From a52cae9102fe02d43dff6c8c480ee342fc808096 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 2 Dec 2015 15:39:45 +0000
Subject: [PATCH 001/447] reactingEulerFoam: Lookup fvOptions from the mesh
 rather than construct a local copy

---
 .../reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C   | 3 +--
 .../reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H   | 3 ---
 .../reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H  | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
index 4efd86189b..4202907a2e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
@@ -154,8 +154,7 @@ Foam::phaseSystem::phaseSystem
         dimensionedScalar("dpdt", dimPressure/dimTime, 0)
     ),
 
-    MRF_(mesh_),
-    fvOptions_(mesh_)
+    MRF_(mesh_)
 {
     phi_.writeOpt() = IOobject::AUTO_WRITE;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index c5ec2aa501..664add034f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
@@ -176,9 +176,6 @@ protected:
         //- Optional MRF zones
         IOMRFZoneList MRF_;
 
-        //- Optional FV-options
-        mutable fv::options fvOptions_;
-
         //- Blending methods
         blendingMethodTable blendingMethods_;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
index 125d286d9d..7f0e73be56 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
@@ -84,7 +84,7 @@ inline const Foam::IOMRFZoneList& Foam::phaseSystem::MRF() const
 
 inline Foam::fv::options& Foam::phaseSystem::fvOptions() const
 {
-    return fvOptions_;
+    return fv::options::New(mesh_);
 }
 
 

From 633e2b1255c5bb3a843929caea6b9ebd23f48c32 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 2 Dec 2015 18:18:06 +0000
Subject: [PATCH 002/447] Minor updates to aid porting to FreeBSD Based on
 patches provided by Jason Bacon

---
 .../mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H         | 4 ++--
 src/OSspecific/POSIX/fileStat.C                             | 3 +--
 src/OpenFOAM/primitives/ints/uint/uintIO.C                  | 6 +++---
 src/OpenFOAM/primitives/ints/uint32/uint32.H                | 2 +-
 src/OpenFOAM/primitives/ints/uint64/uint64.H                | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
index 9e04cdcbbf..70319d5088 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
@@ -31,7 +31,7 @@ inline Foam::label Foam::CV2D::insertPoint
     const label type
 )
 {
-    uint nVert = number_of_vertices();
+    unsigned int nVert = number_of_vertices();
 
     return insertPoint(toPoint(p), nVert, type);
 }
@@ -55,7 +55,7 @@ inline Foam::label Foam::CV2D::insertPoint
     const label type
 )
 {
-    uint nVert = number_of_vertices();
+    unsigned int nVert = number_of_vertices();
 
     Vertex_handle vh = insert(p);
 
diff --git a/src/OSspecific/POSIX/fileStat.C b/src/OSspecific/POSIX/fileStat.C
index bf04835f25..9826983d64 100644
--- a/src/OSspecific/POSIX/fileStat.C
+++ b/src/OSspecific/POSIX/fileStat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,6 @@ License
 
 #include <signal.h>
 #include <unistd.h>
-#include <sys/sysmacros.h>
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/ints/uint/uintIO.C b/src/OpenFOAM/primitives/ints/uint/uintIO.C
index 859eb1f8f6..eb591db54c 100644
--- a/src/OpenFOAM/primitives/ints/uint/uintIO.C
+++ b/src/OpenFOAM/primitives/ints/uint/uintIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,9 +28,9 @@ License
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-uint Foam::readUint(Istream& is)
+unsigned int Foam::readUint(Istream& is)
 {
-    uint val;
+    unsigned int val;
     is >> val;
 
     return val;
diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32.H b/src/OpenFOAM/primitives/ints/uint32/uint32.H
index 07058dcdcc..3b0ad01c7a 100644
--- a/src/OpenFOAM/primitives/ints/uint32/uint32.H
+++ b/src/OpenFOAM/primitives/ints/uint32/uint32.H
@@ -119,7 +119,7 @@ public:
             return p_;
         }
 
-        //- Access to the uint value
+        //- Access to the uint32_t value
         operator uint32_t&()
         {
             return p_;
diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64.H b/src/OpenFOAM/primitives/ints/uint64/uint64.H
index c4f3b581c6..dc19659462 100644
--- a/src/OpenFOAM/primitives/ints/uint64/uint64.H
+++ b/src/OpenFOAM/primitives/ints/uint64/uint64.H
@@ -119,7 +119,7 @@ public:
             return p_;
         }
 
-        //- Access to the uint value
+        //- Access to the uint64_t value
         operator uint64_t&()
         {
             return p_;

From 642690db30d30de1c8665a6e5c9f2d96c588cdc0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 2 Dec 2015 20:33:00 +0000
Subject: [PATCH 003/447] kEpsilon: Minor update of the lookup of fvOptions

---
 src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
index 6a9266e8b0..1340268835 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
@@ -41,9 +41,7 @@ void kEpsilon<BasicTurbulenceModel>::correctNut()
 {
     this->nut_ = Cmu_*sqr(k_)/epsilon_;
     this->nut_.correctBoundaryConditions();
-
-    fv::options& fvOptions(fv::options::New(this->mesh_));
-    fvOptions.correct(this->nut_);
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }

From 1a71623b469a0846534571f7d10ba441a9da26d4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 2 Dec 2015 20:33:28 +0000
Subject: [PATCH 004/447] kOmega: Added support for fvOptions

---
 .../turbulenceModels/RAS/kOmega/kOmega.C           | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
index 5f5e76c03f..81a986b07a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "kOmega.H"
+#include "fvOptions.H"
 #include "bound.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -33,7 +34,6 @@ namespace Foam
 namespace RASModels
 {
 
-
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
@@ -41,6 +41,9 @@ void kOmega<BasicTurbulenceModel>::correctNut()
 {
     this->nut_ = k_/omega_;
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
+
+    BasicTurbulenceModel::correctNut();
 }
 
 
@@ -188,6 +191,7 @@ void kOmega<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volScalarField& nut = this->nut_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
 
@@ -214,13 +218,14 @@ void kOmega<BasicTurbulenceModel>::correct()
         gamma_*alpha*rho*G*omega_/k_
       - fvm::SuSp(((2.0/3.0)*gamma_)*alpha*rho*divU, omega_)
       - fvm::Sp(beta_*alpha*rho*omega_, omega_)
+      + fvOptions(alpha, rho, omega_)
     );
 
     omegaEqn().relax();
-
+    fvOptions.constrain(omegaEqn());
     omegaEqn().boundaryManipulate(omega_.boundaryField());
-
     solve(omegaEqn);
+    fvOptions.correct(omega_);
     bound(omega_, this->omegaMin_);
 
 
@@ -234,10 +239,13 @@ void kOmega<BasicTurbulenceModel>::correct()
         alpha*rho*G
       - fvm::SuSp((2.0/3.0)*alpha*rho*divU, k_)
       - fvm::Sp(Cmu_*alpha*rho*omega_, k_)
+      + fvOptions(alpha, rho, k_)
     );
 
     kEqn().relax();
+    fvOptions.constrain(kEqn());
     solve(kEqn);
+    fvOptions.correct(k_);
     bound(k_, this->kMin_);
 
     correctNut();

From c005f6d68c36258a70c0fdd3a6876b60bee2b2e9 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 2 Dec 2015 20:33:43 +0000
Subject: [PATCH 005/447] kOmegaSST: Added support for fvOptions

---
 .../turbulenceModels/RAS/kOmegaSST/kOmegaSST.C        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
index 223492ba88..3255ff3411 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "kOmegaSST.H"
+#include "fvOptions.H"
 #include "bound.H"
 #include "wallDist.H"
 
@@ -112,6 +113,7 @@ void kOmegaSST<BasicTurbulenceModel>::correctNut(const volScalarField& S2)
 {
     this->nut_ = a1_*k_/max(a1_*omega_, b1_*F23()*sqrt(S2));
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }
@@ -399,6 +401,7 @@ void kOmegaSST<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volScalarField& nut = this->nut_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
 
@@ -446,13 +449,14 @@ void kOmegaSST<BasicTurbulenceModel>::correct()
             )
           + Qsas(S2, gamma, beta)
           + omegaSource()
+          + fvOptions(alpha, rho, omega_)
         );
 
         omegaEqn().relax();
-
+        fvOptions.constrain(omegaEqn());
         omegaEqn().boundaryManipulate(omega_.boundaryField());
-
         solve(omegaEqn);
+        fvOptions.correct(omega_);
         bound(omega_, this->omegaMin_);
     }
 
@@ -467,10 +471,13 @@ void kOmegaSST<BasicTurbulenceModel>::correct()
       - fvm::SuSp((2.0/3.0)*alpha*rho*divU, k_)
       - fvm::Sp(alpha*rho*betaStar_*omega_, k_)
       + kSource()
+      + fvOptions(alpha, rho, k_)
     );
 
     kEqn().relax();
+    fvOptions.constrain(kEqn());
     solve(kEqn);
+    fvOptions.correct(k_);
     bound(k_, this->kMin_);
 
     correctNut(S2);

From 820529b0e6bfad8ef2f4100936a239011a9525e1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 08:40:56 +0000
Subject: [PATCH 006/447] foamInstallationTest: Updated help message

---
 bin/foamInstallationTest | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/foamInstallationTest b/bin/foamInstallationTest
index ed4bb9c782..17b285a5ab 100755
--- a/bin/foamInstallationTest
+++ b/bin/foamInstallationTest
@@ -344,9 +344,9 @@ checkOpenFOAMEnvironment()
         echo ""
         echo "FATAL ERROR: OpenFOAM environment not configured."
         echo ""
-        echo "    Please refer to the installation section of the README file:"
-        echo "    <OpenFOAM installation dir>/OpenFOAM-${WM_PROJECT_VERSION}/README"
-        echo "    to source the OpenFOAM environment."
+        echo "    Please follow the download and installation link in README.html:"
+        echo "    <OpenFOAM installation dir>/OpenFOAM-${WM_PROJECT_VERSION}/README.html"
+        echo "    for information on setting-up the OpenFOAM environment."
         echo ""
         exit 1
     }

From 5e5e22f5f0fc7296e2276849921f824e0a7e2fab Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 08:41:39 +0000
Subject: [PATCH 007/447] RNGkEpsilon: Added support for fvOptions

---
 .../turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
index 1eec3da8a9..cc473482bb 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "RNGkEpsilon.H"
+#include "fvOptions.H"
 #include "bound.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -40,6 +41,7 @@ void RNGkEpsilon<BasicTurbulenceModel>::correctNut()
 {
     this->nut_ = Cmu_*sqr(k_)/epsilon_;
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }
@@ -249,6 +251,7 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volScalarField& nut = this->nut_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
 
@@ -282,13 +285,14 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
       - fvm::SuSp(((2.0/3.0)*C1_ + C3_)*alpha*rho*divU, epsilon_)
       - fvm::Sp(C2_*alpha*rho*epsilon_/k_, epsilon_)
       + epsilonSource()
+      + fvOptions(alpha, rho, epsilon_)
     );
 
     epsEqn().relax();
-
+    fvOptions.constrain(epsEqn());
     epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
     solve(epsEqn);
+    fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
 
 
@@ -304,10 +308,13 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
       - fvm::SuSp((2.0/3.0)*alpha*rho*divU, k_)
       - fvm::Sp(alpha*rho*epsilon_/k_, k_)
       + kSource()
+      + fvOptions(alpha, rho, k_)
     );
 
     kEqn().relax();
+    fvOptions.constrain(kEqn());
     solve(kEqn);
+    fvOptions.correct(k_);
     bound(k_, this->kMin_);
 
     correctNut();

From e94f1385e5b339c9220938a312cc1a6dacae18a6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 08:42:08 +0000
Subject: [PATCH 008/447] realizableKE: Added support for fvOptions

---
 .../turbulenceModels/RAS/realizableKE/realizableKE.C  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
index 81212cb410..d955b973ef 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "realizableKE.H"
+#include "fvOptions.H"
 #include "bound.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -78,6 +79,7 @@ void realizableKE<BasicTurbulenceModel>::correctNut
 {
     this->nut_ = rCmu(gradU, S2, magS)*sqr(k_)/epsilon_;
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }
@@ -267,6 +269,7 @@ void realizableKE<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volScalarField& nut = this->nut_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
 
@@ -298,13 +301,14 @@ void realizableKE<BasicTurbulenceModel>::correct()
             epsilon_
         )
       + epsilonSource()
+      + fvOptions(alpha, rho, epsilon_)
     );
 
     epsEqn().relax();
-
+    fvOptions.constrain(epsEqn());
     epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
     solve(epsEqn);
+    fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
 
 
@@ -320,10 +324,13 @@ void realizableKE<BasicTurbulenceModel>::correct()
       - fvm::SuSp(2.0/3.0*alpha*rho*divU, k_)
       - fvm::Sp(alpha*rho*epsilon_/k_, k_)
       + kSource()
+      + fvOptions(alpha, rho, k_)
     );
 
     kEqn().relax();
+    fvOptions.constrain(kEqn());
     solve(kEqn);
+    fvOptions.correct(k_);
     bound(k_, this->kMin_);
 
     correctNut(tgradU(), S2, magS);

From 8d9f56d1b7de5df5e94864835c12d682adac51eb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 08:43:31 +0000
Subject: [PATCH 009/447] SpalartAllmaras: Added support for fvOptions

---
 .../turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
index a029db7ad3..0883ea88e5 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "SpalartAllmaras.H"
+#include "fvOptions.H"
 #include "bound.H"
 #include "wallDist.H"
 
@@ -124,6 +125,7 @@ void SpalartAllmaras<BasicTurbulenceModel>::correctNut
 {
     this->nut_ = nuTilda_*fv1;
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }
@@ -354,6 +356,7 @@ void SpalartAllmaras<BasicTurbulenceModel>::correct()
     const alphaField& alpha = this->alpha_;
     const rhoField& rho = this->rho_;
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
 
@@ -371,10 +374,13 @@ void SpalartAllmaras<BasicTurbulenceModel>::correct()
      ==
         Cb1_*alpha*rho*Stilda*nuTilda_
       - fvm::Sp(Cw1_*alpha*rho*fw(Stilda)*nuTilda_/sqr(y_), nuTilda_)
+      + fvOptions(alpha, rho, nuTilda_)
     );
 
     nuTildaEqn().relax();
+    fvOptions.constrain(nuTildaEqn());
     solve(nuTildaEqn);
+    fvOptions.correct(nuTilda_);
     bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0.0));
     nuTilda_.correctBoundaryConditions();
 

From 95687c59ec262a3f5fe3048b3114ecfca158028a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 09:15:09 +0000
Subject: [PATCH 010/447] wallShearStress: Now may be used with any turbulence
 model (laminar, RAS or LES/DES) Resolves feature-request
 http://www.openfoam.org/mantisbt/view.php?id=1939

---
 .../wall/wallShearStress/wallShearStress.C     | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
index 6f6609c2fd..b834cd1871 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
+++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
@@ -25,8 +25,8 @@ Application
     wallShearStress
 
 Description
-    Calculates and reports wall shear stress for all patches, for the
-    specified times when using RAS turbulence models.
+    Calculates and reports the turbulent wall shear stress for all patches,
+    for the specified times.
 
     Compressible modes is automatically selected based on the existence of the
     "thermophysicalProperties" dictionary required to construct the
@@ -53,9 +53,9 @@ void calcIncompressible
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<incompressible::RASModel> model
+    autoPtr<incompressible::turbulenceModel> model
     (
-        incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
+        incompressible::turbulenceModel::New(U, phi, laminarTransport)
     );
 
     const volSymmTensorField Reff(model->devReff());
@@ -102,15 +102,9 @@ void calcCompressible
     autoPtr<fluidThermo> pThermo(fluidThermo::New(mesh));
     fluidThermo& thermo = pThermo();
 
-    autoPtr<compressible::RASModel> model
+    autoPtr<compressible::turbulenceModel> model
     (
-        compressible::New<compressible::RASModel>
-        (
-            rho,
-            U,
-            phi,
-            thermo
-        )
+        compressible::turbulenceModel::New(rho, U, phi, thermo)
     );
 
     const volSymmTensorField Reff(model->devRhoReff());

From a749019302b4153902097c7cb1eecf0d84681f52 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 13:11:27 +0000
Subject: [PATCH 011/447] LaunderSharmaKE: Added support for fvOptions

---
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.C              | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index d3fca3307b..e5fa331c72 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LaunderSharmaKE.H"
+#include "fvOptions.H"
 #include "bound.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,6 +57,7 @@ void LaunderSharmaKE<BasicTurbulenceModel>::correctNut()
 {
     this->nut_ = Cmu_*fMu()*sqr(k_)/epsilon_;
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }
@@ -246,6 +248,7 @@ void LaunderSharmaKE<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volScalarField& nut = this->nut_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
 
@@ -274,10 +277,14 @@ void LaunderSharmaKE<BasicTurbulenceModel>::correct()
       - fvm::Sp(C2_*f2()*alpha*rho*epsilon_/k_, epsilon_)
       + alpha*rho*E
       + epsilonSource()
+      + fvOptions(alpha, rho, epsilon_)
     );
 
     epsEqn().relax();
+    fvOptions.constrain(epsEqn());
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
+    fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
 
 
@@ -291,10 +298,13 @@ void LaunderSharmaKE<BasicTurbulenceModel>::correct()
         alpha*rho*G - fvm::SuSp(2.0/3.0*alpha*rho*divU, k_)
       - fvm::Sp(alpha*rho*(epsilon_ + D)/k_, k_)
       + kSource()
+      + fvOptions(alpha, rho, k_)
     );
 
     kEqn().relax();
+    fvOptions.constrain(kEqn());
     solve(kEqn);
+    fvOptions.correct(k_);
     bound(k_, this->kMin_);
 
     correctNut();

From 5f7ad8b82bc1f1a5412603eec310e240e4f447ad Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 13:11:49 +0000
Subject: [PATCH 012/447] v2f: Added support for fvOptions

---
 .../turbulenceModels/RAS/v2f/v2f.C              | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
index 4a76ee1870..df1597cba3 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "v2f.H"
+#include "fvOptions.H"
 #include "bound.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,6 +57,7 @@ void v2f<BasicTurbulenceModel>::correctNut()
 {
     this->nut_ = min(CmuKEps_*sqr(k_)/epsilon_, this->Cmu_*v2_*Ts());
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }
@@ -284,6 +286,7 @@ void v2f<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volScalarField& nut = this->nut_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
 
@@ -323,13 +326,14 @@ void v2f<BasicTurbulenceModel>::correct()
         Ceps1*alpha*rho*G/Ts
       - fvm::SuSp(((2.0/3.0)*Ceps1 + Ceps3_)*alpha*rho*divU, epsilon_)
       - fvm::Sp(Ceps2_*alpha*rho/Ts, epsilon_)
+      + fvOptions(alpha, rho, epsilon_)
     );
 
     epsEqn().relax();
-
+    fvOptions.constrain(epsEqn());
     epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
     solve(epsEqn);
+    fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
 
 
@@ -343,10 +347,13 @@ void v2f<BasicTurbulenceModel>::correct()
         alpha*rho*G
       - fvm::SuSp((2.0/3.0)*alpha*rho*divU, k_)
       - fvm::Sp(alpha*rho*epsilon_/k_, k_)
+      + fvOptions(alpha, rho, k_)
     );
 
     kEqn().relax();
+    fvOptions.constrain(kEqn());
     solve(kEqn);
+    fvOptions.correct(k_);
     bound(k_, this->kMin_);
 
 
@@ -357,10 +364,13 @@ void v2f<BasicTurbulenceModel>::correct()
      ==
       - fvm::Sp(1.0/L2, f_)
       - 1.0/L2/k_*(v2fAlpha - C2_*G)
+      + fvOptions(alpha, rho, f_)
     );
 
     fEqn().relax();
+    fvOptions.constrain(fEqn());
     solve(fEqn);
+    fvOptions.correct(f_);
     bound(f_, fMin_);
 
 
@@ -373,10 +383,13 @@ void v2f<BasicTurbulenceModel>::correct()
       ==
         alpha*rho*min(k_*f_, C2_*G - v2fAlpha)
       - fvm::Sp(N*alpha*rho*epsilon_/k_, v2_)
+      + fvOptions(alpha, rho, v2_)
     );
 
     v2Eqn().relax();
+    fvOptions.constrain(v2Eqn());
     solve(v2Eqn);
+    fvOptions.correct(v2_);
     bound(v2_, v2Min_);
 
     correctNut();

From a6f4bf60b8dc40feba7d099effa5cda257a30ee4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 13:12:10 +0000
Subject: [PATCH 013/447] LRR: Added support for fvOptions

---
 src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
index 2b8be52762..a955b9a205 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LRR.H"
+#include "fvOptions.H"
 #include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -40,6 +41,7 @@ void LRR<BasicTurbulenceModel>::correctNut()
 {
     this->nut_ = this->Cmu_*sqr(k_)/epsilon_;
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }
@@ -280,6 +282,7 @@ void LRR<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volSymmTensorField& R = this->R_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     ReynoldsStress<RASModel<BasicTurbulenceModel> >::correct();
 
@@ -301,13 +304,14 @@ void LRR<BasicTurbulenceModel>::correct()
      ==
         Ceps1_*alpha*rho*G*epsilon_/k_
       - fvm::Sp(Ceps2_*alpha*rho*epsilon_/k_, epsilon_)
+      + fvOptions(alpha, rho, epsilon_)
     );
 
     epsEqn().relax();
-
+    fvOptions.constrain(epsEqn());
     epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
     solve(epsEqn);
+    fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
 
 
@@ -344,6 +348,7 @@ void LRR<BasicTurbulenceModel>::correct()
         alpha*rho*P
       - (2.0/3.0*(1 - C1_)*I)*alpha*rho*epsilon_
       - C2_*alpha*rho*dev(P)
+      + fvOptions(alpha, rho, R)
     );
 
     // Optionally add wall-refection term
@@ -363,7 +368,9 @@ void LRR<BasicTurbulenceModel>::correct()
     }
 
     REqn().relax();
+    fvOptions.constrain(REqn());
     solve(REqn);
+    fvOptions.correct(R);
 
     this->boundNormalStress(R);
 

From 05fa38f5e3125950733791f1aa9725e500f3f5a8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 13:12:27 +0000
Subject: [PATCH 014/447] SSG: Added support for fvOptions

---
 src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
index 9f9cc53464..3e30c1fbed 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "SSG.H"
+#include "fvOptions.H"
 #include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -40,6 +41,7 @@ void SSG<BasicTurbulenceModel>::correctNut()
 {
     this->nut_ = this->Cmu_*sqr(k_)/epsilon_;
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }
@@ -290,6 +292,7 @@ void SSG<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volSymmTensorField& R = this->R_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     ReynoldsStress<RASModel<BasicTurbulenceModel> >::correct();
 
@@ -311,13 +314,14 @@ void SSG<BasicTurbulenceModel>::correct()
      ==
         Ceps1_*alpha*rho*G*epsilon_/k_
       - fvm::Sp(Ceps2_*alpha*rho*epsilon_/k_, epsilon_)
+      + fvOptions(alpha, rho, epsilon_)
     );
 
     epsEqn().relax();
-
+    fvOptions.constrain(epsEqn());
     epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
     solve(epsEqn);
+    fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
 
 
@@ -364,10 +368,13 @@ void SSG<BasicTurbulenceModel>::correct()
           + C4_*dev(twoSymm(b&S))
           + C5_*twoSymm(b&Omega)
         )
+      + fvOptions(alpha, rho, R)
     );
 
     REqn().relax();
+    fvOptions.constrain(REqn());
     solve(REqn);
+    fvOptions.correct(R);
 
     this->boundNormalStress(R);
 

From e8f532f8571a9382716f4114ea040147ab6cda41 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 13:39:55 +0000
Subject: [PATCH 015/447] turbulenceModels/LES/kEqn: Added support for
 fvOptions

---
 src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
index ef2b2b8535..4a87768c10 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "kEqn.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,6 +40,7 @@ void kEqn<BasicTurbulenceModel>::correctNut()
 {
     this->nut_ = Ck_*sqrt(k_)*this->delta();
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }
@@ -171,6 +173,7 @@ void kEqn<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volScalarField& nut = this->nut_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     LESeddyViscosity<BasicTurbulenceModel>::correct();
 
@@ -190,10 +193,13 @@ void kEqn<BasicTurbulenceModel>::correct()
       - fvm::SuSp((2.0/3.0)*alpha*rho*divU, k_)
       - fvm::Sp(this->Ce_*alpha*rho*sqrt(k_)/this->delta(), k_)
       + kSource()
+      + fvOptions(alpha, rho, k_)
     );
 
     kEqn().relax();
+    fvOptions.constrain(kEqn());
     solve(kEqn);
+    fvOptions.correct(k_);
     bound(k_, this->kMin_);
 
     correctNut();

From 2ddf4b7793362ac6d7dd7668b5505cecabed789c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 13:40:32 +0000
Subject: [PATCH 016/447] turbulenceModels/LES/Smagorinsky: Added support for
 fvOptions

---
 .../turbulenceModels/LES/Smagorinsky/Smagorinsky.C              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C
index 9827f76063..8f11a96b9e 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "Smagorinsky.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,6 +70,7 @@ void Smagorinsky<BasicTurbulenceModel>::correctNut()
 
     this->nut_ = Ck_*this->delta()*sqrt(k);
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }

From cb31786753dc2360bb53c73f531b0a3a4b195ed3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 13:48:20 +0000
Subject: [PATCH 017/447] turbulenceModels/LES/WALE: Added support for
 fvOptions

---
 src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
index 49a353ba1d..e70ff8fabf 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "WALE.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -89,6 +90,7 @@ void WALE<BasicTurbulenceModel>::correctNut()
 {
     this->nut_ = Ck_*this->delta()*sqrt(this->k(fvc::grad(this->U_)));
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }

From 248526928326f20900000907f0ba74f4252db53a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 13:48:42 +0000
Subject: [PATCH 018/447] turbulenceModels/LES/dynamicKEqn: Added support for
 fvOptions

---
 .../turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
index ac076991e8..1b61975899 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dynamicKEqn.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -107,6 +108,9 @@ void dynamicKEqn<BasicTurbulenceModel>::correctNut
 {
     this->nut_ = Ck(D, KK)*sqrt(k_)*this->delta();
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
+
+    BasicTurbulenceModel::correctNut();
 }
 
 
@@ -243,6 +247,7 @@ void dynamicKEqn<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volScalarField& nut = this->nut_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     LESeddyViscosity<BasicTurbulenceModel>::correct();
 
@@ -266,10 +271,13 @@ void dynamicKEqn<BasicTurbulenceModel>::correct()
       - fvm::SuSp((2.0/3.0)*alpha*rho*divU, k_)
       - fvm::Sp(Ce(D, KK)*alpha*rho*sqrt(k_)/this->delta(), k_)
       + kSource()
+      + fvOptions(alpha, rho, k_)
     );
 
     kEqn().relax();
-    kEqn().solve();
+    fvOptions.constrain(kEqn());
+    solve(kEqn);
+    fvOptions.correct(k_);
     bound(k_, this->kMin_);
 
     correctNut(D, KK);

From 1ae82d6e0c20d643e529745029d8d0872a727390 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 14:52:48 +0000
Subject: [PATCH 019/447] turbulenceModels/LES/dynamicLagrangian: Added support
 for fvOptions

---
 .../LES/dynamicLagrangian/dynamicLagrangian.C       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
index 6a6fb02b93..c0267708f5 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dynamicLagrangian.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -42,6 +43,9 @@ void dynamicLagrangian<BasicTurbulenceModel>::correctNut
 {
     this->nut_ = (flm_/fmm_)*sqr(this->delta())*mag(dev(symm(gradU)));
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
+
+    BasicTurbulenceModel::correctNut();
 }
 
 
@@ -157,6 +161,7 @@ void dynamicLagrangian<BasicTurbulenceModel>::correct()
     // Local references
     const surfaceScalarField& phi = this->phi_;
     const volVectorField& U = this->U_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     LESeddyViscosity<BasicTurbulenceModel>::correct();
 
@@ -190,11 +195,13 @@ void dynamicLagrangian<BasicTurbulenceModel>::correct()
      ==
         invT*LM
       - fvm::Sp(invT, flm_)
+      + fvOptions(flm_)
     );
 
     flmEqn.relax();
+    fvOptions.constrain(flmEqn);
     flmEqn.solve();
-
+    fvOptions.correct(flm_);
     bound(flm_, flm0_);
 
     volScalarField MM(M && M);
@@ -206,11 +213,13 @@ void dynamicLagrangian<BasicTurbulenceModel>::correct()
      ==
         invT*MM
       - fvm::Sp(invT, fmm_)
+      + fvOptions(fmm_)
     );
 
     fmmEqn.relax();
+    fvOptions.constrain(fmmEqn);
     fmmEqn.solve();
-
+    fvOptions.correct(fmm_);
     bound(fmm_, fmm0_);
 
     correctNut(gradU);

From 154893db0f4e228882cae673a6e28ab62444e54f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 14:53:12 +0000
Subject: [PATCH 020/447] turbulenceModels/LES/SpalartAllmarasDES: Added
 support for fvOptions

---
 .../LES/SpalartAllmarasDES/SpalartAllmarasDES.C           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
index ed5cae80da..02f35be372 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "SpalartAllmarasDES.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -170,6 +171,7 @@ void SpalartAllmarasDES<BasicTurbulenceModel>::correctNut
 {
     this->nut_ = nuTilda_*fv1;
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }
@@ -412,6 +414,7 @@ void SpalartAllmarasDES<BasicTurbulenceModel>::correct()
     const rhoField& rho = this->rho_;
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     LESeddyViscosity<BasicTurbulenceModel>::correct();
 
@@ -436,11 +439,14 @@ void SpalartAllmarasDES<BasicTurbulenceModel>::correct()
             Cw1_*alpha*rho*fw(Stilda, dTilda)*nuTilda_/sqr(dTilda),
             nuTilda_
         )
+      + fvOptions(alpha, rho, nuTilda_)
     );
 
     nuTildaEqn().relax();
+    fvOptions.constrain(nuTildaEqn());
     solve(nuTildaEqn);
-    bound(nuTilda_, dimensionedScalar("zero", nuTilda_.dimensions(), 0.0));
+    fvOptions.correct(nuTilda_);
+    bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0.0));
     nuTilda_.correctBoundaryConditions();
 
     correctNut(fv1);

From da2c319a8da2cec29ee02349ffbd949e98d9e1a3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 14:53:27 +0000
Subject: [PATCH 021/447] turbulenceModels/LES/DeardorffDiffStress: Added
 support for fvOptions

---
 .../LES/DeardorffDiffStress/DeardorffDiffStress.C         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
index e958e93324..921ed47cf9 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "DeardorffDiffStress.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,6 +40,7 @@ void DeardorffDiffStress<BasicTurbulenceModel>::correctNut()
 {
     this->nut_ = Ck_*sqrt(this->k())*this->delta();
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
 
     BasicTurbulenceModel::correctNut();
 }
@@ -174,6 +176,7 @@ void DeardorffDiffStress<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volSymmTensorField& R = this->R_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     ReynoldsStress<LESModel<BasicTurbulenceModel> >::correct();
 
@@ -196,12 +199,15 @@ void DeardorffDiffStress<BasicTurbulenceModel>::correct()
         alpha*rho*P
       + (4.0/5.0)*alpha*rho*k*D
       - ((2.0/3.0)*(1.0 - Cm_/this->Ce_)*I)*(alpha*rho*this->epsilon())
+      + fvOptions(alpha, rho, R)
     );
 
     REqn().relax();
+    fvOptions.constrain(REqn());
     REqn().solve();
-
+    fvOptions.correct(R);
     this->boundNormalStress(R);
+
     correctNut();
 }
 

From fde2866a8b895dfd524dcdbed143cd093c507b83 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 15:37:05 +0000
Subject: [PATCH 022/447] TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon:
 Added support for fvOptions

---
 .../phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
index 843ecc015d..f70d750ee0 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
@@ -24,9 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LaheyKEpsilon.H"
-#include "addToRunTimeSelectionTable.H"
+#include "fvOptions.H"
 #include "twoPhaseSystem.H"
-#include "dragModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -176,6 +175,9 @@ void LaheyKEpsilon<BasicTurbulenceModel>::correctNut()
        *(mag(this->U_ - gasTurbulence.U()));
 
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
+
+    BasicTurbulenceModel::correctNut();
 }
 
 

From 934aa987d97f3510e882d26bb7c59d757189c460 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 15:43:27 +0000
Subject: [PATCH 023/447] 
 TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon: Added support for
 fvOptions

---
 .../RAS/mixtureKEpsilon/mixtureKEpsilon.C         | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
index f0b8a4f537..c65a63cb40 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
@@ -24,9 +24,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "mixtureKEpsilon.H"
+#include "fvOptions.H"
 #include "bound.H"
 #include "twoPhaseSystem.H"
-#include "dragModel.H"
 #include "virtualMassModel.H"
 #include "fixedValueFvPatchFields.H"
 #include "inletOutletFvPatchFields.H"
@@ -335,6 +335,9 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correctNut()
 {
     this->nut_ = Cmu_*sqr(k_)/epsilon_;
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
+
+    BasicTurbulenceModel::correctNut();
 }
 
 
@@ -575,6 +578,8 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
     volScalarField& km = km_();
     volScalarField& epsilonm = epsilonm_();
 
+    fv::options& fvOptions(fv::options::New(this->mesh_));
+
     eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
 
     // Update the effective mixture density
@@ -657,13 +662,14 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
       - fvm::SuSp(((2.0/3.0)*C1_)*divUm, epsilonm)
       - fvm::Sp(C2_*epsilonm/km, epsilonm)
       + epsilonSource()
+      + fvOptions(epsilonm)
     );
 
     epsEqn().relax();
-
+    fvOptions.constrain(epsEqn());
     epsEqn().boundaryManipulate(epsilonm.boundaryField());
-
     solve(epsEqn);
+    fvOptions.correct(epsilonm);
     bound(epsilonm, this->epsilonMin_);
 
 
@@ -679,10 +685,13 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
       - fvm::SuSp((2.0/3.0)*divUm, km)
       - fvm::Sp(epsilonm/km, km)
       + kSource()
+      + fvOptions(km)
     );
 
     kmEqn().relax();
+    fvOptions.constrain(kmEqn());
     solve(kmEqn);
+    fvOptions.correct(km);
     bound(km, this->kMin_);
     km.correctBoundaryConditions();
 

From 352f4ab80b74ea8fb0baae32b49139ec15e2435b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 16:17:23 +0000
Subject: [PATCH 024/447] TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato:
 Added support for fvOptions

---
 .../phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
index 76d7e4d0be..f65de4583d 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
@@ -24,9 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "kOmegaSSTSato.H"
-#include "addToRunTimeSelectionTable.H"
+#include "fvOptions.H"
 #include "twoPhaseSystem.H"
-#include "dragModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -153,6 +152,9 @@ void kOmegaSSTSato<BasicTurbulenceModel>::correctNut()
        *(mag(this->U_ - gasTurbulence.U()));
 
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
+
+    BasicTurbulenceModel::correctNut();
 }
 
 

From cdb7b896bf55f12ad59f5e2a66c51f5b96e7d7f1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 16:17:40 +0000
Subject: [PATCH 025/447] 
 TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon: Added support
 for fvOptions

---
 .../RAS/continuousGasKEpsilon/continuousGasKEpsilon.C          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
index 86d6a7f334..e57eff4b84 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "continuousGasKEpsilon.H"
-#include "addToRunTimeSelectionTable.H"
+#include "fvOptions.H"
 #include "twoPhaseSystem.H"
 #include "virtualMassModel.H"
 
@@ -136,6 +136,7 @@ void continuousGasKEpsilon<BasicTurbulenceModel>::correctNut()
     volScalarField omega((1 - expThetar)/(1 + expThetar));
 
     nutEff_ = omega*liquidTurbulence.nut();
+    fv::options::New(this->mesh_).correct(nutEff_);
 }
 
 

From d577e47b40737ebef1273be65234a79f129a256d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 16:18:04 +0000
Subject: [PATCH 026/447] TurbulenceModels/phaseCompressible/LES/Niceno: Added
 support for fvOptions

---
 .../phaseCompressible/LES/Niceno/NicenoKEqn.C               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
index 44eb97019b..212ec4da2e 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
+++ b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
@@ -24,9 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "NicenoKEqn.H"
-#include "addToRunTimeSelectionTable.H"
+#include "fvOptions.H"
 #include "twoPhaseSystem.H"
-#include "dragModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -165,6 +164,9 @@ void NicenoKEqn<BasicTurbulenceModel>::correctNut()
        *(mag(this->U_ - gasTurbulence.U()));
 
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
+
+    BasicTurbulenceModel::correctNut();
 }
 
 

From 12c4ba267e9952c4b552d4d11e359c7c9ed4035f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 16:38:43 +0000
Subject: [PATCH 027/447] 
 TurbulenceModels/phaseCompressible/LES/continuousGasKEqn: Added support for
 fvOptions

---
 .../phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C
index 00e23e7c32..31d646b759 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C
+++ b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "continuousGasKEqn.H"
-#include "addToRunTimeSelectionTable.H"
 #include "twoPhaseSystem.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

From 297dc6ce8e97aad3eea83587e796bf3fdf32b56f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 16:39:00 +0000
Subject: [PATCH 028/447] 
 TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang: Added support for
 fvOptions

---
 .../phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
index f7bfe4fbf6..24a5aaa70f 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
+++ b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "SmagorinskyZhang.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -142,6 +143,9 @@ void SmagorinskyZhang<BasicTurbulenceModel>::correctNut()
        *(mag(this->U_ - gasTurbulence.U()));
 
     this->nut_.correctBoundaryConditions();
+    fv::options::New(this->mesh_).correct(this->nut_);
+
+    BasicTurbulenceModel::correctNut();
 }
 
 

From 4025d6ebdd60a882730d22ebd61fcabdebc31048 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 3 Dec 2015 16:39:13 +0000
Subject: [PATCH 029/447] 
 reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels:
 Added support for fvOptions

---
 .../kineticTheoryModel/kineticTheoryModel.C                 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 83017e1557..e44534e398 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -26,6 +26,7 @@ License
 #include "kineticTheoryModel.H"
 #include "mathematicalConstants.H"
 #include "twoPhaseSystem.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -417,6 +418,8 @@ void Foam::RASModels::kineticTheoryModel::correct()
         // 'thermal' conductivity (Table 3.3, p. 49)
         kappa_ = conductivityModel_->kappa(alpha, Theta_, gs0_, rho, da, e_);
 
+        fv::options& fvOptions(fv::options::New(mesh_));
+
         // Construct the granular temperature equation (Eq. 3.20, p. 44)
         // NB. note that there are two typos in Eq. 3.20:
         //     Ps should be without grad
@@ -436,10 +439,13 @@ void Foam::RASModels::kineticTheoryModel::correct()
           + fvm::Sp(-gammaCoeff, Theta_)
           + fvm::Sp(-J1, Theta_)
           + fvm::Sp(J2/(Theta_ + ThetaSmall), Theta_)
+          + fvOptions(alpha, rho, Theta_)
         );
 
         ThetaEqn.relax();
+        fvOptions.constrain(ThetaEqn);
         ThetaEqn.solve();
+        fvOptions.correct(Theta_);
     }
     else
     {

From e356211140bd2d80617c65f4b8dc649297a3ca8b Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Fri, 4 Dec 2015 14:20:23 +0000
Subject: [PATCH 030/447] foamNewApp: script to create template for a new
 application Creates a directory containing source .C file and Make directory
 Will deprecate foamNewSource with App argument in due course

---
 bin/foamNewApp                     | 73 ++++++++++++++++++++++++++++++
 etc/codeTemplates/app/Make/files   |  3 ++
 etc/codeTemplates/app/Make/options |  7 +++
 etc/codeTemplates/app/app.C        | 47 +++++++++++++++++++
 4 files changed, 130 insertions(+)
 create mode 100755 bin/foamNewApp
 create mode 100644 etc/codeTemplates/app/Make/files
 create mode 100644 etc/codeTemplates/app/Make/options
 create mode 100644 etc/codeTemplates/app/app.C

diff --git a/bin/foamNewApp b/bin/foamNewApp
new file mode 100755
index 0000000000..b2f664817b
--- /dev/null
+++ b/bin/foamNewApp
@@ -0,0 +1,73 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  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/>.
+#
+# Script
+#     foamNewApp
+#
+# Description
+#     Create directory with source and compilation files for a new application
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+DIR="$FOAM_ETC/codeTemplates/app"
+
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+Usage: $Script [-h | -help] <applicationName>
+
+* Create directory with source and compilation files for a new application
+  <applicationName> (dir)
+  - <applicationName>.C
+  - Make (dir)
+    - files
+    - options
+  Compiles an executable named <applicationName> in \$FOAM_USER_APPBIN:
+  $FOAM_USER_APPBIN
+USAGE
+    exit 1
+}
+
+case "$1" in
+(-h | -help)
+    usage
+    ;;
+-*)
+    usage "$1 is not a valid filename"
+    ;;
+esac
+
+[ "$#" -eq 1 ] || usage "Wrong number of arguments"
+[ -d "$1" ] && usage "$1 directory already exists, aborting..."
+
+NAME=$1
+
+echo "Creating application code directory $NAME" && mkdir $NAME
+sed "s#NAME#${NAME}#g" ${DIR}/app.C > $NAME/$NAME.C
+
+echo "Creating Make subdirectory" && mkdir $NAME/Make
+sed "s#NAME#${NAME}#g" ${DIR}/Make/files > $NAME/Make/files
+cp ${DIR}/Make/options $NAME/Make
+
+#------------------------------------------------------------------------------
diff --git a/etc/codeTemplates/app/Make/files b/etc/codeTemplates/app/Make/files
new file mode 100644
index 0000000000..bfe94ae06e
--- /dev/null
+++ b/etc/codeTemplates/app/Make/files
@@ -0,0 +1,3 @@
+NAME.C
+
+EXE = $(FOAM_USER_APPBIN)/NAME
diff --git a/etc/codeTemplates/app/Make/options b/etc/codeTemplates/app/Make/options
new file mode 100644
index 0000000000..a3ae8da833
--- /dev/null
+++ b/etc/codeTemplates/app/Make/options
@@ -0,0 +1,7 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/etc/codeTemplates/app/app.C b/etc/codeTemplates/app/app.C
new file mode 100644
index 0000000000..e143dcdf22
--- /dev/null
+++ b/etc/codeTemplates/app/app.C
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+Application
+    NAME
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+    #include "createTime.H"
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    Info<< "\nEnd\n" << endl;
+    return 0;
+}
+
+
+// ************************************************************************* //

From a3e555e72c7912b233bb8bd20da6752af63d6199 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Fri, 4 Dec 2015 14:33:56 +0000
Subject: [PATCH 031/447] foamNewBC: script to create template code for a new
 boundary condition Run foamNewBC -h for details

---
 bin/foamNewBC                     | 216 ++++++++++++++++++++++++++
 etc/codeTemplates/BC/BC.C         | 240 +++++++++++++++++++++++++++++
 etc/codeTemplates/BC/BC.H         | 246 ++++++++++++++++++++++++++++++
 etc/codeTemplates/BC/BCs.C        |  43 ++++++
 etc/codeTemplates/BC/BCs.H        |  49 ++++++
 etc/codeTemplates/BC/BCsFwd.H     |  50 ++++++
 etc/codeTemplates/BC/Make/files   |   3 +
 etc/codeTemplates/BC/Make/options |   7 +
 8 files changed, 854 insertions(+)
 create mode 100755 bin/foamNewBC
 create mode 100644 etc/codeTemplates/BC/BC.C
 create mode 100644 etc/codeTemplates/BC/BC.H
 create mode 100644 etc/codeTemplates/BC/BCs.C
 create mode 100644 etc/codeTemplates/BC/BCs.H
 create mode 100644 etc/codeTemplates/BC/BCsFwd.H
 create mode 100644 etc/codeTemplates/BC/Make/files
 create mode 100644 etc/codeTemplates/BC/Make/options

diff --git a/bin/foamNewBC b/bin/foamNewBC
new file mode 100755
index 0000000000..12b894eda0
--- /dev/null
+++ b/bin/foamNewBC
@@ -0,0 +1,216 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  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/>.
+#
+# Script
+#     foamNewBC
+#
+# Description
+#     Create directory of source and compilation files for a new BC
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+DIR="$FOAM_ETC/codeTemplates/BC"
+
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+Usage: $Script [-h | -help] <base> <type> <boundaryConditionName>
+
+* Create directory of source and compilation files for a new boundary condition
+  <boundaryConditionName> (dir)
+  - .C and .H source files
+  - Make (dir)
+    - files
+    - options
+  Compiles a library named lib<boundaryConditionName>.so in \$FOAM_USER_LIBBIN:
+  $FOAM_USER_LIBBIN
+
+<base> conditions:
+-f | -fixedValue    | fixedValue
+-m | -mixed         | mixed
+
+<type> options:
+-a | -all    | all  | template (creates a template class)
+-s | -scalar | scalar
+-v | -vector | vector
+-t | -tensor | tensor
+-symmTensor  | symmTensor
+-sphericalTensor | sphericalTensor
+
+USAGE
+    exit 1
+}
+
+cap() {
+    echo $1 | sed -e 's/^./\U&/'
+}
+
+# Implicitly covers a lone -help
+[ "$#" -gt 1 ] || usage
+
+case "$1" in
+(-h | -help)
+    usage
+    ;;
+(-f | -fixedValue | fixedValue)
+    BASE=fixedValue
+    ;;
+(-m | -mixed | mixed )
+    BASE=mixed
+    ;;
+(*)
+    usage "Unknown <base> condition '$1'"
+    ;;
+esac
+shift
+
+case "$1" in
+(-a | -all | all | template)
+    TYPE=Type
+    UNIT='VALUE-or-(VALUE 0 0)'
+    ;;
+(-s | -scalar | scalar)
+    TYPE=scalar
+    UNIT=VALUE
+    ;;
+(-v | -vector | vector)
+    TYPE=vector
+    UNIT='(VALUE 0 0)'
+    ;;
+(-t | -tensor | tensor)
+    TYPE=tensor
+    UNIT='(VALUE 0 0 0 0 0 0 0 0)'
+    ;;
+(-symmTensor | symmTensor)
+    TYPE=symmTensor
+    UNIT='(VALUE 0 0 0 0 0)'
+    ;;
+(-sphericalTensor | sphericalTensor)
+    TYPE=sphericalTensor
+    UNIT=VALUE
+    ;;
+(*)
+    usage "Unknown <type> option '$1'"
+    ;;
+esac
+shift
+[ "$#" -eq 1 ] || usage "Wrong number of arguments"
+NAME=$1
+
+# Prevents over-writing of existing directory
+[ -d $NAME ] && usage "$NAME directory already exists, aborting..."
+echo "Creating $NAME directory" && mkdir $NAME
+
+# Establish meta template files to copy
+FILES=$(cd ${DIR} && ls *.*)
+[ "$TYPE" = "Type" ] || FILES=$(cd ${DIR} && ls BC.[CH])
+
+# Substitutions for meta-template files
+FIELD="Field<${TYPE}>"
+[ "$TYPE" = "Type" ] || FIELD=${TYPE}Field
+
+FVPATCHF=fvPatch$(cap $FIELD)
+CLASS=$NAME$(cap $FVPATCHF)
+PARENT=$BASE$(cap $FVPATCHF)
+CONSTRUCT=$(echo $CLASS | sed 's/<Type>//g')
+
+# Create some example values for the Description
+n=0
+for N in $(echo "ZERO ONE TWO THREE FOUR")
+do
+   eval $(expr $N='$(echo $UNIT | sed "s#VALUE#$n#g")')
+   n=$(( $n + 1 ))
+done
+
+# Make substitutions to meta-template files
+for F in $FILES
+do
+    EXT=$(echo $F | sed "s#BC##")
+    NEWFILE=${CONSTRUCT}${EXT}
+    echo "   Adding file ${NEWFILE}..."
+
+    # Adds readScalar function when TYPE = scalar
+    sed -e "s#TYPE#${TYPE}#g" \
+        -e "s#NAME#${NAME}#g" \
+        -e "s#BASE#${BASE}#g" \
+        -e "s#CONSTRUCT#${CONSTRUCT}#g" \
+        -e "s#CLASS#${CLASS}#g" \
+        -e "s#FIELD#${FIELD}#g" \
+        -e "s#FVPATCHF#${FVPATCHF}#g" \
+        -e "s#PARENT#${PARENT}#g" \
+        -e "s#ZERO#${ZERO}#g" \
+        -e "s#ONE#${ONE}#g" \
+        -e "s#TWO#${TWO}#g" \
+        -e "s#THREE#${THREE}#g" \
+        -e "s#FOUR#${FOUR}#g" \
+        -e 's/>>/> >/g' \
+        ${DIR}/${F} > ${NAME}/${NEWFILE}
+
+    case $BASE in
+        fixedValue)
+            # refValue(), refGrad(), valueFraction() removed
+            # phip removed
+            sed -i \
+                -e '/refValue/d' \
+                -e '/refGrad/d' \
+                -e '/valueFraction/d' \
+                -e '/phip/,/lookupPatchField/d' \
+                ${NAME}/${NEWFILE}
+            ;;
+        mixed)
+            # evaluate() removed
+            # operator== becomes refValue() =
+            sed -i \
+                -e '/evaluate/d' \
+                -e 's/operator==/refValue() =/g' \
+                ${NAME}/${NEWFILE}
+            ;;
+    esac
+
+    case $TYPE in
+        Type)
+            # Build Macro removed (in ..Fields.C)
+            sed -i -e '/Build Macro/,/^}/d' \
+                ${NAME}/${NEWFILE}
+            ;;
+        *)
+            # template<class Type> removed
+            # this-> removed
+            # .template functionTemplate<...> becomes functionTemplate<...>
+            # template instantiation repository removed
+            sed -i \
+                -e '/^template<class Type>$/d' \
+                -e 's/this->//g' \
+                -e 's/\.template[\t ]*\([a-Z]\)/\.\1/g' \
+                -e '/#ifdef NoRepository/,/\/\/ */d' \
+                ${NAME}/${NEWFILE}
+            ;;
+    esac
+done
+
+echo "Creating Make subdirectory" && cp -r ${DIR}/Make ${NAME}
+COMPILED=$(cd ${NAME} && ls -r1 *C | head -1) # ...Fields.C for template class
+sed -i -e "s#NAME#${NAME}#g" -e "s#COMPILED.*#${COMPILED}#g" ${NAME}/Make/files
+
+#------------------------------------------------------------------------------
diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
new file mode 100644
index 0000000000..c518262cd9
--- /dev/null
+++ b/etc/codeTemplates/BC/BC.C
@@ -0,0 +1,240 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "CONSTRUCT.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+Foam::scalar Foam::CLASS::t() const
+{
+    return this->db().time().timeOutputValue();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::CLASS::
+CONSTRUCT
+(
+    const fvPatch& p,
+    const DimensionedField<TYPE, volMesh>& iF
+)
+:
+    PARENT(p, iF),
+    scalarData_(0.0),
+    data_(pTraits<TYPE>::zero),
+    fieldData_(p.size(), pTraits<TYPE>::zero),
+    timeVsData_(),
+    wordData_("wordDefault"),
+    labelData_(-1),
+    boolData_(false)
+{
+    this->refValue() = pTraits<TYPE>::zero;
+    this->refGrad() = pTraits<TYPE>::zero;
+    this->valueFraction() = 0.0;
+}
+
+
+template<class Type>
+Foam::CLASS::
+CONSTRUCT
+(
+    const fvPatch& p,
+    const DimensionedField<TYPE, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    PARENT(p, iF),
+    scalarData_(readScalar(dict.lookup("scalarData"))),
+    data_(pTraits<TYPE>(dict.lookup("data"))),
+    fieldData_("fieldData", dict, p.size()),
+    timeVsData_(DataEntry<TYPE>::New("timeVsData", dict)),
+    wordData_(dict.lookupOrDefault<word>("wordName", "wordDefault")),
+    labelData_(-1),
+    boolData_(false)
+{
+    this->refGrad() = pTraits<TYPE>::zero;
+    this->valueFraction() = 0.0;
+
+    this->refValue() = FIELD("fieldData", dict, p.size());
+    FVPATCHF::operator=(this->refValue());
+
+    PARENT::evaluate();
+
+    /*
+    //Initialise with the value entry if evaluation is not possible
+    FVPATCHF::operator=
+    (
+        FIELD("value", dict, p.size())
+    );
+    this->refValue() = *this;
+    */
+}
+
+
+template<class Type>
+Foam::CLASS::
+CONSTRUCT
+(
+    const CLASS& ptf,
+    const fvPatch& p,
+    const DimensionedField<TYPE, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    PARENT(ptf, p, iF, mapper),
+    scalarData_(ptf.scalarData_),
+    data_(ptf.data_),
+    fieldData_(ptf.fieldData_, mapper),
+    timeVsData_(ptf.timeVsData_, false),
+    wordData_(ptf.wordData_),
+    labelData_(-1),
+    boolData_(ptf.boolData_)
+{}
+
+
+template<class Type>
+Foam::CLASS::
+CONSTRUCT
+(
+    const CLASS& ptf
+)
+:
+    PARENT(ptf),
+    scalarData_(ptf.scalarData_),
+    data_(ptf.data_),
+    fieldData_(ptf.fieldData_),
+    timeVsData_(ptf.timeVsData_, false),
+    wordData_(ptf.wordData_),
+    labelData_(-1),
+    boolData_(ptf.boolData_)
+{}
+
+
+template<class Type>
+Foam::CLASS::
+CONSTRUCT
+(
+    const CLASS& ptf,
+    const DimensionedField<TYPE, volMesh>& iF
+)
+:
+    PARENT(ptf, iF),
+    scalarData_(ptf.scalarData_),
+    data_(ptf.data_),
+    fieldData_(ptf.fieldData_),
+    timeVsData_(ptf.timeVsData_, false),
+    wordData_(ptf.wordData_),
+    labelData_(-1),
+    boolData_(ptf.boolData_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::CLASS::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    PARENT::autoMap(m);
+    fieldData_.autoMap(m);
+}
+
+
+template<class Type>
+void Foam::CLASS::rmap
+(
+    const FVPATCHF& ptf,
+    const labelList& addr
+)
+{
+    PARENT::rmap(ptf, addr);
+
+    const CLASS& tiptf =
+        refCast<const CLASS>(ptf);
+
+    fieldData_.rmap(tiptf.fieldData_, addr);
+}
+
+
+template<class Type>
+void Foam::CLASS::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    PARENT::operator==
+    (
+        data_
+      + fieldData_
+      + scalarData_*timeVsData_->value(t())
+    );
+
+    const scalarField& phip =
+        this->patch().template lookupPatchField<surfaceScalarField, scalar>("phi");
+    this->valueFraction() = 1.0 - pos(phip);
+
+    PARENT::updateCoeffs();
+}
+
+
+template<class Type>
+void Foam::CLASS::write
+(
+    Ostream& os
+) const
+{
+    FVPATCHF::write(os);
+    os.writeKeyword("scalarData") << scalarData_ << token::END_STATEMENT << nl;
+    os.writeKeyword("data") << data_ << token::END_STATEMENT << nl;
+    fieldData_.writeEntry("fieldData", os);
+    timeVsData_->writeData(os);
+    os.writeKeyword("wordData") << wordData_ << token::END_STATEMENT << nl;
+    this->writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * Build Macro Function  * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        FVPATCHF,
+        CLASS
+    );
+}
+
+// ************************************************************************* //
diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H
new file mode 100644
index 0000000000..553a6c9183
--- /dev/null
+++ b/etc/codeTemplates/BC/BC.H
@@ -0,0 +1,246 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+Class
+    Foam::CONSTRUCT
+
+Group
+    grpGenericBoundaryConditions
+
+Description
+    This boundary condition provides a NAME condition,
+    calculated as:
+
+        \f[
+            Q = Q_{0} + Q_{p} + s*Q_{t}
+        \f]
+
+    where
+    \vartable
+        s      | single scalar value [units]
+        Q_{0}  | single TYPE value [units]
+        Q_{p}  | TYPE field across patch [units]
+        Q_{t}  | TYPE function of time [units]
+    \endtable
+
+    \heading Patch usage
+
+    \table
+        Property   | Description                  | Req'd? | Default
+        scalarData | single scalar value          | yes    |
+        data       | single TYPE value          | yes    |
+        fieldData  | TYPE field across patch    | yes    |
+        timeVsData | TYPE function of time      | yes    |
+        wordData   | word, eg name of data object | no     | wordDefault
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    myPatch
+    {
+        type       NAME;
+        scalarData -1;
+        data       ONE;
+        fieldData  uniform THREE;
+        timeVsData table (
+                             (0 ZERO)
+                             (1 TWO)
+                          );
+        wordName   anotherName;
+        value      uniform FOUR; // optional initial value
+    }
+    \endverbatim
+
+SourceFiles
+    CONSTRUCT.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CONSTRUCT_H
+#define CONSTRUCT_H
+
+#include "BASEFvPatchFields.H"
+#include "DataEntry.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+     Class CONSTRUCT Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class CONSTRUCT
+:
+    public PARENT
+{
+    // Private data
+
+        //- Single valued scalar quantity, e.g. a coefficient
+        scalar scalarData_;
+
+        //- Single valued Type quantity, e.g. reference pressure pRefValue_
+        //  Other options include vector, tensor
+        TYPE data_;
+
+        //- Field of Types, typically defined across patch faces
+        //  e.g. total pressure p0_.  Other options include vectorField
+        FIELD fieldData_;
+
+        //- Type specified as a function of time for time-varying BCs
+        autoPtr<DataEntry<TYPE> > timeVsData_;
+
+        //- Word entry, e.g. pName_ for name of the pressure field on database
+        word wordData_;
+
+        //- Label, e.g. patch index, current time index
+        label labelData_;
+
+        //- Boolean for true/false, e.g. specify if flow rate is volumetric_
+        bool boolData_;
+
+
+    // Private Member Functions
+
+        //- Return current time
+        scalar t() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("NAME");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        CONSTRUCT
+        (
+            const fvPatch&,
+            const DimensionedField<TYPE, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        CONSTRUCT
+        (
+            const fvPatch&,
+            const DimensionedField<TYPE, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given BASETypeFvPatchField
+        //  onto a new patch
+        CONSTRUCT
+        (
+            const CLASS&,
+            const fvPatch&,
+            const DimensionedField<TYPE, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        CONSTRUCT
+        (
+            const CLASS&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<FVPATCHF> clone() const
+        {
+            return tmp<FVPATCHF>
+            (
+                new CLASS(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        CONSTRUCT
+        (
+            const CLASS&,
+            const DimensionedField<TYPE, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<FVPATCHF> clone
+        (
+            const DimensionedField<TYPE, volMesh>& iF
+        ) const
+        {
+            return tmp<FVPATCHF>
+            (
+                new CLASS
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const fvPatchFieldMapper&
+            );
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const FVPATCHF&,
+                const labelList&
+            );
+
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "CONSTRUCT.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/etc/codeTemplates/BC/BCs.C b/etc/codeTemplates/BC/BCs.C
new file mode 100644
index 0000000000..09efcccb66
--- /dev/null
+++ b/etc/codeTemplates/BC/BCs.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "CONSTRUCTs.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePatchFields(NAME);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/etc/codeTemplates/BC/BCs.H b/etc/codeTemplates/BC/BCs.H
new file mode 100644
index 0000000000..fee1a95c9f
--- /dev/null
+++ b/etc/codeTemplates/BC/BCs.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CONSTRUCTs_H
+#define CONSTRUCTs_H
+
+#include "CONSTRUCT.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeFieldTypedefs(NAME);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/etc/codeTemplates/BC/BCsFwd.H b/etc/codeTemplates/BC/BCsFwd.H
new file mode 100644
index 0000000000..366deb6009
--- /dev/null
+++ b/etc/codeTemplates/BC/BCsFwd.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CONSTRUCTsFwd_H
+#define CONSTRUCTsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class CONSTRUCT;
+
+makePatchTypeFieldTypedefs(NAME);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/etc/codeTemplates/BC/Make/files b/etc/codeTemplates/BC/Make/files
new file mode 100644
index 0000000000..bf5c6588a5
--- /dev/null
+++ b/etc/codeTemplates/BC/Make/files
@@ -0,0 +1,3 @@
+COMPILED.C
+
+LIB = $(FOAM_USER_LIBBIN)/libNAME
diff --git a/etc/codeTemplates/BC/Make/options b/etc/codeTemplates/BC/Make/options
new file mode 100644
index 0000000000..a3ae8da833
--- /dev/null
+++ b/etc/codeTemplates/BC/Make/options
@@ -0,0 +1,7 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools

From 17cc8483ef87eb1bcb849923889d6430cdaf1ad3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 5 Dec 2015 16:12:57 +0000
Subject: [PATCH 032/447] saturationModels/Antoine: Corrected dimensions in
 Tsat Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1940

---
 .../saturationModels/Antoine/Antoine.C                        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
index 90f1c989c5..b5b0629df1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
@@ -95,7 +95,9 @@ Foam::saturationModels::Antoine::Tsat
     const volScalarField& p
 ) const
 {
-    return B_/(log(p) - A_) - C_;
+    return
+        B_/(log(p*dimensionedScalar("one", dimless/dimPressure, 1)) - A_)
+      - C_;
 }
 
 

From b52f7571b92ba41c8a810258b79fcbcab4c7ed25 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Mon, 7 Dec 2015 14:15:14 +0000
Subject: [PATCH 033/447] foamNewApp: added execution and clock times to
 template

---
 etc/codeTemplates/app/app.C | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/etc/codeTemplates/app/app.C b/etc/codeTemplates/app/app.C
index e143dcdf22..fb4c8ea78e 100644
--- a/etc/codeTemplates/app/app.C
+++ b/etc/codeTemplates/app/app.C
@@ -39,6 +39,10 @@ int main(int argc, char *argv[])
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+    Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+        << nl << endl;
+
     Info<< "\nEnd\n" << endl;
     return 0;
 }

From cc996852a7d1e0ec06f384888004b13285fcd6b9 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Mon, 7 Dec 2015 17:28:40 +0000
Subject: [PATCH 034/447] foamNewApp: corrected template case

---
 etc/codeTemplates/app/Make/options | 2 +-
 etc/codeTemplates/app/app.C        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/etc/codeTemplates/app/Make/options b/etc/codeTemplates/app/Make/options
index a3ae8da833..d27c95d033 100644
--- a/etc/codeTemplates/app/Make/options
+++ b/etc/codeTemplates/app/Make/options
@@ -2,6 +2,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
-LIB_LIBS = \
+EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools
diff --git a/etc/codeTemplates/app/app.C b/etc/codeTemplates/app/app.C
index fb4c8ea78e..911ba7c7de 100644
--- a/etc/codeTemplates/app/app.C
+++ b/etc/codeTemplates/app/app.C
@@ -43,7 +43,8 @@ int main(int argc, char *argv[])
         << "  ClockTime = " << runTime.elapsedClockTime() << " s"
         << nl << endl;
 
-    Info<< "\nEnd\n" << endl;
+    Info<< "End\n" << endl;
+
     return 0;
 }
 

From ce7b33b77ebd5bdd30f9acf4b7b8aaa9c1b2e603 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 7 Dec 2015 22:38:33 +0000
Subject: [PATCH 035/447] fvcAverage: Removed temporary Info statement

---
 src/finiteVolume/finiteVolume/fvc/fvcAverage.C | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
index c9b1052b8a..c6daac12d2 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
@@ -47,8 +47,6 @@ average
     const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
 )
 {
-    Info<< "average" << endl;
-
     const fvMesh& mesh = ssf.mesh();
 
     tmp<GeometricField<Type, fvPatchField, volMesh> > taverage

From f89d44292e9214be77ec2b660d21bd1a89a1f9f1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 8 Dec 2015 11:57:37 +0000
Subject: [PATCH 036/447] fanFvPatchField,
 freestreamPressureFvPatchScalarField: added write function Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=1942

---
 .../derived/fan/fanFvPatchField.C             | 53 +++++++++++++------
 .../derived/fan/fanFvPatchField.H             |  3 ++
 .../derived/fan/fanFvPatchFields.C            |  2 +-
 .../freestreamPressureFvPatchScalarField.C    | 14 ++++-
 .../freestreamPressureFvPatchScalarField.H    |  4 ++
 .../syringePressureFvPatchScalarField.C       |  1 +
 6 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
index 6885bd7d4d..3f855d52fa 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,23 @@ Foam::fanFvPatchField<Type>::fanFvPatchField
     const DimensionedField<Type, volMesh>& iF
 )
 :
-    uniformJumpFvPatchField<Type>(p, iF)
+    uniformJumpFvPatchField<Type>(p, iF),
+    phiName_("phi"),
+    rhoName_("rho")
+{}
+
+
+template<class Type>
+Foam::fanFvPatchField<Type>::fanFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    uniformJumpFvPatchField<Type>(p, iF, dict),
+    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
 {}
 
 
@@ -59,19 +75,9 @@ Foam::fanFvPatchField<Type>::fanFvPatchField
     const fvPatchFieldMapper& mapper
 )
 :
-    uniformJumpFvPatchField<Type>(ptf, p, iF, mapper)
-{}
-
-
-template<class Type>
-Foam::fanFvPatchField<Type>::fanFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    uniformJumpFvPatchField<Type>(p, iF, dict)
+    uniformJumpFvPatchField<Type>(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_)
 {}
 
 
@@ -81,7 +87,9 @@ Foam::fanFvPatchField<Type>::fanFvPatchField
     const fanFvPatchField<Type>& ptf
 )
 :
-    uniformJumpFvPatchField<Type>(ptf)
+    uniformJumpFvPatchField<Type>(ptf),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_)
 {}
 
 
@@ -92,7 +100,9 @@ Foam::fanFvPatchField<Type>::fanFvPatchField
     const DimensionedField<Type, volMesh>& iF
 )
 :
-    uniformJumpFvPatchField<Type>(ptf, iF)
+    uniformJumpFvPatchField<Type>(ptf, iF),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_)
 {}
 
 
@@ -113,4 +123,13 @@ void Foam::fanFvPatchField<Type>::updateCoeffs()
 }
 
 
+template<class Type>
+void Foam::fanFvPatchField<Type>::write(Ostream& os) const
+{
+    uniformJumpFvPatchField<Type>::write(os);
+    this->template writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+    this->template writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+}
+
+
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
index fd27dfecd3..2ad75b1da6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
@@ -187,6 +187,9 @@ public:
 
         //- Update the coefficients associated with the patch field
         virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
index ea9ecdea57..81adcbf2b8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
@@ -78,7 +78,7 @@ Foam::fanFvPatchField<Foam::scalar>::fanFvPatchField
 :
     uniformJumpFvPatchField<scalar>(p, iF),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "none"))
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
 {
     if (this->cyclicPatch().owner())
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
index b50eac91b8..a32d667709 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
@@ -42,7 +42,7 @@ freestreamPressureFvPatchScalarField
     zeroGradientFvPatchScalarField(p, iF),
     UName_("U"),
     phiName_("phi"),
-    rhoName_("none")
+    rhoName_("rho")
 {}
 
 
@@ -57,7 +57,7 @@ freestreamPressureFvPatchScalarField
     zeroGradientFvPatchScalarField(p, iF, dict),
     UName_(dict.lookupOrDefault<word>("U", "U")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "none"))
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
 {}
 
 
@@ -153,6 +153,16 @@ void Foam::freestreamPressureFvPatchScalarField::updateCoeffs()
 }
 
 
+void Foam::freestreamPressureFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchScalarField::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntry("value", os);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H
index 4d8c5d1807..49687b0ec9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H
@@ -167,6 +167,10 @@ public:
 
             //- Update the coefficients associated with the patch field
             virtual void updateCoeffs();
+
+
+        //- Write
+        virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index 20690258a3..3407e259ab 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
@@ -243,6 +243,7 @@ void Foam::syringePressureFvPatchScalarField::write(Ostream& os) const
     os.writeKeyword("psI") << psI_ << token::END_STATEMENT << nl;
     os.writeKeyword("psi") << psi_ << token::END_STATEMENT << nl;
     os.writeKeyword("ams") << ams_ << token::END_STATEMENT << nl;
+    writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
 
     writeEntry("value", os);
 }

From 4aa6052a660b320d776e113ad0f10ff141a58a74 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 8 Dec 2015 14:24:12 +0000
Subject: [PATCH 037/447] uniformInletOutletFvPatchField: Update refValue in
 updateCoeffs Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1943

---
 .../uniformInletOutletFvPatchField.C          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 54217a529a..9e9809c91f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -55,8 +55,8 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     uniformInletValue_(DataEntry<Type>::New("uniformInletValue", dict))
 {
-    const scalar t = this->db().time().timeOutputValue();
-    this->refValue() = uniformInletValue_->value(t);
+    this->refValue() =
+        uniformInletValue_->value(this->db().time().timeOutputValue());
 
     if (dict.found("value"))
     {
@@ -91,8 +91,8 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
     this->patchType() = ptf.patchType();
 
     // Evaluate refValue since not mapped
-    const scalar t = this->db().time().timeOutputValue();
-    this->refValue() = uniformInletValue_->value(t);
+    this->refValue() =
+        uniformInletValue_->value(this->db().time().timeOutputValue());
 
     this->refGrad() = pTraits<Type>::zero;
     this->valueFraction() = 0.0;
@@ -139,6 +139,9 @@ void Foam::uniformInletOutletFvPatchField<Type>::updateCoeffs()
         return;
     }
 
+    this->refValue() =
+        uniformInletValue_->value(this->db().time().timeOutputValue());
+
     const Field<scalar>& phip =
         this->patch().template lookupPatchField<surfaceScalarField, scalar>
         (
@@ -175,8 +178,8 @@ void Foam::uniformInletOutletFvPatchField<Type>::autoMap
     mixedFvPatchField<Type>::autoMap(m);
 
     // Override
-    const scalar t = this->db().time().timeOutputValue();
-    this->refValue() = uniformInletValue_->value(t);
+    this->refValue() =
+        uniformInletValue_->value(this->db().time().timeOutputValue());
 }
 
 
@@ -190,8 +193,8 @@ void Foam::uniformInletOutletFvPatchField<Type>::rmap
     mixedFvPatchField<Type>::rmap(ptf, addr);
 
     // Override
-    const scalar t = this->db().time().timeOutputValue();
-    this->refValue() = uniformInletValue_->value(t);
+    this->refValue() =
+        uniformInletValue_->value(this->db().time().timeOutputValue());
 }
 
 

From fb871828a57c121742aa304e0dacbb1caee64575 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 8 Dec 2015 22:29:05 +0000
Subject: [PATCH 038/447] fvPatchFields, fvsPatchFields, pointPatchFields:
 specifically declare namespace of functions

It is better to declare the namespace of each function in the C file
rather than "open" the namespace as this may lead to inconsistencies
between the declaration in the H files and definition in the C file.
---
 .../mixedFixedValueSlipFvPatchField.C         | 72 +++++++---------
 .../calculated/calculatedPointPatchField.C    | 23 ++---
 .../basic/coupled/coupledPointPatchField.C    | 19 ++---
 .../fixedValue/fixedValuePointPatchField.C    | 19 ++---
 .../zeroGradientPointPatchField.C             | 19 ++---
 .../constraint/empty/emptyPointPatchField.C   | 17 +---
 .../processor/processorPointPatchField.C      | 21 ++---
 .../symmetry/symmetryPointPatchField.C        | 17 +---
 .../symmetryPlanePointPatchField.C            | 17 +---
 .../derived/slip/slipPointPatchField.C        | 19 ++---
 .../uniformFixedValuePointPatchField.C        | 25 ++----
 .../pointPatchField/pointPatchField.C         | 42 ++++-----
 .../kqRWallFunctionFvPatchField.C             | 51 +++++------
 .../fixedGradient/fixedGradientFvPatchField.C | 69 +++++++--------
 .../basic/fixedValue/fixedValueFvPatchField.C | 33 +++----
 .../basic/mixed/mixedFvPatchField.C           | 74 ++++++++--------
 .../basic/sliced/slicedFvPatchField.C         | 85 ++++++++++---------
 .../zeroGradient/zeroGradientFvPatchField.C   | 59 ++++++-------
 .../constraint/cyclic/cyclicFvPatchField.C    | 78 ++++++++---------
 .../nonuniformTransformCyclicFvPatchField.C   | 45 ++++------
 .../symmetry/symmetryFvPatchField.C           | 63 ++++++--------
 .../freestream/freestreamFvPatchField.C       | 47 +++++-----
 .../mappedField/mappedFieldFvPatchField.C     | 54 +++++-------
 .../mappedFixedValueFvPatchField.C            | 49 +++++------
 .../oscillatingFixedValueFvPatchField.C       | 63 ++++++--------
 .../derived/slip/slipFvPatchField.C           | 43 ++++------
 .../timeVaryingMappedFixedValueFvPatchField.C | 32 +++----
 .../turbulentInletFvPatchField.C              | 63 ++++++--------
 .../calculated/calculatedFvsPatchField.C      | 49 +++++------
 .../basic/coupled/coupledFvsPatchField.C      | 45 ++++------
 .../fixedValue/fixedValueFvsPatchField.C      | 55 ++++++------
 .../basic/sliced/slicedFvsPatchField.C        | 56 ++++++------
 .../constraint/cyclic/cyclicFvsPatchField.C   | 63 ++++++--------
 .../cyclicSlip/cyclicSlipFvsPatchField.C      | 43 ++++------
 .../constraint/empty/emptyFvsPatchField.C     | 61 ++++++-------
 .../nonuniformTransformCyclicFvsPatchField.C  | 45 ++++------
 .../processor/processorFvsPatchField.C        | 68 +++++++--------
 .../processorCyclicFvsPatchField.C            | 68 +++++++--------
 .../symmetry/symmetryFvsPatchField.C          | 61 ++++++-------
 .../symmetryPlaneFvsPatchField.C              | 61 ++++++-------
 .../constraint/wedge/wedgeFvsPatchField.C     | 61 ++++++-------
 .../fvsPatchField/fvsPatchField.C             | 75 +++++++---------
 .../genericPointPatchField.C                  | 23 ++---
 .../zeroFixedValuePointPatchField.C           | 21 ++---
 44 files changed, 857 insertions(+), 1216 deletions(-)

diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
index 5c1459381f..18155d5bca 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,15 +26,10 @@ License
 #include "mixedFixedValueSlipFvPatchField.H"
 #include "symmTransformField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
+Foam::mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -47,7 +42,21 @@ mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
 
 
 template<class Type>
-mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
+Foam::mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    transformFvPatchField<Type>(p, iF),
+    refValue_("refValue", dict, p.size()),
+    valueFraction_("valueFraction", dict, p.size())
+{}
+
+
+template<class Type>
+Foam::mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
 (
     const mixedFixedValueSlipFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -62,21 +71,7 @@ mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
 
 
 template<class Type>
-mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    transformFvPatchField<Type>(p, iF),
-    refValue_("refValue", dict, p.size()),
-    valueFraction_("valueFraction", dict, p.size())
-{}
-
-
-template<class Type>
-mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
+Foam::mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
 (
     const mixedFixedValueSlipFvPatchField<Type>& ptf
 )
@@ -86,8 +81,9 @@ mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
     valueFraction_(ptf.valueFraction_)
 {}
 
+
 template<class Type>
-mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
+Foam::mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
 (
     const mixedFixedValueSlipFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -101,9 +97,8 @@ mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Map from self
 template<class Type>
-void mixedFixedValueSlipFvPatchField<Type>::autoMap
+void Foam::mixedFixedValueSlipFvPatchField<Type>::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -114,9 +109,8 @@ void mixedFixedValueSlipFvPatchField<Type>::autoMap
 }
 
 
-// Reverse-map the given fvPatchField onto this fvPatchField
 template<class Type>
-void mixedFixedValueSlipFvPatchField<Type>::rmap
+void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap
 (
     const fvPatchField<Type>& ptf,
     const labelList& addr
@@ -132,9 +126,9 @@ void mixedFixedValueSlipFvPatchField<Type>::rmap
 }
 
 
-// Return gradient at boundary
 template<class Type>
-tmp<Field<Type> > mixedFixedValueSlipFvPatchField<Type>::snGrad() const
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFixedValueSlipFvPatchField<Type>::snGrad() const
 {
     tmp<vectorField> nHat = this->patch().nf();
     Field<Type> pif(this->patchInternalField());
@@ -147,9 +141,11 @@ tmp<Field<Type> > mixedFixedValueSlipFvPatchField<Type>::snGrad() const
 }
 
 
-// Evaluate the field on the patch
 template<class Type>
-void mixedFixedValueSlipFvPatchField<Type>::evaluate(const Pstream::commsTypes)
+void Foam::mixedFixedValueSlipFvPatchField<Type>::evaluate
+(
+    const Pstream::commsTypes
+)
 {
     if (!this->updated())
     {
@@ -170,10 +166,9 @@ void mixedFixedValueSlipFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 }
 
 
-// Return defining fields
 template<class Type>
-tmp<Field<Type> >
-mixedFixedValueSlipFvPatchField<Type>::snGradTransformDiag() const
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFixedValueSlipFvPatchField<Type>::snGradTransformDiag() const
 {
     vectorField nHat(this->patch().nf());
     vectorField diag(nHat.size());
@@ -189,9 +184,8 @@ mixedFixedValueSlipFvPatchField<Type>::snGradTransformDiag() const
 }
 
 
-// Write
 template<class Type>
-void mixedFixedValueSlipFvPatchField<Type>::write(Ostream& os) const
+void Foam::mixedFixedValueSlipFvPatchField<Type>::write(Ostream& os) const
 {
     transformFvPatchField<Type>::write(os);
     refValue_.writeEntry("refValue", os);
@@ -199,8 +193,4 @@ void mixedFixedValueSlipFvPatchField<Type>::write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
index 45f98495db..74846139eb 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,11 +27,8 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
 template<class Type>
-const word& pointPatchField<Type>::calculatedType()
+const Foam::word& Foam::pointPatchField<Type>::calculatedType()
 {
     return calculatedPointPatchField<Type>::typeName;
 }
@@ -40,7 +37,7 @@ const word& pointPatchField<Type>::calculatedType()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-calculatedPointPatchField<Type>::calculatedPointPatchField
+Foam::calculatedPointPatchField<Type>::calculatedPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
@@ -51,7 +48,7 @@ calculatedPointPatchField<Type>::calculatedPointPatchField
 
 
 template<class Type>
-calculatedPointPatchField<Type>::calculatedPointPatchField
+Foam::calculatedPointPatchField<Type>::calculatedPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -63,7 +60,7 @@ calculatedPointPatchField<Type>::calculatedPointPatchField
 
 
 template<class Type>
-calculatedPointPatchField<Type>::calculatedPointPatchField
+Foam::calculatedPointPatchField<Type>::calculatedPointPatchField
 (
     const calculatedPointPatchField<Type>& ptf,
     const pointPatch& p,
@@ -76,7 +73,7 @@ calculatedPointPatchField<Type>::calculatedPointPatchField
 
 
 template<class Type>
-calculatedPointPatchField<Type>::calculatedPointPatchField
+Foam::calculatedPointPatchField<Type>::calculatedPointPatchField
 (
     const calculatedPointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -88,8 +85,8 @@ calculatedPointPatchField<Type>::calculatedPointPatchField
 
 template<class Type>
 template<class Type2>
-autoPtr<pointPatchField<Type> >
-pointPatchField<Type>::NewCalculatedType
+Foam::autoPtr<Foam::pointPatchField<Type> >
+Foam::pointPatchField<Type>::NewCalculatedType
 (
     const pointPatchField<Type2>& pf
 )
@@ -122,8 +119,4 @@ pointPatchField<Type>::NewCalculatedType
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C
index 434b6873f4..635f9b665e 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "coupledPointPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
 
 template<class Type>
-coupledPointPatchField<Type>::coupledPointPatchField
+Foam::coupledPointPatchField<Type>::coupledPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
@@ -44,7 +39,7 @@ coupledPointPatchField<Type>::coupledPointPatchField
 
 
 template<class Type>
-coupledPointPatchField<Type>::coupledPointPatchField
+Foam::coupledPointPatchField<Type>::coupledPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -56,7 +51,7 @@ coupledPointPatchField<Type>::coupledPointPatchField
 
 
 template<class Type>
-coupledPointPatchField<Type>::coupledPointPatchField
+Foam::coupledPointPatchField<Type>::coupledPointPatchField
 (
     const coupledPointPatchField<Type>& ptf,
     const pointPatch& p,
@@ -69,7 +64,7 @@ coupledPointPatchField<Type>::coupledPointPatchField
 
 
 template<class Type>
-coupledPointPatchField<Type>::coupledPointPatchField
+Foam::coupledPointPatchField<Type>::coupledPointPatchField
 (
     const coupledPointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -79,8 +74,4 @@ coupledPointPatchField<Type>::coupledPointPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
index 19bb6d8af5..2ef21cfdd2 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,15 +26,10 @@ License
 #include "fixedValuePointPatchField.H"
 #include "boolList.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-fixedValuePointPatchField<Type>::fixedValuePointPatchField
+Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
@@ -45,7 +40,7 @@ fixedValuePointPatchField<Type>::fixedValuePointPatchField
 
 
 template<class Type>
-fixedValuePointPatchField<Type>::fixedValuePointPatchField
+Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -58,7 +53,7 @@ fixedValuePointPatchField<Type>::fixedValuePointPatchField
 
 
 template<class Type>
-fixedValuePointPatchField<Type>::fixedValuePointPatchField
+Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
 (
     const fixedValuePointPatchField<Type>& ptf,
     const pointPatch& p,
@@ -71,7 +66,7 @@ fixedValuePointPatchField<Type>::fixedValuePointPatchField
 
 
 template<class Type>
-fixedValuePointPatchField<Type>::fixedValuePointPatchField
+Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
 (
     const fixedValuePointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -81,8 +76,4 @@ fixedValuePointPatchField<Type>::fixedValuePointPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C
index 754ba28d75..9ca14e2ca5 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "zeroGradientPointPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
+Foam::zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
@@ -44,7 +39,7 @@ zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
 
 
 template<class Type>
-zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
+Foam::zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -56,7 +51,7 @@ zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
 
 
 template<class Type>
-zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
+Foam::zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
 (
     const zeroGradientPointPatchField<Type>& ptf,
     const pointPatch& p,
@@ -69,7 +64,7 @@ zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
 
 
 template<class Type>
-zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
+Foam::zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
 (
     const zeroGradientPointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -79,8 +74,4 @@ zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C
index 6435a72c12..8fbbaadd07 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "emptyPointPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-emptyPointPatchField<Type>::emptyPointPatchField
+Foam::emptyPointPatchField<Type>::emptyPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
@@ -44,7 +39,7 @@ emptyPointPatchField<Type>::emptyPointPatchField
 
 
 template<class Type>
-emptyPointPatchField<Type>::emptyPointPatchField
+Foam::emptyPointPatchField<Type>::emptyPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -66,7 +61,7 @@ emptyPointPatchField<Type>::emptyPointPatchField
 
 
 template<class Type>
-emptyPointPatchField<Type>::emptyPointPatchField
+Foam::emptyPointPatchField<Type>::emptyPointPatchField
 (
     const emptyPointPatchField<Type>& ptf,
     const pointPatch& p,
@@ -89,7 +84,7 @@ emptyPointPatchField<Type>::emptyPointPatchField
 
 
 template<class Type>
-emptyPointPatchField<Type>::emptyPointPatchField
+Foam::emptyPointPatchField<Type>::emptyPointPatchField
 (
     const emptyPointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -99,8 +94,4 @@ emptyPointPatchField<Type>::emptyPointPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
index 8a647b6db0..011129adc8 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,15 +26,10 @@ License
 #include "processorPointPatchField.H"
 #include "processorPolyPatch.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
 
 template<class Type>
-processorPointPatchField<Type>::processorPointPatchField
+Foam::processorPointPatchField<Type>::processorPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
@@ -46,7 +41,7 @@ processorPointPatchField<Type>::processorPointPatchField
 
 
 template<class Type>
-processorPointPatchField<Type>::processorPointPatchField
+Foam::processorPointPatchField<Type>::processorPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -59,7 +54,7 @@ processorPointPatchField<Type>::processorPointPatchField
 
 
 template<class Type>
-processorPointPatchField<Type>::processorPointPatchField
+Foam::processorPointPatchField<Type>::processorPointPatchField
 (
     const processorPointPatchField<Type>& ptf,
     const pointPatch& p,
@@ -73,7 +68,7 @@ processorPointPatchField<Type>::processorPointPatchField
 
 
 template<class Type>
-processorPointPatchField<Type>::processorPointPatchField
+Foam::processorPointPatchField<Type>::processorPointPatchField
 (
     const processorPointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -87,12 +82,8 @@ processorPointPatchField<Type>::processorPointPatchField
 // * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
 
 template<class Type>
-processorPointPatchField<Type>::~processorPointPatchField()
+Foam::processorPointPatchField<Type>::~processorPointPatchField()
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C
index 4e11109261..250b438ff9 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "symmetryPointPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-symmetryPointPatchField<Type>::symmetryPointPatchField
+Foam::symmetryPointPatchField<Type>::symmetryPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
@@ -44,7 +39,7 @@ symmetryPointPatchField<Type>::symmetryPointPatchField
 
 
 template<class Type>
-symmetryPointPatchField<Type>::symmetryPointPatchField
+Foam::symmetryPointPatchField<Type>::symmetryPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -66,7 +61,7 @@ symmetryPointPatchField<Type>::symmetryPointPatchField
 
 
 template<class Type>
-symmetryPointPatchField<Type>::symmetryPointPatchField
+Foam::symmetryPointPatchField<Type>::symmetryPointPatchField
 (
     const symmetryPointPatchField<Type>& ptf,
     const pointPatch& p,
@@ -89,7 +84,7 @@ symmetryPointPatchField<Type>::symmetryPointPatchField
 
 
 template<class Type>
-symmetryPointPatchField<Type>::symmetryPointPatchField
+Foam::symmetryPointPatchField<Type>::symmetryPointPatchField
 (
     const symmetryPointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -99,8 +94,4 @@ symmetryPointPatchField<Type>::symmetryPointPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
index c988248e2e..c402bad230 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "symmetryPlanePointPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
+Foam::symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
@@ -45,7 +40,7 @@ symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
 
 
 template<class Type>
-symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
+Foam::symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -68,7 +63,7 @@ symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
 
 
 template<class Type>
-symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
+Foam::symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
 (
     const symmetryPlanePointPatchField<Type>& ptf,
     const pointPatch& p,
@@ -92,7 +87,7 @@ symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
 
 
 template<class Type>
-symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
+Foam::symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
 (
     const symmetryPlanePointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -128,8 +123,4 @@ void Foam::symmetryPlanePointPatchField<Type>::evaluate
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C
index 62f95b4eb5..902e73f6f7 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "slipPointPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-slipPointPatchField<Type>::slipPointPatchField
+Foam::slipPointPatchField<Type>::slipPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
@@ -44,7 +39,7 @@ slipPointPatchField<Type>::slipPointPatchField
 
 
 template<class Type>
-slipPointPatchField<Type>::slipPointPatchField
+Foam::slipPointPatchField<Type>::slipPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -56,7 +51,7 @@ slipPointPatchField<Type>::slipPointPatchField
 
 
 template<class Type>
-slipPointPatchField<Type>::slipPointPatchField
+Foam::slipPointPatchField<Type>::slipPointPatchField
 (
     const slipPointPatchField<Type>& ptf,
     const pointPatch& p,
@@ -69,7 +64,7 @@ slipPointPatchField<Type>::slipPointPatchField
 
 
 template<class Type>
-slipPointPatchField<Type>::slipPointPatchField
+Foam::slipPointPatchField<Type>::slipPointPatchField
 (
     const slipPointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -79,8 +74,4 @@ slipPointPatchField<Type>::slipPointPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
index 0b626d888c..ae42db3989 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "uniformFixedValuePointPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
 
 template<class Type>
-uniformFixedValuePointPatchField<Type>::
+Foam::uniformFixedValuePointPatchField<Type>::
 uniformFixedValuePointPatchField
 (
     const pointPatch& p,
@@ -46,7 +41,7 @@ uniformFixedValuePointPatchField
 
 
 template<class Type>
-uniformFixedValuePointPatchField<Type>::
+Foam::uniformFixedValuePointPatchField<Type>::
 uniformFixedValuePointPatchField
 (
     const pointPatch& p,
@@ -73,7 +68,7 @@ uniformFixedValuePointPatchField
 
 
 template<class Type>
-uniformFixedValuePointPatchField<Type>::
+Foam::uniformFixedValuePointPatchField<Type>::
 uniformFixedValuePointPatchField
 (
     const uniformFixedValuePointPatchField<Type>& ptf,
@@ -92,7 +87,7 @@ uniformFixedValuePointPatchField
 
 
 template<class Type>
-uniformFixedValuePointPatchField<Type>::
+Foam::uniformFixedValuePointPatchField<Type>::
 uniformFixedValuePointPatchField
 (
     const uniformFixedValuePointPatchField<Type>& ptf
@@ -104,7 +99,7 @@ uniformFixedValuePointPatchField
 
 
 template<class Type>
-uniformFixedValuePointPatchField<Type>::
+Foam::uniformFixedValuePointPatchField<Type>::
 uniformFixedValuePointPatchField
 (
     const uniformFixedValuePointPatchField<Type>& ptf,
@@ -123,7 +118,7 @@ uniformFixedValuePointPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void uniformFixedValuePointPatchField<Type>::updateCoeffs()
+void Foam::uniformFixedValuePointPatchField<Type>::updateCoeffs()
 {
     if (this->updated())
     {
@@ -138,7 +133,7 @@ void uniformFixedValuePointPatchField<Type>::updateCoeffs()
 
 
 template<class Type>
-void uniformFixedValuePointPatchField<Type>::
+void Foam::uniformFixedValuePointPatchField<Type>::
 write(Ostream& os) const
 {
     // Note: write value
@@ -147,8 +142,4 @@ write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index 64daf799fd..92c62d0703 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -27,15 +27,10 @@ License
 #include "pointMesh.H"
 #include "dictionary.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-pointPatchField<Type>::pointPatchField
+Foam::pointPatchField<Type>::pointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
@@ -49,7 +44,7 @@ pointPatchField<Type>::pointPatchField
 
 
 template<class Type>
-pointPatchField<Type>::pointPatchField
+Foam::pointPatchField<Type>::pointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -80,7 +75,7 @@ Foam::pointPatchField<Type>::pointPatchField
 
 
 template<class Type>
-pointPatchField<Type>::pointPatchField
+Foam::pointPatchField<Type>::pointPatchField
 (
     const pointPatchField<Type>& ptf
 )
@@ -93,7 +88,7 @@ pointPatchField<Type>::pointPatchField
 
 
 template<class Type>
-pointPatchField<Type>::pointPatchField
+Foam::pointPatchField<Type>::pointPatchField
 (
     const pointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -109,14 +104,14 @@ pointPatchField<Type>::pointPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-const objectRegistry& pointPatchField<Type>::db() const
+const Foam::objectRegistry& Foam::pointPatchField<Type>::db() const
 {
     return patch_.boundaryMesh().mesh()();
 }
 
 
 template<class Type>
-void pointPatchField<Type>::write(Ostream& os) const
+void Foam::pointPatchField<Type>::write(Ostream& os) const
 {
     os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
 
@@ -129,7 +124,8 @@ void pointPatchField<Type>::write(Ostream& os) const
 
 
 template<class Type>
-tmp<Field<Type> > pointPatchField<Type>::patchInternalField() const
+Foam::tmp<Foam::Field<Type> >
+Foam::pointPatchField<Type>::patchInternalField() const
 {
     return patchInternalField(internalField());
 }
@@ -137,7 +133,8 @@ tmp<Field<Type> > pointPatchField<Type>::patchInternalField() const
 
 template<class Type>
 template<class Type1>
-tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
+Foam::tmp<Foam::Field<Type1> >
+Foam::pointPatchField<Type>::patchInternalField
 (
     const Field<Type1>& iF,
     const labelList& meshPoints
@@ -159,7 +156,8 @@ tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
 
 template<class Type>
 template<class Type1>
-tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
+Foam::tmp<Foam::Field<Type1> >
+Foam::pointPatchField<Type>::patchInternalField
 (
     const Field<Type1>& iF
 ) const
@@ -170,7 +168,7 @@ tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
 
 template<class Type>
 template<class Type1>
-void pointPatchField<Type>::addToInternalField
+void Foam::pointPatchField<Type>::addToInternalField
 (
     Field<Type1>& iF,
     const Field<Type1>& pF
@@ -207,7 +205,7 @@ void pointPatchField<Type>::addToInternalField
 
 template<class Type>
 template<class Type1>
-void pointPatchField<Type>::addToInternalField
+void Foam::pointPatchField<Type>::addToInternalField
 (
     Field<Type1>& iF,
     const Field<Type1>& pF,
@@ -246,7 +244,7 @@ void pointPatchField<Type>::addToInternalField
 
 template<class Type>
 template<class Type1>
-void pointPatchField<Type>::setInInternalField
+void Foam::pointPatchField<Type>::setInInternalField
 (
     Field<Type1>& iF,
     const Field<Type1>& pF,
@@ -281,7 +279,7 @@ void pointPatchField<Type>::setInInternalField
 
 template<class Type>
 template<class Type1>
-void pointPatchField<Type>::setInInternalField
+void Foam::pointPatchField<Type>::setInInternalField
 (
     Field<Type1>& iF,
     const Field<Type1>& pF
@@ -292,7 +290,7 @@ void pointPatchField<Type>::setInInternalField
 
 
 template<class Type>
-void pointPatchField<Type>::evaluate(const Pstream::commsTypes)
+void Foam::pointPatchField<Type>::evaluate(const Pstream::commsTypes)
 {
     if (!updated_)
     {
@@ -306,7 +304,7 @@ void pointPatchField<Type>::evaluate(const Pstream::commsTypes)
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class Type>
-Ostream& operator<<
+Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
     const pointPatchField<Type>& ptf
@@ -320,10 +318,6 @@ Ostream& operator<<
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "pointPatchFieldNew.C"
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
index 6afabdcc6c..4ecd27f1d6 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
@@ -28,15 +28,10 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "wallFvPatch.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void kqRWallFunctionFvPatchField<Type>::checkType()
+void Foam::kqRWallFunctionFvPatchField<Type>::checkType()
 {
     if (!isA<wallFvPatch>(this->patch()))
     {
@@ -54,7 +49,7 @@ void kqRWallFunctionFvPatchField<Type>::checkType()
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+Foam::kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -67,7 +62,21 @@ kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 
 
 template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+Foam::kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    zeroGradientFvPatchField<Type>(p, iF, dict)
+{
+    checkType();
+}
+
+
+template<class Type>
+Foam::kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
     const kqRWallFunctionFvPatchField& ptf,
     const fvPatch& p,
@@ -82,21 +91,7 @@ kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 
 
 template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    zeroGradientFvPatchField<Type>(p, iF, dict)
-{
-    checkType();
-}
-
-
-template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+Foam::kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
     const kqRWallFunctionFvPatchField& tkqrwfpf
 )
@@ -108,7 +103,7 @@ kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 
 
 template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+Foam::kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
     const kqRWallFunctionFvPatchField& tkqrwfpf,
     const DimensionedField<Type, volMesh>& iF
@@ -123,7 +118,7 @@ kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void kqRWallFunctionFvPatchField<Type>::evaluate
+void Foam::kqRWallFunctionFvPatchField<Type>::evaluate
 (
     const Pstream::commsTypes commsType
 )
@@ -133,15 +128,11 @@ void kqRWallFunctionFvPatchField<Type>::evaluate
 
 
 template<class Type>
-void kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
+void Foam::kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
 {
     zeroGradientFvPatchField<Type>::write(os);
     this->writeEntry("value", os);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
index 112ddb42f4..2165282197 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
@@ -26,15 +26,10 @@ License
 #include "fixedGradientFvPatchField.H"
 #include "dictionary.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
+Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -46,7 +41,22 @@ fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
 
 
 template<class Type>
-fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
+Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvPatchField<Type>(p, iF, dict),
+    gradient_("gradient", dict, p.size())
+{
+    evaluate();
+}
+
+
+template<class Type>
+Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
 (
     const fixedGradientFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -70,22 +80,7 @@ fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
 
 
 template<class Type>
-fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvPatchField<Type>(p, iF, dict),
-    gradient_("gradient", dict, p.size())
-{
-    evaluate();
-}
-
-
-template<class Type>
-fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
+Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
 (
     const fixedGradientFvPatchField<Type>& ptf
 )
@@ -96,7 +91,7 @@ fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
 
 
 template<class Type>
-fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
+Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
 (
     const fixedGradientFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -110,7 +105,7 @@ fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void fixedGradientFvPatchField<Type>::autoMap
+void Foam::fixedGradientFvPatchField<Type>::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -121,7 +116,7 @@ void fixedGradientFvPatchField<Type>::autoMap
 
 
 template<class Type>
-void fixedGradientFvPatchField<Type>::rmap
+void Foam::fixedGradientFvPatchField<Type>::rmap
 (
     const fvPatchField<Type>& ptf,
     const labelList& addr
@@ -137,7 +132,7 @@ void fixedGradientFvPatchField<Type>::rmap
 
 
 template<class Type>
-void fixedGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
+void Foam::fixedGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 {
     if (!this->updated())
     {
@@ -154,7 +149,8 @@ void fixedGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-tmp<Field<Type> > fixedGradientFvPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedGradientFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -164,7 +160,8 @@ tmp<Field<Type> > fixedGradientFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > fixedGradientFvPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedGradientFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -174,8 +171,8 @@ tmp<Field<Type> > fixedGradientFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > fixedGradientFvPatchField<Type>::
-gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedGradientFvPatchField<Type>::gradientInternalCoeffs() const
 {
     return tmp<Field<Type> >
     (
@@ -185,23 +182,19 @@ gradientInternalCoeffs() const
 
 
 template<class Type>
-tmp<Field<Type> > fixedGradientFvPatchField<Type>::
-gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedGradientFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return gradient();
 }
 
 
 template<class Type>
-void fixedGradientFvPatchField<Type>::write(Ostream& os) const
+void Foam::fixedGradientFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     gradient_.writeEntry("gradient", os);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
index 6ab4ce6e13..442d1b0fea 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "fixedValueFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-fixedValueFvPatchField<Type>::fixedValueFvPatchField
+Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -44,7 +39,7 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
 
 
 template<class Type>
-fixedValueFvPatchField<Type>::fixedValueFvPatchField
+Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -56,7 +51,7 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
 
 
 template<class Type>
-fixedValueFvPatchField<Type>::fixedValueFvPatchField
+Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
 (
     const fixedValueFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -79,7 +74,7 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
 
 
 template<class Type>
-fixedValueFvPatchField<Type>::fixedValueFvPatchField
+Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
 (
     const fixedValueFvPatchField<Type>& ptf
 )
@@ -89,7 +84,7 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
 
 
 template<class Type>
-fixedValueFvPatchField<Type>::fixedValueFvPatchField
+Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
 (
     const fixedValueFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -102,7 +97,8 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<Field<Type> > fixedValueFvPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -115,7 +111,8 @@ tmp<Field<Type> > fixedValueFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > fixedValueFvPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -125,29 +122,27 @@ tmp<Field<Type> > fixedValueFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > fixedValueFvPatchField<Type>::gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvPatchField<Type>::gradientInternalCoeffs() const
 {
     return -pTraits<Type>::one*this->patch().deltaCoeffs();
 }
 
 
 template<class Type>
-tmp<Field<Type> > fixedValueFvPatchField<Type>::gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return this->patch().deltaCoeffs()*(*this);
 }
 
 
 template<class Type>
-void fixedValueFvPatchField<Type>::write(Ostream& os) const
+void Foam::fixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     this->writeEntry("value", os);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index 23eef7e24b..fca0149d0c 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "mixedFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-mixedFvPatchField<Type>::mixedFvPatchField
+Foam::mixedFvPatchField<Type>::mixedFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -47,7 +42,24 @@ mixedFvPatchField<Type>::mixedFvPatchField
 
 
 template<class Type>
-mixedFvPatchField<Type>::mixedFvPatchField
+Foam::mixedFvPatchField<Type>::mixedFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvPatchField<Type>(p, iF, dict),
+    refValue_("refValue", dict, p.size()),
+    refGrad_("refGradient", dict, p.size()),
+    valueFraction_("valueFraction", dict, p.size())
+{
+    evaluate();
+}
+
+
+template<class Type>
+Foam::mixedFvPatchField<Type>::mixedFvPatchField
 (
     const mixedFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -73,24 +85,7 @@ mixedFvPatchField<Type>::mixedFvPatchField
 
 
 template<class Type>
-mixedFvPatchField<Type>::mixedFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvPatchField<Type>(p, iF, dict),
-    refValue_("refValue", dict, p.size()),
-    refGrad_("refGradient", dict, p.size()),
-    valueFraction_("valueFraction", dict, p.size())
-{
-    evaluate();
-}
-
-
-template<class Type>
-mixedFvPatchField<Type>::mixedFvPatchField
+Foam::mixedFvPatchField<Type>::mixedFvPatchField
 (
     const mixedFvPatchField<Type>& ptf
 )
@@ -103,7 +98,7 @@ mixedFvPatchField<Type>::mixedFvPatchField
 
 
 template<class Type>
-mixedFvPatchField<Type>::mixedFvPatchField
+Foam::mixedFvPatchField<Type>::mixedFvPatchField
 (
     const mixedFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -119,7 +114,7 @@ mixedFvPatchField<Type>::mixedFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void mixedFvPatchField<Type>::autoMap
+void Foam::mixedFvPatchField<Type>::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -132,7 +127,7 @@ void mixedFvPatchField<Type>::autoMap
 
 
 template<class Type>
-void mixedFvPatchField<Type>::rmap
+void Foam::mixedFvPatchField<Type>::rmap
 (
     const fvPatchField<Type>& ptf,
     const labelList& addr
@@ -150,7 +145,7 @@ void mixedFvPatchField<Type>::rmap
 
 
 template<class Type>
-void mixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
+void Foam::mixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 {
     if (!this->updated())
     {
@@ -173,7 +168,8 @@ void mixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-tmp<Field<Type> > mixedFvPatchField<Type>::snGrad() const
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFvPatchField<Type>::snGrad() const
 {
     return
         valueFraction_
@@ -184,7 +180,8 @@ tmp<Field<Type> > mixedFvPatchField<Type>::snGrad() const
 
 
 template<class Type>
-tmp<Field<Type> > mixedFvPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -195,7 +192,8 @@ tmp<Field<Type> > mixedFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > mixedFvPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -207,14 +205,16 @@ tmp<Field<Type> > mixedFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > mixedFvPatchField<Type>::gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFvPatchField<Type>::gradientInternalCoeffs() const
 {
     return -Type(pTraits<Type>::one)*valueFraction_*this->patch().deltaCoeffs();
 }
 
 
 template<class Type>
-tmp<Field<Type> > mixedFvPatchField<Type>::gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return
         valueFraction_*this->patch().deltaCoeffs()*refValue_
@@ -223,7 +223,7 @@ tmp<Field<Type> > mixedFvPatchField<Type>::gradientBoundaryCoeffs() const
 
 
 template<class Type>
-void mixedFvPatchField<Type>::write(Ostream& os) const
+void Foam::mixedFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     refValue_.writeEntry("refValue", os);
@@ -233,8 +233,4 @@ void mixedFvPatchField<Type>::write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
index 9e581c6e90..9938891051 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "slicedFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -48,7 +43,7 @@ slicedFvPatchField<Type>::slicedFvPatchField
 
 
 template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -59,7 +54,21 @@ slicedFvPatchField<Type>::slicedFvPatchField
 
 
 template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvPatchField<Type>(p, iF, dict)
+{
+    NotImplemented;
+}
+
+
+template<class Type>
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
 (
     const slicedFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -74,21 +83,7 @@ slicedFvPatchField<Type>::slicedFvPatchField
 
 
 template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvPatchField<Type>(p, iF, dict)
-{
-    NotImplemented;
-}
-
-
-template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
 (
     const slicedFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -100,8 +95,10 @@ slicedFvPatchField<Type>::slicedFvPatchField
     UList<Type>::operator=(ptf);
 }
 
+
 template<class Type>
-tmp<fvPatchField<Type> > slicedFvPatchField<Type>::clone() const
+Foam::tmp<Foam::fvPatchField<Type> >
+Foam::slicedFvPatchField<Type>::clone() const
 {
     return tmp<fvPatchField<Type> >
     (
@@ -111,7 +108,7 @@ tmp<fvPatchField<Type> > slicedFvPatchField<Type>::clone() const
 
 
 template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
 (
     const slicedFvPatchField<Type>& ptf
 )
@@ -129,7 +126,8 @@ slicedFvPatchField<Type>::slicedFvPatchField
 
 
 template<class Type>
-tmp<fvPatchField<Type> > slicedFvPatchField<Type>::clone
+Foam::tmp<Foam::fvPatchField<Type> >
+Foam::slicedFvPatchField<Type>::clone
 (
     const DimensionedField<Type, volMesh>& iF
 ) const
@@ -142,7 +140,7 @@ tmp<fvPatchField<Type> > slicedFvPatchField<Type>::clone
 
 
 template<class Type>
-slicedFvPatchField<Type>::~slicedFvPatchField<Type>()
+Foam::slicedFvPatchField<Type>::~slicedFvPatchField()
 {
     // Set the fvPatchField storage pointer to NULL before its destruction
     // to protect the field it a slice of.
@@ -153,7 +151,7 @@ slicedFvPatchField<Type>::~slicedFvPatchField<Type>()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::snGrad() const
+Foam::tmp<Foam::Field<Type> > Foam::slicedFvPatchField<Type>::snGrad() const
 {
     NotImplemented;
 
@@ -162,14 +160,15 @@ tmp<Field<Type> > slicedFvPatchField<Type>::snGrad() const
 
 
 template<class Type>
-void slicedFvPatchField<Type>::updateCoeffs()
+void Foam::slicedFvPatchField<Type>::updateCoeffs()
 {
     NotImplemented;
 }
 
 
 template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::patchInternalField() const
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::patchInternalField() const
 {
     NotImplemented;
 
@@ -178,14 +177,15 @@ tmp<Field<Type> > slicedFvPatchField<Type>::patchInternalField() const
 
 
 template<class Type>
-void slicedFvPatchField<Type>::patchInternalField(Field<Type>&) const
+void Foam::slicedFvPatchField<Type>::patchInternalField(Field<Type>&) const
 {
     NotImplemented;
 }
 
 
 template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::patchNeighbourField
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::patchNeighbourField
 (
     const Field<Type>& iField
 ) const
@@ -197,7 +197,8 @@ tmp<Field<Type> > slicedFvPatchField<Type>::patchNeighbourField
 
 
 template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::patchNeighbourField() const
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::patchNeighbourField() const
 {
     NotImplemented;
 
@@ -206,7 +207,8 @@ tmp<Field<Type> > slicedFvPatchField<Type>::patchNeighbourField() const
 
 
 template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -218,7 +220,8 @@ tmp<Field<Type> > slicedFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -230,7 +233,8 @@ tmp<Field<Type> > slicedFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::gradientInternalCoeffs() const
 {
     NotImplemented;
 
@@ -239,7 +243,8 @@ tmp<Field<Type> > slicedFvPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     NotImplemented;
 
@@ -248,15 +253,11 @@ tmp<Field<Type> > slicedFvPatchField<Type>::gradientBoundaryCoeffs() const
 
 
 template<class Type>
-void slicedFvPatchField<Type>::write(Ostream& os) const
+void Foam::slicedFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     this->writeEntry("value", os);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
index b33e00277b..af57247f24 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,15 +26,10 @@ License
 #include "zeroGradientFvPatchField.H"
 #include "fvPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
+Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -45,20 +40,7 @@ zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
 
 
 template<class Type>
-zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
-(
-    const zeroGradientFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fvPatchField<Type>(ptf, p, iF, mapper)
-{}
-
-
-template<class Type>
-zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
+Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -72,7 +54,20 @@ zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
 
 
 template<class Type>
-zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
+Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
+(
+    const zeroGradientFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
 (
     const zeroGradientFvPatchField& zgpf
 )
@@ -82,7 +77,7 @@ zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
 
 
 template<class Type>
-zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
+Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
 (
     const zeroGradientFvPatchField& zgpf,
     const DimensionedField<Type, volMesh>& iF
@@ -95,7 +90,7 @@ zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void zeroGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
+void Foam::zeroGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 {
     if (!this->updated())
     {
@@ -108,7 +103,8 @@ void zeroGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-tmp<Field<Type> > zeroGradientFvPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::zeroGradientFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -121,7 +117,8 @@ tmp<Field<Type> > zeroGradientFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > zeroGradientFvPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::zeroGradientFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -134,7 +131,8 @@ tmp<Field<Type> > zeroGradientFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > zeroGradientFvPatchField<Type>::gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::zeroGradientFvPatchField<Type>::gradientInternalCoeffs() const
 {
     return tmp<Field<Type> >
     (
@@ -144,7 +142,8 @@ tmp<Field<Type> > zeroGradientFvPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-tmp<Field<Type> > zeroGradientFvPatchField<Type>::gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::zeroGradientFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return tmp<Field<Type> >
     (
@@ -153,8 +152,4 @@ tmp<Field<Type> > zeroGradientFvPatchField<Type>::gradientBoundaryCoeffs() const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 9090ec02bb..2e404f3a4a 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -26,15 +26,10 @@ License
 #include "cyclicFvPatchField.H"
 #include "transformField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-cyclicFvPatchField<Type>::cyclicFvPatchField
+Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -46,31 +41,7 @@ cyclicFvPatchField<Type>::cyclicFvPatchField
 
 
 template<class Type>
-cyclicFvPatchField<Type>::cyclicFvPatchField
-(
-    const cyclicFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    coupledFvPatchField<Type>(ptf, p, iF, mapper),
-    cyclicPatch_(refCast<const cyclicFvPatch>(p))
-{
-    if (!isA<cyclicFvPatch>(this->patch()))
-    {
-        FatalErrorInFunction
-            << "' not constraint type '" << typeName << "'"
-            << "\n    for patch " << p.name()
-            << " of field " << this->dimensionedInternalField().name()
-            << " in file " << this->dimensionedInternalField().objectPath()
-            << exit(FatalIOError);
-    }
-}
-
-
-template<class Type>
-cyclicFvPatchField<Type>::cyclicFvPatchField
+Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -98,7 +69,31 @@ cyclicFvPatchField<Type>::cyclicFvPatchField
 
 
 template<class Type>
-cyclicFvPatchField<Type>::cyclicFvPatchField
+Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
+(
+    const cyclicFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    coupledFvPatchField<Type>(ptf, p, iF, mapper),
+    cyclicPatch_(refCast<const cyclicFvPatch>(p))
+{
+    if (!isA<cyclicFvPatch>(this->patch()))
+    {
+        FatalErrorInFunction
+            << "' not constraint type '" << typeName << "'"
+            << "\n    for patch " << p.name()
+            << " of field " << this->dimensionedInternalField().name()
+            << " in file " << this->dimensionedInternalField().objectPath()
+            << exit(FatalIOError);
+    }
+}
+
+
+template<class Type>
+Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
 (
     const cyclicFvPatchField<Type>& ptf
 )
@@ -110,7 +105,7 @@ cyclicFvPatchField<Type>::cyclicFvPatchField
 
 
 template<class Type>
-cyclicFvPatchField<Type>::cyclicFvPatchField
+Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
 (
     const cyclicFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -124,7 +119,8 @@ cyclicFvPatchField<Type>::cyclicFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<Field<Type> > cyclicFvPatchField<Type>::patchNeighbourField() const
+Foam::tmp<Foam::Field<Type> >
+Foam::cyclicFvPatchField<Type>::patchNeighbourField() const
 {
     const Field<Type>& iField = this->internalField();
     const labelUList& nbrFaceCells =
@@ -157,8 +153,8 @@ tmp<Field<Type> > cyclicFvPatchField<Type>::patchNeighbourField() const
 
 
 template<class Type>
-const cyclicFvPatchField<Type>& cyclicFvPatchField<Type>::neighbourPatchField()
-const
+const Foam::cyclicFvPatchField<Type>&
+Foam::cyclicFvPatchField<Type>::neighbourPatchField() const
 {
     const GeometricField<Type, fvPatchField, volMesh>& fld =
     static_cast<const GeometricField<Type, fvPatchField, volMesh>&>
@@ -174,7 +170,7 @@ const
 
 
 template<class Type>
-void cyclicFvPatchField<Type>::updateInterfaceMatrix
+void Foam::cyclicFvPatchField<Type>::updateInterfaceMatrix
 (
     scalarField& result,
     const scalarField& psiInternal,
@@ -202,7 +198,7 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
 
 
 template<class Type>
-void cyclicFvPatchField<Type>::updateInterfaceMatrix
+void Foam::cyclicFvPatchField<Type>::updateInterfaceMatrix
 (
     Field<Type>& result,
     const Field<Type>& psiInternal,
@@ -229,14 +225,10 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
 
 
 template<class Type>
-void cyclicFvPatchField<Type>::write(Ostream& os) const
+void Foam::cyclicFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C
index 9f828449ad..a8d4712b16 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "nonuniformTransformCyclicFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-nonuniformTransformCyclicFvPatchField<Type>::
+Foam::nonuniformTransformCyclicFvPatchField<Type>::
 nonuniformTransformCyclicFvPatchField
 (
     const fvPatch& p,
@@ -45,7 +40,20 @@ nonuniformTransformCyclicFvPatchField
 
 
 template<class Type>
-nonuniformTransformCyclicFvPatchField<Type>::
+Foam::nonuniformTransformCyclicFvPatchField<Type>::
+nonuniformTransformCyclicFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    cyclicFvPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+Foam::nonuniformTransformCyclicFvPatchField<Type>::
 nonuniformTransformCyclicFvPatchField
 (
     const nonuniformTransformCyclicFvPatchField<Type>& ptf,
@@ -59,20 +67,7 @@ nonuniformTransformCyclicFvPatchField
 
 
 template<class Type>
-nonuniformTransformCyclicFvPatchField<Type>::
-nonuniformTransformCyclicFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    cyclicFvPatchField<Type>(p, iF, dict)
-{}
-
-
-template<class Type>
-nonuniformTransformCyclicFvPatchField<Type>::
+Foam::nonuniformTransformCyclicFvPatchField<Type>::
 nonuniformTransformCyclicFvPatchField
 (
     const nonuniformTransformCyclicFvPatchField<Type>& ptf
@@ -83,7 +78,7 @@ nonuniformTransformCyclicFvPatchField
 
 
 template<class Type>
-nonuniformTransformCyclicFvPatchField<Type>::
+Foam::nonuniformTransformCyclicFvPatchField<Type>::
 nonuniformTransformCyclicFvPatchField
 (
     const nonuniformTransformCyclicFvPatchField<Type>& ptf,
@@ -94,8 +89,4 @@ nonuniformTransformCyclicFvPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
index c6a2dc126a..4f27422ccd 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "symmetryFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-symmetryFvPatchField<Type>::symmetryFvPatchField
+Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -44,30 +39,7 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
 
 
 template<class Type>
-symmetryFvPatchField<Type>::symmetryFvPatchField
-(
-    const symmetryFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    basicSymmetryFvPatchField<Type>(ptf, p, iF, mapper)
-{
-    if (!isType<symmetryFvPatch>(this->patch()))
-    {
-        FatalErrorInFunction
-            << "' not constraint type '" << typeName << "'"
-            << "\n    for patch " << p.name()
-            << " of field " << this->dimensionedInternalField().name()
-            << " in file " << this->dimensionedInternalField().objectPath()
-            << exit(FatalIOError);
-    }
-}
-
-
-template<class Type>
-symmetryFvPatchField<Type>::symmetryFvPatchField
+Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -92,7 +64,30 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
 
 
 template<class Type>
-symmetryFvPatchField<Type>::symmetryFvPatchField
+Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
+(
+    const symmetryFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    basicSymmetryFvPatchField<Type>(ptf, p, iF, mapper)
+{
+    if (!isType<symmetryFvPatch>(this->patch()))
+    {
+        FatalErrorInFunction
+            << "' not constraint type '" << typeName << "'"
+            << "\n    for patch " << p.name()
+            << " of field " << this->dimensionedInternalField().name()
+            << " in file " << this->dimensionedInternalField().objectPath()
+            << exit(FatalIOError);
+    }
+}
+
+
+template<class Type>
+Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
 (
     const symmetryFvPatchField<Type>& ptf
 )
@@ -102,7 +97,7 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
 
 
 template<class Type>
-symmetryFvPatchField<Type>::symmetryFvPatchField
+Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
 (
     const symmetryFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -112,8 +107,4 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
index 00396a7090..99dad9c4d9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "freestreamFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-freestreamFvPatchField<Type>::freestreamFvPatchField
+Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -44,20 +39,7 @@ freestreamFvPatchField<Type>::freestreamFvPatchField
 
 
 template<class Type>
-freestreamFvPatchField<Type>::freestreamFvPatchField
-(
-    const freestreamFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    inletOutletFvPatchField<Type>(ptf, p, iF, mapper)
-{}
-
-
-template<class Type>
-freestreamFvPatchField<Type>::freestreamFvPatchField
+Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -85,7 +67,20 @@ freestreamFvPatchField<Type>::freestreamFvPatchField
 
 
 template<class Type>
-freestreamFvPatchField<Type>::freestreamFvPatchField
+Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
+(
+    const freestreamFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    inletOutletFvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 (
     const freestreamFvPatchField<Type>& ptf
 )
@@ -95,7 +90,7 @@ freestreamFvPatchField<Type>::freestreamFvPatchField
 
 
 template<class Type>
-freestreamFvPatchField<Type>::freestreamFvPatchField
+Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 (
     const freestreamFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -108,7 +103,7 @@ freestreamFvPatchField<Type>::freestreamFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void freestreamFvPatchField<Type>::write(Ostream& os) const
+void Foam::freestreamFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     if (this->phiName_ != "phi")
@@ -121,8 +116,4 @@ void freestreamFvPatchField<Type>::write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
index 5d359bc691..06047dcebd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,19 +24,13 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "mappedFieldFvPatchField.H"
-
 #include "volFields.H"
 #include "interpolationCell.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -49,7 +43,21 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
 
 
 template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<Type>(p, iF, dict),
+    mappedPatchBase(p.patch(), dict),
+    mappedPatchFieldBase<Type>(*this, *this, dict)
+{}
+
+
+template<class Type>
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
 (
     const mappedFieldFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -64,21 +72,7 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
 
 
 template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<Type>(p, iF, dict),
-    mappedPatchBase(p.patch(), dict),
-    mappedPatchFieldBase<Type>(*this, *this, dict)
-{}
-
-
-template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -118,7 +112,7 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
 
 
 template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
 (
     const mappedFieldFvPatchField<Type>& ptf
 )
@@ -130,7 +124,7 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
 
 
 template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
 (
     const mappedFieldFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -145,7 +139,7 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void mappedFieldFvPatchField<Type>::updateCoeffs()
+void Foam::mappedFieldFvPatchField<Type>::updateCoeffs()
 {
     if (this->updated())
     {
@@ -169,7 +163,7 @@ void mappedFieldFvPatchField<Type>::updateCoeffs()
 
 
 template<class Type>
-void mappedFieldFvPatchField<Type>::write(Ostream& os) const
+void Foam::mappedFieldFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     mappedPatchBase::write(os);
@@ -178,8 +172,4 @@ void mappedFieldFvPatchField<Type>::write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
index 0100f09730..a1a80c7342 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
@@ -27,15 +27,10 @@ License
 #include "mappedPatchBase.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
+Foam::mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -47,7 +42,20 @@ mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
 
 
 template<class Type>
-mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
+Foam::mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<Type>(p, iF, dict),
+    mappedPatchFieldBase<Type>(this->mapper(p, iF), *this, dict)
+{}
+
+
+template<class Type>
+Foam::mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
 (
     const mappedFixedValueFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -61,20 +69,7 @@ mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
 
 
 template<class Type>
-mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<Type>(p, iF, dict),
-    mappedPatchFieldBase<Type>(this->mapper(p, iF), *this, dict)
-{}
-
-
-template<class Type>
-mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
+Foam::mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
 (
     const mappedFixedValueFvPatchField<Type>& ptf
 )
@@ -85,7 +80,7 @@ mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
 
 
 template<class Type>
-mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
+Foam::mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
 (
     const mappedFixedValueFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -99,7 +94,7 @@ mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-const mappedPatchBase& mappedFixedValueFvPatchField<Type>::mapper
+const Foam::mappedPatchBase& Foam::mappedFixedValueFvPatchField<Type>::mapper
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -119,7 +114,7 @@ const mappedPatchBase& mappedFixedValueFvPatchField<Type>::mapper
 
 
 template<class Type>
-void mappedFixedValueFvPatchField<Type>::updateCoeffs()
+void Foam::mappedFixedValueFvPatchField<Type>::updateCoeffs()
 {
     if (this->updated())
     {
@@ -144,7 +139,7 @@ void mappedFixedValueFvPatchField<Type>::updateCoeffs()
 
 
 template<class Type>
-void mappedFixedValueFvPatchField<Type>::write(Ostream& os) const
+void Foam::mappedFixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     mappedPatchFieldBase<Type>::write(os);
@@ -152,8 +147,4 @@ void mappedFixedValueFvPatchField<Type>::write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
index 715586a369..141c69522e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
@@ -26,15 +26,10 @@ License
 #include "oscillatingFixedValueFvPatchField.H"
 #include "mathematicalConstants.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-scalar oscillatingFixedValueFvPatchField<Type>::currentScale() const
+Foam::scalar Foam::oscillatingFixedValueFvPatchField<Type>::currentScale() const
 {
     const scalar t = this->db().time().timeOutputValue();
     const scalar a = amplitude_->value(t);
@@ -47,7 +42,7 @@ scalar oscillatingFixedValueFvPatchField<Type>::currentScale() const
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
+Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -63,25 +58,7 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
 
 
 template<class Type>
-oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
-(
-    const oscillatingFixedValueFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
-    refValue_(ptf.refValue_, mapper),
-    offset_(ptf.offset_),
-    amplitude_(ptf.amplitude_, false),
-    frequency_(ptf.frequency_, false),
-    curTimeIndex_(-1)
-{}
-
-
-template<class Type>
-oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
+Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -114,7 +91,25 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
 
 
 template<class Type>
-oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
+Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
+(
+    const oscillatingFixedValueFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
+    refValue_(ptf.refValue_, mapper),
+    offset_(ptf.offset_),
+    amplitude_(ptf.amplitude_, false),
+    frequency_(ptf.frequency_, false),
+    curTimeIndex_(-1)
+{}
+
+
+template<class Type>
+Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
 (
     const oscillatingFixedValueFvPatchField<Type>& ptf
 )
@@ -129,7 +124,7 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
 
 
 template<class Type>
-oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
+Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
 (
     const oscillatingFixedValueFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -147,7 +142,7 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void oscillatingFixedValueFvPatchField<Type>::autoMap
+void Foam::oscillatingFixedValueFvPatchField<Type>::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -158,7 +153,7 @@ void oscillatingFixedValueFvPatchField<Type>::autoMap
 
 
 template<class Type>
-void oscillatingFixedValueFvPatchField<Type>::rmap
+void Foam::oscillatingFixedValueFvPatchField<Type>::rmap
 (
     const fvPatchField<Type>& ptf,
     const labelList& addr
@@ -174,7 +169,7 @@ void oscillatingFixedValueFvPatchField<Type>::rmap
 
 
 template<class Type>
-void oscillatingFixedValueFvPatchField<Type>::updateCoeffs()
+void Foam::oscillatingFixedValueFvPatchField<Type>::updateCoeffs()
 {
     if (this->updated())
     {
@@ -197,7 +192,7 @@ void oscillatingFixedValueFvPatchField<Type>::updateCoeffs()
 
 
 template<class Type>
-void oscillatingFixedValueFvPatchField<Type>::write(Ostream& os) const
+void Foam::oscillatingFixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fixedValueFvPatchField<Type>::write(os);
     refValue_.writeEntry("refValue", os);
@@ -207,8 +202,4 @@ void oscillatingFixedValueFvPatchField<Type>::write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.C
index c7f30b6e10..83340f3fe5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "slipFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-slipFvPatchField<Type>::slipFvPatchField
+Foam::slipFvPatchField<Type>::slipFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -44,7 +39,19 @@ slipFvPatchField<Type>::slipFvPatchField
 
 
 template<class Type>
-slipFvPatchField<Type>::slipFvPatchField
+Foam::slipFvPatchField<Type>::slipFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    basicSymmetryFvPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+Foam::slipFvPatchField<Type>::slipFvPatchField
 (
     const slipFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -57,19 +64,7 @@ slipFvPatchField<Type>::slipFvPatchField
 
 
 template<class Type>
-slipFvPatchField<Type>::slipFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    basicSymmetryFvPatchField<Type>(p, iF, dict)
-{}
-
-
-template<class Type>
-slipFvPatchField<Type>::slipFvPatchField
+Foam::slipFvPatchField<Type>::slipFvPatchField
 (
     const slipFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -80,7 +75,7 @@ slipFvPatchField<Type>::slipFvPatchField
 
 
 template<class Type>
-slipFvPatchField<Type>::slipFvPatchField
+Foam::slipFvPatchField<Type>::slipFvPatchField
 (
     const slipFvPatchField<Type>& ptf
 )
@@ -89,8 +84,4 @@ slipFvPatchField<Type>::slipFvPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 3e2f43965b..1ef4675d4e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -27,15 +27,10 @@ License
 #include "Time.H"
 #include "AverageIOField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-timeVaryingMappedFixedValueFvPatchField<Type>::
+Foam::timeVaryingMappedFixedValueFvPatchField<Type>::
 timeVaryingMappedFixedValueFvPatchField
 (
     const fvPatch& p,
@@ -59,7 +54,7 @@ timeVaryingMappedFixedValueFvPatchField
 
 
 template<class Type>
-timeVaryingMappedFixedValueFvPatchField<Type>::
+Foam::timeVaryingMappedFixedValueFvPatchField<Type>::
 timeVaryingMappedFixedValueFvPatchField
 (
     const fvPatch& p,
@@ -121,7 +116,7 @@ timeVaryingMappedFixedValueFvPatchField
 
 
 template<class Type>
-timeVaryingMappedFixedValueFvPatchField<Type>::
+Foam::timeVaryingMappedFixedValueFvPatchField<Type>::
 timeVaryingMappedFixedValueFvPatchField
 (
     const timeVaryingMappedFixedValueFvPatchField<Type>& ptf,
@@ -148,7 +143,7 @@ timeVaryingMappedFixedValueFvPatchField
 
 
 template<class Type>
-timeVaryingMappedFixedValueFvPatchField<Type>::
+Foam::timeVaryingMappedFixedValueFvPatchField<Type>::
 timeVaryingMappedFixedValueFvPatchField
 (
     const timeVaryingMappedFixedValueFvPatchField<Type>& ptf
@@ -172,7 +167,7 @@ timeVaryingMappedFixedValueFvPatchField
 
 
 template<class Type>
-timeVaryingMappedFixedValueFvPatchField<Type>::
+Foam::timeVaryingMappedFixedValueFvPatchField<Type>::
 timeVaryingMappedFixedValueFvPatchField
 (
     const timeVaryingMappedFixedValueFvPatchField<Type>& ptf,
@@ -199,7 +194,7 @@ timeVaryingMappedFixedValueFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::autoMap
+void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -218,7 +213,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::autoMap
 
 
 template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::rmap
+void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::rmap
 (
     const fvPatchField<Type>& ptf,
     const labelList& addr
@@ -240,7 +235,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::rmap
 
 
 template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
+void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
 {
     // Initialise
     if (mapperPtr_.empty())
@@ -451,7 +446,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
 
 
 template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::updateCoeffs()
+void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::updateCoeffs()
 {
     if (this->updated())
     {
@@ -556,7 +551,10 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::updateCoeffs()
 
 
 template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::write(Ostream& os) const
+void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::write
+(
+    Ostream& os
+) const
 {
     fvPatchField<Type>::write(os);
     os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl;
@@ -589,8 +587,4 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index 4ad86d3c3f..55a3cda1db 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "turbulentInletFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
+Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -49,25 +44,7 @@ turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
 
 
 template<class Type>
-turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
-(
-    const turbulentInletFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
-    ranGen_(label(0)),
-    fluctuationScale_(ptf.fluctuationScale_),
-    referenceField_(ptf.referenceField_, mapper),
-    alpha_(ptf.alpha_),
-    curTimeIndex_(-1)
-{}
-
-
-template<class Type>
-turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
+Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -96,7 +73,25 @@ turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
 
 
 template<class Type>
-turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
+Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
+(
+    const turbulentInletFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
+    ranGen_(label(0)),
+    fluctuationScale_(ptf.fluctuationScale_),
+    referenceField_(ptf.referenceField_, mapper),
+    alpha_(ptf.alpha_),
+    curTimeIndex_(-1)
+{}
+
+
+template<class Type>
+Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
 (
     const turbulentInletFvPatchField<Type>& ptf
 )
@@ -111,7 +106,7 @@ turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
 
 
 template<class Type>
-turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
+Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
 (
     const turbulentInletFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -129,7 +124,7 @@ turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void turbulentInletFvPatchField<Type>::autoMap
+void Foam::turbulentInletFvPatchField<Type>::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -140,7 +135,7 @@ void turbulentInletFvPatchField<Type>::autoMap
 
 
 template<class Type>
-void turbulentInletFvPatchField<Type>::rmap
+void Foam::turbulentInletFvPatchField<Type>::rmap
 (
     const fvPatchField<Type>& ptf,
     const labelList& addr
@@ -156,7 +151,7 @@ void turbulentInletFvPatchField<Type>::rmap
 
 
 template<class Type>
-void turbulentInletFvPatchField<Type>::updateCoeffs()
+void Foam::turbulentInletFvPatchField<Type>::updateCoeffs()
 {
     if (this->updated())
     {
@@ -198,7 +193,7 @@ void turbulentInletFvPatchField<Type>::updateCoeffs()
 
 
 template<class Type>
-void turbulentInletFvPatchField<Type>::write(Ostream& os) const
+void Foam::turbulentInletFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     os.writeKeyword("fluctuationScale")
@@ -209,8 +204,4 @@ void turbulentInletFvPatchField<Type>::write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
index efe80d2f73..e6e1735fa1 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,11 +28,8 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
 template<class Type>
-const word& fvsPatchField<Type>::calculatedType()
+const Foam::word& Foam::fvsPatchField<Type>::calculatedType()
 {
     return calculatedFvsPatchField<Type>::typeName;
 }
@@ -40,7 +37,7 @@ const word& fvsPatchField<Type>::calculatedType()
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-calculatedFvsPatchField<Type>::calculatedFvsPatchField
+Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -51,7 +48,19 @@ calculatedFvsPatchField<Type>::calculatedFvsPatchField
 
 
 template<class Type>
-calculatedFvsPatchField<Type>::calculatedFvsPatchField
+Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+{}
+
+
+template<class Type>
+Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
 (
     const calculatedFvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -64,19 +73,7 @@ calculatedFvsPatchField<Type>::calculatedFvsPatchField
 
 
 template<class Type>
-calculatedFvsPatchField<Type>::calculatedFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
-{}
-
-
-template<class Type>
-calculatedFvsPatchField<Type>::calculatedFvsPatchField
+Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
 (
     const calculatedFvsPatchField<Type>& ptf
 )
@@ -86,7 +83,7 @@ calculatedFvsPatchField<Type>::calculatedFvsPatchField
 
 
 template<class Type>
-calculatedFvsPatchField<Type>::calculatedFvsPatchField
+Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
 (
     const calculatedFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -97,7 +94,8 @@ calculatedFvsPatchField<Type>::calculatedFvsPatchField
 
 
 template<class Type>
-tmp<fvsPatchField<Type> > fvsPatchField<Type>::NewCalculatedType
+Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::fvsPatchField<Type>::NewCalculatedType
 (
     const fvPatch& p
 )
@@ -129,7 +127,8 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::NewCalculatedType
 
 template<class Type>
 template<class Type2>
-tmp<fvsPatchField<Type> > fvsPatchField<Type>::NewCalculatedType
+Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::fvsPatchField<Type>::NewCalculatedType
 (
     const fvsPatchField<Type2>& pf
 )
@@ -138,8 +137,4 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::NewCalculatedType
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C
index 0a619f50a4..13cc738613 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "coupledFvsPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -44,7 +39,7 @@ coupledFvsPatchField<Type>::coupledFvsPatchField
 
 
 template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
@@ -56,7 +51,19 @@ coupledFvsPatchField<Type>::coupledFvsPatchField
 
 
 template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvsPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
 (
     const coupledFvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -69,19 +76,7 @@ coupledFvsPatchField<Type>::coupledFvsPatchField
 
 
 template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvsPatchField<Type>(p, iF, dict)
-{}
-
-
-template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
 (
     const coupledFvsPatchField<Type>& ptf
 )
@@ -91,7 +86,7 @@ coupledFvsPatchField<Type>::coupledFvsPatchField
 
 
 template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
 (
     const coupledFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -101,8 +96,4 @@ coupledFvsPatchField<Type>::coupledFvsPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
index b791dca272..cf8f46bfa3 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "fixedValueFvsPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
+Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -44,7 +39,19 @@ fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
 
 
 template<class Type>
-fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
+Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+{}
+
+
+template<class Type>
+Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
 (
     const fixedValueFvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -57,19 +64,7 @@ fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
 
 
 template<class Type>
-fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
-{}
-
-
-template<class Type>
-fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
+Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
 (
     const fixedValueFvsPatchField<Type>& ptf
 )
@@ -79,7 +74,7 @@ fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
 
 
 template<class Type>
-fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
+Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
 (
     const fixedValueFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -92,7 +87,8 @@ fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<Field<Type> > fixedValueFvsPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvsPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -105,7 +101,8 @@ tmp<Field<Type> > fixedValueFvsPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > fixedValueFvsPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvsPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -115,21 +112,19 @@ tmp<Field<Type> > fixedValueFvsPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > fixedValueFvsPatchField<Type>::gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvsPatchField<Type>::gradientInternalCoeffs() const
 {
     return -pTraits<Type>::one*this->patch().deltaCoeffs();
 }
 
 
 template<class Type>
-tmp<Field<Type> > fixedValueFvsPatchField<Type>::gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvsPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return this->patch().deltaCoeffs()*(*this);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
index acef68f928..84182ccdfc 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "slicedFvsPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
@@ -48,7 +43,7 @@ slicedFvsPatchField<Type>::slicedFvsPatchField
 
 
 template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -59,7 +54,21 @@ slicedFvsPatchField<Type>::slicedFvsPatchField
 
 
 template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+{
+    NotImplemented;
+}
+
+
+template<class Type>
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
 (
     const slicedFvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -74,21 +83,7 @@ slicedFvsPatchField<Type>::slicedFvsPatchField
 
 
 template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
-{
-    NotImplemented;
-}
-
-
-template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
 (
     const slicedFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -100,8 +95,10 @@ slicedFvsPatchField<Type>::slicedFvsPatchField
     UList<Type>::operator=(ptf);
 }
 
+
 template<class Type>
-tmp<fvsPatchField<Type> > slicedFvsPatchField<Type>::clone() const
+Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::slicedFvsPatchField<Type>::clone() const
 {
     return tmp<fvsPatchField<Type> >
     (
@@ -111,7 +108,7 @@ tmp<fvsPatchField<Type> > slicedFvsPatchField<Type>::clone() const
 
 
 template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
 (
     const slicedFvsPatchField<Type>& ptf
 )
@@ -129,7 +126,8 @@ slicedFvsPatchField<Type>::slicedFvsPatchField
 
 
 template<class Type>
-tmp<fvsPatchField<Type> > slicedFvsPatchField<Type>::clone
+Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::slicedFvsPatchField<Type>::clone
 (
     const DimensionedField<Type, surfaceMesh>& iF
 ) const
@@ -142,7 +140,7 @@ tmp<fvsPatchField<Type> > slicedFvsPatchField<Type>::clone
 
 
 template<class Type>
-slicedFvsPatchField<Type>::~slicedFvsPatchField<Type>()
+Foam::slicedFvsPatchField<Type>::~slicedFvsPatchField()
 {
     // Set the fvsPatchField storage pointer to NULL before its destruction
     // to protect the field it a slice of.
@@ -150,8 +148,4 @@ slicedFvsPatchField<Type>::~slicedFvsPatchField<Type>()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
index 6134ed61fa..15fe2d9df7 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "cyclicFvsPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-cyclicFvsPatchField<Type>::cyclicFvsPatchField
+Foam::cyclicFvsPatchField<Type>::cyclicFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -45,7 +40,30 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
 
 
 template<class Type>
-cyclicFvsPatchField<Type>::cyclicFvsPatchField
+Foam::cyclicFvsPatchField<Type>::cyclicFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    coupledFvsPatchField<Type>(p, iF, dict),
+    cyclicPatch_(refCast<const cyclicFvPatch>(p))
+{
+    if (!isA<cyclicFvPatch>(p))
+    {
+        FatalIOErrorInFunction
+        (
+            dict
+        )   << "patch " << this->patch().index() << " not cyclic type. "
+            << "Patch type = " << p.type()
+            << exit(FatalIOError);
+    }
+}
+
+
+template<class Type>
+Foam::cyclicFvsPatchField<Type>::cyclicFvsPatchField
 (
     const cyclicFvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -69,30 +87,7 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
 
 
 template<class Type>
-cyclicFvsPatchField<Type>::cyclicFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    coupledFvsPatchField<Type>(p, iF, dict),
-    cyclicPatch_(refCast<const cyclicFvPatch>(p))
-{
-    if (!isA<cyclicFvPatch>(p))
-    {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "patch " << this->patch().index() << " not cyclic type. "
-            << "Patch type = " << p.type()
-            << exit(FatalIOError);
-    }
-}
-
-
-template<class Type>
-cyclicFvsPatchField<Type>::cyclicFvsPatchField
+Foam::cyclicFvsPatchField<Type>::cyclicFvsPatchField
 (
     const cyclicFvsPatchField<Type>& ptf
 )
@@ -103,7 +98,7 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
 
 
 template<class Type>
-cyclicFvsPatchField<Type>::cyclicFvsPatchField
+Foam::cyclicFvsPatchField<Type>::cyclicFvsPatchField
 (
     const cyclicFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -114,8 +109,4 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C
index 1e2425befb..8caad80e69 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "cyclicSlipFvsPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+Foam::cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -44,7 +39,19 @@ cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
 
 
 template<class Type>
-cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+Foam::cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    cyclicFvsPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+Foam::cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
 (
     const cyclicSlipFvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -57,19 +64,7 @@ cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
 
 
 template<class Type>
-cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    cyclicFvsPatchField<Type>(p, iF, dict)
-{}
-
-
-template<class Type>
-cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+Foam::cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
 (
     const cyclicSlipFvsPatchField<Type>& ptf
 )
@@ -79,7 +74,7 @@ cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
 
 
 template<class Type>
-cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+Foam::cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
 (
     const cyclicSlipFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -89,8 +84,4 @@ cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C
index 3af9ea3168..160d3e9365 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C
@@ -27,15 +27,10 @@ License
 #include "fvPatchFieldMapper.H"
 #include "surfaceMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-emptyFvsPatchField<Type>::emptyFvsPatchField
+Foam::emptyFvsPatchField<Type>::emptyFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -46,7 +41,29 @@ emptyFvsPatchField<Type>::emptyFvsPatchField
 
 
 template<class Type>
-emptyFvsPatchField<Type>::emptyFvsPatchField
+Foam::emptyFvsPatchField<Type>::emptyFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvsPatchField<Type>(p, iF, Field<Type>(0))
+{
+    if (!isType<emptyFvPatch>(p))
+    {
+        FatalIOErrorInFunction
+        (
+            dict
+        )   << "patch " << this->patch().index() << " not empty type. "
+            << "Patch type = " << p.type()
+            << exit(FatalIOError);
+    }
+}
+
+
+template<class Type>
+Foam::emptyFvsPatchField<Type>::emptyFvsPatchField
 (
     const emptyFvsPatchField<Type>&,
     const fvPatch& p,
@@ -69,29 +86,7 @@ emptyFvsPatchField<Type>::emptyFvsPatchField
 
 
 template<class Type>
-emptyFvsPatchField<Type>::emptyFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvsPatchField<Type>(p, iF, Field<Type>(0))
-{
-    if (!isType<emptyFvPatch>(p))
-    {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "patch " << this->patch().index() << " not empty type. "
-            << "Patch type = " << p.type()
-            << exit(FatalIOError);
-    }
-}
-
-
-template<class Type>
-emptyFvsPatchField<Type>::emptyFvsPatchField
+Foam::emptyFvsPatchField<Type>::emptyFvsPatchField
 (
     const emptyFvsPatchField<Type>& ptf
 )
@@ -106,7 +101,7 @@ emptyFvsPatchField<Type>::emptyFvsPatchField
 
 
 template<class Type>
-emptyFvsPatchField<Type>::emptyFvsPatchField
+Foam::emptyFvsPatchField<Type>::emptyFvsPatchField
 (
     const emptyFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -116,8 +111,4 @@ emptyFvsPatchField<Type>::emptyFvsPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C
index 8540298cf0..ed83712884 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "nonuniformTransformCyclicFvsPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-nonuniformTransformCyclicFvsPatchField<Type>::
+Foam::nonuniformTransformCyclicFvsPatchField<Type>::
 nonuniformTransformCyclicFvsPatchField
 (
     const fvPatch& p,
@@ -45,7 +40,20 @@ nonuniformTransformCyclicFvsPatchField
 
 
 template<class Type>
-nonuniformTransformCyclicFvsPatchField<Type>::
+Foam::nonuniformTransformCyclicFvsPatchField<Type>::
+nonuniformTransformCyclicFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    cyclicFvsPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+Foam::nonuniformTransformCyclicFvsPatchField<Type>::
 nonuniformTransformCyclicFvsPatchField
 (
     const nonuniformTransformCyclicFvsPatchField<Type>& ptf,
@@ -59,20 +67,7 @@ nonuniformTransformCyclicFvsPatchField
 
 
 template<class Type>
-nonuniformTransformCyclicFvsPatchField<Type>::
-nonuniformTransformCyclicFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    cyclicFvsPatchField<Type>(p, iF, dict)
-{}
-
-
-template<class Type>
-nonuniformTransformCyclicFvsPatchField<Type>::
+Foam::nonuniformTransformCyclicFvsPatchField<Type>::
 nonuniformTransformCyclicFvsPatchField
 (
     const nonuniformTransformCyclicFvsPatchField<Type>& ptf
@@ -83,7 +78,7 @@ nonuniformTransformCyclicFvsPatchField
 
 
 template<class Type>
-nonuniformTransformCyclicFvsPatchField<Type>::
+Foam::nonuniformTransformCyclicFvsPatchField<Type>::
 nonuniformTransformCyclicFvsPatchField
 (
     const nonuniformTransformCyclicFvsPatchField<Type>& ptf,
@@ -94,8 +89,4 @@ nonuniformTransformCyclicFvsPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C
index 68eaf04816..a6fa161790 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "processorFvsPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
 
 template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -45,7 +40,7 @@ processorFvsPatchField<Type>::processorFvsPatchField
 
 
 template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
@@ -57,9 +52,31 @@ processorFvsPatchField<Type>::processorFvsPatchField
 {}
 
 
-// Construct by mapping given processorFvsPatchField<Type>
 template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    coupledFvsPatchField<Type>(p, iF, dict),
+    procPatch_(refCast<const processorFvPatch>(p))
+{
+    if (!isType<processorFvPatch>(p))
+    {
+        FatalIOErrorInFunction
+        (
+            dict
+        )   << "patch " << this->patch().index() << " not processor type. "
+            << "Patch type = " << p.type()
+            << exit(FatalIOError);
+    }
+}
+
+
+template<class Type>
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
 (
     const processorFvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -83,30 +100,7 @@ processorFvsPatchField<Type>::processorFvsPatchField
 
 
 template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    coupledFvsPatchField<Type>(p, iF, dict),
-    procPatch_(refCast<const processorFvPatch>(p))
-{
-    if (!isType<processorFvPatch>(p))
-    {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "patch " << this->patch().index() << " not processor type. "
-            << "Patch type = " << p.type()
-            << exit(FatalIOError);
-    }
-}
-
-
-template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
 (
     const processorFvsPatchField<Type>& ptf
 )
@@ -117,7 +111,7 @@ processorFvsPatchField<Type>::processorFvsPatchField
 
 
 template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
 (
     const processorFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -131,12 +125,8 @@ processorFvsPatchField<Type>::processorFvsPatchField
 // * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
 
 template<class Type>
-processorFvsPatchField<Type>::~processorFvsPatchField()
+Foam::processorFvsPatchField<Type>::~processorFvsPatchField()
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
index e633442aca..0cfa469404 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "processorCyclicFvsPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
 
 template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -45,7 +40,7 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 
 
 template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
@@ -57,9 +52,31 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 {}
 
 
-// Construct by mapping given processorCyclicFvsPatchField<Type>
 template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    coupledFvsPatchField<Type>(p, iF, dict),
+    procPatch_(refCast<const processorCyclicFvPatch>(p))
+{
+    if (!isType<processorCyclicFvPatch>(p))
+    {
+        FatalIOErrorInFunction
+        (
+            dict
+        )   << "patch " << this->patch().index() << " not processor type. "
+            << "Patch type = " << p.type()
+            << exit(FatalIOError);
+    }
+}
+
+
+template<class Type>
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 (
     const processorCyclicFvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -83,30 +100,7 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 
 
 template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    coupledFvsPatchField<Type>(p, iF, dict),
-    procPatch_(refCast<const processorCyclicFvPatch>(p))
-{
-    if (!isType<processorCyclicFvPatch>(p))
-    {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "patch " << this->patch().index() << " not processor type. "
-            << "Patch type = " << p.type()
-            << exit(FatalIOError);
-    }
-}
-
-
-template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 (
     const processorCyclicFvsPatchField<Type>& ptf
 )
@@ -117,7 +111,7 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 
 
 template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 (
     const processorCyclicFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -131,12 +125,8 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 // * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
 
 template<class Type>
-processorCyclicFvsPatchField<Type>::~processorCyclicFvsPatchField()
+Foam::processorCyclicFvsPatchField<Type>::~processorCyclicFvsPatchField()
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C
index 104052a54b..fef8848e67 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "symmetryFvsPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-symmetryFvsPatchField<Type>::symmetryFvsPatchField
+Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -44,7 +39,29 @@ symmetryFvsPatchField<Type>::symmetryFvsPatchField
 
 
 template<class Type>
-symmetryFvsPatchField<Type>::symmetryFvsPatchField
+Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvsPatchField<Type>(p, iF, dict)
+{
+    if (!isType<symmetryFvPatch>(p))
+    {
+        FatalIOErrorInFunction
+        (
+            dict
+        )   << "patch " << this->patch().index() << " not symmetry type. "
+            << "Patch type = " << p.type()
+            << exit(FatalIOError);
+    }
+}
+
+
+template<class Type>
+Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField
 (
     const symmetryFvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -67,29 +84,7 @@ symmetryFvsPatchField<Type>::symmetryFvsPatchField
 
 
 template<class Type>
-symmetryFvsPatchField<Type>::symmetryFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvsPatchField<Type>(p, iF, dict)
-{
-    if (!isType<symmetryFvPatch>(p))
-    {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "patch " << this->patch().index() << " not symmetry type. "
-            << "Patch type = " << p.type()
-            << exit(FatalIOError);
-    }
-}
-
-
-template<class Type>
-symmetryFvsPatchField<Type>::symmetryFvsPatchField
+Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField
 (
     const symmetryFvsPatchField<Type>& ptf
 )
@@ -99,7 +94,7 @@ symmetryFvsPatchField<Type>::symmetryFvsPatchField
 
 
 template<class Type>
-symmetryFvsPatchField<Type>::symmetryFvsPatchField
+Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField
 (
     const symmetryFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -109,8 +104,4 @@ symmetryFvsPatchField<Type>::symmetryFvsPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C
index ade5b53c0e..c1d2d3d3c5 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "symmetryPlaneFvsPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
+Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -44,7 +39,29 @@ symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
 
 
 template<class Type>
-symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
+Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvsPatchField<Type>(p, iF, dict)
+{
+    if (!isType<symmetryPlaneFvPatch>(p))
+    {
+        FatalIOErrorInFunction
+        (
+            dict
+        )   << "patch " << this->patch().index() << " not symmetryPlane type. "
+            << "Patch type = " << p.type()
+            << exit(FatalIOError);
+    }
+}
+
+
+template<class Type>
+Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
 (
     const symmetryPlaneFvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -67,29 +84,7 @@ symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
 
 
 template<class Type>
-symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvsPatchField<Type>(p, iF, dict)
-{
-    if (!isType<symmetryPlaneFvPatch>(p))
-    {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "patch " << this->patch().index() << " not symmetryPlane type. "
-            << "Patch type = " << p.type()
-            << exit(FatalIOError);
-    }
-}
-
-
-template<class Type>
-symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
+Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
 (
     const symmetryPlaneFvsPatchField<Type>& ptf
 )
@@ -99,7 +94,7 @@ symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
 
 
 template<class Type>
-symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
+Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
 (
     const symmetryPlaneFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -109,8 +104,4 @@ symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C
index ec31c57f1b..5c5ada449e 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "wedgeFvsPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-wedgeFvsPatchField<Type>::wedgeFvsPatchField
+Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -44,7 +39,29 @@ wedgeFvsPatchField<Type>::wedgeFvsPatchField
 
 
 template<class Type>
-wedgeFvsPatchField<Type>::wedgeFvsPatchField
+Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvsPatchField<Type>(p, iF, dict)
+{
+    if (!isType<wedgeFvPatch>(p))
+    {
+        FatalIOErrorInFunction
+        (
+            dict
+        )   << "patch " << this->patch().index() << " not wedge type. "
+            << "Patch type = " << p.type()
+            << exit(FatalIOError);
+    }
+}
+
+
+template<class Type>
+Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField
 (
     const wedgeFvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -67,29 +84,7 @@ wedgeFvsPatchField<Type>::wedgeFvsPatchField
 
 
 template<class Type>
-wedgeFvsPatchField<Type>::wedgeFvsPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, surfaceMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvsPatchField<Type>(p, iF, dict)
-{
-    if (!isType<wedgeFvPatch>(p))
-    {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "patch " << this->patch().index() << " not wedge type. "
-            << "Patch type = " << p.type()
-            << exit(FatalIOError);
-    }
-}
-
-
-template<class Type>
-wedgeFvsPatchField<Type>::wedgeFvsPatchField
+Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField
 (
     const wedgeFvsPatchField<Type>& ptf
 )
@@ -99,7 +94,7 @@ wedgeFvsPatchField<Type>::wedgeFvsPatchField
 
 
 template<class Type>
-wedgeFvsPatchField<Type>::wedgeFvsPatchField
+Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField
 (
     const wedgeFvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -109,8 +104,4 @@ wedgeFvsPatchField<Type>::wedgeFvsPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index 713f876c7d..cb0276cc7c 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -28,15 +28,10 @@ License
 #include "fvMesh.H"
 #include "fvPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -49,7 +44,7 @@ fvsPatchField<Type>::fvsPatchField
 
 
 template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
@@ -63,7 +58,7 @@ fvsPatchField<Type>::fvsPatchField
 
 
 template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
 (
     const fvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -78,7 +73,7 @@ fvsPatchField<Type>::fvsPatchField
 
 
 template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
@@ -108,7 +103,7 @@ fvsPatchField<Type>::fvsPatchField
 
 
 template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
 (
     const fvsPatchField<Type>& ptf
 )
@@ -120,7 +115,7 @@ fvsPatchField<Type>::fvsPatchField
 
 
 template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
 (
     const fvsPatchField<Type>& ptf,
     const DimensionedField<Type, surfaceMesh>& iF
@@ -135,14 +130,14 @@ fvsPatchField<Type>::fvsPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-const objectRegistry& fvsPatchField<Type>::db() const
+const Foam::objectRegistry& Foam::fvsPatchField<Type>::db() const
 {
     return patch_.boundaryMesh().mesh();
 }
 
 
 template<class Type>
-void fvsPatchField<Type>::check(const fvsPatchField<Type>& ptf) const
+void Foam::fvsPatchField<Type>::check(const fvsPatchField<Type>& ptf) const
 {
     if (&patch_ != &(ptf.patch_))
     {
@@ -153,9 +148,8 @@ void fvsPatchField<Type>::check(const fvsPatchField<Type>& ptf) const
 }
 
 
-// Map from self
 template<class Type>
-void fvsPatchField<Type>::autoMap
+void Foam::fvsPatchField<Type>::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -164,9 +158,8 @@ void fvsPatchField<Type>::autoMap
 }
 
 
-// Reverse-map the given fvsPatchField onto this fvsPatchField
 template<class Type>
-void fvsPatchField<Type>::rmap
+void Foam::fvsPatchField<Type>::rmap
 (
     const fvsPatchField<Type>& ptf,
     const labelList& addr
@@ -176,9 +169,8 @@ void fvsPatchField<Type>::rmap
 }
 
 
-// Write
 template<class Type>
-void fvsPatchField<Type>::write(Ostream& os) const
+void Foam::fvsPatchField<Type>::write(Ostream& os) const
 {
     os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
     this->writeEntry("value", os);
@@ -188,7 +180,7 @@ void fvsPatchField<Type>::write(Ostream& os) const
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Type>
-void fvsPatchField<Type>::operator=
+void Foam::fvsPatchField<Type>::operator=
 (
     const UList<Type>& ul
 )
@@ -198,7 +190,7 @@ void fvsPatchField<Type>::operator=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator=
+void Foam::fvsPatchField<Type>::operator=
 (
     const fvsPatchField<Type>& ptf
 )
@@ -209,7 +201,7 @@ void fvsPatchField<Type>::operator=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator+=
+void Foam::fvsPatchField<Type>::operator+=
 (
     const fvsPatchField<Type>& ptf
 )
@@ -220,7 +212,7 @@ void fvsPatchField<Type>::operator+=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator-=
+void Foam::fvsPatchField<Type>::operator-=
 (
     const fvsPatchField<Type>& ptf
 )
@@ -231,7 +223,7 @@ void fvsPatchField<Type>::operator-=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator*=
+void Foam::fvsPatchField<Type>::operator*=
 (
     const fvsPatchField<scalar>& ptf
 )
@@ -248,7 +240,7 @@ void fvsPatchField<Type>::operator*=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator/=
+void Foam::fvsPatchField<Type>::operator/=
 (
     const fvsPatchField<scalar>& ptf
 )
@@ -264,7 +256,7 @@ void fvsPatchField<Type>::operator/=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator+=
+void Foam::fvsPatchField<Type>::operator+=
 (
     const Field<Type>& tf
 )
@@ -274,7 +266,7 @@ void fvsPatchField<Type>::operator+=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator-=
+void Foam::fvsPatchField<Type>::operator-=
 (
     const Field<Type>& tf
 )
@@ -284,7 +276,7 @@ void fvsPatchField<Type>::operator-=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator*=
+void Foam::fvsPatchField<Type>::operator*=
 (
     const scalarField& tf
 )
@@ -294,7 +286,7 @@ void fvsPatchField<Type>::operator*=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator/=
+void Foam::fvsPatchField<Type>::operator/=
 (
     const scalarField& tf
 )
@@ -304,7 +296,7 @@ void fvsPatchField<Type>::operator/=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator=
+void Foam::fvsPatchField<Type>::operator=
 (
     const Type& t
 )
@@ -314,7 +306,7 @@ void fvsPatchField<Type>::operator=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator+=
+void Foam::fvsPatchField<Type>::operator+=
 (
     const Type& t
 )
@@ -324,7 +316,7 @@ void fvsPatchField<Type>::operator+=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator-=
+void Foam::fvsPatchField<Type>::operator-=
 (
     const Type& t
 )
@@ -334,7 +326,7 @@ void fvsPatchField<Type>::operator-=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator*=
+void Foam::fvsPatchField<Type>::operator*=
 (
     const scalar s
 )
@@ -344,7 +336,7 @@ void fvsPatchField<Type>::operator*=
 
 
 template<class Type>
-void fvsPatchField<Type>::operator/=
+void Foam::fvsPatchField<Type>::operator/=
 (
     const scalar s
 )
@@ -353,9 +345,8 @@ void fvsPatchField<Type>::operator/=
 }
 
 
-// Force an assignment, overriding fixedValue status
 template<class Type>
-void fvsPatchField<Type>::operator==
+void Foam::fvsPatchField<Type>::operator==
 (
     const fvsPatchField<Type>& ptf
 )
@@ -365,7 +356,7 @@ void fvsPatchField<Type>::operator==
 
 
 template<class Type>
-void fvsPatchField<Type>::operator==
+void Foam::fvsPatchField<Type>::operator==
 (
     const Field<Type>& tf
 )
@@ -375,7 +366,7 @@ void fvsPatchField<Type>::operator==
 
 
 template<class Type>
-void fvsPatchField<Type>::operator==
+void Foam::fvsPatchField<Type>::operator==
 (
     const Type& t
 )
@@ -387,7 +378,7 @@ void fvsPatchField<Type>::operator==
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class Type>
-Ostream& operator<<(Ostream& os, const fvsPatchField<Type>& ptf)
+Foam::Ostream& Foam::operator<<(Ostream& os, const fvsPatchField<Type>& ptf)
 {
     ptf.write(os);
 
@@ -399,10 +390,6 @@ Ostream& operator<<(Ostream& os, const fvsPatchField<Type>& ptf)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#   include "fvsPatchFieldNew.C"
+#include "fvsPatchFieldNew.C"
 
 // ************************************************************************* //
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index 08b254e658..bb7598b26a 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -26,15 +26,10 @@ License
 #include "genericPointPatchField.H"
 #include "pointPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-genericPointPatchField<Type>::genericPointPatchField
+Foam::genericPointPatchField<Type>::genericPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
@@ -47,7 +42,7 @@ genericPointPatchField<Type>::genericPointPatchField
 
 
 template<class Type>
-genericPointPatchField<Type>::genericPointPatchField
+Foam::genericPointPatchField<Type>::genericPointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -308,7 +303,7 @@ genericPointPatchField<Type>::genericPointPatchField
 
 
 template<class Type>
-genericPointPatchField<Type>::genericPointPatchField
+Foam::genericPointPatchField<Type>::genericPointPatchField
 (
     const genericPointPatchField<Type>& ptf,
     const pointPatch& p,
@@ -393,7 +388,7 @@ genericPointPatchField<Type>::genericPointPatchField
 
 
 template<class Type>
-genericPointPatchField<Type>::genericPointPatchField
+Foam::genericPointPatchField<Type>::genericPointPatchField
 (
     const genericPointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -413,7 +408,7 @@ genericPointPatchField<Type>::genericPointPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void genericPointPatchField<Type>::autoMap
+void Foam::genericPointPatchField<Type>::autoMap
 (
     const pointPatchFieldMapper& m
 )
@@ -471,7 +466,7 @@ void genericPointPatchField<Type>::autoMap
 
 
 template<class Type>
-void genericPointPatchField<Type>::rmap
+void Foam::genericPointPatchField<Type>::rmap
 (
     const pointPatchField<Type>& ptf,
     const labelList& addr
@@ -563,7 +558,7 @@ void genericPointPatchField<Type>::rmap
 
 
 template<class Type>
-void genericPointPatchField<Type>::write(Ostream& os) const
+void Foam::genericPointPatchField<Type>::write(Ostream& os) const
 {
     os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
 
@@ -614,8 +609,4 @@ void genericPointPatchField<Type>::write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
index 4e3b6745ec..8ee5b49f04 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,15 +25,10 @@ License
 
 #include "zeroFixedValuePointPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
 
 template<class Type>
-zeroFixedValuePointPatchField<Type>::
+Foam::zeroFixedValuePointPatchField<Type>::
 zeroFixedValuePointPatchField
 (
     const pointPatch& p,
@@ -45,7 +40,7 @@ zeroFixedValuePointPatchField
 
 
 template<class Type>
-zeroFixedValuePointPatchField<Type>::
+Foam::zeroFixedValuePointPatchField<Type>::
 zeroFixedValuePointPatchField
 (
     const pointPatch& p,
@@ -60,7 +55,7 @@ zeroFixedValuePointPatchField
 
 
 template<class Type>
-zeroFixedValuePointPatchField<Type>::
+Foam::zeroFixedValuePointPatchField<Type>::
 zeroFixedValuePointPatchField
 (
     const zeroFixedValuePointPatchField<Type>& ptf,
@@ -77,7 +72,7 @@ zeroFixedValuePointPatchField
 
 
 template<class Type>
-zeroFixedValuePointPatchField<Type>::
+Foam::zeroFixedValuePointPatchField<Type>::
 zeroFixedValuePointPatchField
 (
     const zeroFixedValuePointPatchField<Type>& ptf
@@ -88,7 +83,7 @@ zeroFixedValuePointPatchField
 
 
 template<class Type>
-zeroFixedValuePointPatchField<Type>::
+Foam::zeroFixedValuePointPatchField<Type>::
 zeroFixedValuePointPatchField
 (
     const zeroFixedValuePointPatchField<Type>& ptf,
@@ -102,8 +97,4 @@ zeroFixedValuePointPatchField
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //

From 67a9b8df73908909ff8b99b2c3f389416a89981c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Dec 2015 09:16:08 +0000
Subject: [PATCH 039/447] metisDecomp: Changed to use scalar rather than float
 Requires that metis is compiled with REALTYPEWIDTH set to 32 for SP and 64
 for DP.

---
 src/parallel/decompose/metisDecomp/metisDecomp.C | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.C b/src/parallel/decompose/metisDecomp/metisDecomp.C
index 1fb0ea1c39..d87619bd1d 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.C
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.C
@@ -25,7 +25,6 @@ License
 
 #include "metisDecomp.H"
 #include "addToRunTimeSelectionTable.H"
-#include "floatScalar.H"
 #include "Time.H"
 
 extern "C"
@@ -68,7 +67,7 @@ Foam::label Foam::metisDecomp::decompose
 
     // processor weights initialised with no size, only used if specified in
     // a file
-    Field<floatScalar> processorWeights;
+    Field<scalar> processorWeights;
 
     // cell weights (so on the vertices of the dual)
     List<label> cellWeights;

From 1d893a0bd6f8e32227c5a642adf286571bce1f00 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Dec 2015 15:38:09 +0000
Subject: [PATCH 040/447] reactingEulerFoam: Move LTS controls maxCo, maxDeltaT
 and rDeltaTSmoothingCoeff into the PIMPLE sub-dictionary For consistency with
 all other solvers supporting the LTS option

---
 .../reactingMultiphaseEulerFoam/setRDeltaT.H   | 18 +++++++++++++-----
 .../reactingTwoPhaseEulerFoam/setRDeltaT.H     | 18 +++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
index 9e9ca54230..c0ca68835c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
@@ -1,13 +1,21 @@
 {
     volScalarField& rDeltaT = trDeltaT();
 
+    const dictionary& pimpleDict = pimple.dict();
+
+    scalar maxCo
+    (
+        pimpleDict.lookupOrDefault<scalar>("maxCo", 0.2)
+    );
+
+    scalar maxDeltaT
+    (
+        pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
+    );
+
     scalar rDeltaTSmoothingCoeff
     (
-        runTime.controlDict().lookupOrDefault<scalar>
-        (
-            "rDeltaTSmoothingCoeff",
-            0.02
-        )
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
     );
 
     surfaceScalarField maxPhi("maxPhi", phi);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H
index f9f736f788..ff07dc4a32 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H
@@ -1,13 +1,21 @@
 {
     volScalarField& rDeltaT = trDeltaT();
 
+    const dictionary& pimpleDict = pimple.dict();
+
+    scalar maxCo
+    (
+        pimpleDict.lookupOrDefault<scalar>("maxCo", 0.2)
+    );
+
+    scalar maxDeltaT
+    (
+        pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
+    );
+
     scalar rDeltaTSmoothingCoeff
     (
-        runTime.controlDict().lookupOrDefault<scalar>
-        (
-            "rDeltaTSmoothingCoeff",
-            0.02
-        )
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
     );
 
     // Set the reciprocal time-step from the local Courant number

From 4930a5169a85cf5a2f3ef072174c237f6c842f25 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Dec 2015 15:39:45 +0000
Subject: [PATCH 041/447] reactingMultiphaseEulerFoam: Correct and test LTS
 support

---
 .../multiphaseSystem/multiphaseSystem.C         | 11 ++++-------
 .../twoPhaseSystem/twoPhaseSystem.C             | 17 ++++++++---------
 .../fvMatrices/solvers/MULES/MULESTemplates.C   | 13 +++++++++++--
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 2b06f1a7f4..2ec0b15907 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -71,6 +71,8 @@ void Foam::multiphaseSystem::calcAlphas()
 
 void Foam::multiphaseSystem::solveAlphas()
 {
+    bool LTS = fv::localEulerDdt::enabled(mesh_);
+
     PtrList<surfaceScalarField> alphaPhiCorrs(phases().size());
     forAll(phases(), phasei)
     {
@@ -155,14 +157,11 @@ void Foam::multiphaseSystem::solveAlphas()
             }
         }
 
-        if (fv::localEulerDdt::enabled(mesh_))
+        if (LTS)
         {
-            const volScalarField& rDeltaT =
-                fv::localEulerDdt::localRDeltaT(mesh_);
-
             MULES::limit
             (
-                rDeltaT,
+                fv::localEulerDdt::localRDeltaT(mesh_),
                 geometricOneField(),
                 phase,
                 phi_,
@@ -636,8 +635,6 @@ void Foam::multiphaseSystem::solve()
                 fv::localEulerDdt::localRSubDeltaT(mesh_, nAlphaSubCycles);
         }
 
-        dimensionedScalar totalDeltaT = runTime.deltaT();
-
         PtrList<volScalarField> alpha0s(phases().size());
         PtrList<surfaceScalarField> alphaPhiSums(phases().size());
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index 7b7ddee6f4..36e73662cd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -186,18 +186,17 @@ Foam::twoPhaseSystem::dmdt() const
 
 void Foam::twoPhaseSystem::solve()
 {
-    const fvMesh& mesh = this->mesh();
-    const Time& runTime = mesh.time();
+    const Time& runTime = mesh_.time();
 
     volScalarField& alpha1 = phase1_;
     volScalarField& alpha2 = phase2_;
 
-    const dictionary& alphaControls = mesh.solverDict(alpha1.name());
+    const dictionary& alphaControls = mesh_.solverDict(alpha1.name());
 
     label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
     label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
 
-    bool LTS = fv::localEulerDdt::enabled(mesh);
+    bool LTS = fv::localEulerDdt::enabled(mesh_);
 
     word alphaScheme("div(phi," + alpha1.name() + ')');
     word alpharScheme("div(phir," + alpha1.name() + ')');
@@ -264,9 +263,9 @@ void Foam::twoPhaseSystem::solve()
             (
                 "Sp",
                 runTime.timeName(),
-                mesh
+                mesh_
             ),
-            mesh,
+            mesh_,
             dimensionedScalar("Sp", dimless/dimTime, 0.0)
         );
 
@@ -276,7 +275,7 @@ void Foam::twoPhaseSystem::solve()
             (
                 "Su",
                 runTime.timeName(),
-                mesh
+                mesh_
             ),
             // Divergence term is handled explicitly to be
             // consistent with the explicit transport solution
@@ -345,7 +344,7 @@ void Foam::twoPhaseSystem::solve()
             if (LTS)
             {
                 trSubDeltaT =
-                    fv::localEulerDdt::localRSubDeltaT(mesh, nAlphaSubCycles);
+                    fv::localEulerDdt::localRSubDeltaT(mesh_, nAlphaSubCycles);
             }
 
             for
@@ -420,7 +419,7 @@ void Foam::twoPhaseSystem::solve()
             fvc::interpolate(phase2_.rho())*phase2_.alphaPhi();
 
         Info<< alpha1.name() << " volume fraction = "
-            << alpha1.weightedAverage(mesh.V()).value()
+            << alpha1.weightedAverage(mesh_.V()).value()
             << "  Min(alpha1) = " << min(alpha1).value()
             << "  Max(alpha1) = " << max(alpha1).value()
             << endl;
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index f3bb5432a5..61e0d88550 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -89,8 +89,17 @@ void Foam::MULES::explicitSolve
 )
 {
     const fvMesh& mesh = psi.mesh();
-    const scalar rDeltaT = 1.0/mesh.time().deltaTValue();
-    explicitSolve(rDeltaT, rho, psi, phiPsi, Sp, Su);
+
+    if (fv::localEulerDdt::enabled(mesh))
+    {
+        const volScalarField& rDeltaT = fv::localEulerDdt::localRDeltaT(mesh);
+        explicitSolve(rDeltaT, rho, psi, phiPsi, Sp, Su);
+    }
+    else
+    {
+        const scalar rDeltaT = 1.0/mesh.time().deltaTValue();
+        explicitSolve(rDeltaT, rho, psi, phiPsi, Sp, Su);
+    }
 }
 
 

From fc98b1f6dce30acdab9b2a486118b6ddcd0f5f75 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Dec 2015 16:51:46 +0000
Subject: [PATCH 042/447] 
 reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi:
 New drag model

Drag model for gas-liquid system of Tomiyama et al.

Reference:
    "Drag coefficients of single bubbles under normal and microgravity
     conditions"
    Tomiyama, A., Kataoka, I., Zun, I., Sakaguchi, T.
    JSME International Series B, Fluids and Thermal Engineering,
    Vol. 41, 1998, pp. 472-479

Provided by Alberto Passalacq
---
 .../interfacialModels/Make/files              |   1 +
 .../TomiyamaKataokaZunSakaguchi.C             |  86 +++++++++++++
 .../TomiyamaKataokaZunSakaguchi.H             | 113 ++++++++++++++++++
 3 files changed, 200 insertions(+)
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H

diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/files
index 1293886cde..aff39a6ded 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/files
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/files
@@ -10,6 +10,7 @@ dragModels/SchillerNaumann/SchillerNaumann.C
 dragModels/SyamlalOBrien/SyamlalOBrien.C
 dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
 dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
+dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
 dragModels/WenYu/WenYu.C
 dragModels/IshiiZuber/IshiiZuber.C
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
new file mode 100644
index 0000000000..6e3db4231f
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "TomiyamaKataokaZunSakaguchi.H"
+#include "phasePair.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace dragModels
+{
+    defineTypeNameAndDebug(TomiyamaKataokaZunSakaguchi, 0);
+    addToRunTimeSelectionTable
+    (
+        dragModel,
+        TomiyamaKataokaZunSakaguchi,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::dragModels::TomiyamaKataokaZunSakaguchi::TomiyamaKataokaZunSakaguchi
+(
+    const dictionary& dict,
+    const phasePair& pair,
+    const bool registerObject
+)
+:
+    dragModel(dict, pair, registerObject),
+    residualRe_("residualRe", dimless, dict),
+    residualEo_("residualEo", dimless, dict)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::dragModels::TomiyamaKataokaZunSakaguchi::~TomiyamaKataokaZunSakaguchi()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::dragModels::TomiyamaKataokaZunSakaguchi::CdRe() const
+{
+    volScalarField Re(pair_.Re());
+    volScalarField Eo(max(pair_.Eo(), residualEo_));
+
+    return
+        max
+        (
+            24.0*(1.0 + 0.15*pow(Re, 0.687))/max(Re, residualRe_),
+            8.0*Eo/(3.0*(Eo + 4.0))
+        )
+       *max(pair_.Re(), residualRe_);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H
new file mode 100644
index 0000000000..fb0ba6768f
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H
@@ -0,0 +1,113 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+Class
+    Foam::dragModels::TomiyamaKataokaZunSakaguchi
+
+Description
+    Drag model for gas-liquid system of Tomiyama et al.
+
+    Reference:
+    \verbatim
+        "Drag coefficients of single bubbles under normal and microgravity
+         conditions"
+        Tomiyama, A., Kataoka, I., Zun, I., Sakaguchi, T.
+        JSME International Series B, Fluids and Thermal Engineering,
+        Vol. 41, 1998, pp. 472-479
+    \endverbatim
+
+SourceFiles
+    TomiyamaKataokaZunSakaguchi.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef TomiyamaKataokaZunSakaguchi_H
+#define TomiyamaKataokaZunSakaguchi_H
+
+#include "dragModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class phasePair;
+
+namespace dragModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class TomiyamaKataokaZunSakaguchi Declaration
+\*---------------------------------------------------------------------------*/
+
+class TomiyamaKataokaZunSakaguchi
+:
+    public dragModel
+{
+    // Private data
+
+        //- Residual Reynolds Number
+        const dimensionedScalar residualRe_;
+
+        //- Residual Eotvos number
+        const dimensionedScalar residualEo_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("TomiyamaKataokaZunSakaguchi");
+
+
+    // Constructors
+
+        //- Construct from a dictionary and a phase pair
+        TomiyamaKataokaZunSakaguchi
+        (
+            const dictionary& dict,
+            const phasePair& pair,
+            const bool registerObject
+        );
+
+
+    //- Destructor
+    virtual ~TomiyamaKataokaZunSakaguchi();
+
+
+    // Member Functions
+
+        //- Drag coefficient
+        virtual tmp<volScalarField> CdRe() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace dragModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From d1941723dbb770c6d4066f080be84a9e90a6b02b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Dec 2015 22:23:38 +0000
Subject: [PATCH 043/447] src/finiteVolume/interpolation: Modified code to
 conform to OpenFOAM coding standards declaring the namespace in function
 definitions in C files

---
 .../interpolation/interpolation.C             |  15 +--
 .../interpolationCell/interpolationCell.C     |  15 +--
 .../interpolationCell/makeInterpolationCell.C |  12 +-
 .../interpolationCellPatchConstrained.C       |  15 +--
 .../makeInterpolationCellPatchConstrained.C   |  12 +-
 .../interpolationCellPointFace.C              |  18 +--
 .../makeInterpolationCellPointFace.C          |  12 +-
 .../limitedSchemes/LimitedScheme/LimitFuncs.C |  31 ++---
 .../limitedSurfaceInterpolationScheme.C       |  31 ++---
 .../multivariateSurfaceInterpolationScheme.C  |  18 +--
 .../surfaceInterpolation/surfaceInterpolate.C | 119 ++++++------------
 .../surfaceInterpolationScheme.C              |  48 +++----
 .../volPointInterpolation/pointConstraints.C  |  32 ++---
 .../pointConstraintsTemplates.C               |  19 +--
 .../volPointInterpolate.C                     |  45 +++----
 .../volPointInterpolation.C                   |  32 ++---
 16 files changed, 152 insertions(+), 322 deletions(-)

diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C
index 4383382640..83936a51c4 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,15 +28,10 @@ License
 #include "polyMesh.H"
 #include "calculatedPointPatchFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
-interpolation<Type>::interpolation
+Foam::interpolation<Type>::interpolation
 (
     const GeometricField<Type, fvPatchField, volMesh>& psi
 )
@@ -52,10 +47,6 @@ interpolation<Type>::interpolation
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#   include "interpolationNew.C"
+#include "interpolationNew.C"
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.C b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.C
index 7a623378f7..82356d91aa 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,15 +26,10 @@ License
 #include "interpolationCell.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
-interpolationCell<Type>::interpolationCell
+Foam::interpolationCell<Type>::interpolationCell
 (
     const GeometricField<Type, fvPatchField, volMesh>& psi
 )
@@ -46,7 +41,7 @@ interpolationCell<Type>::interpolationCell
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Type interpolationCell<Type>::interpolate
+Type Foam::interpolationCell<Type>::interpolate
 (
     const vector&,
     const label cellI,
@@ -57,8 +52,4 @@ Type interpolationCell<Type>::interpolate
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCell/makeInterpolationCell.C b/src/finiteVolume/interpolation/interpolation/interpolationCell/makeInterpolationCell.C
index 462e0e14c3..6ba82128b8 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCell/makeInterpolationCell.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCell/makeInterpolationCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,13 +29,7 @@ License
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makeInterpolation(interpolationCell);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makeInterpolation(interpolationCell);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C
index 34fac09627..3f6bfb5a90 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,15 +26,10 @@ License
 #include "interpolationCellPatchConstrained.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
-interpolationCellPatchConstrained<Type>::interpolationCellPatchConstrained
+Foam::interpolationCellPatchConstrained<Type>::interpolationCellPatchConstrained
 (
     const GeometricField<Type, fvPatchField, volMesh>& psi
 )
@@ -46,7 +41,7 @@ interpolationCellPatchConstrained<Type>::interpolationCellPatchConstrained
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Type interpolationCellPatchConstrained<Type>::interpolate
+Type Foam::interpolationCellPatchConstrained<Type>::interpolate
 (
     const vector& pt,
     const label cellI,
@@ -69,8 +64,4 @@ Type interpolationCellPatchConstrained<Type>::interpolate
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/makeInterpolationCellPatchConstrained.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/makeInterpolationCellPatchConstrained.C
index d0cba41cdb..bd0303464d 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/makeInterpolationCellPatchConstrained.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/makeInterpolationCellPatchConstrained.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,13 +29,7 @@ License
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makeInterpolation(interpolationCellPatchConstrained);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makeInterpolation(interpolationCellPatchConstrained);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C
index a1256eb36e..537c686bdb 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,15 +31,10 @@ License
 #include "findCellPointFaceTet.H"
 #include "findCellPointFaceTriangle.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
-interpolationCellPointFace<Type>::interpolationCellPointFace
+Foam::interpolationCellPointFace<Type>::interpolationCellPointFace
 (
     const GeometricField<Type, fvPatchField, volMesh>& psi
 )
@@ -61,7 +56,7 @@ interpolationCellPointFace<Type>::interpolationCellPointFace
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Type interpolationCellPointFace<Type>::interpolate
+Type Foam::interpolationCellPointFace<Type>::interpolate
 (
     const vector& position,
     const label cellI,
@@ -258,8 +253,7 @@ Type interpolationCellPointFace<Type>::interpolate
         }
         else
         {
-            Info<< "interpolationCellPointFace<Type>::interpolate"
-                << "(const vector&, const label cellI) const : "
+            InfoInFunction
                 << "search failed; using closest cellFace value" << endl
                 << "cell number " << cellI << tab
                 << "position " << position << endl;
@@ -363,8 +357,4 @@ Type interpolationCellPointFace<Type>::interpolate
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/makeInterpolationCellPointFace.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/makeInterpolationCellPointFace.C
index 8acd4f1864..0732e5dcaa 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/makeInterpolationCellPointFace.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/makeInterpolationCellPointFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,13 +29,7 @@ License
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makeInterpolation(interpolationCellPointFace);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makeInterpolation(interpolationCellPointFace);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C
index e4f0d4db5c..f966abf7f2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C
@@ -27,16 +27,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-namespace limitFuncs
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 template<class Type>
-inline tmp<volScalarField> magSqr<Type>::operator()
+inline Foam::tmp<Foam::volScalarField>
+Foam::limitFuncs::magSqr<Type>::operator()
 (
     const GeometricField<Type, fvPatchField, volMesh>& phi
 ) const
@@ -46,7 +39,8 @@ inline tmp<volScalarField> magSqr<Type>::operator()
 
 
 template<>
-inline tmp<volScalarField> magSqr<scalar>::operator()
+inline Foam::tmp<Foam::volScalarField>
+Foam::limitFuncs::magSqr<Foam::scalar>::operator()
 (
     const volScalarField& phi
 ) const
@@ -56,7 +50,8 @@ inline tmp<volScalarField> magSqr<scalar>::operator()
 
 
 template<>
-inline tmp<volScalarField> magSqr<symmTensor>::operator()
+inline Foam::tmp<Foam::volScalarField>
+Foam::limitFuncs::magSqr<Foam::symmTensor>::operator()
 (
     const volSymmTensorField& phi
 ) const
@@ -66,7 +61,8 @@ inline tmp<volScalarField> magSqr<symmTensor>::operator()
 
 
 template<>
-inline tmp<volScalarField> magSqr<tensor>::operator()
+inline Foam::tmp<Foam::volScalarField>
+Foam::limitFuncs::magSqr<Foam::tensor>::operator()
 (
     const volTensorField& phi
 ) const
@@ -76,7 +72,8 @@ inline tmp<volScalarField> magSqr<tensor>::operator()
 
 
 template<class Type>
-inline tmp<volScalarField> rhoMagSqr<Type>::operator()
+inline Foam::tmp<Foam::volScalarField>
+Foam::limitFuncs::rhoMagSqr<Type>::operator()
 (
     const GeometricField<Type, fvPatchField, volMesh>& phi
 ) const
@@ -88,7 +85,8 @@ inline tmp<volScalarField> rhoMagSqr<Type>::operator()
 
 
 template<>
-inline tmp<volScalarField> rhoMagSqr<scalar>::operator()
+inline Foam::tmp<Foam::volScalarField>
+Foam::limitFuncs::rhoMagSqr<Foam::scalar>::operator()
 (
     const volScalarField& phi
 ) const
@@ -99,9 +97,4 @@ inline tmp<volScalarField> rhoMagSqr<scalar>::operator()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace limitFuncs
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index fa92112352..08f2ad37f9 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -28,16 +28,11 @@ License
 #include "surfaceFields.H"
 #include "coupledFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<limitedSurfaceInterpolationScheme<Type> >
-limitedSurfaceInterpolationScheme<Type>::New
+Foam::tmp<Foam::limitedSurfaceInterpolationScheme<Type> >
+Foam::limitedSurfaceInterpolationScheme<Type>::New
 (
     const fvMesh& mesh,
     Istream& schemeData
@@ -84,10 +79,9 @@ limitedSurfaceInterpolationScheme<Type>::New
 }
 
 
-// Return weighting factors for scheme given by name in dictionary
 template<class Type>
-tmp<limitedSurfaceInterpolationScheme<Type> >
-limitedSurfaceInterpolationScheme<Type>::New
+Foam::tmp<Foam::limitedSurfaceInterpolationScheme<Type> >
+Foam::limitedSurfaceInterpolationScheme<Type>::New
 (
     const fvMesh& mesh,
     const surfaceScalarField& faceFlux,
@@ -138,14 +132,16 @@ limitedSurfaceInterpolationScheme<Type>::New
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-limitedSurfaceInterpolationScheme<Type>::~limitedSurfaceInterpolationScheme()
+Foam::limitedSurfaceInterpolationScheme<Type>::
+~limitedSurfaceInterpolationScheme()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
+Foam::tmp<Foam::surfaceScalarField>
+Foam::limitedSurfaceInterpolationScheme<Type>::weights
 (
     const GeometricField<Type, fvPatchField, volMesh>& phi,
     const surfaceScalarField& CDweights,
@@ -187,7 +183,8 @@ tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
 }
 
 template<class Type>
-tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
+Foam::tmp<Foam::surfaceScalarField>
+Foam::limitedSurfaceInterpolationScheme<Type>::weights
 (
     const GeometricField<Type, fvPatchField, volMesh>& phi
 ) const
@@ -201,8 +198,8 @@ tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
 }
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-limitedSurfaceInterpolationScheme<Type>::flux
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::limitedSurfaceInterpolationScheme<Type>::flux
 (
     const GeometricField<Type, fvPatchField, volMesh>& phi
 ) const
@@ -211,8 +208,4 @@ limitedSurfaceInterpolationScheme<Type>::flux
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
index b2f683dac2..059d88ebf2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
@@ -31,16 +31,11 @@ Description
 #include "volFields.H"
 #include "surfaceFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 //- Construct from face-flux field and coefficient
 template<class Type>
-multivariateSurfaceInterpolationScheme<Type>::
+Foam::multivariateSurfaceInterpolationScheme<Type>::
 multivariateSurfaceInterpolationScheme
 (
     const fvMesh& mesh,
@@ -56,10 +51,9 @@ multivariateSurfaceInterpolationScheme
 
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
-// Return weighting factors for scheme given by name in dictionary
 template<class Type>
-tmp<multivariateSurfaceInterpolationScheme<Type> >
-multivariateSurfaceInterpolationScheme<Type>::New
+Foam::tmp<Foam::multivariateSurfaceInterpolationScheme<Type> >
+Foam::multivariateSurfaceInterpolationScheme<Type>::New
 (
     const fvMesh& mesh,
     const multivariateSurfaceInterpolationScheme<Type>::fieldTable& vtfs,
@@ -99,13 +93,9 @@ multivariateSurfaceInterpolationScheme<Type>::New
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-multivariateSurfaceInterpolationScheme<Type>::
+Foam::multivariateSurfaceInterpolationScheme<Type>::
 ~multivariateSurfaceInterpolationScheme()
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
index 1cb9326e32..02bf978128 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,19 +27,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace fvc
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Return weighting factors for scheme given by name in dictionary
 template<class Type>
-tmp<surfaceInterpolationScheme<Type> > scheme
+Foam::tmp<Foam::surfaceInterpolationScheme<Type> >
+Foam::fvc::scheme
 (
     const surfaceScalarField& faceFlux,
     Istream& streamData
@@ -54,9 +44,8 @@ tmp<surfaceInterpolationScheme<Type> > scheme
 }
 
 
-// Return weighting factors for scheme given by name in dictionary
 template<class Type>
-tmp<surfaceInterpolationScheme<Type> > scheme
+Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
 (
     const surfaceScalarField& faceFlux,
     const word& name
@@ -71,9 +60,8 @@ tmp<surfaceInterpolationScheme<Type> > scheme
 }
 
 
-// Return weighting factors for scheme given by name in dictionary
 template<class Type>
-tmp<surfaceInterpolationScheme<Type> > scheme
+Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
 (
     const fvMesh& mesh,
     Istream& streamData
@@ -87,9 +75,8 @@ tmp<surfaceInterpolationScheme<Type> > scheme
 }
 
 
-// Return weighting factors for scheme given by name in dictionary
 template<class Type>
-tmp<surfaceInterpolationScheme<Type> > scheme
+Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
 (
     const fvMesh& mesh,
     const word& name
@@ -103,10 +90,9 @@ tmp<surfaceInterpolationScheme<Type> > scheme
 }
 
 
-// Interpolate field onto faces using scheme given by name in dictionary
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const surfaceScalarField& faceFlux,
@@ -115,21 +101,18 @@ interpolate
 {
     if (surfaceInterpolation::debug)
     {
-        Info<< "interpolate"
-            << "(const GeometricField<Type, fvPatchField, volMesh>&, "
-            << "const surfaceScalarField&, Istream&) : "
+        InfoInFunction
             << "interpolating GeometricField<Type, fvPatchField, volMesh> "
-            << endl;
+            << vf.name() << endl;
     }
 
     return scheme<Type>(faceFlux, schemeData)().interpolate(vf);
 }
 
 
-// Interpolate field onto faces using scheme given by name in dictionary
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const surfaceScalarField& faceFlux,
@@ -138,21 +121,17 @@ interpolate
 {
     if (surfaceInterpolation::debug)
     {
-        Info<< "interpolate"
-            << "(const GeometricField<Type, fvPatchField, volMesh>&, "
-            << "const surfaceScalarField&, const word&) : "
+        InfoInFunction
             << "interpolating GeometricField<Type, fvPatchField, volMesh> "
-            << "using " << name
-            << endl;
+            << vf.name() << " using " << name << endl;
     }
 
     return scheme<Type>(faceFlux, name)().interpolate(vf);
 }
 
-// Interpolate field onto faces using scheme given by name in dictionary
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::fvc::interpolate
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
     const surfaceScalarField& faceFlux,
@@ -167,10 +146,9 @@ interpolate
     return tsf;
 }
 
-// Interpolate field onto faces using scheme given by name in dictionary
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const tmp<surfaceScalarField>& tFaceFlux,
@@ -185,10 +163,9 @@ interpolate
     return tsf;
 }
 
-// Interpolate field onto faces using scheme given by name in dictionary
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::fvc::interpolate
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
     const tmp<surfaceScalarField>& tFaceFlux,
@@ -205,10 +182,9 @@ interpolate
 }
 
 
-// Interpolate field onto faces using scheme given by name in dictionary
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     Istream& schemeData
@@ -216,20 +192,17 @@ interpolate
 {
     if (surfaceInterpolation::debug)
     {
-        Info<< "interpolate"
-            << "(const GeometricField<Type, fvPatchField, volMesh>&, "
-            << "Istream&) : "
+        InfoInFunction
             << "interpolating GeometricField<Type, fvPatchField, volMesh> "
-            << endl;
+            << vf.name() << endl;
     }
 
     return scheme<Type>(vf.mesh(), schemeData)().interpolate(vf);
 }
 
-// Interpolate field onto faces using scheme given by name in dictionary
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const word& name
@@ -237,21 +210,18 @@ interpolate
 {
     if (surfaceInterpolation::debug)
     {
-        Info<< "interpolate"
-            << "(const GeometricField<Type, fvPatchField, volMesh>&, "
-            << "const word&) : "
+        InfoInFunction
             << "interpolating GeometricField<Type, fvPatchField, volMesh> "
-            << "using " << name
+            << vf.name() << " using " << name
             << endl;
     }
 
     return scheme<Type>(vf.mesh(), name)().interpolate(vf);
 }
 
-// Interpolate field onto faces using scheme given by name in dictionary
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::fvc::interpolate
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
     const word& name
@@ -266,20 +236,18 @@ interpolate
 }
 
 
-// Interpolate field onto faces using central differencing
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
     if (surfaceInterpolation::debug)
     {
-        Info<< "interpolate"
-            << "(const GeometricField<Type, fvPatchField, volMesh>&) : "
+        InfoInFunction
             << "interpolating GeometricField<Type, fvPatchField, volMesh> "
-            << "using run-time selected scheme"
+            << vf.name() << " using run-time selected scheme"
             << endl;
     }
 
@@ -287,10 +255,9 @@ interpolate
 }
 
 
-// Interpolate field onto faces using central differencing
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::fvc::interpolate
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
 )
@@ -303,7 +270,8 @@ interpolate
 
 
 template<class Type>
-tmp<FieldField<fvsPatchField, Type> > interpolate
+Foam::tmp<Foam::FieldField<Foam::fvsPatchField, Type> >
+Foam::fvc::interpolate
 (
     const FieldField<fvPatchField, Type>& fvpff
 )
@@ -328,7 +296,8 @@ tmp<FieldField<fvsPatchField, Type> > interpolate
 
 
 template<class Type>
-tmp<FieldField<fvsPatchField, Type> > interpolate
+Foam::tmp<Foam::FieldField<Foam::fvsPatchField, Type> >
+Foam::fvc::interpolate
 (
     const tmp<FieldField<fvPatchField, Type> >& tfvpff
 )
@@ -339,12 +308,4 @@ tmp<FieldField<fvsPatchField, Type> > interpolate
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace fvc
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 9068212517..788fffab6e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -21,9 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Abstract base class for surface interpolation schemes.
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceInterpolationScheme.H"
@@ -31,16 +28,11 @@ Description
 #include "surfaceFields.H"
 #include "coupledFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
-// Return weighting factors for scheme given by name in dictionary
 template<class Type>
-tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
+Foam::tmp<Foam::surfaceInterpolationScheme<Type> >
+Foam::surfaceInterpolationScheme<Type>::New
 (
     const fvMesh& mesh,
     Istream& schemeData
@@ -64,7 +56,7 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
     {
         Info<< "surfaceInterpolationScheme<Type>::New"
                "(const fvMesh&, Istream&)"
-               " : discretisation scheme = "
+               " : discretisation scheme === "
             << schemeName
             << endl;
     }
@@ -88,9 +80,9 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
 }
 
 
-// Return weighting factors for scheme given by name in dictionary
 template<class Type>
-tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
+Foam::tmp<Foam::surfaceInterpolationScheme<Type> >
+Foam::surfaceInterpolationScheme<Type>::New
 (
     const fvMesh& mesh,
     const surfaceScalarField& faceFlux,
@@ -142,17 +134,15 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-surfaceInterpolationScheme<Type>::~surfaceInterpolationScheme()
+Foam::surfaceInterpolationScheme<Type>::~surfaceInterpolationScheme()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//- Return the face-interpolate of the given cell field
-//  with the given owner and neighbour weighting factors
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-surfaceInterpolationScheme<Type>::interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::surfaceInterpolationScheme<Type>::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const tmp<surfaceScalarField>& tlambdas,
@@ -234,11 +224,9 @@ surfaceInterpolationScheme<Type>::interpolate
 }
 
 
-//- Return the face-interpolate of the given cell field
-//  with the given weighting factors
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-surfaceInterpolationScheme<Type>::interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::surfaceInterpolationScheme<Type>::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const tmp<surfaceScalarField>& tlambdas
@@ -313,11 +301,9 @@ surfaceInterpolationScheme<Type>::interpolate
 }
 
 
-//- Return the face-interpolate of the given cell field
-//  with explicit correction
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-surfaceInterpolationScheme<Type>::interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::surfaceInterpolationScheme<Type>::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
@@ -345,11 +331,9 @@ surfaceInterpolationScheme<Type>::interpolate
 }
 
 
-//- Return the face-interpolate of the given cell field
-//  with explicit correction
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-surfaceInterpolationScheme<Type>::interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::surfaceInterpolationScheme<Type>::interpolate
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
 ) const
@@ -361,8 +345,4 @@ surfaceInterpolationScheme<Type>::interpolate
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
index 28d3332c1d..480d93c97c 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,19 +30,17 @@ License
 #include "globalMeshData.H"
 #include "twoDPointCorrector.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(pointConstraints, 0);
+    defineTypeNameAndDebug(pointConstraints, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void pointConstraints::makePatchPatchAddressing()
+void Foam::pointConstraints::makePatchPatchAddressing()
 {
     if (debug)
     {
@@ -325,7 +323,7 @@ void pointConstraints::makePatchPatchAddressing()
 
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
-pointConstraints::pointConstraints(const pointMesh& pm)
+Foam::pointConstraints::pointConstraints(const pointMesh& pm)
 :
     MeshObject<pointMesh, Foam::UpdateableMeshObject, pointConstraints>(pm)
 {
@@ -342,7 +340,7 @@ pointConstraints::pointConstraints(const pointMesh& pm)
 
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
-pointConstraints::~pointConstraints()
+Foam::pointConstraints::~pointConstraints()
 {
     if (debug)
     {
@@ -353,19 +351,19 @@ pointConstraints::~pointConstraints()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void pointConstraints::updateMesh(const mapPolyMesh&)
+void Foam::pointConstraints::updateMesh(const mapPolyMesh&)
 {
     makePatchPatchAddressing();
 }
 
 
-bool pointConstraints::movePoints()
+bool Foam::pointConstraints::movePoints()
 {
     return true;
 }
 
 
-void pointConstraints::constrainDisplacement
+void Foam::pointConstraints::constrainDisplacement
 (
     pointVectorField& pf,
     const bool overrideFixedValue
@@ -402,10 +400,8 @@ void pointConstraints::constrainDisplacement
 }
 
 
-// Specialisation of constrainCorners for scalars because
-// no constraint need be applied
 template<>
-void pointConstraints::constrainCorners<scalar>
+void Foam::pointConstraints::constrainCorners<Foam::scalar>
 (
     GeometricField<scalar, pointPatchField, pointMesh>& pf
 ) const
@@ -413,15 +409,11 @@ void pointConstraints::constrainCorners<scalar>
 
 
 template<>
-void pointConstraints::constrainCorners<label>
+void Foam::pointConstraints::constrainCorners<Foam::label>
 (
     GeometricField<label, pointPatchField, pointMesh>& pf
 ) const
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C
index 724d827e7f..355d031a27 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,13 +29,8 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 template<class Type, class CombineOp>
-void pointConstraints::syncUntransformedData
+void Foam::pointConstraints::syncUntransformedData
 (
     const polyMesh& mesh,
     List<Type>& pointData,
@@ -91,7 +86,7 @@ void pointConstraints::syncUntransformedData
 
 
 template<class Type>
-void pointConstraints::setPatchFields
+void Foam::pointConstraints::setPatchFields
 (
     GeometricField<Type, pointPatchField, pointMesh>& pf
 )
@@ -110,7 +105,7 @@ void pointConstraints::setPatchFields
 
 
 template<class Type>
-void pointConstraints::constrainCorners
+void Foam::pointConstraints::constrainCorners
 (
     GeometricField<Type, pointPatchField, pointMesh>& pf
 ) const
@@ -127,7 +122,7 @@ void pointConstraints::constrainCorners
 
 
 template<class Type>
-void pointConstraints::constrain
+void Foam::pointConstraints::constrain
 (
     GeometricField<Type, pointPatchField, pointMesh>& pf,
     const bool overrideFixedValue
@@ -151,8 +146,4 @@ void pointConstraints::constrain
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 2c9bf7d5e4..74f9443967 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,13 +32,8 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 template<class Type>
-void volPointInterpolation::pushUntransformedData
+void Foam::volPointInterpolation::pushUntransformedData
 (
     List<Type>& pointData
 ) const
@@ -81,7 +76,7 @@ void volPointInterpolation::pushUntransformedData
 
 
 template<class Type>
-void volPointInterpolation::addSeparated
+void Foam::volPointInterpolation::addSeparated
 (
     GeometricField<Type, pointPatchField, pointMesh>& pf
 ) const
@@ -123,7 +118,7 @@ void volPointInterpolation::addSeparated
 
 
 template<class Type>
-void volPointInterpolation::interpolateInternalField
+void Foam::volPointInterpolation::interpolateInternalField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     GeometricField<Type, pointPatchField, pointMesh>& pf
@@ -160,7 +155,7 @@ void volPointInterpolation::interpolateInternalField
 
 
 template<class Type>
-tmp<Field<Type> > volPointInterpolation::flatBoundaryField
+Foam::tmp<Foam::Field<Type> > Foam::volPointInterpolation::flatBoundaryField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
@@ -207,7 +202,7 @@ tmp<Field<Type> > volPointInterpolation::flatBoundaryField
 
 
 template<class Type>
-void volPointInterpolation::interpolateBoundaryField
+void Foam::volPointInterpolation::interpolateBoundaryField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     GeometricField<Type, pointPatchField, pointMesh>& pf
@@ -261,7 +256,7 @@ void volPointInterpolation::interpolateBoundaryField
 
 
 template<class Type>
-void volPointInterpolation::interpolateBoundaryField
+void Foam::volPointInterpolation::interpolateBoundaryField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     GeometricField<Type, pointPatchField, pointMesh>& pf,
@@ -278,7 +273,7 @@ void volPointInterpolation::interpolateBoundaryField
 
 
 template<class Type>
-void volPointInterpolation::interpolate
+void Foam::volPointInterpolation::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     GeometricField<Type, pointPatchField, pointMesh>& pf
@@ -301,8 +296,8 @@ void volPointInterpolation::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, pointPatchField, pointMesh> >
-volPointInterpolation::interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::volPointInterpolation::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const wordList& patchFieldTypes
@@ -337,8 +332,8 @@ volPointInterpolation::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, pointPatchField, pointMesh> >
-volPointInterpolation::interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::volPointInterpolation::interpolate
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
     const wordList& patchFieldTypes
@@ -353,8 +348,8 @@ volPointInterpolation::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, pointPatchField, pointMesh> >
-volPointInterpolation::interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::volPointInterpolation::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const word& name,
@@ -448,8 +443,8 @@ volPointInterpolation::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, pointPatchField, pointMesh> >
-volPointInterpolation::interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::volPointInterpolation::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
@@ -459,8 +454,8 @@ volPointInterpolation::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, pointPatchField, pointMesh> >
-volPointInterpolation::interpolate
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::volPointInterpolation::interpolate
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
 ) const
@@ -473,8 +468,4 @@ volPointInterpolation::interpolate
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
index 7a307d31ae..12ca3fea5b 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,19 +31,17 @@ License
 #include "pointConstraints.H"
 #include "surfaceFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(volPointInterpolation, 0);
+    defineTypeNameAndDebug(volPointInterpolation, 0);
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void volPointInterpolation::calcBoundaryAddressing()
+void Foam::volPointInterpolation::calcBoundaryAddressing()
 {
     if (debug)
     {
@@ -154,7 +152,7 @@ void volPointInterpolation::calcBoundaryAddressing()
 }
 
 
-void volPointInterpolation::makeInternalWeights(scalarField& sumWeights)
+void Foam::volPointInterpolation::makeInternalWeights(scalarField& sumWeights)
 {
     if (debug)
     {
@@ -194,7 +192,7 @@ void volPointInterpolation::makeInternalWeights(scalarField& sumWeights)
 }
 
 
-void volPointInterpolation::makeBoundaryWeights(scalarField& sumWeights)
+void Foam::volPointInterpolation::makeBoundaryWeights(scalarField& sumWeights)
 {
     if (debug)
     {
@@ -242,7 +240,7 @@ void volPointInterpolation::makeBoundaryWeights(scalarField& sumWeights)
 }
 
 
-void volPointInterpolation::makeWeights()
+void Foam::volPointInterpolation::makeWeights()
 {
     if (debug)
     {
@@ -348,7 +346,7 @@ void volPointInterpolation::makeWeights()
 
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
-volPointInterpolation::volPointInterpolation(const fvMesh& vm)
+Foam::volPointInterpolation::volPointInterpolation(const fvMesh& vm)
 :
     MeshObject<fvMesh, Foam::UpdateableMeshObject, volPointInterpolation>(vm)
 {
@@ -358,19 +356,19 @@ volPointInterpolation::volPointInterpolation(const fvMesh& vm)
 
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
-volPointInterpolation::~volPointInterpolation()
+Foam::volPointInterpolation::~volPointInterpolation()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void volPointInterpolation::updateMesh(const mapPolyMesh&)
+void Foam::volPointInterpolation::updateMesh(const mapPolyMesh&)
 {
     makeWeights();
 }
 
 
-bool volPointInterpolation::movePoints()
+bool Foam::volPointInterpolation::movePoints()
 {
     makeWeights();
 
@@ -378,7 +376,7 @@ bool volPointInterpolation::movePoints()
 }
 
 
-void volPointInterpolation::interpolateDisplacement
+void Foam::volPointInterpolation::interpolateDisplacement
 (
     const volVectorField& vf,
     pointVectorField& pf
@@ -396,8 +394,4 @@ void volPointInterpolation::interpolateDisplacement
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //

From 9639259350b4252f18b126baf4506b84ae7d7bfc Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Dec 2015 22:37:43 +0000
Subject: [PATCH 044/447] LimitFuncs: Update function specializations to
 satisfy gcc, clang and icpc

---
 .../limitedSchemes/LimitedScheme/LimitFuncs.H | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
index d3726edb60..40a1fe3bb5 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,6 +95,24 @@ public:
     ) const;
 };
 
+template<>
+inline tmp<volScalarField> magSqr<scalar>::operator()
+(
+    const volScalarField& phi
+) const;
+
+template<>
+inline tmp<volScalarField> magSqr<symmTensor>::operator()
+(
+    const volSymmTensorField& phi
+) const;
+
+template<>
+inline tmp<volScalarField> magSqr<tensor>::operator()
+(
+    const volTensorField& phi
+) const;
+
 
 template<class Type>
 class rhoMagSqr
@@ -110,6 +128,12 @@ public:
     ) const;
 };
 
+template<>
+inline tmp<volScalarField> rhoMagSqr<scalar>::operator()
+(
+    const volScalarField& phi
+) const;
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From fc4e7db57921f403951a9a043afebcaa172be08e Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Fri, 11 Dec 2015 12:55:46 +0000
Subject: [PATCH 045/447] compressibleInterFoam: updated tutorials with 0.org
 directory

---
 .../laminar/depthCharge2D/{0/T.org => 0.org/T}        |  0
 .../laminar/depthCharge2D/{0 => 0.org}/U              |  0
 .../{0/alpha.water.org => 0.org/alpha.water}          |  0
 .../laminar/depthCharge2D/{0/p.org => 0.org/p}        |  0
 .../depthCharge2D/{0/p_rgh.org => 0.org/p_rgh}        |  0
 .../laminar/depthCharge2D/Allclean                    | 11 ++++++++---
 .../laminar/depthCharge2D/Allrun                      | 10 ++--------
 .../laminar/depthCharge3D/{0/T.org => 0.org/T}        |  0
 .../laminar/depthCharge3D/{0 => 0.org}/U              |  0
 .../{0/alpha.water.org => 0.org/alpha.water}          |  0
 .../laminar/depthCharge3D/{0/p.org => 0.org/p}        |  0
 .../depthCharge3D/{0/p_rgh.org => 0.org/p_rgh}        |  0
 .../laminar/depthCharge3D/Allclean                    |  8 ++++++--
 .../laminar/depthCharge3D/Allrun                      | 10 ++--------
 14 files changed, 18 insertions(+), 21 deletions(-)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/{0/T.org => 0.org/T} (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/{0 => 0.org}/U (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/{0/alpha.water.org => 0.org/alpha.water} (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/{0/p.org => 0.org/p} (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/{0/p_rgh.org => 0.org/p_rgh} (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/{0/T.org => 0.org/T} (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/{0 => 0.org}/U (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/{0/alpha.water.org => 0.org/alpha.water} (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/{0/p.org => 0.org/p} (100%)
 rename tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/{0/p_rgh.org => 0.org/p_rgh} (100%)

diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/T
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/T
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/U
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/U
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/alpha.water
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/alpha.water
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/p
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/p
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/p_rgh
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/p_rgh
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
index 0240735b43..7ac8041872 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
@@ -1,6 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-foamCleanTutorials cases
-rm -rf processor*
-rm -rf 0/p_rgh.gz 0/p.gz 0/alpha.water.gz 0/T*.gz
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+\rm -rf 0
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
index f6263628f2..c481d2eff2 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
@@ -4,15 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name
-application=`getApplication`
-
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
-cp 0/p_rgh.org 0/p_rgh
-cp 0/p.org 0/p
-cp 0/T.org 0/T
+cp -r 0.org 0
 runApplication setFields
-runApplication $application
+runApplication $(getApplication)
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/T
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/T
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/U
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/U
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/alpha.water
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/alpha.water
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/p
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/p
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/p_rgh
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.org
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/p_rgh
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
index 76a62e8cd5..61b2d9ae0e 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
@@ -1,8 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-foamCleanTutorials cases
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+\rm -rf 0
 rm -rf processor*
-rm -rf 0/p_rgh 0/p 0/alpha.water 0/T 0/T.air 0/T.water
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
index 49bc5fe5a1..aadf250ea3 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
@@ -4,17 +4,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name
-application=`getApplication`
-
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
-cp 0/p_rgh.org 0/p_rgh
-cp 0/p.org 0/p
-cp 0/T.org 0/T
+cp -r 0.org 0
 runApplication setFields
 runApplication decomposePar
-runParallel $application 4
+runParallel $(getApplication) 4
 runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file

From 8899f9ec28c0576763464c9caa3b5bb17519b5f0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 11 Dec 2015 13:11:54 +0000
Subject: [PATCH 046/447] foamSequenceVTKFiles, mpirunDebug: Correct call to
 "usage" Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1946

---
 bin/foamSequenceVTKFiles | 2 +-
 bin/mpirunDebug          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/foamSequenceVTKFiles b/bin/foamSequenceVTKFiles
index fbbfc6014e..b106933ff1 100755
--- a/bin/foamSequenceVTKFiles
+++ b/bin/foamSequenceVTKFiles
@@ -72,7 +72,7 @@ do
       shift 2
       ;;
    -h | -help)
-      printUsage
+      usage
       ;;
    -o | -out)
       [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
diff --git a/bin/mpirunDebug b/bin/mpirunDebug
index b9a284d611..469a285b2f 100755
--- a/bin/mpirunDebug
+++ b/bin/mpirunDebug
@@ -250,7 +250,7 @@ MPICH)
 *)
     echo
     echo "Unsupported WM_MPLIB setting : $WM_MPLIB"
-    printUsage
+    usage
     exit 1
 esac
 

From 40ff6c30e3ee042c1c82f9e16c875622e87f1c4e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 11 Dec 2015 13:12:19 +0000
Subject: [PATCH 047/447] Updated header

---
 bin/mpirunDebug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/mpirunDebug b/bin/mpirunDebug
index 469a285b2f..3be74baa25 100755
--- a/bin/mpirunDebug
+++ b/bin/mpirunDebug
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License

From aacaa9c0d7f807ab86473d6bf257a26e8582961d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 11 Dec 2015 14:21:02 +0000
Subject: [PATCH 048/447] foamSequenceVTKFiles: Avoid the -s and -a options for
 basename Only recent GNU/Linux distributions support this functionality
 Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1947

---
 bin/foamSequenceVTKFiles | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/foamSequenceVTKFiles b/bin/foamSequenceVTKFiles
index b106933ff1..86e5122283 100755
--- a/bin/foamSequenceVTKFiles
+++ b/bin/foamSequenceVTKFiles
@@ -94,7 +94,7 @@ if [ ! -d $DIR ]; then
 fi
 
 FILES=$(find $DIR -type f -name *vtk)
-NAMES=$(basename -s .vtk -a $FILES | sort -u)
+NAMES=$(for f in $FILES; do basename $f .vtk; done | sort -u)
 
 if [ -d $OUT ]; then
     echo "$OUT directory already exists.  Deleting links within it..."

From 107b9370f04c2d93879e827d5f086a132075c89b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 12 Dec 2015 09:00:42 +0000
Subject: [PATCH 049/447] PairCollision: stabilize normalization of the force
 direction for low force Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1948

---
 .../Kinematic/CollisionModel/PairCollision/PairCollision.C      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 185bfb2f52..54131aa829 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -246,7 +246,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
 
                     vector pW = nearPt - pos;
 
-                    scalar normalAlignment = normal & pW/mag(pW);
+                    scalar normalAlignment = normal & pW/(mag(pW) + ROOTSMALL);
 
                     // Find the patchIndex and wallData for WallSiteData object
                     label patchI = patchID[realFaceI - mesh.nInternalFaces()];

From a55d5a9b552c7d3d692f1217dcc041620125c968 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 13 Dec 2015 18:33:01 +0000
Subject: [PATCH 050/447] OSspecific/POSIX: Dynamically resize the path buffer
 in cwd Starting from an initial buffer size of 256 it is incremented in steps
 of 256 upto the maximum of 4096 as required. Based on patch provided by Bruno
 Santos Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1944

---
 src/OSspecific/POSIX/POSIX.C | 76 +++++++++++++++++++++++++-----------
 src/OSspecific/POSIX/POSIX.H |  5 ++-
 2 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 44ee3c7088..9188b7e24c 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -246,19 +246,44 @@ Foam::fileName Foam::home(const string& userName)
 
 Foam::fileName Foam::cwd()
 {
-    char buf[256];
-    if (::getcwd(buf, sizeof(buf)))
-    {
-        return buf;
-    }
-    else
-    {
-        FatalErrorInFunction
-            << "Couldn't get the current working directory"
-            << exit(FatalError);
+    label pathLengthLimit = POSIX::pathLengthChunk;
+    List<char> path(pathLengthLimit);
 
-        return fileName::null;
+    // Resize path if getcwd fails with an ERANGE error
+    while(pathLengthLimit == path.size())
+    {
+        if (::getcwd(path.data(), path.size()))
+        {
+            return path.data();
+        }
+        else if(errno == ERANGE)
+        {
+            // Increment path length upto the pathLengthMax limit
+            if
+            (
+                (pathLengthLimit += POSIX::pathLengthChunk)
+             >= POSIX::pathLengthMax
+            )
+            {
+                FatalErrorInFunction
+                    << "Attempt to increase path length beyond limit of "
+                    << POSIX::pathLengthMax
+                    << exit(FatalError);
+            }
+
+            path.setSize(pathLengthLimit);
+        }
+        else
+        {
+            break;
+        }
     }
+
+    FatalErrorInFunction
+        << "Couldn't get the current working directory"
+        << exit(FatalError);
+
+    return fileName::null;
 }
 
 
@@ -670,8 +695,8 @@ Foam::fileNameList Foam::readDir
 
     if (POSIX::debug)
     {
-        Info<< "readDir(const fileName&, const fileType, const bool filtergz)"
-            << " : reading directory " << directory << endl;
+        InfoInFunction
+            << "reading directory " << directory << endl;
     }
 
     // Setup empty string list MAXTVALUES long
@@ -691,9 +716,8 @@ Foam::fileNameList Foam::readDir
 
         if (POSIX::debug)
         {
-            Info<< "readDir(const fileName&, const fileType, "
-                   "const bool filtergz) : cannot open directory "
-                << directory << endl;
+            InfoInFunction
+                << "cannot open directory " << directory << endl;
         }
     }
     else
@@ -824,7 +848,8 @@ bool Foam::cp(const fileName& src, const fileName& dest)
         {
             if (POSIX::debug)
             {
-                Info<< "Copying : " << src/contents[i]
+                InfoInFunction
+                    << "Copying : " << src/contents[i]
                     << " to " << destFile/contents[i] << endl;
             }
 
@@ -838,7 +863,8 @@ bool Foam::cp(const fileName& src, const fileName& dest)
         {
             if (POSIX::debug)
             {
-                Info<< "Copying : " << src/subdirs[i]
+                InfoInFunction
+                    << "Copying : " << src/subdirs[i]
                     << " to " << destFile << endl;
             }
 
@@ -856,7 +882,8 @@ bool Foam::ln(const fileName& src, const fileName& dst)
 {
     if (POSIX::debug)
     {
-        Info<< "Create softlink from : " << src << " to " << dst
+        InfoInFunction
+            << "Create softlink from : " << src << " to " << dst
             << endl;
     }
 
@@ -893,7 +920,8 @@ bool Foam::mv(const fileName& src, const fileName& dst)
 {
     if (POSIX::debug)
     {
-        Info<< "Move : " << src << " to " << dst << endl;
+        InfoInFunction
+            << "Move : " << src << " to " << dst << endl;
     }
 
     if
@@ -919,7 +947,8 @@ bool Foam::mvBak(const fileName& src, const std::string& ext)
 {
     if (POSIX::debug)
     {
-        Info<< "mvBak : " << src << " to extension " << ext << endl;
+        InfoInFunction
+            << "mvBak : " << src << " to extension " << ext << endl;
     }
 
     if (exists(src, false))
@@ -956,7 +985,8 @@ bool Foam::rm(const fileName& file)
 {
     if (POSIX::debug)
     {
-        Info<< "Removing : " << file << endl;
+        InfoInFunction
+            << "Removing : " << file << endl;
     }
 
     // Try returning plain file name; if not there, try with .gz
@@ -976,7 +1006,7 @@ bool Foam::rmDir(const fileName& directory)
 {
     if (POSIX::debug)
     {
-        Info<< "rmDir(const fileName&) : "
+        InfoInFunction
             << "removing directory " << directory << endl;
     }
 
diff --git a/src/OSspecific/POSIX/POSIX.H b/src/OSspecific/POSIX/POSIX.H
index 9947f3de74..0b17af7325 100644
--- a/src/OSspecific/POSIX/POSIX.H
+++ b/src/OSspecific/POSIX/POSIX.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,6 +48,9 @@ namespace POSIX
 {
     //- Declare name of the class and its debug switch
     NamespaceName("POSIX");
+
+    const label pathLengthChunk = 256;
+    const label pathLengthMax = 4096;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

From 8429569091861a439f3aa6a4da8f1cbbd46809f3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 13 Dec 2015 20:55:24 +0000
Subject: [PATCH 051/447] wclean: Added the target "empty", which removes empty
 directories

It will exit after removing the empty folders and it will not do the
other standard "wclean" operations.  This replaces the functionality
provided by "wrmdepold".

Patch provided by Bruno Santos
---
 wmake/wclean    |  45 +++++++++++-----
 wmake/wrmdepold | 133 ------------------------------------------------
 2 files changed, 32 insertions(+), 146 deletions(-)
 delete mode 100755 wmake/wrmdepold

diff --git a/wmake/wclean b/wmake/wclean
index 28e2621bcc..373b76c70e 100755
--- a/wmake/wclean
+++ b/wmake/wclean
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -40,17 +40,18 @@ Usage: $Script [OPTION] [dir]
        $Script [OPTION] target [dir [MakeDir]]
 
 options:
-  -s | -silent      ignored - for compatibility with wmake
-  -help             print the usage
+  -s | -silent      Ignored - for compatibility with wmake
+  -help             Print the usage
 
 Clean up the wmake control directory Make/\$WM_OPTIONS and remove the
 lnInclude directories generated for libraries.
 
 The targets correspond to a subset of the 'wmake' special targets:
-  all               all subdirectories, uses any Allwclean or Allclean
+  all               All subdirectories, uses any Allwclean or Allclean
                     files if they exist
   exe | lib | libo | libso
-                    clean Make, any *.dep files and lnInclude directories
+                    Clean Make, any *.dep files and lnInclude directories
+  empty             Remove empty sub-directories for the requested dir
 
 USAGE
     exit 1
@@ -67,7 +68,7 @@ do
     -h | -help)
         usage
         ;;
-    -s | -silent)    # ignored - for compatibility with wmake
+    -s | -silent)    # Ignored - for compatibility with wmake
         shift
         ;;
     -*)
@@ -81,7 +82,7 @@ done
 
 
 #------------------------------------------------------------------------------
-# check arguments and change to the directory in which to run wclean
+# Check arguments and change to the directory in which to run wclean
 #------------------------------------------------------------------------------
 
 unset dir targetType
@@ -97,10 +98,10 @@ then
         targetType=$1
     fi
 
-    # specified directory name:
+    # Specified directory name:
     [ $# -ge 2 ] && dir=$2
 
-    # specified alternative name for the Make sub-directory:
+    # Specified alternative name for the Make sub-directory:
     [ $# -ge 3 ] && MakeDir=$3
 
     if [ "$dir" ]
@@ -111,22 +112,40 @@ then
         }
     fi
 
-    # provide some feedback
+    # Provide some feedback
     echo "$Script ${dir:-./}"
 fi
 
 
+#------------------------------------------------------------------------------
+# Remove empty sub-directories and exit
+#------------------------------------------------------------------------------
+
+if [ "$targetType" = empty ]
+then
+    # Get sub-directories avoiding particular directories
+    for dir in $(find . -mindepth 1 -maxdepth 1 \
+                           -type d \( -name .git -prune -o -print \) )
+    do
+        echo "check dir: $dir"
+        find $dir -depth -type d -empty -exec rmdir {} \; -print
+    done
+
+    exit 0
+fi
+
+
 #------------------------------------------------------------------------------
 # Recurse the directories tree
 #------------------------------------------------------------------------------
 
 if [ "$targetType" = all ]
 then
-    if [ -e Allwclean ]       # consistent with Allwmake
+    if [ -e Allwclean ]       # Consistent with Allwmake
     then
         ./Allwclean
         exit $?
-    elif [ -e Allclean ]      # often used for tutorial cases
+    elif [ -e Allclean ]      # Often used for tutorial cases
     then
         ./Allclean
         exit $?
@@ -135,7 +154,7 @@ then
         for dir in `find . \( -type d -a -name Make \)`
         do
             echo $dir
-            $0 ${dir%/Make}   # parent directory - trim /Make from the end
+            $0 ${dir%/Make}   # Parent directory - trim /Make from the end
         done
     fi
 fi
diff --git a/wmake/wrmdepold b/wmake/wrmdepold
deleted file mode 100755
index 61cdc92bc0..0000000000
--- a/wmake/wrmdepold
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  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/>.
-#
-# Script
-#     wrmdepold
-#
-# Description
-#     Usage: wrmdepold [dir1 .. dirN]
-#
-#     Remove *.dep files that are without a corresponding .C or .L source file.
-#     This often occurs when a directory has been moved.
-#         - print questionable directory and the *.dep file
-#         - optionally remove empty directories
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-# Source the wmake functions
-. ${0%/*}/scripts/wmakeFunctions
-
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE
-Usage: $Script [OPTION] [dir1 .. dirN]
-options:
-  -rmdir      find and remove empty directories (recursively)
-
-Remove *.dep files that are without a corresponding .C or .L file.
-This often occurs when a directory has been moved.
-  - print questionable directory and file
-  - optionally remove empty directories
-
-USAGE
-    exit 1
-}
-
-
-#------------------------------------------------------------------------------
-# Parse arguments and options
-#------------------------------------------------------------------------------
-
-unset optRmdir
-
-# parse options
-while [ "$#" -gt 0 ]
-do
-    case "$1" in
-    -h | -help)
-        usage
-        ;;
-    -rmdir)
-        optRmdir=true
-        shift
-        ;;
-    -*)
-       usage "unknown option: '$*'"
-       ;;
-    *)
-       break
-       ;;
-    esac
-done
-
-# Check environment variables
-checkEnv
-
-
-#------------------------------------------------------------------------------
-#
-#------------------------------------------------------------------------------
-
-# Default is the current directory
-[ "$#" -gt 0 ] || set -- .
-
-for checkDir
-do
-    findObjectDir $checkDir
-
-    if [ -d $objectsDir ]
-    then
-        echo "Searching: $objectsDir"
-    else
-        echo "Skipping non-dir: $objectsDir"
-        continue
-    fi
-
-    find $objectsDir -name '*.dep' -print | while read depFile
-    do
-        depToSource $depFile
-
-        # Check C++ or Flex source file exists
-        if [ ! -r "$sourceFile" ];
-        then
-            echo "rm $depFile"
-            rm -f $depFile 2>/dev/null
-        fi
-    done
-
-    # Remove empty dirs
-    if [ "$optRmdir" ]
-    then
-        # get subdirs ourselves so we can avoid particular directories
-        for dir in $(find $objectsDir -mindepth 1 -maxdepth 1 -type d \( -name .git -prune -o -print \) )
-        do
-            echo "check dir: $dir"
-            find $dir -depth -type d -empty -exec rmdir {} \; -print
-        done
-    fi
-done
-
-
-# -----------------------------------------------------------------------------

From f56a738f14c31fcfa2d48584c02ec0b3cd4d641a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 13 Dec 2015 20:57:25 +0000
Subject: [PATCH 052/447] wrmdep: Added "update" option

Searches all the "src" and "application" directories of the project for
broken symbolic links for source code files and then remove all .dep
files that relate to the files that no longer exist.  Must be executed
in main project source code folder: $WM_PROJECT_DIR

Patch provided by Bruno Santos

Resolves feature-request http://www.openfoam.org/mantisbt/view.php?id=1941
---
 wmake/wrmdep | 151 +++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 129 insertions(+), 22 deletions(-)

diff --git a/wmake/wrmdep b/wmake/wrmdep
index 32c14546c0..d3ae409375 100755
--- a/wmake/wrmdep
+++ b/wmake/wrmdep
@@ -24,13 +24,29 @@
 #
 # Script
 #     wrmdep [-a | -all | all] [file]
+#     wrmdep [-o | -old] [dir1 .. dirN]
+#     wrmdep -update
 #
 # Description
+#     This is a catch-all script for pruning .dep files, depending on the
+#     provided arguments.
+#
+#     [-a | -all | all] [file]:
 #     Remove all .dep files from the object directory tree corresponding to the
 #     current source derectory or remove only the .dep files referring to the
 #     optionally specified [file].  With the -a/-all/all option the .dep files
 #     are removed for all platforms rather than just the current platform.
 #
+#     [-o | -old] [dir1 .. dirN]:
+#     Remove *.dep files that are without a corresponding .C or .L source file.
+#     This often occurs when a directory has been moved.
+#         - print questionable directory and the *.dep file
+#
+#     -update:
+#     Search all the "src" and "application" directories of the project for
+#     broken symbolic links for source code files and then remove all .dep
+#     files that relate to files that no longer exist.
+#
 #------------------------------------------------------------------------------
 Script=${0##*/}
 
@@ -41,11 +57,28 @@ usage() {
     exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-Usage: $Script [-a | -all | all] [file]
+Usage:
 
-Remove all .dep files or remove .dep files referring to <file>
-With the -a/-all/all option the .dep files are removed for all platform
-rather than just the current platform.
+    $Script [-a | -all | all] [file]
+
+        Remove all .dep files or remove .dep files referring to <file>
+        With the -a/-all/all option the .dep files are removed for all
+        platform rather than just the current platform.
+
+    $Script [-o | -old] [dir1 .. dirN]
+
+        Remove *.dep files that are without a corresponding .C or .L file.
+        This often occurs when a directory has been moved.
+          - print questionable directory and file
+
+        Note: For removing empty source code folders, run: wclean rmdir
+
+    $Script -update
+
+        Search all the "src" and "application" directories of the project for
+        broken symbolic links for source code files and then remove all .dep
+        files that relate to files that no longer exist.
+        Must be executed in main project source code folder: $WM_PROJECT_DIR
 
 USAGE
     exit 1
@@ -56,6 +89,9 @@ USAGE
 # Parse arguments and options
 #------------------------------------------------------------------------------
 
+# Default is for removing all .dep files in the current directory
+rmdepMode="files"
+
 # Default to processing only the current platform
 all=
 
@@ -71,6 +107,14 @@ do
         all="all"
         shift
         ;;
+    -o | -old)
+        rmdepMode="oldFolders"
+        shift
+        ;;
+    -update)
+        rmdepMode="updateMode"
+        shift
+        ;;
     -*)
        usage "unknown option: '$*'"
        ;;
@@ -84,33 +128,96 @@ done
 checkEnv
 
 
-#------------------------------------------------------------------------------
-# Remove the selected .dep files from the object tree
-#------------------------------------------------------------------------------
+case "$rmdepMode" in
+files)
 
-findObjectDir .
+    #-------------------------------------------------------------------------
+    # Remove the selected .dep files from the object tree
+    #-------------------------------------------------------------------------
 
-# With the -a/-all option replace the current platform with a wildcard
-if [ "$all" = "all" ]
-then
-    objectsDir=$(echo $objectsDir | sed s%$WM_OPTIONS%*% )
-fi
+    findObjectDir .
 
-if [ "$#" -eq 0 ]
-then
-    echo "removing all .dep files ..."
-    find $objectsDir -name '*.dep' -print | xargs -t rm 2>/dev/null
-else
-    echo "removing .dep files referring to $1 ..."
-    find $objectsDir -name '*.dep' -exec grep "$1" '{}' \; -exec rm '{}' \;
-fi
+    # With the -a/-all option replace the current platform with a wildcard
+    if [ "$all" = "all" ]
+    then
+        objectsDir=$(echo $objectsDir | sed s%$WM_OPTIONS%*% )
+    fi
+
+    if [ "$#" -eq 0 ]
+    then
+        echo "removing all .dep files ..."
+        find $objectsDir -name '*.dep' -print | xargs -t rm 2>/dev/null
+    else
+        echo "removing .dep files referring to $1 ..."
+        find $objectsDir -name '*.dep' -exec grep "$1" '{}' \; \
+             -exec rm '{}' \;
+    fi
+
+    ;;
+
+oldFolders)
+
+    # Default is the current directory
+    [ "$#" -gt 0 ] || set -- .
+
+    for checkDir
+    do
+        findObjectDir $checkDir
+
+        if [ -d $objectsDir ]
+        then
+            echo "Searching: $objectsDir"
+        else
+            echo "Skipping non-dir: $objectsDir"
+            continue
+        fi
+
+        find $objectsDir -name '*.dep' -print | while read depFile
+        do
+            depToSource $depFile
+
+            # Check C++ or Flex source file exists
+            if [ ! -r "$sourceFile" ];
+            then
+                echo "rm $depFile"
+                rm -f $depFile 2>/dev/null
+            fi
+        done
+    done
+
+    ;;
+
+updateMode)
+
+    [ -d bin -a -d src ] || usage "not in the project top level directory"
+
+    echo "Purging all dep files that relate to files that no longer exist..."
+    fileNameList=$(find -L src applications -name '*.[CHL]' -type l \
+                        -exec basename {} \;)
+
+    for fileName in $fileNameList
+    do
+        echo "Purging from 'src': $fileName"
+        cd src
+        $Script -a $fileName
+
+        echo "Purging from 'applications': $fileName"
+        cd ../applications
+        $Script -a $fileName
+
+        cd ..
+    done
+
+    ;;
+
+esac
 
 
 #------------------------------------------------------------------------------
 # Cleanup local variables and functions
 #------------------------------------------------------------------------------
 
-unset Script usage
+unset Script usage rmdepMode all
 
 
 #------------------------------------------------------------------------------

From fe1dc82e5a90b2197275c4ced3ca881092b868db Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 13 Dec 2015 21:23:04 +0000
Subject: [PATCH 053/447] wrmdep: Update documentation

---
 wmake/wrmdep | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/wmake/wrmdep b/wmake/wrmdep
index d3ae409375..cea58c901a 100755
--- a/wmake/wrmdep
+++ b/wmake/wrmdep
@@ -39,13 +39,14 @@
 #
 #     [-o | -old] [dir1 .. dirN]:
 #     Remove *.dep files that are without a corresponding .C or .L source file.
-#     This often occurs when a directory has been moved.
-#         - print questionable directory and the *.dep file
+#     This occurs when a directory has been moved.
+#         - prints the questionable directory and *.dep file
 #
 #     -update:
 #     Search all the "src" and "application" directories of the project for
 #     broken symbolic links for source code files and then remove all .dep
 #     files that relate to files that no longer exist.
+#     Must be executed in the project top-level directory: $WM_PROJECT_DIR.
 #
 #------------------------------------------------------------------------------
 Script=${0##*/}
@@ -68,17 +69,17 @@ Usage:
     $Script [-o | -old] [dir1 .. dirN]
 
         Remove *.dep files that are without a corresponding .C or .L file.
-        This often occurs when a directory has been moved.
-          - print questionable directory and file
+        This occurs when a directory has been moved.
+          - prints the questionable directory and *.dep file
 
-        Note: For removing empty source code folders, run: wclean rmdir
+        Note: to remove empty directories, run: wclean empty
 
     $Script -update
 
         Search all the "src" and "application" directories of the project for
         broken symbolic links for source code files and then remove all .dep
         files that relate to files that no longer exist.
-        Must be executed in main project source code folder: $WM_PROJECT_DIR
+        Must be executed in the project top-level directory: $WM_PROJECT_DIR
 
 USAGE
     exit 1
@@ -189,7 +190,7 @@ oldFolders)
 
 updateMode)
 
-    [ -d bin -a -d src ] || usage "not in the project top level directory"
+    [ -d bin -a -d src ] || usage "Not in the project top-level directory"
 
     echo "Purging all dep files that relate to files that no longer exist..."
     fileNameList=$(find -L src applications -name '*.[CHL]' -type l \

From 201366f7f2820b786f4d3e54aeb48516db45fff0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 14 Dec 2015 10:21:22 +0000
Subject: [PATCH 054/447] PairCollision: Reduce division stabilization to SMALL

---
 .../Kinematic/CollisionModel/PairCollision/PairCollision.C      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 54131aa829..6800360b40 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -246,7 +246,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
 
                     vector pW = nearPt - pos;
 
-                    scalar normalAlignment = normal & pW/(mag(pW) + ROOTSMALL);
+                    scalar normalAlignment = normal & pW/(mag(pW) + SMALL);
 
                     // Find the patchIndex and wallData for WallSiteData object
                     label patchI = patchID[realFaceI - mesh.nInternalFaces()];

From f23ab37eca81bc334def1bcf1c9c4181d5240566 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 14 Dec 2015 10:22:06 +0000
Subject: [PATCH 055/447] 
 tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun: Updated to handle
 missing polyMesh dir

---
 tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
index 196a72a1d8..60c6459cfe 100755
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
@@ -19,7 +19,7 @@ runApplication simpleFoam
 # Copy the mesh from the steady state case and map the results to a
 # mesh motion case, then solve transient.
 cd ../wingMotion2D_pimpleDyMFoam
-cp -r ../wingMotion2D_simpleFoam/constant/polyMesh/* constant/polyMesh/
+cp -r ../wingMotion2D_simpleFoam/constant/polyMesh constant
 cp -r 0.org 0
 runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
 mv 0/pointDisplacement.unmapped 0/pointDisplacement

From 3de4dcd838c30722254ef11b16f0bdb6ab020468 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 14 Dec 2015 11:03:16 +0000
Subject: [PATCH 056/447] AllwmakeParseArguments: Added "-update" option
 Updates lnInclude directories and dep files before compilation.  This is
 useful to apply following a "git pull" to ensure consistency between the
 source files, dep files and links.

---
 wmake/scripts/AllwmakeParseArguments | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/wmake/scripts/AllwmakeParseArguments b/wmake/scripts/AllwmakeParseArguments
index cbd5aa01e9..5ed59576ba 100644
--- a/wmake/scripts/AllwmakeParseArguments
+++ b/wmake/scripts/AllwmakeParseArguments
@@ -55,6 +55,7 @@ options:
   -j                Compile using all local cores/hyperthreads
   -jN or -j N       Compile using N cores/hyperthreads
   -no-scheduler     Compile without wmakeScheduler
+  -update           Update lnInclude directories and dep files
 USAGE
 
     # Print options for building code documentation
@@ -122,6 +123,11 @@ do
         -no-scheduler)
             unset WM_SCHEDULER
             ;;
+        # Update lnInclude directories and dep files following a pull
+        -update)
+            wrmdep -update
+            wmakeLnIncludeAll
+            ;;
         # Generate documentation
         doc)
             test -n "$genDoc" || usage "invalid option '$1'"

From 13094c2ab3384971d952d5a532fe3ba04b18a10d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 14 Dec 2015 17:49:02 +0000
Subject: [PATCH 057/447] wcleanAll, wrmdep: Updated check for the
 WM_PROJECT_DIR

---
 wmake/wcleanAll | 3 ++-
 wmake/wrmdep    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wmake/wcleanAll b/wmake/wcleanAll
index f4dfaf5f3a..e26504b7e0 100755
--- a/wmake/wcleanAll
+++ b/wmake/wcleanAll
@@ -61,7 +61,8 @@ do
     esac
 done
 
-[ -d bin -a -d src ] || usage "not in the project top level directory"
+[ "$PWD" = "$WM_PROJECT_DIR" ] \
+    || usage "Not in the project top-level directory"
 
 
 echo "Removing platforms/sub-directories"
diff --git a/wmake/wrmdep b/wmake/wrmdep
index cea58c901a..7853279684 100755
--- a/wmake/wrmdep
+++ b/wmake/wrmdep
@@ -190,7 +190,8 @@ oldFolders)
 
 updateMode)
 
-    [ -d bin -a -d src ] || usage "Not in the project top-level directory"
+    [ "$PWD" = "$WM_PROJECT_DIR" ] \
+        || usage "Not in the project top-level directory"
 
     echo "Purging all dep files that relate to files that no longer exist..."
     fileNameList=$(find -L src applications -name '*.[CHL]' -type l \

From 92ab896216a03c0b00b1b2e3479027f069ae330a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 14 Dec 2015 18:23:50 +0000
Subject: [PATCH 058/447] wmake/makeWmake: Removed Legacy script which is no
 longer used

---
 wmake/makeWmake | 73 -------------------------------------------------
 1 file changed, 73 deletions(-)
 delete mode 100755 wmake/makeWmake

diff --git a/wmake/makeWmake b/wmake/makeWmake
deleted file mode 100755
index 98b5b55e14..0000000000
--- a/wmake/makeWmake
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-#
-# Script
-#     makeWmake
-#
-# Description
-#     Build platform-specific parts of wmake
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE
-Usage: $Script
-
-  Build platform-specific parts of wmake
-
-USAGE
-    exit 1
-}
-
-case "$1" in
--h | -help)
-    usage
-    ;;
-esac
-
-
-echo ========================================
-echo Build platform-specific parts of wmake
-echo
-(
-    set -x
-    make -C ${0%/*}/src $@
-)
-echo
-echo ========================================
-echo Done building wmake
-echo ========================================
-echo
-
-
-#------------------------------------------------------------------------------
-# Cleanup local variables and functions
-#------------------------------------------------------------------------------
-
-unset Script usage
-
-#------------------------------------------------------------------------------

From ea4936fd4ebda9eec0b3bfe82088f8f38273e1a1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 15 Dec 2015 12:12:06 +0000
Subject: [PATCH 059/447] wcleanPlatform: Updated version of wcleanMachine and
 wcleanAll

wcleanPlatform is a more general and cleaner version of wcleanMachine
supporting the "-all" option to provide the equivalent of wcleanAll.

Both wcleanMachine and wcleanAll are now deprecated and will be removed
for the next major release.
---
 wmake/wcleanAll      |   6 ++-
 wmake/wcleanMachine  |   5 ++
 wmake/wcleanPlatform | 125 +++++++++++++++++++++++++++++++++++++++++++
 wmake/wmake          |   4 +-
 4 files changed, 137 insertions(+), 3 deletions(-)
 create mode 100755 wmake/wcleanPlatform

diff --git a/wmake/wcleanAll b/wmake/wcleanAll
index e26504b7e0..0a425b7e90 100755
--- a/wmake/wcleanAll
+++ b/wmake/wcleanAll
@@ -26,7 +26,9 @@
 #     wcleanAll
 #
 # Description
-#     search all the directories below the current for the object file
+#     Deprecated: replaced by wcleanPlatform -all
+#
+#     Search all the directories below the current for the object file
 #     directories of all machines and delete them.
 #
 #------------------------------------------------------------------------------
@@ -36,6 +38,8 @@ usage() {
     exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
+Deprecated: replaced by wcleanPlatform -all
+
 Usage: $Script
 
     Remove all object and related files
diff --git a/wmake/wcleanMachine b/wmake/wcleanMachine
index 04bf7dd0ed..1ae2561b45 100755
--- a/wmake/wcleanMachine
+++ b/wmake/wcleanMachine
@@ -26,6 +26,9 @@
 #     wcleanMachine
 #
 # Description
+#
+#     Deprecated: replaced by wcleanPlatform
+#
 #     Searches the directory tree starting at the current directory for the
 #     object file directories of the specified machine type(s) and deletes them.
 #     If a machine type is not provided the current machine type is assumed.
@@ -40,6 +43,8 @@ usage() {
     exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
+Deprecated: replaced by wcleanPlatform
+
 Usage: $Script machineType [... machineTypeN] [ -current ]
 
   Searches the directory tree starting at the current directory for the
diff --git a/wmake/wcleanPlatform b/wmake/wcleanPlatform
new file mode 100755
index 0000000000..6a60af1930
--- /dev/null
+++ b/wmake/wcleanPlatform
@@ -0,0 +1,125 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  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/>.
+#
+# Script
+#     wcleanPlatform
+#
+# Description
+#     Deletes the specified platforms object files directories from the
+#     the project top-level platforms directory $WM_PROJECT_DIR.
+#
+#     You need to be in the project top-level directory to run this script.
+#
+#     If either -current or no platform is specified then the current platform
+#     $WM_OPTIONS is deleted.
+#
+#     If the -all option is specified all platforms and lnInclude directories
+#     are deleted
+#
+#     Usage: wcleanPlatform [ -current | -all ]
+#            wcleanPlatform <platform> [ ... <platformN> ]
+#
+#     -current: clean the current platform
+#     -all: clean all platforms
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+usage() {
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+Usage: $Script [ -current | -all ]
+       $Script <platform> [ ... <platformN> ]
+
+  Deletes the specified platforms object files directories from the
+  the project top-level platforms directory $WM_PROJECT_DIR.
+
+  You need to be in the project top-level directory to run this script.
+
+  If either -current or no platform is specified then the current platform
+  $WM_OPTIONS is deleted.
+
+  If the -all option is specified all platforms and lnInclude directories
+  are deleted.
+
+USAGE
+    exit 1
+}
+
+# Print help message
+if [ "$1" = "-h" -o "$1" = "-help" ]; then
+    usage
+fi
+
+# Check the script is executed from the project top-level directory
+[ "$PWD" = "$WM_PROJECT_DIR" ] || \
+    usage "Not in the project top-level directory " $WM_PROJECT_DIR
+
+# Get the platforms from the arguments
+platforms="$@"
+
+# If no arguments are provided select the current platform
+if [ "$#" -lt 1 ]; then
+    platforms="-current"
+fi
+
+if [ "$platforms" = "-all" ]; then
+    echo "Removing all platforms/sub-directories"
+    rm -rf platforms/*
+
+    echo "Removing lnInclude directories"
+    find . -depth -type d \( -name lnInclude \) | xargs rm -rf
+
+    tutorials/Allclean
+else
+    # Loop over the platforms specified and delete the object directories
+    for platform in $platforms
+    do
+        if [ "$platform" = "-current" ]
+        then
+            platform="$WM_OPTIONS"
+            echo "Current platform $platform"
+            [ -n "$platform" ] || continue
+        fi
+
+        if [ -d platforms/${platform} ]
+        then
+            echo "Cleaning platform $platform"
+            rm -rf platforms/${platform}*
+        else
+            echo "Platform $platform not built"
+        fi
+    done
+fi
+
+
+#------------------------------------------------------------------------------
+# Cleanup local variables and functions
+#------------------------------------------------------------------------------
+
+unset Script platforms
+
+
+#------------------------------------------------------------------------------
diff --git a/wmake/wmake b/wmake/wmake
index 9dfad12d9f..2a3c9ed9c7 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -49,8 +49,8 @@
 #         wdep -h
 #
 # See also
-#     wmakeLnInclude, wmakeLnIncludeAll, wdep, wrmdep, wrmo and wrmdepold,
-#     wclean, wcleanMachine, wcleanAll, wcleanLnIncludeAll
+#     wmakeLnInclude, wmakeLnIncludeAll, wdep, wrmdep, wrmo,
+#     wclean, wcleanPlatform, wcleanLnIncludeAll
 #
 #------------------------------------------------------------------------------
 Script=${0##*/}

From 4b7c3ea5a5ee2d46f64eb290e1cd77a2b264c2ad Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 15 Dec 2015 15:38:59 +0000
Subject: [PATCH 060/447] wmakeLnInclude: Use xargs with find

---
 wmake/wmakeLnInclude | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wmake/wmakeLnInclude b/wmake/wmakeLnInclude
index b68c31a6e0..2287e231d6 100755
--- a/wmake/wmakeLnInclude
+++ b/wmake/wmakeLnInclude
@@ -150,7 +150,7 @@ fi
 #------------------------------------------------------------------------------
 # Remove any broken links first (this helps when file locations have moved)
 #------------------------------------------------------------------------------
-find -L . -type l -exec rm {} \;
+find -L . -type l | xargs rm
 
 
 #------------------------------------------------------------------------------

From 3713b9e19bdc6423325a4fbe919331ef9a7227bc Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 15 Dec 2015 15:39:19 +0000
Subject: [PATCH 061/447] Updated header

---
 wmake/wmakeLnInclude | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wmake/wmakeLnInclude b/wmake/wmakeLnInclude
index 2287e231d6..74f0147cbf 100755
--- a/wmake/wmakeLnInclude
+++ b/wmake/wmakeLnInclude
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License

From 416b0a6f2acde981471f04b7972413dd4a7c57f9 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 15 Dec 2015 15:39:26 +0000
Subject: [PATCH 062/447] wmakeLnIncludeAll: Start messages with capital

---
 wmake/wmakeLnIncludeAll | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wmake/wmakeLnIncludeAll b/wmake/wmakeLnIncludeAll
index 0ecaf9ec5d..f1f591ef82 100755
--- a/wmake/wmakeLnIncludeAll
+++ b/wmake/wmakeLnIncludeAll
@@ -75,10 +75,10 @@ for checkDir
 do
     if [ -d $checkDir ]
     then
-        echo "searching: $checkDir for 'Make' directories"
+        echo "Searching: $checkDir for 'Make' directories"
         echo "---------"
     else
-        echo "skipping non-dir: $checkDir"
+        echo "Skipping non-dir: $checkDir"
         echo "----------------"
         continue
     fi

From d112699c9fee401c59e111dfd331235d9abd54d6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 15 Dec 2015 15:40:06 +0000
Subject: [PATCH 063/447] Updated header

---
 wmake/wmakeLnIncludeAll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wmake/wmakeLnIncludeAll b/wmake/wmakeLnIncludeAll
index f1f591ef82..fb85a6107d 100755
--- a/wmake/wmakeLnIncludeAll
+++ b/wmake/wmakeLnIncludeAll
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License

From 4976c6e522139baae203f2b3bebf31fff9723781 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 15 Dec 2015 19:05:08 +0000
Subject: [PATCH 064/447] SRFSimpleFoam: Change from pure RAS to any turbulence
 model Provides support for running laminar. Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1951

---
 .../incompressible/simpleFoam/SRFSimpleFoam/createFields.H    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
index 5658b68ec6..ea565f0949 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
@@ -64,7 +64,7 @@ volVectorField U
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::RASModel> turbulence
+autoPtr<incompressible::turbulenceModel> turbulence
 (
-    incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
+    incompressible::turbulenceModel::New(U, phi, laminarTransport)
 );

From 2647d178fa86ffb3d8fc9713a9cf7135da190bbd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 16 Dec 2015 10:13:09 +0000
Subject: [PATCH 065/447] solvers: Change from pure RAS to any turbulence model
 Provides support for running laminar.

---
 .../compressible/rhoSimpleFoam/createFields.H |  4 +-
 .../rhoPorousSimpleFoam/createFields.H        |  4 +-
 .../createFields.H                            |  4 +-
 .../createFields.H                            |  4 +-
 .../buoyantSimpleFoam/createFields.H          |  4 +-
 .../heatTransfer/thermoFoam/setAlphaEff.H     | 54 ++-----------------
 .../createFields.H                            |  4 +-
 .../boundaryFoam/createFields.H               |  4 +-
 8 files changed, 19 insertions(+), 63 deletions(-)

diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 80f317cd85..61cea5c2e5 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -69,9 +69,9 @@ dimensionedScalar rhoMin
 );
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::RASModel> turbulence
+autoPtr<compressible::turbulenceModel> turbulence
 (
-    compressible::New<compressible::RASModel>
+    compressible::turbulenceModel::New
     (
         rho,
         U,
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
index 537eea2ea3..2fe0e53dbc 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
@@ -68,9 +68,9 @@ dimensionedScalar rhoMin
 );
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::RASModel> turbulence
+autoPtr<compressible::turbulenceModel> turbulence
 (
-    compressible::New<compressible::RASModel>
+    compressible::turbulenceModel::New
     (
         rho,
         U,
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
index b8d07b1f1a..0916e2788d 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
@@ -47,9 +47,9 @@ volVectorField U
 #include "readTransportProperties.H"
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<incompressible::RASModel> turbulence
+autoPtr<incompressible::turbulenceModel> turbulence
 (
-    incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
+    incompressible::turbulenceModel::New(U, phi, laminarTransport)
 );
 
 // Kinematic density for buoyancy force
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
index 014bf8045c..e78daa67b3 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
@@ -47,9 +47,9 @@ volVectorField U
 #include "readTransportProperties.H"
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<incompressible::RASModel> turbulence
+autoPtr<incompressible::turbulenceModel> turbulence
 (
-    incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
+    incompressible::turbulenceModel::New(U, phi, laminarTransport)
 );
 
 // Kinematic density for buoyancy force
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
index d7cf3eb704..35c6c59560 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
@@ -37,9 +37,9 @@ volVectorField U
 #include "compressibleCreatePhi.H"
 
 Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::RASModel> turbulence
+autoPtr<compressible::turbulenceModel> turbulence
 (
-    compressible::New<compressible::RASModel>
+    compressible::turbulenceModel::New
     (
         rho,
         U,
diff --git a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
index 4af3af3ce4..fff960526f 100644
--- a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
+++ b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
@@ -1,31 +1,17 @@
     Info<< "Creating turbulence model\n" << endl;
     tmp<volScalarField> talphaEff;
 
-    IOobject turbulenceHeader
+    IOobject turbulencePropertiesHeader
     (
         "turbulenceProperties",
         runTime.constant(),
         mesh,
-        IOobject::MUST_READ
+        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::NO_WRITE,
+        false
     );
 
-    IOobject RASHeader
-    (
-        "RASProperties",
-        runTime.constant(),
-        mesh,
-        IOobject::MUST_READ
-    );
-
-    IOobject LESHeader
-    (
-        "LESProperties",
-        runTime.constant(),
-        mesh,
-        IOobject::MUST_READ
-    );
-
-    if (turbulenceHeader.headerOk())
+    if (turbulencePropertiesHeader.headerOk())
     {
         autoPtr<compressible::turbulenceModel> turbulence
         (
@@ -40,36 +26,6 @@
 
         talphaEff = turbulence->alphaEff();
     }
-    else if (RASHeader.headerOk())
-    {
-        autoPtr<compressible::RASModel> turbulence
-        (
-            compressible::New<compressible::RASModel>
-            (
-                rho,
-                U,
-                phi,
-                thermo
-            )
-        );
-
-        talphaEff = turbulence->alphaEff();
-    }
-    else if (LESHeader.headerOk())
-    {
-        autoPtr<compressible::LESModel> turbulence
-        (
-            compressible::New<compressible::LESModel>
-            (
-                rho,
-                U,
-                phi,
-                thermo
-            )
-        );
-
-        talphaEff = turbulence->alphaEff();
-    }
     else
     {
         talphaEff = tmp<volScalarField>
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
index cb7da73687..93da72123d 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
@@ -80,9 +80,9 @@ mesh.setFluxRequired(pa.name());
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::RASModel> turbulence
+autoPtr<incompressible::turbulenceModel> turbulence
 (
-    incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
+    incompressible::turbulenceModel::New(U, phi, laminarTransport)
 );
 
 
diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H
index 5ecfebfcb4..0298c8339c 100644
--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@@ -31,9 +31,9 @@ surfaceScalarField phi
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::RASModel> turbulence
+autoPtr<incompressible::turbulenceModel> turbulence
 (
-    incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
+    incompressible::turbulenceModel::New(U, phi, laminarTransport)
 );
 
 dimensionedVector Ubar("Ubar", dimVelocity, laminarTransport);

From 5355dbc5fe49af11daf5995dfdc239a6b7a0db42 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 16 Dec 2015 18:31:02 +0000
Subject: [PATCH 066/447] wmake: General cleanup to improve consistency and
 maintainability

The Makefiles are now in the makefiles sub-directory

The "-f | -force" option in wmakeLnInclude is now "-u | -update" for
consistency with the other scripts.

The "Usage" entry in the headers is now consistently formatted in all
scripts.
---
 wmake/{MakefileApps => makefiles/apps}   |   4 +-
 wmake/{MakefileFiles => makefiles/files} |   2 +-
 wmake/{Makefile => makefiles/general}    |   6 +-
 wmake/wclean                             |   4 +
 wmake/wcleanAll                          |  96 ---------------------
 wmake/wcleanLnIncludeAll                 |   7 +-
 wmake/wcleanMachine                      | 103 -----------------------
 wmake/wcleanPlatform                     |  14 +--
 wmake/wdep                               |   3 +
 wmake/wmake                              |  15 ++--
 wmake/wmakeCheckPwd                      |   5 +-
 wmake/wmakeFilesAndOptions               |   7 +-
 wmake/wmakeLnInclude                     |  20 ++---
 wmake/wmakeLnIncludeAll                  |   9 +-
 wmake/wmakePrintBuild                    |   5 +-
 wmake/wmakeScheduler                     |  30 +++----
 wmake/wmakeSchedulerUptime               |  18 ++--
 wmake/wrmdep                             |   4 +-
 wmake/wrmo                               |   3 +
 19 files changed, 92 insertions(+), 263 deletions(-)
 rename wmake/{MakefileApps => makefiles/apps} (94%)
 rename wmake/{MakefileFiles => makefiles/files} (99%)
 rename wmake/{Makefile => makefiles/general} (97%)
 delete mode 100755 wmake/wcleanAll
 delete mode 100755 wmake/wcleanMachine

diff --git a/wmake/MakefileApps b/wmake/makefiles/apps
similarity index 94%
rename from wmake/MakefileApps
rename to wmake/makefiles/apps
index 20955e788e..b8abcd2e95 100644
--- a/wmake/MakefileApps
+++ b/wmake/makefiles/apps
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     MakefileApps
+#     wmake/makefiles/apps
 #
 # Description
 #     Makefile used by
diff --git a/wmake/MakefileFiles b/wmake/makefiles/files
similarity index 99%
rename from wmake/MakefileFiles
rename to wmake/makefiles/files
index 8c5535354a..91bff6265e 100644
--- a/wmake/MakefileFiles
+++ b/wmake/makefiles/files
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     MakefileFiles
+#     wmake/makefiles/files
 #
 # Description
 #     A Makefile for the 'options' and 'files' files, used by wmake
diff --git a/wmake/Makefile b/wmake/makefiles/general
similarity index 97%
rename from wmake/Makefile
rename to wmake/makefiles/general
index 38f3f1a714..2fc320de19 100644
--- a/wmake/Makefile
+++ b/wmake/makefiles/general
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,10 +22,10 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     Makefile
+#     wmake/makefiles/general
 #
 # Description
-#     A generic Makefile, used by wmake
+#     Makefile used by wmake to make dependency files and libs and applications
 #
 #------------------------------------------------------------------------------
 
diff --git a/wmake/wclean b/wmake/wclean
index 373b76c70e..c4f3808ba5 100755
--- a/wmake/wclean
+++ b/wmake/wclean
@@ -25,6 +25,10 @@
 # Script
 #     wclean
 #
+# Usage
+#     wclean [OPTION] [dir]
+#     wclean [OPTION] target [dir [MakeDir]]
+#
 # Description
 #     Clean up the wmake control directory Make/\$WM_OPTIONS and remove the
 #     lnInclude directories generated for libraries.
diff --git a/wmake/wcleanAll b/wmake/wcleanAll
deleted file mode 100755
index 0a425b7e90..0000000000
--- a/wmake/wcleanAll
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  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/>.
-#
-# Script
-#     wcleanAll
-#
-# Description
-#     Deprecated: replaced by wcleanPlatform -all
-#
-#     Search all the directories below the current for the object file
-#     directories of all machines and delete them.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE
-Deprecated: replaced by wcleanPlatform -all
-
-Usage: $Script
-
-    Remove all object and related files
-
-USAGE
-    exit 1
-}
-
-
-#------------------------------------------------------------------------------
-# Parse arguments and options
-#------------------------------------------------------------------------------
-
-while [ "$#" -gt 0 ]
-do
-    case "$1" in
-    -h | -help)
-        usage
-        ;;
-    *)
-        usage "unknown option/argument: '$*'"
-        ;;
-    esac
-done
-
-[ "$PWD" = "$WM_PROJECT_DIR" ] \
-    || usage "Not in the project top-level directory"
-
-
-echo "Removing platforms/sub-directories"
-rm -rf platforms/*
-
-echo "Cleaning Make sub-directories"
-find . -depth \( -name Make -o -name "Make.[A-Za-z]*" \) -type d -print | \
-    xargs -I {} find '{}' -mindepth 1 -maxdepth 1 -type d -print | \
-    xargs rm -rf
-
-echo "Removing lnInclude directories"
-find . -depth -type d \( -name lnInclude \) -exec rm -rf {} \;
-
-echo "Removing misc files"
-find . \( -name exe -o -name log \) -exec rm {} \;
-
-tutorials/Allclean
-
-
-#------------------------------------------------------------------------------
-# Cleanup local variables and functions
-#------------------------------------------------------------------------------
-
-unset Script usage
-
-
-#------------------------------------------------------------------------------
diff --git a/wmake/wcleanLnIncludeAll b/wmake/wcleanLnIncludeAll
index 09eb1f6861..a1673d53ba 100755
--- a/wmake/wcleanLnIncludeAll
+++ b/wmake/wcleanLnIncludeAll
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -25,10 +25,13 @@
 # Script
 #     wcleanLnIncludeAll
 #
+# Usage
+#     wcleanLnIncludeAll [dir1] .. [dirN]
+#
 # Description
 #     Delete all the lnInclude directories in the tree.
 #
-#------------------------------------------------------------------------------
+##------------------------------------------------------------------------------
 Script=${0##*/}
 
 # Default to the CWD
diff --git a/wmake/wcleanMachine b/wmake/wcleanMachine
deleted file mode 100755
index 1ae2561b45..0000000000
--- a/wmake/wcleanMachine
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  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/>.
-#
-# Script
-#     wcleanMachine
-#
-# Description
-#
-#     Deprecated: replaced by wcleanPlatform
-#
-#     Searches the directory tree starting at the current directory for the
-#     object file directories of the specified machine type(s) and deletes them.
-#     If a machine type is not provided the current machine type is assumed.
-#
-#     Usage: wcleanMachine [ -current ]
-#            wcleanMachine <machineType> [ .. <machineTypeN> ]
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-usage() {
-    exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE
-Deprecated: replaced by wcleanPlatform
-
-Usage: $Script machineType [... machineTypeN] [ -current ]
-
-  Searches the directory tree starting at the current directory for the
-  object file directories of the specified machine type(s) and deletes them.
-  If either -current or no machine type is specified then the current type
-  is assumed (from $WM_OPTIONS).
-
-USAGE
-    exit 1
-}
-
-# Print help message
-if [ "$1" = "-h" -o "$1" = "-help" ]
-then
-    usage
-fi
-
-# Get the machines from the arguments
-machines="$@"
-
-# If no arguments are provided default to current machine type
-if [ "$#" -lt 1 ]
-then
-    machines="-current"
-fi
-
-# Loop over all the machine types specified and delete the object directories
-for machType in $machines
-do
-    if [ "$machType" = "-current" ]
-    then
-        machType="$WM_OPTIONS"
-        echo "Current machine type: $machType"
-        [ -n "$machType" ] || continue
-    fi
-
-    echo "Cleaning machine type: $machType"
-
-    find . -depth \( -name Make -o -name "Make.[A-Za-z]*" \) -type d -print | \
-        xargs -I {} find '{}' -mindepth 1 -maxdepth 1 \
-              \( -type d -name "*$machType" -o -name "*$machType$WM_MPLIB" \) \
-              -print | xargs rm -rf
-
-    rm -rf platforms/${machType}*
-
-done
-
-
-#------------------------------------------------------------------------------
-# Cleanup local variables and functions
-#------------------------------------------------------------------------------
-
-unset Script machines
-
-
-#------------------------------------------------------------------------------
diff --git a/wmake/wcleanPlatform b/wmake/wcleanPlatform
index 6a60af1930..a9d20ceea9 100755
--- a/wmake/wcleanPlatform
+++ b/wmake/wcleanPlatform
@@ -25,24 +25,26 @@
 # Script
 #     wcleanPlatform
 #
+# Usage
+#    wcleanPlatform [ -current | -all ]
+#    wcleanPlatform <platform> [ ... <platformN> ]
+#
 # Description
 #     Deletes the specified platforms object files directories from the
 #     the project top-level platforms directory $WM_PROJECT_DIR.
 #
 #     You need to be in the project top-level directory to run this script.
 #
+#     Options
+#         -current: clean the current platform
+#         -all: clean all platforms
+#
 #     If either -current or no platform is specified then the current platform
 #     $WM_OPTIONS is deleted.
 #
 #     If the -all option is specified all platforms and lnInclude directories
 #     are deleted
 #
-#     Usage: wcleanPlatform [ -current | -all ]
-#            wcleanPlatform <platform> [ ... <platformN> ]
-#
-#     -current: clean the current platform
-#     -all: clean all platforms
-#
 #------------------------------------------------------------------------------
 Script=${0##*/}
 
diff --git a/wmake/wdep b/wmake/wdep
index a89f81138f..916ef72cb2 100755
--- a/wmake/wdep
+++ b/wmake/wdep
@@ -23,6 +23,9 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
+#     wdep
+#
+# Usage
 #     wdep <file>
 #     cat `wdep <file>`
 #
diff --git a/wmake/wmake b/wmake/wmake
index 2a3c9ed9c7..623a15fcdd 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -230,7 +230,7 @@ then
         then
             # Compile all applications in sub-directories
             $make ${WM_CONTINUE_ON_ERROR:+-k} \
-                  -f $WM_DIR/MakefileApps \
+                  -f $WM_DIR/makefiles/apps \
                   TARGET="$targetType" FOAM_APPS="$FOAM_APPS"
         fi
         # If the current directory contains a 'Make' directory continue
@@ -335,10 +335,11 @@ fi
 
     # Pre-build the $WM_OPTIONS/options file
     # which is included when building the $WM_OPTIONS/files file
-    $make -s -f $WM_DIR/MakefileFiles MAKE_DIR=$MakeDir OBJECTS_DIR=$objectsDir\
-          $objectsDir/options
+    $make -s -f $WM_DIR/makefiles/files MAKE_DIR=$MakeDir \
+          OBJECTS_DIR=$objectsDir $objectsDir/options
 
-    $make -s -f $WM_DIR/MakefileFiles MAKE_DIR=$MakeDir OBJECTS_DIR=$objectsDir
+    $make -s -f $WM_DIR/makefiles/files MAKE_DIR=$MakeDir \
+          OBJECTS_DIR=$objectsDir
 )
 
 
@@ -363,7 +364,7 @@ case "$targetType" in
         # ... but only if 'LIB' is declared in 'Make/files'
         if grep -e '^ *LIB *=' "$MakeDir/files" >/dev/null 2>&1
         then
-            $make -s -f $WM_DIR/Makefile MAKE_DIR=$MakeDir \
+            $make -s -f $WM_DIR/makefiles/general MAKE_DIR=$MakeDir \
                   OBJECTS_DIR=$objectsDir lnInclude
         fi
         ;;
@@ -374,8 +375,8 @@ esac
 # Make the dependency files or object files and link
 #------------------------------------------------------------------------------
 
-exec $make -f $WM_DIR/Makefile MAKE_DIR=$MakeDir OBJECTS_DIR=$objectsDir \
-     $targetType
+exec $make -f $WM_DIR/makefiles/general MAKE_DIR=$MakeDir \
+     OBJECTS_DIR=$objectsDir $targetType
 
 
 #------------------------------------------------------------------------------
diff --git a/wmake/wmakeCheckPwd b/wmake/wmakeCheckPwd
index 75aedba30d..f10b6d2339 100755
--- a/wmake/wmakeCheckPwd
+++ b/wmake/wmakeCheckPwd
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -23,6 +23,9 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
+#     wmakeCheckPwd
+#
+# Usage
 #     wmakeCheckPwd <dir>
 #
 # Description
diff --git a/wmake/wmakeFilesAndOptions b/wmake/wmakeFilesAndOptions
index 022d3ed245..560f2c1ad6 100755
--- a/wmake/wmakeFilesAndOptions
+++ b/wmake/wmakeFilesAndOptions
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -25,12 +25,13 @@
 # Script
 #     wmakeFilesAndOptions
 #
+# Usage
+#     wmakeFilesAndOptions
+#
 # Description
 #     Scan current directory for directories and source files
 #     and construct Make/files and Make/options
 #
-#     Usage : wmakeFilesAndOptions
-#
 #------------------------------------------------------------------------------
 Script=${0##*/}
 
diff --git a/wmake/wmakeLnInclude b/wmake/wmakeLnInclude
index 74f0147cbf..05d2b9f516 100755
--- a/wmake/wmakeLnInclude
+++ b/wmake/wmakeLnInclude
@@ -25,17 +25,17 @@
 # Script
 #     wmakeLnInclude
 #
+# Usage
+#     wmakeLnInclude [-u | -update] [-s | -silent] <dir>
+#
 # Description
 #     Link all the source files in the <dir> directory into <dir>/lnInclude
 #
-#     Usage: wmakeLnInclude [-f] <dir>
-#
 #     The desired source files:
 #         *.C *.H *.h *.cpp *.cxx *.hpp *.hxx
 #
 #     Avoid
 #         *.c (C source)
-#         .#* (cvs recovered files)
 #
 #------------------------------------------------------------------------------
 Script=${0##*/}
@@ -48,14 +48,14 @@ usage() {
 Usage: $Script [OPTION] dir
 
 options:
-  -f | -force       force update
+  -u | -update      update
   -s | -silent      use 'silent' mode (do not echo command)
   -help             print the usage
 
     Link all the source files in the <dir> into <dir>/lnInclude
 
 Note
-    The '-f' option forces an update when the lnInclude directory already exists
+    The '-u' option forces an update when the lnInclude directory already exists
     and changes the default linking from 'ln -s' to 'ln -sf'.
 
 USAGE
@@ -73,7 +73,7 @@ unset findOpt
 # Default 'ln' option
 lnOpt="-s"
 
-unset forceUpdate silentOpt
+unset update silentOpt
 
 while [ "$#" -gt 0 ]
 do
@@ -81,8 +81,8 @@ do
     -h | -help)   # provide immediate help
         usage
         ;;
-    -f | -force)
-        forceUpdate=true
+    -u | -update)
+        update=true
         lnOpt="-sf"
         shift
         ;;
@@ -126,7 +126,7 @@ incDir=$baseDir/lnInclude
 
 if [ -d $incDir ]
 then
-    [ "$forceUpdate" = true ] || {
+    [ "$update" = true ] || {
         # echo "$Script error: include directory $incDir already exists" 1>&2
         exit 0
     }
@@ -150,7 +150,7 @@ fi
 #------------------------------------------------------------------------------
 # Remove any broken links first (this helps when file locations have moved)
 #------------------------------------------------------------------------------
-find -L . -type l | xargs rm
+find -L . -type l | xargs rm -f
 
 
 #------------------------------------------------------------------------------
diff --git a/wmake/wmakeLnIncludeAll b/wmake/wmakeLnIncludeAll
index fb85a6107d..2aa833c8d6 100755
--- a/wmake/wmakeLnIncludeAll
+++ b/wmake/wmakeLnIncludeAll
@@ -25,9 +25,12 @@
 # Script
 #     wmakeLnIncludeAll
 #
+# Usage
+#     wmakeLnIncludeAll [dir1 .. dirN]
+#
 # Description
 #     Find directories with a 'Make/files' that contains a 'LIB =' directive
-#     and execute 'wmakeLnInclude -f' for each one
+#     and execute 'wmakeLnInclude -update' for each one
 #
 #------------------------------------------------------------------------------
 Script=${0##*/}
@@ -39,7 +42,7 @@ usage() {
 Usage: $Script [dir1 .. dirN]
 
     Find directories with a 'Make/files' that contains a 'LIB =' directive
-    and execute 'wmakeLnInclude -f' for each one
+    and execute 'wmakeLnInclude -update' for each one
 
 USAGE
     exit 1
@@ -90,7 +93,7 @@ do
         then
             if grep -e '^ *LIB *=' "$MakeDir/files" >/dev/null 2>&1
             then
-                wmakeLnInclude -f $topDir
+                wmakeLnInclude -update $topDir
             elif [ -d "$topDir/lnInclude" ]
             then
                 echo "removing spurious $topDir/lnInclude"
diff --git a/wmake/wmakePrintBuild b/wmake/wmakePrintBuild
index cc554513dc..c23e63d33e 100755
--- a/wmake/wmakePrintBuild
+++ b/wmake/wmakePrintBuild
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -25,6 +25,9 @@
 # Script
 #     wmakePrintBuild
 #
+# Usage
+#     wmakePrintBuild [OPTION]
+#
 # Description
 #     Print the version used when building the project
 #
diff --git a/wmake/wmakeScheduler b/wmake/wmakeScheduler
index 7b3d51e91b..11a22009c4 100755
--- a/wmake/wmakeScheduler
+++ b/wmake/wmakeScheduler
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -25,20 +25,6 @@
 # Script
 #     wmakeScheduler
 #
-# Description
-#     Scheduler for network distributed compilations using wmake.
-#     - WM_HOSTS contains a list of hosts and number of concurrent processes
-#     eg,
-#        export WM_HOSTS="hostA:1 hostB:2 hostC:1"
-#     - WM_COLOURS contains a list of colours to cycle through
-#        export WM_COLOURS="black blue green cyan red magenta yellow"
-#
-#     Sources the relevant cshrc/bashrc if not set.
-#
-#     WM_PROJECT_DIR, WM_PROJECT and WM_PROJECT_VERSION will have been set
-#     before calling this routine.
-#     FOAM_INST_DIR may possibly have been set (to find installation)
-#
 # Usage
 #     wmakeScheduler COMMAND
 #         run 'COMMAND' on one of the slots listed in WM_HOSTS
@@ -47,6 +33,20 @@
 #         count the total number of slots available in WM_HOSTS
 #         eg,  export WM_NCOMPPROCS=$(wmakeScheduler -count)
 #
+# Description
+#     Scheduler for network distributed compilations using wmake.
+#     - WM_HOSTS contains a list of hosts and number of concurrent processes
+#     eg,
+#         export WM_HOSTS="hostA:1 hostB:2 hostC:1"
+#     - WM_COLOURS contains a list of colours to cycle through
+#         export WM_COLOURS="black blue green cyan red magenta yellow"
+#
+#     Sources the relevant cshrc/bashrc if not set.
+#
+#     WM_PROJECT_DIR, WM_PROJECT and WM_PROJECT_VERSION will have been set
+#     before calling this routine.
+#     FOAM_INST_DIR may possibly have been set (to find installation)
+#
 #-------------------------------------------------------------------------------
 Script=${0##*/}
 
diff --git a/wmake/wmakeSchedulerUptime b/wmake/wmakeSchedulerUptime
index eb52f40615..1ef11f97b3 100755
--- a/wmake/wmakeSchedulerUptime
+++ b/wmake/wmakeSchedulerUptime
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -25,6 +25,14 @@
 # Script
 #     wmakeSchedulerUptime
 #
+# Usage
+#     wmakeSchedulerUptime COMMAND
+#         run 'COMMAND' on one of the slots listed in WM_HOSTS
+#
+#     wmakeScheduler -count
+#         count the total number of slots available in WM_HOSTS
+#         eg,  export WM_NCOMPPROCS=$(wmakeScheduler -count)
+#
 # Description
 #     Scheduler for network distributed compilations using wmake.
 #     - WM_HOSTS contains a list of hosts and number of concurrent processes
@@ -39,14 +47,6 @@
 #     before calling this routine.
 #     FOAM_INST_DIR may possibly have been set (to find installation)
 #
-# Usage
-#     wmakeSchedulerUptime COMMAND
-#         run 'COMMAND' on one of the slots listed in WM_HOSTS
-#
-#     wmakeScheduler -count
-#         count the total number of slots available in WM_HOSTS
-#         eg,  export WM_NCOMPPROCS=$(wmakeScheduler -count)
-#
 #-------------------------------------------------------------------------------
 Script=${0##*/}
 
diff --git a/wmake/wrmdep b/wmake/wrmdep
index 7853279684..b390205d8c 100755
--- a/wmake/wrmdep
+++ b/wmake/wrmdep
@@ -22,7 +22,9 @@
 #     You should have received a copy of the GNU General Public License
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
-# Script
+# Script wrmdep
+#
+# Usage
 #     wrmdep [-a | -all | all] [file]
 #     wrmdep [-o | -old] [dir1 .. dirN]
 #     wrmdep -update
diff --git a/wmake/wrmo b/wmake/wrmo
index 1fb5cc4088..b7cab9bf98 100755
--- a/wmake/wrmo
+++ b/wmake/wrmo
@@ -23,6 +23,9 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
+#     wrmo
+#
+# Usage
 #     wrmo [-a | -all | all] [file]
 #
 # Description

From 947f3fea5064471d924a8474cf94becde4f97195 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 16 Dec 2015 20:26:25 +0000
Subject: [PATCH 067/447] foamMonitor: change format to support old gnuplot
 versions Resolves bug-report http://openfoam.org/mantisbt/view.php?id=1952

---
 bin/foamMonitor | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/foamMonitor b/bin/foamMonitor
index 9f70c74570..e38545f00d 100755
--- a/bin/foamMonitor
+++ b/bin/foamMonitor
@@ -154,7 +154,12 @@ i=1
 for field in $KEYS
 do
     i=$(expr $i + 1)
-    echo "\"$FILE\" using 1:${i} with lines title \"$field\", \\" >> $GPFILE
+    PLOTLINE="\"$FILE\" using 1:${i} with lines title \"$field\""
+    if [[ $i -lt $NCOLS ]]
+    then
+       PLOTLINE="$PLOTLINE, \\"
+    fi
+    echo $PLOTLINE >> $GPFILE
 done
 plotFileFooter >> $GPFILE
 

From 77090f2ad9cae7cefb2115df516d4c56d0642d3e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Dec 2015 08:40:52 +0000
Subject: [PATCH 068/447] turbulenceModels/RAS/v2f: removed the fvOptions
 source from the f-equation

It is not clear what form an fvOptions source should take as f is not a
transported dynamic field. For the moment the fvOptions source from the
f-equation has been removed until there is a specific need which will
show what the form should be.

Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1955
---
 src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
index df1597cba3..7d92909849 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
@@ -364,7 +364,6 @@ void v2f<BasicTurbulenceModel>::correct()
      ==
       - fvm::Sp(1.0/L2, f_)
       - 1.0/L2/k_*(v2fAlpha - C2_*G)
-      + fvOptions(alpha, rho, f_)
     );
 
     fEqn().relax();

From 5c6d420ca08b66726f4c01a4f6fa2976df525b56 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Dec 2015 12:20:10 +0000
Subject: [PATCH 069/447] prghPressureFvPatchScalarField: Updated documentation
 Corrected rho name specification. Resolves bug-report
 http://openfoam.org/mantisbt/view.php?id=1956

---
 .../prghTotalPressureFvPatchScalarField.C     |  2 +-
 .../prghTotalPressureFvPatchScalarField.H     | 26 +++++++------------
 .../laminar/bubbleColumn/0/p_rgh              |  2 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
index 7b8789df44..21229f7d82 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
@@ -58,7 +58,7 @@ prghTotalPressureFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     UName_(dict.lookupOrDefault<word>("U", "U")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    rhoName_(dict.lookupOrDefault<word>("rhoName", "rho")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     p0_("p0", dict, p.size())
 {
     if (dict.found("value"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.H
index f809029261..1723e20919 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.H
@@ -33,12 +33,14 @@ Description
 
         \f[
             p_rgh = p - \rho g (h - hRef)
+            p = p0 - 0.5 \rho |U|^2
         \f]
 
     where
     \vartable
         p_rgh   | Pseudo hydrostatic pressure [Pa]
         p       | Static pressure [Pa]
+        p0      | Total pressure [Pa]
         h       | Height in the opposite direction to gravity
         hRef    | Reference height in the opposite direction to gravity
         \rho    | density
@@ -49,8 +51,10 @@ Description
 
     \table
         Property     | Description             | Required    | Default value
-        rhoName      | rho field name          | no          | rho
-        p            | static pressure         | yes         |
+        U            | velocity field name     | no          | U
+        phi          | flux field name         | no          | phi
+        rho          | density field name      | no          | rho
+        p0           | total pressure          | yes         |
     \endtable
 
     Example of the boundary condition specification:
@@ -58,8 +62,10 @@ Description
     myPatch
     {
         type            prghTotalPressure;
-        rhoName         rho;
-        p               uniform 0;
+        U               U;
+        phi             phi;
+        rho             rho;
+        p0              uniform 0;
         value           uniform 0; // optional initial value
     }
     \endverbatim
@@ -180,18 +186,6 @@ public:
 
         // Access
 
-            //- Return the rhoName
-            const word& rhoName() const
-            {
-                return rhoName_;
-            }
-
-            //- Return reference to the rhoName to allow adjustment
-            word& rhoName()
-            {
-                return rhoName_;
-            }
-
             //- Return the total pressure
             const scalarField& p0() const
             {
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
index d78578a440..e675fc646a 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
@@ -31,7 +31,7 @@ boundaryField
         p0              $internalField;
         U               U.air;
         phi             phi.air;
-        rho             rho.air;
+        rho             thermo:rho.air;
         value           $internalField;
     }
     walls

From 93ed8c0a0b138a764db702594f3c73f3d083be2c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Dec 2015 12:23:29 +0000
Subject: [PATCH 070/447] prghPressureFvPatchScalarField: Updated rho name
 specification for consistency with prghPressureFvPatchScalarField

---
 .../prghPressureFvPatchScalarField.C             |  8 ++------
 .../prghPressureFvPatchScalarField.H             | 16 ++--------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
index c86986f711..5ea2c2c823 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
@@ -53,7 +53,7 @@ prghPressureFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    rhoName_(dict.lookupOrDefault<word>("rhoName", "rho")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     p_("p", dict, p.size())
 {
     if (dict.found("value"))
@@ -171,11 +171,7 @@ void Foam::prghPressureFvPatchScalarField::updateCoeffs()
 void Foam::prghPressureFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchScalarField::write(os);
-    if (rhoName_ != "rho")
-    {
-        os.writeKeyword("rhoName")
-            << rhoName_ << token::END_STATEMENT << nl;
-    }
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
     p_.writeEntry("p", os);
     writeEntry("value", os);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.H
index bad53659f0..06cbd5dcf2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.H
@@ -49,7 +49,7 @@ Description
 
     \table
         Property     | Description             | Required    | Default value
-        rhoName      | rho field name          | no          | rho
+        rho          | rho field name          | no          | rho
         p            | static pressure         | yes         |
     \endtable
 
@@ -58,7 +58,7 @@ Description
     myPatch
     {
         type            prghPressure;
-        rhoName         rho;
+        rho             rho;
         p               uniform 0;
         value           uniform 0; // optional initial value
     }
@@ -174,18 +174,6 @@ public:
 
         // Access
 
-            //- Return the rhoName
-            const word& rhoName() const
-            {
-                return rhoName_;
-            }
-
-            //- Return reference to the rhoName to allow adjustment
-            word& rhoName()
-            {
-                return rhoName_;
-            }
-
             //- Return the static pressure
             const scalarField& p() const
             {

From 639563b550ad7c0c600c10796c28369c5e8b73e1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 20 Dec 2015 18:12:35 +0000
Subject: [PATCH 071/447] fanFvPatchField: Minor reorganization

---
 .../derived/fan/fanFvPatchFields.C            | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
index 81adcbf2b8..3a4d46b3d9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
@@ -30,17 +30,6 @@ License
 #include "Tuple2.H"
 #include "PolynomialEntry.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makeTemplatePatchTypeField
-    (
-        fvPatchScalarField,
-        fanFvPatchScalarField
-    );
-}
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<>
@@ -133,4 +122,16 @@ Foam::fanFvPatchField<Foam::scalar>::fanFvPatchField
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeTemplatePatchTypeField
+    (
+        fvPatchScalarField,
+        fanFvPatchScalarField
+    );
+}
+
+
 // ************************************************************************* //

From f0e0fe6935d2987c109750510deb2a035d74676b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 20 Dec 2015 18:12:58 +0000
Subject: [PATCH 072/447] supersonicFreestreamFvPatchVectorField: Corrected
 documentation

---
 .../supersonicFreestreamFvPatchVectorField.C  | 40 +++++++++----------
 .../supersonicFreestreamFvPatchVectorField.H  |  6 +--
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index 2d4b1691ce..fb17d580b6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -52,26 +52,6 @@ supersonicFreestreamFvPatchVectorField
 }
 
 
-Foam::supersonicFreestreamFvPatchVectorField::
-supersonicFreestreamFvPatchVectorField
-(
-    const supersonicFreestreamFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mixedFvPatchVectorField(ptf, p, iF, mapper),
-    TName_(ptf.TName_),
-    pName_(ptf.pName_),
-    psiName_(ptf.psiName_),
-    UInf_(ptf.UInf_),
-    pInf_(ptf.pInf_),
-    TInf_(ptf.TInf_),
-    gamma_(ptf.gamma_)
-{}
-
-
 Foam::supersonicFreestreamFvPatchVectorField::
 supersonicFreestreamFvPatchVectorField
 (
@@ -119,6 +99,26 @@ supersonicFreestreamFvPatchVectorField
 }
 
 
+Foam::supersonicFreestreamFvPatchVectorField::
+supersonicFreestreamFvPatchVectorField
+(
+    const supersonicFreestreamFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchVectorField(ptf, p, iF, mapper),
+    TName_(ptf.TName_),
+    pName_(ptf.pName_),
+    psiName_(ptf.psiName_),
+    UInf_(ptf.UInf_),
+    pInf_(ptf.pInf_),
+    TInf_(ptf.TInf_),
+    gamma_(ptf.gamma_)
+{}
+
+
 Foam::supersonicFreestreamFvPatchVectorField::
 supersonicFreestreamFvPatchVectorField
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H
index 7b3b92044f..238eef2034 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H
@@ -40,9 +40,9 @@ Description
 
     \table
         Property     | Description             | Required    | Default value
-        TName        | Temperature field name  | no          | T
-        pName        | Pressure field name     | no          | p
-        psiName      | Compressibility field name | no       | thermo:psi
+        T            | Temperature field name  | no          | T
+        p            | Pressure field name     | no          | p
+        psi          | Compressibility field name | no       | thermo:psi
         UInf         | free-stream velocity    | yes         |
         pInf         | free-stream pressure    | yes         |
         TInf         | free-stream temperature | yes         |

From 94ed45c1627c3575011a98f31c696f171bb8eb94 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 20 Dec 2015 18:16:15 +0000
Subject: [PATCH 073/447] alphaContactAngleFvPatchScalarField,
 constantAlphaContactAngleFvPatchScalarField: minor update

---
 .../alphaContactAngleFvPatchScalarField.C     | 30 ++++++++---------
 ...stantAlphaContactAngleFvPatchScalarField.C | 32 +++++++++----------
 ...stantAlphaContactAngleFvPatchScalarField.H |  9 ++++--
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index f183641e46..78bd011527 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,9 +24,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "alphaContactAngleFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volMesh.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,19 +69,6 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 {}
 
 
-Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
-(
-    const alphaContactAngleFvPatchScalarField& acpsf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedGradientFvPatchScalarField(acpsf, p, iF, mapper),
-    limit_(acpsf.limit_)
-{}
-
-
 Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
@@ -106,6 +93,19 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 }
 
 
+Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
+(
+    const alphaContactAngleFvPatchScalarField& acpsf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedGradientFvPatchScalarField(acpsf, p, iF, mapper),
+    limit_(acpsf.limit_)
+{}
+
+
 Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
     const alphaContactAngleFvPatchScalarField& acpsf
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
index ea35d3999c..c94e36ce77 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,9 +24,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "constantAlphaContactAngleFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
 #include "volMesh.H"
 #include "fvPatchFieldMapper.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -42,20 +42,6 @@ constantAlphaContactAngleFvPatchScalarField
 {}
 
 
-Foam::constantAlphaContactAngleFvPatchScalarField::
-constantAlphaContactAngleFvPatchScalarField
-(
-    const constantAlphaContactAngleFvPatchScalarField& gcpsf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
-    theta0_(gcpsf.theta0_)
-{}
-
-
 Foam::constantAlphaContactAngleFvPatchScalarField::
 constantAlphaContactAngleFvPatchScalarField
 (
@@ -71,6 +57,20 @@ constantAlphaContactAngleFvPatchScalarField
 }
 
 
+Foam::constantAlphaContactAngleFvPatchScalarField::
+constantAlphaContactAngleFvPatchScalarField
+(
+    const constantAlphaContactAngleFvPatchScalarField& gcpsf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
+    theta0_(gcpsf.theta0_)
+{}
+
+
 Foam::constantAlphaContactAngleFvPatchScalarField::
 constantAlphaContactAngleFvPatchScalarField
 (
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H
index 02eaf6b352..7ce340390e 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,8 +25,11 @@ Class
     Foam::constantAlphaContactAngleFvPatchScalarField
 
 Description
-    A constant alphaContactAngle scalar boundary condition
-    (alphaContactAngleFvPatchScalarField)
+    A constant alphaContactAngle scalar boundary condition.
+
+SeeAlso
+    Foam::alphaContactAngleFvPatchScalarField
+    Foam::temperatureDependentAlphaContactAngleFvPatchScalarField
 
 SourceFiles
     constantAlphaContactAngleFvPatchScalarField.C

From f5fd3227b979d1de5530f3d4e43929dd493fc667 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 20 Dec 2015 19:12:11 +0000
Subject: [PATCH 074/447] 
 temperatureDependentAlphaContactAngleFvPatchScalarField:
 Temperature-dependent constant alphaContactAngle scalar boundary condition

Evaluates the contact angle as a function of the optionally specified
temperature field (defaults to T).  The "theta0" function is provided as
a DataEntry currently supporting:
    CompatibilityConstant
    constant
    csvFile
    polynomial
    table
    tableFile
---
 .../twoPhaseProperties/Make/files             |   1 +
 ...ndentAlphaContactAngleFvPatchScalarField.C | 141 ++++++++++++++
 ...ndentAlphaContactAngleFvPatchScalarField.H | 182 ++++++++++++++++++
 3 files changed, 324 insertions(+)
 create mode 100644 src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
 create mode 100644 src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H

diff --git a/src/transportModels/twoPhaseProperties/Make/files b/src/transportModels/twoPhaseProperties/Make/files
index 5457dcde52..2e5b03ff0e 100644
--- a/src/transportModels/twoPhaseProperties/Make/files
+++ b/src/transportModels/twoPhaseProperties/Make/files
@@ -1,5 +1,6 @@
 alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
 alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
+alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
 alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
 alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
 alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
new file mode 100644
index 0000000000..e39da64c06
--- /dev/null
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "temperatureDependentAlphaContactAngleFvPatchScalarField.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::
+temperatureDependentAlphaContactAngleFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    alphaContactAngleFvPatchScalarField(p, iF),
+    TName_("T"),
+    theta0_()
+{}
+
+
+Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::
+temperatureDependentAlphaContactAngleFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    alphaContactAngleFvPatchScalarField(p, iF, dict),
+    TName_(dict.lookupOrDefault<word>("T", "T")),
+    theta0_(DataEntry<scalar>::New("theta0", dict))
+{
+    evaluate();
+}
+
+
+Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::
+temperatureDependentAlphaContactAngleFvPatchScalarField
+(
+    const temperatureDependentAlphaContactAngleFvPatchScalarField& psf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    alphaContactAngleFvPatchScalarField(psf, p, iF, mapper),
+    TName_(psf.TName_),
+    theta0_(psf.theta0_, false)
+{}
+
+
+Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::
+temperatureDependentAlphaContactAngleFvPatchScalarField
+(
+    const temperatureDependentAlphaContactAngleFvPatchScalarField& psf
+)
+:
+    alphaContactAngleFvPatchScalarField(psf),
+    TName_(psf.TName_),
+    theta0_(psf.theta0_, false)
+{}
+
+
+Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::
+temperatureDependentAlphaContactAngleFvPatchScalarField
+(
+    const temperatureDependentAlphaContactAngleFvPatchScalarField& psf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    alphaContactAngleFvPatchScalarField(psf, iF),
+    TName_(psf.TName_),
+    theta0_(psf.theta0_, false)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::scalarField>
+Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::theta
+(
+    const fvPatchVectorField&,
+    const fvsPatchVectorField&
+) const
+{
+    return theta0_->value
+    (
+        patch().lookupPatchField<volScalarField, scalar>(TName_)
+    );
+}
+
+
+void Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    alphaContactAngleFvPatchScalarField::write(os);
+    writeEntryIfDifferent<word>(os, "T", "T", TName_);
+    theta0_->writeData(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        temperatureDependentAlphaContactAngleFvPatchScalarField
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
new file mode 100644
index 0000000000..ae92f01ae6
--- /dev/null
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
@@ -0,0 +1,182 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+Class
+    Foam::temperatureDependentAlphaContactAngleFvPatchScalarField
+
+Description
+    Temperature-dependent constant alphaContactAngle scalar boundary condition.
+
+    \heading Patch usage
+
+    \table
+        Property     | Description             | Required    | Default value
+        TName        | Temperature field name  | no          | T
+        theta0       | Contact angle data      | yes         |
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    myPatch
+    {
+        type            temperatureDependentAlphaContactAngle;
+        theta0          constant 60;
+    }
+    \endverbatim
+
+SeeAlso
+    Foam::alphaContactAngleFvPatchScalarField
+    Foam::constantAlphaContactAngleFvPatchScalarField
+
+SourceFiles
+    temperatureDependentAlphaContactAngleFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef temperatureDependentAlphaContactAngleFvPatchScalarField_H
+#define temperatureDependentAlphaContactAngleFvPatchScalarField_H
+
+#include "alphaContactAngleFvPatchScalarField.H"
+#include "DataEntry.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+       Class temperatureDependentAlphaContactAngleFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class temperatureDependentAlphaContactAngleFvPatchScalarField
+:
+    public alphaContactAngleFvPatchScalarField
+{
+    // Private data
+
+        //- Name of temperature field, default = "T"
+        word TName_;
+
+        //- Equilibrium contact angle table
+        autoPtr<DataEntry<scalar> > theta0_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("temperatureDependentAlphaContactAngle");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        temperatureDependentAlphaContactAngleFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        temperatureDependentAlphaContactAngleFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  temperatureDependentAlphaContactAngleFvPatchScalarField
+        //  onto a new patch
+        temperatureDependentAlphaContactAngleFvPatchScalarField
+        (
+            const temperatureDependentAlphaContactAngleFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        temperatureDependentAlphaContactAngleFvPatchScalarField
+        (
+            const temperatureDependentAlphaContactAngleFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new temperatureDependentAlphaContactAngleFvPatchScalarField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        temperatureDependentAlphaContactAngleFvPatchScalarField
+        (
+            const temperatureDependentAlphaContactAngleFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new temperatureDependentAlphaContactAngleFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        //- Return the equilibrium contact-angle
+        virtual tmp<scalarField> theta
+        (
+            const fvPatchVectorField& Up,
+            const fvsPatchVectorField& nHat
+        ) const;
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 4ccdd833d3b82b71918e8607ac1bd2b09188e966 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 1 Jan 2016 21:21:15 +0000
Subject: [PATCH 075/447] IOdsmcFields.C: Not used, removed. Resolves
 bug-report http://openfoam.org/mantisbt/view.php?id=1959

---
 .../utilities/dsmcFields/IOdsmcFields.C       | 49 -------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 src/postProcessing/functionObjects/utilities/dsmcFields/IOdsmcFields.C

diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/IOdsmcFields.C b/src/postProcessing/functionObjects/utilities/dsmcFields/IOdsmcFields.C
deleted file mode 100644
index 3847b5df83..0000000000
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/IOdsmcFields.C
+++ /dev/null
@@ -1,49 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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/>.
-
-Typedef
-    Foam::IOdsmcFields
-
-Description
-    Instance of the generic IOOutputFilter for dsmcFields.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef IOdsmcFields_H
-#define IOdsmcFields_H
-
-#include "dsmcFields.H"
-#include "IOOutputFilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    typedef IOOutputFilter<dsmcFields> IOdsmcFields;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

From 779aa398ae048b97660cd66e01805072e1f2488f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 1 Jan 2016 21:29:21 +0000
Subject: [PATCH 076/447] src/regionModels/regionCoupling/Make/options: Removed
 redundant -I option Resolves bug-report
 http://openfoam.org/mantisbt/view.php?id=1958

---
 src/regionModels/regionCoupling/Make/options | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options
index 39fe765eb4..379349b045 100644
--- a/src/regionModels/regionCoupling/Make/options
+++ b/src/regionModels/regionCoupling/Make/options
@@ -1,6 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/AMIInterpolation/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \

From 65c98f27d65ddbda346cd910f1b55c9ce89e848c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 2 Jan 2016 21:40:49 +0000
Subject: [PATCH 077/447] externalCoupledMixedFvPatchField.H: Updated
 documentation Patch provided by Bruno Santos Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1961

---
 .../externalCoupledMixedFvPatchField.H        | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
index 5c041cb103..22c208923e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,40 +32,52 @@ Description
     Values are transferred as plain text files, where OpenFOAM data is written
     as:
 
-        # Patch: \<patch name\>
-        \<magSf1\> \<value1\> \<surfaceNormalGradient1\>
-        \<magSf2\> \<value2\> \<surfaceNormalGradient2\>
-        \<magSf3\> \<value3\> \<surfaceNormalGradient3\>
+    \verbatim
+        # Patch: <patch name>
+        <magSf1> <value1> <surfaceNormalGradient1>
+        <magSf2> <value2> <surfaceNormalGradient2>
+        <magSf3> <value3> <surfaceNormalGradient3>
         ...
-        \<magSfN\> \<valueN\> \<surfaceNormalGradientN\>
+        <magSfN> <valueN> <surfaceNormalGradientN>
+    \endverbatim
 
     and received as the constituent pieces of the `mixed' condition, i.e.
 
-        # Patch: \<patch name\>
-        \<value1\> \<gradient1\> \<valueFracion1\>
-        \<value2\> \<gradient2\> \<valueFracion2\>
-        \<value3\> \<gradient3\> \<valueFracion3\>
+    \verbatim
+        # Patch: <patch name>
+        <value1> <gradient1> <valueFracion1>
+        <value2> <gradient2> <valueFracion2>
+        <value3> <gradient3> <valueFracion3>
         ...
-        \<valueN\> \<gradientN\> \<valueFracionN\>
+        <valueN> <gradientN> <valueFracionN>
+    \endverbatim
 
     Data is sent/received as a single file for all patches from the directory
 
-        $FOAM_CASE/\<commsDir\>
+    \verbatim
+        $FOAM_CASE/<commsDir>
+    \endverbatim
 
     At start-up, the boundary creates a lock file, i.e..
 
+    \verbatim
         OpenFOAM.lock
+    \endverbatim
 
     ... to signal the external source to wait.  During the boundary condition
     update, boundary values are written to file, e.g.
 
-        \<fileName\>.out
+    \verbatim
+        <fileName>.out
+    \endverbatim
 
     The lock file is then removed, instructing the external source to take
     control of the program execution.  When ready, the external program
     should create the return values, e.g. to file
 
-        \<fileName\>.in
+    \verbatim
+        <fileName>.in
+    \endverbatim
 
     ... and then re-instate the lock file.  The boundary condition will then
     read the return values, and pass program execution back to OpenFOAM.

From 41f9e71c712f247408d48b5d7c957616b3bc2e86 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 3 Jan 2016 11:43:10 +0000
Subject: [PATCH 078/447] dynamicMesh/meshCut: Improved diagnostics and
 documentation Patch provided by Bruno Santos Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1960

---
 src/dynamicMesh/meshCut/cellCuts/cellCuts.C   | 95 +++++++------------
 src/dynamicMesh/meshCut/cellCuts/cellCuts.H   | 16 ++--
 .../refinementIterator/refinementIterator.C   |  8 +-
 3 files changed, 48 insertions(+), 71 deletions(-)

diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index 864faad5fd..0d5d96ec71 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,6 @@ defineTypeNameAndDebug(cellCuts, 0);
 
 // * * * * * * * * * * * * * Private Static Functions  * * * * * * * * * * * //
 
-// Find val in first nElems elements of list.
 Foam::label Foam::cellCuts::findPartIndex
 (
     const labelList& elems,
@@ -96,7 +95,6 @@ Foam::scalarField Foam::cellCuts::expand
 }
 
 
-// Find first point in lst not in map.
 Foam::label Foam::cellCuts::firstUnique
 (
     const labelList& lst,
@@ -116,7 +114,6 @@ Foam::label Foam::cellCuts::firstUnique
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Write cell and raw cuts on any of the elements
 void Foam::cellCuts::writeUncutOBJ
 (
     const fileName& dir,
@@ -223,7 +220,6 @@ void Foam::cellCuts::writeOBJ
 }
 
 
-// Find face on cell using the two edges.
 Foam::label Foam::cellCuts::edgeEdgeToFace
 (
     const label cellI,
@@ -264,7 +260,6 @@ Foam::label Foam::cellCuts::edgeEdgeToFace
 }
 
 
-// Find face on cell using an edge and a vertex.
 Foam::label Foam::cellCuts::edgeVertexToFace
 (
     const label cellI,
@@ -304,7 +299,6 @@ Foam::label Foam::cellCuts::edgeVertexToFace
 }
 
 
-// Find face using two vertices (guaranteed not to be along edge)
 Foam::label Foam::cellCuts::vertexVertexToFace
 (
     const label cellI,
@@ -477,7 +471,6 @@ void Foam::cellCuts::calcFaceCuts() const
 }
 
 
-// Find edge on face using two vertices
 Foam::label Foam::cellCuts::findEdge
 (
     const label faceI,
@@ -507,7 +500,6 @@ Foam::label Foam::cellCuts::findEdge
 }
 
 
-// Check if there is a face on the cell on which all cuts are.
 Foam::label Foam::cellCuts::loopFace
 (
     const label cellI,
@@ -559,7 +551,6 @@ Foam::label Foam::cellCuts::loopFace
 }
 
 
-// From point go into connected face
 bool Foam::cellCuts::walkPoint
 (
     const label cellI,
@@ -615,7 +606,6 @@ bool Foam::cellCuts::walkPoint
 }
 
 
-// Cross cut (which is edge on faceI) onto next face
 bool Foam::cellCuts::crossEdge
 (
     const label cellI,
@@ -695,8 +685,6 @@ bool Foam::cellCuts::addCut
 }
 
 
-// Walk across faceI, storing cuts as you go. Returns last two cuts visisted.
-// Returns true if valid walk.
 bool Foam::cellCuts::walkFace
 (
     const label cellI,
@@ -787,8 +775,6 @@ bool Foam::cellCuts::walkFace
 
 
 
-// Walk across cuts (cut edges or cut vertices) of cell. Stops when hit cut
-// already visited. Returns true when loop of 3 or more vertices found.
 bool Foam::cellCuts::walkCell
 (
     const label cellI,
@@ -982,13 +968,14 @@ bool Foam::cellCuts::walkCell
 }
 
 
-// Determine for every cut cell the loop (= face) it is cut by. Done by starting
-// from a cut edge or cut vertex and walking across faces, from cut to cut,
-// until starting cut hit.
-// If multiple loops are possible across a cell circumference takes the first
-// one found.
 void Foam::cellCuts::calcCellLoops(const labelList& cutCells)
 {
+    // Determine for every cut cell the loop (= face) it is cut by. Done by
+    // starting from a cut edge or cut vertex and walking across faces, from
+    // cut to cut, until starting cut hit.
+    // If multiple loops are possible across a cell circumference takes the
+    // first one found.
+
     // Calculate cuts per face.
     const labelListList& allFaceCuts = faceCuts();
 
@@ -1139,8 +1126,6 @@ void Foam::cellCuts::calcCellLoops(const labelList& cutCells)
 }
 
 
-// Walk unset edges of single cell from starting point and marks visited
-// edges and vertices with status.
 void Foam::cellCuts::walkEdges
 (
     const label cellI,
@@ -1178,7 +1163,6 @@ void Foam::cellCuts::walkEdges
 }
 
 
-// Invert anchor point selection.
 Foam::labelList Foam::cellCuts::nonAnchorPoints
 (
     const labelList& cellPoints,
@@ -1209,7 +1193,6 @@ Foam::labelList Foam::cellCuts::nonAnchorPoints
 }
 
 
-//- Check anchor points on 'outside' of loop
 bool Foam::cellCuts::loopAnchorConsistent
 (
     const label cellI,
@@ -1245,10 +1228,6 @@ bool Foam::cellCuts::loopAnchorConsistent
 }
 
 
-// Determines set of anchor points given a loop. The loop should split the
-// cell into (one or) two sets of vertices. The set of vertices that is
-// on the 'normal' side of the loop is the anchor set.
-// Returns true if valid set, false otherwise.
 bool Foam::cellCuts::calcAnchors
 (
     const label cellI,
@@ -1612,7 +1591,6 @@ Foam::pointField Foam::cellCuts::loopPoints
 }
 
 
-// Returns weights of loop. Inverse of loopPoints.
 Foam::scalarField Foam::cellCuts::loopWeights(const labelList& loop) const
 {
     scalarField weights(loop.size());
@@ -1636,7 +1614,6 @@ Foam::scalarField Foam::cellCuts::loopWeights(const labelList& loop) const
 }
 
 
-// Check if cut edges in loop are compatible with ones in edgeIsCut_
 bool Foam::cellCuts::validEdgeLoop
 (
     const labelList& loop,
@@ -1672,15 +1649,16 @@ bool Foam::cellCuts::validEdgeLoop
 }
 
 
-// Counts cuts on face. Includes cuts through vertices and through edges.
-// Assumes that if edge is cut both in edgeIsCut and in loop that the position
-// of the cut is the same.
 Foam::label Foam::cellCuts::countFaceCuts
 (
     const label faceI,
     const labelList& loop
 ) const
 {
+    // Includes cuts through vertices and through edges.
+    // Assumes that if edge is cut both in edgeIsCut and in loop that the
+    // position of the cut is the same.
+
     label nCuts = 0;
 
     // Count cut vertices
@@ -1723,8 +1701,6 @@ Foam::label Foam::cellCuts::countFaceCuts
 }
 
 
-// Determine compatibility of loop with existing cut pattern. Does not use
-// cut-addressing (faceCuts_, cutCuts_)
 bool Foam::cellCuts::conservativeValidLoop
 (
     const label cellI,
@@ -1816,10 +1792,6 @@ bool Foam::cellCuts::conservativeValidLoop
 }
 
 
-// Determine compatibility of loop with existing cut pattern. Does not use
-// derived cut-addressing (faceCuts), only pointIsCut, edgeIsCut.
-// Adds any cross-cuts found to newFaceSplitCut and sets cell points on
-// one side of the loop in anchorPoints.
 bool Foam::cellCuts::validLoop
 (
     const label cellI,
@@ -1830,6 +1802,11 @@ bool Foam::cellCuts::validLoop
     labelList& anchorPoints
 ) const
 {
+    // Determine compatibility of loop with existing cut pattern. Does not use
+    // derived cut-addressing (faceCuts), only pointIsCut, edgeIsCut.
+    // Adds any cross-cuts found to newFaceSplitCut and sets cell points on
+    // one side of the loop in anchorPoints.
+
     if (loop.size() < 2)
     {
         return false;
@@ -1841,6 +1818,7 @@ bool Foam::cellCuts::validLoop
         // cut per face is allowed.
         if (!conservativeValidLoop(cellI, loop))
         {
+            Info << "Invalid conservative loop: " << loop << endl;
             return  false;
         }
     }
@@ -1984,9 +1962,6 @@ bool Foam::cellCuts::validLoop
 }
 
 
-// Update basic cut information (pointIsCut, edgeIsCut) from cellLoops.
-// Assumes cellLoops_ and edgeWeight_ already set and consistent.
-// Does not use any other information.
 void Foam::cellCuts::setFromCellLoops()
 {
     // 'Uncut' edges/vertices that are not used in loops.
@@ -2071,8 +2046,6 @@ void Foam::cellCuts::setFromCellLoops()
 }
 
 
-// Upate basic cut information from single cellLoop. Returns true if loop
-// was valid.
 bool Foam::cellCuts::setFromCellLoop
 (
     const label cellI,
@@ -2080,6 +2053,9 @@ bool Foam::cellCuts::setFromCellLoop
     const scalarField& loopWeights
 )
 {
+    // Update basic cut information from single cellLoop. Returns true if loop
+    // was valid.
+
     // Dump loop for debugging.
     if (debug)
     {
@@ -2169,8 +2145,6 @@ bool Foam::cellCuts::setFromCellLoop
 }
 
 
-// Update basic cut information from cellLoops. Checks for consistency with
-// existing cut pattern.
 void Foam::cellCuts::setFromCellLoops
 (
     const labelList& cellLabels,
@@ -2207,8 +2181,6 @@ void Foam::cellCuts::setFromCellLoops
 }
 
 
-// Cut cells and update basic cut information from cellLoops. Checks each loop
-// for consistency with existing cut pattern.
 void Foam::cellCuts::setFromCellCutter
 (
     const cellLooper& cellCutter,
@@ -2266,6 +2238,17 @@ void Foam::cellCuts::setFromCellCutter
             {
                 cellLoops_[cellI].setSize(0);
 
+                WarningInFunction
+                    << "Found loop on cell " << cellI
+                    << " that resulted in an unexpected bad cut."
+                    << "    Suggestions:" << nl
+                    << "      - Turn on the debug switch for 'cellCuts' to get"
+                    << " geometry files that identify this cell." << nl
+                    << "      - Also keep in mind to check the defined"
+                    << " reference directions, as these are most likely the"
+                    << " origin of the problem."
+                    << nl << endl;
+
                 // Discarded by validLoop
                 if (debug)
                 {
@@ -2324,7 +2307,6 @@ void Foam::cellCuts::setFromCellCutter
 }
 
 
-// Same as one before but cut plane prescribed (instead of just normal)
 void Foam::cellCuts::setFromCellCutter
 (
     const cellLooper& cellCutter,
@@ -2436,7 +2418,6 @@ void Foam::cellCuts::setFromCellCutter
 }
 
 
-// Set orientation of loops
 void Foam::cellCuts::orientPlanesAndLoops()
 {
     // Determine anchorPoints if not yet done by validLoop.
@@ -2493,7 +2474,6 @@ void Foam::cellCuts::orientPlanesAndLoops()
 }
 
 
-// Do all: calculate addressing, calculate loops splitting cells
 void Foam::cellCuts::calcLoopsAndAddressing(const labelList& cutCells)
 {
     // Sanity check on weights
@@ -2682,7 +2662,6 @@ void Foam::cellCuts::check() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from cells to cut and pattern of cuts
 Foam::cellCuts::cellCuts
 (
     const polyMesh& mesh,
@@ -2727,8 +2706,6 @@ Foam::cellCuts::cellCuts
 }
 
 
-// Construct from pattern of cuts. Finds out itself which cells are cut.
-// (can go wrong if e.g. all neighbours of cell are refined)
 Foam::cellCuts::cellCuts
 (
     const polyMesh& mesh,
@@ -2747,6 +2724,9 @@ Foam::cellCuts::cellCuts
     nLoops_(-1),
     cellAnchorPoints_(mesh.nCells())
 {
+    // Construct from pattern of cuts. Finds out itself which cells are cut.
+    // (can go wrong if e.g. all neighbours of cell are refined)
+
     if (debug)
     {
         Pout<< "cellCuts : constructor from cellLoops" << endl;
@@ -2771,8 +2751,6 @@ Foam::cellCuts::cellCuts
 }
 
 
-// Construct from complete cellLoops. Assumes correct cut pattern.
-// Only constructs cut-cut addressing and cellAnchorPoints
 Foam::cellCuts::cellCuts
 (
     const polyMesh& mesh,
@@ -2817,7 +2795,6 @@ Foam::cellCuts::cellCuts
 }
 
 
-// Construct from list of cells to cut and cell cutter.
 Foam::cellCuts::cellCuts
 (
     const polyMesh& mesh,
@@ -2861,7 +2838,6 @@ Foam::cellCuts::cellCuts
 }
 
 
-// Construct from list of cells to cut, plane to cut with and cell cutter.
 Foam::cellCuts::cellCuts
 (
     const polyMesh& mesh,
@@ -2908,7 +2884,6 @@ Foam::cellCuts::cellCuts
 }
 
 
-// Construct from components
 Foam::cellCuts::cellCuts
 (
     const polyMesh& mesh,
@@ -2980,7 +2955,6 @@ Foam::pointField Foam::cellCuts::loopPoints(const label cellI) const
 }
 
 
-// Flip loop for cell
 void Foam::cellCuts::flip(const label cellI)
 {
     labelList& loop = cellLoops_[cellI];
@@ -2998,7 +2972,6 @@ void Foam::cellCuts::flip(const label cellI)
 }
 
 
-// Flip loop only
 void Foam::cellCuts::flipLoopOnly(const label cellI)
 {
     labelList& loop = cellLoops_[cellI];
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
index 4fb1173db6..30b1528b22 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -277,6 +277,7 @@ class cellCuts
 
             //- Walk across faceI following cuts, starting at cut. Stores cuts
             //  visited
+            // Returns true if valid walk.
             bool walkFace
             (
                 const label cellI,
@@ -374,8 +375,8 @@ class cellCuts
                 const labelList& loop
             ) const;
 
-            //- Determines if loop through cellI consistent with existing
-            //  pattern.
+            //- Determine compatibility of loop with existing cut pattern.
+            //  Does not use cut-addressing (faceCuts_, cutCuts_)
             bool conservativeValidLoop
             (
                 const label cellI,
@@ -395,8 +396,9 @@ class cellCuts
                 labelList& anchorPoints
             ) const;
 
-            //- Update basic cut information from cellLoops. Assumes cellLoops_
-            //  already set and consistent.
+            //- Update basic cut information from cellLoops.
+            //  Assumes cellLoops_ and edgeWeight_ already set and consistent.
+            //  Does not use any other information.
             void setFromCellLoops();
 
             //- Update basic cut information for single cell from cellLoop.
@@ -424,7 +426,8 @@ class cellCuts
                 const List<refineCell>& refCells
             );
 
-            //- Same as above but now cut with prescribed plane.
+            //- Same as above but now cut with prescribed plane (instead of
+            //  just normal).
             void setFromCellCutter
             (
                 const cellLooper&,
@@ -436,6 +439,7 @@ class cellCuts
             void orientPlanesAndLoops();
 
             //- Top level driver: adressing calculation and loop detection
+            //  (loops splitting cells).
             void calcLoopsAndAddressing(const labelList& cutCells);
 
             //- Check various consistencies.
diff --git a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
index feec8ba08c..27ee747ae8 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,10 +126,10 @@ Foam::Map<Foam::label> Foam::refinementIterator::setRefinement
                 OFstream cutsStream(cutsFile);
 
 
-                labelList refCells(currentRefCells.size());
+                labelList refCellsDebug(currentRefCells.size());
                 forAll(currentRefCells, i)
                 {
-                    refCells[i] = currentRefCells[i].cellNo();
+                    refCellsDebug[i] = currentRefCells[i].cellNo();
                 }
                 meshTools::writeOBJ
                 (
@@ -137,7 +137,7 @@ Foam::Map<Foam::label> Foam::refinementIterator::setRefinement
                     mesh().cells(),
                     mesh().faces(),
                     mesh().points(),
-                    refCells
+                    refCellsDebug
                 );
             }
 

From 97301ef7549ef109a9cd35986aa1c9c616cdd2a7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 3 Jan 2016 12:04:51 +0000
Subject: [PATCH 079/447] LISAAtomization: Corrected Ks expression Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=1957

---
 .../AtomizationModel/LISAAtomization/LISAAtomization.C        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
index 33cda4093b..c21fdfd583 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -225,7 +225,7 @@ void Foam::LISAAtomization<CloudType>::update
     }
     else
     {
-        k = rhoAv*sqr(Urel)/2.0*sigma;
+        k = rhoAv*sqr(Urel)/(2.0*sigma);
 
         scalar J = 0.5*traveledTime*hSheet;
 

From a9888b215d610f11c7aa0f305143323fab3aa04b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 3 Jan 2016 15:39:44 +0000
Subject: [PATCH 080/447] patchInteractionDataList: treat cyclicAMIPolyPatch as
 a coupled patch Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1949

---
 .../LocalInteraction/patchInteractionDataList.C               | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
index 30aa85357f..4c7739a070 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,7 @@ License
 #include "patchInteractionDataList.H"
 #include "stringListOps.H"
 #include "emptyPolyPatch.H"
+#include "cyclicAMIPolyPatch.H"
 
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
@@ -73,6 +74,7 @@ Foam::patchInteractionDataList::patchInteractionDataList
         (
             !pp.coupled()
          && !isA<emptyPolyPatch>(pp)
+         && !isA<cyclicAMIPolyPatch>(pp)
          && applyToPatch(pp.index()) < 0
         )
         {

From 01d5da5ae3a969b3a4784b44c643665db2a28133 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 5 Jan 2016 07:30:52 +0000
Subject: [PATCH 081/447] README.org: Added link to
 http://www.openfoam.org/dev.php Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1962

---
 README.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 5842a0ef04..e5bfcf24fe 100644
--- a/README.org
+++ b/README.org
@@ -1,6 +1,6 @@
 #                            -*- mode: org; -*-
 #
-#+TITLE:                README for OpenFOAM-dev
+#+TITLE:                README for [[http://www.openfoam.org/dev.php][OpenFOAM-dev]]
 #+AUTHOR:               The OpenFOAM Foundation
 #+DATE:                     9th March 2015
 #+LINK:                  http://www.openfoam.org

From bb7aef5f28a52394a733d688ec07049109b1c019 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 5 Jan 2016 07:31:48 +0000
Subject: [PATCH 082/447] Updated header

---
 README.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.org b/README.org
index e5bfcf24fe..d4f14dbe13 100644
--- a/README.org
+++ b/README.org
@@ -5,7 +5,7 @@
 #+DATE:                     9th March 2015
 #+LINK:                  http://www.openfoam.org
 #+OPTIONS: author:nil ^:{}
-# Copyright (c) 2015 OpenFOAM Foundation.
+# Copyright (c) 2015-2016 OpenFOAM Foundation.
 
 * About OpenFOAM
   OpenFOAM is a free, open source computational fluid dynamics (CFD) software

From 946f62d65dd6f9be2aa3290301ee770f8d13c914 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 7 Jan 2016 11:44:14 +0000
Subject: [PATCH 083/447] laplacianScheme: make private member functions
 private Resolves bug-report http://openfoam.org/mantisbt/view.php?id=1965

---
 .../laplacianSchemes/laplacianScheme/laplacianScheme.H          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
index 781d2044d5..16fa0c4b1b 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
@@ -77,6 +77,8 @@ protected:
         tmp<snGradScheme<Type> > tsnGradScheme_;
 
 
+private:
+
     // Private Member Functions
 
         //- Disallow copy construct

From e75ac08da191ea2d89c8e8029fc52790b20de1bf Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 7 Jan 2016 11:45:13 +0000
Subject: [PATCH 084/447] Updated header

---
 .../laplacianSchemes/laplacianScheme/laplacianScheme.H          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
index 16fa0c4b1b..ad479aa835 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 533bae38b21a9f3295f5bb80d61711ba7af03246 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Fri, 8 Jan 2016 17:49:39 +0000
Subject: [PATCH 085/447] foamCreateVideo: add option to specify first image
 number

---
 bin/foamCreateVideo | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/foamCreateVideo b/bin/foamCreateVideo
index fa4a01166f..a204d7cdbc 100755
--- a/bin/foamCreateVideo
+++ b/bin/foamCreateVideo
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -43,6 +43,7 @@ options:
   -h | -help          help
   -i | -image <name>  name of image sequence (default = image)
   -o | -out <name>    name of output video file (default = video)
+  -s | -start <frame> specify the start frame number for avconv
   -w | -webm          WebM output video file format
 
 Creates a video file from a sequence of PNG images
@@ -64,6 +65,7 @@ IMAGE='image'
 VIDEO='video'
 FPS=10
 FMT='mp4'
+START_NUMBER=''
 
 while [ "$#" -gt 0 ]
 do
@@ -91,6 +93,11 @@ do
       VIDEO=$2
       shift 2
       ;;
+   -s | -start)
+      [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+      START_NUMBER="-start_number $2"
+      shift 2
+      ;;
    -w | -webm)
       FMT=webm
       echo "Selected $FMT format, requires avconv..."
@@ -116,6 +123,7 @@ if [ "$FMT" = "webm" ] ; then
         echo "Creating image with avconv..."
         avconv \
             -r $FPS \
+            $START_NUMBER \
             -i ${DIR}/${IMAGE}.%04d.png \
             -c:v libvpx -crf 15 -b:v 1M \
             $VIDEO.$FMT
@@ -127,6 +135,7 @@ else
         echo "Creating image with avconv..."
         avconv \
             -r $FPS \
+            $START_NUMBER \
             -i ${DIR}/${IMAGE}.%04d.png \
             -c:v libx264 -pix_fmt yuv420p \
             $VIDEO.$FMT

From 1eca13aeb9a363f7b78583f9bec664edadf71703 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 9 Jan 2016 23:09:08 +0000
Subject: [PATCH 086/447] CleanFunctions: Check the constant directory exists
 before cleaning it

---
 bin/tools/CleanFunctions | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index b17efcfbb5..d58feb9f7a 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -94,11 +94,14 @@ cleanCase()
             > /dev/null 2>&1 \
         )
     fi
-    (cd constant && \
-        rm -rf \
-        cellToRegion cellLevel* pointLevel* \
-        > /dev/null 2>&1 \
-    )
+    if [ -d constant ]
+    then
+        (cd constant && \
+            rm -rf \
+            cellToRegion cellLevel* pointLevel* \
+            > /dev/null 2>&1 \
+        )
+    fi
 
     rm -rf constant/tetDualMesh > /dev/null 2>&1
 

From 75cf86b769c1459e8093de07b82c9970603cfb7f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 9 Jan 2016 23:10:16 +0000
Subject: [PATCH 087/447] Correct formatting: "forAll (" -> "forAll(" Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=1967

---
 .../fluid/compressibleMultiRegionCourantNo.H       |  2 +-
 .../mesh/manipulation/checkMesh/checkTopology.C    |  4 ++--
 .../preProcessing/viewFactorsGen/viewFactorsGen.C  | 14 +++++++-------
 .../surfaceSplitByTopology.C                       |  4 ++--
 .../LduMatrix/LduMatrixUpdateMatrixInterfaces.C    |  8 ++++----
 .../polyMesh/polyBoundaryMesh/polyBoundaryMesh.C   |  4 ++--
 .../meshes/polyMesh/polyMeshCheck/polyMeshCheck.C  |  8 ++++----
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C      |  4 ++--
 .../primitiveMeshCheck/primitiveMeshTools.C        |  4 ++--
 ...rnalWallHeatFluxTemperatureFvPatchScalarField.C |  4 ++--
 ...mperatureCoupledBaffleMixedFvPatchScalarField.C |  4 ++--
 ...tTemperatureRadCoupledMixedFvPatchScalarField.C |  4 ++--
 .../extrudePatchMesh/extrudePatchMesh.C            | 14 +++++++-------
 .../DarcyForchheimer/DarcyForchheimer.C            |  4 ++--
 .../general/porosityModel/fixedCoeff/fixedCoeff.C  |  4 ++--
 ...PressureForceBaffleVelocityFvPatchVectorField.C |  4 ++--
 .../LeastSquaresGrad/LeastSquaresVectors.C         |  4 ++--
 .../pairPatchAgglomeration.C                       |  4 ++--
 .../writeRegisteredObject/writeRegisteredObject.H  |  4 +---
 .../regionModel/regionModel1D/regionModel1D.C      |  4 ++--
 .../thermalBaffleFvPatchScalarField.C              |  4 ++--
 .../thermalBaffleModel/thermalBaffleModel.C        |  6 +++---
 src/sampling/probes/probes.C                       |  4 ++--
 .../greyMeanAbsorptionEmission.C                   |  4 ++--
 .../greyMeanSolidAbsorptionEmission.C              |  4 ++--
 25 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
index fa5feefbb4..82dc875847 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
@@ -15,7 +15,7 @@
         );
     }
 /*
-    forAll (porousFluidRegions, porousI)
+    forAll(porousFluidRegions, porousI)
     {
         CoNum = max
         (
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index b0c4d37c03..e093787090 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -446,7 +446,7 @@ Foam::label Foam::checkTopology
                     if (returnReduce(mp.size(), sumOp<label>()) > 0)
                     {
                         boundBox bb(point::max, point::min);
-                        forAll (mp, i)
+                        forAll(mp, i)
                         {
                             bb.min() = min(bb.min(), pts[mp[i]]);
                             bb.max() = max(bb.max(), pts[mp[i]]);
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index bccf381ba1..e01be739e1 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -381,7 +381,7 @@ int main(int argc, char *argv[])
 
     DynamicList<label> localAgg(nCoarseFaces);
 
-    forAll (viewFactorsPatches, i)
+    forAll(viewFactorsPatches, i)
     {
         const label patchID = viewFactorsPatches[i];
 
@@ -689,7 +689,7 @@ int main(int argc, char *argv[])
 
     if (mesh.nSolutionD() == 3)
     {
-        forAll (localCoarseSf, coarseFaceI)
+        forAll(localCoarseSf, coarseFaceI)
         {
             const List<point>& localFineSf = compactFineSf[coarseFaceI];
             const vector Ai = sum(localFineSf);
@@ -709,12 +709,12 @@ int main(int argc, char *argv[])
                 const label toPatchId = compactPatchId[compactJ];
 
                 scalar Fij = 0;
-                forAll (localFineSf, i)
+                forAll(localFineSf, i)
                 {
                     const vector& dAi = localFineSf[i];
                     const vector& dCi = localFineCf[i];
 
-                    forAll (remoteFineSj, j)
+                    forAll(remoteFineSj, j)
                     {
                         const vector& dAj = remoteFineSj[j];
                         const vector& dCj = remoteFineCj[j];
@@ -762,7 +762,7 @@ int main(int argc, char *argv[])
             patchArea[fromPatchId] += mag(Ai);
 
             const labelList& visCoarseFaces = visibleFaceFaces[coarseFaceI];
-            forAll (visCoarseFaces, visCoarseFaceI)
+            forAll(visCoarseFaces, visCoarseFaceI)
             {
                 F[coarseFaceI].setSize(visCoarseFaces.size());
                 label compactJ = visCoarseFaces[visCoarseFaceI];
@@ -847,7 +847,7 @@ int main(int argc, char *argv[])
                 const scalar Fij = sum(F[compactI]);
                 const label coarseFaceID = coarsePatchFace[coarseI];
                 const labelList& fineFaces = coarseToFine[coarseFaceID];
-                forAll (fineFaces, fineId)
+                forAll(fineFaces, fineId)
                 {
                     const label faceID = fineFaces[fineId];
                     viewFactorField.boundaryField()[patchID][faceID] = Fij;
diff --git a/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C b/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
index 3e92451369..9ab191ae21 100644
--- a/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
+++ b/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
             {
                 if (faceZone[f] == z)
                 {
-                    forAll (faceEds[f], fe)
+                    forAll(faceEds[f], fe)
                     {
                         if (edFaces[faceEds[f][fe]].size() < 2)
                         {
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
index b068e47481..89c3f797ee 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ void Foam::LduMatrix<Type, DType, LUType>::initMatrixInterfaces
      || Pstream::defaultCommsType == Pstream::nonBlocking
     )
     {
-        forAll (interfaces_, interfaceI)
+        forAll(interfaces_, interfaceI)
         {
             if (interfaces_.set(interfaceI))
             {
@@ -114,7 +114,7 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
             OPstream::waitRequests();
         }
 
-        forAll (interfaces_, interfaceI)
+        forAll(interfaces_, interfaceI)
         {
             if (interfaces_.set(interfaceI))
             {
@@ -134,7 +134,7 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
         const lduSchedule& patchSchedule = this->patchSchedule();
 
         // Loop over all the "normal" interfaces relating to standard patches
-        forAll (patchSchedule, i)
+        forAll(patchSchedule, i)
         {
             label interfaceI = patchSchedule[i].patch;
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index f3311f26e4..a795557339 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -179,7 +179,7 @@ Foam::polyBoundaryMesh::polyBoundaryMesh
     {
         polyPatchList& patches = *this;
         patches.setSize(ppl.size());
-        forAll (patches, patchI)
+        forAll(patches, patchI)
         {
             patches.set(patchI, ppl[patchI].clone(*this).ptr());
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
index 14835981ab..f471696986 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -441,7 +441,7 @@ bool Foam::polyMesh::checkCellDeterminant
     scalar minDet = min(cellDeterminant);
     scalar sumDet = sum(cellDeterminant);
 
-    forAll (cellDeterminant, cellI)
+    forAll(cellDeterminant, cellI)
     {
         if (cellDeterminant[cellI] < warnDet)
         {
@@ -529,7 +529,7 @@ bool Foam::polyMesh::checkFaceWeight
     // Statistics only for internal and masters of coupled faces
     PackedBoolList isMasterFace(syncTools::getInternalOrMasterFaces(*this));
 
-    forAll (faceWght, faceI)
+    forAll(faceWght, faceI)
     {
         if (faceWght[faceI] < minWeight)
         {
@@ -618,7 +618,7 @@ bool Foam::polyMesh::checkVolRatio
     // Statistics only for internal and masters of coupled faces
     PackedBoolList isMasterFace(syncTools::getInternalOrMasterFaces(*this));
 
-    forAll (volRatio, faceI)
+    forAll(volRatio, faceI)
     {
         if (volRatio[faceI] < minRatio)
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index 5e44455f0c..f453dee2a0 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,7 +186,7 @@ Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh
         // Nothing read. Use supplied zones
         PtrList<ZoneType>& zones = *this;
         zones.setSize(pzm.size());
-        forAll (zones, zoneI)
+        forAll(zones, zoneI)
         {
             zones.set(zoneI, pzm[zoneI].clone(*this).ptr());
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
index c833f5ca91..2845ca262b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -484,7 +484,7 @@ Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::cellDeterminant
     }
     else
     {
-        forAll (c, cellI)
+        forAll(c, cellI)
         {
             const labelList& curFaces = c[cellI];
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index 2a02d01cac..9a23256da0 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -282,7 +282,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
             scalar totalSolidRes = 0.0;
             if (thicknessLayers_.size() > 0)
             {
-                forAll (thicknessLayers_, iLayer)
+                forAll(thicknessLayers_, iLayer)
                 {
                     const scalar l = thicknessLayers_[iLayer];
                     if (kappaLayers_[iLayer] > 0.0)
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index 903c50b164..ad37059180 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
         if (thicknessLayers_.size() > 0)
         {
             // Calculate effective thermal resistance by harmonic averaging
-            forAll (thicknessLayers_, iLayer)
+            forAll(thicknessLayers_, iLayer)
             {
                 contactRes_ += thicknessLayers_[iLayer]/kappaLayers_[iLayer];
             }
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index 8d563bac65..4fa51bc054 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
         if (thicknessLayers_.size() > 0)
         {
             // Calculate effective thermal resistance by harmonic averaging
-            forAll (thicknessLayers_, iLayer)
+            forAll(thicknessLayers_, iLayer)
             {
                 contactRes_ += thicknessLayers_[iLayer]/kappaLayers_[iLayer];
             }
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
index ca87555627..d2e00ec96f 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ extrudePatchMesh::extrudePatchMesh
     List<word> patchTypes(regionPatches.size());
     PtrList<dictionary> dicts(regionPatches.size());
 
-    forAll (dicts, patchI)
+    forAll(dicts, patchI)
     {
         if (!dicts.set(patchI))
         {
@@ -122,13 +122,13 @@ extrudePatchMesh::extrudePatchMesh
     dicts[sidePatchID] = dict_.subDict("sideCoeffs");
     dicts[topPatchID] = dict_.subDict("topCoeffs");
 
-    forAll (dicts, patchI)
+    forAll(dicts, patchI)
     {
         dicts[patchI].lookup("name") >> patchNames[patchI];
         dicts[patchI].lookup("type") >> patchTypes[patchI];
     }
 
-    forAll (regionPatches, patchI)
+    forAll(regionPatches, patchI)
     {
         dictionary&  patchDict = dicts[patchI];
         patchDict.set("nFaces", 0);
@@ -267,7 +267,7 @@ void extrudePatchMesh::extrudeMesh(const List<polyPatch*>& regionPatches)
         List<word> patchTypes(regionPatches.size());
         PtrList<dictionary> dicts(regionPatches.size());
 
-        forAll (dicts, patchI)
+        forAll(dicts, patchI)
         {
             if (!dicts.set(patchI))
             {
@@ -279,13 +279,13 @@ void extrudePatchMesh::extrudeMesh(const List<polyPatch*>& regionPatches)
         dicts[sidePatchID] = dict_.subDict("sideCoeffs");
         dicts[topPatchID] = dict_.subDict("topCoeffs");
 
-        forAll (dicts, patchI)
+        forAll(dicts, patchI)
         {
             dicts[patchI].lookup("name") >> patchNames[patchI];
             dicts[patchI].lookup("type") >> patchTypes[patchI];
         }
 
-        forAll (regionPatches, patchI)
+        forAll(regionPatches, patchI)
         {
             dictionary&  patchDict = dicts[patchI];
             patchDict.set("nFaces", 0);
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
index 20ac7a29b1..411b8dfc6b 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
 {
     if (coordSys_.R().uniform())
     {
-        forAll (cellZoneIDs_, zoneI)
+        forAll(cellZoneIDs_, zoneI)
         {
             D_[zoneI].setSize(1);
             F_[zoneI].setSize(1);
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
index eeb4bb3e9c..6525c6c2c3 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,7 +135,7 @@ void Foam::porosityModels::fixedCoeff::calcTransformModelData()
 {
     if (coordSys_.R().uniform())
     {
-        forAll (cellZoneIDs_, zoneI)
+        forAll(cellZoneIDs_, zoneI)
         {
             alpha_[zoneI].setSize(1);
             beta_[zoneI].setSize(1);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index 02a63dd00d..cef5a6e58f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -190,7 +190,7 @@ void Foam::activePressureForceBaffleVelocityFvPatchVectorField::autoMap
     //- Note: we don't want to use Sf here since triggers rebuilding of
     //  fvMesh::S() which will give problems when mapped (since already
     //  on new mesh)
-    forAll (patch().boundaryMesh().mesh().faceAreas(), i)
+    forAll(patch().boundaryMesh().mesh().faceAreas(), i)
     {
         if (mag(patch().boundaryMesh().mesh().faceAreas()[i]) == 0)
         {
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
index ea30ffa3db..536208067a 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ void Foam::fv::LeastSquaresVectors<Stencil>::calcLeastSquaresVectors()
     // including components for the "empty" directions
     symmTensor dd0(sqr((Vector<label>::one - mesh.geometricD())/2));
 
-    forAll (vectors_, i)
+    forAll(vectors_, i)
     {
         List<vector>& lsvi = vectors_[i];
         symmTensor dd(dd0);
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
index 33c19f801a..ecceef966a 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -254,7 +254,7 @@ void Foam::pairPatchAgglomeration::mapBaseToTopAgglom
 )
 {
     const labelList& fineToCoarse = restrictAddressing_[fineLevelIndex];
-    forAll (restrictTopBottomAddressing_, i)
+    forAll(restrictTopBottomAddressing_, i)
     {
         restrictTopBottomAddressing_[i] =
             fineToCoarse[restrictTopBottomAddressing_[i]];
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
index d08dc7c914..8785424569 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,8 +94,6 @@ class mapPolyMesh;
 
 class writeRegisteredObject
 {
-protected:
-
     // Private data
 
         //- Name of this set of writeRegisteredObject
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.C b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
index d5e80beec8..63e8145c5f 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1D.C
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,7 +134,7 @@ void Foam::regionModels::regionModel1D::initialise()
         {
             const vector& n = pNormals[localFaceI];
             const labelList& faces = boundaryFaceFaces_[localPyrolysisFaceI++];
-            forAll (faces, faceI)
+            forAll(faces, faceI)
             {
                 const label faceID = faces[faceI];
                 nMagSf[faceID] = regionMesh().Sf()[faceID] & n;
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
index 2231b42999..e575a1c480 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -208,7 +208,7 @@ void thermalBaffleFvPatchScalarField::createPatchMesh()
     dicts[topPatchID].add("sampleMode", mpp.sampleModeNames_[mpp.mode()]);
 
 
-    forAll (regionPatches, patchI)
+    forAll(regionPatches, patchI)
     {
         dictionary&  patchDict = dicts[patchI];
         patchDict.set("nFaces", 0);
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C
index c432d922a8..f56ef9193e 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ void thermalBaffleModel::init()
         reduce(nTotalEdges, sumOp<label>());
 
         label nFaces = 0;
-        forAll (rbm, patchi)
+        forAll(rbm, patchi)
         {
             if (
                    rbm[patchi].size()
@@ -157,7 +157,7 @@ void thermalBaffleModel::init()
             // Calculate thickness of the baffle on the first face only.
             if (delta_.value() == 0.0)
             {
-                forAll (ppCoupled, localFaceI)
+                forAll(ppCoupled, localFaceI)
                 {
                     label faceI = ppCoupled.start() + localFaceI;
 
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index 2ea3a4f430..9a103e1367 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ void Foam::probes::findElements(const fvMesh& mesh)
             const vector& cellCentre = mesh.cellCentres()[cellI];
             scalar minDistance = GREAT;
             label minFaceID = -1;
-            forAll (cellFaces, i)
+            forAll(cellFaces, i)
             {
                 label faceI = cellFaces[i];
                 vector dist = mesh.faceCentres()[faceI] - cellCentre;
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index 985935df96..ef0ab32012 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -234,7 +234,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
             else
             {
                 scalar invWt = 0.0;
-                forAll (mixture.Y(), s)
+                forAll(mixture.Y(), s)
                 {
                     invWt += mixture.Y(s)[cellI]/mixture.W(s);
                 }
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
index 14497374c0..2ab1931029 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ greyMeanSolidAbsorptionEmission::X(const word specie) const
     {
         const scalarField& Yi = mixture_.Y()[specieI];
 
-        forAll (rhoInv, iCell)
+        forAll(rhoInv, iCell)
         {
             rhoInv[iCell] +=
                 Yi[iCell]/mixture_.rho(specieI, p[iCell], T[iCell]);

From 9439d83f39cf32e339e9d46b1300e31080544e1b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Jan 2016 12:49:35 +0000
Subject: [PATCH 088/447] Make private member functions private Resolves
 bug-report http://openfoam.org/mantisbt/view.php?id=1969

---
 .../Lists/IndirectList/IndirectList.H         |  4 ++--
 .../meshes/polyMesh/zones/cellZone/cellZone.H |  4 +++-
 .../meshes/polyMesh/zones/faceZone/faceZone.H | 20 +++++++++++--------
 .../fvMesh/fvBoundaryMesh/fvBoundaryMesh.H    |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index 030dfd9e30..9b69d51892 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -107,10 +107,10 @@ class IndirectList
 {
     // Private Member Functions
 
-        //- Disable default assignment operator
+        //- Disallow default assignment operator
         void operator=(const IndirectList<T>&);
 
-        //- Disable assignment from UIndirectList
+        //- Disallow assignment from UIndirectList
         void operator=(const UIndirectList<T>&);
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index 0a6dbd671b..c5027f3eaa 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,6 +72,8 @@ protected:
         const cellZoneMesh& zoneMesh_;
 
 
+private:
+
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 1567b09fb1..690c49e031 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,6 +71,16 @@ class faceZone
         //- The name associated with the zone-labels dictionary entry
         static const word labelsName_;
 
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        faceZone(const faceZone&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const faceZone&);
+
+
 protected:
 
     // Protected data
@@ -98,13 +108,7 @@ protected:
             mutable labelList* mePtr_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        faceZone(const faceZone&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const faceZone&);
+    // Protected Member Functions
 
         //- Build primitive patch
         void calcFaceZonePatch() const;
diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
index df96168551..62f5cda738 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
@@ -62,7 +62,7 @@ class fvBoundaryMesh
 
     // Private Member Functions
 
-        //- Disable default copy construct
+        //- Disallow default copy construct
         fvBoundaryMesh(const fvBoundaryMesh&);
 
         //- Disallow assignment

From fbae6721c63cca6ce0ed37bc41af56daabec4a9b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Jan 2016 12:50:32 +0000
Subject: [PATCH 089/447] Update headers

---
 src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H | 2 +-
 src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index 9b69d51892..4af62fc864 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
index 62f5cda738..cf9ee4c35f 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From b31ea4fa2253cf53bf6dbc790ee8d2de4b86bde7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Jan 2016 12:50:41 +0000
Subject: [PATCH 090/447] etc/config/settings.*: Update gcc versions

---
 etc/config/settings.csh | 16 ++++++++++++++--
 etc/config/settings.sh  | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index 31669ae676..fd6cc37330 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -219,7 +219,7 @@ case ThirdParty:
     switch ("$WM_COMPILER")
     case Gcc:
     case Gcc48:
-        set gcc_version=gcc-4.8.4
+        set gcc_version=gcc-4.8.5
         set gmp_version=gmp-5.1.2
         set mpfr_version=mpfr-3.1.2
         set mpc_version=mpc-1.0.1
@@ -243,7 +243,7 @@ case ThirdParty:
         set mpc_version=mpc-1.0.1
         breaksw
     case Gcc49:
-        set gcc_version=gcc-4.9.2
+        set gcc_version=gcc-4.9.3
         set gmp_version=gmp-5.1.2
         set mpfr_version=mpfr-3.1.2
         set mpc_version=mpc-1.0.1
@@ -254,6 +254,18 @@ case ThirdParty:
         set mpfr_version=mpfr-3.1.2
         set mpc_version=mpc-1.0.1
         breaksw
+    case Gcc52:
+        set gcc_version=gcc-5.2.0
+        set gmp_version=gmp-5.1.2
+        set mpfr_version=mpfr-3.1.2
+        set mpc_version=mpc-1.0.1
+        breaksw
+    case Gcc53:
+        set gcc_version=gcc-5.3.0
+        set gmp_version=gmp-5.1.2
+        set mpfr_version=mpfr-3.1.2
+        set mpc_version=mpc-1.0.1
+        breaksw
     case Clang:
         # Using clang - not gcc
         setenv WM_CC 'clang'
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 02be26b9d7..ebbc680218 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -244,7 +244,7 @@ case "${foamCompiler}" in
 OpenFOAM | ThirdParty)
     case "$WM_COMPILER" in
     Gcc | Gcc48)
-        gcc_version=gcc-4.8.4
+        gcc_version=gcc-4.8.5
         gmp_version=gmp-5.1.2
         mpfr_version=mpfr-3.1.2
         mpc_version=mpc-1.0.1
@@ -268,7 +268,7 @@ OpenFOAM | ThirdParty)
         mpc_version=mpc-1.0.1
         ;;
     Gcc49)
-        gcc_version=gcc-4.9.2
+        gcc_version=gcc-4.9.3
         gmp_version=gmp-5.1.2
         mpfr_version=mpfr-3.1.2
         mpc_version=mpc-1.0.1
@@ -279,6 +279,18 @@ OpenFOAM | ThirdParty)
         mpfr_version=mpfr-3.1.2
         mpc_version=mpc-1.0.1
         ;;
+    Gcc52)
+        gcc_version=gcc-5.2.0
+        gmp_version=gmp-5.1.2
+        mpfr_version=mpfr-3.1.2
+        mpc_version=mpc-1.0.1
+        ;;
+    Gcc53)
+        gcc_version=gcc-5.3.0
+        gmp_version=gmp-5.1.2
+        mpfr_version=mpfr-3.1.2
+        mpc_version=mpc-1.0.1
+        ;;
     Clang)
         # using clang - not gcc
         export WM_CC='clang'

From d41014938cd122cc5ff030aff058a69e8740dadd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Jan 2016 12:50:58 +0000
Subject: [PATCH 091/447] Update headers

---
 etc/config/settings.csh | 2 +-
 etc/config/settings.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index fd6cc37330..cdb701aae5 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index ebbc680218..de634eea79 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License

From 33c99cc91856f68f79cced270771a0fc466ab9b9 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Jan 2016 19:16:27 +0000
Subject: [PATCH 092/447] etc/config/paraview.*: Update include directory name
 which is 3.0 rather than 4.0 even for ParaView-4

---
 etc/config/paraview.csh | 6 +++---
 etc/config/paraview.sh  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh
index f81a894d11..eab513082d 100644
--- a/etc/config/paraview.csh
+++ b/etc/config/paraview.csh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -97,8 +97,8 @@ if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
     endif
 
     set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}
-    if (! -r $ParaView_LIB_DIR && -r ${ParaView_DIR}/lib/paraview) then
-        set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview
+    if (! -r $ParaView_LIB_DIR && -r ${ParaView_DIR}/lib/paraview-3.0) then
+        set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-3.0
     endif
 
     setenv PATH ${ParaView_DIR}/bin:${PATH}
diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh
index 6b34500881..a2a1373d43 100644
--- a/etc/config/paraview.sh
+++ b/etc/config/paraview.sh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -101,9 +101,9 @@ export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraview
 if [ -r $ParaView_DIR -o -r $paraviewInstDir ]
 then
     export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-$ParaView_MAJOR
-    if [ ! -d $ParaView_INCLUDE_DIR -a -d $ParaView_DIR/include/paraview ]
+    if [ ! -d $ParaView_INCLUDE_DIR -a -d $ParaView_DIR/include/paraview-3.0 ]
     then
-        export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview
+        export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-3.0
     fi
 
     ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR

From acb9ec8b46b5b5e9034205bdb43f8c0e1f9e99d7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Jan 2016 19:17:31 +0000
Subject: [PATCH 093/447] wmake/rules: Add -std=c++0x to formally enable
 support for of C++11 features The c++0x is used rather than c++11 to support
 gcc-4.5.?

---
 .../PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt       | 1 +
 .../PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt        | 1 +
 wmake/rules/linux64Clang/c++                                    | 2 +-
 wmake/rules/linux64Gcc/c++                                      | 2 +-
 wmake/rules/linuxARM7Gcc/c++                                    | 2 +-
 wmake/rules/linuxClang/c++                                      | 2 +-
 wmake/rules/linuxGcc/c++                                        | 2 +-
 wmake/rules/linuxIA64Gcc/c++                                    | 2 +-
 wmake/rules/linuxIA64Icc/c++                                    | 2 +-
 wmake/rules/linuxPPC64Gcc/c++                                   | 2 +-
 wmake/rules/linuxPPC64leGcc/c++                                 | 2 +-
 wmake/rules/solaris64Gcc/c++                                    | 2 +-
 wmake/rules/solarisGcc/c++                                      | 2 +-
 13 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
index 65c25ae507..96ed7021fe 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
@@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES(
 )
 
 ADD_DEFINITIONS(
+    -std=c++0x
     -DWM_$ENV{WM_PRECISION_OPTION}
     -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
 )
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
index d081db2ff6..e15613a51f 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
@@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES(
 )
 
 ADD_DEFINITIONS(
+    -std=c++0x
     -DWM_$ENV{WM_PRECISION_OPTION}
     -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
 )
diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++
index f7d8a111eb..2e09ff8827 100644
--- a/wmake/rules/linux64Clang/c++
+++ b/wmake/rules/linux64Clang/c++
@@ -5,7 +5,7 @@ c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-undefined-compare -Wno-shift-negative-value
 
-CC          = clang++ -m64
+CC          = clang++ -std=c++0x -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++
index a3246efdd4..7c7af702e2 100644
--- a/wmake/rules/linux64Gcc/c++
+++ b/wmake/rules/linux64Gcc/c++
@@ -5,7 +5,7 @@ c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
-CC          = g++ -m64
+CC          = g++ -std=c++0x -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
diff --git a/wmake/rules/linuxARM7Gcc/c++ b/wmake/rules/linuxARM7Gcc/c++
index 076934eae8..b647cc85e6 100644
--- a/wmake/rules/linuxARM7Gcc/c++
+++ b/wmake/rules/linuxARM7Gcc/c++
@@ -5,7 +5,7 @@ c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
-CC          = g++
+CC          = g++ -std=c++0x
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++
index 9d1ecb7482..216cc67f7b 100644
--- a/wmake/rules/linuxClang/c++
+++ b/wmake/rules/linuxClang/c++
@@ -5,7 +5,7 @@ c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedef -Wno-tautological-undefined-compare -Wno-shift-negative-value
 
-CC          = clang++ -m32
+CC          = clang++ -std=c++0x -m32
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++
index 9e2be6d739..b115000d95 100644
--- a/wmake/rules/linuxGcc/c++
+++ b/wmake/rules/linuxGcc/c++
@@ -5,7 +5,7 @@ c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
-CC          = g++ -m32
+CC          = g++ -std=c++0x -m32
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++
index ada728b3fb..d07854e064 100644
--- a/wmake/rules/linuxIA64Gcc/c++
+++ b/wmake/rules/linuxIA64Gcc/c++
@@ -5,7 +5,7 @@ c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
-CC          = g++
+CC          = g++ -std=c++0x
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
diff --git a/wmake/rules/linuxIA64Icc/c++ b/wmake/rules/linuxIA64Icc/c++
index 831d3cc1ed..4d24538e97 100644
--- a/wmake/rules/linuxIA64Icc/c++
+++ b/wmake/rules/linuxIA64Icc/c++
@@ -6,7 +6,7 @@ c++WARN     = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invali
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN = -diag-disable 1224,2026,2305
 
-CC          = icpc
+CC          = icpc -std=c++0x
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++
index e8e862bd26..c5dcaa4d96 100644
--- a/wmake/rules/linuxPPC64Gcc/c++
+++ b/wmake/rules/linuxPPC64Gcc/c++
@@ -5,7 +5,7 @@ c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
-CC          = g++ -m64 -mcpu=power5+
+CC          = g++ -std=c++0x -m64 -mcpu=power5+
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
diff --git a/wmake/rules/linuxPPC64leGcc/c++ b/wmake/rules/linuxPPC64leGcc/c++
index 284007b730..76c4947183 100644
--- a/wmake/rules/linuxPPC64leGcc/c++
+++ b/wmake/rules/linuxPPC64leGcc/c++
@@ -5,7 +5,7 @@ c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
-CC          = g++ -m64 -mcpu=power8
+CC          = g++ -std=c++0x -m64 -mcpu=power8
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
diff --git a/wmake/rules/solaris64Gcc/c++ b/wmake/rules/solaris64Gcc/c++
index 33c22305fe..e7f16f4d46 100644
--- a/wmake/rules/solaris64Gcc/c++
+++ b/wmake/rules/solaris64Gcc/c++
@@ -5,7 +5,7 @@ c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN =
 
-CC          = g++ -m64
+CC          = g++ -std=c++0x -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
diff --git a/wmake/rules/solarisGcc/c++ b/wmake/rules/solarisGcc/c++
index ec5a6ef39e..d6bf189010 100644
--- a/wmake/rules/solarisGcc/c++
+++ b/wmake/rules/solarisGcc/c++
@@ -5,7 +5,7 @@ c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN =
 
-CC          = g++
+CC          = g++ -std=c++0x
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 

From 4eba393fe1cd0a32c460234276c3add5c69d20b5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Jan 2016 19:20:16 +0000
Subject: [PATCH 094/447] Update code to use the simpler C++11 template syntax

---
 .../test/Distribution/Test-Distribution.C     |  4 +-
 applications/test/Hashing/Test-Hashing.C      |  4 +-
 .../ideasUnvToFoam/ideasUnvToFoam.C           |  4 +-
 .../decomposePar/decomposePar.C               |  4 +-
 .../foamToEnsightParts/findFields.H           |  2 +-
 .../surface/surfaceCoarsen/surfaceCoarsen.C   |  8 +--
 .../fixedValueFvPatchFieldTemplate.H          | 10 +--
 .../fixedValuePointPatchFieldTemplate.H       | 10 +--
 .../dynamicCode/mixedFvPatchFieldTemplate.H   | 10 +--
 .../Lists/Distribution/Distribution.C         | 70 +++++++++----------
 .../Lists/Distribution/Distribution.H         | 12 ++--
 .../Lists/DynamicList/DynamicListI.H          |  4 +-
 .../containers/Lists/FixedList/FixedList.H    |  6 +-
 .../containers/Lists/FixedList/FixedListI.H   |  6 +-
 .../containers/Lists/PackedList/PackedList.H  |  4 +-
 .../containers/Lists/SubList/SubListI.H       |  4 +-
 src/OpenFOAM/db/error/StaticAssert.H          |  4 +-
 .../construction/addToRunTimeSelectionTable.H | 18 ++---
 .../construction/runTimeSelectionTables.H     | 52 +++++++-------
 .../Fields/DynamicField/DynamicFieldI.H       |  4 +-
 src/OpenFOAM/fields/Fields/Field/SubFieldI.H  |  4 +-
 .../tableReaders/tableReaders.H               |  6 +-
 .../ranges/labelRange/labelRangeI.H           |  4 +-
 .../ranges/labelRange/labelRangesI.H          |  4 +-
 .../primitives/strings/lists/hashedWordList.C |  4 +-
 .../primitives/strings/lists/hashedWordList.H |  4 +-
 src/fileFormats/sampledSetWriters/writer.C    |  4 +-
 src/fileFormats/sampledSetWriters/writers.H   |  6 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            |  4 +-
 .../bufferedAccumulator/bufferedAccumulator.C | 10 +--
 .../bufferedAccumulator/bufferedAccumulator.H |  4 +-
 .../bufferedAccumulatorIO.C                   |  4 +-
 .../correlationFunction/correlationFunction.C |  4 +-
 .../correlationFunction/correlationFunction.H |  6 +-
 .../correlationFunctionI.H                    |  4 +-
 .../distribution/distribution.C               |  4 +-
 .../molecule/mdTools/createMDFields.H         |  8 +--
 .../molecule/mdTools/resetMDFields.H          |  8 +--
 .../pairPotential/basic/pairPotential.C       |  6 +-
 .../pairPotential/basic/pairPotentialIO.C     |  6 +-
 src/mesh/blockMesh/block/blockCreate.C        |  4 +-
 .../blockDescriptor/blockDescriptor.C         |  4 +-
 .../blockDescriptor/blockDescriptor.H         |  6 +-
 .../intersectedSurface/intersectedSurface.C   |  6 +-
 .../meshToMesh0/meshToMesh0Templates.C        |  6 +-
 .../sampledSet/sampledSets/sampledSets.H      |  4 +-
 src/surfMesh/MeshedSurface/MeshedSurfaceNew.C | 10 +--
 .../UnsortedMeshedSurfaceNew.C                |  6 +-
 .../surfaceFormats/ftr/FTRsurfaceFormat.C     |  4 +-
 49 files changed, 197 insertions(+), 197 deletions(-)

diff --git a/applications/test/Distribution/Test-Distribution.C b/applications/test/Distribution/Test-Distribution.C
index 209f46a36c..f893e1e4bc 100644
--- a/applications/test/Distribution/Test-Distribution.C
+++ b/applications/test/Distribution/Test-Distribution.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011-2015 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
             << "Median " << dS.median()
             << endl;
 
-        reduce(dS, sumOp< Distribution<scalar> >());
+        reduce(dS, sumOp<Distribution<scalar>>());
 
         if (Pstream::master())
         {
diff --git a/applications/test/Hashing/Test-Hashing.C b/applications/test/Hashing/Test-Hashing.C
index 63da9431f1..0ab7e9a7cb 100644
--- a/applications/test/Hashing/Test-Hashing.C
+++ b/applications/test/Hashing/Test-Hashing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
         }
         else if (listType == "labelListList")
         {
-            List< List<label> > lst(is);
+            List<List<label>> lst(is);
 
             forAll(lst, i)
             {
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 874f787119..2d80394ea4 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1124,7 +1124,7 @@ int main(int argc, char *argv[])
         meshedSurface rawSurface
         (
             xferCopy(polyPoints),
-            xferCopyTo< faceList >(boundaryFaces)
+            xferCopyTo<faceList>(boundaryFaces)
         );
 
         // Write locally numbered surface
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 165c7c273f..901890c59d 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -517,7 +517,7 @@ int main(int argc, char *argv[])
                 cloudDirs.size()
             );
             // Particles per cell
-            PtrList< List<SLList<indexedParticle*>*> > cellParticles
+            PtrList<List<SLList<indexedParticle*>*> > cellParticles
             (
                 cloudDirs.size()
             );
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
index 7a6bd938dc..0231f2e4dd 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
@@ -4,7 +4,7 @@
 HashTable<word> volumeFields;
 
 // 2. the fields for each cloud:
-HashTable< HashTable<word> > cloudFields;
+HashTable<HashTable<word>> cloudFields;
 
 if (timeDirs.size())
 {
diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
index 7603f8a4a8..1ab971475e 100644
--- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
+++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,8 +95,8 @@ int main(int argc, char *argv[])
     Info<< endl;
 
 
-    ::List< ::Vector> vert;     // global list of vertices
-    ::List< ::tridata> tri;     // global list of triangles
+    ::List<::Vector> vert;     // global list of vertices
+    ::List<::tridata> tri;     // global list of triangles
 
 
     // Convert triSurface to progmesh format. Note: can use global point
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
     ::ProgressiveMesh(vert,tri,collapse_map,permutation);
 
     // rearrange the vertex list
-    ::List< ::Vector> temp_list;
+    ::List<::Vector> temp_list;
     for (int i=0;i<vert.num;i++)
     {
         temp_list.Add(vert[i]);
diff --git a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H
index 4bb70e27ac..6026fe1256 100644
--- a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H
+++ b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp< fvPatch${FieldType} > clone() const
+        virtual tmp<fvPatch${FieldType} > clone() const
         {
-            return tmp< fvPatch${FieldType} >
+            return tmp<fvPatch${FieldType} >
             (
                 new ${typeName}FixedValueFvPatch${FieldType}(*this)
             );
@@ -108,12 +108,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp< fvPatch${FieldType} > clone
+        virtual tmp<fvPatch${FieldType} > clone
         (
             const DimensionedField<${TemplateType}, volMesh>& iF
         ) const
         {
-            return tmp< fvPatch${FieldType} >
+            return tmp<fvPatch${FieldType} >
             (
                 new ${typeName}FixedValueFvPatch${FieldType}(*this, iF)
             );
diff --git a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
index 1b1baf40c6..0b90345029 100644
--- a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
+++ b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr< pointPatchField<${TemplateType}> > clone() const
+        virtual autoPtr<pointPatchField<${TemplateType}> > clone() const
         {
-            return autoPtr< pointPatchField<${TemplateType}> >
+            return autoPtr<pointPatchField<${TemplateType}> >
             (
                 new ${typeName}FixedValuePointPatch${FieldType}(*this)
             );
@@ -109,12 +109,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr< pointPatchField<${TemplateType}> > clone
+        virtual autoPtr<pointPatchField<${TemplateType}> > clone
         (
             const DimensionedField<${TemplateType}, pointMesh>& iF
         ) const
         {
-            return autoPtr< pointPatchField<${TemplateType}> >
+            return autoPtr<pointPatchField<${TemplateType}> >
             (
                 new ${typeName}FixedValuePointPatch${FieldType}(*this, iF)
             );
diff --git a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H
index 06e1c9887c..129fb534dd 100644
--- a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H
+++ b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp< fvPatch${FieldType} > clone() const
+        virtual tmp<fvPatch${FieldType} > clone() const
         {
-            return tmp< fvPatch${FieldType} >
+            return tmp<fvPatch${FieldType} >
             (
                 new ${typeName}MixedValueFvPatch${FieldType}(*this)
             );
@@ -108,12 +108,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp< fvPatch${FieldType} > clone
+        virtual tmp<fvPatch${FieldType} > clone
         (
             const DimensionedField<${TemplateType}, volMesh>& iF
         ) const
         {
-            return tmp< fvPatch${FieldType} >
+            return tmp<fvPatch${FieldType} >
             (
                 new ${typeName}MixedValueFvPatch${FieldType}(*this, iF)
             );
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
index 7e8e171556..c5ee3a283c 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ License
 template<class Type>
 Foam::Distribution<Type>::Distribution()
 :
-    List< List<scalar> >(pTraits<Type>::nComponents),
+    List<List<scalar>>(pTraits<Type>::nComponents),
     binWidth_(pTraits<Type>::one),
     listStarts_(pTraits<Type>::nComponents, 0)
 {}
@@ -41,7 +41,7 @@ Foam::Distribution<Type>::Distribution()
 template<class Type>
 Foam::Distribution<Type>::Distribution(const Type& binWidth)
 :
-    List< List<scalar> >(pTraits<Type>::nComponents),
+    List<List<scalar>>(pTraits<Type>::nComponents),
     binWidth_(binWidth),
     listStarts_(pTraits<Type>::nComponents, 0)
 {}
@@ -50,7 +50,7 @@ Foam::Distribution<Type>::Distribution(const Type& binWidth)
 template<class Type>
 Foam::Distribution<Type>::Distribution(const Distribution<Type>& d)
 :
-    List< List<scalar> >(static_cast< const List< List<scalar> >& >(d)),
+    List<List<scalar>>(static_cast<const List<List<scalar>>& >(d)),
     binWidth_(d.binWidth()),
     listStarts_(d.listStarts())
 {}
@@ -227,11 +227,11 @@ Type Foam::Distribution<Type>::median() const
 {
     Type medianValue(pTraits<Type>::zero);
 
-    List< List < Pair<scalar> > > normDistribution = normalised();
+    List<List<Pair<scalar>>> normDistribution = normalised();
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
-        List< Pair<scalar> >& normDist = normDistribution[cmpt];
+        List<Pair<scalar>>& normDist = normDistribution[cmpt];
 
         if (normDist.size())
         {
@@ -331,10 +331,10 @@ void Foam::Distribution<Type>::add
 
 
 template<class Type>
-Foam::List< Foam::List< Foam::Pair<Foam::scalar> > >Foam::
+Foam::List<Foam::List<Foam::Pair<Foam::scalar>>>Foam::
 Distribution<Type>::normalised() const
 {
-    List< List < Pair<scalar> > > normDistribution(pTraits<Type>::nComponents);
+    List<List<Pair<scalar>>> normDistribution(pTraits<Type>::nComponents);
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
@@ -349,7 +349,7 @@ Distribution<Type>::normalised() const
 
         List<label> cmptKeys = keys(cmpt);
 
-        List< Pair<scalar> >& normDist = normDistribution[cmpt];
+        List<Pair<scalar>>& normDist = normDistribution[cmpt];
 
         Pair<label> limits = validLimits(cmpt);
 
@@ -379,10 +379,10 @@ Distribution<Type>::normalised() const
 
 
 template<class Type>
-Foam::List< Foam::List< Foam::Pair<Foam::scalar> > >Foam::
+Foam::List<Foam::List<Foam::Pair<Foam::scalar>>>Foam::
 Distribution<Type>::raw() const
 {
-    List< List < Pair<scalar> > > rawDistribution(pTraits<Type>::nComponents);
+    List<List<Pair<scalar>>> rawDistribution(pTraits<Type>::nComponents);
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
@@ -395,7 +395,7 @@ Distribution<Type>::raw() const
 
         List<label> cmptKeys = keys(cmpt);
 
-        List< Pair<scalar> >& rawDist = rawDistribution[cmpt];
+        List<Pair<scalar>>& rawDist = rawDistribution[cmpt];
 
         Pair<label> limits = validLimits(cmpt);
 
@@ -421,20 +421,20 @@ Distribution<Type>::raw() const
 
 
 template<class Type>
-Foam::List< Foam::List< Foam::Pair<Foam::scalar> > >Foam::
+Foam::List<Foam::List<Foam::Pair<Foam::scalar>>>Foam::
 Distribution<Type>::cumulativeNormalised() const
 {
-    List< List< Pair<scalar> > > normalisedDistribution = normalised();
+    List<List<Pair<scalar>>> normalisedDistribution = normalised();
 
-    List< List < Pair<scalar> > > cumulativeNormalisedDistribution =
+    List<List<Pair<scalar>>> cumulativeNormalisedDistribution =
         normalisedDistribution;
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
-        const List< Pair<scalar> >& normalisedCmpt =
+        const List<Pair<scalar>>& normalisedCmpt =
             normalisedDistribution[cmpt];
 
-        List< Pair<scalar> >& cumNormalisedCmpt =
+        List<Pair<scalar>>& cumNormalisedCmpt =
             cumulativeNormalisedDistribution[cmpt];
 
         scalar sum = 0.0;
@@ -457,18 +457,18 @@ Distribution<Type>::cumulativeNormalised() const
 
 
 template<class Type>
-Foam::List< Foam::List< Foam::Pair<Foam::scalar> > >Foam::
+Foam::List<Foam::List<Foam::Pair<Foam::scalar>>>Foam::
 Distribution<Type>::cumulativeRaw() const
 {
-    List< List< Pair<scalar> > > rawDistribution = raw();
+    List<List<Pair<scalar>>> rawDistribution = raw();
 
-    List< List < Pair<scalar> > > cumulativeRawDistribution = rawDistribution;
+    List<List<Pair<scalar>>> cumulativeRawDistribution = rawDistribution;
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
-        const List< Pair<scalar> >& rawCmpt = rawDistribution[cmpt];
+        const List<Pair<scalar>>& rawCmpt = rawDistribution[cmpt];
 
-        List< Pair<scalar> >& cumRawCmpt = cumulativeRawDistribution[cmpt];
+        List<Pair<scalar>>& cumRawCmpt = cumulativeRawDistribution[cmpt];
 
         scalar sum = 0.0;
 
@@ -503,15 +503,15 @@ void Foam::Distribution<Type>::clear()
 template<class Type>
 void Foam::Distribution<Type>::write(const fileName& filePrefix) const
 {
-    List< List< Pair<scalar> > > rawDistribution = raw();
+    List<List<Pair<scalar>>> rawDistribution = raw();
 
-    List< List < Pair<scalar> > > normDistribution = normalised();
+    List<List<Pair<scalar>>> normDistribution = normalised();
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
-        const List< Pair<scalar> >& rawPairs = rawDistribution[cmpt];
+        const List<Pair<scalar>>& rawPairs = rawDistribution[cmpt];
 
-        const List< Pair<scalar> >& normPairs = normDistribution[cmpt];
+        const List<Pair<scalar>>& normPairs = normDistribution[cmpt];
 
         OFstream os(filePrefix + '_' + pTraits<Type>::componentNames[cmpt]);
 
@@ -526,15 +526,15 @@ void Foam::Distribution<Type>::write(const fileName& filePrefix) const
         }
     }
 
-    List< List< Pair<scalar> > > rawCumDist = cumulativeRaw();
+    List<List<Pair<scalar>>> rawCumDist = cumulativeRaw();
 
-    List< List < Pair<scalar> > > normCumDist = cumulativeNormalised();
+    List<List<Pair<scalar>>> normCumDist = cumulativeNormalised();
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
-        const List< Pair<scalar> >& rawPairs = rawCumDist[cmpt];
+        const List<Pair<scalar>>& rawPairs = rawCumDist[cmpt];
 
-        const List< Pair<scalar> >& normPairs = normCumDist[cmpt];
+        const List<Pair<scalar>>& normPairs = normCumDist[cmpt];
 
         OFstream os
         (
@@ -570,7 +570,7 @@ void Foam::Distribution<Type>::operator=
             << abort(FatalError);
     }
 
-    List< List<scalar> >::operator=(rhs);
+    List<List<scalar>>::operator=(rhs);
 
     binWidth_ = rhs.binWidth();
 
@@ -587,7 +587,7 @@ Foam::Istream& Foam::operator>>
     Distribution<Type>& d
 )
 {
-    is  >> static_cast<List< List<scalar> >&>(d)
+    is  >> static_cast<List<List<scalar>>&>(d)
         >> d.binWidth_
         >> d.listStarts_;
 
@@ -605,7 +605,7 @@ Foam::Ostream& Foam::operator<<
     const Distribution<Type>& d
 )
 {
-    os  <<  static_cast<const List< List<scalar> >& >(d)
+    os  <<  static_cast<const List<List<scalar>>& >(d)
         << d.binWidth_ << token::SPACE
         << d.listStarts_;
 
@@ -628,7 +628,7 @@ Foam::Distribution<Type> Foam::operator+
     // The coarsest binWidth is the sensible choice
     Distribution<Type> d(max(d1.binWidth(), d2.binWidth()));
 
-    List< List< List < Pair<scalar> > > > rawDists(2);
+    List<List<List<Pair<scalar>>>> rawDists(2);
 
     rawDists[0] = d1.raw();
     rawDists[1] = d2.raw();
@@ -639,7 +639,7 @@ Foam::Distribution<Type> Foam::operator+
         {
             List<scalar>& cmptDistribution = d[cmpt];
 
-            const List < Pair<scalar> >& cmptRaw = rawDists[rDI][cmpt];
+            const List<Pair<scalar>>& cmptRaw = rawDists[rDI][cmpt];
 
             forAll(cmptRaw, rI)
             {
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
index d84a1c763a..0faff2764c 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ Ostream& operator<<(Ostream&, const Distribution<Type>&);
 template<class Type>
 class Distribution
 :
-    public List< List<scalar> >
+    public List<List<scalar>>
 {
     // Private data
 
@@ -125,18 +125,18 @@ public:
 
         //- Return the normalised distribution (probability density)
         //  and bins
-        List< List<Pair<scalar> > > normalised() const;
+        List<List<Pair<scalar>> > normalised() const;
 
         //- Return the distribution of the total bin weights
-        List< List < Pair<scalar> > > raw() const;
+        List<List < Pair<scalar> > > raw() const;
 
         //- Return the cumulative normalised distribution and
         //  integration locations (at end of bins)
-        List< List<Pair<scalar> > > cumulativeNormalised() const;
+        List<List<Pair<scalar>> > cumulativeNormalised() const;
 
         //- Return the cumulative total bin weights and integration
         //  locations (at end of bins)
-        List< List<Pair<scalar> > > cumulativeRaw() const;
+        List<List<Pair<scalar>> > cumulativeRaw() const;
 
         //- Resets the Distribution by clearing the stored lists.
         //  Leaves the same number of them and the same binWidth.
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index c6ed4d1569..80323a7b73 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -300,7 +300,7 @@ template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::Xfer<Foam::List<T> >
 Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::xfer()
 {
-    return xferMoveTo< List<T> >(*this);
+    return xferMoveTo<List<T>>(*this);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index 0ebbcf6a4d..fa69e0a646 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ public:
 
     //- Hashing function class.
     //  Use Hasher directly for contiguous data. Otherwise hash incrementally.
-    template< class HashT=Hash<T> >
+    template<class HashT=Hash<T> >
     class Hash
     {
     public:
@@ -127,7 +127,7 @@ public:
         FixedList(Istream&);
 
         //- Clone
-        inline autoPtr< FixedList<T, Size> > clone() const;
+        inline autoPtr<FixedList<T, Size> > clone() const;
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index 053a4e4e6d..16f7f1b16d 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,10 +95,10 @@ inline Foam::FixedList<T, Size>::FixedList(const FixedList<T, Size>& lst)
 
 
 template<class T, unsigned Size>
-inline Foam::autoPtr< Foam::FixedList<T, Size> >
+inline Foam::autoPtr<Foam::FixedList<T, Size> >
 Foam::FixedList<T, Size>::clone() const
 {
-    return autoPtr< FixedList<T, Size> >(new FixedList<T, Size>(*this));
+    return autoPtr<FixedList<T, Size> >(new FixedList<T, Size>(*this));
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index ccec25c25e..1766cbe028 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -235,7 +235,7 @@ public:
         explicit inline PackedList(const UIndirectList<label>&);
 
         //- Clone
-        inline autoPtr< PackedList<nBits> > clone() const;
+        inline autoPtr<PackedList<nBits>> clone() const;
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
index 98a4191865..ce8b19e592 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ inline const Foam::SubList<T>& Foam::SubList<T>::null()
 template<class T>
 inline Foam::SubList<T>::operator const Foam::List<T>&() const
 {
-    return *reinterpret_cast< const List<T>* >(this);
+    return *reinterpret_cast<const List<T>* >(this);
 }
 
 
diff --git a/src/OpenFOAM/db/error/StaticAssert.H b/src/OpenFOAM/db/error/StaticAssert.H
index bfebf929e3..4e139b120a 100644
--- a/src/OpenFOAM/db/error/StaticAssert.H
+++ b/src/OpenFOAM/db/error/StaticAssert.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ class StaticAssertionTest {};
 #define StaticAssert(Test)                                                   \
     typedef ::Foam::StaticAssertionTest                                      \
     <                                                                        \
-        sizeof( ::Foam::StaticAssertionFailed< ((Test) ? true : false) > )   \
+        sizeof( ::Foam::StaticAssertionFailed<((Test) ? true : false)>)      \
     > StaticAssertMacro(StaticAssertionTest, __LINE__)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H
index 2a02143f4a..062ff5e853 100644
--- a/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Description
 (baseType,thisType,argNames)                                                  \
                                                                               \
     /* Add the thisType constructor function to the table */                  \
-    baseType::add##argNames##ConstructorToTable< thisType >                   \
+    baseType::add##argNames##ConstructorToTable<thisType>                     \
         add##thisType##argNames##ConstructorTo##baseType##Table_
 
 
@@ -46,7 +46,7 @@ Description
 (baseType,thisType,argNames,lookup)                                           \
                                                                               \
     /* Add the thisType constructor function to the table, find by lookup */  \
-    baseType::add##argNames##ConstructorToTable< thisType >                   \
+    baseType::add##argNames##ConstructorToTable<thisType>                     \
         add_##lookup##_##thisType##argNames##ConstructorTo##baseType##Table_  \
         (#lookup)
 
@@ -56,7 +56,7 @@ Description
 (baseType,thisType,argNames)                                                  \
                                                                               \
     /* Add the thisType constructor function to the table */                  \
-    baseType::addRemovable##argNames##ConstructorToTable< thisType >          \
+    baseType::addRemovable##argNames##ConstructorToTable<thisType>            \
         addRemovable##thisType##argNames##ConstructorTo##baseType##Table_
 
 
@@ -65,7 +65,7 @@ Description
 (baseType,thisType,argNames,lookup)                                           \
                                                                               \
     /* Add the thisType constructor function to the table, find by lookup */  \
-    baseType::addRemovable##argNames##ConstructorToTable< thisType >          \
+    baseType::addRemovable##argNames##ConstructorToTable<thisType>            \
         addRemovable_##lookup##_##thisType##argNames##ConstructorTo           \
         ##baseType##Table_(#lookup)
 
@@ -79,7 +79,7 @@ Description
 (baseType,thisType,Targ,argNames)                                             \
                                                                               \
     /* Add the thisType constructor function to the table */                  \
-    baseType::add##argNames##ConstructorToTable< thisType< Targ > >           \
+    baseType::add##argNames##ConstructorToTable<thisType<Targ>>               \
         add##thisType##Targ##argNames##ConstructorTo##baseType##Table_
 
 
@@ -89,7 +89,7 @@ Description
 (baseType,thisType,Targ,argNames,lookup)                                      \
                                                                               \
     /* Add the thisType constructor function to the table, find by lookup */  \
-    baseType::add##argNames##ConstructorToTable< thisType< Targ > >           \
+    baseType::add##argNames##ConstructorToTable<thisType<Targ>>               \
         add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType    \
         ##Table_(#lookup)
 
@@ -103,7 +103,7 @@ Description
 (baseType,thisType,Targ,argNames)                                             \
                                                                               \
     /* Add the thisType constructor function to the table */                  \
-    baseType< Targ >::add##argNames##ConstructorToTable< thisType< Targ > >   \
+    baseType<Targ>::add##argNames##ConstructorToTable<thisType<Targ>>         \
         add##thisType##Targ##argNames##ConstructorTo##baseType##Targ##Table_
 
 
@@ -113,7 +113,7 @@ Description
 (baseType,thisType,Targ,argNames,lookup)                                      \
                                                                               \
     /* Add the thisType constructor function to the table, find by lookup */  \
-    baseType< Targ >::add##argNames##ConstructorToTable< thisType< Targ > >   \
+    baseType<Targ>::add##argNames##ConstructorToTable<thisType<Targ>>         \
         add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType##  \
         Targ##Table_(#lookup)
 
diff --git a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
index b49ab8ccb9..ad692a3276 100644
--- a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,10 @@ Description
 (autoPtr,baseType,argNames,argList,parList)                                   \
                                                                               \
     /* Construct from argList function pointer type */                        \
-    typedef autoPtr< baseType > (*argNames##ConstructorPtr)argList;           \
+    typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList;             \
                                                                               \
     /* Construct from argList function table type */                          \
-    typedef HashTable< argNames##ConstructorPtr, word, string::hash >         \
+    typedef HashTable<argNames##ConstructorPtr, word, string::hash>           \
         argNames##ConstructorTable;                                           \
                                                                               \
     /* Construct from argList function pointer table pointer */               \
@@ -66,14 +66,14 @@ Description
     static void destroy##argNames##ConstructorTables();                       \
                                                                               \
     /* Class to add constructor from argList to table */                      \
-    template< class baseType##Type >                                          \
+    template<class baseType##Type>                                            \
     class add##argNames##ConstructorToTable                                   \
     {                                                                         \
     public:                                                                   \
                                                                               \
-        static autoPtr< baseType > New argList                                \
+        static autoPtr<baseType> New argList                                  \
         {                                                                     \
-            return autoPtr< baseType >(new baseType##Type parList);           \
+            return autoPtr<baseType>(new baseType##Type parList);             \
         }                                                                     \
                                                                               \
         add##argNames##ConstructorToTable                                     \
@@ -99,7 +99,7 @@ Description
                                                                               \
     /* Class to add constructor from argList to table */                      \
     /* Remove only the entry (not the table) upon destruction */              \
-    template< class baseType##Type >                                          \
+    template<class baseType##Type>                                            \
     class addRemovable##argNames##ConstructorToTable                          \
     {                                                                         \
         /* retain lookup name for later removal */                            \
@@ -107,9 +107,9 @@ Description
                                                                               \
     public:                                                                   \
                                                                               \
-        static autoPtr< baseType > New argList                                \
+        static autoPtr<baseType> New argList                                  \
         {                                                                     \
-            return autoPtr< baseType >(new baseType##Type parList);           \
+            return autoPtr<baseType>(new baseType##Type parList);             \
         }                                                                     \
                                                                               \
         addRemovable##argNames##ConstructorToTable                            \
@@ -141,10 +141,10 @@ Description
 (autoPtr,baseType,argNames,argList,parList)                                   \
                                                                               \
     /* Construct from argList function pointer type */                        \
-    typedef autoPtr< baseType > (*argNames##ConstructorPtr)argList;           \
+    typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList;             \
                                                                               \
     /* Construct from argList function table type */                          \
-    typedef HashTable< argNames##ConstructorPtr, word, string::hash >         \
+    typedef HashTable<argNames##ConstructorPtr, word, string::hash>           \
         argNames##ConstructorTable;                                           \
                                                                               \
     /* Construct from argList function pointer table pointer */               \
@@ -157,14 +157,14 @@ Description
     static void destroy##argNames##ConstructorTables();                       \
                                                                               \
     /* Class to add constructor from argList to table */                      \
-    template< class baseType##Type >                                          \
+    template<class baseType##Type>                                            \
     class add##argNames##ConstructorToTable                                   \
     {                                                                         \
     public:                                                                   \
                                                                               \
-        static autoPtr< baseType > New##baseType argList                      \
+        static autoPtr<baseType> New##baseType argList                        \
         {                                                                     \
-            return autoPtr< baseType >(baseType##Type::New parList.ptr());    \
+            return autoPtr<baseType>(baseType##Type::New parList.ptr());      \
         }                                                                     \
                                                                               \
         add##argNames##ConstructorToTable                                     \
@@ -196,7 +196,7 @@ Description
     };                                                                        \
                                                                               \
     /* Class to add constructor from argList to table */                      \
-    template< class baseType##Type >                                          \
+    template<class baseType##Type>                                            \
     class addRemovable##argNames##ConstructorToTable                          \
     {                                                                         \
         /* retain lookup name for later removal */                            \
@@ -204,9 +204,9 @@ Description
                                                                               \
     public:                                                                   \
                                                                               \
-        static autoPtr< baseType > New##baseType argList                      \
+        static autoPtr<baseType> New##baseType argList                        \
         {                                                                     \
-            return autoPtr< baseType >(baseType##Type::New parList.ptr());    \
+            return autoPtr<baseType>(baseType##Type::New parList.ptr());      \
         }                                                                     \
                                                                               \
         addRemovable##argNames##ConstructorToTable                            \
@@ -325,14 +325,14 @@ Description
 (baseType,argNames,Targ)                                                      \
                                                                               \
     /* Table constructor called from the table add function */                \
-    void baseType< Targ >::construct##argNames##ConstructorTables()           \
+    void baseType<Targ>::construct##argNames##ConstructorTables()             \
     {                                                                         \
         static bool constructed = false;                                      \
         if (!constructed)                                                     \
         {                                                                     \
             constructed = true;                                               \
-            baseType< Targ >::argNames##ConstructorTablePtr_                  \
-                = new baseType< Targ >::argNames##ConstructorTable;           \
+            baseType<Targ>::argNames##ConstructorTablePtr_                    \
+                = new baseType<Targ>::argNames##ConstructorTable;             \
         }                                                                     \
     }
 
@@ -344,12 +344,12 @@ Description
 (baseType,argNames,Targ)                                                      \
                                                                               \
     /* Table destructor called from the table add function destructor */      \
-    void baseType< Targ >::destroy##argNames##ConstructorTables()             \
+    void baseType<Targ>::destroy##argNames##ConstructorTables()               \
     {                                                                         \
-        if (baseType< Targ >::argNames##ConstructorTablePtr_)                 \
+        if (baseType<Targ>::argNames##ConstructorTablePtr_)                   \
         {                                                                     \
-            delete baseType< Targ >::argNames##ConstructorTablePtr_;          \
-            baseType< Targ >::argNames##ConstructorTablePtr_ = NULL;          \
+            delete baseType<Targ>::argNames##ConstructorTablePtr_;            \
+            baseType<Targ>::argNames##ConstructorTablePtr_ = NULL;            \
         }                                                                     \
     }
 
@@ -361,8 +361,8 @@ Description
 (baseType,argNames,Targ)                                                      \
                                                                               \
     /* Define the constructor function table */                               \
-    baseType< Targ >::argNames##ConstructorTable*                             \
-        baseType< Targ >::argNames##ConstructorTablePtr_ = NULL
+    baseType<Targ>::argNames##ConstructorTable*                               \
+        baseType<Targ>::argNames##ConstructorTablePtr_ = NULL
 
 
 // external use:
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
index f185163e3a..72c49353a7 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -311,7 +311,7 @@ template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::Xfer<Foam::List<T> >
 Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::xfer()
 {
-    return xferMoveTo< List<T> >(*this);
+    return xferMoveTo<List<T>>(*this);
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
index d2d5aabe9c..18d3c589c7 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ inline void Foam::SubField<Type>::operator=(const SubField<Type>& rhs)
 template<class Type>
 inline Foam::SubField<Type>::operator const Foam::Field<Type>&() const
 {
-    return *reinterpret_cast< const Field<Type>* >(this);
+    return *reinterpret_cast<const Field<Type>* >(this);
 }
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H
index 0ac15a7cab..a2353fdd22 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ SourceFiles
 // Only used internally
 #define makeTypeTableReadersTypeName(typeTableReader, dataType)               \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(typeTableReader< dataType >, 0)
+    defineNamedTemplateTypeNameAndDebug(typeTableReader<dataType>, 0)
 
 // Sometimes used externally
 #define makeTableReadersTypeName(typeTableReader)                             \
@@ -51,7 +51,7 @@ SourceFiles
 // Define type info for single dataType template instantiation (eg, vector)
 #define makeTableReaderType(typeTableReader, dataType)                        \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(typeTableReader< dataType >, 0);      \
+    defineNamedTemplateTypeNameAndDebug(typeTableReader<dataType>, 0);      \
     addTemplatedToRunTimeSelectionTable                                       \
     (                                                                         \
         tableReader, typeTableReader, dataType, dictionary                    \
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H
index eaafd563f3..21e839cf3c 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ inline Foam::labelRange::labelRange(const label start, const label size)
 
 inline Foam::labelRange::const_iterator::const_iterator()
 :
-   range_(*reinterpret_cast< Foam::labelRange* >(0)),
+   range_(*reinterpret_cast<Foam::labelRange* >(0)),
    index_(-1)
 {}
 
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H
index 2c6f75aecc..739d582e9f 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ inline Foam::labelRanges::labelRanges(const label nElem)
 
 inline Foam::labelRanges::const_iterator::const_iterator()
 :
-   list_(*reinterpret_cast< Foam::labelRanges* >(0)),
+   list_(*reinterpret_cast<Foam::labelRanges* >(0)),
    index_(-1),
    subIndex_(-1)
 {}
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordList.C b/src/OpenFOAM/primitives/strings/lists/hashedWordList.C
index de0e43052a..4a7cde89ed 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordList.C
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ Foam::hashedWordList::hashedWordList(const hashedWordList& names)
 }
 
 
-Foam::hashedWordList::hashedWordList(const Xfer< List<word> >& names)
+Foam::hashedWordList::hashedWordList(const Xfer<List<word>>& names)
 :
     List<word>(names)
 {
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
index a4cda16163..700f794908 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ public:
         hashedWordList(const UList<word>& names);
 
         //- Construct by transferring the parameter contents
-        hashedWordList(const Xfer< List<word> >& names);
+        hashedWordList(const Xfer<List<word>>& names);
 
         //- Construct from number and list of names
         hashedWordList(const label nNames, const char** names);
diff --git a/src/fileFormats/sampledSetWriters/writer.C b/src/fileFormats/sampledSetWriters/writer.C
index 6ccf51c743..a6abbed258 100644
--- a/src/fileFormats/sampledSetWriters/writer.C
+++ b/src/fileFormats/sampledSetWriters/writer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr< Foam::writer<Type> > Foam::writer<Type>::New
+Foam::autoPtr<Foam::writer<Type>> Foam::writer<Type>::New
 (
     const word& writeType
 )
diff --git a/src/fileFormats/sampledSetWriters/writers.H b/src/fileFormats/sampledSetWriters/writers.H
index 601e7bcd16..95665cbb64 100644
--- a/src/fileFormats/sampledSetWriters/writers.H
+++ b/src/fileFormats/sampledSetWriters/writers.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ SourceFiles
 // Only used internally
 #define makeTypeSetWritersTypeName(typeWriter, dataType)                      \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(typeWriter< dataType >, 0)
+    defineNamedTemplateTypeNameAndDebug(typeWriter<dataType>, 0)
 
 // Sometimes used externally
 #define makeSetWritersTypeName(typeWriter)                                    \
@@ -55,7 +55,7 @@ SourceFiles
 // Define type info for single dataType template instantiation (eg, vector)
 #define makeSetWriterType(typeWriter, dataType)                               \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(typeWriter< dataType >, 0);           \
+    defineNamedTemplateTypeNameAndDebug(typeWriter<dataType>, 0);           \
     addTemplatedToRunTimeSelectionTable                                       \
     (                                                                         \
         writer, typeWriter, dataType, word                                    \
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 8825177218..8f5a2d3789 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -2178,7 +2178,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
 (
-    const tmp< DimensionedField<scalar, volMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, volMesh> >& tdsf,
     const fvMatrix<Type>& A
 )
 {
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
index f04b7363a4..a65a18ac10 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ void Foam::bufferedAccumulator<Type>::accumulateAndResetBuffer(const label b)
 template<class Type>
 Foam::bufferedAccumulator<Type>::bufferedAccumulator()
 :
-    List< Field<Type> >(),
+    List<Field<Type>>(),
     averagesTaken_(),
     bufferOffsets_()
 {}
@@ -66,7 +66,7 @@ Foam::bufferedAccumulator<Type>::bufferedAccumulator
     const label bufferingInterval
 )
 :
-    List< Field<Type> >(),
+    List<Field<Type>>(),
     averagesTaken_(),
     bufferOffsets_()
 {
@@ -85,7 +85,7 @@ Foam::bufferedAccumulator<Type>::bufferedAccumulator
     const bufferedAccumulator<Type>& bA
 )
 :
-    List< Field<Type> >(static_cast< List< Field<Type> > >(bA)),
+    List<Field<Type>>(static_cast<List<Field<Type>>>(bA)),
     averagesTaken_(bA.averagesTaken()),
     bufferOffsets_(bA.bufferOffsets())
 {}
@@ -217,7 +217,7 @@ void Foam::bufferedAccumulator<Type>::operator=
             << abort(FatalError);
     }
 
-    List< Field<Type> >::operator=(rhs);
+    List<Field<Type>>::operator=(rhs);
 
     averagesTaken_ = rhs.averagesTaken();
 
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
index 8d462902f4..a96d90b192 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ Ostream& operator<<
 template<class Type>
 class bufferedAccumulator
 :
-    public List< Field<Type> >
+    public List<Field<Type>>
 {
     // Private data
 
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
index 247fe3d37d..88d8888a49 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Foam::operator<<(Ostream& os, const bufferedAccumulator<Type>& bA)
 {
 
     os  << bA.averagesTaken_
-        << static_cast<const List< Field<Type> >&>(bA)
+        << static_cast<const List<Field<Type>>&>(bA)
         << bA.bufferOffsets();
 
     // Check state of Ostream
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
index 54ac66d1fa..b3aedbeb18 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ void Foam::correlationFunction<Type>::setTimesAndSizes
     );
 
     tZeroBuffers_ =
-        Field< Field<Type> >
+        Field<Field<Type>>
         (
             nBuffers,
             Field<Type>
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
index 0c02e412df..6fcf25d8ed 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ class correlationFunction
 
         const polyMesh& mesh_;
 
-        Field< Field<Type> > tZeroBuffers_;
+        Field<Field<Type>> tZeroBuffers_;
 
         scalar duration_;
         scalar sampleInterval_;
@@ -137,7 +137,7 @@ public:
 
     // Access
 
-        inline const Field< Field<Type> >& tZeroBuffers() const;
+        inline const Field<Field<Type>>& tZeroBuffers() const;
 
         inline scalar duration() const;
 
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H
index c3296a928a..0be6417185 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-inline const Foam::Field< Foam::Field<Type> >&
+inline const Foam::Field<Foam::Field<Type>>&
 Foam::correlationFunction<Type>::tZeroBuffers() const
 {
     return tZeroBuffers_;
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
index bc02f151a1..e3f9bea103 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ Foam::distribution::distribution(const scalar binWidth)
 
 Foam::distribution::distribution(const distribution& d)
 :
-    Map<label>(static_cast< Map<label> >(d)),
+    Map<label>(static_cast<Map<label>>(d)),
     binWidth_(d.binWidth())
 {}
 
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
index 6d6617d652..b730adb56e 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
@@ -1,24 +1,24 @@
 // Fields for data gathering
 
-List< scalarField > allSpeciesN_RU
+List<scalarField> allSpeciesN_RU
 (
     molecules.potential().nIds(),
     scalarField (mesh.nCells(), 0.0)
 );
 
-List< scalarField > allSpeciesM_RU
+List<scalarField> allSpeciesM_RU
 (
     molecules.potential().nIds(),
     scalarField (mesh.nCells(), 0.0)
 );
 
-List< vectorField > allSpeciesVelocitySum_RU
+List<vectorField> allSpeciesVelocitySum_RU
 (
     molecules.potential().nIds(),
     vectorField (mesh.nCells(), vector::zero)
 );
 
-List< scalarField > allSpeciesVelocityMagSquaredSum_RU
+List<scalarField> allSpeciesVelocityMagSquaredSum_RU
 (
     molecules.potential().nIds(),
     scalarField (mesh.nCells(), 0.0)
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
index af0197b5fe..4bd50ebafc 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
@@ -1,24 +1,24 @@
 if (runTime.outputTime())
 {
-    allSpeciesN_RU = List< scalarField >
+    allSpeciesN_RU = List<scalarField>
     (
         molecules.potential().nIds(),
         scalarField(mesh.nCells(), 0.0)
     );
 
-    allSpeciesM_RU = List< scalarField >
+    allSpeciesM_RU = List<scalarField>
     (
         molecules.potential().nIds(),
         scalarField(mesh.nCells(), 0.0)
     );
 
-    allSpeciesVelocitySum_RU = List< vectorField >
+    allSpeciesVelocitySum_RU = List<vectorField>
     (
         molecules.potential().nIds(),
         vectorField(mesh.nCells(), vector::zero)
     );
 
-    allSpeciesVelocityMagSquaredSum_RU = List< scalarField >
+    allSpeciesVelocityMagSquaredSum_RU = List<scalarField>
     (
         molecules.potential().nIds(),
         scalarField(mesh.nCells(), 0.0)
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
index 0775247d7e..535a298015 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ Foam::scalar Foam::pairPotential::force(const scalar r) const
 }
 
 
-Foam::List< Foam::Pair< Foam::scalar > >
+Foam::List<Foam::Pair<Foam::scalar>>
 Foam::pairPotential::forceTable() const
 {
     List<Pair<scalar> > forceTab(forceLookup_.size());
@@ -150,7 +150,7 @@ Foam::scalar Foam::pairPotential::energy(const scalar r) const
 }
 
 
-Foam::List< Foam::Pair< Foam::scalar > >
+Foam::List<Foam::Pair<Foam::scalar>>
     Foam::pairPotential::energyTable() const
 {
     List<Pair<scalar> > energyTab(energyLookup_.size());
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
index b9483f5796..c1022a6434 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,9 +31,9 @@ bool Foam::pairPotential::writeEnergyAndForceTables(Ostream& os) const
     Info<< "Writing energy and force tables to file for potential "
         << name_ << endl;
 
-    List< Pair <scalar> > eTab(energyTable());
+    List<Pair <scalar> > eTab(energyTable());
 
-    List< Pair <scalar> > fTab(forceTable());
+    List<Pair <scalar> > fTab(forceTable());
 
     forAll(eTab, e)
     {
diff --git a/src/mesh/blockMesh/block/blockCreate.C b/src/mesh/blockMesh/block/blockCreate.C
index 85c6c583b9..b3ce7d3a31 100644
--- a/src/mesh/blockMesh/block/blockCreate.C
+++ b/src/mesh/blockMesh/block/blockCreate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ void Foam::block::createPoints() const
 
 
     // List of edge point and weighting factors
-    const List< List<point> >& p = blockEdgePoints();
+    const List<List<point>>& p = blockEdgePoints();
     const scalarListList& w = blockEdgeWeights();
 
     //
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
index 1357a9e566..1bdb4a82d7 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,7 +186,7 @@ const Foam::cellShape& Foam::blockDescriptor::blockShape() const
 }
 
 
-const Foam::List< Foam::List< Foam::point > >&
+const Foam::List<Foam::List<Foam::point>>&
 Foam::blockDescriptor::blockEdgePoints() const
 {
     return edgePoints_;
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
index df3bfa8a39..a1e6e60798 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ class blockDescriptor
         Vector<label> meshDensity_;
 
         //- Block edge points
-        List< List<point> > edgePoints_;
+        List<List<point>> edgePoints_;
 
         //- Block edge weighting factors
         scalarListList edgeWeights_;
@@ -155,7 +155,7 @@ public:
         const cellShape& blockShape() const;
 
         //- Return the block points along each edge
-        const List< List<point> >& blockEdgePoints() const;
+        const List<List<point>>& blockEdgePoints() const;
 
         //- Return the weightings along each edge
         const scalarListList& blockEdgeWeights() const;
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 70f548ad00..0c294d0c32 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -334,7 +334,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
     }
 
     // Shrink it
-    forAllIter(Map< DynamicList<label> >, facePointEdges, iter)
+    forAllIter(Map<DynamicList<label>>, facePointEdges, iter)
     {
         iter().shrink();
 
@@ -361,7 +361,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
         }
 
         Pout<< "    Constructed point-edge adressing:" << endl;
-        forAllConstIter(Map< DynamicList<label> >, facePointEdges, iter)
+        forAllConstIter(Map<DynamicList<label>>, facePointEdges, iter)
         {
             Pout<< "    vertex " << iter.key() << " is connected to edges "
                 << iter() << endl;
diff --git a/src/sampling/meshToMesh0/meshToMesh0Templates.C b/src/sampling/meshToMesh0/meshToMesh0Templates.C
index 9595399bd2..c535ee07a2 100644
--- a/src/sampling/meshToMesh0/meshToMesh0Templates.C
+++ b/src/sampling/meshToMesh0/meshToMesh0Templates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -365,7 +365,7 @@ void Foam::meshToMesh0::interpolate
 
 
 template<class Type, class CombineOp>
-Foam::tmp< Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
 Foam::meshToMesh0::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& fromVf,
@@ -437,7 +437,7 @@ Foam::meshToMesh0::interpolate
 
 
 template<class Type, class CombineOp>
-Foam::tmp< Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
 Foam::meshToMesh0::interpolate
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf,
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index 430039a2ce..7efa29fcca 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ class sampledSets
         public:
 
             //- The set formatter
-            autoPtr< writer<Type> > formatter;
+            autoPtr<writer<Type>> formatter;
 
             //- Construct null
             fieldGroup()
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
index d20c3fc779..02f92594d7 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 
 
 template<class Face>
-Foam::autoPtr< Foam::MeshedSurface<Face> >
+Foam::autoPtr<Foam::MeshedSurface<Face>>
 Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
 {
     if (debug)
@@ -50,7 +50,7 @@ Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
         if (supported.found(ext))
         {
             // create indirectly
-            autoPtr< MeshedSurface<Face> > surf(new MeshedSurface<Face>);
+            autoPtr<MeshedSurface<Face>> surf(new MeshedSurface<Face>);
             surf().transfer(FriendType::New(name, ext)());
 
             return surf;
@@ -66,12 +66,12 @@ Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
             << exit(FatalError);
     }
 
-    return autoPtr< MeshedSurface<Face> >(cstrIter()(name));
+    return autoPtr<MeshedSurface<Face>>(cstrIter()(name));
 }
 
 
 template<class Face>
-Foam::autoPtr< Foam::MeshedSurface<Face> >
+Foam::autoPtr<Foam::MeshedSurface<Face>>
 Foam::MeshedSurface<Face>::New(const fileName& name)
 {
     word ext = name.ext();
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
index 9a2e01992d..c1974960f7 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Face>
-Foam::autoPtr< Foam::UnsortedMeshedSurface<Face> >
+Foam::autoPtr<Foam::UnsortedMeshedSurface<Face>>
 Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
 {
     if (debug)
@@ -72,7 +72,7 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
 
 
 template<class Face>
-Foam::autoPtr< Foam::UnsortedMeshedSurface<Face> >
+Foam::autoPtr<Foam::UnsortedMeshedSurface<Face>>
 Foam::UnsortedMeshedSurface<Face>::New(const fileName& name)
 {
     word ext = name.ext();
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
index 418bcd9ce7..bc5b582cdc 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ bool Foam::fileFormats::FTRsurfaceFormat<Face>::read
     is >> this->storedPoints();
 
     // triFaces read with attached keys
-    List< Keyed<triFace> > facesRead(is);
+    List<Keyed<triFace>> facesRead(is);
 
     List<Face>  faceLst(facesRead.size());
     List<label> zoneIds(facesRead.size());

From 56fa7c09063f531089f9c340ea7daa2e62ffd209 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Jan 2016 22:41:16 +0000
Subject: [PATCH 095/447] Update code to use the simpler C++11 template syntax
 removing spaces between closing ">"s

---
 .../turbulence/PDRkEpsilon/PDRkEpsilon.C      |   4 +-
 .../solvers/combustion/PDRFoam/bEqn.H         |   2 +-
 .../solvers/combustion/XiFoam/ftEqn.H         |   2 +-
 .../chemFoam/createSingleCellMesh.H           |   2 +-
 .../solvers/combustion/fireFoam/YEEqn.H       |   2 +-
 .../solvers/combustion/reactingFoam/YEqn.H    |   2 +-
 .../mixedFixedValueSlipFvPatchField.C         |   8 +-
 .../mixedFixedValueSlipFvPatchField.H         |  14 +-
 .../rhoCentralFoam/directionInterpolate.H     |   4 +-
 .../solvers/lagrangian/DPMFoam/createFields.H |   2 +-
 .../lagrangian/coalChemistryFoam/YEqn.H       |   2 +-
 .../lagrangian/reactingParcelFilmFoam/YEqn.H  |   2 +-
 .../lagrangian/reactingParcelFoam/YEqn.H      |   2 +-
 .../simpleReactingParcelFoam/YEqn.H           |   2 +-
 .../solvers/multiphase/interFoam/alphaEqn.H   |  10 +-
 .../interPhaseChangeFoam/alphaEqn.H           |   2 +-
 .../interPhaseChangeDyMFoam/pEqn.H            |   2 +-
 .../multiphase/interPhaseChangeFoam/pEqn.H    |   2 +-
 .../phaseChangeTwoPhaseMixtures/Kunz/Kunz.C   |  10 +-
 .../phaseChangeTwoPhaseMixtures/Kunz/Kunz.H   |   6 +-
 .../Merkle/Merkle.C                           |  10 +-
 .../Merkle/Merkle.H                           |   6 +-
 .../SchnerrSauer/SchnerrSauer.C               |  10 +-
 .../SchnerrSauer/SchnerrSauer.H               |   6 +-
 .../phaseChangeTwoPhaseMixture.C              |  14 +-
 .../phaseChangeTwoPhaseMixture.H              |  10 +-
 .../InterfaceCompositionModel.H               |  10 +-
 .../Raoult/Raoult.C                           |   4 +-
 .../Raoult/Raoult.H                           |   4 +-
 .../BlendedInterfacialModel.C                 |   6 +-
 .../BlendedInterfacialModel.H                 |   4 +-
 .../HeatAndMassTransferPhaseSystem.H          |   6 +-
 .../HeatTransferPhaseSystem.H                 |   4 +-
 .../MomentumTransferPhaseSystem.C             |  10 +-
 .../MomentumTransferPhaseSystem.H             |  16 +-
 .../phaseCompressibleTurbulenceModel.H        |   4 +-
 .../phaseCompressibleTurbulenceModelFwd.H     |   4 +-
 .../phaseSystems/phaseSystem/phaseSystem.H    |   6 +-
 .../phaseSystem/phaseSystemTemplates.C        |  10 +-
 .../multiphaseSystem/multiphaseSystem.H       |   6 +-
 .../reactingMultiphaseEulerFoam/pU/pEqn.H     |   4 +-
 .../kineticTheoryModel/kineticTheoryModel.C   |   6 +-
 .../kineticTheoryModel/kineticTheoryModel.H   |   4 +-
 .../phasePressureModel/phasePressureModel.C   |   6 +-
 .../phasePressureModel/phasePressureModel.H   |   4 +-
 .../kineticTheoryModel/kineticTheoryModel.C   |   6 +-
 .../kineticTheoryModel/kineticTheoryModel.H   |   4 +-
 .../phasePressureModel/phasePressureModel.C   |   6 +-
 .../phasePressureModel/phasePressureModel.H   |   4 +-
 .../BlendedInterfacialModel.C                 |   6 +-
 .../BlendedInterfacialModel.H                 |   4 +-
 .../twoPhaseSystem/phaseModel/phaseModel.H    |   4 +-
 .../twoPhaseSystem/twoPhaseSystem.H           |  14 +-
 .../CompactListList/Test-CompactListList.C    |   6 +-
 .../test/DynamicList/Test-DynamicList.C       |   6 +-
 .../test/HashTable2/Test-HashTable2.C         |   4 +-
 .../test/HashTable3/Test-HashTable3.C         |   8 +-
 .../test/PackedList2/Test-PackedList2.C       |   6 +-
 .../test/PatchTools/Test-PatchTools.C         |   4 +-
 applications/test/dataEntry/Test-DataEntry.C  |   4 +-
 .../extendedStencil/Test-ExtendedStencil.C    |  28 +-
 .../extendedStencil/Test-ExtendedStencil2.C   |   6 +-
 applications/test/parallel/Test-parallel.C    |   4 +-
 applications/test/regex/Test-regex.C          |   4 +-
 .../test/thermoMixture/Test-thermoMixture.C   |   4 +-
 applications/test/wordRe/Test-wordRe.C        |   4 +-
 applications/test/xfer/Test-xferList.C        |   6 +-
 .../utilities/mesh/advanced/PDRMesh/PDRMesh.C |  10 +-
 .../mesh/advanced/modifyMesh/modifyMesh.C     |  16 +-
 .../refinementLevel/refinementLevel.C         |   4 +-
 .../Optional/ccm26ToFoam/ccm26ToFoam.C        |   6 +-
 .../mesh/conversion/ansysToFoam/ansysToFoam.L |   6 +-
 .../fluentMeshToFoam/fluentMeshToFoam.L       |   4 +-
 .../mesh/conversion/gmshToFoam/gmshToFoam.C   |  14 +-
 .../ideasUnvToFoam/ideasUnvToFoam.C           |   6 +-
 .../mesh/conversion/kivaToFoam/readKivaGrid.H |   2 +-
 .../netgenNeutralToFoam/netgenNeutralToFoam.C |   8 +-
 .../star3ToFoam/createCoupleMatches.C         |  22 +-
 .../conversion/tetgenToFoam/tetgenToFoam.C    |   4 +-
 .../mesh/generation/blockMesh/blockMeshApp.C  |   6 +-
 .../extrudeToRegionMesh/extrudeToRegionMesh.C |   4 +-
 .../extrude2DMesh/extrude2DMeshApp.C          |   4 +-
 .../cellSizeAndAlignmentGrid.C                |   8 +-
 .../DelaunayMesh/DelaunayMesh.H               |   6 +-
 .../DelaunayMesh/DelaunayMeshIO.C             |  10 +-
 .../DelaunayMesh/DistributedDelaunayMesh.H    |   4 +-
 .../backgroundMeshDecomposition.C             |   6 +-
 .../backgroundMeshDecomposition.H             |   6 +-
 .../smoothAlignmentSolver.C                   |  10 +-
 .../smoothAlignmentSolver.H                   |   4 +-
 .../conformalVoronoiMesh.H                    |  22 +-
 .../conformalVoronoiMeshCalcDualMesh.C        |  36 +-
 .../conformalVoronoiMeshConformToSurface.C    |   6 +-
 .../featurePointConformer.C                   |   8 +-
 .../featurePointConformer.H                   |   4 +-
 .../indexedCell/indexedCell.C                 |   4 +-
 .../indexedCell/indexedCell.H                 |   8 +-
 .../indexedVertex/indexedVertex.C             |   4 +-
 .../indexedVertex/indexedVertex.H             |  10 +-
 .../conformalVoronoiMesh/pointConversion.H    |   4 +-
 .../conformationSurfaces.C                    |  16 +-
 .../conformationSurfaces.H                    |   4 +-
 .../foamyMesh/foamyHexMesh/foamyHexMesh.C     |   4 +-
 .../foamyHexMeshSurfaceSimplify.C             |   4 +-
 .../foamyMesh/foamyQuadMesh/indexedFace.H     |   4 +-
 .../foamyMesh/foamyQuadMesh/indexedVertex.H   |   4 +-
 .../foamyQuadMesh/shortEdgeFilter2D.C         |   8 +-
 .../foamyQuadMesh/shortEdgeFilter2D.H         |   6 +-
 .../generation/snappyHexMesh/snappyHexMesh.C  |  20 +-
 .../splitMeshRegions/splitMeshRegions.C       |  26 +-
 .../mesh/manipulation/subsetMesh/subsetMesh.C |   8 +-
 .../helpBoundary/helpBoundaryTemplates.C      |   4 +-
 .../miscellaneous/patchSummary/patchSummary.C |   6 +-
 .../decomposePar/decomposePar.C               |  38 +-
 .../decomposePar/dimFieldDecomposer.H         |   4 +-
 .../dimFieldDecomposerDecomposeFields.C       |   6 +-
 .../decomposePar/domainDecomposition.C        |  10 +-
 .../decomposePar/domainDecomposition.H        |  12 +-
 .../decomposePar/domainDecompositionMesh.C    |  12 +-
 .../domainDecompositionTemplates.C            |   6 +-
 .../decomposePar/lagrangianFieldDecomposer.C  |   4 +-
 .../decomposePar/lagrangianFieldDecomposer.H  |  14 +-
 ...lagrangianFieldDecomposerDecomposeFields.C |  22 +-
 .../decomposePar/pointFieldDecomposer.H       |   4 +-
 .../pointFieldDecomposerDecomposeFields.C     |   8 +-
 .../foamToEnsight/ensightField.C              |   8 +-
 .../foamToEnsight/ensightField.H              |   4 +-
 .../foamToEnsight/foamToEnsight.C             |   8 +-
 .../foamToEnsightParts/ensightOutputCase.H    |   6 +-
 .../foamToEnsightParts/findFields.H           |   2 +-
 .../foamToEnsightParts/foamToEnsightParts.C   |   8 +-
 .../foamToTecplot360/tecplotWriter.H          |   6 +-
 .../foamToTecplot360/tecplotWriterTemplates.C |   8 +-
 .../dataConversion/foamToVTK/internalWriter.H |   6 +-
 .../foamToVTK/internalWriterTemplates.C       |   6 +-
 .../dataConversion/foamToVTK/patchWriter.H    |   8 +-
 .../foamToVTK/patchWriterTemplates.C          |   8 +-
 .../foamToVTK/surfaceMeshWriter.H             |   6 +-
 .../foamToVTK/surfaceMeshWriterTemplates.C    |   8 +-
 .../dataConversion/foamToVTK/writeFuns.H      |   6 +-
 .../foamToVTK/writeFunsTemplates.C            |   6 +-
 .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C     |   4 +-
 .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H     |   6 +-
 .../vtkPV3Foam/vtkPV3FoamFields.C             |   4 +-
 .../vtkPV3Foam/vtkPV3FoamMeshVolume.C         |   4 +-
 .../vtkPV3Foam/vtkPV3FoamUpdateInfo.C         |  14 +-
 .../vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H   |  12 +-
 .../vtkPV3Foam/vtkPV3FoamVolFields.H          |  12 +-
 .../PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C     |   4 +-
 .../PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H     |   6 +-
 .../vtkPV4Foam/vtkPV4FoamFields.C             |   4 +-
 .../vtkPV4Foam/vtkPV4FoamMeshVolume.C         |   4 +-
 .../vtkPV4Foam/vtkPV4FoamUpdateInfo.C         |  14 +-
 .../vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H   |  12 +-
 .../vtkPV4Foam/vtkPV4FoamVolFields.H          |  12 +-
 .../particleTracks/particleTracks.C           |   8 +-
 .../steadyParticleTracks.C                    |   8 +-
 .../steadyParticleTracksTemplates.C           |  16 +-
 .../steadyParticleTracksTemplates.H           |  12 +-
 .../dsmcFieldsCalc/dsmcFieldsCalc.C           |   4 +-
 ...ateExternalCoupledPatchGeometryTemplates.C |   6 +-
 .../mapFields/MapLagrangianFields.H           |   6 +-
 .../mapFieldsPar/MapLagrangianFields.H        |   6 +-
 .../viewFactorsGen/viewFactorsGen.C           |   6 +-
 .../tabulatedWallFunction/general/general.C   |   4 +-
 .../surfaceBooleanFeatures.C                  |   6 +-
 .../surfaceFeatureExtract.C                   |   4 +-
 .../surface/surfaceHookUp/surfaceHookUp.C     |  10 +-
 .../surfaceRedistributePar.C                  |   6 +-
 .../adiabaticFlameT/adiabaticFlameT.C         |   4 +-
 .../equilibriumCO/equilibriumCO.C             |   4 +-
 .../equilibriumFlameT/equilibriumFlameT.C     |   4 +-
 .../mixtureAdiabaticFlameT.C                  |   4 +-
 bin/foamNewBC                                 |   4 +-
 doc/codingStyleGuide.org                      |   2 +-
 etc/codeTemplates/BC/BC.H                     |   4 +-
 .../fixedValuePointPatchFieldTemplate.H       |   8 +-
 .../template/_TemplateTemplate.C              |   6 +-
 .../template/_TemplateTemplate.H              |   4 +-
 .../dynamicIndexedOctree.C                    |  16 +-
 .../dynamicIndexedOctree.H                    |  10 +-
 .../algorithms/indexedOctree/indexedOctree.C  |   4 +-
 .../algorithms/indexedOctree/indexedOctree.H  |   6 +-
 .../containers/HashTables/HashSet/HashSet.H   |   8 +-
 .../HashTables/HashTable/HashTable.C          |   4 +-
 .../HashTables/HashTable/HashTable.H          |   6 +-
 .../HashTables/HashTable/HashTableI.H         |   4 +-
 src/OpenFOAM/containers/HashTables/Map/Map.H  |  22 +-
 .../containers/HashTables/PtrMap/PtrMap.H     |  10 +-
 .../StaticHashTable/StaticHashTable.C         |   4 +-
 .../StaticHashTable/StaticHashTable.H         |  10 +-
 .../StaticHashTable/StaticHashTableI.H        |   4 +-
 .../containers/Identifiers/Keyed/Keyed.H      |   6 +-
 .../containers/Identifiers/Keyed/KeyedI.H     |  10 +-
 .../Lists/BiIndirectList/BiIndirectList.H     |   6 +-
 .../Lists/BiIndirectList/BiIndirectListI.H    |   6 +-
 .../Lists/CompactListList/CompactListList.C   |   4 +-
 .../Lists/CompactListList/CompactListList.H   |  12 +-
 .../Lists/CompactListList/CompactListListI.H  |  10 +-
 .../Lists/Distribution/Distribution.H         |   8 +-
 .../Lists/DynamicList/DynamicList.H           |   6 +-
 .../Lists/DynamicList/DynamicListI.H          |   4 +-
 .../containers/Lists/FixedList/FixedList.H    |   4 +-
 .../containers/Lists/FixedList/FixedListI.H   |   6 +-
 .../containers/Lists/FixedList/FixedListIO.C  |   4 +-
 .../Lists/IndirectList/IndirectList.H         |   6 +-
 .../Lists/IndirectList/IndirectListI.H        |   8 +-
 src/OpenFOAM/containers/Lists/List/List.C     |   4 +-
 src/OpenFOAM/containers/Lists/List/List.H     |   8 +-
 src/OpenFOAM/containers/Lists/List/ListI.H    |  10 +-
 src/OpenFOAM/containers/Lists/List/ListIO.C   |   4 +-
 .../Lists/PackedList/PackedBoolList.H         |   4 +-
 .../Lists/PackedList/PackedBoolListI.H        |   4 +-
 .../containers/Lists/PackedList/PackedList.H  |   4 +-
 .../containers/Lists/PackedList/PackedListI.H |  10 +-
 .../containers/Lists/PtrList/PtrList.C        |   4 +-
 .../containers/Lists/PtrList/PtrList.H        |   6 +-
 .../containers/Lists/PtrList/PtrListI.H       |   4 +-
 .../Lists/SortableList/SortableList.C         |   8 +-
 .../Lists/SortableList/SortableList.H         |   6 +-
 .../containers/Lists/SubList/SubListI.H       |   2 +-
 src/OpenFOAM/containers/Lists/UList/UListI.H  |   4 +-
 src/OpenFOAM/containers/Lists/UList/UListIO.C |   4 +-
 .../containers/Lists/UPtrList/UPtrList.C      |   4 +-
 .../containers/Lists/UPtrList/UPtrList.H      |   6 +-
 .../containers/Lists/UPtrList/UPtrListI.H     |   4 +-
 .../IOobjects/CompactIOField/CompactIOField.C |   4 +-
 .../IOobjects/CompactIOField/CompactIOField.H |   4 +-
 .../IOobjects/CompactIOList/CompactIOList.C   |   4 +-
 .../IOobjects/CompactIOList/CompactIOList.H   |   4 +-
 src/OpenFOAM/db/IOobjects/IOField/IOField.C   |   4 +-
 src/OpenFOAM/db/IOobjects/IOField/IOField.H   |   4 +-
 src/OpenFOAM/db/IOobjects/IOList/IOList.C     |   4 +-
 src/OpenFOAM/db/IOobjects/IOList/IOList.H     |   4 +-
 src/OpenFOAM/db/IOobjects/IOMap/IOMap.C       |   4 +-
 src/OpenFOAM/db/IOobjects/IOMap/IOMap.H       |   4 +-
 .../db/IOobjects/IOPtrList/IOPtrList.C        |   4 +-
 .../db/IOobjects/IOPtrList/IOPtrList.H        |   4 +-
 .../db/IOstreams/Pstreams/PstreamBuffers.H    |   6 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C |  14 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  10 +-
 src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H |   4 +-
 src/OpenFOAM/db/IOstreams/token/token.H       |   4 +-
 src/OpenFOAM/db/dictionary/dictionary.C       |  16 +-
 src/OpenFOAM/db/dictionary/dictionary.H       |   8 +-
 .../primitiveEntry/primitiveEntry.C           |   4 +-
 .../primitiveEntry/primitiveEntry.H           |   4 +-
 .../addToMemberFunctionSelectionTable.H       |  14 +-
 .../DimensionedField/DimensionedField.C       |  26 +-
 .../DimensionedField/DimensionedField.H       |  34 +-
 .../DimensionedFieldFunctions.C               | 106 ++--
 .../DimensionedFieldFunctions.H               |  70 +--
 .../DimensionedFieldFunctionsM.C              | 134 +++---
 .../DimensionedFieldFunctionsM.H              |  94 ++--
 .../DimensionedField/DimensionedFieldI.H      |   4 +-
 .../DimensionedField/DimensionedFieldIO.C     |   4 +-
 .../DimensionedFieldReuseFunctions.H          |  66 +--
 .../DimensionedField/SubDimensionedField.H    |   6 +-
 .../DimensionedField/SubDimensionedFieldI.H   |   6 +-
 .../DimensionedScalarField.C                  | 134 +++---
 .../DimensionedScalarField.H                  |  14 +-
 .../FieldFields/FieldField/FieldField.C       |  46 +-
 .../FieldFields/FieldField/FieldField.H       |  30 +-
 .../FieldField/FieldFieldFunctions.C          | 130 ++---
 .../FieldField/FieldFieldFunctions.H          |  80 +--
 .../FieldField/FieldFieldFunctionsM.C         | 110 ++---
 .../FieldField/FieldFieldFunctionsM.H         |  70 +--
 .../FieldField/FieldFieldReuseFunctions.H     |  66 +--
 .../scalarFieldField/scalarFieldField.C       |  22 +-
 .../scalarFieldField/scalarFieldField.H       |  10 +-
 .../transformFieldField/transformFieldField.C |  36 +-
 .../transformFieldField/transformFieldField.H |  24 +-
 .../fields/Fields/DynamicField/DynamicField.C |   6 +-
 .../fields/Fields/DynamicField/DynamicField.H |  10 +-
 .../Fields/DynamicField/DynamicFieldI.H       |   6 +-
 src/OpenFOAM/fields/Fields/Field/Field.C      |  46 +-
 src/OpenFOAM/fields/Fields/Field/Field.H      |  56 +--
 .../fields/Fields/Field/FieldFunctions.C      | 114 ++---
 .../fields/Fields/Field/FieldFunctions.H      |  70 +--
 .../fields/Fields/Field/FieldFunctionsM.C     | 106 ++--
 .../fields/Fields/Field/FieldFunctionsM.H     |  66 +--
 .../fields/Fields/Field/FieldMapper.H         |   6 +-
 .../fields/Fields/Field/FieldReuseFunctions.H |  62 +--
 src/OpenFOAM/fields/Fields/Field/SubField.H   |   6 +-
 src/OpenFOAM/fields/Fields/Field/SubFieldI.H  |   6 +-
 .../sphericalTensorField.C                    |  14 +-
 .../Fields/symmTensorField/symmTensorField.C  |  12 +-
 .../symmTransformField/symmTransformField.C   |  32 +-
 .../symmTransformField/symmTransformField.H   |  28 +-
 .../fields/Fields/tensorField/tensorField.C   |   8 +-
 .../Fields/transformField/transformField.H    |  26 +-
 .../transformField/transformFieldTemplates.C  |  38 +-
 .../GeometricField/GeometricBoundaryField.C   |  10 +-
 .../GeometricField/GeometricField.C           |  24 +-
 .../GeometricField/GeometricField.H           |  34 +-
 .../GeometricField/GeometricFieldFunctions.C  |  96 ++--
 .../GeometricField/GeometricFieldFunctions.H  |  40 +-
 .../GeometricField/GeometricFieldFunctionsM.C | 134 +++---
 .../GeometricField/GeometricFieldFunctionsM.H |  94 ++--
 .../GeometricField/GeometricFieldI.H          |   4 +-
 .../GeometricFieldReuseFunctions.H            |  66 +--
 .../GeometricField/MapGeometricFields.H       |   4 +-
 .../GeometricField/uniformInterpolate.C       |   4 +-
 .../GeometricField/uniformInterpolate.H       |   4 +-
 .../GeometricScalarField.C                    | 134 +++---
 .../GeometricScalarField.H                    |  14 +-
 .../SlicedGeometricField.C                    |  10 +-
 .../SlicedGeometricField.H                    |   8 +-
 .../transformGeometricField.C                 |  36 +-
 .../transformGeometricField.H                 |  24 +-
 .../basicSymmetryPointPatchField.C            |   4 +-
 .../basicSymmetryPointPatchField.H            |  10 +-
 .../calculated/calculatedPointPatchField.C    |   8 +-
 .../calculated/calculatedPointPatchField.H    |  10 +-
 .../basic/coupled/coupledPointPatchField.H    |   6 +-
 .../fixedValue/fixedValuePointPatchField.H    |  10 +-
 .../basic/value/valuePointPatchField.C        |   4 +-
 .../basic/value/valuePointPatchField.H        |  12 +-
 .../zeroGradientPointPatchField.H             |  10 +-
 .../constraint/cyclic/cyclicPointPatchField.C |   6 +-
 .../constraint/cyclic/cyclicPointPatchField.H |  10 +-
 .../cyclicSlip/cyclicSlipPointPatchField.C    |   4 +-
 .../cyclicSlip/cyclicSlipPointPatchField.H    |  10 +-
 .../constraint/empty/emptyPointPatchField.H   |  10 +-
 ...nonuniformTransformCyclicPointPatchField.C |   4 +-
 ...nonuniformTransformCyclicPointPatchField.H |  10 +-
 .../processor/processorPointPatchField.H      |  10 +-
 .../processorCyclicPointPatchField.H          |  10 +-
 .../symmetry/symmetryPointPatchField.H        |  10 +-
 .../symmetryPlanePointPatchField.C            |   4 +-
 .../symmetryPlanePointPatchField.H            |  10 +-
 .../constraint/wedge/wedgePointPatchField.C   |   4 +-
 .../constraint/wedge/wedgePointPatchField.H   |  10 +-
 .../codedFixedValuePointPatchField.H          |  12 +-
 .../fixedNormalSlipPointPatchField.C          |   4 +-
 .../fixedNormalSlipPointPatchField.H          |  10 +-
 .../derived/slip/slipPointPatchField.H        |  10 +-
 ...eVaryingUniformFixedValuePointPatchField.H |  10 +-
 .../uniformFixedValuePointPatchField.H        |  12 +-
 .../pointPatchField/pointPatchField.C         |  10 +-
 .../pointPatchField/pointPatchField.H         |  22 +-
 .../pointPatchField/pointPatchFieldNew.C      |  14 +-
 .../interpolation2DTable.C                    |  16 +-
 .../interpolation2DTable.H                    |  14 +-
 .../interpolationTable/interpolationTable.C   |  74 +--
 .../interpolationTable/interpolationTable.H   |   8 +-
 .../tableReaders/csv/csvTableReader.C         |   8 +-
 .../tableReaders/csv/csvTableReader.H         |  10 +-
 .../openFoam/openFoamTableReader.C            |   6 +-
 .../openFoam/openFoamTableReader.H            |  10 +-
 .../tableReaders/tableReader.C                |   6 +-
 .../tableReaders/tableReader.H                |   8 +-
 .../PatchToPatchInterpolate.C                 |  22 +-
 .../PatchToPatchInterpolation.H               |  10 +-
 .../PrimitivePatchInterpolation.C             |  32 +-
 .../PrimitivePatchInterpolation.H             |  20 +-
 .../LduInterfaceFieldPtrsList.H               |   6 +-
 .../matrices/LduMatrix/LduMatrix/LduMatrix.H  |  16 +-
 .../LduMatrix/LduMatrix/LduMatrixATmul.C      |  10 +-
 .../LduMatrix/LduMatrix/LduMatrixOperations.C |  22 +-
 src/OpenFOAM/matrices/Matrix/Matrix.H         |   4 +-
 src/OpenFOAM/matrices/Matrix/MatrixI.H        |   8 +-
 .../RectangularMatrix/RectangularMatrix.H     |   4 +-
 .../RectangularMatrix/RectangularMatrixI.H    |   6 +-
 .../matrices/SquareMatrix/SquareMatrix.H      |   4 +-
 .../matrices/SquareMatrix/SquareMatrixI.H     |   6 +-
 .../SymmetricSquareMatrix.H                   |   4 +-
 .../SymmetricSquareMatrixI.H                  |   6 +-
 .../lduInterface/processorLduInterface.H      |   6 +-
 .../processorLduInterfaceTemplates.C          |  10 +-
 .../matrices/lduMatrix/lduMatrix/lduMatrix.H  |  10 +-
 .../lduMatrix/lduMatrix/lduMatrixTemplates.C  |  24 +-
 .../manualGAMGProcAgglomeration.H             |   4 +-
 .../procFacesGAMGProcAgglomeration.C          |   4 +-
 .../lduMatrix/solvers/GAMG/GAMGSolver.H       |  14 +-
 .../GAMG/GAMGSolverAgglomerateMatrix.C        |  20 +-
 .../interfaces/GAMGInterface/GAMGInterface.H  |   4 +-
 .../GAMGInterface/GAMGInterfaceTemplates.C    |   6 +-
 .../cyclicGAMGInterface/cyclicGAMGInterface.C |   6 +-
 .../processorGAMGInterface.C                  |   8 +-
 src/OpenFOAM/memory/Xfer/XferI.H              |   4 +-
 src/OpenFOAM/meshes/MeshObject/MeshObject.C   |  16 +-
 .../meshes/ProcessorTopology/commSchedule.C   |   4 +-
 src/OpenFOAM/meshes/data/dataTemplates.C      |   4 +-
 src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H |  10 +-
 .../polyMesh/globalMeshData/globalMeshData.C  |   8 +-
 .../polyMesh/globalMeshData/globalMeshData.H  |   4 +-
 .../polyMesh/globalMeshData/globalPoints.C    |   4 +-
 .../mapPolyMesh/mapDistribute/mapDistribute.C |  22 +-
 .../mapPolyMesh/mapDistribute/mapDistribute.H |  26 +-
 .../mapDistribute/mapDistributeTemplates.C    |  10 +-
 .../polyBoundaryMesh/polyBoundaryMesh.C       |   4 +-
 .../polyBoundaryMesh/polyBoundaryMesh.H       |   6 +-
 src/OpenFOAM/meshes/polyMesh/polyMesh.H       |   4 +-
 .../meshes/polyMesh/polyMeshFromShapeMesh.C   |   4 +-
 .../polyMesh/syncTools/dummyTransform.H       |   8 +-
 .../PatchTools/PatchToolsGatherAndMerge.C     |  16 +-
 .../PatchTools/PatchToolsNormals.C            |   4 +-
 .../PrimitivePatch/PrimitivePatch.C           |   6 +-
 .../PrimitivePatch/PrimitivePatch.H           |   6 +-
 .../PrimitivePatch/PrimitivePatchAddressing.C |   8 +-
 .../PrimitivePatchPointAddressing.C           |   4 +-
 .../meshes/primitiveMesh/primitiveMesh.H      |   4 +-
 .../primitiveMesh/primitiveMeshCellEdges.C    |   4 +-
 .../meshes/primitiveMesh/primitiveMeshEdges.C |   6 +-
 .../SphericalTensor/SphericalTensorI.H        |  10 +-
 .../SphericalTensor2D/SphericalTensor2DI.H    |  10 +-
 .../primitives/SymmTensor/SymmTensorI.H       |  18 +-
 .../primitives/SymmTensor2D/SymmTensor2DI.H   |  18 +-
 src/OpenFOAM/primitives/Tensor/Tensor.H       |   6 +-
 src/OpenFOAM/primitives/Tensor/TensorI.H      |  32 +-
 src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H  |  26 +-
 src/OpenFOAM/primitives/Vector/Vector.H       |   4 +-
 src/OpenFOAM/primitives/Vector/VectorI.H      |   6 +-
 src/OpenFOAM/primitives/Vector2D/Vector2DI.H  |   4 +-
 .../primitives/bools/lists/boolList.H         |   4 +-
 .../primitives/contiguous/contiguous.H        |  54 +--
 .../primitives/functions/DataEntry/CSV/CSV.C  |   4 +-
 .../primitives/functions/DataEntry/CSV/CSV.H  |   6 +-
 .../CompatibilityConstant.H                   |   6 +-
 .../functions/DataEntry/Constant/Constant.H   |   6 +-
 .../functions/DataEntry/DataEntry/DataEntry.C |  26 +-
 .../functions/DataEntry/DataEntry/DataEntry.H |  18 +-
 .../DataEntry/DataEntry/DataEntryNew.C        |   6 +-
 .../PolynomialEntry/PolynomialEntry.C         |   4 +-
 .../PolynomialEntry/PolynomialEntry.H         |  10 +-
 .../functions/DataEntry/Table/Table.H         |   6 +-
 .../functions/DataEntry/Table/TableBase.C     |   6 +-
 .../functions/DataEntry/Table/TableBase.H     |   6 +-
 .../functions/DataEntry/TableFile/TableFile.H |   6 +-
 .../functions/Polynomial/PolynomialIO.C       |   4 +-
 .../TimeDataEntry/TimeDataEntry.H             |   4 +-
 .../globalIndexAndTransform.C                 |   4 +-
 .../globalIndexAndTransform.H                 |   6 +-
 .../globalIndexAndTransformI.H                |   4 +-
 .../vectorTensorTransform.C                   |   8 +-
 .../vectorTensorTransform.H                   |  10 +-
 .../vectorTensorTransformTemplates.C          |   4 +-
 .../CompressibleTurbulenceModel.C             |   4 +-
 .../ThermalDiffusivity/ThermalDiffusivity.C   |   6 +-
 ...oupledTemperatureMixedFvPatchScalarField.C |  10 +-
 ...oupledTemperatureMixedFvPatchScalarField.H |  10 +-
 ...RateAdvectiveDiffusiveFvPatchScalarField.C |   6 +-
 ...RateAdvectiveDiffusiveFvPatchScalarField.H |  10 +-
 .../makeTurbulenceModel.H                     |  12 +-
 .../turbulentFluidThermoModel.H               |   8 +-
 .../IncompressibleTurbulenceModel.C           |   4 +-
 .../phaseCompressible/LES/Niceno/NicenoKEqn.C |   4 +-
 .../LES/SmagorinskyZhang/SmagorinskyZhang.C   |   4 +-
 .../PhaseCompressibleTurbulenceModel.C        |   4 +-
 .../RAS/LaheyKEpsilon/LaheyKEpsilon.C         |   4 +-
 .../RAS/kOmegaSSTSato/kOmegaSSTSato.C         |   4 +-
 .../RAS/mixtureKEpsilon/mixtureKEpsilon.C     |  10 +-
 .../RAS/mixtureKEpsilon/mixtureKEpsilon.H     |   4 +-
 .../PhaseIncompressibleTurbulenceModel.C      |   4 +-
 .../DeardorffDiffStress/DeardorffDiffStress.C |   8 +-
 .../DeardorffDiffStress/DeardorffDiffStress.H |   4 +-
 .../turbulenceModels/LES/LESModel/LESModel.C  |   4 +-
 .../LES/LESeddyViscosity/LESeddyViscosity.C   |   6 +-
 .../LES/LESeddyViscosity/LESeddyViscosity.H   |   4 +-
 .../turbulenceModels/RAS/LRR/LRR.C            |   8 +-
 .../turbulenceModels/RAS/LRR/LRR.H            |   4 +-
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.C     |   8 +-
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.H     |   4 +-
 .../turbulenceModels/RAS/RASModel/RASModel.C  |   4 +-
 .../RAS/RNGkEpsilon/RNGkEpsilon.C             |   8 +-
 .../RAS/RNGkEpsilon/RNGkEpsilon.H             |   4 +-
 .../turbulenceModels/RAS/SSG/SSG.C            |   8 +-
 .../turbulenceModels/RAS/SSG/SSG.H            |   4 +-
 .../RAS/SpalartAllmaras/SpalartAllmaras.C     |   8 +-
 .../RAS/SpalartAllmaras/SpalartAllmaras.H     |   4 +-
 .../turbulenceModels/RAS/kEpsilon/kEpsilon.C  |   8 +-
 .../turbulenceModels/RAS/kEpsilon/kEpsilon.H  |   4 +-
 .../turbulenceModels/RAS/kOmega/kOmega.C      |   8 +-
 .../turbulenceModels/RAS/kOmega/kOmega.H      |   4 +-
 .../RAS/kOmegaSST/kOmegaSST.C                 |   8 +-
 .../RAS/kOmegaSST/kOmegaSST.H                 |   4 +-
 .../RAS/realizableKE/realizableKE.C           |   8 +-
 .../RAS/realizableKE/realizableKE.H           |   4 +-
 .../turbulenceModels/RAS/v2f/v2f.C            |   8 +-
 .../turbulenceModels/RAS/v2f/v2f.H            |   4 +-
 .../porousBafflePressureFvPatchField.H        |  10 +-
 ...silonLowReWallFunctionFvPatchScalarField.C |   4 +-
 .../epsilonWallFunctionFvPatchScalarField.H   |   4 +-
 .../kqRWallFunctionFvPatchField.H             |  10 +-
 .../omegaWallFunctionFvPatchScalarField.H     |   4 +-
 .../turbulenceModels/laminar/laminar.C        |   4 +-
 .../singleStepCombustion.C                    |   4 +-
 src/conversion/meshReader/meshReader.H        |   6 +-
 src/conversion/meshTables/cellTable.C         |   4 +-
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.C |   4 +-
 ...yMotionDisplacementPointPatchVectorField.H |  10 +-
 .../rotatingMotion/rotatingMotion.H           |   4 +-
 .../tabulated6DoFMotion/tabulated6DoFMotion.C |   4 +-
 src/dynamicMesh/boundaryMesh/boundaryMesh.C   |   6 +-
 .../fvMeshAdder/fvMeshAdderTemplates.C        |   6 +-
 .../fvMeshDistribute/fvMeshDistribute.C       |  36 +-
 .../fvMeshDistribute/fvMeshDistribute.H       |  10 +-
 .../fvMeshDistributeTemplates.C               |   6 +-
 .../boundaryCutter/boundaryCutter.C           |  10 +-
 .../boundaryCutter/boundaryCutter.H           |   8 +-
 .../meshCutAndRemove/meshCutAndRemove.C       |  10 +-
 .../meshCutAndRemove/meshCutAndRemove.H       |   6 +-
 .../meshModifiers/meshCutter/meshCutter.C     |  10 +-
 .../meshModifiers/meshCutter/meshCutter.H     |   6 +-
 .../motionSmoother/motionSmootherAlgo.C       |   4 +-
 .../motionSmoother/motionSmootherAlgo.H       |   6 +-
 .../motionSmootherAlgoTemplates.C             |   6 +-
 .../polyMeshAdder/faceCoupleInfo.H            |   4 +-
 src/dynamicMesh/polyMeshAdder/polyMeshAdder.C |  42 +-
 src/dynamicMesh/polyMeshAdder/polyMeshAdder.H |  26 +-
 .../polyTopoChange/edgeCollapser.C            |   8 +-
 .../polyTopoChange/edgeCollapser.H            |   4 +-
 .../polyTopoChange/polyTopoChange/hexRef8.C   |   4 +-
 .../polyTopoChange/polyTopoChange.C           |  18 +-
 .../polyTopoChange/polyTopoChange.H           |  12 +-
 .../polyTopoChange/polyTopoChangeTemplates.C  |   6 +-
 .../polyTopoChange/refinementHistory.C        |   4 +-
 .../polyTopoChange/refinementHistory.H        |   4 +-
 .../polyTopoChange/removePoints.C             |   4 +-
 .../slidingInterface/coupleSlidingInterface.C |   8 +-
 .../enrichedPatch/enrichedPatchCutFaces.C     |   8 +-
 .../enrichedPatch/enrichedPatchMasterPoints.C |   8 +-
 .../enrichedPatch/enrichedPatchPointPoints.C  |   4 +-
 .../slidingInterface/slidingInterface.C       |   8 +-
 .../slidingInterface/slidingInterface.H       |   6 +-
 .../slidingInterfaceAttachedAddressing.C      |  12 +-
 .../extendedEdgeMesh/extendedEdgeMesh.C       |   8 +-
 .../extendedEdgeMesh/extendedEdgeMesh.H       |  10 +-
 .../extendedEdgeMeshTemplates.C               |   6 +-
 .../extendedFeatureEdgeMeshTemplates.C        |   6 +-
 .../sampledSetWriters/csv/csvSetWriter.C      |   4 +-
 .../sampledSetWriters/csv/csvSetWriter.H      |   4 +-
 .../ensight/ensightSetWriter.C                |   6 +-
 .../ensight/ensightSetWriter.H                |   4 +-
 .../gnuplot/gnuplotSetWriter.C                |   4 +-
 .../gnuplot/gnuplotSetWriter.H                |   4 +-
 .../sampledSetWriters/jplot/jplotSetWriter.H  |   4 +-
 .../sampledSetWriters/raw/rawSetWriter.C      |   4 +-
 .../sampledSetWriters/raw/rawSetWriter.H      |   4 +-
 .../sampledSetWriters/vtk/vtkSetWriter.C      |   6 +-
 .../sampledSetWriters/vtk/vtkSetWriter.H      |   4 +-
 src/fileFormats/sampledSetWriters/writer.C    |   4 +-
 src/fileFormats/sampledSetWriters/writer.H    |   8 +-
 .../xmgrace/xmgraceSetWriter.C                |   4 +-
 .../xmgrace/xmgraceSetWriter.H                |   4 +-
 .../cfdTools/general/MRF/MRFZone.H            |   4 +-
 .../cfdTools/general/MRF/MRFZoneList.C        |   8 +-
 .../cfdTools/general/MRF/MRFZoneList.H        |   6 +-
 .../general/SRF/SRFModel/SRFModel/SRFModel.C  |  12 +-
 .../general/SRF/SRFModel/SRFModel/SRFModel.H  |   8 +-
 .../cfdTools/general/fvOptions/fvOptionList.H |  20 +-
 .../general/fvOptions/fvOptionListTemplates.C |  26 +-
 .../cfdTools/general/fvOptions/makeFvOption.H |   4 +-
 .../solutionControl/solutionControl.C         |   4 +-
 .../basicSymmetry/basicSymmetryFvPatchField.C |   6 +-
 .../basicSymmetry/basicSymmetryFvPatchField.H |  14 +-
 .../basic/calculated/calculatedFvPatchField.C |  16 +-
 .../basic/calculated/calculatedFvPatchField.H |  18 +-
 .../basic/coupled/coupledFvPatchField.C       |  16 +-
 .../basic/coupled/coupledFvPatchField.H       |  24 +-
 .../directionMixedFvPatchField.C              |  20 +-
 .../directionMixedFvPatchField.H              |  14 +-
 .../fixedGradient/fixedGradientFvPatchField.C |  16 +-
 .../fixedGradient/fixedGradientFvPatchField.H |  20 +-
 .../basic/fixedValue/fixedValueFvPatchField.C |  12 +-
 .../basic/fixedValue/fixedValueFvPatchField.H |  18 +-
 .../basic/mixed/mixedFvPatchField.C           |  14 +-
 .../basic/mixed/mixedFvPatchField.H           |  20 +-
 .../basic/sliced/slicedFvPatchField.C         |  26 +-
 .../basic/sliced/slicedFvPatchField.H         |  22 +-
 .../basic/transform/transformFvPatchField.C   |  10 +-
 .../basic/transform/transformFvPatchField.H   |  18 +-
 .../zeroGradient/zeroGradientFvPatchField.C   |  18 +-
 .../zeroGradient/zeroGradientFvPatchField.H   |  22 +-
 .../constraint/cyclic/cyclicFvPatchField.C    |   8 +-
 .../constraint/cyclic/cyclicFvPatchField.H    |  14 +-
 .../cyclicACMI/cyclicACMIFvPatchField.C       |  22 +-
 .../cyclicACMI/cyclicACMIFvPatchField.H       |  28 +-
 .../cyclicAMI/cyclicAMIFvPatchField.C         |   8 +-
 .../cyclicAMI/cyclicAMIFvPatchField.H         |  14 +-
 .../cyclicSlip/cyclicSlipFvPatchField.H       |  10 +-
 .../constraint/empty/emptyFvPatchField.H      |  26 +-
 .../jumpCyclic/jumpCyclicFvPatchField.C       |   6 +-
 .../jumpCyclic/jumpCyclicFvPatchField.H       |   6 +-
 .../jumpCyclicAMI/jumpCyclicAMIFvPatchField.C |   8 +-
 .../jumpCyclicAMI/jumpCyclicAMIFvPatchField.H |   6 +-
 .../nonuniformTransformCyclicFvPatchField.H   |  10 +-
 .../processor/processorFvPatchField.C         |   6 +-
 .../processor/processorFvPatchField.H         |  14 +-
 .../processorCyclicFvPatchField.H             |  10 +-
 .../symmetry/symmetryFvPatchField.H           |  10 +-
 .../symmetryPlane/symmetryPlaneFvPatchField.C |   8 +-
 .../symmetryPlane/symmetryPlaneFvPatchField.H |  14 +-
 .../constraint/wedge/wedgeFvPatchField.C      |   8 +-
 .../constraint/wedge/wedgeFvPatchField.H      |  14 +-
 .../derived/advective/advectiveFvPatchField.C |   4 +-
 .../derived/advective/advectiveFvPatchField.H |  10 +-
 .../codedFixedValueFvPatchField.H             |  12 +-
 .../codedMixed/codedMixedFvPatchField.H       |  12 +-
 ...lindricalInletVelocityFvPatchVectorField.H |   8 +-
 .../externalCoupledMixedFvPatchField.C        |   8 +-
 .../externalCoupledMixedFvPatchField.H        |  10 +-
 .../derived/fan/fanFvPatchField.H             |  10 +-
 .../derived/fan/fanFvPatchFields.C            |   4 +-
 .../fixedFluxPressureFvPatchScalarField.H     |   4 +-
 .../fixedInternalValueFvPatchField.H          |  10 +-
 .../derived/fixedJump/fixedJumpFvPatchField.C |   8 +-
 .../derived/fixedJump/fixedJumpFvPatchField.H |  12 +-
 .../fixedJumpAMI/fixedJumpAMIFvPatchField.C   |   8 +-
 .../fixedJumpAMI/fixedJumpAMIFvPatchField.H   |  12 +-
 .../derived/fixedMean/fixedMeanFvPatchField.H |  10 +-
 .../fixedNormalSlipFvPatchField.C             |   8 +-
 .../fixedNormalSlipFvPatchField.H             |  14 +-
 .../fixedProfile/fixedProfileFvPatchField.H   |  12 +-
 .../flowRateInletVelocityFvPatchVectorField.H |   4 +-
 .../freestream/freestreamFvPatchField.H       |  10 +-
 .../inletOutlet/inletOutletFvPatchField.H     |  10 +-
 .../mappedField/mappedFieldFvPatchField.H     |  10 +-
 .../mappedField/mappedPatchFieldBase.C        |   8 +-
 .../mappedField/mappedPatchFieldBase.H        |   4 +-
 .../mappedFixedInternalValueFvPatchField.H    |  10 +-
 ...ppedFixedPushedInternalValueFvPatchField.H |  10 +-
 .../mappedFixedValueFvPatchField.H            |  10 +-
 .../oscillatingFixedValueFvPatchField.C       |   4 +-
 .../oscillatingFixedValueFvPatchField.H       |  14 +-
 .../outletInlet/outletInletFvPatchField.H     |  10 +-
 .../outletMappedUniformInletFvPatchField.H    |  10 +-
 .../partialSlip/partialSlipFvPatchField.C     |   8 +-
 .../partialSlip/partialSlipFvPatchField.H     |  14 +-
 ...ureInletOutletVelocityFvPatchVectorField.H |   4 +-
 .../rotatingTotalPressureFvPatchScalarField.H |   4 +-
 .../rotatingWallVelocityFvPatchVectorField.H  |   4 +-
 .../derived/slip/slipFvPatchField.H           |  10 +-
 ...lFlowRateInletVelocityFvPatchVectorField.H |   6 +-
 .../timeVaryingMappedFixedValueFvPatchField.C |   4 +-
 .../timeVaryingMappedFixedValueFvPatchField.H |  12 +-
 .../turbulentInletFvPatchField.C              |   4 +-
 .../turbulentInletFvPatchField.H              |  10 +-
 .../uniformFixedGradientFvPatchField.H        |  12 +-
 .../uniformFixedValueFvPatchField.H           |  12 +-
 .../uniformInletOutletFvPatchField.H          |  12 +-
 .../uniformJump/uniformJumpFvPatchField.H     |  12 +-
 .../uniformJumpAMIFvPatchField.H              |  12 +-
 .../uniformTotalPressureFvPatchScalarField.H  |   4 +-
 .../variableHeightFlowRateFvPatchField.H      |  10 +-
 .../waveTransmissiveFvPatchField.H            |  10 +-
 .../fvPatchFields/fvPatchField/fvPatchField.C |   6 +-
 .../fvPatchFields/fvPatchField/fvPatchField.H |  46 +-
 .../fvPatchField/fvPatchFieldNew.C            |  12 +-
 .../calculated/calculatedFvsPatchField.C      |   8 +-
 .../calculated/calculatedFvsPatchField.H      |  10 +-
 .../basic/coupled/coupledFvsPatchField.H      |   6 +-
 .../fixedValue/fixedValueFvsPatchField.C      |  12 +-
 .../fixedValue/fixedValueFvsPatchField.H      |  18 +-
 .../basic/sliced/slicedFvsPatchField.C        |  10 +-
 .../basic/sliced/slicedFvsPatchField.H        |   6 +-
 .../constraint/cyclic/cyclicFvsPatchField.H   |  10 +-
 .../cyclicACMI/cyclicACMIFvsPatchField.H      |  10 +-
 .../cyclicAMI/cyclicAMIFvsPatchField.H        |  10 +-
 .../cyclicSlip/cyclicSlipFvsPatchField.H      |  10 +-
 .../constraint/empty/emptyFvsPatchField.H     |  10 +-
 .../nonuniformTransformCyclicFvsPatchField.H  |  10 +-
 .../processor/processorFvsPatchField.H        |  10 +-
 .../processorCyclicFvsPatchField.H            |  10 +-
 .../symmetry/symmetryFvsPatchField.H          |  10 +-
 .../symmetryPlaneFvsPatchField.H              |  10 +-
 .../constraint/wedge/wedgeFvsPatchField.H     |  10 +-
 .../fvsPatchField/fvsPatchField.H             |  22 +-
 .../fvsPatchField/fvsPatchFieldNew.C          |  10 +-
 src/finiteVolume/fields/volFields/volFields.C |   4 +-
 src/finiteVolume/fields/volFields/volFields.H |   4 +-
 .../boundedConvectionScheme.C                 |  10 +-
 .../boundedConvectionScheme.H                 |  12 +-
 .../convectionScheme/convectionScheme.C       |   6 +-
 .../convectionScheme/convectionScheme.H       |  18 +-
 .../gaussConvectionScheme.C                   |  14 +-
 .../gaussConvectionScheme.H                   |  14 +-
 .../multivariateGaussConvectionScheme.C       |  10 +-
 .../multivariateGaussConvectionScheme.H       |  14 +-
 .../EulerD2dt2Scheme/EulerD2dt2Scheme.C       |  26 +-
 .../EulerD2dt2Scheme/EulerD2dt2Scheme.H       |  12 +-
 .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C    |   4 +-
 .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H    |  16 +-
 .../steadyStateD2dt2Scheme.C                  |  22 +-
 .../steadyStateD2dt2Scheme.H                  |  12 +-
 .../CoEulerDdtScheme/CoEulerDdtScheme.C       |  48 +-
 .../CoEulerDdtScheme/CoEulerDdtScheme.H       |  20 +-
 .../CrankNicolsonDdtScheme.C                  | 106 ++--
 .../CrankNicolsonDdtScheme.H                  |  20 +-
 .../EulerDdtScheme/EulerDdtScheme.C           |  48 +-
 .../EulerDdtScheme/EulerDdtScheme.H           |  20 +-
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C  |  48 +-
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H  |  20 +-
 .../backwardDdtScheme/backwardDdtScheme.C     |  48 +-
 .../backwardDdtScheme/backwardDdtScheme.H     |  20 +-
 .../boundedDdtScheme/boundedDdtScheme.C       |  20 +-
 .../boundedDdtScheme/boundedDdtScheme.H       |  22 +-
 .../ddtSchemes/ddtScheme/ddtScheme.C          |  12 +-
 .../ddtSchemes/ddtScheme/ddtScheme.H          |  24 +-
 .../localEulerDdtScheme/localEulerDdtScheme.C |  48 +-
 .../localEulerDdtScheme/localEulerDdtScheme.H |  20 +-
 .../steadyStateDdtScheme.C                    |  38 +-
 .../steadyStateDdtScheme.H                    |  20 +-
 .../divSchemes/divScheme/divScheme.C          |   4 +-
 .../divSchemes/divScheme/divScheme.H          |   8 +-
 .../finiteVolume/fvc/fvcAverage.C             |  20 +-
 .../finiteVolume/fvc/fvcAverage.H             |  14 +-
 .../finiteVolume/fvc/fvcCellReduce.C          |   8 +-
 .../finiteVolume/fvc/fvcCellReduce.H          |   8 +-
 src/finiteVolume/finiteVolume/fvc/fvcCurl.C   |  14 +-
 src/finiteVolume/finiteVolume/fvc/fvcCurl.H   |   8 +-
 src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C  |   6 +-
 src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H  |   6 +-
 src/finiteVolume/finiteVolume/fvc/fvcDDt.C    |  10 +-
 src/finiteVolume/finiteVolume/fvc/fvcDDt.H    |   6 +-
 src/finiteVolume/finiteVolume/fvc/fvcDdt.C    |  24 +-
 src/finiteVolume/finiteVolume/fvc/fvcDdt.H    |  16 +-
 src/finiteVolume/finiteVolume/fvc/fvcDiv.C    |  56 +--
 src/finiteVolume/finiteVolume/fvc/fvcDiv.H    |  36 +-
 src/finiteVolume/finiteVolume/fvc/fvcFlux.C   |  38 +-
 src/finiteVolume/finiteVolume/fvc/fvcFlux.H   |  26 +-
 src/finiteVolume/finiteVolume/fvc/fvcGrad.C   |  12 +-
 src/finiteVolume/finiteVolume/fvc/fvcGrad.H   |   8 +-
 .../finiteVolume/fvc/fvcLaplacian.C           | 116 ++---
 .../finiteVolume/fvc/fvcLaplacian.H           |  90 ++--
 .../finiteVolume/fvc/fvcMagSqrGradGrad.C      |   4 +-
 .../finiteVolume/fvc/fvcMagSqrGradGrad.H      |   4 +-
 .../finiteVolume/fvc/fvcReconstruct.C         |   8 +-
 .../finiteVolume/fvc/fvcReconstruct.H         |   4 +-
 .../finiteVolume/fvc/fvcSimpleReconstruct.C   |   8 +-
 src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C |  18 +-
 src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H |  14 +-
 src/finiteVolume/finiteVolume/fvc/fvcSup.C    |  18 +-
 src/finiteVolume/finiteVolume/fvc/fvcSup.H    |  18 +-
 .../finiteVolume/fvc/fvcSurfaceIntegrate.C    |  22 +-
 .../finiteVolume/fvc/fvcSurfaceIntegrate.H    |  14 +-
 .../finiteVolume/fvc/fvcVolumeIntegrate.C     |  22 +-
 .../finiteVolume/fvc/fvcVolumeIntegrate.H     |  18 +-
 src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C  |   8 +-
 src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H  |   8 +-
 src/finiteVolume/finiteVolume/fvm/fvmDdt.C    |  18 +-
 src/finiteVolume/finiteVolume/fvm/fvmDdt.H    |  18 +-
 src/finiteVolume/finiteVolume/fvm/fvmDiv.C    |  14 +-
 src/finiteVolume/finiteVolume/fvm/fvmDiv.H    |  10 +-
 .../finiteVolume/fvm/fvmLaplacian.C           |  54 +--
 .../finiteVolume/fvm/fvmLaplacian.H           |  42 +-
 src/finiteVolume/finiteVolume/fvm/fvmSup.C    |  50 +-
 src/finiteVolume/finiteVolume/fvm/fvmSup.H    |  30 +-
 .../LeastSquaresGrad/LeastSquaresGrad.C       |   8 +-
 .../LeastSquaresGrad/LeastSquaresGrad.H       |   4 +-
 .../LeastSquaresGrad/LeastSquaresVectors.H    |   8 +-
 .../gradSchemes/fourthGrad/fourthGrad.C       |   6 +-
 .../gradSchemes/gaussGrad/gaussGrad.C         |   6 +-
 .../gradSchemes/gaussGrad/gaussGrad.H         |   8 +-
 .../gradSchemes/gradScheme/gradScheme.C       |   6 +-
 .../gradSchemes/gradScheme/gradScheme.H       |   8 +-
 .../leastSquaresGrad/leastSquaresGrad.C       |   4 +-
 .../cellLimitedGrad/cellLimitedGrad.H         |   4 +-
 .../cellMDLimitedGrad/cellMDLimitedGrad.H     |   4 +-
 .../faceLimitedGrad/faceLimitedGrad.H         |   4 +-
 .../faceMDLimitedGrad/faceMDLimitedGrad.H     |   4 +-
 .../gaussLaplacianScheme.C                    |  24 +-
 .../gaussLaplacianScheme.H                    |  20 +-
 .../gaussLaplacianSchemes.C                   |  10 +-
 .../laplacianScheme/laplacianScheme.C         |   8 +-
 .../laplacianScheme/laplacianScheme.H         |  26 +-
 .../CentredFitSnGrad/CentredFitSnGradData.C   |   4 +-
 .../CentredFitSnGrad/CentredFitSnGradScheme.H |   8 +-
 .../correctedSnGrad/correctedSnGrad.C         |  10 +-
 .../correctedSnGrad/correctedSnGrad.H         |   6 +-
 .../faceCorrectedSnGrad/faceCorrectedSnGrad.C |  10 +-
 .../faceCorrectedSnGrad/faceCorrectedSnGrad.H |   6 +-
 .../limitedSnGrad/limitedSnGrad.C             |   4 +-
 .../limitedSnGrad/limitedSnGrad.H             |  12 +-
 .../orthogonalSnGrad/orthogonalSnGrad.C       |   6 +-
 .../orthogonalSnGrad/orthogonalSnGrad.H       |   4 +-
 .../snGradSchemes/snGradScheme/snGradScheme.C |  20 +-
 .../snGradSchemes/snGradScheme/snGradScheme.H |  20 +-
 .../uncorrectedSnGrad/uncorrectedSnGrad.C     |   6 +-
 .../uncorrectedSnGrad/uncorrectedSnGrad.H     |   4 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            | 454 +++++++++---------
 .../fvMatrices/fvMatrix/fvMatrix.H            | 332 ++++++-------
 .../fvMatrices/fvMatrix/fvMatrixSolve.C       |   6 +-
 .../cellToCell/extendedCellToCellStencil.H    |   4 +-
 .../extendedCellToCellStencilTemplates.C      |   6 +-
 .../extendedCentredCellToCellStencil.C        |   4 +-
 .../extendedCentredCellToCellStencil.H        |   6 +-
 .../cellToFace/extendedCellToFaceStencil.H    |   8 +-
 .../extendedCellToFaceStencilTemplates.C      |  12 +-
 .../extendedCentredCellToFaceStencil.C        |   4 +-
 .../extendedCentredCellToFaceStencil.H        |   8 +-
 .../extendedUpwindCellToFaceStencil.C         |  12 +-
 .../extendedUpwindCellToFaceStencil.H         |   8 +-
 ...extendedUpwindCellToFaceStencilTemplates.C |  14 +-
 .../extendedCentredFaceToCellStencil.C        |   4 +-
 .../extendedCentredFaceToCellStencil.H        |   8 +-
 .../faceToCell/extendedFaceToCellStencil.H    |   8 +-
 .../extendedFaceToCellStencilTemplates.C      |  12 +-
 src/finiteVolume/fvMesh/fvMesh.H              |   6 +-
 .../fvMesh/fvMeshSubset/fvMeshSubset.H        |  14 +-
 .../fvMeshSubset/fvMeshSubsetInterpolate.C    |  26 +-
 .../constraint/cyclicACMI/cyclicACMIFvPatch.H |  16 +-
 .../constraint/cyclicAMI/cyclicAMIFvPatch.H   |   8 +-
 .../fvMesh/fvPatches/fvPatch/fvPatch.H        |   4 +-
 .../fvPatches/fvPatch/fvPatchTemplates.C      |   6 +-
 .../singleCellFvMesh/singleCellFvMesh.H       |   4 +-
 .../singleCellFvMeshInterpolate.C             |   8 +-
 .../meshWave/meshWavePatchDistMethod.C        |   4 +-
 .../meshWave/wallDistData/wallDistData.C      |   4 +-
 .../wallDist/wallPointYPlus/wallPointYPlus.H  |   4 +-
 .../interpolation/interpolation.H             |   8 +-
 .../interpolation/interpolationNew.C          |   8 +-
 .../limitedSchemes/LimitedScheme/LimitFuncs.H |   4 +-
 .../LimitedScheme/LimitedScheme.C             |   6 +-
 .../LimitedScheme/LimitedScheme.H             |  20 +-
 .../limitedSchemes/PhiScheme/PhiScheme.H      |  10 +-
 .../limitedSchemes/limitWith/limitWith.H      |   8 +-
 .../limitedSurfaceInterpolationScheme.C       |   8 +-
 .../limitedSurfaceInterpolationScheme.H       |  16 +-
 .../multivariateIndependentScheme.H           |   4 +-
 .../multivariateIndependentSchemes.C          |   4 +-
 .../multivariateScheme/multivariateScheme.H   |  10 +-
 .../multivariateSelectionScheme.H             |   6 +-
 .../multivariateSelectionSchemes.C            |   4 +-
 .../multivariateSurfaceInterpolationScheme.C  |   4 +-
 .../multivariateSurfaceInterpolationScheme.H  |   8 +-
 .../upwind/multivariateUpwind.H               |   6 +-
 .../schemes/CentredFitScheme/CentredFitData.C |   4 +-
 .../CentredFitScheme/CentredFitScheme.H       |   8 +-
 .../schemes/CoBlended/CoBlended.H             |  12 +-
 .../surfaceInterpolation/schemes/LUST/LUST.H  |   4 +-
 .../PureUpwindFitScheme/PureUpwindFitScheme.H |   8 +-
 .../schemes/UpwindFitScheme/UpwindFitData.C   |   4 +-
 .../schemes/UpwindFitScheme/UpwindFitScheme.H |   8 +-
 .../schemes/cellCoBlended/cellCoBlended.H     |  12 +-
 .../schemes/cubic/cubic.H                     |   6 +-
 .../schemes/fixedBlended/fixedBlended.H       |  12 +-
 .../schemes/harmonic/harmonic.H               |   4 +-
 .../schemes/limiterBlended/limiterBlended.H   |  14 +-
 .../schemes/linear/linear.H                   |  10 +-
 .../schemes/linearUpwind/linearUpwind.C       |   6 +-
 .../schemes/linearUpwind/linearUpwind.H       |   6 +-
 .../schemes/linearUpwind/linearUpwindV.C      |   6 +-
 .../schemes/linearUpwind/linearUpwindV.H      |   6 +-
 .../schemes/localBlended/localBlended.H       |  12 +-
 .../schemes/localMax/localMax.H               |   6 +-
 .../schemes/localMin/localMin.H               |   6 +-
 .../outletStabilised/outletStabilised.H       |  20 +-
 .../schemes/pointLinear/pointLinear.C         |   6 +-
 .../schemes/pointLinear/pointLinear.H         |   4 +-
 .../schemes/skewCorrected/skewCorrected.H     |  12 +-
 .../surfaceInterpolation/surfaceInterpolate.C |  58 +--
 .../surfaceInterpolation/surfaceInterpolate.H |  44 +-
 .../surfaceInterpolationScheme.C              |  24 +-
 .../surfaceInterpolationScheme.H              |  24 +-
 .../pointConstraintsTemplates.C               |   6 +-
 .../volPointInterpolate.C                     |  34 +-
 .../volPointInterpolation.H                   |  18 +-
 .../pairPatchAgglomeration.C                  |   2 +-
 .../displacementInterpolationMotionSolver.C   |   8 +-
 .../fvMotionSolverCoreTemplates.C             |   4 +-
 .../cellMotion/cellMotionFvPatchField.C       |   4 +-
 .../cellMotion/cellMotionFvPatchField.H       |  10 +-
 .../surfaceSlipDisplacementFvPatchField.H     |  10 +-
 ...llatingDisplacementPointPatchVectorField.H |  10 +-
 ...OscillatingVelocityPointPatchVectorField.H |  10 +-
 ...llatingDisplacementPointPatchVectorField.H |  10 +-
 ...oscillatingVelocityPointPatchVectorField.H |  10 +-
 ...meVaryingMappedFixedValuePointPatchField.C |   4 +-
 ...meVaryingMappedFixedValuePointPatchField.H |  12 +-
 ...polatedDisplacementPointPatchVectorField.H |  10 +-
 .../waveDisplacementPointPatchVectorField.H   |  10 +-
 .../fixedTemperatureConstraint.H              |   4 +-
 .../effectivenessHeatExchangerSource.H        |   4 +-
 .../rotorDiskSource/bladeModel/bladeModel.C   |   4 +-
 .../tabulated6DoFAcceleration.C               |   4 +-
 .../semiImplicitSource/SemiImplicitSource.H   |   8 +-
 .../semiImplicitSource/SemiImplicitSourceI.H  |   6 +-
 .../interRegionHeatTransferModel.H            |   6 +-
 .../interRegionHeatTransferModelTemplates.C   |   6 +-
 .../tabulatedHeatTransfer.H                   |   4 +-
 .../genericFvPatchField/genericFvPatchField.C |  32 +-
 .../genericFvPatchField/genericFvPatchField.H |  18 +-
 .../genericPointPatchField.C                  |  24 +-
 .../genericPointPatchField.H                  |  10 +-
 .../clouds/Templates/DSMCCloud/DSMCCloud.C    |  10 +-
 .../clouds/Templates/DSMCCloud/DSMCCloud.H    |  24 +-
 .../clouds/Templates/DSMCCloud/DSMCCloudI.H   |  16 +-
 .../parcels/Templates/DSMCParcel/DSMCParcel.H |  16 +-
 .../Templates/DSMCParcel/DSMCParcelIO.C       |  10 +-
 .../BinaryCollisionModel.H                    |   6 +-
 .../BinaryCollisionModelNew.C                 |   6 +-
 .../FreeStream/FreeStream.C                   |   8 +-
 .../FreeStream/FreeStream.H                   |   4 +-
 .../InflowBoundaryModel/InflowBoundaryModel.H |   6 +-
 .../InflowBoundaryModelNew.C                  |   6 +-
 .../WallInteractionModel.H                    |   6 +-
 .../WallInteractionModelNew.C                 |   6 +-
 src/lagrangian/basic/Cloud/Cloud.C            |   6 +-
 src/lagrangian/basic/Cloud/CloudIO.C          |   4 +-
 .../basic/InteractionLists/InteractionLists.C |  12 +-
 .../basic/InteractionLists/InteractionLists.H |  14 +-
 .../InteractionLists/InteractionListsI.H      |   6 +-
 .../coalCloudList/coalCloudList.H             |  12 +-
 .../coalCloudList/coalCloudListI.H            |  22 +-
 .../COxidationDiffusionLimitedRate.H          |   6 +-
 .../COxidationHurtMitchell.H                  |   6 +-
 .../COxidationIntrinsicRate.H                 |   6 +-
 .../COxidationKineticDiffusionLimitedRate.H   |   6 +-
 .../COxidationMurphyShaddix.H                 |   6 +-
 .../IntegrationScheme/Analytical/Analytical.H |   6 +-
 .../IntegrationScheme/Euler/Euler.H           |   6 +-
 .../IntegrationScheme/IntegrationScheme.H     |   6 +-
 .../IntegrationScheme/IntegrationSchemeNew.C  |   6 +-
 .../Templates/CollidingCloud/CollidingCloud.C |   6 +-
 .../Templates/CollidingCloud/CollidingCloud.H |  18 +-
 .../CollidingCloud/CollidingCloudI.H          |   6 +-
 .../Templates/KinematicCloud/KinematicCloud.C |  18 +-
 .../Templates/KinematicCloud/KinematicCloud.H |  54 +--
 .../KinematicCloud/KinematicCloudI.H          |  28 +-
 .../cloudSolution/cloudSolution.H             |   4 +-
 .../clouds/Templates/MPPICCloud/MPPICCloud.C  |  10 +-
 .../clouds/Templates/MPPICCloud/MPPICCloud.H  |  30 +-
 .../clouds/Templates/MPPICCloud/MPPICCloudI.H |  14 +-
 .../Templates/ReactingCloud/ReactingCloud.C   |  10 +-
 .../Templates/ReactingCloud/ReactingCloud.H   |  32 +-
 .../Templates/ReactingCloud/ReactingCloudI.H  |  20 +-
 .../ReactingMultiphaseCloud.C                 |  10 +-
 .../ReactingMultiphaseCloud.H                 |  16 +-
 .../Templates/ThermoCloud/ThermoCloud.C       |   8 +-
 .../Templates/ThermoCloud/ThermoCloud.H       |  26 +-
 .../Templates/ThermoCloud/ThermoCloudI.H      |   4 +-
 .../basicKinematicCloud/basicKinematicCloud.H |   4 +-
 .../CollidingParcel/CollidingParcel.H         |   6 +-
 .../CollisionRecordList/CollisionRecordList.C |   6 +-
 .../CollisionRecordList/CollisionRecordList.H |  10 +-
 .../CollisionRecordListI.H                    |   6 +-
 .../KinematicParcel/KinematicParcel.H         |  12 +-
 .../Templates/MPPICParcel/MPPICParcel.H       |  20 +-
 .../MPPICParcel/MPPICParcelTrackingDataI.H    |   4 +-
 .../ReactingMultiphaseParcel.H                |   6 +-
 .../ReactingMultiphaseParcelIO.C              |  16 +-
 .../Templates/ReactingParcel/ReactingParcel.H |   8 +-
 .../ReactingParcel/ReactingParcelIO.C         |  12 +-
 .../Templates/ThermoParcel/ThermoParcel.H     |  14 +-
 .../Templates/ThermoParcel/ThermoParcelIO.C   |   6 +-
 .../basicKinematicCollidingParcel.H           |   4 +-
 .../basicKinematicMPPICParcel.H               |   4 +-
 .../basicReactingParcel/basicReactingParcel.H |   4 +-
 .../basicThermoParcel/basicThermoParcel.H     |   4 +-
 .../CloudFunctionObject/CloudFunctionObject.H |  10 +-
 .../CloudFunctionObjectNew.C                  |   6 +-
 .../CloudFunctionObjectList.C                 |   8 +-
 .../CloudFunctionObjectList.H                 |   4 +-
 .../FacePostProcessing/FacePostProcessing.H   |   6 +-
 .../ParticleCollector/ParticleCollector.C     |  10 +-
 .../ParticleCollector/ParticleCollector.H     |  10 +-
 .../ParticleErosion/ParticleErosion.H         |   6 +-
 .../ParticleTracks/ParticleTracks.H           |  10 +-
 .../ParticleTrap/ParticleTrap.H               |   6 +-
 .../PatchPostProcessing/PatchPostProcessing.C |  14 +-
 .../PatchPostProcessing/PatchPostProcessing.H |  10 +-
 .../VoidFraction/VoidFraction.H               |   6 +-
 .../ParticleForceList/ParticleForceList.C     |   8 +-
 .../ParticleForceList/ParticleForceList.H     |   4 +-
 .../CollisionModel/CollisionModel.H           |   8 +-
 .../CollisionModel/CollisionModelNew.C        |   6 +-
 .../CollisionModel/NoCollision/NoCollision.H  |   6 +-
 .../PairCollision/PairCollision.C             |  20 +-
 .../PairCollision/PairCollision.H             |  14 +-
 .../PairModel/PairModel/PairModel.H           |   6 +-
 .../PairModel/PairModel/PairModelNew.C        |   6 +-
 .../WallLocalSpringSliderDashpot.C            |   6 +-
 .../WallLocalSpringSliderDashpot.H            |   6 +-
 .../WallModel/WallModel/WallModel.H           |  10 +-
 .../WallModel/WallModel/WallModelNew.C        |   6 +-
 .../WallSpringSliderDashpot.C                 |   6 +-
 .../WallSpringSliderDashpot.H                 |   6 +-
 .../DispersionModel/DispersionModel.H         |   8 +-
 .../DispersionModel/DispersionModelNew.C      |   6 +-
 .../NoDispersion/NoDispersion.H               |   6 +-
 .../CellZoneInjection/CellZoneInjection.H     |   6 +-
 .../ConeInjection/ConeInjection.H             |   8 +-
 .../ConeNozzleInjection/ConeNozzleInjection.H |   6 +-
 .../FieldActivatedInjection.H                 |   6 +-
 .../InflationInjection/InflationInjection.C   |  10 +-
 .../InflationInjection/InflationInjection.H   |   8 +-
 .../InjectionModel/InjectionModel.H           |  10 +-
 .../InjectionModel/InjectionModelList.C       |   8 +-
 .../InjectionModel/InjectionModelList.H       |   8 +-
 .../InjectionModel/InjectionModelNew.C        |  10 +-
 .../KinematicLookupTableInjection.H           |   6 +-
 .../ManualInjection/ManualInjection.H         |   6 +-
 .../InjectionModel/NoInjection/NoInjection.H  |   6 +-
 .../PatchFlowRateInjection.H                  |   6 +-
 .../PatchInjection/PatchInjection.H           |   6 +-
 .../DistortedSphereDragForce.H                |   6 +-
 .../Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H |   6 +-
 .../Drag/NonSphereDrag/NonSphereDragForce.H   |   6 +-
 .../PlessisMasliyahDragForce.H                |   6 +-
 .../Drag/SphereDrag/SphereDragForce.H         |   6 +-
 .../Drag/WenYuDrag/WenYuDragForce.H           |   6 +-
 .../ParticleForces/Gravity/GravityForce.H     |   6 +-
 .../ParticleForces/Lift/LiftForce/LiftForce.H |   8 +-
 .../Lift/SaffmanMeiLift/SaffmanMeiLiftForce.H |   6 +-
 .../Lift/TomiyamaLift/TomiyamaLiftForce.H     |   6 +-
 .../NonInertialFrame/NonInertialFrameForce.H  |   6 +-
 .../Paramagnetic/ParamagneticForce.H          |   6 +-
 .../ParticleForce/ParticleForce.H             |  10 +-
 .../ParticleForce/ParticleForceNew.C          |   6 +-
 .../PressureGradient/PressureGradientForce.H  |   8 +-
 .../Kinematic/ParticleForces/SRF/SRFForce.H   |   6 +-
 .../VirtualMass/VirtualMassForce.H            |   6 +-
 .../LocalInteraction/LocalInteraction.H       |   6 +-
 .../MultiInteraction/MultiInteraction.H       |   8 +-
 .../NoInteraction/NoInteraction.H             |   6 +-
 .../PatchInteractionModel.H                   |   8 +-
 .../PatchInteractionModelNew.C                |   6 +-
 .../PatchInteractionModel/Rebound/Rebound.H   |   6 +-
 .../StandardWallInteraction.H                 |   6 +-
 .../NoStochasticCollision.H                   |   6 +-
 .../StochasticCollisionModel.H                |   8 +-
 .../StochasticCollisionModelNew.C             |   6 +-
 .../NoSurfaceFilm/NoSurfaceFilm.H             |   6 +-
 .../SurfaceFilmModel/SurfaceFilmModel.H       |   8 +-
 .../SurfaceFilmModel/SurfaceFilmModelNew.C    |   6 +-
 .../AveragingMethod/AveragingMethod.C         |   6 +-
 .../AveragingMethod/AveragingMethod.H         |  16 +-
 .../AveragingMethod/AveragingMethodI.H        |  10 +-
 .../MPPIC/AveragingMethods/Basic/Basic.C      |   6 +-
 .../MPPIC/AveragingMethods/Basic/Basic.H      |  10 +-
 .../MPPIC/AveragingMethods/Dual/Dual.C        |   6 +-
 .../MPPIC/AveragingMethods/Dual/Dual.H        |  10 +-
 .../MPPIC/AveragingMethods/Moment/Moment.C    |   6 +-
 .../MPPIC/AveragingMethods/Moment/Moment.H    |  10 +-
 .../AveragingMethods/makeAveragingMethods.C   |  14 +-
 .../DampingModels/DampingModel/DampingModel.C |   6 +-
 .../DampingModels/DampingModel/DampingModel.H |   8 +-
 .../MPPIC/DampingModels/NoDamping/NoDamping.H |   6 +-
 .../DampingModels/Relaxation/Relaxation.C     |  12 +-
 .../DampingModels/Relaxation/Relaxation.H     |   8 +-
 .../IsotropyModel/IsotropyModel.C             |   6 +-
 .../IsotropyModel/IsotropyModel.H             |   8 +-
 .../IsotropyModels/NoIsotropy/NoIsotropy.H    |   6 +-
 .../IsotropyModels/Stochastic/Stochastic.C    |  20 +-
 .../IsotropyModels/Stochastic/Stochastic.H    |   6 +-
 .../MPPIC/PackingModels/Explicit/Explicit.C   |  10 +-
 .../MPPIC/PackingModels/Explicit/Explicit.H   |   8 +-
 .../MPPIC/PackingModels/Implicit/Implicit.C   |   6 +-
 .../MPPIC/PackingModels/Implicit/Implicit.H   |   6 +-
 .../MPPIC/PackingModels/NoPacking/NoPacking.H |   6 +-
 .../PackingModels/PackingModel/PackingModel.C |   6 +-
 .../PackingModels/PackingModel/PackingModel.H |   8 +-
 .../HarrisCrighton/HarrisCrighton.C           |   8 +-
 .../HarrisCrighton/HarrisCrighton.H           |   8 +-
 .../MPPIC/ParticleStressModels/Lun/Lun.C      |  12 +-
 .../MPPIC/ParticleStressModels/Lun/Lun.H      |   6 +-
 .../ParticleStressModel/ParticleStressModel.C |   6 +-
 .../ParticleStressModel/ParticleStressModel.H |   8 +-
 .../exponential/exponential.C                 |   6 +-
 .../exponential/exponential.H                 |   6 +-
 .../TimeScaleModel/TimeScaleModel.H           |   4 +-
 .../TimeScaleModels/equilibrium/equilibrium.C |   4 +-
 .../TimeScaleModels/equilibrium/equilibrium.H |   4 +-
 .../TimeScaleModels/isotropic/isotropic.C     |   4 +-
 .../TimeScaleModels/isotropic/isotropic.H     |   4 +-
 .../nonEquilibrium/nonEquilibrium.C           |   4 +-
 .../nonEquilibrium/nonEquilibrium.H           |   4 +-
 .../CompositionModel/CompositionModel.H       |   8 +-
 .../CompositionModel/CompositionModelNew.C    |   6 +-
 .../NoComposition/NoComposition.H             |   6 +-
 .../SingleMixtureFraction.H                   |   6 +-
 .../SinglePhaseMixture/SinglePhaseMixture.H   |   6 +-
 .../ReactingLookupTableInjection.H            |   6 +-
 .../LiquidEvaporation/LiquidEvaporation.H     |   6 +-
 .../LiquidEvaporationBoil.H                   |   6 +-
 .../NoPhaseChange/NoPhaseChange.H             |   6 +-
 .../PhaseChangeModel/PhaseChangeModel.H       |   8 +-
 .../PhaseChangeModel/PhaseChangeModelNew.C    |   6 +-
 .../ConstantRateDevolatilisation.H            |   8 +-
 .../DevolatilisationModel.H                   |   8 +-
 .../DevolatilisationModelNew.C                |   6 +-
 .../NoDevolatilisation/NoDevolatilisation.H   |   6 +-
 .../SingleKineticRateDevolatilisation.H       |   6 +-
 .../ReactingMultiphaseLookupTableInjection.H  |   6 +-
 .../SuppressionCollision.H                    |   6 +-
 .../NoSurfaceReaction/NoSurfaceReaction.H     |   6 +-
 .../SurfaceReactionModel.H                    |   8 +-
 .../SurfaceReactionModelNew.C                 |   6 +-
 .../HeatTransferModel/HeatTransferModel.H     |   8 +-
 .../HeatTransferModel/HeatTransferModelNew.C  |   6 +-
 .../NoHeatTransfer/NoHeatTransfer.H           |   6 +-
 .../RanzMarshall/RanzMarshall.H               |   6 +-
 .../ThermoLookupTableInjection.H              |   6 +-
 .../ThermoSurfaceFilm/ThermoSurfaceFilm.H     |   6 +-
 .../distribution/distribution.C               |  20 +-
 .../distribution/distribution.H               |  12 +-
 .../molecule/mdTools/calculateMDFields.H      |   2 +-
 .../molecule/moleculeCloud/moleculeCloud.C    |   6 +-
 .../molecule/moleculeCloud/moleculeCloud.H    |   6 +-
 .../molecule/moleculeCloud/moleculeCloudI.H   |   4 +-
 .../pairPotential/basic/pairPotential.C       |   4 +-
 .../pairPotential/basic/pairPotential.H       |   6 +-
 .../pairPotential/basic/pairPotentialIO.C     |   4 +-
 .../clouds/Templates/SprayCloud/SprayCloud.C  |   8 +-
 .../clouds/Templates/SprayCloud/SprayCloud.H  |  24 +-
 .../clouds/Templates/SprayCloud/SprayCloudI.H |  10 +-
 .../Templates/SprayParcel/SprayParcel.H       |   6 +-
 .../Templates/SprayParcel/SprayParcelIO.C     |   6 +-
 .../AtomizationModel/AtomizationModel.H       |   8 +-
 .../AtomizationModel/AtomizationModelNew.C    |   6 +-
 .../BlobsSheetAtomization.H                   |   6 +-
 .../LISAAtomization/LISAAtomization.H         |   6 +-
 .../NoAtomization/NoAtomization.H             |   6 +-
 .../BreakupModel/BreakupModel/BreakupModel.H  |   8 +-
 .../BreakupModel/BreakupModelNew.C            |   6 +-
 .../spray/submodels/BreakupModel/ETAB/ETAB.H  |   6 +-
 .../BreakupModel/NoBreakup/NoBreakup.H        |   6 +-
 .../BreakupModel/PilchErdman/PilchErdman.H    |   6 +-
 .../BreakupModel/ReitzDiwakar/ReitzDiwakar.H  |   6 +-
 .../BreakupModel/ReitzKHRT/ReitzKHRT.H        |   6 +-
 .../spray/submodels/BreakupModel/SHF/SHF.H    |   6 +-
 .../spray/submodels/BreakupModel/TAB/TAB.H    |   6 +-
 .../ORourkeCollision/ORourkeCollision.H       |   6 +-
 .../TrajectoryCollision/TrajectoryCollision.H |   6 +-
 .../DispersionRASModel/DispersionRASModel.H   |   4 +-
 .../GradientDispersionRAS.H                   |   6 +-
 .../StochasticDispersionRAS.H                 |   6 +-
 .../BrownianMotion/BrownianMotionForce.H      |   6 +-
 .../autoHexMeshDriver/autoLayerDriverShrink.C |  10 +-
 .../autoHexMeshDriver/autoSnapDriver.H        |  62 +--
 .../autoHexMeshDriver/autoSnapDriverFeature.C |  80 +--
 .../medialAxisMeshMover.C                     |  14 +-
 .../zeroFixedValuePointPatchField.H           |  10 +-
 .../meshRefinement/meshRefinement.C           |   8 +-
 .../meshRefinement/meshRefinement.H           |   8 +-
 .../refinementFeatures/refinementFeatures.C   |  12 +-
 .../refinementFeatures/refinementFeatures.H   |  14 +-
 .../refinementSurfaces/refinementSurfaces.C   |  20 +-
 .../autoHexMesh/shellSurfaces/shellSurfaces.C |   4 +-
 .../autoHexMesh/shellSurfaces/shellSurfaces.H |   4 +-
 .../trackedParticle/trackedParticle.H         |   6 +-
 .../blockMesh/blockMesh/blockMeshMergeFast.C  |   8 +-
 src/mesh/extrudeModel/radial/radial.H         |   4 +-
 .../AMIInterpolation/AMIInterpolation.C       |  36 +-
 .../AMIInterpolation/AMIInterpolation.H       |  26 +-
 .../AMIInterpolationParallelOps.C             |   4 +-
 .../AMIMethod/AMIMethod/AMIMethod.H           |   4 +-
 .../AMIMethod/AMIMethod/AMIMethodNew.C        |   6 +-
 .../AMIMethod/directAMI/directAMI.C           |   6 +-
 .../faceAreaWeightAMI/faceAreaWeightAMI.C     |  34 +-
 .../faceAreaWeightAMI/faceAreaWeightAMI.H     |  26 +-
 .../AMIMethod/mapNearestAMI/mapNearestAMI.C   |   8 +-
 .../AMIMethod/mapNearestAMI/mapNearestAMI.H   |   4 +-
 .../partialFaceAreaWeightAMI.C                |  10 +-
 .../cyclicACMIPointPatchField.C               |   6 +-
 .../cyclicACMIPointPatchField.H               |  14 +-
 .../cyclicACMIPolyPatch/cyclicACMIPolyPatch.H |  10 +-
 .../cyclicACMIPolyPatchTemplates.C            |  10 +-
 .../cyclicAMIPointPatchField.C                |   6 +-
 .../cyclicAMIPointPatchField.H                |  14 +-
 .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.H   |   8 +-
 .../cyclicAMIPolyPatchTemplates.C             |   8 +-
 .../cellDist/patchWave/patchDataWave.C        |   4 +-
 .../cellDist/patchWave/patchDataWave.H        |   6 +-
 .../cellDist/wallPoint/wallPointData.H        |  16 +-
 src/meshTools/cellFeatures/cellFeatures.H     |   6 +-
 .../coordinateSystems/coordinateSystems.C     |   4 +-
 .../coordinateSystems/coordinateSystems.H     |   4 +-
 .../indexedOctree/treeDataPrimitivePatch.C    |  14 +-
 .../indexedOctree/treeDataPrimitivePatch.H    |   6 +-
 .../indexedOctree/treeDataTriSurface.C        |   4 +-
 .../indexedOctree/treeDataTriSurface.H        |   4 +-
 .../mappedPolyPatch/mappedPatchBase.H         |   4 +-
 src/meshTools/meshSearch/meshSearch.H         |   6 +-
 .../regionCoupledBase.H                       |   8 +-
 .../regionCoupledBaseTemplates.C              |   8 +-
 .../searchableSurface/searchableBox.C         |   4 +-
 .../searchableSurface/searchableBox.H         |   4 +-
 .../searchableSurface/searchableCylinder.C    |   4 +-
 .../searchableSurface/searchableCylinder.H    |   4 +-
 .../searchableSurface/searchableDisk.C        |   4 +-
 .../searchableSurface/searchableDisk.H        |   4 +-
 .../searchableSurface/searchablePlane.C       |   4 +-
 .../searchableSurface/searchablePlane.H       |   4 +-
 .../searchableSurface/searchablePlate.C       |   4 +-
 .../searchableSurface/searchablePlate.H       |   4 +-
 .../searchableSurface/searchableSphere.C      |   4 +-
 .../searchableSurface/searchableSphere.H      |   4 +-
 .../searchableSurface/searchableSurface.H     |   4 +-
 .../searchableSurfaceCollection.C             |  18 +-
 .../searchableSurfaceCollection.H             |   6 +-
 .../searchableSurfaceWithGaps.C               |   4 +-
 .../searchableSurfaceWithGaps.H               |   4 +-
 .../searchableSurface/searchableSurfaces.C    |   8 +-
 .../searchableSurface/searchableSurfaces.H    |   8 +-
 .../searchableSurfacesQueries.C               |   8 +-
 .../searchableSurfacesQueries.H               |   6 +-
 .../searchableSurface/triSurfaceMesh.C        |   4 +-
 .../searchableSurface/triSurfaceMesh.H        |   6 +-
 .../intersectedSurface/edgeSurface.C          |   4 +-
 .../intersectedSurface/intersectedSurface.C   |  22 +-
 .../intersectedSurface/intersectedSurface.H   |  12 +-
 .../surfaceIntersection/edgeIntersections.C   |  12 +-
 .../surfaceIntersection/edgeIntersections.H   |   6 +-
 .../surfaceIntersection/surfaceIntersection.C |  16 +-
 .../surfaceIntersection/surfaceIntersection.H |  10 +-
 .../surfaceIntersectionFuncs.C                |   4 +-
 .../surfaceIntersectionTemplates.C            |   6 +-
 .../orientedSurface/orientedSurface.C         |   4 +-
 .../triSurfaceSearch/triSurfaceSearch.C       |   4 +-
 .../triSurfaceSearch/triSurfaceSearch.H       |   6 +-
 .../pointToPointPlanarInterpolation.H         |  12 +-
 ...pointToPointPlanarInterpolationTemplates.C |   6 +-
 .../triSurfaceTools/triSurfaceTools.C         |  24 +-
 .../triSurfaceTools/triSurfaceTools.H         |  24 +-
 .../decompose/decompose/fvFieldDecomposer.H   |   6 +-
 .../fvFieldDecomposerDecomposeFields.C        |  14 +-
 .../decompositionMethod/decompositionMethod.C |   4 +-
 .../multiLevelDecomp/multiLevelDecomp.C       |   4 +-
 .../distributedTriSurfaceMesh.C               |  16 +-
 .../distributedTriSurfaceMesh.H               |  10 +-
 .../reconstruct/fvFieldReconstructor.H        |  20 +-
 .../fvFieldReconstructorReconstructFields.C   |  36 +-
 .../reconstruct/pointFieldReconstructor.H     |   4 +-
 ...pointFieldReconstructorReconstructFields.C |  10 +-
 .../reconstruct/reconstructLagrangian.H       |   6 +-
 .../reconstruct/reconstructLagrangianFields.C |  16 +-
 .../reconstructLagrangianPositions.C          |   4 +-
 .../IO/partialWrite/partialWrite.H            |  10 +-
 .../IO/partialWrite/partialWriteTemplates.C   |  10 +-
 .../field/fieldValues/cellSource/cellSource.H |   6 +-
 .../cellSource/cellSourceTemplates.C          |  10 +-
 .../field/fieldValues/faceSource/faceSource.H |   8 +-
 .../faceSource/faceSourceTemplates.C          |  18 +-
 .../field/fieldValues/fieldValue/fieldValue.H |   4 +-
 .../fieldValue/fieldValueTemplates.C          |  10 +-
 .../field/nearWallFields/findCellParticle.H   |  12 +-
 .../field/nearWallFields/nearWallFields.C     |   4 +-
 .../field/nearWallFields/nearWallFields.H     |  10 +-
 .../nearWallFields/nearWallFieldsTemplates.C  |   6 +-
 .../field/readFields/readFields.H             |   6 +-
 .../field/readFields/readFieldsTemplates.C    |   6 +-
 .../regionSizeDistribution.H                  |   4 +-
 .../field/streamLine/streamLine.C             |  10 +-
 .../field/streamLine/streamLine.H             |  12 +-
 .../field/streamLine/streamLineParticle.H     |  28 +-
 .../surfaceInterpolateFields.H                |   6 +-
 .../surfaceInterpolateFieldsTemplates.C       |   4 +-
 .../wallBoundedStreamLine.C                   |  10 +-
 .../wallBoundedStreamLine.H                   |  12 +-
 .../wallBoundedStreamLineParticle.H           |  24 +-
 .../forces/forceCoeffs/forceCoeffs.C          |   4 +-
 .../functionObjects/forces/forces/forces.C    |  10 +-
 .../functionObjects/forces/forces/forces.H    |   6 +-
 .../blendingFactor/blendingFactorTemplates.C  |  10 +-
 .../utilities/residuals/residualsTemplates.C  |   4 +-
 .../setTimeStep/setTimeStepFunctionObject.H   |   4 +-
 .../timeActivatedFileUpdate.H                 |   4 +-
 .../turbulenceFields/turbulenceFields.H       |   4 +-
 .../turbulenceFieldsTemplates.C               |   4 +-
 .../energyRegionCoupledFvPatchScalarField.C   |   4 +-
 .../energyRegionCoupledFvPatchScalarField.H   |  10 +-
 .../regionModel/regionModel/regionModel.H     |  10 +-
 .../regionModel/regionModelTemplates.C        |  18 +-
 ...linedFilmNusseltHeightFvPatchScalarField.H |   8 +-
 ...lmNusseltInletVelocityFvPatchVectorField.H |   8 +-
 .../kinematicSingleLayer.C                    |  14 +-
 .../kinematicSingleLayer.H                    |   8 +-
 .../surfaceFilmModels/noFilm/noFilm.C         |  14 +-
 .../surfaceFilmModels/noFilm/noFilm.H         |   8 +-
 .../curvatureSeparation/curvatureSeparation.C |   6 +-
 .../curvatureSeparation/curvatureSeparation.H |   4 +-
 .../surfaceFilmModel/surfaceFilmModel.C       |  14 +-
 .../surfaceFilmModel/surfaceFilmModel.H       |   8 +-
 .../thermoSingleLayer/thermoSingleLayer.C     |  16 +-
 .../thermoSingleLayer/thermoSingleLayer.H     |   8 +-
 src/sampling/cuttingPlane/cuttingPlane.H      |   6 +-
 .../cuttingPlane/cuttingPlaneTemplates.C      |  12 +-
 .../cellVolumeWeight/cellVolumeWeightMethod.C |  10 +-
 .../calcMethod/direct/directMethod.C          |   6 +-
 .../calcMethod/mapNearest/mapNearestMethod.C  |   8 +-
 .../calcMethod/mapNearest/mapNearestMethod.H  |   4 +-
 src/sampling/meshToMesh/meshToMesh.C          |   4 +-
 src/sampling/meshToMesh/meshToMesh.H          |  50 +-
 .../meshToMesh/meshToMeshParallelOps.C        |   6 +-
 src/sampling/meshToMesh/meshToMeshTemplates.C |  62 +--
 src/sampling/meshToMesh0/meshToMesh0.H        |  12 +-
 .../meshToMesh0/meshToMesh0Templates.C        |  20 +-
 src/sampling/probes/patchProbes.H             |   8 +-
 src/sampling/probes/patchProbesTemplates.C    |  18 +-
 src/sampling/probes/probes.H                  |  10 +-
 src/sampling/probes/probesTemplates.C         |  24 +-
 .../sampledSet/sampledSets/sampledSets.C      |   8 +-
 .../sampledSet/sampledSets/sampledSets.H      |  10 +-
 .../sampledSets/sampledSetsTemplates.C        |  34 +-
 .../distanceSurface/distanceSurface.H         |   6 +-
 .../distanceSurfaceTemplates.C                |  12 +-
 .../sampledSurface/isoSurface/isoSurface.C    |  12 +-
 .../sampledSurface/isoSurface/isoSurface.H    |  14 +-
 .../isoSurface/isoSurfaceCell.C               |  12 +-
 .../isoSurface/isoSurfaceCell.H               |  14 +-
 .../isoSurface/isoSurfaceCellTemplates.C      |  10 +-
 .../isoSurface/isoSurfaceTemplates.C          |  16 +-
 .../isoSurface/sampledIsoSurface.H            |   6 +-
 .../isoSurface/sampledIsoSurfaceCell.H        |   6 +-
 .../sampledIsoSurfaceCellTemplates.C          |  10 +-
 .../isoSurface/sampledIsoSurfaceTemplates.C   |  14 +-
 .../sampledCuttingPlane/sampledCuttingPlane.H |   6 +-
 .../sampledCuttingPlaneTemplates.C            |  14 +-
 .../sampledPatch/sampledPatch.H               |   8 +-
 .../sampledPatch/sampledPatchTemplates.C      |  14 +-
 .../sampledPatchInternalField.H               |   6 +-
 .../sampledPatchInternalFieldTemplates.C      |   8 +-
 .../sampledPlane/sampledPlane.H               |   6 +-
 .../sampledPlane/sampledPlaneTemplates.C      |  10 +-
 .../sampledSurface/sampledSurface.C           |  22 +-
 .../sampledSurface/sampledSurface.H           |  22 +-
 .../sampledSurface/sampledSurfaceTemplates.C  |  18 +-
 .../sampledSurfacesTemplates.C                |  10 +-
 .../sampledTriSurfaceMesh.H                   |   8 +-
 .../sampledTriSurfaceMeshTemplates.C          |  10 +-
 .../sampledThresholdCellFaces.H               |   6 +-
 .../sampledThresholdCellFacesTemplates.C      |  10 +-
 .../writers/nastran/nastranSurfaceWriter.C    |   8 +-
 .../writers/nastran/nastranSurfaceWriter.H    |   4 +-
 .../nastran/nastranSurfaceWriterTemplates.C   |   4 +-
 ...gidBodyDisplacementPointPatchVectorField.H |  10 +-
 ...gidBodyDisplacementPointPatchVectorField.H |  10 +-
 src/surfMesh/MeshedSurface/MeshedSurface.C    |  18 +-
 src/surfMesh/MeshedSurface/MeshedSurface.H    |  22 +-
 .../MeshedSurface/MeshedSurfaceZones.C        |   6 +-
 .../MeshedSurfaceIOAllocator.C                |   6 +-
 .../MeshedSurfaceIOAllocator.H                |   4 +-
 .../UnsortedMeshedSurface.C                   |  24 +-
 .../UnsortedMeshedSurface.H                   |  24 +-
 .../UnsortedMeshedSurfaceNew.C                |   4 +-
 src/surfMesh/surfMesh/surfMesh.C              |   8 +-
 src/surfMesh/surfMesh/surfMesh.H              |   6 +-
 .../surfaceFormats/ac3d/AC3DsurfaceFormat.H   |   6 +-
 .../surfaceFormats/ftr/FTRsurfaceFormat.H     |   6 +-
 .../surfaceFormats/gts/GTSsurfaceFormat.H     |   6 +-
 .../surfaceFormats/nas/NASsurfaceFormat.H     |   6 +-
 .../surfaceFormats/obj/OBJsurfaceFormat.H     |   6 +-
 .../surfaceFormats/off/OFFsurfaceFormat.H     |   6 +-
 .../surfaceFormats/ofs/OFSsurfaceFormat.H     |   6 +-
 .../starcd/STARCDsurfaceFormat.H              |   6 +-
 .../surfaceFormats/stl/STLsurfaceFormat.H     |   6 +-
 .../surfaceFormats/tri/TRIsurfaceFormat.H     |   6 +-
 .../surfaceFormats/vtk/VTKsurfaceFormat.H     |   6 +-
 .../energyJump/energyJumpFvPatchScalarField.H |  10 +-
 .../energyJumpAMIFvPatchScalarField.H         |  10 +-
 .../basicChemistryModel/basicChemistryModel.H |   4 +-
 .../chemistryModel/chemistryModel.C           |   8 +-
 .../chemistryModel/chemistryModel.H           |  12 +-
 .../chemistryModel/chemistryModelI.H          |   6 +-
 .../makeChemistrySolverTypes.H                |   4 +-
 .../RaviPetersen/RaviPetersen.C               |   4 +-
 .../RaviPetersen/RaviPetersen.H               |   8 +-
 .../radiation/radiationModels/P1/P1.C         |   4 +-
 .../radiation/radiationModels/P1/P1.H         |   4 +-
 .../blackBodyEmission/blackBodyEmission.C     |   4 +-
 .../blackBodyEmission/blackBodyEmission.H     |   4 +-
 .../radiationModels/fvDOM/fvDOM/fvDOM.C       |   4 +-
 .../radiationModels/fvDOM/fvDOM/fvDOM.H       |   6 +-
 .../radiationModels/noRadiation/noRadiation.C |   6 +-
 .../radiationModels/noRadiation/noRadiation.H |   4 +-
 .../radiationModels/opaqueSolid/opaqueSolid.C |   6 +-
 .../radiationModels/opaqueSolid/opaqueSolid.H |   4 +-
 .../radiationModel/radiationModel.H           |   4 +-
 .../radiationModels/viewFactor/viewFactor.C   |   6 +-
 .../radiationModels/viewFactor/viewFactor.H   |   4 +-
 .../greyMeanAbsorptionEmission.H              |   4 +-
 .../greyMeanSolidAbsorptionEmission.H         |   4 +-
 .../mixtureFractionSoot/mixtureFractionSoot.C |   4 +-
 .../chemistryReader/chemistryReader.C         |   6 +-
 .../chemistryReader/chemistryReader.H         |   4 +-
 .../chemkinReader/chemkinLexer.L              |   6 +-
 .../chemkinReader/chemkinReader.H             |   6 +-
 .../reactingMixture/reactingMixture.C         |  12 +-
 .../reactingMixture/reactingMixture.H         |  12 +-
 .../singleStepReactingMixture.C               |   4 +-
 .../basicSolidChemistryModel.C                |   6 +-
 .../basicSolidChemistryModel.H                |   8 +-
 .../pyrolysisChemistryModel.H                 |   8 +-
 .../pyrolysisChemistryModelI.H                |   8 +-
 .../solidChemistryModel/solidChemistryModel.H |  12 +-
 .../solidChemistryModelI.H                    |  10 +-
 .../makeSolidChemistrySolverType.H            |   4 +-
 .../Reactions/solidReaction/solidReaction.H   |  10 +-
 .../const/constAnIsoSolidTransportI.H         |   6 +-
 .../transport/const/constIsoSolidTransportI.H |   6 +-
 .../exponential/exponentialSolidTransportI.H  |   6 +-
 .../polynomial/polynomialSolidTransportI.H    |  14 +-
 .../equationOfState/Boussinesq/BoussinesqI.H  |  14 +-
 .../PengRobinsonGas/PengRobinsonGasI.H        |  12 +-
 .../adiabaticPerfectFluidI.H                  |  14 +-
 .../icoPolynomial/icoPolynomialI.H            |  14 +-
 .../incompressiblePerfectGasI.H               |  14 +-
 .../specie/equationOfState/linear/linearI.H   |  14 +-
 .../perfectFluid/perfectFluidI.H              |  14 +-
 .../equationOfState/perfectGas/perfectGasI.H  |  14 +-
 .../equationOfState/rhoConst/rhoConstI.H      |  10 +-
 .../IrreversibleReaction.H                    |  10 +-
 .../NonEquilibriumReversibleReaction.H        |  10 +-
 .../reaction/Reactions/Reaction/Reaction.C    |  14 +-
 .../reaction/Reactions/Reaction/Reaction.H    |  14 +-
 .../Reactions/ReactionList/ReactionList.C     |  12 +-
 .../Reactions/ReactionList/ReactionList.H     |   4 +-
 .../ReversibleReaction/ReversibleReaction.H   |  10 +-
 .../thirdBodyEfficienciesI.H                  |   6 +-
 .../specie/thermo/eConst/eConstThermoI.H      |  14 +-
 .../specie/thermo/hConst/hConstThermoI.H      |  14 +-
 .../specie/thermo/hPower/hPowerThermoI.H      |  14 +-
 .../thermo/hRefConst/hRefConstThermoI.H       |  14 +-
 .../specie/thermo/thermo/thermo.H             |   6 +-
 .../specie/thermo/thermo/thermoI.H            |  14 +-
 .../specie/transport/const/constTransportI.H  |  14 +-
 .../polynomial/polynomialTransportI.H         |  14 +-
 .../sutherland/sutherlandTransportI.H         |  14 +-
 ...ndentAlphaContactAngleFvPatchScalarField.H |   4 +-
 .../triSurface/interfaces/VTK/readVTK.C       |   4 +-
 src/triSurface/triSurface/triSurface.C        |   6 +-
 src/triSurface/triSurface/triSurface.H        |   6 +-
 .../ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C  |   4 +-
 1426 files changed, 8375 insertions(+), 8375 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index e09c1bbd14..ebc92684a4 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ PDRkEpsilon::PDRkEpsilon
     const word& modelName
 )
 :
-    Foam::RASModels::kEpsilon<EddyDiffusivity<compressible::turbulenceModel> >
+    Foam::RASModels::kEpsilon<EddyDiffusivity<compressible::turbulenceModel>>
     (
         geometricOneField(),
         rho,
diff --git a/applications/solvers/combustion/PDRFoam/bEqn.H b/applications/solvers/combustion/PDRFoam/bEqn.H
index 8ad1161871..e9f1a73279 100644
--- a/applications/solvers/combustion/PDRFoam/bEqn.H
+++ b/applications/solvers/combustion/PDRFoam/bEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/combustion/XiFoam/ftEqn.H b/applications/solvers/combustion/XiFoam/ftEqn.H
index 87bfaa9790..c0f7dcad9c 100644
--- a/applications/solvers/combustion/XiFoam/ftEqn.H
+++ b/applications/solvers/combustion/XiFoam/ftEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
index e5e7de6496..9b9d0f376b 100644
--- a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
+++ b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
@@ -25,7 +25,7 @@ fvMesh mesh
         runTime,
         IOobject::READ_IF_PRESENT
     ),
-    xferMove<Field<vector> >(points),
+    xferMove<Field<vector>>(points),
     faces.xfer(),
     owner.xfer(),
     neighbour.xfer()
diff --git a/applications/solvers/combustion/fireFoam/YEEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H
index da485e7305..cee98e2429 100644
--- a/applications/solvers/combustion/fireFoam/YEEqn.H
+++ b/applications/solvers/combustion/fireFoam/YEEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/combustion/reactingFoam/YEqn.H b/applications/solvers/combustion/reactingFoam/YEqn.H
index c8d34cf1d5..8cb5664d5a 100644
--- a/applications/solvers/combustion/reactingFoam/YEqn.H
+++ b/applications/solvers/combustion/reactingFoam/YEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
index 18155d5bca..d65d3943f9 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap
     transformFvPatchField<Type>::rmap(ptf, addr);
 
     const mixedFixedValueSlipFvPatchField<Type>& dmptf =
-        refCast<const mixedFixedValueSlipFvPatchField<Type> >(ptf);
+        refCast<const mixedFixedValueSlipFvPatchField<Type>>(ptf);
 
     refValue_.rmap(dmptf.refValue_, addr);
     valueFraction_.rmap(dmptf.valueFraction_, addr);
@@ -127,7 +127,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::mixedFixedValueSlipFvPatchField<Type>::snGrad() const
 {
     tmp<vectorField> nHat = this->patch().nf();
@@ -167,7 +167,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::evaluate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::mixedFixedValueSlipFvPatchField<Type>::snGradTransformDiag() const
 {
     vectorField nHat(this->patch().nf());
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H
index d27b722a93..8c98fb5f83 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,9 +101,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mixedFixedValueSlipFvPatchField<Type>(*this)
             );
@@ -117,12 +117,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mixedFixedValueSlipFvPatchField<Type>(*this, iF)
             );
@@ -170,7 +170,7 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const;
+            virtual tmp<Field<Type>> snGrad() const;
 
             //- Evaluate the patch field
             virtual void evaluate
@@ -179,7 +179,7 @@ public:
             );
 
             //- Return face-gradient transform diagonal
-            virtual tmp<Field<Type> > snGradTransformDiag() const;
+            virtual tmp<Field<Type>> snGradTransformDiag() const;
 
 
         //- Write
diff --git a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H b/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
index 7f4b6cd7b8..7d361ac9f8 100644
--- a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
+++ b/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
@@ -3,14 +3,14 @@ namespace Foam
 
 //- Interpolate field vf according to direction dir
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const surfaceScalarField& dir,
     const word& reconFieldName = word::null
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
     (
         fvc::interpolate
         (
diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H
index 9e34895a73..6c08de4b8e 100644
--- a/applications/solvers/lagrangian/DPMFoam/createFields.H
+++ b/applications/solvers/lagrangian/DPMFoam/createFields.H
@@ -151,7 +151,7 @@ alphac.correctBoundaryConditions();
 surfaceScalarField alphacf("alphacf", fvc::interpolate(alphac));
 surfaceScalarField alphaPhic("alphaPhic", alphacf*phic);
 
-autoPtr<PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel> >
+autoPtr<PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>>
 continuousPhaseTurbulence
 (
     PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>::New
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
index a719c83cd7..671e316c54 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H
index b23f00dbf1..93dacc3ba6 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
index fbcc0a0f65..25bdc12cdf 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
index cd0a45f0f0..20d55a8d52 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H
index 6a24830137..055aac3966 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interFoam/alphaEqn.H
@@ -2,7 +2,7 @@
     word alphaScheme("div(phi,alpha)");
     word alpharScheme("div(phirb,alpha)");
 
-    tmp<fv::ddtScheme<scalar> > ddtAlpha
+    tmp<fv::ddtScheme<scalar>> ddtAlpha
     (
         fv::ddtScheme<scalar>::New
         (
@@ -15,13 +15,13 @@
     scalar ocCoeff = 0;
     if
     (
-        isType<fv::EulerDdtScheme<scalar> >(ddtAlpha())
-     || isType<fv::localEulerDdtScheme<scalar> >(ddtAlpha())
+        isType<fv::EulerDdtScheme<scalar>>(ddtAlpha())
+     || isType<fv::localEulerDdtScheme<scalar>>(ddtAlpha())
     )
     {
         ocCoeff = 0;
     }
-    else if (isType<fv::CrankNicolsonDdtScheme<scalar> >(ddtAlpha()))
+    else if (isType<fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha()))
     {
         if (nAlphaSubCycles > 1)
         {
@@ -32,7 +32,7 @@
         }
 
         ocCoeff =
-            refCast<fv::CrankNicolsonDdtScheme<scalar> >(ddtAlpha()).ocCoeff();
+            refCast<fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha()).ocCoeff();
     }
     else
     {
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
index 172676b97f..9cc90a9ebe 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
@@ -4,7 +4,7 @@
 
     surfaceScalarField phir("phir", phic*interface.nHatf());
 
-    Pair<tmp<volScalarField> > vDotAlphal =
+    Pair<tmp<volScalarField>> vDotAlphal =
         mixture->vDotAlphal();
     const volScalarField& vDotcAlphal = vDotAlphal[0]();
     const volScalarField& vDotvAlphal = vDotAlphal[1]();
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
index b759081eea..a1b9241fa5 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
@@ -39,7 +39,7 @@
         )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
     );
 
-    Pair<tmp<volScalarField> > vDotP = mixture->vDotP();
+    Pair<tmp<volScalarField>> vDotP = mixture->vDotP();
     const volScalarField& vDotcP = vDotP[0]();
     const volScalarField& vDotvP = vDotP[1]();
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
index 4a174eb980..497a6e3d64 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
@@ -33,7 +33,7 @@
         )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
     );
 
-    Pair<tmp<volScalarField> > vDotP = mixture->vDotP();
+    Pair<tmp<volScalarField>> vDotP = mixture->vDotP();
     const volScalarField& vDotcP = vDotP[0]();
     const volScalarField& vDotvP = vDotP[1]();
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
index f7cc2eae21..a4663ba488 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,13 +63,13 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::Kunz
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotAlphal() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
     volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         mcCoeff_*sqr(limitedAlpha1)
        *max(p - pSat(), p0_)/max(p - pSat(), 0.01*pSat()),
@@ -78,13 +78,13 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotAlphal() const
     );
 }
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotP() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
     volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         mcCoeff_*sqr(limitedAlpha1)*(1.0 - limitedAlpha1)
        *pos(p - pSat())/max(p - pSat(), 0.01*pSat()),
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
index 393357a7ff..0b1c155f45 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,11 +105,11 @@ public:
         //- Return the mass condensation and vaporisation rates as a
         //  coefficient to multiply (1 - alphal) for the condensation rate
         //  and a coefficient to multiply  alphal for the vaporisation rate
-        virtual Pair<tmp<volScalarField> > mDotAlphal() const;
+        virtual Pair<tmp<volScalarField>> mDotAlphal() const;
 
         //- Return the mass condensation and vaporisation rates as coefficients
         //  to multiply (p - pSat)
-        virtual Pair<tmp<volScalarField> > mDotP() const;
+        virtual Pair<tmp<volScalarField>> mDotP() const;
 
         //- Correct the Kunz phaseChange model
         virtual void correct();
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
index 72fdb7245e..cfe6b1b008 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,25 +63,25 @@ Foam::phaseChangeTwoPhaseMixtures::Merkle::Merkle
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::Merkle::mDotAlphal() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         mcCoeff_*max(p - pSat(), p0_),
         mvCoeff_*min(p - pSat(), p0_)
     );
 }
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::Merkle::mDotP() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
     volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         mcCoeff_*(1.0 - limitedAlpha1)*pos(p - pSat()),
         (-mvCoeff_)*limitedAlpha1*neg(p - pSat())
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
index 0152b2d18a..1de1263e5c 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,11 +99,11 @@ public:
         //- Return the mass condensation and vaporisation rates as a
         //  coefficient to multiply (1 - alphal) for the condensation rate
         //  and a coefficient to multiply  alphal for the vaporisation rate
-        virtual Pair<tmp<volScalarField> > mDotAlphal() const;
+        virtual Pair<tmp<volScalarField>> mDotAlphal() const;
 
         //- Return the mass condensation and vaporisation rates as coefficients
         //  to multiply (p - pSat)
-        virtual Pair<tmp<volScalarField> > mDotP() const;
+        virtual Pair<tmp<volScalarField>> mDotP() const;
 
         //- Correct the Merkle phaseChange model
         virtual void correct();
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
index 189c7bae06..3be86e0f51 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::pCoeff
 }
 
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotAlphal() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
@@ -116,7 +116,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotAlphal() const
 
     volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         Cc_*limitedAlpha1*pCoeff*max(p - pSat(), p0_),
 
@@ -125,7 +125,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotAlphal() const
 }
 
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotP() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
@@ -134,7 +134,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotP() const
     volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
     volScalarField apCoeff(limitedAlpha1*pCoeff);
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         Cc_*(1.0 - limitedAlpha1)*pos(p - pSat())*apCoeff,
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
index 67eb0dd5ba..c3b8f86a46 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,11 +112,11 @@ public:
         //- Return the mass condensation and vaporisation rates as a
         //  coefficient to multiply (1 - alphal) for the condensation rate
         //  and a coefficient to multiply  alphal for the vaporisation rate
-        virtual Pair<tmp<volScalarField> > mDotAlphal() const;
+        virtual Pair<tmp<volScalarField>> mDotAlphal() const;
 
         //- Return the mass condensation and vaporisation rates as coefficients
         //  to multiply (p - pSat)
-        virtual Pair<tmp<volScalarField> > mDotP() const;
+        virtual Pair<tmp<volScalarField>> mDotP() const;
 
         //- Correct the SchnerrSauer phaseChange model
         virtual void correct();
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
index 5575253888..b9a5e69bf8 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,26 +50,26 @@ Foam::phaseChangeTwoPhaseMixture::phaseChangeTwoPhaseMixture
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixture::vDotAlphal() const
 {
     volScalarField alphalCoeff(1.0/rho1() - alpha1_*(1.0/rho1() - 1.0/rho2()));
-    Pair<tmp<volScalarField> > mDotAlphal = this->mDotAlphal();
+    Pair<tmp<volScalarField>> mDotAlphal = this->mDotAlphal();
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         alphalCoeff*mDotAlphal[0],
         alphalCoeff*mDotAlphal[1]
     );
 }
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixture::vDotP() const
 {
     dimensionedScalar pCoeff(1.0/rho1() - 1.0/rho2());
-    Pair<tmp<volScalarField> > mDotP = this->mDotP();
+    Pair<tmp<volScalarField>> mDotP = this->mDotP();
 
-    return Pair<tmp<volScalarField> >(pCoeff*mDotP[0], pCoeff*mDotP[1]);
+    return Pair<tmp<volScalarField>>(pCoeff*mDotP[0], pCoeff*mDotP[1]);
 }
 
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
index 227768ac8d..dedc97a9e9 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,20 +134,20 @@ public:
         //- Return the mass condensation and vaporisation rates as a
         //  coefficient to multiply (1 - alphal) for the condensation rate
         //  and a coefficient to multiply  alphal for the vaporisation rate
-        virtual Pair<tmp<volScalarField> > mDotAlphal() const = 0;
+        virtual Pair<tmp<volScalarField>> mDotAlphal() const = 0;
 
         //- Return the mass condensation and vaporisation rates as coefficients
         //  to multiply (p - pSat)
-        virtual Pair<tmp<volScalarField> > mDotP() const = 0;
+        virtual Pair<tmp<volScalarField>> mDotP() const = 0;
 
         //- Return the volumetric condensation and vaporisation rates as a
         //  coefficient to multiply (1 - alphal) for the condensation rate
         //  and a coefficient to multiply  alphal for the vaporisation rate
-        Pair<tmp<volScalarField> > vDotAlphal() const;
+        Pair<tmp<volScalarField>> vDotAlphal() const;
 
         //- Return the volumetric condensation and vaporisation rates as
         //  coefficients to multiply (p - pSat)
-        Pair<tmp<volScalarField> > vDotP() const;
+        Pair<tmp<volScalarField>> vDotP() const;
 
         //- Correct the phaseChange model
         virtual void correct() = 0;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
index 4c2c4ad3de..e10e3bb68b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,10 +150,10 @@ public:
 // Instantiation for multi-component-multi-component pairs
 #define makeInterfaceCompositionType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
                                                                                \
-    typedef Thermo<Comp, SpecieMixture<Mix<Phys> > >                           \
+    typedef Thermo<Comp, SpecieMixture<Mix<Phys>>>                           \
         Type##Thermo##Comp##Mix##Phys;                                         \
                                                                                \
-    typedef OtherThermo<OtherComp, OtherMix<OtherPhys> >                       \
+    typedef OtherThermo<OtherComp, OtherMix<OtherPhys>>                       \
         Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys;              \
                                                                                \
     addInterfaceCompositionToRunTimeSelectionTable                             \
@@ -166,10 +166,10 @@ public:
 // Instantiation for multi-component-single-component pairs
 #define makeSpecieInterfaceCompositionType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
                                                                                \
-    typedef Thermo<Comp, SpecieMixture<Mix<Phys> > >                           \
+    typedef Thermo<Comp, SpecieMixture<Mix<Phys>>>                           \
         Type##Thermo##Comp##Mix##Phys;                                         \
                                                                                \
-    typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys> > >       \
+    typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys>>>       \
         Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys;              \
                                                                                \
     addInterfaceCompositionToRunTimeSelectionTable                             \
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C
index e8f16ee9ae..0cc976c042 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ void Foam::interfaceCompositionModels::Raoult<Thermo, OtherThermo>::update
 
     forAllIter
     (
-        HashTable<autoPtr<interfaceCompositionModel> >,
+        HashTable<autoPtr<interfaceCompositionModel>>,
         speciesModels_,
         iter
     )
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H
index 103c8d048c..ca001df8e4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ private:
         volScalarField YNonVapourPrime_;
 
         //- Species' individual composition models
-        HashTable<autoPtr<interfaceCompositionModel> > speciesModels_;
+        HashTable<autoPtr<interfaceCompositionModel>> speciesModels_;
 
 
 public:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
index 36e31630a4..64d2e63ae8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -353,7 +353,7 @@ Foam::BlendedInterfacialModel<ModelType>::Kf() const
 
 template<class ModelType>
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::BlendedInterfacialModel<ModelType>::F() const
 {
     tmp<volScalarField> f1, f2;
@@ -368,7 +368,7 @@ Foam::BlendedInterfacialModel<ModelType>::F() const
         f2 = blending_.f2(phase1_, phase2_);
     }
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > x
+    tmp<GeometricField<Type, fvPatchField, volMesh>> x
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
index 4be8f0b347..c51599d58c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,7 +144,7 @@ public:
 
         //- Return the blended force
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > F() const;
+        tmp<GeometricField<Type, fvPatchField, volMesh>> F() const;
 
         //- Return the face blended force
         tmp<surfaceScalarField> Ff() const;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
index 3a0cbd4ba2..c02f04e82e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ protected:
         <
             HashTable
             <
-                autoPtr<BlendedInterfacialModel<heatTransferModel> >
+                autoPtr<BlendedInterfacialModel<heatTransferModel>>
             >,
             phasePairKey,
             phasePairKey::hash
@@ -77,7 +77,7 @@ protected:
         <
             HashTable
             <
-                autoPtr<BlendedInterfacialModel<massTransferModel> >
+                autoPtr<BlendedInterfacialModel<massTransferModel>>
             >,
             phasePairKey,
             phasePairKey::hash
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
index 0c908239fd..931fc2a758 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ protected:
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<heatTransferModel> >,
+            autoPtr<BlendedInterfacialModel<heatTransferModel>>,
             phasePairKey,
             phasePairKey::hash
         > heatTransferModelTable;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index f50bd61f9e..c789d365b7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -543,10 +543,10 @@ Foam::volVectorField& Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setF
 
 
 template<class BasePhaseSystem>
-Foam::autoPtr<Foam::PtrList<Foam::volVectorField> >
+Foam::autoPtr<Foam::PtrList<Foam::volVectorField>>
 Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
 {
-    autoPtr<PtrList<volVectorField> > tFs
+    autoPtr<PtrList<volVectorField>> tFs
     (
         new PtrList<volVectorField>(this->phases().size())
     );
@@ -628,13 +628,13 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setPhiD
 
 
 template<class BasePhaseSystem>
-Foam::autoPtr<Foam::PtrList<Foam::surfaceScalarField> >
+Foam::autoPtr<Foam::PtrList<Foam::surfaceScalarField>>
 Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::phiDs
 (
     const PtrList<volScalarField>& rAUs
 ) const
 {
-    autoPtr<PtrList<surfaceScalarField> > tphiDs
+    autoPtr<PtrList<surfaceScalarField>> tphiDs
     (
         new PtrList<surfaceScalarField>(this->phases().size())
     );
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
index 2f787ed004..c449e0f67d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,35 +72,35 @@ protected:
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<dragModel> >,
+            autoPtr<BlendedInterfacialModel<dragModel>>,
             phasePairKey,
             phasePairKey::hash
         > dragModelTable;
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<virtualMassModel> >,
+            autoPtr<BlendedInterfacialModel<virtualMassModel>>,
             phasePairKey,
             phasePairKey::hash
         > virtualMassModelTable;
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<liftModel> >,
+            autoPtr<BlendedInterfacialModel<liftModel>>,
             phasePairKey,
             phasePairKey::hash
         > liftModelTable;
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<wallLubricationModel> >,
+            autoPtr<BlendedInterfacialModel<wallLubricationModel>>,
             phasePairKey,
             phasePairKey::hash
         > wallLubricationModelTable;
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<turbulentDispersionModel> >,
+            autoPtr<BlendedInterfacialModel<turbulentDispersionModel>>,
             phasePairKey,
             phasePairKey::hash
         > turbulentDispersionModelTable;
@@ -187,10 +187,10 @@ public:
         virtual tmp<volVectorField> F(const phasePairKey& key) const;
 
         //- Return the combined force (lift + wall-lubrication)
-        virtual autoPtr<PtrList<volVectorField> > Fs() const;
+        virtual autoPtr<PtrList<volVectorField>> Fs() const;
 
         //- Return the turbulent dispersion force on faces for phase pair
-        virtual autoPtr<PtrList<surfaceScalarField> > phiDs
+        virtual autoPtr<PtrList<surfaceScalarField>> phiDs
         (
             const PtrList<volScalarField>& rAUs
         ) const;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H
index 862f75646e..d869907a33 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ Description
 
 namespace Foam
 {
-      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel> >
+      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel>>
           phaseCompressibleTurbulenceModel;
 }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H
index 9600f6ef9b..417c6cea6d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ namespace Foam
     template<class BasicTurbulenceModel>
     class ThermalDiffusivity;
 
-      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel> >
+      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel>>
           phaseCompressibleTurbulenceModel;
 }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index 664add034f..cee72cb353 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -236,7 +236,7 @@ protected:
             const word& modelName,
             HashTable
             <
-                autoPtr<BlendedInterfacialModel<modelType> >,
+                autoPtr<BlendedInterfacialModel<modelType>>,
                 phasePairKey,
                 phasePairKey::hash
             >& models
@@ -249,7 +249,7 @@ protected:
             const word& modelName,
             HashTable
             <
-                HashTable<autoPtr<modelType> >,
+                HashTable<autoPtr<modelType>>,
                 phasePairKey,
                 phasePairKey::hash
             >& models
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
index eee3fcd3b3..3ac0019fab 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
     const word& modelName,
     HashTable
     <
-        autoPtr<BlendedInterfacialModel<modelType> >,
+        autoPtr<BlendedInterfacialModel<modelType>>,
         phasePairKey,
         phasePairKey::hash
     >& models
@@ -118,7 +118,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
         models.insert
         (
             key,
-            autoPtr<BlendedInterfacialModel<modelType> >
+            autoPtr<BlendedInterfacialModel<modelType>>
             (
                 new BlendedInterfacialModel<modelType>
                 (
@@ -141,7 +141,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
     const word& modelName,
     HashTable
     <
-        HashTable<autoPtr<modelType> >,
+        HashTable<autoPtr<modelType>>,
         phasePairKey,
         phasePairKey::hash
     >& models
@@ -169,7 +169,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
                 models.insert
                 (
                     key,
-                    HashTable<autoPtr<modelType> >()
+                    HashTable<autoPtr<modelType>>()
                 );
             }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
index e33bf8c487..bf6d3e0d2e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -167,10 +167,10 @@ public:
         virtual tmp<volScalarField> Kd(const phaseModel& phase) const = 0;
 
         //- Return the combined force (lift + wall-lubrication) for phase pair
-        virtual autoPtr<PtrList<Foam::volVectorField> > Fs() const = 0;
+        virtual autoPtr<PtrList<Foam::volVectorField>> Fs() const = 0;
 
         //- Return the turbulent dispersion force on faces for phase pair
-        virtual autoPtr<PtrList<Foam::surfaceScalarField> > phiDs
+        virtual autoPtr<PtrList<Foam::surfaceScalarField>> phiDs
         (
             const PtrList<volScalarField>& rAUs
         ) const = 0;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index 2703d75ef1..8b4a27f2b8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -37,7 +37,7 @@ forAll(phases, phasei)
 // Lift, wall-lubrication and turbulent diffusion fluxes
 PtrList<surfaceScalarField> phiFs(phases.size());
 {
-    autoPtr<PtrList<volVectorField> > Fs = fluid.Fs();
+    autoPtr<PtrList<volVectorField>> Fs = fluid.Fs();
 
     forAll(phases, phasei)
     {
@@ -58,7 +58,7 @@ PtrList<surfaceScalarField> phiFs(phases.size());
     }
 }
 {
-    autoPtr<PtrList<surfaceScalarField> > phiDs = fluid.phiDs(rAUs);
+    autoPtr<PtrList<surfaceScalarField>> phiDs = fluid.phiDs(rAUs);
 
     forAll(phases, phasei)
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index e44534e398..43ad071962 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
 :
     eddyViscosity
     <
-        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
     >
     (
         type,
@@ -187,7 +187,7 @@ bool Foam::RASModels::kineticTheoryModel::read()
     (
         eddyViscosity
         <
-            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
         >::read()
     )
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index e18d41fb40..d648de7bc1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ class kineticTheoryModel
 :
     public eddyViscosity
     <
-        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
     >
 {
     // Private data
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index 79df9e4922..c4ce9a7583 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel
 :
     eddyViscosity
     <
-        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
     >
     (
         type,
@@ -90,7 +90,7 @@ bool Foam::RASModels::phasePressureModel::read()
     (
         eddyViscosity
         <
-            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
         >::read()
     )
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
index c7e9842f37..ab5e38effe 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ class phasePressureModel
 :
     public eddyViscosity
     <
-        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
     >
 {
     // Private data
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 99879c41d5..f07624c001 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
         RASModel<EddyDiffusivity<ThermalDiffusivity
         <
             PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        >>>
     >
     (
         type,
@@ -192,7 +192,7 @@ bool Foam::RASModels::kineticTheoryModel::read()
             RASModel<EddyDiffusivity<ThermalDiffusivity
             <
                 PhaseCompressibleTurbulenceModel<phaseModel>
-            > > >
+            >>>
         >::read()
     )
     {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index 9aadb83d12..91f58d3449 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ class kineticTheoryModel
         RASModel<EddyDiffusivity<ThermalDiffusivity
         <
             PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        >>>
     >
 {
     // Private data
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index 2eba4bdab7..47364ab10d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel
         RASModel<EddyDiffusivity<ThermalDiffusivity
         <
             PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        >>>
     >
     (
         type,
@@ -96,7 +96,7 @@ bool Foam::RASModels::phasePressureModel::read()
             RASModel<EddyDiffusivity<ThermalDiffusivity
             <
                 PhaseCompressibleTurbulenceModel<phaseModel>
-            > > >
+            >>>
         >::read()
     )
     {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
index 68734e5b4f..c148e3c40a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ class phasePressureModel
         RASModel<EddyDiffusivity<ThermalDiffusivity
         <
             PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        >>>
     >
 {
     // Private data
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
index 090ffd1bcc..1cac6d7176 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -251,7 +251,7 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
 
 template<class modelType>
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::BlendedInterfacialModel<modelType>::F() const
 {
     tmp<volScalarField> f1, f2;
@@ -266,7 +266,7 @@ Foam::BlendedInterfacialModel<modelType>::F() const
         f2 = blending_.f2(pair1In2_.dispersed(), pair2In1_.dispersed());
     }
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > x
+    tmp<GeometricField<Type, fvPatchField, volMesh>> x
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H
index e6493fa1cf..c53894f45c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ public:
 
         //- Return the blended force
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > F() const;
+        tmp<GeometricField<Type, fvPatchField, volMesh>> F() const;
 
         //- Return the face blended force
         tmp<surfaceScalarField> Ff() const;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H
index 3f91a8bd25..5fb0245513 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ class phaseModel
         autoPtr<diameterModel> dPtr_;
 
         //- Turbulence model
-        autoPtr<PhaseCompressibleTurbulenceModel<phaseModel> > turbulence_;
+        autoPtr<PhaseCompressibleTurbulenceModel<phaseModel>> turbulence_;
 
 
 public:
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
index 18928c7cc7..2355c0bf74 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,23 +97,23 @@ class twoPhaseSystem
         HashTable<autoPtr<blendingMethod>, word, word::hash> blendingMethods_;
 
         //- Drag model
-        autoPtr<BlendedInterfacialModel<dragModel> > drag_;
+        autoPtr<BlendedInterfacialModel<dragModel>> drag_;
 
         //- Virtual mass model
-        autoPtr<BlendedInterfacialModel<virtualMassModel> > virtualMass_;
+        autoPtr<BlendedInterfacialModel<virtualMassModel>> virtualMass_;
 
         //- Heat transfer model
-        autoPtr<BlendedInterfacialModel<heatTransferModel> > heatTransfer_;
+        autoPtr<BlendedInterfacialModel<heatTransferModel>> heatTransfer_;
 
         //- Lift model
-        autoPtr<BlendedInterfacialModel<liftModel> > lift_;
+        autoPtr<BlendedInterfacialModel<liftModel>> lift_;
 
         //- Wall lubrication model
-        autoPtr<BlendedInterfacialModel<wallLubricationModel> >
+        autoPtr<BlendedInterfacialModel<wallLubricationModel>>
             wallLubrication_;
 
         //- Wall lubrication model
-        autoPtr<BlendedInterfacialModel<turbulentDispersionModel> >
+        autoPtr<BlendedInterfacialModel<turbulentDispersionModel>>
             turbulentDispersion_;
 
 
diff --git a/applications/test/CompactListList/Test-CompactListList.C b/applications/test/CompactListList/Test-CompactListList.C
index 13a73cde7b..6d0a26676a 100644
--- a/applications/test/CompactListList/Test-CompactListList.C
+++ b/applications/test/CompactListList/Test-CompactListList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    List<List<label> > lll(5);
+    List<List<label>> lll(5);
     lll[0].setSize(3, 0);
     lll[1].setSize(2, 1);
     lll[2].setSize(6, 2);
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
     cll2(2, 3) = 999;
     Info<< "cll2(2, 3) = " << cll2(2, 3) << nl << endl;
 
-    Info<< "cll2 as List<List<label > > " << cll2()
+    Info<< "cll2 as List<List<label >> " << cll2()
         << endl;
 
     cll2.setSize(3);
diff --git a/applications/test/DynamicList/Test-DynamicList.C b/applications/test/DynamicList/Test-DynamicList.C
index 63f995d9a0..7b73a214c9 100644
--- a/applications/test/DynamicList/Test-DynamicList.C
+++ b/applications/test/DynamicList/Test-DynamicList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ void printInfo
 
 int main(int argc, char *argv[])
 {
-    List<DynamicList<label, 1, 0> > ldl(2);
+    List<DynamicList<label, 1, 0>> ldl(2);
 
     ldl[0](0) = 0;
     ldl[0](2) = 2;
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
     }
     Info<< endl;
 
-    List<List<label> > ll(2);
+    List<List<label>> ll(2);
     ll[0].transfer(ldl[0]);
     ll[1].transfer(ldl[1].shrink());
 
diff --git a/applications/test/HashTable2/Test-HashTable2.C b/applications/test/HashTable2/Test-HashTable2.C
index 79ff10de4c..0fb7b3a942 100644
--- a/applications/test/HashTable2/Test-HashTable2.C
+++ b/applications/test/HashTable2/Test-HashTable2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     Info<< "table1: " << table1 << nl
         << "toc: " << table1.toc() << endl;
 
-    HashTable<label, label, Hash<label> > table2(10);
+    HashTable<label, label, Hash<label>> table2(10);
 
     table2.insert(3, 10);
     table2.insert(5, 12);
diff --git a/applications/test/HashTable3/Test-HashTable3.C b/applications/test/HashTable3/Test-HashTable3.C
index 82e6ce3b9f..7184d30574 100644
--- a/applications/test/HashTable3/Test-HashTable3.C
+++ b/applications/test/HashTable3/Test-HashTable3.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,9 +48,9 @@ int main(int argc, char *argv[])
 
     // ie, a
     // Map<label> map(2 * nSize);
-    // HashTable<label, label, Hash<label> > map(2 * nSize);
-    // StaticHashTable<label, label, Hash<label> > map(2 * nSize);
-    HashTable<label, label, Hash<label> > map(2 * nSize);
+    // HashTable<label, label, Hash<label>> map(2 * nSize);
+    // StaticHashTable<label, label, Hash<label>> map(2 * nSize);
+    HashTable<label, label, Hash<label>> map(2 * nSize);
 
     Info<< "Constructed map of size: " << nSize
         << " (size " << map.size() << " capacity " << map.capacity() << ") "
diff --git a/applications/test/PackedList2/Test-PackedList2.C b/applications/test/PackedList2/Test-PackedList2.C
index 578a6103ad..2926118ff9 100644
--- a/applications/test/PackedList2/Test-PackedList2.C
+++ b/applications/test/PackedList2/Test-PackedList2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,8 +62,8 @@ int main(int argc, char *argv[])
 
     // fullStaticHash is really slow
     // give it lots of slots to help
-    StaticHashTable<nil, label, Hash<label> > emptyStaticHash;
-    StaticHashTable<nil, label, Hash<label> > fullStaticHash(100000);
+    StaticHashTable<nil, label, Hash<label>> emptyStaticHash;
+    StaticHashTable<nil, label, Hash<label>> fullStaticHash(100000);
     for (label i = 0; i < n; i++)
     {
         fullStaticHash.insert(i, nil());
diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C
index 21d5e27617..7807287900 100644
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/applications/test/PatchTools/Test-PatchTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ using namespace Foam;
 //
 //
 //    // Collect local pointFaces
-//    List<List<point> > pointFaceNormals(map.constructSize());
+//    List<List<point>> pointFaceNormals(map.constructSize());
 //    {
 //        const vectorField& faceAreas = mesh.faceAreas();
 //
diff --git a/applications/test/dataEntry/Test-DataEntry.C b/applications/test/dataEntry/Test-DataEntry.C
index 6223b2c6a7..cde0801610 100644
--- a/applications/test/dataEntry/Test-DataEntry.C
+++ b/applications/test/dataEntry/Test-DataEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
         )
     );
 
-    autoPtr<DataEntry<scalar> > dataEntry
+    autoPtr<DataEntry<scalar>> dataEntry
     (
         DataEntry<scalar>::New
         (
diff --git a/applications/test/extendedStencil/Test-ExtendedStencil.C b/applications/test/extendedStencil/Test-ExtendedStencil.C
index 8c01410fec..e0e343eed4 100644
--- a/applications/test/extendedStencil/Test-ExtendedStencil.C
+++ b/applications/test/extendedStencil/Test-ExtendedStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
 //        writeStencilStats(addressing.stencil());
 //
 //        // Collect stencil cell centres
-//        List<List<point> > stencilPoints(mesh.nFaces());
+//        List<List<point>> stencilPoints(mesh.nFaces());
 //        addressing.collectData
 //        (
 //            mesh.C(),
@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
 //        //// Do some interpolation.
 //        //{
 //        //    const labelListList& stencil = addressing.stencil();
-//        //    List<List<scalar> > stencilWeights(stencil.size());
+//        //    List<List<scalar>> stencilWeights(stencil.size());
 //        //    forAll(stencil, faceI)
 //        //    {
 //        //        const labelList& fStencil = stencil[faceI];
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
 //
 //
 //        // Collect stencil cell centres
-//        List<List<point> > stencilPoints(mesh.nFaces());
+//        List<List<point>> stencilPoints(mesh.nFaces());
 //        addressing.collectData
 //        (
 //            mesh.C(),
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
 //        //
 //        //
 //        //// Collect stencil cell centres
-//        //List<List<point> > stencilPoints(mesh.nFaces());
+//        //List<List<point>> stencilPoints(mesh.nFaces());
 //        //addressing.collectData
 //        //(
 //        //    mesh.C(),
@@ -295,7 +295,7 @@ int main(int argc, char *argv[])
 //        //
 //        //
 //        //// Collect stencil cell centres
-//        //List<List<point> > stencilPoints(mesh.nFaces());
+//        //List<List<point>> stencilPoints(mesh.nFaces());
 //        //addressing.collectData
 //        //(
 //        //    mesh.C(),
@@ -331,7 +331,7 @@ int main(int argc, char *argv[])
     //
     //    {
     //        // Collect stencil cell centres
-    //        List<List<point> > ownPoints(mesh.nFaces());
+    //        List<List<point>> ownPoints(mesh.nFaces());
     //        addressing.collectData
     //        (
     //            addressing.ownMap(),
@@ -352,7 +352,7 @@ int main(int argc, char *argv[])
     //    }
     //    {
     //        // Collect stencil cell centres
-    //        List<List<point> > neiPoints(mesh.nFaces());
+    //        List<List<point>> neiPoints(mesh.nFaces());
     //        addressing.collectData
     //        (
     //            addressing.neiMap(),
@@ -391,7 +391,7 @@ int main(int argc, char *argv[])
     //
     //    {
     //        // Collect stencil cell centres
-    //        List<List<point> > ownPoints(mesh.nFaces());
+    //        List<List<point>> ownPoints(mesh.nFaces());
     //        addressing.collectData
     //        (
     //            addressing.ownMap(),
@@ -412,7 +412,7 @@ int main(int argc, char *argv[])
     //    }
     //    {
     //        // Collect stencil cell centres
-    //        List<List<point> > neiPoints(mesh.nFaces());
+    //        List<List<point>> neiPoints(mesh.nFaces());
     //        addressing.collectData
     //        (
     //            addressing.neiMap(),
@@ -451,7 +451,7 @@ int main(int argc, char *argv[])
         writeStencilStats(addressing.stencil());
 
         // Collect stencil cell centres
-        List<List<point> > stencilPoints(mesh.nCells());
+        List<List<point>> stencilPoints(mesh.nCells());
         addressing.collectData
         (
             mesh.C(),
@@ -479,7 +479,7 @@ int main(int argc, char *argv[])
         writeStencilStats(addressing.stencil());
 
         // Collect stencil cell centres
-        List<List<point> > stencilPoints(mesh.nCells());
+        List<List<point>> stencilPoints(mesh.nCells());
         addressing.collectData
         (
             mesh.C(),
@@ -507,7 +507,7 @@ int main(int argc, char *argv[])
         writeStencilStats(addressing.stencil());
 
         // Collect stencil cell centres
-        List<List<point> > stencilPoints(mesh.nCells());
+        List<List<point>> stencilPoints(mesh.nCells());
         addressing.collectData
         (
             mesh.C(),
@@ -528,7 +528,7 @@ int main(int argc, char *argv[])
 
 //XXXXXX
 //    // Evaluate
-//    List<List<scalar> > stencilData(faceStencils.size());
+//    List<List<scalar>> stencilData(faceStencils.size());
 //    collectStencilData
 //    (
 //        distMap,
diff --git a/applications/test/extendedStencil/Test-ExtendedStencil2.C b/applications/test/extendedStencil/Test-ExtendedStencil2.C
index df23d30283..3c0228df85 100644
--- a/applications/test/extendedStencil/Test-ExtendedStencil2.C
+++ b/applications/test/extendedStencil/Test-ExtendedStencil2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
         CFCCellToCellStencil stencil(mesh);
 
         // Construct exchange map and renumber stencil
-        List<Map<label> > compactMap(Pstream::nProcs());
+        List<Map<label>> compactMap(Pstream::nProcs());
         mapDistribute map
         (
             stencil.globalNumbering(),
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
 
 
         // Collect the data in stencil form
-        List<List<vector> > stencilPoints;
+        List<List<vector>> stencilPoints;
         {
             const volVectorField& fld = mesh.C();
 
diff --git a/applications/test/parallel/Test-parallel.C b/applications/test/parallel/Test-parallel.C
index 5aeb0140bd..a2072eadd9 100644
--- a/applications/test/parallel/Test-parallel.C
+++ b/applications/test/parallel/Test-parallel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
         Random rndGen(43544*Pstream::myProcNo());
 
         // Generate random data.
-        List<Tuple2<label, List<scalar> > > complexData(100);
+        List<Tuple2<label, List<scalar>>> complexData(100);
         forAll(complexData, i)
         {
             complexData[i].first() = rndGen.integer(0, Pstream::nProcs()-1);
diff --git a/applications/test/regex/Test-regex.C b/applications/test/regex/Test-regex.C
index 9e74c36f24..35fa73a2cc 100644
--- a/applications/test/regex/Test-regex.C
+++ b/applications/test/regex/Test-regex.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    List<Tuple2<string, string> > rawList(IFstream("testRegexps")());
+    List<Tuple2<string, string>> rawList(IFstream("testRegexps")());
     Info<< "Test expressions:" << rawList << endl;
     IOobject::writeDivider(Info) << endl;
 
diff --git a/applications/test/thermoMixture/Test-thermoMixture.C b/applications/test/thermoMixture/Test-thermoMixture.C
index 1a2883cb0a..2a3ab1a0c8 100644
--- a/applications/test/thermoMixture/Test-thermoMixture.C
+++ b/applications/test/thermoMixture/Test-thermoMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
     <
         species::thermo
         <
-            hConstThermo<perfectGas<specie> >,
+            hConstThermo<perfectGas<specie>>,
             sensibleEnthalpy
         >
     > ThermoType;
diff --git a/applications/test/wordRe/Test-wordRe.C b/applications/test/wordRe/Test-wordRe.C
index 3c49affaae..e3fae58cc5 100644
--- a/applications/test/wordRe/Test-wordRe.C
+++ b/applications/test/wordRe/Test-wordRe.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
 
     IOobject::writeDivider(Info);
 
-    List<Tuple2<wordRe, string> > rawList(IFstream("testRegexps")());
+    List<Tuple2<wordRe, string>> rawList(IFstream("testRegexps")());
     Info<< "input list:" << rawList << endl;
     IOobject::writeDivider(Info) << endl;
 
diff --git a/applications/test/xfer/Test-xferList.C b/applications/test/xfer/Test-xferList.C
index ceddf0575d..77231e2118 100644
--- a/applications/test/xfer/Test-xferList.C
+++ b/applications/test/xfer/Test-xferList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,8 +55,8 @@ int main(int argc, char *argv[])
     Info<< "lstA: " << lstA << endl;
     Info<< "lstC: " << lstC << endl;
 
-    Xfer<List<label> > xA = xferMove(lstA);
-    Xfer<List<label> > xB;
+    Xfer<List<label>> xA = xferMove(lstA);
+    Xfer<List<label>> xB;
 
     List<label> lstB( xA );
 
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index e6df9ed9d4..ca1f9a4752 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ void subsetVolFields
     const label patchI,
     const Type& exposedValue,
     const word GeomVolType,
-    PtrList<GeometricField<Type, fvPatchField, volMesh> >& subFields
+    PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -201,7 +201,7 @@ void subsetSurfaceFields
     const label patchI,
     const Type& exposedValue,
     const word GeomSurfType,
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& subFields
+    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -580,10 +580,10 @@ int main(int argc, char *argv[])
     );
 
     // Per faceSet the patch to put the baffles into
-    const List<Pair<word> > setsAndPatches(dict.lookup("blockedFaces"));
+    const List<Pair<word>> setsAndPatches(dict.lookup("blockedFaces"));
 
     // Per faceSet the patch to put the coupled baffles into
-    DynamicList<FixedList<word, 3> > coupledAndPatches(10);
+    DynamicList<FixedList<word, 3>> coupledAndPatches(10);
     const dictionary& functionDicts = dict.subDict("coupledFaces");
     forAllConstIter(dictionary, functionDicts, iter)
     {
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index abd5eb45ad..766cd6a6e5 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -355,9 +355,9 @@ int main(int argc, char *argv[])
     );
 
     // Read all from the dictionary.
-    List<Pair<point> > pointsToMove(dict.lookup("pointsToMove"));
-    List<Pair<point> > edgesToSplit(dict.lookup("edgesToSplit"));
-    List<Pair<point> > facesToTriangulate
+    List<Pair<point>> pointsToMove(dict.lookup("pointsToMove"));
+    List<Pair<point>> edgesToSplit(dict.lookup("edgesToSplit"));
+    List<Pair<point>> facesToTriangulate
     (
         dict.lookup("facesToTriangulate")
     );
@@ -369,15 +369,15 @@ int main(int argc, char *argv[])
      || facesToTriangulate.size()
     );
 
-    List<Pair<point> > edgesToCollapse(dict.lookup("edgesToCollapse"));
+    List<Pair<point>> edgesToCollapse(dict.lookup("edgesToCollapse"));
 
     bool collapseEdge = edgesToCollapse.size();
 
-    List<Pair<point> > cellsToPyramidise(dict.lookup("cellsToSplit"));
+    List<Pair<point>> cellsToPyramidise(dict.lookup("cellsToSplit"));
 
     bool cellsToSplit = cellsToPyramidise.size();
 
-    // List<Tuple2<pointField,point> >
+    // List<Tuple2<pointField,point>>
     //     cellsToCreate(dict.lookup("cellsToCreate"));
 
     Info<< "Read from " << dict.name() << nl
@@ -442,7 +442,7 @@ int main(int argc, char *argv[])
 
 
     Info<< nl << "Looking up edges to split ..." << nl << endl;
-    Map<List<point> > edgeToCuts(edgesToSplit.size());
+    Map<List<point>> edgeToCuts(edgesToSplit.size());
     forAll(edgesToSplit, i)
     {
         const Pair<point>& pts = edgesToSplit[i];
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index b3af03b509..fee877a8bc 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
     SortableList<scalar> sortedVols(vols);
 
     // All cell labels, sorted per bin.
-    DynamicList<DynamicList<label> > bins;
+    DynamicList<DynamicList<label>> bins;
 
     // Lower/upper limits
     DynamicList<scalar> lowerLimits;
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index deda5581f8..83ffb09f39 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ void storeCellInZone
     const label cellI,
     const label cellType,
     Map<label>& typeToZone,
-    List<DynamicList<label> >& zoneCells
+    List<DynamicList<label>>& zoneCells
 )
 {
     if (cellType >= 0)
@@ -1022,7 +1022,7 @@ int main(int argc, char *argv[])
         // From foamCellType physical region to Foam cellZone
         Map<label> typeToZone;
         // Storage for cell zones.
-        List<DynamicList<label> > zoneCells(0);
+        List<DynamicList<label>> zoneCells(0);
 
         forAll(foamCellType, cellI)
         {
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index 8e2a1749a9..3555577fd7 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,8 +66,8 @@ SLList<label> slCellMap;
 SLList<label> slCellType;
 label maxCelli = 0;
 
-PtrList<SLList<label> > slPatchCells;
-PtrList<SLList<label> > slPatchCellFaces;
+PtrList<SLList<label>> slPatchCells;
+PtrList<SLList<label>> slPatchCellFaces;
 
 // Cell types
 Map<word> cellTypes;
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index a040ca4195..69b12d5080 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1578,7 +1578,7 @@ int main(int argc, char *argv[])
 
         // List of patch names and the cellZone(s) they border
         // this is just an info file to make MRF easier to setup
-        List<DynamicList<word> > boundaryZones
+        List<DynamicList<word>> boundaryZones
         (
             pShapeMesh.boundaryMesh().size()
         );
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 5ed5279c9c..5de646c441 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -211,7 +211,7 @@ void storeCellInZone
     Map<label>& physToZone,
 
     labelList& zoneToPhys,
-    List<DynamicList<label> >& zoneCells
+    List<DynamicList<label>>& zoneCells
 )
 {
     Map<label>::const_iterator zoneFnd = physToZone.find(regPhys);
@@ -415,10 +415,10 @@ void readCells
     cellShapeList& cells,
 
     labelList& patchToPhys,
-    List<DynamicList<face> >& patchFaces,
+    List<DynamicList<face>>& patchFaces,
 
     labelList& zoneToPhys,
-    List<DynamicList<label> >& zoneCells
+    List<DynamicList<label>>& zoneCells
 )
 {
     Info<< "Starting to read cells at line " << inFile.lineNumber() << endl;
@@ -791,12 +791,12 @@ int main(int argc, char *argv[])
     // Map from patch to gmsh physical region
     labelList patchToPhys;
     // Storage for patch faces.
-    List<DynamicList<face> > patchFaces(0);
+    List<DynamicList<face>> patchFaces(0);
 
     // Map from cellZone to gmsh physical region
     labelList zoneToPhys;
     // Storage for cell zones.
-    List<DynamicList<label> > zoneCells(0);
+    List<DynamicList<label>> zoneCells(0);
 
     // Name per physical region
     Map<word> physicalNames;
@@ -934,7 +934,7 @@ int main(int argc, char *argv[])
     const polyPatch& pp = mesh.boundaryMesh().last();
 
     // Storage for faceZones.
-    List<DynamicList<label> > zoneFaces(patchFaces.size());
+    List<DynamicList<label>> zoneFaces(patchFaces.size());
 
 
     // Go through all the patchFaces and find corresponding face in pp.
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 2d80394ea4..7a94b27299 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -849,7 +849,7 @@ int main(int argc, char *argv[])
     HashTable<label, label> faceToCell[2];
 
     {
-        HashTable<label, face, Hash<face> > faceToFaceID(boundaryFaces.size());
+        HashTable<label, face, Hash<face>> faceToFaceID(boundaryFaces.size());
         forAll(boundaryFaces, faceI)
         {
             SortableList<label> sortedVerts(boundaryFaces[faceI]);
@@ -862,7 +862,7 @@ int main(int argc, char *argv[])
             forAll(faces, i)
             {
                 SortableList<label> sortedVerts(faces[i]);
-                HashTable<label, face, Hash<face> >::const_iterator fnd =
+                HashTable<label, face, Hash<face>>::const_iterator fnd =
                     faceToFaceID.find(face(sortedVerts));
 
                 if (fnd != faceToFaceID.end())
@@ -956,7 +956,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        List<DynamicList<face> > dynPatchFaces(dofVertIndices.size());
+        List<DynamicList<face>> dynPatchFaces(dofVertIndices.size());
 
         forAll(cellVerts, cellI)
         {
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index a8ffe7b6b6..adbd36b657 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -232,7 +232,7 @@ const char* kivaPatchNames[nBCs] =
 };
 
 
-List<SLList<face> > pFaces[nBCs];
+List<SLList<face>> pFaces[nBCs];
 
 face quadFace(4);
 face triFace(3);
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 065e36119b..e004220723 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
     label maxPatch = 0;
 
     // Boundary faces as three vertices
-    HashTable<label, triFace, Hash<triFace> > vertsToBoundary(nFaces);
+    HashTable<label, triFace, Hash<triFace>> vertsToBoundary(nFaces);
 
     forAll(boundaryFaces, faceI)
     {
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
 
             // Is there any boundary face with same vertices?
             // (uses commutative hash)
-            HashTable<label, triFace, Hash<triFace> >::iterator iter =
+            HashTable<label, triFace, Hash<triFace>>::iterator iter =
                 vertsToBoundary.find(triFace(f[0], f[1], f[2]));
 
             if (iter != vertsToBoundary.end())
@@ -266,7 +266,7 @@ int main(int argc, char *argv[])
 
     {
         // Sort boundaryFaces by patch.
-        List<DynamicList<face> > allPatchFaces(nPatches);
+        List<DynamicList<face>> allPatchFaces(nPatches);
 
         forAll(boundaryPatch, faceI)
         {
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
index 9f35fcb89b..4f91fcd5ef 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,9 +51,9 @@ void Foam::starMesh::createCoupleMatches()
     );
 
     // Store newly created faces for each cell
-    Map<SLList<face> > cellAddedFaces(cellMapSize);
+    Map<SLList<face>> cellAddedFaces(cellMapSize);
 
-    Map<SLList<label> > cellRemovedFaces(cellMapSize);
+    Map<SLList<label>> cellRemovedFaces(cellMapSize);
 
     // In order to remove often allocation, remember the number of live points.
     // If you run out of space in point creation, increase it by the number of
@@ -115,7 +115,7 @@ void Foam::starMesh::createCoupleMatches()
         {
             // Master face is replaced by a set of slave faces
 
-            Map<SLList<label> >::iterator crfIter =
+            Map<SLList<label>>::iterator crfIter =
                 cellRemovedFaces.find(fp.masterCell());
 
             if (crfIter == cellRemovedFaces.end())
@@ -131,7 +131,7 @@ void Foam::starMesh::createCoupleMatches()
                 crfIter().append(fp.masterFace());
             }
 
-            Map<SLList<face> >::iterator cafIter =
+            Map<SLList<face>>::iterator cafIter =
                 cellAddedFaces.find(fp.masterCell());
             if (cafIter == cellAddedFaces.end())
             {
@@ -155,11 +155,11 @@ void Foam::starMesh::createCoupleMatches()
 
             // Master data
             edgeList masterEdges = masterFace.edges();
-            List<SLList<label> > masterEdgePoints(masterEdges.size());
+            List<SLList<label>> masterEdgePoints(masterEdges.size());
 
             // Slave data
             edgeList slaveEdges = slaveFace.edges();
-            List<SLList<label> > slaveEdgePoints(slaveEdges.size());
+            List<SLList<label>> slaveEdgePoints(slaveEdges.size());
 
             // Find common plane
             vector n = masterFace.normal(points_);
@@ -1354,7 +1354,7 @@ void Foam::starMesh::createCoupleMatches()
             // Add the new face to both master and slave
 
             // Master face is replaced by a set of slave faces
-            Map<SLList<label> >::iterator crfMasterIter =
+            Map<SLList<label>>::iterator crfMasterIter =
                 cellRemovedFaces.find(fp.masterCell());
 
             if (crfMasterIter == cellRemovedFaces.end())
@@ -1370,7 +1370,7 @@ void Foam::starMesh::createCoupleMatches()
                 crfMasterIter().append(fp.masterFace());
             }
 
-            Map<SLList<label> >::iterator crfSlaveIter =
+            Map<SLList<label>>::iterator crfSlaveIter =
                 cellRemovedFaces.find(fp.slaveCell());
 
             if (crfSlaveIter == cellRemovedFaces.end())
@@ -1386,7 +1386,7 @@ void Foam::starMesh::createCoupleMatches()
                 crfSlaveIter().append(fp.slaveFace());
             }
 
-            Map<SLList<face> >::iterator cafMasterIter =
+            Map<SLList<face>>::iterator cafMasterIter =
                 cellAddedFaces.find(fp.masterCell());
             if (cafMasterIter == cellAddedFaces.end())
             {
@@ -1401,7 +1401,7 @@ void Foam::starMesh::createCoupleMatches()
                 cafMasterIter().append(intersectedFace);
             }
 
-            Map<SLList<face> >::iterator cafSlaveIter =
+            Map<SLList<face>>::iterator cafSlaveIter =
                 cellAddedFaces.find(fp.slaveCell());
             if (cafSlaveIter == cellAddedFaces.end())
             {
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 2a4de9c57b..b7bcf072ad 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -498,7 +498,7 @@ int main(int argc, char *argv[])
 
 
         // Sort boundaryFaces by patch using boundaryPatch.
-        List<DynamicList<face> > allPatchFaces(nPatches);
+        List<DynamicList<face>> allPatchFaces(nPatches);
 
         forAll(boundaryPatch, faceI)
         {
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 6e050b39dd..628c2b920b 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -228,7 +228,7 @@ int main(int argc, char *argv[])
     // Read in a list of dictionaries for the merge patch pairs
     if (meshDict.found("mergePatchPairs"))
     {
-        List<Pair<word> > mergePatchPairs
+        List<Pair<word>> mergePatchPairs
         (
             meshDict.lookup("mergePatchPairs")
         );
@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
         HashTable<label> zoneMap(nZones);
 
         // Cells per zone.
-        List<DynamicList<label> > zoneCells(nZones);
+        List<DynamicList<label>> zoneCells(nZones);
 
         // Running cell counter
         label cellI = 0;
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index ff0837e690..9d3bed8499 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1927,7 +1927,7 @@ int main(int argc, char *argv[])
             extrudeMeshEdges
         )
     );
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     const mapDistribute extrudeEdgeFacesMap
     (
         globalExtrudeFaces,
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index 363a60653e..a6916b7076 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
     // Point generator
     autoPtr<extrudeModel> model(extrudeModel::New(extrude2DMeshDict));
 
-    autoPtr<MeshedSurface<face> > fMesh;
+    autoPtr<MeshedSurface<face>> fMesh;
 
     autoPtr<polyMesh> mesh;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
index cde380cdd5..779b682649 100644
--- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
+++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,13 +55,13 @@ using namespace Foam;
 // Main program:
 
 template<class Triangulation, class Type>
-Foam::tmp<Foam::Field<Type> > filterFarPoints
+Foam::tmp<Foam::Field<Type>> filterFarPoints
 (
     const Triangulation& mesh,
     const Field<Type>& field
 )
 {
-    tmp<Field<Type> > tNewField(new Field<Type>(field.size()));
+    tmp<Field<Type>> tNewField(new Field<Type>(field.size()));
     Field<Type>& newField = tNewField();
 
     label added = 0;
@@ -139,7 +139,7 @@ autoPtr<mapDistribute> buildMap
         pointPoints[vit->index()].transfer(indices);
     }
 
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
 
     return autoPtr<mapDistribute>
     (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
index 92af158c19..865b3108fe 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,8 +154,8 @@ private:
             faceList& faces,
             labelList& owner,
             PtrList<dictionary>& patchDicts,
-            const List<DynamicList<face> >& patchFaces,
-            const List<DynamicList<label> >& patchOwners
+            const List<DynamicList<face>>& patchFaces,
+            const List<DynamicList<label>>& patchOwners
         ) const;
 
         //- Disallow default bitwise copy construct
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index a2865609ac..3f916f9ba5 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,8 +84,8 @@ void Foam::DelaunayMesh<Triangulation>::addPatches
     faceList& faces,
     labelList& owner,
     PtrList<dictionary>& patchDicts,
-    const List<DynamicList<face> >& patchFaces,
-    const List<DynamicList<label> >& patchOwners
+    const List<DynamicList<face>>& patchFaces,
+    const List<DynamicList<label>>& patchOwners
 ) const
 {
     label nPatches = patchFaces.size();
@@ -353,8 +353,8 @@ Foam::DelaunayMesh<Triangulation>::createMesh
     PtrList<dictionary> patchDicts(1);
     patchDicts.set(0, new dictionary());
 
-    List<DynamicList<face> > patchFaces(1, DynamicList<face>());
-    List<DynamicList<label> > patchOwners(1, DynamicList<label>());
+    List<DynamicList<face>> patchFaces(1, DynamicList<face>());
+    List<DynamicList<label>> patchOwners(1, DynamicList<label>());
 
     vertexMap.resize(vertexCount());
     cellMap.setSize(Triangulation::number_of_finite_cells(), -1);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
index c040300dd3..2c59cf6fde 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
 
 private:
 
-        autoPtr<List<boundBox> > allBackgroundMeshBounds_;
+        autoPtr<List<boundBox>> allBackgroundMeshBounds_;
 
 
     // Private Member Functions
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 01d69a2376..a21e6cecfc 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1219,7 +1219,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
 
 
 
-Foam::List<Foam::List<Foam::pointIndexHit> >
+Foam::List<Foam::List<Foam::pointIndexHit>>
 Foam::backgroundMeshDecomposition::intersectsProcessors
 (
     const List<point>& starts,
@@ -1295,7 +1295,7 @@ Foam::backgroundMeshDecomposition::intersectsProcessors
         segmentIntersectsCandidate
     );
 
-    List<List<pointIndexHit> > segmentHitProcs(starts.size());
+    List<List<pointIndexHit>> segmentHitProcs(starts.size());
 
     // Working storage for assessing processors
     DynamicList<pointIndexHit> tmpProcHits;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index 63bb4fba0e..60701acbb8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ class backgroundMeshDecomposition
         autoPtr<bPatch> boundaryFacesPtr_;
 
         //- Search tree for the boundaryFaces_ patch
-        autoPtr<indexedOctree<treeDataBPatch> > bFTreePtr_;
+        autoPtr<indexedOctree<treeDataBPatch>> bFTreePtr_;
 
         //- The bounds of all background meshes on all processors
         treeBoundBoxList allBackgroundMeshBounds_;
@@ -275,7 +275,7 @@ public:
         //  launched from, it is assumed that the point is on that processor.
         //  The index data member of the pointIndexHit is replaced with the
         //  processor index.
-        List<List<pointIndexHit> > intersectsProcessors
+        List<List<pointIndexHit>> intersectsProcessors
         (
             const List<point>& starts,
             const List<point>& ends,
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
index 97fb37191a..456f6be9c5 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,13 +28,13 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Triangulation, class Type>
-Foam::tmp<Foam::Field<Type> > Foam::smoothAlignmentSolver::filterFarPoints
+Foam::tmp<Foam::Field<Type>> Foam::smoothAlignmentSolver::filterFarPoints
 (
     const Triangulation& mesh,
     const Field<Type>& field
 )
 {
-    tmp<Field<Type> > tNewField(new Field<Type>(field.size()));
+    tmp<Field<Type>> tNewField(new Field<Type>(field.size()));
     Field<Type>& newField = tNewField();
 
     label added = 0;
@@ -92,7 +92,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
 
     indices.transfer(dynIndices);
 
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     return autoPtr<mapDistribute>
     (
         new mapDistribute
@@ -156,7 +156,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildMap
         pointPoints[vit->index()].transfer(indices);
     }
 
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     return autoPtr<mapDistribute>
     (
         new mapDistribute
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
index c3b0341a4b..19cc6ea665 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ class smoothAlignmentSolver
     // Private Member Functions
 
         template<class Triangulation, class Type>
-        tmp<Field<Type> > filterFarPoints
+        tmp<Field<Type>> filterFarPoints
         (
             const Triangulation& mesh,
             const Field<Type>& field
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index f6d44489b7..818bf6a8c2 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
     typedef Delaunay::Facet            Facet;
     typedef Delaunay::Point            Point;
 
-    typedef List<DynamicList<Pair<labelPair> > > labelPairPairDynListList;
+    typedef List<DynamicList<Pair<labelPair>>> labelPairPairDynListList;
 
     typedef Tuple2<pointIndexHit, label>         pointIndexHitAndFeature;
     typedef List<pointIndexHitAndFeature>        pointIndexHitAndFeatureList;
@@ -170,13 +170,13 @@ private:
         featurePointConformer ftPtConformer_;
 
         //- Search tree for edge point locations
-        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint> >
+        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint>>
             edgeLocationTreePtr_;
 
         mutable DynamicList<Foam::point> existingEdgeLocations_;
 
         //- Search tree for surface point locations
-        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint> >
+        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint>>
             surfacePtLocationTreePtr_;
 
         mutable DynamicList<Foam::point> existingSurfacePtLocations_;
@@ -710,7 +710,7 @@ private:
         (
             labelList& owner,
             labelList& neighbour,
-            const HashSet<labelPair, labelPair::Hash<> >& deferredCollapseFaces
+            const HashSet<labelPair, labelPair::Hash<>>& deferredCollapseFaces
         ) const;
 
         //- Check whether the cell sizes are fine enough. Creates a polyMesh.
@@ -783,9 +783,9 @@ private:
         //  on both processors
         void sortProcPatches
         (
-            List<DynamicList<face> >& patchFaces,
-            List<DynamicList<label> >& patchOwners,
-            List<DynamicList<label> >& patchPointPairSlaves,
+            List<DynamicList<face>>& patchFaces,
+            List<DynamicList<label>>& patchOwners,
+            List<DynamicList<label>>& patchPointPairSlaves,
             labelPairPairDynListList& patchSortingIndices
         ) const;
 
@@ -797,9 +797,9 @@ private:
             labelList& owner,
             PtrList<dictionary>& patchDicts,
             PackedBoolList& boundaryFacesToRemove,
-            const List<DynamicList<face> >& patchFaces,
-            const List<DynamicList<label> >& patchOwners,
-            const List<DynamicList<bool> >& indirectPatchFace
+            const List<DynamicList<face>>& patchFaces,
+            const List<DynamicList<label>>& patchOwners,
+            const List<DynamicList<bool>>& indirectPatchFace
         ) const;
 
         //- Remove points that are no longer used by any faces
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 2e351cf81a..22554a57df 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -160,9 +160,9 @@ void Foam::conformalVoronoiMesh::calcTetMesh
 
     label nPatches = patchNames.size();
 
-    List<DynamicList<face> > patchFaces(nPatches, DynamicList<face>(0));
+    List<DynamicList<face>> patchFaces(nPatches, DynamicList<face>(0));
 
-    List<DynamicList<label> > patchOwners(nPatches, DynamicList<label>(0));
+    List<DynamicList<label>> patchOwners(nPatches, DynamicList<label>(0));
 
     faces.setSize(number_of_finite_facets());
 
@@ -278,7 +278,7 @@ void Foam::conformalVoronoiMesh::calcTetMesh
     sortFaces(faces, owner, neighbour);
 
 //    PackedBoolList boundaryFacesToRemove;
-//    List<DynamicList<bool> > indirectPatchFace;
+//    List<DynamicList<bool>> indirectPatchFace;
 //
 //    addPatches
 //    (
@@ -673,7 +673,7 @@ void Foam::conformalVoronoiMesh::deferredCollapseFaceSet
 (
     labelList& owner,
     labelList& neighbour,
-    const HashSet<labelPair, labelPair::Hash<> >& deferredCollapseFaces
+    const HashSet<labelPair, labelPair::Hash<>>& deferredCollapseFaces
 ) const
 {
     DynamicList<label> faceLabels;
@@ -1750,12 +1750,12 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
         }
     }
 
-    List<DynamicList<face> > patchFaces(nPatches, DynamicList<face>(0));
-    List<DynamicList<label> > patchOwners(nPatches, DynamicList<label>(0));
+    List<DynamicList<face>> patchFaces(nPatches, DynamicList<face>(0));
+    List<DynamicList<label>> patchOwners(nPatches, DynamicList<label>(0));
     // Per patch face the index of the slave node of the point pair
-    List<DynamicList<label> > patchPPSlaves(nPatches, DynamicList<label>(0));
+    List<DynamicList<label>> patchPPSlaves(nPatches, DynamicList<label>(0));
 
-    List<DynamicList<bool> > indirectPatchFace(nPatches, DynamicList<bool>(0));
+    List<DynamicList<bool>> indirectPatchFace(nPatches, DynamicList<bool>(0));
 
 
     faces.setSize(number_of_finite_edges());
@@ -2134,7 +2134,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                             // Use this processor's vertex index as the master
                             // for sorting
 
-                            DynamicList<Pair<labelPair> >& sortingIndex =
+                            DynamicList<Pair<labelPair>>& sortingIndex =
                                 procPatchSortingIndex[patchIndex];
 
                             if (vB->internalOrBoundaryPoint() && vB->referred())
@@ -2165,7 +2165,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                             // Use the other processor's vertex index as the
                             // master for sorting
 
-                            DynamicList<Pair<labelPair> >& sortingIndex =
+                            DynamicList<Pair<labelPair>>& sortingIndex =
                                 procPatchSortingIndex[patchIndex];
 
                             if (vA->internalOrBoundaryPoint() && vA->referred())
@@ -2450,9 +2450,9 @@ void Foam::conformalVoronoiMesh::sortFaces
 
 void Foam::conformalVoronoiMesh::sortProcPatches
 (
-    List<DynamicList<face> >& patchFaces,
-    List<DynamicList<label> >& patchOwners,
-    List<DynamicList<label> >& patchPointPairSlaves,
+    List<DynamicList<face>>& patchFaces,
+    List<DynamicList<label>>& patchOwners,
+    List<DynamicList<label>>& patchPointPairSlaves,
     labelPairPairDynListList& patchSortingIndices
 ) const
 {
@@ -2466,7 +2466,7 @@ void Foam::conformalVoronoiMesh::sortProcPatches
         faceList& faces = patchFaces[patchI];
         labelList& owner = patchOwners[patchI];
         DynamicList<label>& slaves = patchPointPairSlaves[patchI];
-        DynamicList<Pair<labelPair> >& sortingIndices
+        DynamicList<Pair<labelPair>>& sortingIndices
             = patchSortingIndices[patchI];
 
         if (!sortingIndices.empty())
@@ -2511,9 +2511,9 @@ void Foam::conformalVoronoiMesh::addPatches
     labelList& owner,
     PtrList<dictionary>& patchDicts,
     PackedBoolList& boundaryFacesToRemove,
-    const List<DynamicList<face> >& patchFaces,
-    const List<DynamicList<label> >& patchOwners,
-    const List<DynamicList<bool> >& indirectPatchFace
+    const List<DynamicList<face>>& patchFaces,
+    const List<DynamicList<label>>& patchOwners,
+    const List<DynamicList<bool>>& indirectPatchFace
 ) const
 {
     label nBoundaryFaces = 0;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index fdc4ef4354..638ae6a51b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -2066,7 +2066,7 @@ void Foam::conformalVoronoiMesh::addSurfaceAndEdgeHits
             keepSurfacePoint = false;
         }
 
-        List<List<pointIndexHit> > edHitsByFeature;
+        List<List<pointIndexHit>> edHitsByFeature;
 
         labelList featuresHit;
 
@@ -2295,7 +2295,7 @@ void Foam::conformalVoronoiMesh::reinsertSurfaceConformation()
         }
     }
 
-    inplaceSubset<PackedBoolList, List<Vb> >
+    inplaceSubset<PackedBoolList, List<Vb>>
     (
         selectedElems,
         surfaceConformationVertices_
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
index 99a35e1957..0e07acfebd 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,12 +118,12 @@ void Foam::featurePointConformer::addMasterAndSlavePoints
 (
     const DynamicList<Foam::point>& masterPoints,
     const DynamicList<Foam::indexedVertexEnum::vertexType>& masterPointsTypes,
-    const Map<DynamicList<autoPtr<plane> > >& masterPointReflections,
+    const Map<DynamicList<autoPtr<plane>>>& masterPointReflections,
     DynamicList<Vb>& pts,
     const label ptI
 ) const
 {
-    typedef DynamicList<autoPtr<plane> >        planeDynList;
+    typedef DynamicList<autoPtr<plane>>        planeDynList;
     typedef Foam::indexedVertexEnum::vertexType vertexType;
 
     forAll(masterPoints, pI)
@@ -199,7 +199,7 @@ void Foam::featurePointConformer::createMasterAndSlavePoints
     DynamicList<Vb>& pts
 ) const
 {
-    typedef DynamicList<autoPtr<plane> >          planeDynList;
+    typedef DynamicList<autoPtr<plane>>          planeDynList;
     typedef indexedVertexEnum::vertexType         vertexType;
     typedef extendedFeatureEdgeMesh::edgeStatus   edgeStatus;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
index 5c5a69afea..21cdc53e31 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ class featurePointConformer
         (
             const DynamicList<point>& masterPoints,
             const DynamicList<indexedVertexEnum::vertexType>& masterPointsTypes,
-            const Map<DynamicList<autoPtr<plane> > >& masterPointReflections,
+            const Map<DynamicList<autoPtr<plane>>>& masterPointReflections,
             DynamicList<Vb>& pts,
             const label ptI
         ) const;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
index 8274132e5c..601bba3f8e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ template<class Gt, class Cb>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<CGAL::indexedCell<Gt, Cb> >& p
+    const InfoProxy<CGAL::indexedCell<Gt, Cb>>& p
 )
 {
     const CGAL::indexedCell<Gt, Cb>& iv = p.t_;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
index a2eeb21c99..f3b964b3f3 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ class Ostream;
 template<class Gt, class Cb> Ostream& operator<<
 (
     Ostream&,
-    const Foam::InfoProxy<CGAL::indexedCell<Gt, Cb> >&
+    const Foam::InfoProxy<CGAL::indexedCell<Gt, Cb>>&
 );
 }
 
@@ -243,7 +243,7 @@ public:
 
         //- Return info proxy.
         //  Used to print indexedCell information to a stream
-        Foam::InfoProxy<indexedCell<Gt, Cb> > info() const
+        Foam::InfoProxy<indexedCell<Gt, Cb>> info() const
         {
             return *this;
         }
@@ -251,7 +251,7 @@ public:
         friend Foam::Ostream& Foam::operator<< <Gt, Cb>
         (
             Foam::Ostream&,
-            const Foam::InfoProxy<indexedCell<Gt, Cb> >&
+            const Foam::InfoProxy<indexedCell<Gt, Cb>>&
         );
 
 };
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
index ad130e5381..13a137f694 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,7 +155,7 @@ template<class Gt, class Vb>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<CGAL::indexedVertex<Gt, Vb> >& p
+    const InfoProxy<CGAL::indexedVertex<Gt, Vb>>& p
 )
 {
     const CGAL::indexedVertex<Gt, Vb>& iv = p.t_;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
index e4b012e668..32ed1d2447 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ class Istream;
 template<class Gt, class Vb> Ostream& operator<<
 (
     Ostream&,
-    const Foam::InfoProxy<CGAL::indexedVertex<Gt, Vb> >&
+    const Foam::InfoProxy<CGAL::indexedVertex<Gt, Vb>>&
 );
 
 template<class Gt, class Vb> Ostream& operator<<
@@ -98,7 +98,7 @@ namespace CGAL
                        Class indexedVertex Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Gt, class Vb = CGAL::Triangulation_vertex_base_3<Gt> >
+template<class Gt, class Vb = CGAL::Triangulation_vertex_base_3<Gt>>
 class indexedVertex
 :
     public Foam::indexedVertexEnum,
@@ -294,7 +294,7 @@ public:
 
         //- Return info proxy.
         //  Used to print indexedVertex information to a stream
-        Foam::InfoProxy<indexedVertex<Gt, Vb> > info() const
+        Foam::InfoProxy<indexedVertex<Gt, Vb>> info() const
         {
             return *this;
         }
@@ -302,7 +302,7 @@ public:
         friend Foam::Ostream& Foam::operator<< <Gt, Vb>
         (
             Foam::Ostream&,
-            const Foam::InfoProxy<indexedVertex<Gt, Vb> >&
+            const Foam::InfoProxy<indexedVertex<Gt, Vb>>&
         );
 
         friend Foam::Ostream& Foam::operator<< <Gt, Vb>
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
index fe799a31a3..509a8f7a7f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ namespace Foam
 
     //- Specialisation for indexedVertex.
     template<>
-    inline pointFromPoint topoint<CGAL::indexedVertex<K> >
+    inline pointFromPoint topoint<CGAL::indexedVertex<K>>
     (
         const CGAL::indexedVertex<K>& P
     )
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index 464dd646ba..f79c96654d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -327,9 +327,9 @@ Foam::conformationSurfaces::conformationSurfaces
     regionOffset_.setSize(surfI, 0);
 
     PtrList<dictionary> globalPatchInfo(surfI);
-    List<Map<autoPtr<dictionary> > > regionPatchInfo(surfI);
+    List<Map<autoPtr<dictionary>>> regionPatchInfo(surfI);
     List<sideVolumeType> globalVolumeTypes(surfI);
-    List<Map<sideVolumeType> > regionVolumeTypes(surfI);
+    List<Map<sideVolumeType>> regionVolumeTypes(surfI);
 
     HashSet<word> unmatchedKeys(surfacesDict.toc());
 
@@ -514,8 +514,8 @@ Foam::conformationSurfaces::conformationSurfaces
                 regionVolumeTypes[surfI][iter.key()];
         }
 
-        const Map<autoPtr<dictionary> >& localInfo = regionPatchInfo[surfI];
-        forAllConstIter(Map<autoPtr<dictionary> >, localInfo, iter)
+        const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfI];
+        forAllConstIter(Map<autoPtr<dictionary>>, localInfo, iter)
         {
             label globalRegionI = regionOffset_[surfI] + iter.key();
 
@@ -659,7 +659,7 @@ Foam::Field<bool> Foam::conformationSurfaces::wellInOutSide
     const bool testForInside
 ) const
 {
-    List<List<volumeType> > surfaceVolumeTests
+    List<List<volumeType>> surfaceVolumeTests
     (
         surfaces_.size(),
         List<volumeType>
@@ -896,7 +896,7 @@ void Foam::conformationSurfaces::findSurfaceAllIntersections
 ) const
 {
     labelListList hitSurfaces;
-    List<List<pointIndexHit> > hitInfo;
+    List<List<pointIndexHit>> hitInfo;
 
     searchableSurfacesQueries::findAllIntersections
     (
@@ -1173,7 +1173,7 @@ void Foam::conformationSurfaces::findAllNearestEdges
 (
     const point& sample,
     const scalar searchRadiusSqr,
-    List<List<pointIndexHit> >& edgeHitsByFeature,
+    List<List<pointIndexHit>>& edgeHitsByFeature,
     List<label>& featuresHit
 ) const
 {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
index 1d41a40d1d..09c351bd0a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -335,7 +335,7 @@ public:
             (
                 const point& sample,
                 const scalar searchRadiusSqr,
-                List<List<pointIndexHit> >& edgeHitsByFeature,
+                List<List<pointIndexHit>>& edgeHitsByFeature,
                 List<label>& featuresHit
             ) const;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
index 6e68f1c80e..b8e5363002 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011-2015 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
         (
             100.0,      // max size ratio
             1e-9,       // intersection tolerance
-            autoPtr<writer<scalar> >(new vtkSetWriter<scalar>()),
+            autoPtr<writer<scalar>>(new vtkSetWriter<scalar>()),
             0.01,       // min triangle quality
             true
         );
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
index 515dc5e032..bffad658bb 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2012-2015 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2012-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -229,7 +229,7 @@ public:
             //    start[i] = points[edges[i][0]];
             //    end[i] = points[edges[i][1]];
             //}
-            //Foam::List<Foam::List<pointIndexHit> > hitInfo;
+            //Foam::List<Foam::List<pointIndexHit>> hitInfo;
             //labelListList hitSurfaces;
             //searchableSurfacesQueries::findAllIntersections
             //(
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
index 571273d1fd..07dc30ea42 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ namespace CGAL
                        Class indexedFace Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Gt, class Fb=CGAL::Triangulation_face_base_2<Gt> >
+template<class Gt, class Fb=CGAL::Triangulation_face_base_2<Gt>>
 class indexedFace
 :
     public Fb
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
index 8301384715..3c100372df 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ bool outsideTriangle
                        Class indexedVertex Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Gt, class Vb=CGAL::Triangulation_vertex_base_2<Gt> >
+template<class Gt, class Vb=CGAL::Triangulation_vertex_base_2<Gt>>
 class indexedVertex
 :
     public Vb
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
index 9220ca7bed..91da90bf77 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ void Foam::shortEdgeFilter2D::addRegion
 
 void Foam::shortEdgeFilter2D::assignBoundaryPointRegions
 (
-    List<DynamicList<label> >& boundaryPointRegions
+    List<DynamicList<label>>& boundaryPointRegions
 ) const
 {
     forAllConstIter(EdgeMap<label>, mapEdgesRegion_, iter)
@@ -72,7 +72,7 @@ void Foam::shortEdgeFilter2D::assignBoundaryPointRegions
 void Foam::shortEdgeFilter2D::updateEdgeRegionMap
 (
     const MeshedSurface<face>& surfMesh,
-    const List<DynamicList<label> >& boundaryPtRegions,
+    const List<DynamicList<label>>& boundaryPtRegions,
     const labelList& surfPtToBoundaryPt,
     EdgeMap<label>& mapEdgesRegion,
     labelList& patchSizes
@@ -250,7 +250,7 @@ Foam::shortEdgeFilter2D::filter()
 
     // Check if the point is a boundary point. Flag if it is so that
     // it will not be deleted.
-    List<DynamicList<label> > boundaryPointRegions
+    List<DynamicList<label>> boundaryPointRegions
     (
         points.size(),
         DynamicList<label>()
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H
index 433b22f95d..66f055a377 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,13 +78,13 @@ class shortEdgeFilter2D
 
         void assignBoundaryPointRegions
         (
-            List<DynamicList<label> >& boundaryPointRegions
+            List<DynamicList<label>>& boundaryPointRegions
         ) const;
 
         void updateEdgeRegionMap
         (
             const MeshedSurface<face>& surfMesh,
-            const List<DynamicList<label> >& boundaryPtRegions,
+            const List<DynamicList<label>>& boundaryPtRegions,
             const labelList& surfPtToBoundaryPt,
             EdgeMap<label>& mapEdgesRegion,
             labelList& patchSizes
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 9c32811369..edd87561fd 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,11 +106,11 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
     labelList globalMaxLevel(surfI, 0);
     labelList globalLevelIncr(surfI, 0);
     PtrList<dictionary> globalPatchInfo(surfI);
-    List<Map<label> > regionMinLevel(surfI);
-    List<Map<label> > regionMaxLevel(surfI);
-    List<Map<label> > regionLevelIncr(surfI);
-    List<Map<scalar> > regionAngle(surfI);
-    List<Map<autoPtr<dictionary> > > regionPatchInfo(surfI);
+    List<Map<label>> regionMinLevel(surfI);
+    List<Map<label>> regionMaxLevel(surfI);
+    List<Map<label>> regionLevelIncr(surfI);
+    List<Map<scalar>> regionAngle(surfI);
+    List<Map<autoPtr<dictionary>>> regionPatchInfo(surfI);
 
     HashSet<word> unmatchedKeys(surfacesDict.toc());
 
@@ -300,8 +300,8 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
               + regionLevelIncr[surfI][iter.key()];
         }
 
-        const Map<autoPtr<dictionary> >& localInfo = regionPatchInfo[surfI];
-        forAllConstIter(Map<autoPtr<dictionary> >, localInfo, iter)
+        const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfI];
+        forAllConstIter(Map<autoPtr<dictionary>>, localInfo, iter)
         {
             label globalRegionI = regionOffset[surfI] + iter.key();
             patchInfo.set(globalRegionI, iter()().clone());
@@ -684,7 +684,7 @@ int main(int argc, char *argv[])
 //                    runTime,
 //                    IOobject::NO_READ
 //                ),
-//                xferMove<Field<vector> >(bb.points()()),
+//                xferMove<Field<vector>>(bb.points()()),
 //                faces.xfer(),
 //                owner.xfer(),
 //                neighbour.xfer()
@@ -1045,7 +1045,7 @@ int main(int argc, char *argv[])
         (
             100.0,      // max size ratio
             1e-9,       // intersection tolerance
-            autoPtr<writer<scalar> >(new vtkSetWriter<scalar>()),
+            autoPtr<writer<scalar>>(new vtkSetWriter<scalar>()),
             0.01,       // min triangle quality
             true
         );
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index da3c2ac7c8..9494874c89 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -267,7 +267,7 @@ void addToInterface
     const label zoneID,
     const label ownRegion,
     const label neiRegion,
-    EdgeMap<Map<label> >& regionsToSize
+    EdgeMap<Map<label>>& regionsToSize
 )
 {
     edge interface
@@ -276,7 +276,7 @@ void addToInterface
         max(ownRegion, neiRegion)
     );
 
-    EdgeMap<Map<label> >::iterator iter = regionsToSize.find
+    EdgeMap<Map<label>>::iterator iter = regionsToSize.find
     (
         interface
     );
@@ -316,14 +316,14 @@ void getInterfaceSizes
     const wordList& regionNames,
 
     edgeList& interfaces,
-    List<Pair<word> >& interfaceNames,
+    List<Pair<word>>& interfaceNames,
     labelList& interfaceSizes,
     labelList& faceToInterface
 )
 {
     // From region-region to faceZone (or -1) to number of faces.
 
-    EdgeMap<Map<label> > regionsToSize;
+    EdgeMap<Map<label>> regionsToSize;
 
 
     // Internal faces
@@ -394,11 +394,11 @@ void getInterfaceSizes
             {
                 IPstream fromSlave(Pstream::blocking, slave);
 
-                EdgeMap<Map<label> > slaveSizes(fromSlave);
+                EdgeMap<Map<label>> slaveSizes(fromSlave);
 
-                forAllConstIter(EdgeMap<Map<label> >, slaveSizes, slaveIter)
+                forAllConstIter(EdgeMap<Map<label>>, slaveSizes, slaveIter)
                 {
-                    EdgeMap<Map<label> >::iterator masterIter =
+                    EdgeMap<Map<label>>::iterator masterIter =
                         regionsToSize.find(slaveIter.key());
 
                     if (masterIter != regionsToSize.end())
@@ -452,7 +452,7 @@ void getInterfaceSizes
     // Now we have the global sizes of all inter-regions.
     // Invert this on master and distribute.
     label nInterfaces = 0;
-    forAllConstIter(EdgeMap<Map<label> >, regionsToSize, iter)
+    forAllConstIter(EdgeMap<Map<label>>, regionsToSize, iter)
     {
         const Map<label>& info = iter();
         nInterfaces += info.size();
@@ -461,10 +461,10 @@ void getInterfaceSizes
     interfaces.setSize(nInterfaces);
     interfaceNames.setSize(nInterfaces);
     interfaceSizes.setSize(nInterfaces);
-    EdgeMap<Map<label> > regionsToInterface(nInterfaces);
+    EdgeMap<Map<label>> regionsToInterface(nInterfaces);
 
     nInterfaces = 0;
-    forAllConstIter(EdgeMap<Map<label> >, regionsToSize, iter)
+    forAllConstIter(EdgeMap<Map<label>>, regionsToSize, iter)
     {
         const edge& e = iter.key();
         const word& name0 = regionNames[e[0]];
@@ -1052,7 +1052,7 @@ labelList addRegionPatches
     fvMesh& mesh,
     const wordList& regionNames,
     const edgeList& interfaces,
-    const List<Pair<word> >& interfaceNames
+    const List<Pair<word>>& interfaceNames
 )
 {
     Info<< nl << "Adding patches" << nl << endl;
@@ -1785,7 +1785,7 @@ int main(int argc, char *argv[])
     // - the name
     // - the (global) size
     edgeList interfaces;
-    List<Pair<word> > interfaceNames;
+    List<Pair<word>> interfaceNames;
     labelList interfaceSizes;
     // per face the interface
     labelList faceToInterface;
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 180c736b92..784e260a94 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ void subsetVolFields
 (
     const fvMeshSubset& subsetter,
     const wordList& fieldNames,
-    PtrList<GeometricField<Type, fvPatchField, volMesh> >& subFields
+    PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -86,7 +86,7 @@ void subsetSurfaceFields
 (
     const fvMeshSubset& subsetter,
     const wordList& fieldNames,
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& subFields
+    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -121,7 +121,7 @@ void subsetPointFields
     const fvMeshSubset& subsetter,
     const pointMesh& pMesh,
     const wordList& fieldNames,
-    PtrList<GeometricField<Type, pointPatchField, pointMesh> >& subFields
+    PtrList<GeometricField<Type, pointPatchField, pointMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
index 15ef8f4848..c27ee167f5 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ void Foam::helpTypes::helpBoundary::fixedValueFieldConditions
 
             fvPatch fvp(pp, mesh.boundary());
 
-            tmp<fvPatchField<Type> > pf
+            tmp<fvPatchField<Type>> pf
             (
                 fvPatchField<Type>::New
                 (
diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummary.C b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
index c5951b3865..0a3621ff83 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummary.C
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,9 +152,9 @@ int main(int argc, char *argv[])
             // patches.
 
             // Per 'group', the map from fieldname to patchfield type
-            DynamicList<HashTable<word> > fieldToTypes(bm.size());
+            DynamicList<HashTable<word>> fieldToTypes(bm.size());
             // Per 'group' the patches
-            DynamicList<DynamicList<label> > groupToPatches(bm.size());
+            DynamicList<DynamicList<label>> groupToPatches(bm.size());
             forAll(bm, patchI)
             {
                 HashTable<word> fieldToType;
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 901890c59d..6f973fb661 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -460,16 +460,16 @@ int main(int argc, char *argv[])
 
             // Construct the dimensioned fields
             // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            PtrList<DimensionedField<scalar, volMesh> > dimScalarFields;
+            PtrList<DimensionedField<scalar, volMesh>> dimScalarFields;
             readFields(mesh, objects, dimScalarFields);
-            PtrList<DimensionedField<vector, volMesh> > dimVectorFields;
+            PtrList<DimensionedField<vector, volMesh>> dimVectorFields;
             readFields(mesh, objects, dimVectorFields);
-            PtrList<DimensionedField<sphericalTensor, volMesh> >
+            PtrList<DimensionedField<sphericalTensor, volMesh>>
                 dimSphericalTensorFields;
             readFields(mesh, objects, dimSphericalTensorFields);
-            PtrList<DimensionedField<symmTensor, volMesh> > dimSymmTensorFields;
+            PtrList<DimensionedField<symmTensor, volMesh>> dimSymmTensorFields;
             readFields(mesh, objects, dimSymmTensorFields);
-            PtrList<DimensionedField<tensor, volMesh> > dimTensorFields;
+            PtrList<DimensionedField<tensor, volMesh>> dimTensorFields;
             readFields(mesh, objects, dimTensorFields);
 
 
@@ -512,64 +512,64 @@ int main(int argc, char *argv[])
             );
 
             // Particles
-            PtrList<Cloud<indexedParticle> > lagrangianPositions
+            PtrList<Cloud<indexedParticle>> lagrangianPositions
             (
                 cloudDirs.size()
             );
             // Particles per cell
-            PtrList<List<SLList<indexedParticle*>*> > cellParticles
+            PtrList<List<SLList<indexedParticle*>*>> cellParticles
             (
                 cloudDirs.size()
             );
 
-            PtrList<PtrList<labelIOField> > lagrangianLabelFields
+            PtrList<PtrList<labelIOField>> lagrangianLabelFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<labelFieldCompactIOField> >
+            PtrList<PtrList<labelFieldCompactIOField>>
             lagrangianLabelFieldFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<scalarIOField> > lagrangianScalarFields
+            PtrList<PtrList<scalarIOField>> lagrangianScalarFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<scalarFieldCompactIOField> >
+            PtrList<PtrList<scalarFieldCompactIOField>>
             lagrangianScalarFieldFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<vectorIOField> > lagrangianVectorFields
+            PtrList<PtrList<vectorIOField>> lagrangianVectorFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<vectorFieldCompactIOField> >
+            PtrList<PtrList<vectorFieldCompactIOField>>
             lagrangianVectorFieldFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<sphericalTensorIOField> >
+            PtrList<PtrList<sphericalTensorIOField>>
             lagrangianSphericalTensorFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<sphericalTensorFieldCompactIOField> >
+            PtrList<PtrList<sphericalTensorFieldCompactIOField>>
                 lagrangianSphericalTensorFieldFields(cloudDirs.size());
-            PtrList<PtrList<symmTensorIOField> > lagrangianSymmTensorFields
+            PtrList<PtrList<symmTensorIOField>> lagrangianSymmTensorFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<symmTensorFieldCompactIOField> >
+            PtrList<PtrList<symmTensorFieldCompactIOField>>
             lagrangianSymmTensorFieldFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<tensorIOField> > lagrangianTensorFields
+            PtrList<PtrList<tensorIOField>> lagrangianTensorFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<tensorFieldCompactIOField> >
+            PtrList<PtrList<tensorFieldCompactIOField>>
             lagrangianTensorFieldFields
             (
                 cloudDirs.size()
diff --git a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H
index ad04f4689e..ee4fc1d777 100644
--- a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ public:
 
         //- Decompose field
         template<class Type>
-        tmp<DimensionedField<Type, volMesh> > decomposeField
+        tmp<DimensionedField<Type, volMesh>> decomposeField
         (
             const DimensionedField<Type, volMesh>& field
         ) const;
diff --git a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposerDecomposeFields.C
index 701f91780d..dcdebc31d8 100644
--- a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposerDecomposeFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposerDecomposeFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh>>
 Foam::dimFieldDecomposer::decomposeField
 (
     const DimensionedField<Type, volMesh>& field
@@ -38,7 +38,7 @@ Foam::dimFieldDecomposer::decomposeField
     Field<Type> mappedField(field, cellAddressing_);
 
     // Create the field for the processor
-    return tmp<DimensionedField<Type, volMesh> >
+    return tmp<DimensionedField<Type, volMesh>>
     (
         new DimensionedField<Type, volMesh>
         (
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 7d86369398..2293ff0044 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -599,7 +599,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             // Go through all the zoned points and find out if they
             // belong to a zone.  If so, add it to the zone as
             // necessary
-            List<DynamicList<label> > zonePoints(pz.size());
+            List<DynamicList<label>> zonePoints(pz.size());
 
             // Estimate size
             forAll(zonePoints, zoneI)
@@ -665,8 +665,8 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             // Go through all the zoned face and find out if they
             // belong to a zone.  If so, add it to the zone as
             // necessary
-            List<DynamicList<label> > zoneFaces(fz.size());
-            List<DynamicList<bool> > zoneFaceFlips(fz.size());
+            List<DynamicList<label>> zoneFaces(fz.size());
+            List<DynamicList<bool>> zoneFaceFlips(fz.size());
 
             // Estimate size
             forAll(zoneFaces, zoneI)
@@ -759,7 +759,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             // Go through all the zoned cells and find out if they
             // belong to a zone.  If so, add it to the zone as
             // necessary
-            List<DynamicList<label> > zoneCells(cz.size());
+            List<DynamicList<label>> zoneCells(cz.size());
 
             // Estimate size
             forAll(zoneCells, zoneI)
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
index 21bc8e6169..1935c6fa67 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ class domainDecomposition
         // indices will be incremented by 1 and the decremented as
         // necessary to avoid the problem of face number zero having no
         // sign.
-        List<DynamicList<label> > procFaceAddressing_;
+        List<DynamicList<label>> procFaceAddressing_;
 
         //- Labels of cells for each processor
         labelListList procCellAddressing_;
@@ -137,8 +137,8 @@ class domainDecomposition
             const label ownerProc,
             const label nbrProc,
 
-            List<Map<label> >&,
-            List<DynamicList<DynamicList<label> > >&
+            List<Map<label>>&,
+            List<DynamicList<DynamicList<label>>>&
         ) const;
 
         //- Generate sub patch info for processor cyclics
@@ -146,8 +146,8 @@ class domainDecomposition
         void processInterCyclics
         (
             const polyBoundaryMesh& patches,
-            List<DynamicList<DynamicList<label> > >& interPatchFaces,
-            List<Map<label> >& procNbrToInterPatch,
+            List<DynamicList<DynamicList<label>>>& interPatchFaces,
+            List<Map<label>>& procNbrToInterPatch,
             List<labelListList>& subPatchIDs,
             List<labelListList>& subPatchStarts,
             bool owner,
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index f5a767225c..efcfc82ebd 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,8 +51,8 @@ void Foam::domainDecomposition::addInterProcFace
     const label ownerProc,
     const label nbrProc,
 
-    List<Map<label> >& nbrToInterPatch,
-    List<DynamicList<DynamicList<label> > >& interPatchFaces
+    List<Map<label>>& nbrToInterPatch,
+    List<DynamicList<DynamicList<label>>>& interPatchFaces
 ) const
 {
     Map<label>::iterator patchIter = nbrToInterPatch[ownerProc].find(nbrProc);
@@ -209,10 +209,10 @@ void Foam::domainDecomposition::decomposeMesh()
 
     // Per processor, from neighbour processor to the inter-processor patch
     // that communicates with that neighbour
-    List<Map<label> > procNbrToInterPatch(nProcs_);
+    List<Map<label>> procNbrToInterPatch(nProcs_);
 
     // Per processor the faces per inter-processor patch
-    List<DynamicList<DynamicList<label> > > interPatchFaces(nProcs_);
+    List<DynamicList<DynamicList<label>>> interPatchFaces(nProcs_);
 
     // Processor boundaries from internal faces
     forAll(neighbour, facei)
@@ -336,7 +336,7 @@ void Foam::domainDecomposition::decomposeMesh()
 
         sortedOrder(nbrs, order);
 
-        DynamicList<DynamicList<label> >& curInterPatchFaces =
+        DynamicList<DynamicList<label>>& curInterPatchFaces =
             interPatchFaces[procI];
 
         forAll(nbrs, i)
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
index c08be4f7fa..5122d628d7 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,8 +31,8 @@ template <class BinaryOp>
 void Foam::domainDecomposition::processInterCyclics
 (
     const polyBoundaryMesh& patches,
-    List<DynamicList<DynamicList<label> > >& interPatchFaces,
-    List<Map<label> >& procNbrToInterPatch,
+    List<DynamicList<DynamicList<label>>>& interPatchFaces,
+    List<Map<label>>& procNbrToInterPatch,
     List<labelListList>& subPatchIDs,
     List<labelListList>& subPatchStarts,
     bool owner,
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
index 361c930ad2..274e3a51a3 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
 
     particleIndices_.setSize(pi);
 
-    IOPosition<Cloud<passiveParticle> >(positions_).write();
+    IOPosition<Cloud<passiveParticle>>(positions_).write();
 }
 
 
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
index 023ca93fb0..6e0280398d 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,8 +100,8 @@ public:
         (
             const label cloudI,
             const IOobjectList& lagrangianObjects,
-            PtrList<PtrList<IOField<Type> > >& lagrangianFields
-//            PtrList<IOField<Type> >& lagrangianFields
+            PtrList<PtrList<IOField<Type>>>& lagrangianFields
+//            PtrList<IOField<Type>>& lagrangianFields
         );
 
         template<class Type>
@@ -111,22 +111,22 @@ public:
             const IOobjectList& lagrangianObjects,
             PtrList
             <
-                PtrList<CompactIOField<Field<Type>, Type> >
+                PtrList<CompactIOField<Field<Type>, Type>>
             >& lagrangianFields
-//            PtrList<CompactIOField<Field<Type>, Type > >& lagrangianFields
+//            PtrList<CompactIOField<Field<Type>, Type >>& lagrangianFields
         );
 
 
         //- Decompose volume field
         template<class Type>
-        tmp<IOField<Type> > decomposeField
+        tmp<IOField<Type>> decomposeField
         (
             const word& cloudName,
             const IOField<Type>& field
         ) const;
 
         template<class Type>
-        tmp<CompactIOField<Field<Type>, Type> > decomposeFieldField
+        tmp<CompactIOField<Field<Type>, Type>> decomposeFieldField
         (
             const word& cloudName,
             const CompactIOField<Field<Type>, Type>& field
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
index 0b1cbcec13..1b5caf8e6f 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ void Foam::lagrangianFieldDecomposer::readFields
 (
     const label cloudI,
     const IOobjectList& lagrangianObjects,
-    PtrList<PtrList<IOField<Type> > >& lagrangianFields
+    PtrList<PtrList<IOField<Type>>>& lagrangianFields
 )
 {
     // Search list of objects for lagrangian fields
@@ -45,7 +45,7 @@ void Foam::lagrangianFieldDecomposer::readFields
     lagrangianFields.set
     (
         cloudI,
-        new PtrList<IOField<Type> >
+        new PtrList<IOField<Type>>
         (
             lagrangianTypeObjects.size()
         )
@@ -68,13 +68,13 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
 (
     const label cloudI,
     const IOobjectList& lagrangianObjects,
-    PtrList<PtrList<CompactIOField<Field<Type>, Type> > >& lagrangianFields
+    PtrList<PtrList<CompactIOField<Field<Type>, Type>>>& lagrangianFields
 )
 {
     // Search list of objects for lagrangian fields
     IOobjectList lagrangianTypeObjectsA
     (
-        lagrangianObjects.lookupClass(IOField<Field<Type> >::typeName)
+        lagrangianObjects.lookupClass(IOField<Field<Type>>::typeName)
     );
 
     IOobjectList lagrangianTypeObjectsB
@@ -89,7 +89,7 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
     lagrangianFields.set
     (
         cloudI,
-        new PtrList<CompactIOField<Field<Type>, Type> >
+        new PtrList<CompactIOField<Field<Type>, Type>>
         (
             lagrangianTypeObjectsA.size() + lagrangianTypeObjectsB.size()
         )
@@ -118,7 +118,7 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
 
 
 template<class Type>
-Foam::tmp<Foam::IOField<Type> >
+Foam::tmp<Foam::IOField<Type>>
 Foam::lagrangianFieldDecomposer::decomposeField
 (
     const word& cloudName,
@@ -129,7 +129,7 @@ Foam::lagrangianFieldDecomposer::decomposeField
     Field<Type> procField(field, particleIndices_);
 
     // Create the field for the processor
-    return tmp<IOField<Type> >
+    return tmp<IOField<Type>>
     (
         new IOField<Type>
         (
@@ -150,7 +150,7 @@ Foam::lagrangianFieldDecomposer::decomposeField
 
 
 template<class Type>
-Foam::tmp<Foam::CompactIOField<Foam::Field<Type>, Type> >
+Foam::tmp<Foam::CompactIOField<Foam::Field<Type>, Type>>
 Foam::lagrangianFieldDecomposer::decomposeFieldField
 (
     const word& cloudName,
@@ -158,10 +158,10 @@ Foam::lagrangianFieldDecomposer::decomposeFieldField
 ) const
 {
     // Create and map the internal field values
-    Field<Field<Type> > procField(field, particleIndices_);
+    Field<Field<Type>> procField(field, particleIndices_);
 
     // Create the field for the processor
-    return tmp<CompactIOField<Field<Type>, Type> >
+    return tmp<CompactIOField<Field<Type>, Type>>
     (
         new CompactIOField<Field<Type>, Type>
         (
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
index cf9e4badf8..d912ca8d9f 100644
--- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,7 +154,7 @@ public:
 
         //- Decompose point field
         template<class Type>
-        tmp<GeometricField<Type, pointPatchField, pointMesh> >
+        tmp<GeometricField<Type, pointPatchField, pointMesh>>
         decomposeField
         (
             const GeometricField<Type, pointPatchField, pointMesh>&
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C
index 6992180b11..52f1576331 100644
--- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::pointFieldDecomposer::decomposeField
 (
     const GeometricField<Type, pointPatchField, pointMesh>& field
@@ -39,7 +39,7 @@ Foam::pointFieldDecomposer::decomposeField
     Field<Type> internalField(field.internalField(), pointAddressing_);
 
     // Create a list of pointers for the patchFields
-    PtrList<pointPatchField<Type> > patchFields(boundaryAddressing_.size());
+    PtrList<pointPatchField<Type>> patchFields(boundaryAddressing_.size());
 
     // Create and map the patch field values
     forAll(boundaryAddressing_, patchi)
@@ -73,7 +73,7 @@ Foam::pointFieldDecomposer::decomposeField
     }
 
     // Create the field for the processor
-    return tmp<GeometricField<Type, pointPatchField, pointMesh> >
+    return tmp<GeometricField<Type, pointPatchField, pointMesh>>
     (
         new GeometricField<Type, pointPatchField, pointMesh>
         (
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index ae90704fd3..e6a38a6cf6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ using namespace Foam;
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 volField
 (
     const fvMeshSubset& meshSubsetter,
@@ -49,7 +49,7 @@ volField
 {
     if (meshSubsetter.hasSubMesh())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh> > tfld
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tfld
         (
             meshSubsetter.interpolate(vf)
         );
@@ -725,7 +725,7 @@ void ensightField
 {
     if (nodeValues)
     {
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > pfld
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> pfld
         (
             volPointInterpolation::New(vf.mesh()).interpolate(vf)
         );
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H
index b3469e3572..ad5b11f93e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ SourceFiles
 
 //- Wrapper to get hold of the field or the subsetted field
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 volField
 (
     const Foam::fvMeshSubset&,
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 1e2df86039..1cd3cbe37d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -328,7 +328,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    HashTable<HashTable<word> > allCloudFields;
+    HashTable<HashTable<word>> allCloudFields;
     forAllConstIter(wordHashSet, allCloudNames, cloudIter)
     {
         // Add the name of the cloud(s) to the case file header
@@ -348,7 +348,7 @@ int main(int argc, char *argv[])
         allCloudFields.insert(cloudIter.key(), HashTable<word>());
 
         // Identify the new cloud in the hash table
-        HashTable<HashTable<word> >::iterator newCloudIter =
+        HashTable<HashTable<word>>::iterator newCloudIter =
             allCloudFields.find(cloudIter.key());
 
         // Loop over all times to build list of fields and field types
@@ -550,7 +550,7 @@ int main(int argc, char *argv[])
         // Cloud field data output
         // ~~~~~~~~~~~~~~~~~~~~~~~
 
-        forAllConstIter(HashTable<HashTable<word> >, allCloudFields, cloudIter)
+        forAllConstIter(HashTable<HashTable<word>>, allCloudFields, cloudIter)
         {
             const word& cloudName = cloudIter.key();
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
index 3ccdbbe91b..0d22159079 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
@@ -36,7 +36,7 @@ else
 
 // add information for clouds
 // multiple clouds currently require the same time index
-forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
+forAllConstIter(HashTable<HashTable<word>>, cloudFields, cloudIter)
 {
     const word& cloudName = cloudIter.key();
 
@@ -91,7 +91,7 @@ forAllConstIter(HashTable<word>, volumeFields, fieldIter)
 
 
 label cloudNo = 0;
-forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
+forAllConstIter(HashTable<HashTable<word>>, cloudFields, cloudIter)
 {
     const word& cloudName = cloudIter.key();
 
@@ -175,7 +175,7 @@ if (fieldTimesUsed.size())
 
 // TODO: allow similar/different time-steps for each cloud
 cloudNo = 0;
-forAllConstIter(HashTable<DynamicList<label> >, cloudTimesUsed, cloudIter)
+forAllConstIter(HashTable<DynamicList<label>>, cloudTimesUsed, cloudIter)
 {
     // const word& cloudName = cloudIter.key();
     const DynamicList<label>& timesUsed = cloudIter();
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
index 0231f2e4dd..077490f1ec 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
@@ -48,7 +48,7 @@ if (timeDirs.size())
         cloudFields.insert(cloudName, HashTable<word>());
 
         // Identify the new cloud within the hash table
-        HashTable<HashTable<word> >::iterator cloudIter =
+        HashTable<HashTable<word>>::iterator cloudIter =
             cloudFields.find(cloudName);
 
         IOobjectList objs
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index 8e948b1692..f2d0286bce 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -220,10 +220,10 @@ int main(int argc, char *argv[])
     DynamicList<label> fieldTimesUsed;
 
     // Track the time indices used by each cloud
-    HashTable<DynamicList<label> > cloudTimesUsed;
+    HashTable<DynamicList<label>> cloudTimesUsed;
 
     // Create a new DynamicList for each cloud
-    forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
+    forAllConstIter(HashTable<HashTable<word>>, cloudFields, cloudIter)
     {
         cloudTimesUsed.insert(cloudIter.key(), DynamicList<label>());
     }
@@ -356,7 +356,7 @@ int main(int argc, char *argv[])
         Info<< " )" << endl;
 
         // check for clouds
-        forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
+        forAllConstIter(HashTable<HashTable<word>>, cloudFields, cloudIter)
         {
             const word& cloudName = cloudIter.key();
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
index 60836e9a24..1bd38ec892 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,7 +120,7 @@ public:
 
         //- Get either fvPatchField or patchInternalField
         template<class Type>
-        tmp<Field<Type> > getPatchField
+        tmp<Field<Type>> getPatchField
         (
             const bool nearCellValue,
             const GeometricField<Type, fvPatchField, volMesh>& vfld,
@@ -130,7 +130,7 @@ public:
         //- Get mixed field: fvsPatchField for boundary faces and
         //  internalField for internal faces.
         template<class Type>
-        tmp<Field<Type> > getFaceField
+        tmp<Field<Type>> getFaceField
         (
             const GeometricField<Type, fvsPatchField, surfaceMesh>&,
             const labelList& faceLabels
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
index 16416593cb..c2ca8ac4a8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ void Foam::tecplotWriter::writeField(const Field<Type>& fld) const
 
 
 template<class Type>
-Foam::tmp<Field<Type> > Foam::tecplotWriter::getPatchField
+Foam::tmp<Field<Type>> Foam::tecplotWriter::getPatchField
 (
     const bool nearCellValue,
     const GeometricField<Type, fvPatchField, volMesh>& vfld,
@@ -84,7 +84,7 @@ Foam::tmp<Field<Type> > Foam::tecplotWriter::getPatchField
 
 
 template<class Type>
-Foam::tmp<Field<Type> > Foam::tecplotWriter::getFaceField
+Foam::tmp<Field<Type>> Foam::tecplotWriter::getFaceField
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& sfld,
     const labelList& faceLabels
@@ -92,7 +92,7 @@ Foam::tmp<Field<Type> > Foam::tecplotWriter::getFaceField
 {
     const polyBoundaryMesh& patches = sfld.mesh().boundaryMesh();
 
-    tmp<Field<Type> > tfld(new Field<Type>(faceLabels.size()));
+    tmp<Field<Type>> tfld(new Field<Type>(faceLabels.size()));
     Field<Type>& fld = tfld();
 
     forAll(faceLabels, i)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
index 9c456f843c..4da03b6d73 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ public:
         template<class Type, template<class> class PatchField, class GeoMesh>
         void write
         (
-            const PtrList<GeometricField<Type, PatchField, GeoMesh> >&
+            const PtrList<GeometricField<Type, PatchField, GeoMesh>>&
         );
 
         //- Interpolate and write volFields
@@ -99,7 +99,7 @@ public:
         void write
         (
             const volPointInterpolation&,
-            const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
+            const PtrList<GeometricField<Type, fvPatchField, volMesh>>&
         );
 };
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
index 853caca75b..cdc7ad9720 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::internalWriter::write
 (
-    const PtrList<GeometricField<Type, PatchField, GeoMesh> >& flds
+    const PtrList<GeometricField<Type, PatchField, GeoMesh>>& flds
 )
 {
     forAll(flds, i)
@@ -45,7 +45,7 @@ template<class Type>
 void Foam::internalWriter::write
 (
     const volPointInterpolation& pInterp,
-    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& flds
+    const PtrList<GeometricField<Type, fvPatchField, volMesh>>& flds
 )
 {
     forAll(flds, i)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H
index 730f68098e..f0880c9903 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,14 +114,14 @@ public:
         template<class Type>
         void write
         (
-            const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
+            const PtrList<GeometricField<Type, fvPatchField, volMesh>>&
         );
 
         //- Write pointFields
         template<class Type>
         void write
         (
-            const PtrList<GeometricField<Type, pointPatchField, pointMesh> >&
+            const PtrList<GeometricField<Type, pointPatchField, pointMesh>>&
         );
 
         //- Interpolate and write volFields
@@ -129,7 +129,7 @@ public:
         void write
         (
             const PrimitivePatchInterpolation<primitivePatch>&,
-            const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
+            const PtrList<GeometricField<Type, fvPatchField, volMesh>>&
         );
 };
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C
index 25e228ebe0..f6ea96d7b8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 template<class Type>
 void Foam::patchWriter::write
 (
-    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& flds
+    const PtrList<GeometricField<Type, fvPatchField, volMesh>>& flds
 )
 {
     forAll(flds, fieldI)
@@ -66,7 +66,7 @@ void Foam::patchWriter::write
 template<class Type>
 void Foam::patchWriter::write
 (
-    const PtrList<GeometricField<Type, pointPatchField, pointMesh> >& flds
+    const PtrList<GeometricField<Type, pointPatchField, pointMesh>>& flds
 )
 {
     forAll(flds, fieldI)
@@ -96,7 +96,7 @@ template<class Type>
 void Foam::patchWriter::write
 (
     const PrimitivePatchInterpolation<primitivePatch>& pInter,
-    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& flds
+    const PtrList<GeometricField<Type, fvPatchField, volMesh>>& flds
 )
 {
     forAll(flds, fieldI)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H
index 0a5936cfa1..2520badad0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ public:
 
         //- Extract face data
         template<class Type>
-        tmp<Field<Type> > getFaceField
+        tmp<Field<Type>> getFaceField
         (
             const GeometricField<Type, fvsPatchField, surfaceMesh>&
         ) const;
@@ -99,7 +99,7 @@ public:
         template<class Type>
         void write
         (
-            const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+            const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>&
         );
 };
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C
index 3ae7b08be2..86ccae2867 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,14 +29,14 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Field<Type> > Foam::surfaceMeshWriter::getFaceField
+Foam::tmp<Field<Type>> Foam::surfaceMeshWriter::getFaceField
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& sfld
 ) const
 {
     const polyBoundaryMesh& patches = sfld.mesh().boundaryMesh();
 
-    tmp<Field<Type> > tfld(new Field<Type>(pp_.size()));
+    tmp<Field<Type>> tfld(new Field<Type>(pp_.size()));
     Field<Type>& fld = tfld();
 
     forAll(pp_.addressing(), i)
@@ -63,7 +63,7 @@ Foam::tmp<Field<Type> > Foam::surfaceMeshWriter::getFaceField
 template<class Type>
 void Foam::surfaceMeshWriter::write
 (
-    const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& sflds
+    const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& sflds
 )
 {
     forAll(sflds, fieldI)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
index 11f18b3d76..41b21b3bdf 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,7 +146,7 @@ public:
     (
         std::ostream&,
         const bool binary,
-        const PtrList<GeometricField<Type, PatchField, GeoMesh> >&,
+        const PtrList<GeometricField<Type, PatchField, GeoMesh>>&,
         const vtkMesh&
     );
 
@@ -157,7 +157,7 @@ public:
         std::ostream&,
         const bool binary,
         const volPointInterpolation&,
-        const PtrList<GeometricField<Type, fvPatchField, volMesh> >&,
+        const PtrList<GeometricField<Type, fvPatchField, volMesh>>&,
         const vtkMesh&
     );
 };
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
index 5fe5d076dd..b88b9b20f8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ void Foam::writeFuns::write
 (
     std::ostream& os,
     const bool binary,
-    const PtrList<GeometricField<Type, PatchField, GeoMesh> >& flds,
+    const PtrList<GeometricField<Type, PatchField, GeoMesh>>& flds,
     const vtkMesh& vMesh
 )
 {
@@ -178,7 +178,7 @@ void Foam::writeFuns::write
     std::ostream& os,
     const bool binary,
     const volPointInterpolation& pInterp,
-    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& flds,
+    const PtrList<GeometricField<Type, fvPatchField, volMesh>>& flds,
     const vtkMesh& vMesh
 )
 {
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index 054582768f..f30956dddb 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -659,7 +659,7 @@ void Foam::vtkPV3Foam::renderPatchNames(vtkRenderer* renderer, const bool show)
         labelList nZones(pbMesh.size(), 0);
 
         // Per global zone number the average face centre position
-        List<DynamicList<point> > zoneCentre(pbMesh.size());
+        List<DynamicList<point>> zoneCentre(pbMesh.size());
 
 
         // Loop through all patches to determine zones, and centre of each zone
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
index e21bd33fc9..ab6dc05c83 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -497,7 +497,7 @@ class vtkPV3Foam
             void convertVolFields
             (
                 const fvMesh&,
-                const PtrList<PrimitivePatchInterpolation<primitivePatch> >&,
+                const PtrList<PrimitivePatchInterpolation<primitivePatch>>&,
                 const IOobjectList&,
                 const bool interpFields,
                 vtkMultiBlockDataSet* output
@@ -508,7 +508,7 @@ class vtkPV3Foam
             void convertVolFieldBlock
             (
                 const GeometricField<Type, fvPatchField, volMesh>&,
-                autoPtr<GeometricField<Type, pointPatchField, pointMesh> >&,
+                autoPtr<GeometricField<Type, pointPatchField, pointMesh>>&,
                 vtkMultiBlockDataSet* output,
                 const arrayRange&,
                 const List<polyDecomp>& decompLst
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C
index 6d0e98dd40..0c0fa41c73 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ void Foam::vtkPV3Foam::convertVolFields
     }
 
 
-    PtrList<PrimitivePatchInterpolation<primitivePatch> >
+    PtrList<PrimitivePatchInterpolation<primitivePatch>>
         ppInterpList(mesh.boundaryMesh().size());
 
     forAll(ppInterpList, i)
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
index 8235b13d0a..6463823988 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -325,7 +325,7 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
             // but avoids crashes when there is no vtkPolyhedron support
 
             // establish unique node ids used
-            HashSet<vtkIdType, Hash<label> > hashUniqId(2*256);
+            HashSet<vtkIdType, Hash<label>> hashUniqId(2*256);
 
             forAll(cFaces, cFaceI)
             {
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
index 842a301ed7..1028086056 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -678,33 +678,33 @@ void Foam::vtkPV3Foam::updateInfoLagrangianFields()
         lagrangianPrefix/cloudName
     );
 
-    addToSelection<IOField<label> >
+    addToSelection<IOField<label>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<scalar> >
+    addToSelection<IOField<scalar>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<vector> >
+    addToSelection<IOField<vector>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<sphericalTensor> >
+    addToSelection<IOField<sphericalTensor>>
     (
         fieldSelection,
 
         objects
     );
-    addToSelection<IOField<symmTensor> >
+    addToSelection<IOField<symmTensor>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<tensor> >
+    addToSelection<IOField<tensor>>
     (
         fieldSelection,
         objects
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H
index 3ef9124979..02cf345d4a 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,27 +73,27 @@ void Foam::vtkPV3Foam::updateInfoFields
     IOobjectList objects(dbPtr_(), dbPtr_().timeName(), regionPrefix);
 
     //- Add volume fields to GUI
-    addToSelection<GeometricField<scalar, patchType, meshType> >
+    addToSelection<GeometricField<scalar, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<vector, patchType, meshType> >
+    addToSelection<GeometricField<vector, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<sphericalTensor, patchType, meshType> >
+    addToSelection<GeometricField<sphericalTensor, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<symmTensor, patchType, meshType> >
+    addToSelection<GeometricField<symmTensor, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<tensor, patchType, meshType> >
+    addToSelection<GeometricField<tensor, patchType, meshType>>
     (
         select,
         objects
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H
index 57e6931c12..9e11686f20 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ template<class Type>
 void Foam::vtkPV3Foam::convertVolFields
 (
     const fvMesh& mesh,
-    const PtrList<PrimitivePatchInterpolation<primitivePatch> >& ppInterpList,
+    const PtrList<PrimitivePatchInterpolation<primitivePatch>>& ppInterpList,
     const IOobjectList& objects,
     const bool interpFields,
     vtkMultiBlockDataSet* output
@@ -74,7 +74,7 @@ void Foam::vtkPV3Foam::convertVolFields
         );
 
         // Interpolated field (demand driven)
-        autoPtr<GeometricField<Type, pointPatchField, pointMesh> > ptfPtr;
+        autoPtr<GeometricField<Type, pointPatchField, pointMesh>> ptfPtr;
         if (interpFields)
         {
             if (debug)
@@ -144,7 +144,7 @@ void Foam::vtkPV3Foam::convertVolFields
 
             if
             (
-                isType<emptyFvPatchField<Type> >(ptf)
+                isType<emptyFvPatchField<Type>>(ptf)
              ||
                 (
                     reader_->GetExtrapolatePatches()
@@ -154,7 +154,7 @@ void Foam::vtkPV3Foam::convertVolFields
             {
                 fvPatch p(ptf.patch().patch(), tf.mesh().boundary());
 
-                tmp<Field<Type> > tpptf
+                tmp<Field<Type>> tpptf
                 (
                     fvPatchField<Type>(p, tf).patchInternalField()
                 );
@@ -284,7 +284,7 @@ template<class Type>
 void Foam::vtkPV3Foam::convertVolFieldBlock
 (
     const GeometricField<Type, fvPatchField, volMesh>& tf,
-    autoPtr<GeometricField<Type, pointPatchField, pointMesh> >& ptfPtr,
+    autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
     const List<polyDecomp>& decompLst
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C
index 960883af34..cf7170a738 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -663,7 +663,7 @@ void Foam::vtkPV4Foam::renderPatchNames
         labelList nZones(pbMesh.size(), 0);
 
         // Per global zone number the average face centre position
-        List<DynamicList<point> > zoneCentre(pbMesh.size());
+        List<DynamicList<point>> zoneCentre(pbMesh.size());
 
 
         // Loop through all patches to determine zones, and centre of each zone
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
index 0bd35573e1..b177df59f6 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -497,7 +497,7 @@ class vtkPV4Foam
             void convertVolFields
             (
                 const fvMesh&,
-                const PtrList<PrimitivePatchInterpolation<primitivePatch> >&,
+                const PtrList<PrimitivePatchInterpolation<primitivePatch>>&,
                 const IOobjectList&,
                 const bool interpFields,
                 vtkMultiBlockDataSet* output
@@ -508,7 +508,7 @@ class vtkPV4Foam
             void convertVolFieldBlock
             (
                 const GeometricField<Type, fvPatchField, volMesh>&,
-                autoPtr<GeometricField<Type, pointPatchField, pointMesh> >&,
+                autoPtr<GeometricField<Type, pointPatchField, pointMesh>>&,
                 vtkMultiBlockDataSet* output,
                 const arrayRange&,
                 const List<polyDecomp>& decompLst
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
index 127f49d306..949627089c 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ void Foam::vtkPV4Foam::convertVolFields
     }
 
 
-    PtrList<PrimitivePatchInterpolation<primitivePatch> >
+    PtrList<PrimitivePatchInterpolation<primitivePatch>>
         ppInterpList(mesh.boundaryMesh().size());
 
     forAll(ppInterpList, i)
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C
index 70a7c04a1a..9756316e81 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -325,7 +325,7 @@ vtkUnstructuredGrid* Foam::vtkPV4Foam::volumeVTKMesh
             // but avoids crashes when there is no vtkPolyhedron support
 
             // establish unique node ids used
-            HashSet<vtkIdType, Hash<label> > hashUniqId(2*256);
+            HashSet<vtkIdType, Hash<label>> hashUniqId(2*256);
 
             forAll(cFaces, cFaceI)
             {
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
index 9598d5de4a..653d481d14 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -678,33 +678,33 @@ void Foam::vtkPV4Foam::updateInfoLagrangianFields()
         lagrangianPrefix/cloudName
     );
 
-    addToSelection<IOField<label> >
+    addToSelection<IOField<label>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<scalar> >
+    addToSelection<IOField<scalar>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<vector> >
+    addToSelection<IOField<vector>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<sphericalTensor> >
+    addToSelection<IOField<sphericalTensor>>
     (
         fieldSelection,
 
         objects
     );
-    addToSelection<IOField<symmTensor> >
+    addToSelection<IOField<symmTensor>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<tensor> >
+    addToSelection<IOField<tensor>>
     (
         fieldSelection,
         objects
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
index b191e1c52b..0c659fffdd 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,27 +73,27 @@ void Foam::vtkPV4Foam::updateInfoFields
     IOobjectList objects(dbPtr_(), dbPtr_().timeName(), regionPrefix);
 
     //- Add volume fields to GUI
-    addToSelection<GeometricField<scalar, patchType, meshType> >
+    addToSelection<GeometricField<scalar, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<vector, patchType, meshType> >
+    addToSelection<GeometricField<vector, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<sphericalTensor, patchType, meshType> >
+    addToSelection<GeometricField<sphericalTensor, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<symmTensor, patchType, meshType> >
+    addToSelection<GeometricField<symmTensor, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<tensor, patchType, meshType> >
+    addToSelection<GeometricField<tensor, patchType, meshType>>
     (
         select,
         objects
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
index f4757a6137..9c836ef397 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ template<class Type>
 void Foam::vtkPV4Foam::convertVolFields
 (
     const fvMesh& mesh,
-    const PtrList<PrimitivePatchInterpolation<primitivePatch> >& ppInterpList,
+    const PtrList<PrimitivePatchInterpolation<primitivePatch>>& ppInterpList,
     const IOobjectList& objects,
     const bool interpFields,
     vtkMultiBlockDataSet* output
@@ -74,7 +74,7 @@ void Foam::vtkPV4Foam::convertVolFields
         );
 
         // Interpolated field (demand driven)
-        autoPtr<GeometricField<Type, pointPatchField, pointMesh> > ptfPtr;
+        autoPtr<GeometricField<Type, pointPatchField, pointMesh>> ptfPtr;
         if (interpFields)
         {
             if (debug)
@@ -144,7 +144,7 @@ void Foam::vtkPV4Foam::convertVolFields
 
             if
             (
-                isType<emptyFvPatchField<Type> >(ptf)
+                isType<emptyFvPatchField<Type>>(ptf)
              ||
                 (
                     reader_->GetExtrapolatePatches()
@@ -154,7 +154,7 @@ void Foam::vtkPV4Foam::convertVolFields
             {
                 fvPatch p(ptf.patch().patch(), tf.mesh().boundary());
 
-                tmp<Field<Type> > tpptf
+                tmp<Field<Type>> tpptf
                 (
                     fvPatchField<Type>(p, tf).patchInternalField()
                 );
@@ -284,7 +284,7 @@ template<class Type>
 void Foam::vtkPV4Foam::convertVolFieldBlock
 (
     const GeometricField<Type, fvPatchField, volMesh>& tf,
-    autoPtr<GeometricField<Type, pointPatchField, pointMesh> >& ptfPtr,
+    autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
     const List<polyDecomp>& decompLst
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index 4988fc969f..590306a3ea 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
     label nTracks = nParticle/sampleFrequency;
 
     // storage for all particle tracks
-    List<DynamicList<vector> > allTracks(nTracks);
+    List<DynamicList<vector>> allTracks(nTracks);
 
     Info<< "\nGenerating " << nTracks << " particle tracks for cloud "
         << cloudName << nl << endl;
@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
             tracks[trackI].transfer(allTracks[trackI]);
         }
 
-        autoPtr<writer<scalar> > scalarFormatterPtr = writer<scalar>::New
+        autoPtr<writer<scalar>> scalarFormatterPtr = writer<scalar>::New
         (
             setFormat
         );
@@ -242,7 +242,7 @@ int main(int argc, char *argv[])
             true,           // writeTracks
             tracks,
             wordList(0),
-            List<List<scalarField> >(0),
+            List<List<scalarField>>(0),
             vtkTracks
         );
     }
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
index 4d2ab943ac..cc34e01691 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
     fileName vtkPath(runTime.path()/"VTK");
     mkDir(vtkPath);
 
-    typedef HashTable<label, labelPair, labelPair::Hash<> > trackTableType;
+    typedef HashTable<label, labelPair, labelPair::Hash<>> trackTableType;
 
     forAll(timeDirs, timeI)
     {
@@ -202,8 +202,8 @@ int main(int argc, char *argv[])
             }
 
             // particle "age" property used to sort the tracks
-            List<SortableList<scalar> > agePerTrack(nTracks);
-            List<List<label> > particleMap(nTracks);
+            List<SortableList<scalar>> agePerTrack(nTracks);
+            List<List<label>> particleMap(nTracks);
 
             forAll(trackLengths, i)
             {
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
index edf43c9a29..8499dc509f 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ bool fieldOk(const IOobjectList& cloudObjs, const word& name)
 
 
 template<class Type>
-tmp<Field<Type> > readParticleField
+tmp<Field<Type>> readParticleField
 (
     const word& name,
     const IOobjectList cloudObjs
@@ -54,7 +54,7 @@ tmp<Field<Type> > readParticleField
     if (obj != NULL)
     {
         IOField<Type> newField(*obj);
-        return tmp<Field<Type> >(new Field<Type>(newField.xfer()));
+        return tmp<Field<Type>>(new Field<Type>(newField.xfer()));
     }
 
     FatalErrorInFunction
@@ -68,7 +68,7 @@ tmp<Field<Type> > readParticleField
 template<class Type>
 void readFields
 (
-    PtrList<List<Type> >& values,
+    PtrList<List<Type>>& values,
     const List<word>& fieldNames,
     const IOobjectList& cloudObjs
 )
@@ -109,8 +109,8 @@ template<class Type>
 void writeVTKFields
 (
     OFstream& os,
-    const PtrList<List<Type> >& values,
-    const List<List<label> >& addr,
+    const PtrList<List<Type>>& values,
+    const List<List<label>>& addr,
     const List<word>& fieldNames
 )
 {
@@ -150,7 +150,7 @@ template<class Type>
 void processFields
 (
     OFstream& os,
-    const List<List<label> >& addr,
+    const List<List<label>>& addr,
     const List<word>& userFieldNames,
     const IOobjectList& cloudObjs
 )
@@ -170,7 +170,7 @@ void processFields
         }
         fieldNames.shrink();
 
-        PtrList<List<Type> > values(fieldNames.size());
+        PtrList<List<Type>> values(fieldNames.size());
         readFields<Type>(values, fieldNames, cloudObjs);
 
         writeVTKFields<Type>
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.H b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.H
index f3b5d48d2d..46c6ba91b3 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.H
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ namespace Foam
     bool fieldOk(const IOobjectList& cloudObjs, const word& name);
 
     template<class Type>
-    tmp<Field<Type> > readParticleField
+    tmp<Field<Type>> readParticleField
     (
         const word& name,
         const IOobjectList cloudObjs
@@ -51,7 +51,7 @@ namespace Foam
     template<class Type>
     void readFields
     (
-        PtrList<List<Type> >& values,
+        PtrList<List<Type>>& values,
         const List<word>& fields,
         const IOobjectList& cloudObjs
     );
@@ -63,15 +63,15 @@ namespace Foam
     void writeVTKFields
     (
         OFstream& os,
-        const PtrList<List<Type> >& values,
-        const List<SortableList<scalar> >& agePerTrack,
+        const PtrList<List<Type>>& values,
+        const List<SortableList<scalar>>& agePerTrack,
         const List<word>& fieldNames
     );
 
     void processFields
     (
         OFstream& os,
-        const List<SortableList<scalar> >& agePerTrack,
+        const List<SortableList<scalar>>& agePerTrack,
         const List<word>& userFieldNames,
         const IOobjectList& cloudObjs
     );
diff --git a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
index b9c321b87a..6059ebf5aa 100644
--- a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
+++ b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ namespace Foam
     bool addFieldsToList
     (
         const fvMesh& mesh,
-        PtrList<GeometricField<Type, fvPatchField, volMesh> >& list,
+        PtrList<GeometricField<Type, fvPatchField, volMesh>>& list,
         const wordList& fieldNames
     )
     {
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
index c5d842237e..3a62b622ef 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,13 +57,13 @@ void processField
 
         forAll(bf, patchI)
         {
-            if (isA<externalCoupledMixedFvPatchField<Type> >(bf[patchI]))
+            if (isA<externalCoupledMixedFvPatchField<Type>>(bf[patchI]))
             {
                 Info<< "Generating external coupled geometry for field "
                     << fieldName << endl;
 
                 const externalCoupledMixedFvPatchField<Type>& pf =
-                    refCast<const externalCoupledMixedFvPatchField<Type> >
+                    refCast<const externalCoupledMixedFvPatchField<Type>>
                     (
                         bf[patchI]
                     );
diff --git a/applications/utilities/preProcessing/mapFields/MapLagrangianFields.H b/applications/utilities/preProcessing/mapFields/MapLagrangianFields.H
index 9244091d2e..605f43090a 100644
--- a/applications/utilities/preProcessing/mapFields/MapLagrangianFields.H
+++ b/applications/utilities/preProcessing/mapFields/MapLagrangianFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ void MapLagrangianFields
 
     {
         IOobjectList fieldFields =
-            objects.lookupClass(IOField<Field<Type> >::typeName);
+            objects.lookupClass(IOField<Field<Type>>::typeName);
 
         forAllIter(IOobjectList, fieldFields, fieldIter)
         {
@@ -104,7 +104,7 @@ void MapLagrangianFields
                 << fieldIter()->name() << endl;
 
             // Read field (does not need mesh)
-            IOField<Field<Type> > fieldSource(*fieldIter());
+            IOField<Field<Type>> fieldSource(*fieldIter());
 
             // Map - use CompactIOField to automatically write in
             // compact form for binary format.
diff --git a/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H b/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H
index e045522145..6b668fdd38 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H
+++ b/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ void MapLagrangianFields
 
     {
         IOobjectList fieldFields =
-            objects.lookupClass(IOField<Field<Type> >::typeName);
+            objects.lookupClass(IOField<Field<Type>>::typeName);
 
         forAllIter(IOobjectList, fieldFields, fieldIter)
         {
@@ -104,7 +104,7 @@ void MapLagrangianFields
             Info<< "    mapping lagrangian fieldField " << fieldName << endl;
 
             // Read field (does not need mesh)
-            IOField<Field<Type> > fieldSource(*fieldIter());
+            IOField<Field<Type>> fieldSource(*fieldIter());
 
             // Map - use CompactIOField to automatically write in
             // compact form for binary format.
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index e01be739e1..ed00d1a6cf 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -515,7 +515,7 @@ int main(int argc, char *argv[])
     // - construct distribute map
     // - renumber rayEndFace into compact addressing
 
-    List<Map<label> > compactMap(Pstream::nProcs());
+    List<Map<label>> compactMap(Pstream::nProcs());
 
     mapDistribute map(globalNumbering, rayEndFace, compactMap);
 
@@ -586,8 +586,8 @@ int main(int argc, char *argv[])
 
     pointField compactCoarseCf(map.constructSize(), pTraits<vector>::zero);
     pointField compactCoarseSf(map.constructSize(), pTraits<vector>::zero);
-    List<List<point> > compactFineSf(map.constructSize());
-    List<List<point> > compactFineCf(map.constructSize());
+    List<List<point>> compactFineSf(map.constructSize());
+    List<List<point>> compactFineCf(map.constructSize());
 
     DynamicList<label> compactPatchId(map.constructSize());
 
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
index 73d87c004b..7857569be3 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,7 +144,7 @@ Foam::tabulatedWallFunctions::general::general
     log10YPlus_(coeffDict_.lookup("log10YPlus")),
     log10UPlus_(coeffDict_.lookup("log10UPlus"))
 {
-    List<Tuple2<scalar, scalar> > inputTable = coeffDict_.lookup("inputTable");
+    List<Tuple2<scalar, scalar>> inputTable = coeffDict_.lookup("inputTable");
     if (inputTable.size() < 2)
     {
         FatalErrorInFunction
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index ea697d1733..b539946bc6 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -509,8 +509,8 @@ int main(int argc, char *argv[])
     (
         2*nFeatEds
     );
-    List<DynamicList<label> > edgeNormals(nFeatEds);
-    List<DynamicList<label> > normalDirections(nFeatEds);
+    List<DynamicList<label>> edgeNormals(nFeatEds);
+    List<DynamicList<label>> normalDirections(nFeatEds);
 
     forAllConstIter(labelPairLookup, inter.facePairToEdge(), iter)
     {
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index a763c90c29..542c9ba4af 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1438,7 +1438,7 @@ int main(int argc, char *argv[])
             pointField end(searchSurf.faceCentres() + span*normals);
             const pointField& faceCentres = searchSurf.faceCentres();
 
-            List<List<pointIndexHit> > allHitInfo;
+            List<List<pointIndexHit>> allHitInfo;
 
             // Find all intersections (in order)
             searchSurf.findLineAll(start, end, allHitInfo);
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index 4c5a91d108..b7c5ca03b2 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -151,7 +151,7 @@ void greenRefine
 void createBoundaryEdgeTrees
 (
     const PtrList<triSurfaceMesh>& surfs,
-    PtrList<indexedOctree<treeDataEdge> >& bEdgeTrees,
+    PtrList<indexedOctree<treeDataEdge>>& bEdgeTrees,
     labelListList& treeBoundaryEdges
 )
 {
@@ -325,11 +325,11 @@ int main(int argc, char *argv[])
         Info<< decrIndent;
     }
 
-    PtrList<indexedOctree<treeDataEdge> > bEdgeTrees(surfs.size());
+    PtrList<indexedOctree<treeDataEdge>> bEdgeTrees(surfs.size());
     labelListList treeBoundaryEdges(surfs.size());
 
-    List<DynamicList<labelledTri> > newFaces(surfs.size());
-    List<DynamicList<point> > newPoints(surfs.size());
+    List<DynamicList<labelledTri>> newFaces(surfs.size());
+    List<DynamicList<point>> newPoints(surfs.size());
     List<PackedBoolList> visitedFace(surfs.size());
 
     PtrList<triSurfaceMesh> newSurfaces(surfs.size());
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index 03195b4664..3d829e8903 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ using namespace Foam;
 void writeProcStats
 (
     const triSurface& s,
-    const List<List<treeBoundBox> >& meshBb
+    const List<List<treeBoundBox>>& meshBb
 )
 {
     // Determine surface bounding boxes, faces, points
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
     Random rndGen(653213);
 
     // Determine mesh bounding boxes:
-    List<List<treeBoundBox> > meshBb(Pstream::nProcs());
+    List<List<treeBoundBox>> meshBb(Pstream::nProcs());
     {
         meshBb[Pstream::myProcNo()] = List<treeBoundBox>
         (
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 51aaab6669..2e41a7870e 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Description
 
 using namespace Foam;
 
-typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
+typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
     thermo;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index 7af84242b9..478c2ae9f5 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Description
 
 using namespace Foam;
 
-typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
+typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
     thermo;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index 4642bde45f..cd1c35f07e 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Description
 
 using namespace Foam;
 
-typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
+typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
     thermo;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
index 358bb7ab0f..c755532d65 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Description
 
 using namespace Foam;
 
-typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
+typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
     thermo;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/bin/foamNewBC b/bin/foamNewBC
index 12b894eda0..61e093d7a3 100755
--- a/bin/foamNewBC
+++ b/bin/foamNewBC
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -164,7 +164,7 @@ do
         -e "s#TWO#${TWO}#g" \
         -e "s#THREE#${THREE}#g" \
         -e "s#FOUR#${FOUR}#g" \
-        -e 's/>>/> >/g' \
+        -e 's/>>/>>/g' \
         ${DIR}/${F} > ${NAME}/${NEWFILE}
 
     case $BASE in
diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index 29eb59145c..4a6a679d55 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -256,7 +256,7 @@
     they are macros, they will fail if the iterated object contains
     any commas /e.g./ following will FAIL!:
     #+BEGIN_SRC C++
-    forAllIter(HashTable<labelPair, edge, Hash<edge> >, foo, iter)
+    forAllIter(HashTable<labelPair, edge, Hash<edge>>, foo, iter)
     #+END_SRC
     These convenience macros are also generally avoided in other
     container classes and OpenFOAM primitive classes.
diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H
index 553a6c9183..14bbcb76cf 100644
--- a/etc/codeTemplates/BC/BC.H
+++ b/etc/codeTemplates/BC/BC.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ class CONSTRUCT
         FIELD fieldData_;
 
         //- Type specified as a function of time for time-varying BCs
-        autoPtr<DataEntry<TYPE> > timeVsData_;
+        autoPtr<DataEntry<TYPE>> timeVsData_;
 
         //- Word entry, e.g. pName_ for name of the pressure field on database
         word wordData_;
diff --git a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
index 0b90345029..bbb46269ff 100644
--- a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
+++ b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
@@ -93,9 +93,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<${TemplateType}> > clone() const
+        virtual autoPtr<pointPatchField<${TemplateType}>> clone() const
         {
-            return autoPtr<pointPatchField<${TemplateType}> >
+            return autoPtr<pointPatchField<${TemplateType}>>
             (
                 new ${typeName}FixedValuePointPatch${FieldType}(*this)
             );
@@ -109,12 +109,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<${TemplateType}> > clone
+        virtual autoPtr<pointPatchField<${TemplateType}>> clone
         (
             const DimensionedField<${TemplateType}, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<${TemplateType}> >
+            return autoPtr<pointPatchField<${TemplateType}>>
             (
                 new ${typeName}FixedValuePointPatch${FieldType}(*this, iF)
             );
diff --git a/etc/codeTemplates/template/_TemplateTemplate.C b/etc/codeTemplates/template/_TemplateTemplate.C
index 41469f7b13..5603c4959e 100644
--- a/etc/codeTemplates/template/_TemplateTemplate.C
+++ b/etc/codeTemplates/template/_TemplateTemplate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,10 +66,10 @@ Foam::CLASSNAME<TemplateArgument>::CLASSNAME
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<TemplateClassArgument>
-Foam::autoPtr<Foam::CLASSNAME<TemplateArgument> >
+Foam::autoPtr<Foam::CLASSNAME<TemplateArgument>>
 Foam::CLASSNAME<TemplateArgument>::New()
 {
-    return autoPtr<CLASSNAME<TemplateArgument> >
+    return autoPtr<CLASSNAME<TemplateArgument>>
     (
         new CLASSNAME<TemplateArgument>
     );
diff --git a/etc/codeTemplates/template/_TemplateTemplate.H b/etc/codeTemplates/template/_TemplateTemplate.H
index 8db7a0fc99..e070d3d6fb 100644
--- a/etc/codeTemplates/template/_TemplateTemplate.H
+++ b/etc/codeTemplates/template/_TemplateTemplate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ public:
     // Selectors
 
         //- Select null constructed
-        static autoPtr<CLASSNAME<TemplateArgument> > New();
+        static autoPtr<CLASSNAME<TemplateArgument>> New();
 
 
     //- Destructor
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
index 922a62415f..c38bdfa814 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,7 +148,7 @@ bool Foam::dynamicIndexedOctree<Type>::overlaps
 template<class Type>
 void Foam::dynamicIndexedOctree<Type>::divide
 (
-    const autoPtr<DynamicList<label> >& indices,
+    const autoPtr<DynamicList<label>>& indices,
     const treeBoundBox& bb,
     contentListList& result
 ) const
@@ -157,7 +157,7 @@ void Foam::dynamicIndexedOctree<Type>::divide
     {
         result.append
         (
-            autoPtr<DynamicList<label> >
+            autoPtr<DynamicList<label>>
             (
                 new DynamicList<label>(indices().size()/8)
             )
@@ -197,7 +197,7 @@ Foam::dynamicIndexedOctree<Type>::divide
     const label octantToBeDivided
 )
 {
-    const autoPtr<DynamicList<label> >& indices = contents_[contentI];
+    const autoPtr<DynamicList<label>>& indices = contents_[contentI];
 
     node nod;
 
@@ -226,7 +226,7 @@ Foam::dynamicIndexedOctree<Type>::divide
 
     for (direction octant = 0; octant < dividedIndices.size(); octant++)
     {
-        autoPtr<DynamicList<label> >& subIndices = dividedIndices[octant];
+        autoPtr<DynamicList<label>>& subIndices = dividedIndices[octant];
 
         if (subIndices().size())
         {
@@ -245,7 +245,7 @@ Foam::dynamicIndexedOctree<Type>::divide
 
                 contents_.append
                 (
-                    autoPtr<DynamicList<label> >
+                    autoPtr<DynamicList<label>>
                     (
                         new DynamicList<label>()
                     )
@@ -2677,7 +2677,7 @@ bool Foam::dynamicIndexedOctree<Type>::insert(label startIndex, label endIndex)
     {
         contents_.append
         (
-            autoPtr<DynamicList<label> >
+            autoPtr<DynamicList<label>>
             (
                 new DynamicList<label>(1)
             )
@@ -2771,7 +2771,7 @@ bool Foam::dynamicIndexedOctree<Type>::insertIndex
 
                 contents_.append
                 (
-                    autoPtr<DynamicList<label> >(new DynamicList<label>(1))
+                    autoPtr<DynamicList<label>>(new DynamicList<label>(1))
                 );
 
                 contents_[sz]().append(index);
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
index 3c1d969c46..e80b526461 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ SourceFiles
 namespace Foam
 {
 
-typedef DynamicList<autoPtr<DynamicList<label > > > contentListList;
+typedef DynamicList<autoPtr<DynamicList<label >>> contentListList;
 
 // Forward declaration of classes
 template<class Type> class dynamicIndexedOctree;
@@ -181,7 +181,7 @@ private:
             //  according to where they are in relation to mid.
             void divide
             (
-                const autoPtr<DynamicList<label> >& indices,
+                const autoPtr<DynamicList<label>>& indices,
                 const treeBoundBox& bb,
                 contentListList& result
             ) const;
@@ -435,9 +435,9 @@ public:
         );
 
         //- Clone
-        autoPtr<dynamicIndexedOctree<Type> > clone() const
+        autoPtr<dynamicIndexedOctree<Type>> clone() const
         {
-            return autoPtr<dynamicIndexedOctree<Type> >
+            return autoPtr<dynamicIndexedOctree<Type>>
             (
                 new dynamicIndexedOctree<Type>(*this)
             );
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index 9706ffc52f..3e2968117a 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ void Foam::indexedOctree<Type>::divide
     labelListList& result
 ) const
 {
-    List<DynamicList<label> > subIndices(8);
+    List<DynamicList<label>> subIndices(8);
     for (direction octant = 0; octant < subIndices.size(); octant++)
     {
         subIndices[octant].setCapacity(indices.size()/8);
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
index e111d4f4af..d1debf7f9f 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -434,9 +434,9 @@ public:
         indexedOctree(const Type& shapes, Istream& is);
 
         //- Clone
-        autoPtr<indexedOctree<Type> > clone() const
+        autoPtr<indexedOctree<Type>> clone() const
         {
-            return autoPtr<indexedOctree<Type> >
+            return autoPtr<indexedOctree<Type>>
             (
                 new indexedOctree<Type>(*this)
             );
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index ffe4e8a766..513efd8c9b 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,13 +92,13 @@ public:
         {}
 
         //- Construct by transferring the parameter contents
-        HashSet(const Xfer<HashSet<Key, Hash> >& hs)
+        HashSet(const Xfer<HashSet<Key, Hash>>& hs)
         :
             HashTable<nil, Key, Hash>(hs)
         {}
 
         //- Construct by transferring the parameter contents
-        HashSet(const Xfer<HashTable<nil, Key, Hash> >& hs)
+        HashSet(const Xfer<HashTable<nil, Key, Hash>>& hs)
         :
             HashTable<nil, Key, Hash>(hs)
         {}
@@ -208,7 +208,7 @@ HashSet<Key,Hash> operator^
 typedef HashSet<> wordHashSet;
 
 //- A HashSet with label keys.
-typedef HashSet<label, Hash<label> > labelHashSet;
+typedef HashSet<label, Hash<label>> labelHashSet;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index 2ebab1e3a9..7e36d1eb6e 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ Foam::HashTable<T, Key, Hash>::HashTable(const HashTable<T, Key, Hash>& ht)
 template<class T, class Key, class Hash>
 Foam::HashTable<T, Key, Hash>::HashTable
 (
-    const Xfer<HashTable<T, Key, Hash> >& ht
+    const Xfer<HashTable<T, Key, Hash>>& ht
 )
 :
     HashTableCore(),
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 0b3218c40b..b24990f5c1 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -205,7 +205,7 @@ public:
         HashTable(const HashTable<T, Key, Hash>&);
 
         //- Construct by transferring the parameter contents
-        HashTable(const Xfer<HashTable<T, Key, Hash> >&);
+        HashTable(const Xfer<HashTable<T, Key, Hash>>&);
 
 
     //- Destructor
@@ -290,7 +290,7 @@ public:
             void transfer(HashTable<T, Key, Hash>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<HashTable<T, Key, Hash> > xfer();
+            inline Xfer<HashTable<T, Key, Hash>> xfer();
 
 
     // Member Operators
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index 9839015f02..b3e3406da5 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ inline bool Foam::HashTable<T, Key, Hash>::set
 
 
 template<class T, class Key, class Hash>
-inline Foam::Xfer<Foam::HashTable<T, Key, Hash> >
+inline Foam::Xfer<Foam::HashTable<T, Key, Hash>>
 Foam::HashTable<T, Key, Hash>::xfer()
 {
     return xferMove(*this);
diff --git a/src/OpenFOAM/containers/HashTables/Map/Map.H b/src/OpenFOAM/containers/HashTables/Map/Map.H
index 61da5981fd..f9d6082ead 100644
--- a/src/OpenFOAM/containers/HashTables/Map/Map.H
+++ b/src/OpenFOAM/containers/HashTables/Map/Map.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,14 +49,14 @@ namespace Foam
 template<class T>
 class Map
 :
-    public HashTable<T, label, Hash<label> >
+    public HashTable<T, label, Hash<label>>
 {
 
 public:
 
-    typedef typename HashTable<T, label, Hash<label> >::iterator iterator;
+    typedef typename HashTable<T, label, Hash<label>>::iterator iterator;
 
-    typedef typename HashTable<T, label, Hash<label> >::const_iterator
+    typedef typename HashTable<T, label, Hash<label>>::const_iterator
         const_iterator;
 
     // Constructors
@@ -64,31 +64,31 @@ public:
         //- Construct given initial size
         Map(const label size = 128)
         :
-            HashTable<T, label, Hash<label> >(size)
+            HashTable<T, label, Hash<label>>(size)
         {}
 
         //- Construct from Istream
         Map(Istream& is)
         :
-            HashTable<T, label, Hash<label> >(is)
+            HashTable<T, label, Hash<label>>(is)
         {}
 
         //- Construct as copy
         Map(const Map<T>& map)
         :
-            HashTable<T, label, Hash<label> >(map)
+            HashTable<T, label, Hash<label>>(map)
         {}
 
         //- Construct by transferring the parameter contents
-        Map(const Xfer<Map<T> >& map)
+        Map(const Xfer<Map<T>>& map)
         :
-            HashTable<T, label, Hash<label> >(map)
+            HashTable<T, label, Hash<label>>(map)
         {}
 
         //- Construct by transferring the parameter contents
-        Map(const Xfer<HashTable<T, label, Hash<label> > >& map)
+        Map(const Xfer<HashTable<T, label, Hash<label>>>& map)
         :
-            HashTable<T, label, Hash<label> >(map)
+            HashTable<T, label, Hash<label>>(map)
         {}
 
 };
diff --git a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
index c225048b01..89054f95a1 100644
--- a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
+++ b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ namespace Foam
 template<class T>
 class PtrMap
 :
-    public HashPtrTable<T, label, Hash<label> >
+    public HashPtrTable<T, label, Hash<label>>
 {
 
 public:
@@ -59,19 +59,19 @@ public:
         //- Construct given initial map size
         PtrMap(const label size = 128)
         :
-            HashPtrTable<T, label, Hash<label> >(size)
+            HashPtrTable<T, label, Hash<label>>(size)
         {}
 
         //- Construct from Istream
         PtrMap(Istream& is)
         :
-            HashPtrTable<T, label, Hash<label> >(is)
+            HashPtrTable<T, label, Hash<label>>(is)
         {}
 
         //- Construct as copy
         PtrMap(const PtrMap<T>& map)
         :
-            HashPtrTable<T, label, Hash<label> >(map)
+            HashPtrTable<T, label, Hash<label>>(map)
         {}
 };
 
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
index 2b1dacbc39..f4fe74840f 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ Foam::StaticHashTable<T, Key, Hash>::StaticHashTable
 template<class T, class Key, class Hash>
 Foam::StaticHashTable<T, Key, Hash>::StaticHashTable
 (
-    const Xfer<StaticHashTable<T, Key, Hash> >& ht
+    const Xfer<StaticHashTable<T, Key, Hash>>& ht
 )
 :
     StaticHashTableCore(),
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
index d3372ed0e1..d10ae72bb4 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,10 +111,10 @@ class StaticHashTable
     // Private data type for table entries
 
         //- The lookup keys, ordered per hash value
-        List<List<Key> > keys_;
+        List<List<Key>> keys_;
 
         //- For each key the corresponding object.
-        List<List<T> > objects_;
+        List<List<T>> objects_;
 
         //- The current number of elements in table
         label nElmts_;
@@ -178,7 +178,7 @@ public:
         StaticHashTable(const StaticHashTable<T, Key, Hash>&);
 
         //- Construct by transferring the parameter contents
-        StaticHashTable(const Xfer<StaticHashTable<T, Key, Hash> >&);
+        StaticHashTable(const Xfer<StaticHashTable<T, Key, Hash>>&);
 
 
     //- Destructor
@@ -246,7 +246,7 @@ public:
             void transfer(StaticHashTable<T, Key, Hash>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<StaticHashTable<T, Key, Hash> > xfer();
+            inline Xfer<StaticHashTable<T, Key, Hash>> xfer();
 
 
     // Member Operators
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
index 49f84be2b4..50030eae94 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ inline bool Foam::StaticHashTable<T, Key, Hash>::set
 
 
 template<class T, class Key, class Hash>
-inline Foam::Xfer<Foam::StaticHashTable<T, Key, Hash> >
+inline Foam::Xfer<Foam::StaticHashTable<T, Key, Hash>>
 Foam::StaticHashTable<T, Key, Hash>::xfer()
 {
     return xferMove(*this);
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H b/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
index 70cb858119..df695531de 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,14 +69,14 @@ public:
     // Static Members
 
         //- Add labels to a list of values
-        inline static List<Keyed<T> > createList
+        inline static List<Keyed<T>> createList
         (
             const List<T>&,
             const label key=0
         );
 
         //- Add labels to a list of values
-        inline static List<Keyed<T> > createList
+        inline static List<Keyed<T>> createList
         (
             const List<T>&,
             const labelUList& keys
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
index ed5edf6c8f..d07aeb0f6a 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,10 +75,10 @@ inline Foam::label& Foam::Keyed<T>::key()
 
 
 template<class T>
-inline Foam::List<Foam::Keyed<T> >
+inline Foam::List<Foam::Keyed<T>>
 Foam::Keyed<T>::createList(const List<T>& lst, const label key)
 {
-    List<Keyed<T> > newList(lst.size());
+    List<Keyed<T>> newList(lst.size());
 
     forAll(lst, elemI)
     {
@@ -89,7 +89,7 @@ Foam::Keyed<T>::createList(const List<T>& lst, const label key)
 
 
 template<class T>
-inline Foam::List<Foam::Keyed<T> >
+inline Foam::List<Foam::Keyed<T>>
 Foam::Keyed<T>::createList(const List<T>& lst, const labelUList& keys)
 {
     if (lst.size() != keys.size())
@@ -101,7 +101,7 @@ Foam::Keyed<T>::createList(const List<T>& lst, const labelUList& keys)
             << abort(FatalError);
     }
 
-    List<Keyed<T> > newList(lst.size());
+    List<Keyed<T>> newList(lst.size());
 
     forAll(lst, elemI)
     {
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
index 667a0f40cb..e436c1f0dc 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ public:
         (
             const UList<T>& posList,
             const UList<T>& negList,
-            const Xfer<List<label> >&
+            const Xfer<List<label>>&
         );
 
 
@@ -101,7 +101,7 @@ public:
 
             //- Reset addressing
             inline void resetAddressing(const labelUList&);
-            inline void resetAddressing(const Xfer<List<label> >&);
+            inline void resetAddressing(const Xfer<List<label>>&);
 
 
         // Member Operators
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
index dcf70d41a5..1f1dd4de5b 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ inline Foam::BiIndirectList<T>::BiIndirectList
 (
     const UList<T>& posList,
     const UList<T>& negList,
-    const Xfer<List<label> >& addr
+    const Xfer<List<label>>& addr
 )
 :
     posList_(const_cast<UList<T>&>(posList)),
@@ -104,7 +104,7 @@ inline void Foam::BiIndirectList<T>::resetAddressing
 template<class T>
 inline void Foam::BiIndirectList<T>::resetAddressing
 (
-    const Xfer<List<label> >& addr
+    const Xfer<List<label>>& addr
 )
 {
     addressing_.transfer(addr());
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 4e18ee6176..164069d2fa 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ Foam::CompactListList<T, Container>::CompactListList
 template<class T, class Container>
 Foam::CompactListList<T, Container>::CompactListList
 (
-    const Xfer<CompactListList<T, Container> >& lst
+    const Xfer<CompactListList<T, Container>>& lst
 )
 {
     transfer(lst());
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index fe0e33da2d..5cfa0a07f2 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ template<class T, class Container> Ostream& operator<<
                        Class CompactListList Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class T, class Container = List<T> >
+template<class T, class Container = List<T>>
 class CompactListList
 {
     // Private data
@@ -102,7 +102,7 @@ public:
         //- Null constructor.
         inline CompactListList();
 
-        //- Construct by converting given List<List<T> >
+        //- Construct by converting given List<List<T>>
         explicit CompactListList(const List<Container>&);
 
         //- Construct given size of offset table (number of rows)
@@ -120,7 +120,7 @@ public:
         CompactListList(const labelUList& rowSizes, const T&);
 
         //- Construct by transferring the parameter contents
-        explicit CompactListList(const Xfer<CompactListList<T, Container> >&);
+        explicit CompactListList(const Xfer<CompactListList<T, Container>>&);
 
         //- Construct as copy or re-use as specified.
         CompactListList(CompactListList<T, Container>&, bool reUse);
@@ -129,7 +129,7 @@ public:
         CompactListList(Istream&);
 
         //- Clone
-        inline autoPtr<CompactListList<T, Container> > clone() const;
+        inline autoPtr<CompactListList<T, Container>> clone() const;
 
 
     // Member Functions
@@ -194,7 +194,7 @@ public:
             void transfer(CompactListList<T, Container>&);
 
             //- Transfer the contents to the Xfer container
-            inline Xfer<CompactListList<T, Container> > xfer();
+            inline Xfer<CompactListList<T, Container>> xfer();
 
         // Other
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
index c426fd151c..4abf848915 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,10 +63,10 @@ inline Foam::CompactListList<T, Container>::CompactListList
 
 
 template<class T, class Container>
-inline Foam::autoPtr<Foam::CompactListList<T, Container> >
+inline Foam::autoPtr<Foam::CompactListList<T, Container>>
 Foam::CompactListList<T, Container>::clone() const
 {
-    return autoPtr<CompactListList<T, Container> >
+    return autoPtr<CompactListList<T, Container>>
     (
         new CompactListList<T, Container>(*this)
     );
@@ -79,7 +79,7 @@ template<class T, class Container>
 inline const Foam::CompactListList<T, Container>&
 Foam::CompactListList<T, Container>::null()
 {
-    return NullObjectRef<CompactListList<T, Container> >();
+    return NullObjectRef<CompactListList<T, Container>>();
 }
 
 
@@ -165,7 +165,7 @@ inline Foam::label Foam::CompactListList<T, Container>::whichColumn
 
 
 template<class T, class Container>
-inline Foam::Xfer<Foam::CompactListList<T, Container> >
+inline Foam::Xfer<Foam::CompactListList<T, Container>>
 Foam::CompactListList<T, Container>::xfer()
 {
     return xferMove(*this);
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
index 0faff2764c..89e9eb5cd4 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
@@ -125,18 +125,18 @@ public:
 
         //- Return the normalised distribution (probability density)
         //  and bins
-        List<List<Pair<scalar>> > normalised() const;
+        List<List<Pair<scalar>>> normalised() const;
 
         //- Return the distribution of the total bin weights
-        List<List < Pair<scalar> > > raw() const;
+        List<List < Pair<scalar>>> raw() const;
 
         //- Return the cumulative normalised distribution and
         //  integration locations (at end of bins)
-        List<List<Pair<scalar>> > cumulativeNormalised() const;
+        List<List<Pair<scalar>>> cumulativeNormalised() const;
 
         //- Return the cumulative total bin weights and integration
         //  locations (at end of bins)
-        List<List<Pair<scalar>> > cumulativeRaw() const;
+        List<List<Pair<scalar>>> cumulativeRaw() const;
 
         //- Resets the Distribution by clearing the stored lists.
         //  Leaves the same number of them and the same binWidth.
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 0d9621c50d..e4a0b14253 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ public:
         explicit inline DynamicList(const UIndirectList<T>&);
 
         //- Construct by transferring the parameter contents
-        explicit inline DynamicList(const Xfer<List<T> >&);
+        explicit inline DynamicList(const Xfer<List<T>>&);
 
         //- Construct from Istream. Size set to size of list read.
         explicit DynamicList(Istream&);
@@ -178,7 +178,7 @@ public:
             inline void transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
 
             //- Transfer contents to the Xfer container as a plain List
-            inline Xfer<List<T> > xfer();
+            inline Xfer<List<T>> xfer();
 
 
         // Member Operators
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 80323a7b73..802cf9b17a 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -85,7 +85,7 @@ inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 (
-    const Xfer<List<T> >& lst
+    const Xfer<List<T>>& lst
 )
 :
     List<T>(lst),
@@ -297,7 +297,7 @@ Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::transfer
 
 
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
-inline Foam::Xfer<Foam::List<T> >
+inline Foam::Xfer<Foam::List<T>>
 Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::xfer()
 {
     return xferMoveTo<List<T>>(*this);
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index fa69e0a646..ed0fbc12b2 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -83,7 +83,7 @@ public:
 
     //- Hashing function class.
     //  Use Hasher directly for contiguous data. Otherwise hash incrementally.
-    template<class HashT=Hash<T> >
+    template<class HashT=Hash<T>>
     class Hash
     {
     public:
@@ -127,7 +127,7 @@ public:
         FixedList(Istream&);
 
         //- Clone
-        inline autoPtr<FixedList<T, Size> > clone() const;
+        inline autoPtr<FixedList<T, Size>> clone() const;
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index 16f7f1b16d..a647069599 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -95,10 +95,10 @@ inline Foam::FixedList<T, Size>::FixedList(const FixedList<T, Size>& lst)
 
 
 template<class T, unsigned Size>
-inline Foam::autoPtr<Foam::FixedList<T, Size> >
+inline Foam::autoPtr<Foam::FixedList<T, Size>>
 Foam::FixedList<T, Size>::clone() const
 {
-    return autoPtr<FixedList<T, Size> >(new FixedList<T, Size>(*this));
+    return autoPtr<FixedList<T, Size>>(new FixedList<T, Size>(*this));
 }
 
 
@@ -107,7 +107,7 @@ Foam::FixedList<T, Size>::clone() const
 template<class T, unsigned Size>
 inline const Foam::FixedList<T, Size>& Foam::FixedList<T, Size>::null()
 {
-    return NullObjectRef<FixedList<T, Size> >();
+    return NullObjectRef<FixedList<T, Size>>();
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
index 62e801dd98..2bf821a369 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ Foam::Istream& Foam::operator>>(Foam::Istream& is, FixedList<T, Size>& L)
 
         if (firstToken.isCompound())
         {
-            L = dynamicCast<token::Compound<List<T> > >
+            L = dynamicCast<token::Compound<List<T>>>
             (
                 firstToken.transferCompoundToken(is)
             );
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index 4af62fc864..1d554d7d7e 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -76,7 +76,7 @@ protected:
         explicit inline IndirectListAddressing(const labelUList& addr);
 
         //- Construct by transferring addressing array
-        explicit inline IndirectListAddressing(const Xfer<List<label> >& addr);
+        explicit inline IndirectListAddressing(const Xfer<List<label>>& addr);
 
 
     // Member Functions
@@ -90,7 +90,7 @@ protected:
 
             //- Reset addressing
             inline void resetAddressing(const labelUList&);
-            inline void resetAddressing(const Xfer<List<label> >&);
+            inline void resetAddressing(const Xfer<List<label>>&);
 
 };
 
@@ -122,7 +122,7 @@ public:
         inline IndirectList(const UList<T>&, const labelUList&);
 
         //- Construct given the complete list and by transferring addressing
-        inline IndirectList(const UList<T>&, const Xfer<List<label> >&);
+        inline IndirectList(const UList<T>&, const Xfer<List<label>>&);
 
         //- Copy constructor
         inline IndirectList(const IndirectList<T>&);
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
index b8374b0226..068b38ed9d 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ inline Foam::IndirectListAddressing::IndirectListAddressing
 
 inline Foam::IndirectListAddressing::IndirectListAddressing
 (
-    const Xfer<List<label> >& addr
+    const Xfer<List<label>>& addr
 )
 :
     addressing_(addr)
@@ -64,7 +64,7 @@ template<class T>
 inline Foam::IndirectList<T>::IndirectList
 (
     const UList<T>& completeList,
-    const Xfer<List<label> >& addr
+    const Xfer<List<label>>& addr
 )
 :
     IndirectListAddressing(addr),
@@ -126,7 +126,7 @@ inline void Foam::IndirectListAddressing::resetAddressing
 
 inline void Foam::IndirectListAddressing::resetAddressing
 (
-    const Xfer<List<label> >& addr
+    const Xfer<List<label>>& addr
 )
 {
     addressing_.transfer(addr());
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index e184284d82..cd766c8ed1 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ Foam::List<T>::List(const List<T>& a)
 
 // Construct by transferring the parameter contents
 template<class T>
-Foam::List<T>::List(const Xfer<List<T> >& lst)
+Foam::List<T>::List(const Xfer<List<T>>& lst)
 {
     transfer(lst());
 }
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 0523b55b75..ba1e75ad1f 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ public:
         List(const List<T>&);
 
         //- Construct by transferring the parameter contents
-        List(const Xfer<List<T> >&);
+        List(const Xfer<List<T>>&);
 
         //- Construct as copy or re-use as specified.
         List(List<T>&, bool reUse);
@@ -141,7 +141,7 @@ public:
         List(Istream&);
 
         //- Clone
-        inline autoPtr<List<T> > clone() const;
+        inline autoPtr<List<T>> clone() const;
 
 
     //- Destructor
@@ -200,7 +200,7 @@ public:
             void transfer(SortableList<T>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<List<T> > xfer();
+            inline Xfer<List<T>> xfer();
 
             //- Return subscript-checked element of UList.
             inline T& newElmt(const label);
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index f304da6e21..1d1e991244 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,9 +31,9 @@ inline Foam::List<T>::List()
 
 
 template<class T>
-inline Foam::autoPtr<Foam::List<T> > Foam::List<T>::clone() const
+inline Foam::autoPtr<Foam::List<T>> Foam::List<T>::clone() const
 {
-    return autoPtr<List<T> >(new List<T>(*this));
+    return autoPtr<List<T>>(new List<T>(*this));
 }
 
 
@@ -42,7 +42,7 @@ inline Foam::autoPtr<Foam::List<T> > Foam::List<T>::clone() const
 template<class T>
 inline const Foam::List<T>& Foam::List<T>::null()
 {
-    return NullObjectRef<List<T> >();
+    return NullObjectRef<List<T>>();
 }
 
 
@@ -87,7 +87,7 @@ inline Foam::label Foam::List<T>::size() const
 
 
 template<class T>
-inline Foam::Xfer<Foam::List<T> > Foam::List<T>::xfer()
+inline Foam::Xfer<Foam::List<T>> Foam::List<T>::xfer()
 {
     return xferMove(*this);
 }
diff --git a/src/OpenFOAM/containers/Lists/List/ListIO.C b/src/OpenFOAM/containers/Lists/List/ListIO.C
index 4480234cd0..97d338470b 100644
--- a/src/OpenFOAM/containers/Lists/List/ListIO.C
+++ b/src/OpenFOAM/containers/Lists/List/ListIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ Foam::Istream& Foam::operator>>(Istream& is, List<T>& L)
     {
         L.transfer
         (
-            dynamicCast<token::Compound<List<T> > >
+            dynamicCast<token::Compound<List<T>>>
             (
                 firstToken.transferCompoundToken(is)
             )
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
index 4909cf9240..904d6f1644 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ public:
         inline PackedBoolList(const Xfer<PackedBoolList>&);
 
         //- Construct by transferring the parameter contents
-        inline PackedBoolList(const Xfer<PackedList<1> >&);
+        inline PackedBoolList(const Xfer<PackedList<1>>&);
 
         //- Construct from a list of bools
         explicit inline PackedBoolList(const Foam::UList<bool>&);
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
index 3a76fdc65c..772ef763d3 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ inline Foam::PackedBoolList::PackedBoolList(const Xfer<PackedBoolList>& lst)
 }
 
 
-inline Foam::PackedBoolList::PackedBoolList(const Xfer<PackedList<1> >& lst)
+inline Foam::PackedBoolList::PackedBoolList(const Xfer<PackedList<1>>& lst)
 :
     PackedList<1>(lst)
 {}
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 1766cbe028..8b44cc362b 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -226,7 +226,7 @@ public:
         inline PackedList(const PackedList<nBits>&);
 
         //- Construct by transferring the parameter contents
-        inline PackedList(const Xfer<PackedList<nBits> >&);
+        inline PackedList(const Xfer<PackedList<nBits>>&);
 
         //- Construct from a list of labels
         explicit inline PackedList(const labelUList&);
@@ -344,7 +344,7 @@ public:
             inline void transfer(PackedList<nBits>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<PackedList<nBits> > xfer();
+            inline Xfer<PackedList<nBits>> xfer();
 
 
         // IO
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 01f21e37ad..e4a56f9b70 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -222,7 +222,7 @@ inline Foam::PackedList<nBits>::PackedList(const PackedList<nBits>& lst)
 
 
 template<unsigned nBits>
-inline Foam::PackedList<nBits>::PackedList(const Xfer<PackedList<nBits> >& lst)
+inline Foam::PackedList<nBits>::PackedList(const Xfer<PackedList<nBits>>& lst)
 {
     transfer(lst());
 }
@@ -257,10 +257,10 @@ inline Foam::PackedList<nBits>::PackedList(const UIndirectList<label>& lst)
 
 
 template<unsigned nBits>
-inline Foam::autoPtr<Foam::PackedList<nBits> >
+inline Foam::autoPtr<Foam::PackedList<nBits>>
 Foam::PackedList<nBits>::clone() const
 {
-    return autoPtr<PackedList<nBits> >(new PackedList<nBits>(*this));
+    return autoPtr<PackedList<nBits>>(new PackedList<nBits>(*this));
 }
 
 
@@ -954,7 +954,7 @@ inline void Foam::PackedList<nBits>::transfer(PackedList<nBits>& lst)
 
 
 template<unsigned nBits>
-inline Foam::Xfer<Foam::PackedList<nBits> > Foam::PackedList<nBits>::xfer()
+inline Foam::Xfer<Foam::PackedList<nBits>> Foam::PackedList<nBits>::xfer()
 {
     return xferMove(*this);
 }
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
index db29382769..d526142159 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ Foam::PtrList<T>::PtrList(const PtrList<T>& a, const CloneArg& cloneArg)
 
 
 template<class T>
-Foam::PtrList<T>::PtrList(const Xfer<PtrList<T> >& lst)
+Foam::PtrList<T>::PtrList(const Xfer<PtrList<T>>& lst)
 {
     transfer(lst());
 }
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index b3b2924d9f..80b751c220 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -158,7 +158,7 @@ public:
         PtrList(const PtrList<T>&, const CloneArg&);
 
         //- Construct by transferring the parameter contents
-        PtrList(const Xfer<PtrList<T> >&);
+        PtrList(const Xfer<PtrList<T>>&);
 
         //- Construct as copy or re-use as specified.
         PtrList(PtrList<T>&, bool reUse);
@@ -224,7 +224,7 @@ public:
             void transfer(PtrList<T>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<PtrList<T> > xfer();
+            inline Xfer<PtrList<T>> xfer();
 
             //- Is element set
             inline bool set(const label) const;
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
index c9065e8c46..2913f19106 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,7 +142,7 @@ inline Foam::autoPtr<T> Foam::PtrList<T>::set
 
 
 template<class T>
-inline Foam::Xfer<Foam::PtrList<T> > Foam::PtrList<T>::xfer()
+inline Foam::Xfer<Foam::PtrList<T>> Foam::PtrList<T>::xfer()
 {
     return xferMove(*this);
 }
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
index d610a56a04..784b1f9e1d 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ Foam::SortableList<T>::SortableList(const UList<T>& values)
 
 
 template<class T>
-Foam::SortableList<T>::SortableList(const Xfer<List<T> >& values)
+Foam::SortableList<T>::SortableList(const Xfer<List<T>>& values)
 :
     List<T>(values)
 {
@@ -122,9 +122,9 @@ void Foam::SortableList<T>::reverseSort()
 
 
 template<class T>
-Foam::Xfer<Foam::List<T> > Foam::SortableList<T>::xfer()
+Foam::Xfer<Foam::List<T>> Foam::SortableList<T>::xfer()
 {
-    return xferMoveTo<List<T> >(*this);
+    return xferMoveTo<List<T>>(*this);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
index 2d7b31a9e8..56fa2e20c1 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ public:
         explicit SortableList(const UList<T>&);
 
         //- Construct from transferred List, sorting immediately.
-        explicit SortableList(const Xfer<List<T> >&);
+        explicit SortableList(const Xfer<List<T>>&);
 
         //- Construct given size. Sort later on.
         //  The indices remain empty until the list is sorted
@@ -113,7 +113,7 @@ public:
         void reverseSort();
 
         //- Transfer contents to the Xfer container as a plain List
-        inline Xfer<List<T> > xfer();
+        inline Xfer<List<T>> xfer();
 
 
     // Member Operators
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
index ce8b19e592..a0b9f32807 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
@@ -74,7 +74,7 @@ inline Foam::SubList<T>::SubList
 template<class T>
 inline const Foam::SubList<T>& Foam::SubList<T>::null()
 {
-    return NullObjectRef<SubList<T> >();
+    return NullObjectRef<SubList<T>>();
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UListI.H b/src/OpenFOAM/containers/Lists/UList/UListI.H
index aaf526d636..523abb2d29 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListI.H
+++ b/src/OpenFOAM/containers/Lists/UList/UListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ inline Foam::UList<T>::UList(T* __restrict__ v, label size)
 template<class T>
 inline const Foam::UList<T>& Foam::UList<T>::null()
 {
-    return NullObjectRef<UList<T> >();
+    return NullObjectRef<UList<T>>();
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UListIO.C b/src/OpenFOAM/containers/Lists/UList/UListIO.C
index bb888a7fd2..e31b5dd2bc 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListIO.C
+++ b/src/OpenFOAM/containers/Lists/UList/UListIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,7 +152,7 @@ Foam::Istream& Foam::operator>>(Istream& is, UList<T>& L)
         List<T> elems;
         elems.transfer
         (
-            dynamicCast<token::Compound<List<T> > >
+            dynamicCast<token::Compound<List<T>>>
             (
                 firstToken.transferCompoundToken(is)
             )
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
index 139877c409..3a6a7c2d96 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::UPtrList<T>::UPtrList(const label s)
 
 
 template<class T>
-Foam::UPtrList<T>::UPtrList(const Xfer<UPtrList<T> >& lst)
+Foam::UPtrList<T>::UPtrList(const Xfer<UPtrList<T>>& lst)
 {
     transfer(lst());
 }
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
index cdf32f630a..02aee9f141 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ public:
         explicit UPtrList(const label);
 
         //- Construct by transferring the parameter contents
-        UPtrList(const Xfer<UPtrList<T> >&);
+        UPtrList(const Xfer<UPtrList<T>>&);
 
         //- Construct as copy or re-use as specified.
         UPtrList(UPtrList<T>&, bool reUse);
@@ -159,7 +159,7 @@ public:
             void transfer(UPtrList<T>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<UPtrList<T> > xfer();
+            inline Xfer<UPtrList<T>> xfer();
 
             //- Is element set
             inline bool set(const label) const;
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
index 2f69d16929..7162cd5c3d 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ inline T* Foam::UPtrList<T>::set(const label i, T* ptr)
 
 
 template<class T>
-inline Foam::Xfer<Foam::UPtrList<T> > Foam::UPtrList<T>::xfer()
+inline Foam::Xfer<Foam::UPtrList<T>> Foam::UPtrList<T>::xfer()
 {
     return xferMove(*this);
 }
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
index 9cdaf8de88..c5e369b1cf 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ template<class T, class BaseType>
 Foam::CompactIOField<T, BaseType>::CompactIOField
 (
     const IOobject& io,
-    const Xfer<Field<T> >& list
+    const Xfer<Field<T>>& list
 )
 :
     regIOobject(io)
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
index 31edac7970..f7bdf4b48c 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ public:
         CompactIOField(const IOobject&, const Field<T>&);
 
         //- Construct by transferring the Field contents
-        CompactIOField(const IOobject&, const Xfer<Field<T> >&);
+        CompactIOField(const IOobject&, const Xfer<Field<T>>&);
 
 
     // Destructor
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
index 5d7756dd42..b742b293b1 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ template<class T, class BaseType>
 Foam::CompactIOList<T, BaseType>::CompactIOList
 (
     const IOobject& io,
-    const Xfer<List<T> >& list
+    const Xfer<List<T>>& list
 )
 :
     regIOobject(io)
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
index dc06092c59..7c8628ef1c 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ public:
         CompactIOList(const IOobject&, const List<T>&);
 
         //- Construct by transferring the List contents
-        CompactIOList(const IOobject&, const Xfer<List<T> >&);
+        CompactIOList(const IOobject&, const Xfer<List<T>>&);
 
 
     // Destructor
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
index 9d47700da8..5002c32f2a 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,7 +126,7 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Field<Type>& f)
 
 
 template<class Type>
-Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type> >& f)
+Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type>>& f)
 :
     regIOobject(io)
 {
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
index 5c18b4e4ff..29768ee62d 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ public:
         IOField(const IOobject&, const Field<Type>&);
 
         //- Construct by transferring the Field contents
-        IOField(const IOobject&, const Xfer<Field<Type> >&);
+        IOField(const IOobject&, const Xfer<Field<Type>>&);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.C b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
index 1bd99eff9a..3fd35a5d0b 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.C
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ Foam::IOList<T>::IOList(const IOobject& io, const List<T>& list)
 
 
 template<class T>
-Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T> >& list)
+Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T>>& list)
 :
     regIOobject(io)
 {
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.H b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
index ef3f5c341f..8a54d99aac 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.H
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ public:
         IOList(const IOobject&, const List<T>&);
 
         //- Construct by transferring the List contents
-        IOList(const IOobject&, const Xfer<List<T> >&);
+        IOList(const IOobject&, const Xfer<List<T>>&);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
index f2921af31a..4701df5548 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const Map<T>& map)
 
 
 template<class T>
-Foam::IOMap<T>::IOMap(const IOobject& io, const Xfer<Map<T> >& map)
+Foam::IOMap<T>::IOMap(const IOobject& io, const Xfer<Map<T>>& map)
 :
     regIOobject(io)
 {
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
index 71d254bd6b..5d9cae6b5f 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ public:
         IOMap(const IOobject&, const Map<T>&);
 
         //- Construct by transferring the Map contents
-        IOMap(const IOobject&, const Xfer<Map<T> >&);
+        IOMap(const IOobject&, const Xfer<Map<T>>&);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
index a002e62b2b..1c806bfab1 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const PtrList<T>& list)
 
 
 template<class T>
-Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const Xfer<PtrList<T> >& list)
+Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const Xfer<PtrList<T>>& list)
 :
     regIOobject(io)
 {
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
index 5267f38a20..cef88c4608 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ public:
         IOPtrList(const IOobject&, const PtrList<T>&);
 
         //- Construct by transferring the PtrList contents
-        IOPtrList(const IOobject&, const Xfer<PtrList<T> >&);
+        IOPtrList(const IOobject&, const Xfer<PtrList<T>>&);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index 718366cd5b..5da9dd218b 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,10 +102,10 @@ class PstreamBuffers
         const IOstream::versionNumber version_;
 
         //- Send buffer
-        List<DynamicList<char> > sendBuf_;
+        List<DynamicList<char>> sendBuf_;
 
         //- Receive buffer
-        List<DynamicList<char> > recvBuf_;
+        List<DynamicList<char>> recvBuf_;
 
         //- Read position in recvBuf_
         labelList recvBufPos_;
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 7249823d02..6a332a1f4e 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ Foam::List<Foam::UPstream::commsStruct> Foam::UPstream::calcLinearComm
 void Foam::UPstream::collectReceives
 (
     const label procID,
-    const List<DynamicList<label> >& receives,
+    const List<DynamicList<label>>& receives,
     DynamicList<label>& allReceives
 )
 {
@@ -170,7 +170,7 @@ Foam::List<Foam::UPstream::commsStruct> Foam::UPstream::calcTreeComm
         nLevels++;
     }
 
-    List<DynamicList<label> > receives(nProcs);
+    List<DynamicList<label>> receives(nProcs);
     labelList sends(nProcs, -1);
 
     // Info<< "Using " << nLevels << " communication levels" << endl;
@@ -201,7 +201,7 @@ Foam::List<Foam::UPstream::commsStruct> Foam::UPstream::calcTreeComm
 
     // For all processors find the processors it receives data from
     // (and the processors they receive data from etc.)
-    List<DynamicList<label> > allReceives(nProcs);
+    List<DynamicList<label>> allReceives(nProcs);
     for (label procID = 0; procID < nProcs; procID++)
     {
         collectReceives(procID, receives, allReceives[procID]);
@@ -388,7 +388,7 @@ Foam::LIFOStack<Foam::label> Foam::UPstream::freeComms_;
 Foam::DynamicList<int> Foam::UPstream::myProcNo_(10);
 
 // List of process IDs
-Foam::DynamicList<Foam::List<int> > Foam::UPstream::procIDs_(10);
+Foam::DynamicList<Foam::List<int>> Foam::UPstream::procIDs_(10);
 
 // Parent communicator
 Foam::DynamicList<Foam::label> Foam::UPstream::parentCommunicator_(10);
@@ -397,11 +397,11 @@ Foam::DynamicList<Foam::label> Foam::UPstream::parentCommunicator_(10);
 int Foam::UPstream::msgType_(1);
 
 // Linear communication schedule
-Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct> >
+Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct>>
 Foam::UPstream::linearCommunication_(10);
 
 // Multi level communication schedule
-Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct> >
+Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct>>
 Foam::UPstream::treeCommunication_(10);
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 09706b704d..615f9a6fb5 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -188,11 +188,11 @@ private:
 
         static LIFOStack<label> freeComms_;
         static DynamicList<int> myProcNo_;
-        static DynamicList<List<int> > procIDs_;
+        static DynamicList<List<int>> procIDs_;
         static DynamicList<label> parentCommunicator_;
 
-        static DynamicList<List<commsStruct> > linearCommunication_;
-        static DynamicList<List<commsStruct> > treeCommunication_;
+        static DynamicList<List<commsStruct>> linearCommunication_;
+        static DynamicList<List<commsStruct>> treeCommunication_;
 
 
     // Private Member Functions
@@ -211,7 +211,7 @@ private:
         static void collectReceives
         (
             const label procID,
-            const List<DynamicList<label> >& receives,
+            const List<DynamicList<label>>& receives,
             DynamicList<label>& allReceives
         );
 
diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
index 55c04d0d94..9a179e2d07 100644
--- a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
+++ b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ public:
         ITstream
         (
             const string& name,
-            const Xfer<List<token> >& tokens,
+            const Xfer<List<token>>& tokens,
             streamFormat format=ASCII,
             versionNumber version=currentVersion
         )
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 3b5775b955..7b7eeee54c 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -444,7 +444,7 @@ Ostream& operator<<(Ostream& os, const InfoProxy<token>& ip);
     defineTemplateTypeNameAndDebugWithName(token::Compound<Type>, #Type, 0);
 
 #define addCompoundToRunTimeSelectionTable(Type, Name)                        \
-    token::compound::addIstreamConstructorToTable<token::Compound<Type> >     \
+    token::compound::addIstreamConstructorToTable<token::Compound<Type>>     \
         add##Name##IstreamConstructorToTable_;
 
 
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 0221242a83..a85406d53f 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ bool Foam::dictionary::findInPatterns
     const bool patternMatch,
     const word& Keyword,
     DLList<entry*>::const_iterator& wcLink,
-    DLList<autoPtr<regExp> >::const_iterator& reLink
+    DLList<autoPtr<regExp>>::const_iterator& reLink
 ) const
 {
     if (patternEntries_.size())
@@ -82,7 +82,7 @@ bool Foam::dictionary::findInPatterns
     const bool patternMatch,
     const word& Keyword,
     DLList<entry*>::iterator& wcLink,
-    DLList<autoPtr<regExp> >::iterator& reLink
+    DLList<autoPtr<regExp>>::iterator& reLink
 )
 {
     if (patternEntries_.size())
@@ -319,7 +319,7 @@ bool Foam::dictionary::found
         {
             DLList<entry*>::const_iterator wcLink =
                 patternEntries_.begin();
-            DLList<autoPtr<regExp> >::const_iterator reLink =
+            DLList<autoPtr<regExp>>::const_iterator reLink =
                 patternRegexps_.begin();
 
             // Find in patterns using regular expressions only
@@ -356,7 +356,7 @@ const Foam::entry* Foam::dictionary::lookupEntryPtr
         {
             DLList<entry*>::const_iterator wcLink =
                 patternEntries_.begin();
-            DLList<autoPtr<regExp> >::const_iterator reLink =
+            DLList<autoPtr<regExp>>::const_iterator reLink =
                 patternRegexps_.begin();
 
             // Find in patterns using regular expressions only
@@ -395,7 +395,7 @@ Foam::entry* Foam::dictionary::lookupEntryPtr
         {
             DLList<entry*>::iterator wcLink =
                 patternEntries_.begin();
-            DLList<autoPtr<regExp> >::iterator reLink =
+            DLList<autoPtr<regExp>>::iterator reLink =
                 patternRegexps_.begin();
 
             // Find in patterns using regular expressions only
@@ -889,7 +889,7 @@ bool Foam::dictionary::remove(const word& Keyword)
         // Delete from patterns first
         DLList<entry*>::iterator wcLink =
             patternEntries_.begin();
-        DLList<autoPtr<regExp> >::iterator reLink =
+        DLList<autoPtr<regExp>>::iterator reLink =
             patternRegexps_.begin();
 
         // Find in pattern using exact match only
@@ -957,7 +957,7 @@ bool Foam::dictionary::changeKeyword
                 // Delete from patterns first
                 DLList<entry*>::iterator wcLink =
                     patternEntries_.begin();
-                DLList<autoPtr<regExp> >::iterator reLink =
+                DLList<autoPtr<regExp>>::iterator reLink =
                     patternRegexps_.begin();
 
                 // Find in patterns using exact match only
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index bbba527971..040e829fb4 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,7 +156,7 @@ class dictionary
         DLList<entry*> patternEntries_;
 
         //- Patterns as precompiled regular expressions
-        DLList<autoPtr<regExp> > patternRegexps_;
+        DLList<autoPtr<regExp>> patternRegexps_;
 
 
    // Private Member Functions
@@ -167,7 +167,7 @@ class dictionary
             const bool patternMatch,
             const word& Keyword,
             DLList<entry*>::const_iterator& wcLink,
-            DLList<autoPtr<regExp> >::const_iterator& reLink
+            DLList<autoPtr<regExp>>::const_iterator& reLink
         ) const;
 
         //- Search patterns table for exact match or regular expression match
@@ -176,7 +176,7 @@ class dictionary
             const bool patternMatch,
             const word& Keyword,
             DLList<entry*>::iterator& wcLink,
-            DLList<autoPtr<regExp> >::iterator& reLink
+            DLList<autoPtr<regExp>>::iterator& reLink
         );
 
 
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
index 5e4d15eb08..9bc12364b4 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ Foam::primitiveEntry::primitiveEntry
 Foam::primitiveEntry::primitiveEntry
 (
     const keyType& key,
-    const Xfer<List<token> >& tokens
+    const Xfer<List<token>>& tokens
 )
 :
     entry(key),
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index 2930e5f121..35314c46e0 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ public:
         primitiveEntry(const keyType&, const UList<token>&);
 
         //- Construct from keyword and by transferring a list of tokens
-        primitiveEntry(const keyType&, const Xfer<List<token> >&);
+        primitiveEntry(const keyType&, const Xfer<List<token>>&);
 
         //- Construct from keyword and a T
         template<class T>
diff --git a/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H
index e2c1eab272..a8ddcb9145 100644
--- a/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table */                        \
     baseType::add##memberFunction##argNames##                                 \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##         \
     baseType##Table_
 
@@ -77,7 +77,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table, find by lookup name */   \
     baseType::add##memberFunction##argNames##                                 \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add_##lookup##_##thisType##Targ##memberFunction##argNames##               \
     MemberFunctionTo##baseType##Table_(#lookup)
 
@@ -87,7 +87,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table */                        \
     baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##         \
     baseType##Targ##Table_
 
@@ -97,7 +97,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table, find by lookup name */   \
     baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add_##lookup##_##thisType##Targ##memberFunction##argNames##               \
     MemberFunctionTo##baseType##Targ##Table_(#lookup)
 
@@ -112,7 +112,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table */                        \
     baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##         \
     baseType##Targ##Table_
 
@@ -124,7 +124,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table, find by lookup name */   \
     baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add_##lookup##_##thisType##Targ##memberFunction##argNames##               \
     MemberFunctionTo##baseType##Targ##Table_(#lookup)
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index 3c3abf215d..cd49f12880 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,7 +144,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
 (
-    const Xfer<DimensionedField<Type, GeoMesh> >& df
+    const Xfer<DimensionedField<Type, GeoMesh>>& df
 )
 :
     regIOobject(df(), true),
@@ -158,7 +158,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 :
     regIOobject(tdf(), tdf.isTmp()),
@@ -237,7 +237,7 @@ template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
 (
     const word& newName,
-    const Xfer<DimensionedField<Type, GeoMesh> >& df
+    const Xfer<DimensionedField<Type, GeoMesh>>& df
 )
 :
     regIOobject(newName, df, true),
@@ -252,7 +252,7 @@ template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
 (
     const word& newName,
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 :
     regIOobject(newName, tdf(), true),
@@ -270,10 +270,10 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<Type, GeoMesh> >
+tmp<DimensionedField<Type, GeoMesh>>
 DimensionedField<Type, GeoMesh>::clone() const
 {
-    return tmp<DimensionedField<Type, GeoMesh> >
+    return tmp<DimensionedField<Type, GeoMesh>>
     (
         new DimensionedField<Type, GeoMesh>(*this)
     );
@@ -300,7 +300,7 @@ DimensionedField<Type, GeoMesh>::component
     const direction d
 ) const
 {
-    tmp<DimensionedField<cmptType, GeoMesh> > result
+    tmp<DimensionedField<cmptType, GeoMesh>> result
     (
         new DimensionedField<cmptType, GeoMesh>
         (
@@ -350,10 +350,10 @@ void DimensionedField<Type, GeoMesh>::replace
 
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<Type, GeoMesh> >
+tmp<DimensionedField<Type, GeoMesh>>
 DimensionedField<Type, GeoMesh>::T() const
 {
-    tmp<DimensionedField<Type, GeoMesh> > result
+    tmp<DimensionedField<Type, GeoMesh>> result
     (
         new DimensionedField<Type, GeoMesh>
         (
@@ -409,7 +409,7 @@ dimensioned<Type> DimensionedField<Type, GeoMesh>::weightedAverage
 template<class Type, class GeoMesh>
 dimensioned<Type> DimensionedField<Type, GeoMesh>::weightedAverage
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tweightField
+    const tmp<DimensionedField<scalar, GeoMesh>>& tweightField
 ) const
 {
     dimensioned<Type> wa = weightedAverage(tweightField());
@@ -444,7 +444,7 @@ void DimensionedField<Type, GeoMesh>::operator=
 template<class Type, class GeoMesh>
 void DimensionedField<Type, GeoMesh>::operator=
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 {
     const DimensionedField<Type, GeoMesh>& df = tdf();
@@ -493,7 +493,7 @@ void DimensionedField<Type, GeoMesh>::operator op                             \
 template<class Type, class GeoMesh>                                           \
 void DimensionedField<Type, GeoMesh>::operator op                             \
 (                                                                             \
-    const tmp<DimensionedField<TYPE, GeoMesh> >& tdf                          \
+    const tmp<DimensionedField<TYPE, GeoMesh>>& tdf                          \
 )                                                                             \
 {                                                                             \
     operator op(tdf());                                                       \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index b3beb9577c..81817fdeba 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ template<class Type, class GeoMesh> Ostream& operator<<
 template<class Type, class GeoMesh> Ostream& operator<<
 (
     Ostream&,
-    const tmp<DimensionedField<Type, GeoMesh> >&
+    const tmp<DimensionedField<Type, GeoMesh>>&
 );
 
 
@@ -165,14 +165,14 @@ public:
         //- Construct by transferring the DimensionedField
         DimensionedField
         (
-            const Xfer<DimensionedField<Type, GeoMesh> >&
+            const Xfer<DimensionedField<Type, GeoMesh>>&
         );
 
         //- Construct as copy of tmp<DimensionedField> deleting argument
         #ifndef NoConstructFromTmp
         DimensionedField
         (
-            const tmp<DimensionedField<Type, GeoMesh> >&
+            const tmp<DimensionedField<Type, GeoMesh>>&
         );
         #endif
 
@@ -210,7 +210,7 @@ public:
         DimensionedField
         (
             const word& newName,
-            const Xfer<DimensionedField<Type, GeoMesh> >&
+            const Xfer<DimensionedField<Type, GeoMesh>>&
         );
 
         //- Construct as copy resetting name
@@ -218,12 +218,12 @@ public:
         DimensionedField
         (
             const word& newName,
-            const tmp<DimensionedField<Type, GeoMesh> >&
+            const tmp<DimensionedField<Type, GeoMesh>>&
         );
         #endif
 
         //- Clone
-        tmp<DimensionedField<Type, GeoMesh> > clone() const;
+        tmp<DimensionedField<Type, GeoMesh>> clone() const;
 
 
     //- Destructor
@@ -252,7 +252,7 @@ public:
         inline Field<Type>& field();
 
         //- Return a component field of the field
-        tmp<DimensionedField<cmptType, GeoMesh> > component
+        tmp<DimensionedField<cmptType, GeoMesh>> component
         (
             const direction
         ) const;
@@ -268,11 +268,11 @@ public:
         void replace
         (
             const direction,
-            const tmp<DimensionedField<cmptType, GeoMesh> >&
+            const tmp<DimensionedField<cmptType, GeoMesh>>&
         );
 
         //- Return the field transpose (only defined for second rank tensors)
-        tmp<DimensionedField<Type, GeoMesh> > T() const;
+        tmp<DimensionedField<Type, GeoMesh>> T() const;
 
         //- Calculate and return arithmetic average
         dimensioned<Type> average() const;
@@ -286,7 +286,7 @@ public:
         //- Calculate and return weighted average
         dimensioned<Type> weightedAverage
         (
-            const tmp<DimensionedField<scalar, GeoMesh> >&
+            const tmp<DimensionedField<scalar, GeoMesh>>&
         ) const;
 
 
@@ -300,20 +300,20 @@ public:
     // Member Operators
 
         void operator=(const DimensionedField<Type, GeoMesh>&);
-        void operator=(const tmp<DimensionedField<Type, GeoMesh> >&);
+        void operator=(const tmp<DimensionedField<Type, GeoMesh>>&);
         void operator=(const dimensioned<Type>&);
 
         void operator+=(const DimensionedField<Type, GeoMesh>&);
-        void operator+=(const tmp<DimensionedField<Type, GeoMesh> >&);
+        void operator+=(const tmp<DimensionedField<Type, GeoMesh>>&);
 
         void operator-=(const DimensionedField<Type, GeoMesh>&);
-        void operator-=(const tmp<DimensionedField<Type, GeoMesh> >&);
+        void operator-=(const tmp<DimensionedField<Type, GeoMesh>>&);
 
         void operator*=(const DimensionedField<scalar, GeoMesh>&);
-        void operator*=(const tmp<DimensionedField<scalar, GeoMesh> >&);
+        void operator*=(const tmp<DimensionedField<scalar, GeoMesh>>&);
 
         void operator/=(const DimensionedField<scalar, GeoMesh>&);
-        void operator/=(const tmp<DimensionedField<scalar, GeoMesh> >&);
+        void operator/=(const tmp<DimensionedField<scalar, GeoMesh>>&);
 
         void operator+=(const dimensioned<Type>&);
         void operator-=(const dimensioned<Type>&);
@@ -333,7 +333,7 @@ public:
         friend Ostream& operator<< <Type, GeoMesh>
         (
             Ostream&,
-            const tmp<DimensionedField<Type, GeoMesh> >&
+            const tmp<DimensionedField<Type, GeoMesh>>&
         );
 };
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
index 66f6c7bee1..cc070b715c 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * //
 
 template<class Type, class GeoMesh, int r>
-tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh> >
+tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
     const DimensionedField<Type, GeoMesh>& df,
@@ -45,7 +45,7 @@ pow
 {
     typedef typename powProduct<Type, r>::type powProductType;
 
-    tmp<DimensionedField<powProductType, GeoMesh> > tPow
+    tmp<DimensionedField<powProductType, GeoMesh>> tPow
     (
         new DimensionedField<powProductType, GeoMesh>
         (
@@ -67,10 +67,10 @@ pow
 
 
 template<class Type, class GeoMesh, int r>
-tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh> >
+tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf,
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf,
     typename powProduct<Type, r>::type
 )
 {
@@ -78,7 +78,7 @@ pow
 
     const DimensionedField<Type, GeoMesh>& df = tdf();
 
-    tmp<DimensionedField<powProductType, GeoMesh> > tPow =
+    tmp<DimensionedField<powProductType, GeoMesh>> tPow =
         reuseTmpDimensionedField<powProductType, Type, GeoMesh>::New
         (
             tdf,
@@ -94,12 +94,12 @@ pow
 }
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh> >
+tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
 sqr(const DimensionedField<Type, GeoMesh>& df)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
 
-    tmp<DimensionedField<outerProductType, GeoMesh> > tSqr
+    tmp<DimensionedField<outerProductType, GeoMesh>> tSqr
     (
         new DimensionedField<outerProductType, GeoMesh>
         (
@@ -120,14 +120,14 @@ sqr(const DimensionedField<Type, GeoMesh>& df)
 }
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh> >
-sqr(const tmp<DimensionedField<Type, GeoMesh> >& tdf)
+tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
+sqr(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
 
     const DimensionedField<Type, GeoMesh>& df = tdf();
 
-    tmp<DimensionedField<outerProductType, GeoMesh> > tSqr =
+    tmp<DimensionedField<outerProductType, GeoMesh>> tSqr =
         reuseTmpDimensionedField<outerProductType, Type, GeoMesh>::New
         (
             tdf,
@@ -144,12 +144,12 @@ sqr(const tmp<DimensionedField<Type, GeoMesh> >& tdf)
 
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > magSqr
+tmp<DimensionedField<scalar, GeoMesh>> magSqr
 (
     const DimensionedField<Type, GeoMesh>& df
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tMagSqr
+    tmp<DimensionedField<scalar, GeoMesh>> tMagSqr
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -170,14 +170,14 @@ tmp<DimensionedField<scalar, GeoMesh> > magSqr
 }
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > magSqr
+tmp<DimensionedField<scalar, GeoMesh>> magSqr
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 {
     const DimensionedField<Type, GeoMesh>& df = tdf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tMagSqr =
+    tmp<DimensionedField<scalar, GeoMesh>> tMagSqr =
         reuseTmpDimensionedField<scalar, Type, GeoMesh>::New
         (
             tdf,
@@ -194,12 +194,12 @@ tmp<DimensionedField<scalar, GeoMesh> > magSqr
 
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > mag
+tmp<DimensionedField<scalar, GeoMesh>> mag
 (
     const DimensionedField<Type, GeoMesh>& df
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tMag
+    tmp<DimensionedField<scalar, GeoMesh>> tMag
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -220,14 +220,14 @@ tmp<DimensionedField<scalar, GeoMesh> > mag
 }
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > mag
+tmp<DimensionedField<scalar, GeoMesh>> mag
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 {
     const DimensionedField<Type, GeoMesh>& df = tdf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tMag =
+    tmp<DimensionedField<scalar, GeoMesh>> tMag =
         reuseTmpDimensionedField<scalar, Type, GeoMesh>::New
         (
             tdf,
@@ -253,7 +253,7 @@ cmptAv(const DimensionedField<Type, GeoMesh>& df)
 {
     typedef typename DimensionedField<Type, GeoMesh>::cmptType cmptType;
 
-    tmp<DimensionedField<cmptType, GeoMesh> > CmptAv
+    tmp<DimensionedField<cmptType, GeoMesh>> CmptAv
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -279,14 +279,14 @@ tmp
     DimensionedField
         <typename DimensionedField<Type, GeoMesh>::cmptType, GeoMesh>
 >
-cmptAv(const tmp<DimensionedField<Type, GeoMesh> >& tdf)
+cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
 {
     typedef typename DimensionedField<Type, GeoMesh>::cmptType
         cmptType;
 
     const DimensionedField<Type, GeoMesh>& df = tdf();
 
-    tmp<DimensionedField<cmptType, GeoMesh> > CmptAv =
+    tmp<DimensionedField<cmptType, GeoMesh>> CmptAv =
         reuseTmpDimensionedField<cmptType, Type, GeoMesh>::New
         (
             tdf,
@@ -320,7 +320,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, class GeoMesh>                                           \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 )                                                                             \
 {                                                                             \
     dimensioned<returnType> res = func(tdf1());                               \
@@ -367,7 +367,7 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 #define PRODUCT_OPERATOR(product, op, opFunc)                                 \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
@@ -375,7 +375,7 @@ operator op                                                                   \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<DimensionedField<productType, GeoMesh> > tRes                         \
+    tmp<DimensionedField<productType, GeoMesh>> tRes                         \
     (                                                                         \
         new DimensionedField<productType, GeoMesh>                            \
         (                                                                     \
@@ -396,18 +396,18 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
                                                                               \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes =                       \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
         reuseTmpDimensionedField<productType, Type2, GeoMesh>::New            \
         (                                                                     \
             tdf2,                                                             \
@@ -423,10 +423,10 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
@@ -434,7 +434,7 @@ operator op                                                                   \
                                                                               \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes =                       \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
         reuseTmpDimensionedField<productType, Type1, GeoMesh>::New            \
         (                                                                     \
             tdf1,                                                             \
@@ -450,11 +450,11 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
@@ -462,7 +462,7 @@ operator op                                                                   \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes =                       \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
         reuseTmpTmpDimensionedField                                           \
         <productType, Type1, Type1, Type2, GeoMesh>::New                      \
         (                                                                     \
@@ -481,7 +481,7 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type, GeoMesh>& df1,                               \
@@ -490,7 +490,7 @@ operator op                                                                   \
 {                                                                             \
     typedef typename product<Type, Form>::type productType;                   \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes                         \
+    tmp<DimensionedField<productType, GeoMesh>> tRes                         \
     (                                                                         \
         new DimensionedField<productType, GeoMesh>                            \
         (                                                                     \
@@ -511,7 +511,7 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type, GeoMesh>& df1,                               \
@@ -523,10 +523,10 @@ operator op                                                                   \
                                                                               \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1,                        \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
     const dimensioned<Form>& dvs                                              \
 )                                                                             \
 {                                                                             \
@@ -534,7 +534,7 @@ operator op                                                                   \
                                                                               \
     const DimensionedField<Type, GeoMesh>& df1 = tdf1();                      \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes =                       \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
         reuseTmpDimensionedField<productType, Type, GeoMesh>::New             \
         (                                                                     \
             tdf1,                                                             \
@@ -550,10 +550,10 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1,                        \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
 )                                                                             \
 {                                                                             \
@@ -562,7 +562,7 @@ operator op                                                                   \
                                                                               \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
@@ -570,7 +570,7 @@ operator op                                                                   \
 )                                                                             \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
-    tmp<DimensionedField<productType, GeoMesh> > tRes                         \
+    tmp<DimensionedField<productType, GeoMesh>> tRes                         \
     (                                                                         \
         new DimensionedField<productType, GeoMesh>                            \
         (                                                                     \
@@ -591,7 +591,7 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
@@ -602,18 +602,18 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 )                                                                             \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
                                                                               \
     const DimensionedField<Type, GeoMesh>& df1 = tdf1();                      \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes =                       \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
         reuseTmpDimensionedField<productType, Type, GeoMesh>::New             \
         (                                                                     \
             tdf1,                                                             \
@@ -629,11 +629,11 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 )                                                                             \
 {                                                                             \
     return dimensioned<Form>(static_cast<const Form&>(vs)) op tdf1;           \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
index df4efeb8ea..09deae37e9 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * //
 
 template<class Type, class GeoMesh, int r>
-tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh> >
+tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
     const DimensionedField<Type, GeoMesh>& df,
@@ -44,43 +44,43 @@ pow
 );
 
 template<class Type, class GeoMesh, int r>
-tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh> >
+tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf,
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf,
     typename powProduct<Type, r>::type
 );
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh> >
+tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
 sqr(const DimensionedField<Type, GeoMesh>& df);
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh> >
-sqr(const tmp<DimensionedField<Type, GeoMesh> >& tdf);
+tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
+sqr(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > magSqr
+tmp<DimensionedField<scalar, GeoMesh>> magSqr
 (
     const DimensionedField<Type, GeoMesh>& df
 );
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > magSqr
+tmp<DimensionedField<scalar, GeoMesh>> magSqr
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 );
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > mag
+tmp<DimensionedField<scalar, GeoMesh>> mag
 (
     const DimensionedField<Type, GeoMesh>& df
 );
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > mag
+tmp<DimensionedField<scalar, GeoMesh>> mag
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 );
 
 template<class Type, class GeoMesh>
@@ -97,7 +97,7 @@ tmp
     DimensionedField
         <typename DimensionedField<Type, GeoMesh>::cmptType, GeoMesh>
 >
-cmptAv(const tmp<DimensionedField<Type, GeoMesh> >& tdf);
+cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
 
 
 #define UNARY_REDUCTION_FUNCTION(returnType, func, dfunc)                     \
@@ -110,7 +110,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, class GeoMesh>                                           \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 );
 
 UNARY_REDUCTION_FUNCTION(Type, max, gMax)
@@ -152,7 +152,7 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 #define PRODUCT_OPERATOR(product, op, opFunc)                                 \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
@@ -160,31 +160,31 @@ operator op                                                                   \
 );                                                                            \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type, GeoMesh>& df1,                               \
@@ -192,7 +192,7 @@ operator op                                                                   \
 );                                                                            \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type, GeoMesh>& df1,                               \
@@ -200,23 +200,23 @@ operator op                                                                   \
 );                                                                            \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1,                        \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
     const dimensioned<Form>& dvs                                              \
 );                                                                            \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1,                        \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
 );                                                                            \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
@@ -224,7 +224,7 @@ operator op                                                                   \
 );                                                                            \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
@@ -232,19 +232,19 @@ operator op                                                                   \
 );                                                                            \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 );                                                                            \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 );
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
index 85310c12fc..bd33ca2c60 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,12 +30,12 @@ License
 #define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                        \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -56,14 +56,14 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -86,12 +86,12 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc, Dfunc)                  \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -112,14 +112,14 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -142,13 +142,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 #define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -169,15 +169,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
         (                                                                     \
@@ -195,15 +195,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -221,16 +221,16 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpTmpDimensionedField                                           \
             <ReturnType, Type1, Type1, Type2, GeoMesh>::New                   \
@@ -256,13 +256,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -283,7 +283,7 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const Type1& t1,                                                          \
     const DimensionedField<Type2, GeoMesh>& df2                               \
@@ -294,15 +294,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
         (                                                                     \
@@ -320,10 +320,10 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     return Func(dimensioned<Type2>(t1), tdf2);                                \
@@ -333,13 +333,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -360,7 +360,7 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const Type2& t2                                                           \
@@ -371,15 +371,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -397,9 +397,9 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const Type2& t2                                                           \
 )                                                                             \
 {                                                                             \
@@ -417,13 +417,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)         \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -444,15 +444,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
         (                                                                     \
@@ -470,15 +470,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -496,16 +496,16 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpTmpDimensionedField                                           \
             <ReturnType, Type1, Type1, Type2, GeoMesh>::New                   \
@@ -531,13 +531,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -558,7 +558,7 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const Type1& t1,                                                          \
     const DimensionedField<Type2, GeoMesh>& df2                               \
@@ -569,15 +569,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
         (                                                                     \
@@ -595,10 +595,10 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     return dimensioned<Type1>(t1) Op tdf2;                                    \
@@ -608,13 +608,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -635,7 +635,7 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const Type2& t2                                                           \
@@ -646,15 +646,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -672,9 +672,9 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const Type2& t2                                                           \
 )                                                                             \
 {                                                                             \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
index 66b2ada8fe..1ed114443c 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,15 +28,15 @@ License
 #define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                        \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df                                \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
 );
 
 
@@ -45,15 +45,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define UNARY_OPERATOR(ReturnType, Type1, Op, opFunc, Dfunc)                  \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
 );
 
 
@@ -62,31 +62,31 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 #define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );
 
 
@@ -95,61 +95,61 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const Type1& t1,                                                          \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );
 
 
 #define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const Type2& t2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf2,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf2,                       \
     const Type2& t2                                                           \
 );
 
@@ -164,31 +164,31 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)         \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );
 
 
@@ -197,61 +197,61 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const Type1& t1,                                                          \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );
 
 
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const Type2& t2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const Type2& t2                                                           \
 );
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
index f2aa000604..64cfd31589 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ template<class Type, class GeoMesh>
 inline const Foam::DimensionedField<Type, GeoMesh>&
 Foam::DimensionedField<Type, GeoMesh>::null()
 {
-    return NullObjectRef<DimensionedField<Type, GeoMesh> >();
+    return NullObjectRef<DimensionedField<Type, GeoMesh>>();
 }
 
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
index be049a4be8..0a7b215147 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ template<class Type, class GeoMesh>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 {
     tdf().writeData(os);
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
index 806745808f..2df208e96e 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,16 +38,16 @@ class reuseTmpDimensionedField
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,
+        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
         const word& name,
         const dimensionSet& dimensions
     )
     {
         const DimensionedField<Type1, GeoMesh>& df1 = tdf1();
 
-        return tmp<DimensionedField<TypeR, GeoMesh> >
+        return tmp<DimensionedField<TypeR, GeoMesh>>
         (
             new DimensionedField<TypeR, GeoMesh>
             (
@@ -63,7 +63,7 @@ public:
         );
     }
 
-    static void clear(const tmp<DimensionedField<Type1, GeoMesh> >& tdf1)
+    static void clear(const tmp<DimensionedField<Type1, GeoMesh>>& tdf1)
     {
         tdf1.clear();
     }
@@ -75,9 +75,9 @@ class reuseTmpDimensionedField<TypeR, TypeR, GeoMesh>
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -93,7 +93,7 @@ public:
         }
         else
         {
-            return tmp<DimensionedField<TypeR, GeoMesh> >
+            return tmp<DimensionedField<TypeR, GeoMesh>>
             (
                 new DimensionedField<TypeR, GeoMesh>
                 (
@@ -110,7 +110,7 @@ public:
         }
     }
 
-    static void clear(const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1)
+    static void clear(const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1)
     {
         if (tdf1.isTmp())
         {
@@ -125,17 +125,17 @@ class reuseTmpTmpDimensionedField
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh> >& tdf2,
+        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
         const DimensionedField<Type1, GeoMesh>& df1 = tdf1();
 
-        return tmp<DimensionedField<TypeR, GeoMesh> >
+        return tmp<DimensionedField<TypeR, GeoMesh>>
         (
             new DimensionedField<TypeR, GeoMesh>
             (
@@ -153,8 +153,8 @@ public:
 
     static void clear
     (
-        const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh> >& tdf2
+        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2
     )
     {
         tdf1.clear();
@@ -168,10 +168,10 @@ class reuseTmpTmpDimensionedField<TypeR, Type1, Type12, TypeR, GeoMesh>
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf2,
+        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -188,7 +188,7 @@ public:
         }
         else
         {
-            return tmp<DimensionedField<TypeR, GeoMesh> >
+            return tmp<DimensionedField<TypeR, GeoMesh>>
             (
                 new DimensionedField<TypeR, GeoMesh>
                 (
@@ -207,8 +207,8 @@ public:
 
     static void clear
     (
-        const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf2
+        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2
     )
     {
         tdf1.clear();
@@ -225,10 +225,10 @@ class reuseTmpTmpDimensionedField<TypeR, TypeR, TypeR, Type2, GeoMesh>
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh> >& tdf2,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -244,7 +244,7 @@ public:
         }
         else
         {
-            return tmp<DimensionedField<TypeR, GeoMesh> >
+            return tmp<DimensionedField<TypeR, GeoMesh>>
             (
                 new DimensionedField<TypeR, GeoMesh>
                 (
@@ -263,8 +263,8 @@ public:
 
     static void clear
     (
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh> >& tdf2
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2
     )
     {
         if (tdf1.isTmp())
@@ -281,10 +281,10 @@ class reuseTmpTmpDimensionedField<TypeR, TypeR, TypeR, TypeR, GeoMesh>
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf2,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -308,7 +308,7 @@ public:
         }
         else
         {
-            return tmp<DimensionedField<TypeR, GeoMesh> >
+            return tmp<DimensionedField<TypeR, GeoMesh>>
             (
                 new DimensionedField<TypeR, GeoMesh>
                 (
@@ -327,8 +327,8 @@ public:
 
     static void clear
     (
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf2
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2
     )
     {
         if (tdf1.isTmp())
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H
index e4f69802b8..e0e4282fb4 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,13 +103,13 @@ public:
         static inline const SubDimensionedField<Type, GeoMesh>& null();
 
         //- Return a component field of the field
-        inline tmp<DimensionedField<cmptType, GeoMesh> > component
+        inline tmp<DimensionedField<cmptType, GeoMesh>> component
         (
             const direction
         ) const;
 
         //- Return the field transpose (only defined for second rank tensors)
-        tmp<DimensionedField<Type, GeoMesh> > T() const;
+        tmp<DimensionedField<Type, GeoMesh>> T() const;
 
 
     // Member operators
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
index ecddcc04ba..215a525421 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ template<class Type, class GeoMesh>
 inline const Foam::SubDimensionedField<Type, GeoMesh>&
 Foam::SubDimensionedField<Type, GeoMesh>::null()
 {
-    return NullObjectRef<SubDimensionedField<Type, GeoMesh> >();
+    return NullObjectRef<SubDimensionedField<Type, GeoMesh>>();
 }
 
 
@@ -97,7 +97,7 @@ Foam::SubDimensionedField<Type, GeoMesh>::component
 
 
 template<class Type, class GeoMesh>
-inline Foam::tmp<Foam::DimensionedField<Type, GeoMesh> >
+inline Foam::tmp<Foam::DimensionedField<Type, GeoMesh>>
 Foam::SubDimensionedField<Type, GeoMesh>::T() const
 {
     return
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
index 8d1429f500..5426d79c53 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,13 +36,13 @@ namespace Foam
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > stabilise
+tmp<DimensionedField<scalar, GeoMesh>> stabilise
 (
     const DimensionedField<scalar, GeoMesh>& dsf,
     const dimensioned<scalar>& ds
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tRes
+    tmp<DimensionedField<scalar, GeoMesh>> tRes
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -64,15 +64,15 @@ tmp<DimensionedField<scalar, GeoMesh> > stabilise
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > stabilise
+tmp<DimensionedField<scalar, GeoMesh>> stabilise
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf,
     const dimensioned<scalar>& ds
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tRes =
+    tmp<DimensionedField<scalar, GeoMesh>> tRes =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf,
@@ -101,13 +101,13 @@ BINARY_TYPE_OPERATOR_SF(scalar, scalar, scalar, /, '|', divide)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const DimensionedField<scalar, GeoMesh>& dsf1,
     const DimensionedField<scalar, GeoMesh>& dsf2
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tPow
+    tmp<DimensionedField<scalar, GeoMesh>> tPow
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -133,15 +133,15 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf1,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf1,
     const DimensionedField<scalar, GeoMesh>& dsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tPow =
+    tmp<DimensionedField<scalar, GeoMesh>> tPow =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf1,
@@ -162,15 +162,15 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const DimensionedField<scalar, GeoMesh>& dsf1,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf2
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tPow =
+    tmp<DimensionedField<scalar, GeoMesh>> tPow =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf2,
@@ -190,16 +190,16 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf1,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf2
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf1,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
     const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tPow =
+    tmp<DimensionedField<scalar, GeoMesh>> tPow =
         reuseTmpTmpDimensionedField<scalar, scalar, scalar, scalar, GeoMesh>::
         New
         (
@@ -226,13 +226,13 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const DimensionedField<scalar, GeoMesh>& dsf,
     const dimensionedScalar& ds
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tPow
+    tmp<DimensionedField<scalar, GeoMesh>> tPow
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -253,15 +253,15 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf,
     const dimensionedScalar& ds
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tPow =
+    tmp<DimensionedField<scalar, GeoMesh>> tPow =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf,
@@ -277,7 +277,7 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const DimensionedField<scalar, GeoMesh>& dsf,
     const scalar& s
@@ -287,9 +287,9 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf,
     const scalar& s
 )
 {
@@ -298,13 +298,13 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
     const DimensionedField<scalar, GeoMesh>& dsf
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tPow
+    tmp<DimensionedField<scalar, GeoMesh>> tPow
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -326,15 +326,15 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tPow =
+    tmp<DimensionedField<scalar, GeoMesh>> tPow =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf,
@@ -350,7 +350,7 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const scalar& s,
     const DimensionedField<scalar, GeoMesh>& dsf
@@ -360,10 +360,10 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const scalar& s,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf
 )
 {
     return pow(dimensionedScalar(s), tdsf);
@@ -373,13 +373,13 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const DimensionedField<scalar, GeoMesh>& dsf1,
     const DimensionedField<scalar, GeoMesh>& dsf2
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -401,15 +401,15 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf1,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf1,
     const DimensionedField<scalar, GeoMesh>& dsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2 =
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf1,
@@ -426,15 +426,15 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const DimensionedField<scalar, GeoMesh>& dsf1,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf2
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2 =
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf2,
@@ -450,16 +450,16 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf1,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf2
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf1,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
     const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2 =
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
         reuseTmpTmpDimensionedField<scalar, scalar, scalar, scalar, GeoMesh>::
         New
         (
@@ -482,13 +482,13 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const DimensionedField<scalar, GeoMesh>& dsf,
     const dimensionedScalar& ds
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -509,15 +509,15 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf,
     const dimensionedScalar& ds
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2 =
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf,
@@ -533,7 +533,7 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const DimensionedField<scalar, GeoMesh>& dsf,
     const scalar& s
@@ -543,9 +543,9 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf,
     const scalar& s
 )
 {
@@ -554,13 +554,13 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const dimensionedScalar& ds,
     const DimensionedField<scalar, GeoMesh>& dsf
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -582,15 +582,15 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const dimensionedScalar& ds,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2 =
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf,
@@ -606,7 +606,7 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const scalar& s,
     const DimensionedField<scalar, GeoMesh>& dsf
@@ -616,10 +616,10 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const scalar& s,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf
 )
 {
     return atan2(dimensionedScalar(s), tdsf);
@@ -670,7 +670,7 @@ UNARY_FUNCTION(scalar, scalar, y1, trans)
 #define BesselFunc(func)                                                    \
                                                                             \
 template<class GeoMesh>                                                     \
-tmp<DimensionedField<scalar, GeoMesh> > func                                \
+tmp<DimensionedField<scalar, GeoMesh>> func                                \
 (                                                                           \
     const int n,                                                            \
     const DimensionedField<scalar, GeoMesh>& dsf                            \
@@ -683,7 +683,7 @@ tmp<DimensionedField<scalar, GeoMesh> > func                                \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
-    tmp<DimensionedField<scalar, GeoMesh> > tFunc                           \
+    tmp<DimensionedField<scalar, GeoMesh>> tFunc                           \
     (                                                                       \
         new DimensionedField<scalar, GeoMesh>                               \
         (                                                                   \
@@ -704,10 +704,10 @@ tmp<DimensionedField<scalar, GeoMesh> > func                                \
 }                                                                           \
                                                                             \
 template<class GeoMesh>                                                     \
-tmp<DimensionedField<scalar, GeoMesh> > func                                \
+tmp<DimensionedField<scalar, GeoMesh>> func                                \
 (                                                                           \
     const int n,                                                            \
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf                     \
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf                     \
 )                                                                           \
 {                                                                           \
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();                  \
@@ -719,7 +719,7 @@ tmp<DimensionedField<scalar, GeoMesh> > func                                \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
-    tmp<DimensionedField<scalar, GeoMesh> > tFunc                           \
+    tmp<DimensionedField<scalar, GeoMesh>> tFunc                           \
     (                                                                       \
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New              \
         (                                                                   \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
index 1734c9dde0..1120223176 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,16 +49,16 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > stabilise
+tmp<DimensionedField<scalar, GeoMesh>> stabilise
 (
     const DimensionedField<scalar, GeoMesh>&,
     const dimensioned<scalar>&
 );
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > stabilise
+tmp<DimensionedField<scalar, GeoMesh>> stabilise
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >&,
+    const tmp<DimensionedField<scalar, GeoMesh>>&,
     const dimensioned<scalar>&
 );
 
@@ -124,17 +124,17 @@ UNARY_FUNCTION(scalar, scalar, y1, trans)
 #define BesselFunc(func)                                                       \
                                                                                \
 template<class GeoMesh>                                                        \
-tmp<DimensionedField<scalar, GeoMesh> > func                                   \
+tmp<DimensionedField<scalar, GeoMesh>> func                                   \
 (                                                                              \
     const int n,                                                               \
     const DimensionedField<scalar, GeoMesh>&                                   \
 );                                                                             \
                                                                                \
 template<class GeoMesh>                                                        \
-tmp<DimensionedField<scalar, GeoMesh> > func                                   \
+tmp<DimensionedField<scalar, GeoMesh>> func                                   \
 (                                                                              \
     const int n,                                                               \
-    const tmp<DimensionedField<scalar, GeoMesh> >&                             \
+    const tmp<DimensionedField<scalar, GeoMesh>>&                             \
 );
 
 BesselFunc(jn)
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index 6042b20448..c15243f392 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,14 +107,14 @@ void checkFields
 template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField()
 :
-    PtrList<Field<Type> >()
+    PtrList<Field<Type>>()
 {}
 
 
 template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(const label size)
 :
-    PtrList<Field<Type> >(size)
+    PtrList<Field<Type>>(size)
 {}
 
 
@@ -125,7 +125,7 @@ FieldField<Field, Type>::FieldField
     const FieldField<Field, Type>& ff
 )
 :
-    PtrList<Field<Type> >(ff.size())
+    PtrList<Field<Type>>(ff.size())
 {
     forAll(*this, i)
     {
@@ -138,7 +138,7 @@ template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(const FieldField<Field, Type>& f)
 :
     refCount(),
-    PtrList<Field<Type> >(f)
+    PtrList<Field<Type>>(f)
 {}
 
 
@@ -146,23 +146,23 @@ template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(FieldField<Field, Type>& f, bool reUse)
 :
     refCount(),
-    PtrList<Field<Type> >(f, reUse)
+    PtrList<Field<Type>>(f, reUse)
 {}
 
 
 template<template<class> class Field, class Type>
-FieldField<Field, Type>::FieldField(const PtrList<Field<Type> >& tl)
+FieldField<Field, Type>::FieldField(const PtrList<Field<Type>>& tl)
 :
-    PtrList<Field<Type> >(tl)
+    PtrList<Field<Type>>(tl)
 {}
 
 
 // Construct as copy of tmp<FieldField>
 #ifndef NoConstructFromTmp
 template<template<class> class Field, class Type>
-FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type> >& tf)
+FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type>>& tf)
 :
-    PtrList<Field<Type> >
+    PtrList<Field<Type>>
     (
         const_cast<FieldField<Field, Type>&>(tf()),
         tf.isTmp()
@@ -176,20 +176,20 @@ FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type> >& tf)
 template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(Istream& is)
 :
-    PtrList<Field<Type> >(is)
+    PtrList<Field<Type>>(is)
 {}
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > FieldField<Field, Type>::clone() const
+tmp<FieldField<Field, Type>> FieldField<Field, Type>::clone() const
 {
-    return tmp<FieldField<Field, Type> >(new FieldField<Field, Type>(*this));
+    return tmp<FieldField<Field, Type>>(new FieldField<Field, Type>(*this));
 }
 
 
 template<template<class> class Field, class Type>
 template<class Type2>
-tmp<FieldField<Field, Type> > FieldField<Field, Type>::NewCalculatedType
+tmp<FieldField<Field, Type>> FieldField<Field, Type>::NewCalculatedType
 (
     const FieldField<Field, Type2>& ff
 )
@@ -204,7 +204,7 @@ tmp<FieldField<Field, Type> > FieldField<Field, Type>::NewCalculatedType
         nffPtr->set(i, Field<Type>::NewCalculatedType(ff[i]).ptr());
     }
 
-    return tmp<FieldField<Field, Type> >(nffPtr);
+    return tmp<FieldField<Field, Type>>(nffPtr);
 }
 
 
@@ -221,13 +221,13 @@ void FieldField<Field, Type>::negate()
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> >
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>>
 FieldField<Field, Type>::component
 (
     const direction d
 ) const
 {
-    tmp<FieldField<Field, cmptType> > Component
+    tmp<FieldField<Field, cmptType>> Component
     (
         FieldField<Field, typename FieldField<Field, Type>::cmptType>::
             NewCalculatedType(*this)
@@ -268,9 +268,9 @@ void FieldField<Field, Type>::replace
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > FieldField<Field, Type>::T() const
+tmp<FieldField<Field, Type>> FieldField<Field, Type>::T() const
 {
-    tmp<FieldField<Field, Type> > transpose
+    tmp<FieldField<Field, Type>> transpose
     (
         FieldField<Field, Type>::NewCalculatedType(*this)
     );
@@ -311,7 +311,7 @@ void FieldField<Field, Type>::operator=(const tmp<FieldField>& tf)
 
     // This is dodgy stuff, don't try this at home.
     FieldField* fieldPtr = tf.ptr();
-    PtrList<Field<Type> >::transfer(*fieldPtr);
+    PtrList<Field<Type>>::transfer(*fieldPtr);
     delete fieldPtr;
 }
 
@@ -340,7 +340,7 @@ void FieldField<Field, Type>::operator op(const FieldField<Field, TYPE>& f)   \
 template<template<class> class Field, class Type>                             \
 void FieldField<Field, Type>::operator op                                     \
 (                                                                             \
-    const tmp<FieldField<Field, TYPE> >& tf                                   \
+    const tmp<FieldField<Field, TYPE>>& tf                                   \
 )                                                                             \
 {                                                                             \
     operator op(tf());                                                        \
@@ -369,13 +369,13 @@ COMPUTED_ASSIGNMENT(scalar, /=)
 template<template<class> class Field, class Type>
 Ostream& operator<<(Ostream& os, const FieldField<Field, Type>& f)
 {
-    os << static_cast<const PtrList<Field<Type> >&>(f);
+    os << static_cast<const PtrList<Field<Type>>&>(f);
     return os;
 }
 
 
 template<template<class> class Field, class Type>
-Ostream& operator<<(Ostream& os, const tmp<FieldField<Field, Type> >& tf)
+Ostream& operator<<(Ostream& os, const tmp<FieldField<Field, Type>>& tf)
 {
     os << tf();
     tf.clear();
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
index 94f89dbf6a..3c1134e207 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ template<template<class> class Field, class Type>
 Ostream& operator<<
 (
     Ostream&,
-    const tmp<FieldField<Field, Type> >&
+    const tmp<FieldField<Field, Type>>&
 );
 
 
@@ -74,7 +74,7 @@ template<template<class> class Field, class Type>
 class FieldField
 :
     public refCount,
-    public PtrList<Field<Type> >
+    public PtrList<Field<Type>>
 {
 
 public:
@@ -105,23 +105,23 @@ public:
         FieldField(FieldField<Field, Type>&, bool reUse);
 
         //- Construct as copy of a PtrList<Field, Type>
-        FieldField(const PtrList<Field<Type> >&);
+        FieldField(const PtrList<Field<Type>>&);
 
         //- Construct as copy of tmp<FieldField>
         #ifndef NoConstructFromTmp
-        FieldField(const tmp<FieldField<Field, Type> >&);
+        FieldField(const tmp<FieldField<Field, Type>>&);
         #endif
 
         //- Construct from Istream
         FieldField(Istream&);
 
         //- Clone
-        tmp<FieldField<Field, Type> > clone() const;
+        tmp<FieldField<Field, Type>> clone() const;
 
         //- Return a pointer to a new calculatedFvPatchFieldField created on
         //  freestore without setting patchField values
         template<class Type2>
-        static tmp<FieldField<Field, Type> > NewCalculatedType
+        static tmp<FieldField<Field, Type>> NewCalculatedType
         (
             const FieldField<Field, Type2>& ff
         );
@@ -133,7 +133,7 @@ public:
         void negate();
 
         //- Return a component field of the field
-        tmp<FieldField<Field, cmptType> > component(const direction) const;
+        tmp<FieldField<Field, cmptType>> component(const direction) const;
 
         //- Replace a component field of the field
         void replace(const direction, const FieldField<Field, cmptType>&);
@@ -142,26 +142,26 @@ public:
         void replace(const direction, const cmptType&);
 
         //- Return the field transpose (only defined for second rank tensors)
-        tmp<FieldField<Field, Type> > T() const;
+        tmp<FieldField<Field, Type>> T() const;
 
 
     // Member operators
 
         void operator=(const FieldField<Field, Type>&);
-        void operator=(const tmp<FieldField<Field, Type> >&);
+        void operator=(const tmp<FieldField<Field, Type>>&);
         void operator=(const Type&);
 
         void operator+=(const FieldField<Field, Type>&);
-        void operator+=(const tmp<FieldField<Field, Type> >&);
+        void operator+=(const tmp<FieldField<Field, Type>>&);
 
         void operator-=(const FieldField<Field, Type>&);
-        void operator-=(const tmp<FieldField<Field, Type> >&);
+        void operator-=(const tmp<FieldField<Field, Type>>&);
 
         void operator*=(const FieldField<Field, scalar>&);
-        void operator*=(const tmp<FieldField<Field, scalar> >&);
+        void operator*=(const tmp<FieldField<Field, scalar>>&);
 
         void operator/=(const FieldField<Field, scalar>&);
-        void operator/=(const tmp<FieldField<Field, scalar> >&);
+        void operator/=(const tmp<FieldField<Field, scalar>>&);
 
         void operator+=(const Type&);
         void operator-=(const Type&);
@@ -181,7 +181,7 @@ public:
         friend Ostream& operator<< <Field, Type>
         (
             Ostream&,
-            const tmp<FieldField<Field, Type> >&
+            const tmp<FieldField<Field, Type>>&
         );
 };
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index 1c6a990f35..3c5b726de6 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,14 +75,14 @@ void pow
 }
 
 template<template<class> class Field, class Type, int r>
-tmp<FieldField<Field, typename powProduct<Type, r>::type> >
+tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
     const FieldField<Field, Type>& f, typename powProduct<Type, r>::type
 )
 {
     typedef typename powProduct<Type, r>::type powProductType;
-    tmp<FieldField<Field, powProductType> > tRes
+    tmp<FieldField<Field, powProductType>> tRes
     (
         FieldField<Field, powProductType>::NewCalculatedType(f)
     );
@@ -91,14 +91,14 @@ pow
 }
 
 template<template<class> class Field, class Type, int r>
-tmp<FieldField<Field, typename powProduct<Type, r>::type> >
+tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
-    const tmp<FieldField<Field, Type> >& tf, typename powProduct<Type, r>::type
+    const tmp<FieldField<Field, Type>>& tf, typename powProduct<Type, r>::type
 )
 {
     typedef typename powProduct<Type, r>::type powProductType;
-    tmp<FieldField<Field, powProductType> > tRes
+    tmp<FieldField<Field, powProductType>> tRes
     (
         reuseTmpFieldField<Field, powProductType, Type>::New(tf)
     );
@@ -122,11 +122,11 @@ void sqr
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename outerProduct<Type, Type>::type> >
+tmp<FieldField<Field, typename outerProduct<Type, Type>::type>>
 sqr(const FieldField<Field, Type>& f)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
-    tmp<FieldField<Field, outerProductType> > tRes
+    tmp<FieldField<Field, outerProductType>> tRes
     (
         FieldField<Field, outerProductType>::NewCalculatedType(f)
     );
@@ -135,11 +135,11 @@ sqr(const FieldField<Field, Type>& f)
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename outerProduct<Type, Type>::type> >
-sqr(const tmp<FieldField<Field, Type> >& tf)
+tmp<FieldField<Field, typename outerProduct<Type, Type>::type>>
+sqr(const tmp<FieldField<Field, Type>>& tf)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
-    tmp<FieldField<Field, outerProductType> > tRes
+    tmp<FieldField<Field, outerProductType>> tRes
     (
         reuseTmpFieldField<Field, outerProductType, Type>::New(tf)
     );
@@ -159,9 +159,9 @@ void magSqr(FieldField<Field, scalar>& sf, const FieldField<Field, Type>& f)
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > magSqr(const FieldField<Field, Type>& f)
+tmp<FieldField<Field, scalar>> magSqr(const FieldField<Field, Type>& f)
 {
-    tmp<FieldField<Field, scalar> > tRes
+    tmp<FieldField<Field, scalar>> tRes
     (
         FieldField<Field, scalar>::NewCalculatedType(f)
     );
@@ -171,9 +171,9 @@ tmp<FieldField<Field, scalar> > magSqr(const FieldField<Field, Type>& f)
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > magSqr(const tmp<FieldField<Field, Type> >& tf)
+tmp<FieldField<Field, scalar>> magSqr(const tmp<FieldField<Field, Type>>& tf)
 {
-    tmp<FieldField<Field, scalar> > tRes
+    tmp<FieldField<Field, scalar>> tRes
     (
         reuseTmpFieldField<Field, scalar, Type>::New(tf)
     );
@@ -194,9 +194,9 @@ void mag(FieldField<Field, scalar>& sf, const FieldField<Field, Type>& f)
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > mag(const FieldField<Field, Type>& f)
+tmp<FieldField<Field, scalar>> mag(const FieldField<Field, Type>& f)
 {
-    tmp<FieldField<Field, scalar> > tRes
+    tmp<FieldField<Field, scalar>> tRes
     (
         FieldField<Field, scalar>::NewCalculatedType(f)
     );
@@ -206,9 +206,9 @@ tmp<FieldField<Field, scalar> > mag(const FieldField<Field, Type>& f)
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > mag(const tmp<FieldField<Field, Type> >& tf)
+tmp<FieldField<Field, scalar>> mag(const tmp<FieldField<Field, Type>>& tf)
 {
-    tmp<FieldField<Field, scalar> > tRes
+    tmp<FieldField<Field, scalar>> tRes
     (
         reuseTmpFieldField<Field, scalar, Type>::New(tf)
     );
@@ -233,13 +233,13 @@ void cmptMax
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMax
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
 (
     const FieldField<Field, Type>& f
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         FieldField<Field, cmptType>::NewCalculatedType(f)
     );
@@ -248,13 +248,13 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMax
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMax
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
@@ -278,13 +278,13 @@ void cmptMin
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMin
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
 (
     const FieldField<Field, Type>& f
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         FieldField<Field, cmptType>::NewCalculatedType(f)
     );
@@ -293,13 +293,13 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMin
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMin
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
@@ -323,13 +323,13 @@ void cmptAv
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptAv
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
 (
     const FieldField<Field, Type>& f
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         FieldField<Field, cmptType>::NewCalculatedType(f)
     );
@@ -338,13 +338,13 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptAv
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptAv
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
@@ -368,12 +368,12 @@ void cmptMag
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > cmptMag
+tmp<FieldField<Field, Type>> cmptMag
 (
     const FieldField<Field, Type>& f
 )
 {
-    tmp<FieldField<Field, Type> > tRes
+    tmp<FieldField<Field, Type>> tRes
     (
         FieldField<Field, Type>::NewCalculatedType(f)
     );
@@ -382,12 +382,12 @@ tmp<FieldField<Field, Type> > cmptMag
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > cmptMag
+tmp<FieldField<Field, Type>> cmptMag
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 )
 {
-    tmp<FieldField<Field, Type> > tRes
+    tmp<FieldField<Field, Type>> tRes
     (
         reuseTmpFieldField<Field, Type, Type>::New(tf)
     );
@@ -400,7 +400,7 @@ tmp<FieldField<Field, Type> > cmptMag
 #define TMP_UNARY_FUNCTION(returnType, func)                                  \
                                                                               \
 template<template<class> class Field, class Type>                             \
-returnType func(const tmp<FieldField<Field, Type> >& tf1)                     \
+returnType func(const tmp<FieldField<Field, Type>>& tf1)                     \
 {                                                                             \
     returnType res = func(tf1());                                             \
     tf1.clear();                                                              \
@@ -655,7 +655,7 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
@@ -663,7 +663,7 @@ operator op                                                                    \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType> > tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                 \
     (                                                                          \
         FieldField<Field1, productType>::NewCalculatedType(f1)                 \
     );                                                                         \
@@ -672,15 +672,15 @@ operator op                                                                    \
 }                                                                              \
                                                                                \
 template<template<class> class Field, class Type1, class Type2>                \
-tmp<FieldField<Field, typename product<Type1, Type2>::type> >                  \
+tmp<FieldField<Field, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
-    const tmp<FieldField<Field, Type2> >& tf2                                  \
+    const tmp<FieldField<Field, Type2>>& tf2                                  \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field, productType> > tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                  \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type2>::New(tf2)                \
     );                                                                         \
@@ -696,15 +696,15 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field, typename product<Type1, Type2>::type> >                  \
+tmp<FieldField<Field, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
-    const tmp<FieldField<Field2, Type2> >& tf2                                 \
+    const tmp<FieldField<Field2, Type2>>& tf2                                 \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType> > tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                 \
     (                                                                          \
         FieldField<Field1, productType>::NewCalculatedType(f1)                 \
     );                                                                         \
@@ -720,15 +720,15 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1> >& tf1,                                \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                \
     const FieldField<Field2, Type2>& f2                                        \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType> > tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                 \
     (                                                                          \
         reuseTmpFieldField<Field1, productType, Type1>::New(tf1)               \
     );                                                                         \
@@ -744,15 +744,15 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1> >& tf1,                                \
-    const tmp<FieldField<Field2, Type2> >& tf2                                 \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                \
+    const tmp<FieldField<Field2, Type2>>& tf2                                 \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType> > tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                 \
     (                                                                          \
         reuseTmpTmpFieldField<Field1, productType, Type1, Type1, Type2>::New   \
         (tf1, tf2)                                                             \
@@ -780,7 +780,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type> >                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type>& f1,                                         \
@@ -788,7 +788,7 @@ operator op                                                                    \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type, Form>::type productType;                    \
-    tmp<FieldField<Field, productType> > tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                  \
     (                                                                          \
         FieldField<Field, productType>::NewCalculatedType(f1)                  \
     );                                                                         \
@@ -798,15 +798,15 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type> >                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field, Type> >& tf1,                                  \
+    const tmp<FieldField<Field, Type>>& tf1,                                  \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type, Form>::type productType;                    \
-    tmp<FieldField<Field, productType> > tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                  \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
     );                                                                         \
@@ -832,7 +832,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type> >                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
@@ -840,7 +840,7 @@ operator op                                                                    \
 )                                                                              \
 {                                                                              \
     typedef typename product<Form, Type>::type productType;                    \
-    tmp<FieldField<Field, productType> > tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                  \
     (                                                                          \
         FieldField<Field, productType>::NewCalculatedType(f1)                  \
     );                                                                         \
@@ -850,15 +850,15 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type> >                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const tmp<FieldField<Field, Type> >& tf1                                   \
+    const tmp<FieldField<Field, Type>>& tf1                                   \
 )                                                                              \
 {                                                                              \
     typedef typename product<Form, Type>::type productType;                    \
-    tmp<FieldField<Field, productType> > tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                  \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
     );                                                                         \
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
index 97dccf4510..5860c6e4ed 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ void pow
 );
 
 template<template<class> class Field, class Type, int r>
-tmp<FieldField<Field, typename powProduct<Type, r>::type> >
+tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
     const FieldField<Field, Type>& f, typename powProduct<Type, r>::type
@@ -63,10 +63,10 @@ pow
 );
 
 template<template<class> class Field, class Type, int r>
-tmp<FieldField<Field, typename powProduct<Type, r>::type> >
+tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
-    const tmp<FieldField<Field, Type> >& tf, typename powProduct<Type, r>::type
+    const tmp<FieldField<Field, Type>>& tf, typename powProduct<Type, r>::type
         = pTraits<typename powProduct<Type, r>::type>::zero
 );
 
@@ -79,30 +79,30 @@ void sqr
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename outerProduct<Type, Type>::type> >
+tmp<FieldField<Field, typename outerProduct<Type, Type>::type>>
 sqr(const FieldField<Field, Type>& f);
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename outerProduct<Type, Type>::type> >
-sqr(const tmp<FieldField<Field, Type> >& tf);
+tmp<FieldField<Field, typename outerProduct<Type, Type>::type>>
+sqr(const tmp<FieldField<Field, Type>>& tf);
 
 template<template<class> class Field, class Type>
 void magSqr(FieldField<Field, scalar>& sf, const FieldField<Field, Type>& f);
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > magSqr(const FieldField<Field, Type>& f);
+tmp<FieldField<Field, scalar>> magSqr(const FieldField<Field, Type>& f);
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > magSqr(const tmp<FieldField<Field, Type> >& tf);
+tmp<FieldField<Field, scalar>> magSqr(const tmp<FieldField<Field, Type>>& tf);
 
 template<template<class> class Field, class Type>
 void mag(FieldField<Field, scalar>& sf, const FieldField<Field, Type>& f);
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > mag(const FieldField<Field, Type>& f);
+tmp<FieldField<Field, scalar>> mag(const FieldField<Field, Type>& f);
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > mag(const tmp<FieldField<Field, Type> >& tf);
+tmp<FieldField<Field, scalar>> mag(const tmp<FieldField<Field, Type>>& tf);
 
 
 template<template<class> class Field, class Type>
@@ -113,15 +113,15 @@ void cmptMax
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMax
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
 (
     const FieldField<Field, Type>& f
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMax
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 );
 
 
@@ -133,15 +133,15 @@ void cmptMin
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMin
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
 (
     const FieldField<Field, Type>& f
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMin
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 );
 
 
@@ -153,15 +153,15 @@ void cmptAv
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptAv
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
 (
     const FieldField<Field, Type>& f
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptAv
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 );
 
 
@@ -173,22 +173,22 @@ void cmptMag
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > cmptMag
+tmp<FieldField<Field, Type>> cmptMag
 (
     const FieldField<Field, Type>& f
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > cmptMag
+tmp<FieldField<Field, Type>> cmptMag
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 );
 
 
 #define TMP_UNARY_FUNCTION(returnType, func)                                  \
                                                                               \
 template<template<class> class Field, class Type>                             \
-returnType func(const tmp<FieldField<Field, Type> >& tf1);
+returnType func(const tmp<FieldField<Field, Type>>& tf1);
 
 template<template<class> class Field, class Type>
 Type max(const FieldField<Field, Type>& f);
@@ -288,7 +288,7 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
@@ -296,11 +296,11 @@ operator op                                                                    \
 );                                                                             \
                                                                                \
 template<template<class> class Field, class Type1, class Type2>                \
-tmp<FieldField<Field, typename product<Type1, Type2>::type> >                  \
+tmp<FieldField<Field, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
-    const tmp<FieldField<Field, Type2> >& tf2                                  \
+    const tmp<FieldField<Field, Type2>>& tf2                                  \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -310,11 +310,11 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
-    const tmp<FieldField<Field2, Type2> >& tf2                                 \
+    const tmp<FieldField<Field2, Type2>>& tf2                                 \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -324,10 +324,10 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1> >& tf1,                                \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                \
     const FieldField<Field2, Type2>& f2                                        \
 );                                                                             \
                                                                                \
@@ -338,11 +338,11 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1> >& tf1,                                \
-    const tmp<FieldField<Field2, Type2> >& tf2                                 \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                \
+    const tmp<FieldField<Field2, Type2>>& tf2                                 \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -356,7 +356,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type> >                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type>& f1,                                         \
@@ -365,10 +365,10 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type> >                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field, Type> >& tf1,                                  \
+    const tmp<FieldField<Field, Type>>& tf1,                                  \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 );                                                                             \
                                                                                \
@@ -383,7 +383,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type> >                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
@@ -392,11 +392,11 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type> >                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const tmp<FieldField<Field, Type> >& tf1                                   \
+    const tmp<FieldField<Field, Type>>& tf1                                   \
 );
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
index 880d52ea5b..e309733770 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,12 +44,12 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const FieldField<Field, Type>& f                                          \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, ReturnType>::NewCalculatedType(f)                   \
     );                                                                        \
@@ -58,12 +58,12 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type> >& tf                                   \
+    const tmp<FieldField<Field, Type>>& tf                                   \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, Type, Type>::New(tf)                        \
     );                                                                        \
@@ -91,12 +91,12 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type>& f                                          \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type>::NewCalculatedType(f)                         \
     );                                                                        \
@@ -105,12 +105,12 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type> >& tf                                   \
+    const tmp<FieldField<Field, Type>>& tf                                   \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, Type, Type>::New(tf)                        \
     );                                                                        \
@@ -139,13 +139,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type1>::NewCalculatedType(f1)                       \
     );                                                                        \
@@ -154,13 +154,13 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
     );                                                                        \
@@ -170,13 +170,13 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
     );                                                                        \
@@ -186,13 +186,13 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::       \
             New(tf1, tf2)                                                     \
@@ -223,13 +223,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const Type2& s                                                            \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type1>::NewCalculatedType(f1)                       \
     );                                                                        \
@@ -238,13 +238,13 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const Type2& s                                                            \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
     );                                                                        \
@@ -271,13 +271,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const Type1& s,                                                           \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type2>::NewCalculatedType(f2)                       \
     );                                                                        \
@@ -286,13 +286,13 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const Type1& s,                                                           \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
     );                                                                        \
@@ -326,13 +326,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, ReturnType>::NewCalculatedType(f1)                  \
     );                                                                        \
@@ -341,13 +341,13 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
     );                                                                        \
@@ -357,13 +357,13 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
     );                                                                        \
@@ -373,13 +373,13 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::       \
             New(tf1, tf2)                                                     \
@@ -410,13 +410,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const Type1& s,                                                           \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type2>::NewCalculatedType(f2)                       \
     );                                                                        \
@@ -425,13 +425,13 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const Type1& s,                                                           \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
     );                                                                        \
@@ -458,13 +458,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const Type2& s                                                            \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type1>::NewCalculatedType(f1)                       \
     );                                                                        \
@@ -473,13 +473,13 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const Type2& s                                                            \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
     );                                                                        \
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
index aafc1fa720..6cc3ad76ab 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,15 +40,15 @@ void Func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f                                         \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf                                  \
+    const tmp<FieldField<Field, Type1>>& tf                                  \
 );
 
 
@@ -64,15 +64,15 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f                                         \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf                                  \
+    const tmp<FieldField<Field, Type1>>& tf                                  \
 );
 
 
@@ -89,31 +89,31 @@ void func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const FieldField<Field, Type2>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const FieldField<Field, Type2>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 );
 
 
@@ -130,17 +130,17 @@ void func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
     const Type1& s1,                                                          \
     const FieldField<Field, Type1>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<FieldField<Field, Type1> >& tf2                                 \
+    const tmp<FieldField<Field, Type1>>& tf2                                 \
 );
 
 
@@ -155,16 +155,16 @@ void func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const Type2& s                                                            \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const Type2& s                                                            \
 );
 
@@ -187,31 +187,31 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const FieldField<Field, Type2>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const FieldField<Field, Type2>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 );
 
 
@@ -228,17 +228,17 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const Type1& s1,                                                          \
     const FieldField<Field, Type2>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 );
 
 
@@ -253,16 +253,16 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const Type2& s2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const Type2& s2                                                           \
 );
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
index 525a6d38b1..b941bee749 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,18 +38,18 @@ class reuseTmpFieldField
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, Type1> >& tf1
+        const tmp<FieldField<Field, Type1>>& tf1
     )
     {
-        return tmp<FieldField<Field, TypeR> >
+        return tmp<FieldField<Field, TypeR>>
         (
             FieldField<Field, TypeR>::NewCalculatedType(tf1())
         );
     }
 
-    static void clear(const tmp<FieldField<Field, Type1> >& tf1)
+    static void clear(const tmp<FieldField<Field, Type1>>& tf1)
     {
         tf1.clear();
     }
@@ -61,9 +61,9 @@ class reuseTmpFieldField<Field, TypeR, TypeR>
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, TypeR> >& tf1
+        const tmp<FieldField<Field, TypeR>>& tf1
     )
     {
         if (tf1.isTmp())
@@ -72,14 +72,14 @@ public:
         }
         else
         {
-            return tmp<FieldField<Field, TypeR> >
+            return tmp<FieldField<Field, TypeR>>
             (
                 FieldField<Field, TypeR>::NewCalculatedType(tf1())
             );
         }
     }
 
-    static void clear(const tmp<FieldField<Field, TypeR> >& tf1)
+    static void clear(const tmp<FieldField<Field, TypeR>>& tf1)
     {
         if (tf1.isTmp())
         {
@@ -101,13 +101,13 @@ class reuseTmpTmpFieldField
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, Type1> >& tf1,
-        const tmp<FieldField<Field, Type2> >& tf2
+        const tmp<FieldField<Field, Type1>>& tf1,
+        const tmp<FieldField<Field, Type2>>& tf2
     )
     {
-        return tmp<FieldField<Field, TypeR> >
+        return tmp<FieldField<Field, TypeR>>
         (
             FieldField<Field, TypeR>::NewCalculatedType(tf1())
         );
@@ -115,8 +115,8 @@ public:
 
     static void clear
     (
-        const tmp<FieldField<Field, Type1> >& tf1,
-        const tmp<FieldField<Field, Type2> >& tf2
+        const tmp<FieldField<Field, Type1>>& tf1,
+        const tmp<FieldField<Field, Type2>>& tf2
     )
     {
         tf1.clear();
@@ -130,10 +130,10 @@ class reuseTmpTmpFieldField<Field, TypeR, Type1, Type12, TypeR>
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, Type1> >& tf1,
-        const tmp<FieldField<Field, TypeR> >& tf2
+        const tmp<FieldField<Field, Type1>>& tf1,
+        const tmp<FieldField<Field, TypeR>>& tf2
     )
     {
         if (tf2.isTmp())
@@ -142,7 +142,7 @@ public:
         }
         else
         {
-            return tmp<FieldField<Field, TypeR> >
+            return tmp<FieldField<Field, TypeR>>
             (
                 FieldField<Field, TypeR>::NewCalculatedType(tf1())
             );
@@ -151,8 +151,8 @@ public:
 
     static void clear
     (
-        const tmp<FieldField<Field, Type1> >& tf1,
-        const tmp<FieldField<Field, TypeR> >& tf2
+        const tmp<FieldField<Field, Type1>>& tf1,
+        const tmp<FieldField<Field, TypeR>>& tf2
     )
     {
         tf1.clear();
@@ -169,10 +169,10 @@ class reuseTmpTmpFieldField<Field, TypeR, TypeR, TypeR, Type2>
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, TypeR> >& tf1,
-        const tmp<FieldField<Field, Type2> >& tf2
+        const tmp<FieldField<Field, TypeR>>& tf1,
+        const tmp<FieldField<Field, Type2>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -181,7 +181,7 @@ public:
         }
         else
         {
-            return tmp<FieldField<Field, TypeR> >
+            return tmp<FieldField<Field, TypeR>>
             (
                 FieldField<Field, TypeR>::NewCalculatedType(tf1())
             );
@@ -190,8 +190,8 @@ public:
 
     static void clear
     (
-        const tmp<FieldField<Field, TypeR> >& tf1,
-        const tmp<FieldField<Field, Type2> >& tf2
+        const tmp<FieldField<Field, TypeR>>& tf1,
+        const tmp<FieldField<Field, Type2>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -208,10 +208,10 @@ class reuseTmpTmpFieldField<Field, TypeR, TypeR, TypeR, TypeR>
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, TypeR> >& tf1,
-        const tmp<FieldField<Field, TypeR> >& tf2
+        const tmp<FieldField<Field, TypeR>>& tf1,
+        const tmp<FieldField<Field, TypeR>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -224,7 +224,7 @@ public:
         }
         else
         {
-            return tmp<FieldField<Field, TypeR> >
+            return tmp<FieldField<Field, TypeR>>
             (
                 FieldField<Field, TypeR>::NewCalculatedType(tf1())
             );
@@ -233,8 +233,8 @@ public:
 
     static void clear
     (
-        const tmp<FieldField<Field, TypeR> >& tf1,
-        const tmp<FieldField<Field, TypeR> >& tf2
+        const tmp<FieldField<Field, TypeR>>& tf1,
+        const tmp<FieldField<Field, TypeR>>& tf2
     )
     {
         if (tf1.isTmp())
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
index 4f4ddcb429..43e52ab90f 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,13 +53,13 @@ void stabilise
 }
 
 template<template<class> class Field>
-tmp<FieldField<Field, scalar> > stabilise
+tmp<FieldField<Field, scalar>> stabilise
 (
     const FieldField<Field, scalar>& f1,
     const scalar s
 )
 {
-    tmp<FieldField<Field, scalar> > tf
+    tmp<FieldField<Field, scalar>> tf
     (
         FieldField<Field, scalar>::NewCalculatedType(f1)
     );
@@ -68,13 +68,13 @@ tmp<FieldField<Field, scalar> > stabilise
 }
 
 template<template<class> class Field>
-tmp<FieldField<Field, scalar> > stabilise
+tmp<FieldField<Field, scalar>> stabilise
 (
-    const tmp<FieldField<Field, scalar> >& tf1,
+    const tmp<FieldField<Field, scalar>>& tf1,
     const scalar s
 )
 {
-    tmp<FieldField<Field, scalar> > tf(tf1.ptr());
+    tmp<FieldField<Field, scalar>> tf(tf1.ptr());
     stabilise(tf(), tf(), s);
     return tf;
 }
@@ -152,13 +152,13 @@ void func                                                                     \
 }                                                                             \
                                                                               \
 template<template<class> class Field>                                         \
-tmp<FieldField<Field, scalar> > func                                          \
+tmp<FieldField<Field, scalar>> func                                          \
 (                                                                             \
     const int n,                                                              \
     const FieldField<Field, scalar>& sf                                       \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, scalar> > tRes                                      \
+    tmp<FieldField<Field, scalar>> tRes                                      \
     (                                                                         \
         FieldField<Field, scalar>::NewCalculatedType(sf)                      \
     );                                                                        \
@@ -167,13 +167,13 @@ tmp<FieldField<Field, scalar> > func                                          \
 }                                                                             \
                                                                               \
 template<template<class> class Field>                                         \
-tmp<FieldField<Field, scalar> > func                                          \
+tmp<FieldField<Field, scalar>> func                                          \
 (                                                                             \
     const int n,                                                              \
-    const tmp<FieldField<Field, scalar> >& tsf                                \
+    const tmp<FieldField<Field, scalar>>& tsf                                \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, scalar> > tRes                                      \
+    tmp<FieldField<Field, scalar>> tRes                                      \
     (                                                                         \
         reuseTmpFieldField<Field, scalar, scalar>::New(tsf)                   \
     );                                                                        \
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
index 0af7ac39d4..3a214a3ee4 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ void stabilise
 
 
 template<template<class> class Field>
-tmp<FieldField<Field, scalar> > stabilise
+tmp<FieldField<Field, scalar>> stabilise
 (
     const FieldField<Field, scalar>&,
     const scalar s
@@ -66,9 +66,9 @@ tmp<FieldField<Field, scalar> > stabilise
 
 
 template<template<class> class Field>
-tmp<FieldField<Field, scalar> > stabilise
+tmp<FieldField<Field, scalar>> stabilise
 (
-    const tmp<FieldField<Field, scalar> >&,
+    const tmp<FieldField<Field, scalar>>&,
     const scalar s
 );
 
@@ -136,7 +136,7 @@ void func                                                                     \
     const FieldField<Field, scalar>& sf                                       \
 );                                                                            \
 tmp<scalarField> func(const int n, const FieldField<Field, scalar>&);         \
-tmp<scalarField> func(const int n, const tmp<FieldField<Field, scalar> >&);
+tmp<scalarField> func(const int n, const tmp<FieldField<Field, scalar>>&);
 
 BesselFunc(jn)
 BesselFunc(yn)
diff --git a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.C b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.C
index 7fdb90afec..a1069a53fc 100644
--- a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,13 +51,13 @@ void transform
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const FieldField<Field, tensor>& trf,
     const FieldField<Field, Type>& tf
 )
 {
-    tmp<FieldField<Field, Type> > tranf
+    tmp<FieldField<Field, Type>> tranf
     (
         FieldField<Field, Type>::NewCalculatedType(tf)
     );
@@ -67,26 +67,26 @@ tmp<FieldField<Field, Type> > transform
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const FieldField<Field, tensor>& trf,
-    const tmp<FieldField<Field, Type> >& ttf
+    const tmp<FieldField<Field, Type>>& ttf
 )
 {
-    tmp<FieldField<Field, Type> > tranf(ttf.ptr());
+    tmp<FieldField<Field, Type>> tranf(ttf.ptr());
     transform(tranf(), trf, tranf());
     return tranf;
 }
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
-    const tmp<FieldField<Field, tensor> >& ttrf,
+    const tmp<FieldField<Field, tensor>>& ttrf,
     const FieldField<Field, Type>& tf
 )
 {
-    tmp<FieldField<Field, Type> > tranf
+    tmp<FieldField<Field, Type>> tranf
     (
         FieldField<Field, Type>::NewCalculatedType(tf)
     );
@@ -97,13 +97,13 @@ tmp<FieldField<Field, Type> > transform
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
-    const tmp<FieldField<Field, tensor> >& ttrf,
-    const tmp<FieldField<Field, Type> >& ttf
+    const tmp<FieldField<Field, tensor>>& ttrf,
+    const tmp<FieldField<Field, Type>>& ttf
 )
 {
-    tmp<FieldField<Field, Type> > tranf(ttf.ptr());
+    tmp<FieldField<Field, Type>> tranf(ttf.ptr());
     transform(tranf(), ttrf(), tranf());
     ttrf.clear();
     return tranf;
@@ -126,13 +126,13 @@ void transform
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const tensor& t,
     const FieldField<Field, Type>& tf
 )
 {
-    tmp<FieldField<Field, Type> > tranf
+    tmp<FieldField<Field, Type>> tranf
     (
         FieldField<Field, Type>::NewCalculatedType(tf)
     );
@@ -142,13 +142,13 @@ tmp<FieldField<Field, Type> > transform
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const tensor& t,
-    const tmp<FieldField<Field, Type> >& ttf
+    const tmp<FieldField<Field, Type>>& ttf
 )
 {
-    tmp<FieldField<Field, Type> > tranf(ttf.ptr());
+    tmp<FieldField<Field, Type>> tranf(ttf.ptr());
     transform(tranf(), t, tranf());
     return tranf;
 }
diff --git a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
index 3e11c09867..2b313ac995 100644
--- a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,31 +55,31 @@ void transform
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const FieldField<Field, tensor>&,
     const FieldField<Field, Type>&
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const FieldField<Field, tensor>&,
-    const tmp<FieldField<Field, Type> >&
+    const tmp<FieldField<Field, Type>>&
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
-    const tmp<FieldField<Field, tensor> >&,
+    const tmp<FieldField<Field, tensor>>&,
     const FieldField<Field, Type>&
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
-    const tmp<FieldField<Field, tensor> >&,
-    const tmp<FieldField<Field, Type> >&
+    const tmp<FieldField<Field, tensor>>&,
+    const tmp<FieldField<Field, Type>>&
 );
 
 
@@ -92,17 +92,17 @@ void transform
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const tensor&,
     const FieldField<Field, Type>&
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const tensor&,
-    const tmp<FieldField<Field, Type> >&
+    const tmp<FieldField<Field, Type>>&
 );
 
 
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.C b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.C
index 5696467d97..1626319fc0 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.C
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,10 +36,10 @@ Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField(Istream& is)
 
 
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
-Foam::tmp<Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv> >
+Foam::tmp<Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>>
 Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::clone() const
 {
-    return tmp<DynamicField<T, SizeInc, SizeMult, SizeDiv> >
+    return tmp<DynamicField<T, SizeInc, SizeMult, SizeDiv>>
     (
         new DynamicField<T, SizeInc, SizeMult, SizeDiv>(*this)
     );
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index 9df294a08f..06165cbb41 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ public:
         explicit inline DynamicField(const UList<T>&);
 
         //- Construct by transferring the parameter contents
-        explicit inline DynamicField(const Xfer<List<T> >&);
+        explicit inline DynamicField(const Xfer<List<T>>&);
 
         //- Construct by 1 to 1 mapping from the given field
         inline DynamicField
@@ -139,14 +139,14 @@ public:
         //- Construct by transferring the Field contents
         inline DynamicField
         (
-            const Xfer<DynamicField<T, SizeInc, SizeMult, SizeDiv> >&
+            const Xfer<DynamicField<T, SizeInc, SizeMult, SizeDiv>>&
         );
 
         //- Construct from Istream. Size set to size of list read.
         explicit DynamicField(Istream&);
 
         //- Clone
-        tmp<DynamicField<T, SizeInc, SizeMult, SizeDiv> > clone() const;
+        tmp<DynamicField<T, SizeInc, SizeMult, SizeDiv>> clone() const;
 
 
     // Member Functions
@@ -200,7 +200,7 @@ public:
             inline DynamicField<T, SizeInc, SizeMult, SizeDiv>& shrink();
 
             //- Transfer contents to the Xfer container as a plain List
-            inline Xfer<List<T> > xfer();
+            inline Xfer<List<T>> xfer();
 
 
         // Member Operators
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
index 72c49353a7..8db855af53 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
@@ -61,7 +61,7 @@ inline Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField
 (
-    const Xfer<List<T> >& lst
+    const Xfer<List<T>>& lst
 )
 :
     Field<T>(lst),
@@ -121,7 +121,7 @@ inline Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField
 (
-    const Xfer<DynamicField<T, SizeInc, SizeMult, SizeDiv> >& lst
+    const Xfer<DynamicField<T, SizeInc, SizeMult, SizeDiv>>& lst
 )
 :
     Field<T>(lst),
@@ -308,7 +308,7 @@ Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::shrink()
 
 
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
-inline Foam::Xfer<Foam::List<T> >
+inline Foam::Xfer<Foam::List<T>>
 Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::xfer()
 {
     return xferMoveTo<List<T>>(*this);
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index f629bc4187..5d66bdb349 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelUList& mapAddressing
 )
 :
@@ -100,7 +100,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelListList& mapAddressing,
     const scalarListList& mapWeights
 )
@@ -155,7 +155,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const FieldMapper& mapper
 )
 :
@@ -168,7 +168,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const FieldMapper& mapper,
     const Type& defaultValue
 )
@@ -182,7 +182,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const FieldMapper& mapper,
     const UList<Type>& defaultValues
 )
@@ -209,14 +209,14 @@ Foam::Field<Type>::Field(Field<Type>& f, bool reUse)
 
 
 template<class Type>
-Foam::Field<Type>::Field(const Xfer<List<Type> >& f)
+Foam::Field<Type>::Field(const Xfer<List<Type>>& f)
 :
     List<Type>(f)
 {}
 
 
 template<class Type>
-Foam::Field<Type>::Field(const Xfer<Field<Type> >& f)
+Foam::Field<Type>::Field(const Xfer<Field<Type>>& f)
 :
     List<Type>(f)
 {}
@@ -232,7 +232,7 @@ Foam::Field<Type>::Field(const UList<Type>& list)
 // Construct as copy of tmp<Field>
 #ifndef NoConstructFromTmp
 template<class Type>
-Foam::Field<Type>::Field(const tmp<Field<Type> >& tf)
+Foam::Field<Type>::Field(const tmp<Field<Type>>& tf)
 :
     List<Type>(const_cast<Field<Type>&>(tf()), tf.isTmp())
 {
@@ -324,9 +324,9 @@ Foam::Field<Type>::Field
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::Field<Type>::clone() const
+Foam::tmp<Foam::Field<Type>> Foam::Field<Type>::clone() const
 {
-    return tmp<Field<Type> >(new Field<Type>(*this));
+    return tmp<Field<Type>>(new Field<Type>(*this));
 }
 
 
@@ -364,7 +364,7 @@ void Foam::Field<Type>::map
 template<class Type>
 void Foam::Field<Type>::map
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelUList& mapAddressing
 )
 {
@@ -413,7 +413,7 @@ void Foam::Field<Type>::map
 template<class Type>
 void Foam::Field<Type>::map
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelListList& mapAddressing,
     const scalarListList& mapWeights
 )
@@ -449,7 +449,7 @@ void Foam::Field<Type>::map
 template<class Type>
 void Foam::Field<Type>::map
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const FieldMapper& mapper
 )
 {
@@ -508,7 +508,7 @@ void Foam::Field<Type>::rmap
 template<class Type>
 void Foam::Field<Type>::rmap
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelUList& mapAddressing
 )
 {
@@ -539,7 +539,7 @@ void Foam::Field<Type>::rmap
 template<class Type>
 void Foam::Field<Type>::rmap
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelUList& mapAddressing,
     const UList<scalar>& mapWeights
 )
@@ -557,13 +557,13 @@ void Foam::Field<Type>::negate()
 
 
 template<class Type>
-Foam::tmp<Foam::Field<typename Foam::Field<Type>::cmptType> >
+Foam::tmp<Foam::Field<typename Foam::Field<Type>::cmptType>>
 Foam::Field<Type>::component
 (
     const direction d
 ) const
 {
-    tmp<Field<cmptType> > Component(new Field<cmptType>(this->size()));
+    tmp<Field<cmptType>> Component(new Field<cmptType>(this->size()));
     ::Foam::component(Component(), *this, d);
     return Component;
 }
@@ -585,7 +585,7 @@ template<class Type>
 void Foam::Field<Type>::replace
 (
     const direction d,
-    const tmp<Field<cmptType> >& tsf
+    const tmp<Field<cmptType>>& tsf
 )
 {
     replace(d, tsf());
@@ -606,9 +606,9 @@ void Foam::Field<Type>::replace
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::Field<Type>::T() const
+Foam::tmp<Foam::Field<Type>> Foam::Field<Type>::T() const
 {
-    tmp<Field<Type> > transpose(new Field<Type>(this->size()));
+    tmp<Field<Type>> transpose(new Field<Type>(this->size()));
     ::Foam::T(transpose(), *this);
     return transpose;
 }
@@ -721,7 +721,7 @@ void Foam::Field<Type>::operator op(const UList<TYPE>& f)                     \
 }                                                                             \
                                                                               \
 template<class Type>                                                          \
-void Foam::Field<Type>::operator op(const tmp<Field<TYPE> >& tf)              \
+void Foam::Field<Type>::operator op(const tmp<Field<TYPE>>& tf)              \
 {                                                                             \
     operator op(tf());                                                        \
     tf.clear();                                                               \
@@ -752,7 +752,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Field<Type>& f)
 
 
 template<class Type>
-Foam::Ostream& Foam::operator<<(Ostream& os, const tmp<Field<Type> >& tf)
+Foam::Ostream& Foam::operator<<(Ostream& os, const tmp<Field<Type>>& tf)
 {
     os  << tf();
     tf.clear();
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index f9c340f9bc..678dd3c772 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ template<class Type>
 Ostream& operator<<(Ostream&, const Field<Type>&);
 
 template<class Type>
-Ostream& operator<<(Ostream&, const tmp<Field<Type> >&);
+Ostream& operator<<(Ostream&, const tmp<Field<Type>>&);
 
 class FieldMapper;
 class dictionary;
@@ -100,7 +100,7 @@ public:
         //- Return a null field
         inline static const Field<Type>& null()
         {
-            return NullObjectRef<Field<Type> >();
+            return NullObjectRef<Field<Type>>();
         }
 
 
@@ -121,7 +121,7 @@ public:
         explicit Field(const UList<Type>&);
 
         //- Construct by transferring the List contents
-        explicit Field(const Xfer<List<Type> >&);
+        explicit Field(const Xfer<List<Type>>&);
 
         //- Construct by 1 to 1 mapping from the given field
         Field
@@ -133,7 +133,7 @@ public:
         //- Construct by 1 to 1 mapping from the given tmp field
         Field
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelUList& mapAddressing
         );
 
@@ -148,7 +148,7 @@ public:
         //- Construct by interpolative mapping from the given tmp field
         Field
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelListList& mapAddressing,
             const scalarListList& weights
         );
@@ -179,7 +179,7 @@ public:
         //- Construct by mapping from the given tmp field
         Field
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const FieldMapper& map
         );
 
@@ -187,7 +187,7 @@ public:
         //  value for unmapped items
         Field
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const FieldMapper& map,
             const Type& defaultValue
         );
@@ -196,7 +196,7 @@ public:
         //  for unmapped items
         Field
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const FieldMapper& map,
             const UList<Type>& defaultValues
         );
@@ -208,11 +208,11 @@ public:
         Field(Field<Type>&, bool reUse);
 
         //- Construct by transferring the Field contents
-        Field(const Xfer<Field<Type> >&);
+        Field(const Xfer<Field<Type>>&);
 
         //- Construct as copy of tmp<Field>
         #ifndef NoConstructFromTmp
-        Field(const tmp<Field<Type> >&);
+        Field(const tmp<Field<Type>>&);
         #endif
 
         //- Construct from Istream
@@ -222,14 +222,14 @@ public:
         Field(const word& keyword, const dictionary&, const label size);
 
         //- Clone
-        tmp<Field<Type> > clone() const;
+        tmp<Field<Type>> clone() const;
 
         //- Return a pointer to a new calculatedFvPatchFieldField created on
         //  freestore without setting patchField values
         template<class Type2>
-        static tmp<Field<Type> > NewCalculatedType(const Field<Type2>& f)
+        static tmp<Field<Type>> NewCalculatedType(const Field<Type2>& f)
         {
-            return tmp<Field<Type> >(new Field<Type>(f.size()));
+            return tmp<Field<Type>>(new Field<Type>(f.size()));
         }
 
 
@@ -245,7 +245,7 @@ public:
         //- 1 to 1 map from the given tmp field
         void map
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelUList& mapAddressing
         );
 
@@ -260,7 +260,7 @@ public:
         //- Interpolative map from the given tmp field
         void map
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelListList& mapAddressing,
             const scalarListList& weights
         );
@@ -275,7 +275,7 @@ public:
         //- Map from the given tmp field
         void map
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const FieldMapper& map
         );
 
@@ -295,7 +295,7 @@ public:
         //- 1 to 1 reverse-map from the given tmp field
         void rmap
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelUList& mapAddressing
         );
 
@@ -310,7 +310,7 @@ public:
         //- Interpolative reverse map from the given tmp field
         void rmap
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelUList& mapAddressing,
             const UList<scalar>& weights
         );
@@ -319,19 +319,19 @@ public:
         void negate();
 
         //- Return a component field of the field
-        tmp<Field<cmptType> > component(const direction) const;
+        tmp<Field<cmptType>> component(const direction) const;
 
         //- Replace a component field of the field
         void replace(const direction, const UList<cmptType>&);
 
         //- Replace a component field of the field
-        void replace(const direction, const tmp<Field<cmptType> >&);
+        void replace(const direction, const tmp<Field<cmptType>>&);
 
         //- Replace a component field of the field
         void replace(const direction, const cmptType&);
 
         //- Return the field transpose (only defined for second rank tensors)
-        tmp<Field<Type> > T() const;
+        tmp<Field<Type>> T() const;
 
         //- Write the field as a dictionary entry
         void writeEntry(const word& keyword, Ostream& os) const;
@@ -342,23 +342,23 @@ public:
         void operator=(const Field<Type>&);
         void operator=(const UList<Type>&);
         void operator=(const SubField<Type>&);
-        void operator=(const tmp<Field<Type> >&);
+        void operator=(const tmp<Field<Type>>&);
         void operator=(const Type&);
 
         template<class Form, class Cmpt, int nCmpt>
         void operator=(const VectorSpace<Form,Cmpt,nCmpt>&);
 
         void operator+=(const UList<Type>&);
-        void operator+=(const tmp<Field<Type> >&);
+        void operator+=(const tmp<Field<Type>>&);
 
         void operator-=(const UList<Type>&);
-        void operator-=(const tmp<Field<Type> >&);
+        void operator-=(const tmp<Field<Type>>&);
 
         void operator*=(const UList<scalar>&);
-        void operator*=(const tmp<Field<scalar> >&);
+        void operator*=(const tmp<Field<scalar>>&);
 
         void operator/=(const UList<scalar>&);
-        void operator/=(const tmp<Field<scalar> >&);
+        void operator/=(const tmp<Field<scalar>>&);
 
         void operator+=(const Type&);
         void operator-=(const Type&);
@@ -373,7 +373,7 @@ public:
         (Ostream&, const Field<Type>&);
 
         friend Ostream& operator<< <Type>
-        (Ostream&, const tmp<Field<Type> >&);
+        (Ostream&, const tmp<Field<Type>>&);
 };
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index f7bd175308..e8703cd1b8 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ void pow
 }
 
 template<class Type, int r>
-tmp<Field<typename powProduct<Type, r>::type> >
+tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
     const UList<Type>& f,
@@ -83,7 +83,7 @@ pow
 )
 {
     typedef typename powProduct<Type, r>::type powProductType;
-    tmp<Field<powProductType> > tRes
+    tmp<Field<powProductType>> tRes
     (
         new Field<powProductType>(f.size())
     );
@@ -92,15 +92,15 @@ pow
 }
 
 template<class Type, int r>
-tmp<Field<typename powProduct<Type, r>::type> >
+tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
-    const tmp<Field<Type> >& tf,
+    const tmp<Field<Type>>& tf,
     typename powProduct<Type, r>::type
 )
 {
     typedef typename powProduct<Type, r>::type powProductType;
-    tmp<Field<powProductType> > tRes = reuseTmp<powProductType, Type>::New(tf);
+    tmp<Field<powProductType>> tRes = reuseTmp<powProductType, Type>::New(tf);
     pow<Type, r>(tRes(), tf());
     reuseTmp<powProductType, Type>::clear(tf);
     return tRes;
@@ -119,11 +119,11 @@ void sqr
 }
 
 template<class Type>
-tmp<Field<typename outerProduct<Type, Type>::type> >
+tmp<Field<typename outerProduct<Type, Type>::type>>
 sqr(const UList<Type>& f)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
-    tmp<Field<outerProductType> > tRes
+    tmp<Field<outerProductType>> tRes
     (
         new Field<outerProductType>(f.size())
     );
@@ -132,11 +132,11 @@ sqr(const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<typename outerProduct<Type, Type>::type> >
-sqr(const tmp<Field<Type> >& tf)
+tmp<Field<typename outerProduct<Type, Type>::type>>
+sqr(const tmp<Field<Type>>& tf)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
-    tmp<Field<outerProductType> > tRes =
+    tmp<Field<outerProductType>> tRes =
         reuseTmp<outerProductType, Type>::New(tf);
     sqr(tRes(), tf());
     reuseTmp<outerProductType, Type>::clear(tf);
@@ -151,17 +151,17 @@ void magSqr(Field<scalar>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<scalar> > magSqr(const UList<Type>& f)
+tmp<Field<scalar>> magSqr(const UList<Type>& f)
 {
-    tmp<Field<scalar> > tRes(new Field<scalar>(f.size()));
+    tmp<Field<scalar>> tRes(new Field<scalar>(f.size()));
     magSqr(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<scalar> > magSqr(const tmp<Field<Type> >& tf)
+tmp<Field<scalar>> magSqr(const tmp<Field<Type>>& tf)
 {
-    tmp<Field<scalar> > tRes = reuseTmp<scalar, Type>::New(tf);
+    tmp<Field<scalar>> tRes = reuseTmp<scalar, Type>::New(tf);
     magSqr(tRes(), tf());
     reuseTmp<scalar, Type>::clear(tf);
     return tRes;
@@ -175,17 +175,17 @@ void mag(Field<scalar>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<scalar> > mag(const UList<Type>& f)
+tmp<Field<scalar>> mag(const UList<Type>& f)
 {
-    tmp<Field<scalar> > tRes(new Field<scalar>(f.size()));
+    tmp<Field<scalar>> tRes(new Field<scalar>(f.size()));
     mag(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<scalar> > mag(const tmp<Field<Type> >& tf)
+tmp<Field<scalar>> mag(const tmp<Field<Type>>& tf)
 {
-    tmp<Field<scalar> > tRes = reuseTmp<scalar, Type>::New(tf);
+    tmp<Field<scalar>> tRes = reuseTmp<scalar, Type>::New(tf);
     mag(tRes(), tf());
     reuseTmp<scalar, Type>::clear(tf);
     return tRes;
@@ -200,19 +200,19 @@ void cmptMax(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMax(const UList<Type>& f)
+tmp<Field<typename Field<Type>::cmptType>> cmptMax(const UList<Type>& f)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes(new Field<cmptType>(f.size()));
+    tmp<Field<cmptType>> tRes(new Field<cmptType>(f.size()));
     cmptMax(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMax(const tmp<Field<Type> >& tf)
+tmp<Field<typename Field<Type>::cmptType>> cmptMax(const tmp<Field<Type>>& tf)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes = reuseTmp<cmptType, Type>::New(tf);
+    tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
     cmptMax(tRes(), tf());
     reuseTmp<cmptType, Type>::clear(tf);
     return tRes;
@@ -227,19 +227,19 @@ void cmptMin(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMin(const UList<Type>& f)
+tmp<Field<typename Field<Type>::cmptType>> cmptMin(const UList<Type>& f)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes(new Field<cmptType>(f.size()));
+    tmp<Field<cmptType>> tRes(new Field<cmptType>(f.size()));
     cmptMin(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMin(const tmp<Field<Type> >& tf)
+tmp<Field<typename Field<Type>::cmptType>> cmptMin(const tmp<Field<Type>>& tf)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes = reuseTmp<cmptType, Type>::New(tf);
+    tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
     cmptMin(tRes(), tf());
     reuseTmp<cmptType, Type>::clear(tf);
     return tRes;
@@ -254,19 +254,19 @@ void cmptAv(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptAv(const UList<Type>& f)
+tmp<Field<typename Field<Type>::cmptType>> cmptAv(const UList<Type>& f)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes(new Field<cmptType>(f.size()));
+    tmp<Field<cmptType>> tRes(new Field<cmptType>(f.size()));
     cmptAv(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptAv(const tmp<Field<Type> >& tf)
+tmp<Field<typename Field<Type>::cmptType>> cmptAv(const tmp<Field<Type>>& tf)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes = reuseTmp<cmptType, Type>::New(tf);
+    tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
     cmptAv(tRes(), tf());
     reuseTmp<cmptType, Type>::clear(tf);
     return tRes;
@@ -280,17 +280,17 @@ void cmptMag(Field<Type>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<Type> > cmptMag(const UList<Type>& f)
+tmp<Field<Type>> cmptMag(const UList<Type>& f)
 {
-    tmp<Field<Type> > tRes(new Field<Type>(f.size()));
+    tmp<Field<Type>> tRes(new Field<Type>(f.size()));
     cmptMag(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<Type> > cmptMag(const tmp<Field<Type> >& tf)
+tmp<Field<Type>> cmptMag(const tmp<Field<Type>>& tf)
 {
-    tmp<Field<Type> > tRes = reuseTmp<Type, Type>::New(tf);
+    tmp<Field<Type>> tRes = reuseTmp<Type, Type>::New(tf);
     cmptMag(tRes(), tf());
     reuseTmp<Type, Type>::clear(tf);
     return tRes;
@@ -300,7 +300,7 @@ tmp<Field<Type> > cmptMag(const tmp<Field<Type> >& tf)
 #define TMP_UNARY_FUNCTION(ReturnType, Func)                                  \
                                                                               \
 template<class Type>                                                          \
-ReturnType Func(const tmp<Field<Type> >& tf1)                                 \
+ReturnType Func(const tmp<Field<Type>>& tf1)                                 \
 {                                                                             \
     ReturnType res = Func(tf1());                                             \
     tf1.clear();                                                              \
@@ -648,43 +648,43 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
 operator Op(const UList<Type1>& f1, const UList<Type2>& f2)                   \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType> > tRes(new Field<productType>(f1.size()));         \
+    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));         \
     OpFunc(tRes(), f1, f2);                                                   \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const UList<Type1>& f1, const tmp<Field<Type2> >& tf2)            \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const UList<Type1>& f1, const tmp<Field<Type2>>& tf2)            \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType> > tRes = reuseTmp<productType, Type2>::New(tf2);   \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type2>::New(tf2);   \
     OpFunc(tRes(), f1, tf2());                                                \
     reuseTmp<productType, Type2>::clear(tf2);                                 \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const tmp<Field<Type1> >& tf1, const UList<Type2>& f2)            \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const tmp<Field<Type1>>& tf1, const UList<Type2>& f2)            \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType> > tRes = reuseTmp<productType, Type1>::New(tf1);   \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type1>::New(tf1);   \
     OpFunc(tRes(), tf1(), f2);                                                \
     reuseTmp<productType, Type1>::clear(tf1);                                 \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const tmp<Field<Type1> >& tf1, const tmp<Field<Type2> >& tf2)     \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2)     \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType> > tRes =                                           \
+    tmp<Field<productType>> tRes =                                           \
         reuseTmpTmp<productType, Type1, Type1, Type2>::New(tf1, tf2);         \
     OpFunc(tRes(), tf1(), tf2());                                             \
     reuseTmpTmp<productType, Type1, Type1, Type2>::clear(tf1, tf2);           \
@@ -705,25 +705,25 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type> >                               \
+tmp<Field<typename product<Type, Form>::type>>                               \
 operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs)    \
 {                                                                             \
     typedef typename product<Type, Form>::type productType;                   \
-    tmp<Field<productType> > tRes(new Field<productType>(f1.size()));         \
+    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));         \
     OpFunc(tRes(), f1, static_cast<const Form&>(vs));                         \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type> >                               \
+tmp<Field<typename product<Type, Form>::type>>                               \
 operator Op                                                                   \
 (                                                                             \
-    const tmp<Field<Type> >& tf1,                                             \
+    const tmp<Field<Type>>& tf1,                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type, Form>::type productType;                   \
-    tmp<Field<productType> > tRes = reuseTmp<productType, Type>::New(tf1);    \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);    \
     OpFunc(tRes(), tf1(), static_cast<const Form&>(vs));                      \
     reuseTmp<productType, Type>::clear(tf1);                                  \
     return tRes;                                                              \
@@ -743,24 +743,24 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type> >                               \
+tmp<Field<typename product<Form, Type>::type>>                               \
 operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1)    \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
-    tmp<Field<productType> > tRes(new Field<productType>(f1.size()));         \
+    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));         \
     OpFunc(tRes(), static_cast<const Form&>(vs), f1);                         \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type> >                               \
+tmp<Field<typename product<Form, Type>::type>>                               \
 operator Op                                                                   \
 (                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs, const tmp<Field<Type> >& tf1      \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs, const tmp<Field<Type>>& tf1      \
 )                                                                             \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
-    tmp<Field<productType> > tRes = reuseTmp<productType, Type>::New(tf1);    \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);    \
     OpFunc(tRes(), static_cast<const Form&>(vs), tf1());                      \
     reuseTmp<productType, Type>::clear(tf1);                                  \
     return tRes;                                                              \
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
index 72a148f8e3..682139da60 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ void pow
 
 
 template<class Type, int r>
-tmp<Field<typename powProduct<Type, r>::type> >
+tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
     const UList<Type>& f,
@@ -65,10 +65,10 @@ pow
 );
 
 template<class Type, int r>
-tmp<Field<typename powProduct<Type, r>::type> >
+tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
-    const tmp<Field<Type> >& tf,
+    const tmp<Field<Type>>& tf,
     typename powProduct<Type, r>::type
       = pTraits<typename powProduct<Type, r>::type>::zero
 );
@@ -82,79 +82,79 @@ void sqr
 );
 
 template<class Type>
-tmp<Field<typename outerProduct<Type, Type>::type> >
+tmp<Field<typename outerProduct<Type, Type>::type>>
 sqr(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename outerProduct<Type, Type>::type> >
-sqr(const tmp<Field<Type> >& tf);
+tmp<Field<typename outerProduct<Type, Type>::type>>
+sqr(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void magSqr(Field<scalar>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<scalar> > magSqr(const UList<Type>& f);
+tmp<Field<scalar>> magSqr(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<scalar> > magSqr(const tmp<Field<Type> >& tf);
+tmp<Field<scalar>> magSqr(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void mag(Field<scalar>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<scalar> > mag(const UList<Type>& f);
+tmp<Field<scalar>> mag(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<scalar> > mag(const tmp<Field<Type> >& tf);
+tmp<Field<scalar>> mag(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void cmptMax(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMax(const UList<Type>& f);
+tmp<Field<typename Field<Type>::cmptType>> cmptMax(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> >
-cmptMax(const tmp<Field<Type> >& tf);
+tmp<Field<typename Field<Type>::cmptType>>
+cmptMax(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void cmptMin(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMin(const UList<Type>& f);
+tmp<Field<typename Field<Type>::cmptType>> cmptMin(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> >
-cmptMin(const tmp<Field<Type> >& tf);
+tmp<Field<typename Field<Type>::cmptType>>
+cmptMin(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void cmptAv(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptAv(const UList<Type>& f);
+tmp<Field<typename Field<Type>::cmptType>> cmptAv(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptAv(const tmp<Field<Type> >& tf);
+tmp<Field<typename Field<Type>::cmptType>> cmptAv(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void cmptMag(Field<Type>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<Type> > cmptMag(const UList<Type>& f);
+tmp<Field<Type>> cmptMag(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<Type> > cmptMag(const tmp<Field<Type> >& tf);
+tmp<Field<Type>> cmptMag(const tmp<Field<Type>>& tf);
 
 #define TMP_UNARY_FUNCTION(ReturnType, Func)                                  \
                                                                               \
 template<class Type>                                                          \
-ReturnType Func(const tmp<Field<Type> >& tf1);
+ReturnType Func(const tmp<Field<Type>>& tf1);
 
 template<class Type>
 Type max(const UList<Type>& f);
@@ -292,20 +292,20 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
 operator Op(const UList<Type1>& f1, const UList<Type2>& f2);                  \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const UList<Type1>& f1, const tmp<Field<Type2> >& tf2);           \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const UList<Type1>& f1, const tmp<Field<Type2>>& tf2);           \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const tmp<Field<Type1> >& tf1, const UList<Type2>& f2);           \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const tmp<Field<Type1>>& tf1, const UList<Type2>& f2);           \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const tmp<Field<Type1> >& tf1, const tmp<Field<Type2> >& tf2);    \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2);    \
                                                                               \
 template<class Type, class Form, class Cmpt, int nCmpt>                       \
 void OpFunc                                                                   \
@@ -316,12 +316,12 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type> >                               \
+tmp<Field<typename product<Type, Form>::type>>                               \
 operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs);   \
                                                                               \
 template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type> >                               \
-operator Op(const tmp<Field<Type> >&tf1,const VectorSpace<Form,Cmpt,nCmpt>&vs);\
+tmp<Field<typename product<Type, Form>::type>>                               \
+operator Op(const tmp<Field<Type>>&tf1,const VectorSpace<Form,Cmpt,nCmpt>&vs);\
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type>                       \
 void OpFunc                                                                   \
@@ -332,12 +332,12 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type> >                               \
+tmp<Field<typename product<Form, Type>::type>>                               \
 operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1);   \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type> >                               \
-operator Op(const VectorSpace<Form,Cmpt,nCmpt>&vs,const tmp<Field<Type> >&tf1);
+tmp<Field<typename product<Form, Type>::type>>                               \
+operator Op(const VectorSpace<Form,Cmpt,nCmpt>&vs,const tmp<Field<Type>>&tf1);
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
 PRODUCT_OPERATOR(typeOfSum, -, subtract)
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
index 4227d67df3..1a2840a786 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,17 +37,17 @@ void Func(Field<ReturnType>& res, const UList<Type>& f)                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func(const UList<Type>& f)                            \
+tmp<Field<ReturnType>> Func(const UList<Type>& f)                            \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f.size()));            \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f.size()));            \
     Func(tRes(), f);                                                          \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func(const tmp<Field<Type> >& tf)                     \
+tmp<Field<ReturnType>> Func(const tmp<Field<Type>>& tf)                     \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type>::New(tf);       \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);       \
     Func(tRes(), tf());                                                       \
     reuseTmp<ReturnType, Type>::clear(tf);                                    \
     return tRes;                                                              \
@@ -65,17 +65,17 @@ void OpFunc(Field<ReturnType>& res, const UList<Type>& f)                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op(const UList<Type>& f)                     \
+tmp<Field<ReturnType>> operator Op(const UList<Type>& f)                     \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f.size()));            \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f.size()));            \
     OpFunc(tRes(), f);                                                        \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op(const tmp<Field<Type> >& tf)              \
+tmp<Field<ReturnType>> operator Op(const tmp<Field<Type>>& tf)              \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type>::New(tf);       \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);       \
     OpFunc(tRes(), tf());                                                     \
     reuseTmp<ReturnType, Type>::clear(tf);                                    \
     return tRes;                                                              \
@@ -101,51 +101,51 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f1.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
     Func(tRes(), f1, f2);                                                     \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
     Func(tRes(), f1, tf2());                                                  \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
     Func(tRes(), tf1(), f2);                                                  \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type1>>& tf1,                                            \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes =                                            \
+    tmp<Field<ReturnType>> tRes =                                            \
         reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);          \
     Func(tRes(), tf1(), tf2());                                               \
     reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);            \
@@ -172,25 +172,25 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const Type1& s1,                                                          \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f2.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f2.size()));           \
     Func(tRes(), s1, f2);                                                     \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
     Func(tRes(), s1, tf2());                                                  \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
     return tRes;                                                              \
@@ -214,25 +214,25 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const Type2& s2                                                           \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f1.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
     Func(tRes(), f1, s2);                                                     \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const Type2& s2                                                           \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
     Func(tRes(), tf1(), s2);                                                  \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
     return tRes;                                                              \
@@ -260,51 +260,51 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f1.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
     OpFunc(tRes(), f1, f2);                                                   \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
     OpFunc(tRes(), f1, tf2());                                                \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
     OpFunc(tRes(), tf1(), f2);                                                \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type1>>& tf1,                                            \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes =                                            \
+    tmp<Field<ReturnType>> tRes =                                            \
         reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);          \
     OpFunc(tRes(), tf1(), tf2());                                             \
     reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);            \
@@ -328,25 +328,25 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const Type1& s1,                                                          \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f2.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f2.size()));           \
     OpFunc(tRes(), s1, f2);                                                   \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
     OpFunc(tRes(), s1, tf2());                                                \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
     return tRes;                                                              \
@@ -367,25 +367,25 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const Type2& s2                                                           \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f1.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
     OpFunc(tRes(), f1, s2);                                                   \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const Type2& s2                                                           \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
     OpFunc(tRes(), tf1(), s2);                                                \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
     return tRes;                                                              \
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
index 381a8d9872..4d0993e767 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,9 +35,9 @@ Description
 TEMPLATE                                                                      \
 void Func(Field<ReturnType>& res, const UList<Type1>& f);                     \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func(const UList<Type1>& f);                          \
+tmp<Field<ReturnType>> Func(const UList<Type1>& f);                          \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func(const tmp<Field<Type1> >& tf);
+tmp<Field<ReturnType>> Func(const tmp<Field<Type1>>& tf);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -47,9 +47,9 @@ tmp<Field<ReturnType> > Func(const tmp<Field<Type1> >& tf);
 TEMPLATE                                                                      \
 void OpFunc(Field<ReturnType>& res, const UList<Type1>& f);                   \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op(const UList<Type1>& f);                   \
+tmp<Field<ReturnType>> operator Op(const UList<Type1>& f);                   \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op(const tmp<Field<Type1> >& tf);
+tmp<Field<ReturnType>> operator Op(const tmp<Field<Type1>>& tf);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,31 +65,31 @@ void Func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type1>>& tf1,                                            \
+    const tmp<Field<Type2>>& tf2                                             \
 );
 
 
@@ -106,17 +106,17 @@ void Func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const Type1& s1,                                                          \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 );
 
 
@@ -131,16 +131,16 @@ void Func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const Type2& s2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const Type2& s2                                                           \
 );
 
@@ -163,31 +163,31 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type1>>& tf1,                                            \
+    const tmp<Field<Type2>>& tf2                                             \
 );
 
 
@@ -204,17 +204,17 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const Type1& s1,                                                          \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 );
 
 
@@ -229,16 +229,16 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const Type2& s2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const Type2& s2                                                           \
 );
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
index 69414c5b3e..b15b45b295 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,9 +99,9 @@ public:
     // Member Operators
 
         template<class Type>
-        tmp<Field<Type> > operator()(const Field<Type>& f) const
+        tmp<Field<Type>> operator()(const Field<Type>& f) const
         {
-            return tmp<Field<Type> >(new Field<Type>(f, *this));
+            return tmp<Field<Type>>(new Field<Type>(f, *this));
         }
 };
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
index 099994919a..35c5a5c16d 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,12 +38,12 @@ class reuseTmp
 {
 public:
 
-    static tmp<Field<TypeR> > New(const tmp<Field<Type1> >& tf1)
+    static tmp<Field<TypeR>> New(const tmp<Field<Type1>>& tf1)
     {
-        return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+        return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
     }
 
-    static void clear(const tmp<Field<Type1> >& tf1)
+    static void clear(const tmp<Field<Type1>>& tf1)
     {
         tf1.clear();
     }
@@ -55,7 +55,7 @@ class reuseTmp<TypeR, TypeR>
 {
 public:
 
-    static tmp<Field<TypeR> > New(const tmp<Field<TypeR> >& tf1)
+    static tmp<Field<TypeR>> New(const tmp<Field<TypeR>>& tf1)
     {
         if (tf1.isTmp())
         {
@@ -63,11 +63,11 @@ public:
         }
         else
         {
-            return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
 
-    static void clear(const tmp<Field<TypeR> >& tf1)
+    static void clear(const tmp<Field<TypeR>>& tf1)
     {
         if (tf1.isTmp())
         {
@@ -82,19 +82,19 @@ class reuseTmpTmp
 {
 public:
 
-    static tmp<Field<TypeR> > New
+    static tmp<Field<TypeR>> New
     (
-        const tmp<Field<Type1> >& tf1,
-        const tmp<Field<Type2> >& tf2
+        const tmp<Field<Type1>>& tf1,
+        const tmp<Field<Type2>>& tf2
     )
     {
-        return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+        return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
     }
 
     static void clear
     (
-        const tmp<Field<Type1> >& tf1,
-        const tmp<Field<Type2> >& tf2
+        const tmp<Field<Type1>>& tf1,
+        const tmp<Field<Type2>>& tf2
     )
     {
         tf1.clear();
@@ -108,10 +108,10 @@ class reuseTmpTmp<TypeR, Type1, Type12, TypeR>
 {
 public:
 
-    static tmp<Field<TypeR> > New
+    static tmp<Field<TypeR>> New
     (
-        const tmp<Field<Type1> >& tf1,
-        const tmp<Field<TypeR> >& tf2
+        const tmp<Field<Type1>>& tf1,
+        const tmp<Field<TypeR>>& tf2
     )
     {
         if (tf2.isTmp())
@@ -120,14 +120,14 @@ public:
         }
         else
         {
-            return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
 
     static void clear
     (
-        const tmp<Field<Type1> >& tf1,
-        const tmp<Field<TypeR> >& tf2
+        const tmp<Field<Type1>>& tf1,
+        const tmp<Field<TypeR>>& tf2
     )
     {
         tf1.clear();
@@ -144,10 +144,10 @@ class reuseTmpTmp<TypeR, TypeR, TypeR, Type2>
 {
 public:
 
-    static tmp<Field<TypeR> > New
+    static tmp<Field<TypeR>> New
     (
-        const tmp<Field<TypeR> >& tf1,
-        const tmp<Field<Type2> >& tf2
+        const tmp<Field<TypeR>>& tf1,
+        const tmp<Field<Type2>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -156,14 +156,14 @@ public:
         }
         else
         {
-            return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
 
     static void clear
     (
-        const tmp<Field<TypeR> >& tf1,
-        const tmp<Field<Type2> >& tf2
+        const tmp<Field<TypeR>>& tf1,
+        const tmp<Field<Type2>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -180,10 +180,10 @@ class reuseTmpTmp<TypeR, TypeR, TypeR, TypeR>
 {
 public:
 
-    static tmp<Field<TypeR> > New
+    static tmp<Field<TypeR>> New
     (
-        const tmp<Field<TypeR> >& tf1,
-        const tmp<Field<TypeR> >& tf2
+        const tmp<Field<TypeR>>& tf1,
+        const tmp<Field<TypeR>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -196,14 +196,14 @@ public:
         }
         else
         {
-            return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
 
     static void clear
     (
-        const tmp<Field<TypeR> >& tf1,
-        const tmp<Field<TypeR> >& tf2
+        const tmp<Field<TypeR>>& tf1,
+        const tmp<Field<TypeR>>& tf2
     )
     {
         if (tf1.isTmp())
diff --git a/src/OpenFOAM/fields/Fields/Field/SubField.H b/src/OpenFOAM/fields/Fields/Field/SubField.H
index a615d40f88..4ebacc1feb 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubField.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,10 +101,10 @@ public:
         static inline const SubField<Type>& null();
 
         //- Return a component field of the field
-        inline tmp<Field<cmptType> > component(const direction) const;
+        inline tmp<Field<cmptType>> component(const direction) const;
 
         //- Return the field transpose (only defined for second rank tensors)
-        tmp<Field<Type> > T() const;
+        tmp<Field<Type>> T() const;
 
 
     // Member operators
diff --git a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
index 18d3c589c7..e5ed14146d 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
@@ -84,12 +84,12 @@ inline Foam::SubField<Type>::SubField
 template<class Type>
 inline const Foam::SubField<Type>& Foam::SubField<Type>::null()
 {
-    return NullObjectRef<SubField<Type> >();
+    return NullObjectRef<SubField<Type>>();
 }
 
 
 template<class Type>
-inline Foam::tmp<Foam::Field<typename Foam::SubField<Type>::cmptType> >
+inline Foam::tmp<Foam::Field<typename Foam::SubField<Type>::cmptType>>
 Foam::SubField<Type>::component
 (
     const direction d
@@ -100,7 +100,7 @@ Foam::SubField<Type>::component
 
 
 template<class Type>
-inline Foam::tmp<Foam::Field<Type> > Foam::SubField<Type>::T() const
+inline Foam::tmp<Foam::Field<Type>> Foam::SubField<Type>::T() const
 {
     return (reinterpret_cast<const Field<Type>&>(*this)).T();
 }
diff --git a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorField.C b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorField.C
index a6d186f291..805b47cbad 100644
--- a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorField.C
+++ b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ BINARY_TYPE_OPERATOR(sphericalTensor, scalar, sphericalTensor, /, divide)
 
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tensorField& tf
 )
@@ -55,12 +55,12 @@ tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
 }
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tmp<tensorField>& ttf
 )
 {
-    tmp<Field<sphericalTensor> > ret =
+    tmp<Field<sphericalTensor>> ret =
         transformFieldMask<sphericalTensor>(ttf());
     ttf.clear();
     return ret;
@@ -68,7 +68,7 @@ tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
 
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const symmTensorField& stf
 )
@@ -77,12 +77,12 @@ tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
 }
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tmp<symmTensorField>& tstf
 )
 {
-    tmp<Field<sphericalTensor> > ret =
+    tmp<Field<sphericalTensor>> ret =
         transformFieldMask<sphericalTensor>(tstf());
     tstf.clear();
     return ret;
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
index 5aec204e24..f99fcb5e6a 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ tmp<symmTensorField> inv(const tmp<symmTensorField>& tf)
 
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tensorField& tf
 )
@@ -131,19 +131,19 @@ tmp<Field<symmTensor> > transformFieldMask<symmTensor>
 }
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tmp<tensorField>& ttf
 )
 {
-    tmp<Field<symmTensor> > ret = transformFieldMask<symmTensor>(ttf());
+    tmp<Field<symmTensor>> ret = transformFieldMask<symmTensor>(ttf());
     ttf.clear();
     return ret;
 }
 
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const symmTensorField& stf
 )
@@ -152,7 +152,7 @@ tmp<Field<symmTensor> > transformFieldMask<symmTensor>
 }
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tmp<symmTensorField>& tstf
 )
diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
index 47a22217b9..ab8f395201 100644
--- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
+++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,26 +56,26 @@ void transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const symmTensorField& trf,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type> (tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
     transform(tranf(), trf, tf);
     return tranf;
 }
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const symmTensorField& trf,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), trf, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
@@ -83,13 +83,13 @@ tmp<Field<Type> > transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tmp<symmTensorField>& ttrf,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type> (tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
     transform(tranf(), ttrf(), tf);
     ttrf.clear();
     return tranf;
@@ -97,13 +97,13 @@ tmp<Field<Type> > transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tmp<symmTensorField>& ttrf,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), ttrf(), ttf());
     reuseTmp<Type, Type>::clear(ttf);
     ttrf.clear();
@@ -124,26 +124,26 @@ void transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const symmTensor& t,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type>(tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type>(tf.size()));
     transform(tranf(), t, tf);
     return tranf;
 }
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const symmTensor& t,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), t, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
index 0ae6755f37..5e25bf0e74 100644
--- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
+++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,19 +50,19 @@ template<class Type>
 void transform(Field<Type>&, const symmTensorField&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const symmTensorField&, const Field<Type>&);
+tmp<Field<Type>> transform(const symmTensorField&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const symmTensorField&, const tmp<Field<Type> >&);
+tmp<Field<Type>> transform(const symmTensorField&, const tmp<Field<Type>>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tmp<symmTensorField>&, const Field<Type>&);
+tmp<Field<Type>> transform(const tmp<symmTensorField>&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tmp<symmTensorField>&,
-    const tmp<Field<Type> >&
+    const tmp<Field<Type>>&
 );
 
 
@@ -70,46 +70,46 @@ template<class Type>
 void transform(Field<Type>&, const tensor&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensor&, const Field<Type>&);
+tmp<Field<Type>> transform(const tensor&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensor&, const tmp<Field<Type> >&);
+tmp<Field<Type>> transform(const tensor&, const tmp<Field<Type>>&);
 
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const symmTensorField&
 );
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tmp<symmTensorField>&
 );
 
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const symmTensorField&
 );
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tmp<symmTensorField>&
 );
 
 
 template<>
-tmp<Field<tensor> > transformFieldMask<tensor>
+tmp<Field<tensor>> transformFieldMask<tensor>
 (
     const symmTensorField&
 );
 
 template<>
-tmp<Field<tensor> > transformFieldMask<tensor>
+tmp<Field<tensor>> transformFieldMask<tensor>
 (
     const tmp<symmTensorField>&
 );
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
index b373dbf2e7..91197660f6 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,7 +126,7 @@ UNARY_FUNCTION(tensor, symmTensor, eigenVectors)
 
 
 template<>
-tmp<Field<tensor> > transformFieldMask<tensor>
+tmp<Field<tensor>> transformFieldMask<tensor>
 (
     const symmTensorField& stf
 )
@@ -138,12 +138,12 @@ tmp<Field<tensor> > transformFieldMask<tensor>
 }
 
 template<>
-tmp<Field<tensor> > transformFieldMask<tensor>
+tmp<Field<tensor>> transformFieldMask<tensor>
 (
     const tmp<symmTensorField>& tstf
 )
 {
-    tmp<Field<tensor> > ret = transformFieldMask<tensor>(tstf());
+    tmp<Field<tensor>> ret = transformFieldMask<tensor>(tstf());
     tstf.clear();
     return ret;
 }
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformField.H b/src/OpenFOAM/fields/Fields/transformField/transformField.H
index ec881641b7..e5bf3917a1 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformField.H
+++ b/src/OpenFOAM/fields/Fields/transformField/transformField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,56 +52,56 @@ template<class Type>
 void transform(Field<Type>&, const tensorField&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensorField&, const Field<Type>&);
+tmp<Field<Type>> transform(const tensorField&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensorField&, const tmp<Field<Type> >&);
+tmp<Field<Type>> transform(const tensorField&, const tmp<Field<Type>>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tmp<tensorField>&, const Field<Type>&);
+tmp<Field<Type>> transform(const tmp<tensorField>&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tmp<tensorField>&, const tmp<Field<Type> >&);
+tmp<Field<Type>> transform(const tmp<tensorField>&, const tmp<Field<Type>>&);
 
 
 template<class Type>
 void transform(Field<Type>&, const tensor&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensor&, const Field<Type>&);
+tmp<Field<Type>> transform(const tensor&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensor&, const tmp<Field<Type> >&);
+tmp<Field<Type>> transform(const tensor&, const tmp<Field<Type>>&);
 
 
 template<class Type1, class Type2>
-tmp<Field<Type1> > transformFieldMask(const Field<Type2>&);
+tmp<Field<Type1>> transformFieldMask(const Field<Type2>&);
 
 template<class Type1, class Type2>
-tmp<Field<Type1> > transformFieldMask(const tmp<Field<Type2> >&);
+tmp<Field<Type1>> transformFieldMask(const tmp<Field<Type2>>&);
 
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tensorField&
 );
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tmp<tensorField>&
 );
 
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tensorField&
 );
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tmp<tensorField>&
 );
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C b/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
index 658fdd3aef..792df9ce10 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
+++ b/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,26 +56,26 @@ void transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tensorField& trf,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type> (tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
     transform(tranf(), trf, tf);
     return tranf;
 }
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tensorField& trf,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), trf, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
@@ -83,13 +83,13 @@ tmp<Field<Type> > transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tmp<tensorField>& ttrf,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type> (tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
     transform(tranf(), ttrf(), tf);
     ttrf.clear();
     return tranf;
@@ -97,13 +97,13 @@ tmp<Field<Type> > transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tmp<tensorField>& ttrf,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), ttrf(), ttf());
     reuseTmp<Type, Type>::clear(ttf);
     ttrf.clear();
@@ -124,26 +124,26 @@ void transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tensor& t,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type>(tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type>(tf.size()));
     transform(tranf(), t, tf);
     return tranf;
 }
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tensor& t,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), t, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
@@ -151,15 +151,15 @@ tmp<Field<Type> > transform
 
 
 template<class Type1, class Type2>
-tmp<Field<Type1> > transformFieldMask(const Field<Type2>& f)
+tmp<Field<Type1>> transformFieldMask(const Field<Type2>& f)
 {
     return f;
 }
 
 template<class Type1, class Type2>
-tmp<Field<Type1> > transformFieldMask(const tmp<Field<Type2> >& tf)
+tmp<Field<Type1>> transformFieldMask(const tmp<Field<Type2>>& tf)
 {
-    return tmp<Field<Type1> >(tf.ptr());
+    return tmp<Field<Type1>>(tf.ptr());
 }
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index da522ae426..2cc3264215 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -336,7 +336,7 @@ GeometricBoundaryField
 (
     const BoundaryMesh& bmesh,
     const DimensionedField<Type, GeoMesh>& field,
-    const PtrList<PatchField<Type> >& ptfl
+    const PtrList<PatchField<Type>>& ptfl
 )
 :
     FieldField<PatchField, Type>(bmesh.size()),
@@ -350,7 +350,7 @@ GeometricBoundaryField
                "("
                     "const BoundaryMesh&, "
                     "const DimensionedField<Type, GeoMesh>&, "
-                    "const PtrLIst<PatchField<Type> >&"
+                    "const PtrLIst<PatchField<Type>>&"
                ")"
             << endl;
     }
@@ -573,12 +573,12 @@ interfaces() const
 
     forAll(interfaces, patchi)
     {
-        if (isA<LduInterfaceField<Type> >(this->operator[](patchi)))
+        if (isA<LduInterfaceField<Type>>(this->operator[](patchi)))
         {
             interfaces.set
             (
                 patchi,
-                &refCast<const LduInterfaceField<Type> >
+                &refCast<const LduInterfaceField<Type>>
                 (
                     this->operator[](patchi)
                 )
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index fe5a34c6de..452e214997 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -289,7 +289,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
     const Mesh& mesh,
     const dimensionSet& ds,
     const Field<Type>& iField,
-    const PtrList<PatchField<Type> >& ptfl
+    const PtrList<PatchField<Type>>& ptfl
 )
 :
     DimensionedField<Type, GeoMesh>(io, mesh, ds, iField),
@@ -417,7 +417,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 :
     DimensionedField<Type, GeoMesh>
@@ -480,7 +480,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const IOobject& io,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 :
     DimensionedField<Type, GeoMesh>
@@ -544,7 +544,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const word& newName,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 :
     DimensionedField<Type, GeoMesh>
@@ -943,10 +943,10 @@ writeData(Ostream& os) const
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-Foam::tmp<Foam::GeometricField<Type, PatchField, GeoMesh> >
+Foam::tmp<Foam::GeometricField<Type, PatchField, GeoMesh>>
 Foam::GeometricField<Type, PatchField, GeoMesh>::T() const
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > result
+    tmp<GeometricField<Type, PatchField, GeoMesh>> result
     (
         new GeometricField<Type, PatchField, GeoMesh>
         (
@@ -983,7 +983,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::component
     const direction d
 ) const
 {
-    tmp<GeometricField<cmptType, PatchField, GeoMesh> > Component
+    tmp<GeometricField<cmptType, PatchField, GeoMesh>> Component
     (
         new GeometricField<cmptType, PatchField, GeoMesh>
         (
@@ -1091,7 +1091,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator=
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::operator=
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
     if (this == &(tgf()))
@@ -1135,7 +1135,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator=
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::operator==
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
@@ -1179,7 +1179,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator op             \
 template<class Type, template<class> class PatchField, class GeoMesh>         \
 void Foam::GeometricField<Type, PatchField, GeoMesh>::operator op             \
 (                                                                             \
-    const tmp<GeometricField<TYPE, PatchField, GeoMesh> >& tgf                \
+    const tmp<GeometricField<TYPE, PatchField, GeoMesh>>& tgf                \
 )                                                                             \
 {                                                                             \
     operator op(tgf());                                                       \
@@ -1232,7 +1232,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
     os << tgf();
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index 334bdc2670..7c47a526cb 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Ostream& operator<<
 (
     Ostream&,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>&
 );
 
 
@@ -144,12 +144,12 @@ public:
 
             //- Construct from a BoundaryMesh,
             //  reference to the internal field
-            //  and a PtrList<PatchField<Type> >
+            //  and a PtrList<PatchField<Type>>
             GeometricBoundaryField
             (
                 const BoundaryMesh&,
                 const DimensionedInternalField&,
-                const PtrList<PatchField<Type> >&
+                const PtrList<PatchField<Type>>&
             );
 
             //- Construct as copy setting the reference to the internal field
@@ -330,7 +330,7 @@ public:
             const Mesh&,
             const dimensionSet&,
             const Field<Type>&,
-            const PtrList<PatchField<Type> >&
+            const PtrList<PatchField<Type>>&
         );
 
         //- Construct and read given IOobject
@@ -358,7 +358,7 @@ public:
         #ifndef NoConstructFromTmp
         GeometricField
         (
-            const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>&
         );
         #endif
 
@@ -374,7 +374,7 @@ public:
         GeometricField
         (
             const IOobject&,
-            const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>&
         );
         #endif
 
@@ -390,7 +390,7 @@ public:
         GeometricField
         (
             const word& newName,
-            const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>&
         );
         #endif
 
@@ -471,7 +471,7 @@ public:
         bool needReference() const;
 
         //- Return a component of the field
-        tmp<GeometricField<cmptType, PatchField, GeoMesh> > component
+        tmp<GeometricField<cmptType, PatchField, GeoMesh>> component
         (
             const direction
         ) const;
@@ -480,7 +480,7 @@ public:
         bool writeData(Ostream&) const;
 
         //- Return transpose (only if it is a tensor field)
-        tmp<GeometricField<Type, PatchField, GeoMesh> > T() const;
+        tmp<GeometricField<Type, PatchField, GeoMesh>> T() const;
 
         //- Relax field (for steady-state solution).
         //  alpha = 1 : no relaxation
@@ -548,23 +548,23 @@ public:
     // Member operators
 
         void operator=(const GeometricField<Type, PatchField, GeoMesh>&);
-        void operator=(const tmp<GeometricField<Type, PatchField, GeoMesh> >&);
+        void operator=(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
         void operator=(const dimensioned<Type>&);
 
-        void operator==(const tmp<GeometricField<Type, PatchField, GeoMesh> >&);
+        void operator==(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
         void operator==(const dimensioned<Type>&);
 
         void operator+=(const GeometricField<Type, PatchField, GeoMesh>&);
-        void operator+=(const tmp<GeometricField<Type, PatchField, GeoMesh> >&);
+        void operator+=(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
 
         void operator-=(const GeometricField<Type, PatchField, GeoMesh>&);
-        void operator-=(const tmp<GeometricField<Type, PatchField, GeoMesh> >&);
+        void operator-=(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
 
         void operator*=(const GeometricField<scalar, PatchField, GeoMesh>&);
-        void operator*=(const tmp<GeometricField<scalar,PatchField,GeoMesh> >&);
+        void operator*=(const tmp<GeometricField<scalar,PatchField,GeoMesh>>&);
 
         void operator/=(const GeometricField<scalar, PatchField, GeoMesh>&);
-        void operator/=(const tmp<GeometricField<scalar,PatchField,GeoMesh> >&);
+        void operator/=(const tmp<GeometricField<scalar,PatchField,GeoMesh>>&);
 
         void operator+=(const dimensioned<Type>&);
         void operator-=(const dimensioned<Type>&);
@@ -584,7 +584,7 @@ public:
         friend Ostream& operator<< <Type, PatchField, GeoMesh>
         (
             Ostream&,
-            const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>&
         );
 };
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
index bdd619e359..9dbc5cfb0d 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ void pow
 }
 
 template<class Type, template<class> class PatchField, class GeoMesh, int r>
-tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh> >
+tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>>
 pow
 (
     const GeometricField<Type, PatchField, GeoMesh>& gf,
@@ -87,7 +87,7 @@ pow
 {
     typedef typename powProduct<Type, r>::type powProductType;
 
-    tmp<GeometricField<powProductType, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<powProductType, PatchField, GeoMesh>> tPow
     (
         new GeometricField<powProductType, PatchField, GeoMesh>
         (
@@ -111,10 +111,10 @@ pow
 
 
 template<class Type, template<class> class PatchField, class GeoMesh, int r>
-tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh> >
+tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>>
 pow
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf,
     typename powProduct<Type, r>::type
 )
 {
@@ -122,7 +122,7 @@ pow
 
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
 
-    tmp<GeometricField<powProductType, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<powProductType, PatchField, GeoMesh>> tPow
     (
         new GeometricField<powProductType, PatchField, GeoMesh>
         (
@@ -173,7 +173,7 @@ sqr(const GeometricField<Type, PatchField, GeoMesh>& gf)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
 
-    tmp<GeometricField<outerProductType, PatchField, GeoMesh> > tSqr
+    tmp<GeometricField<outerProductType, PatchField, GeoMesh>> tSqr
     (
         new GeometricField<outerProductType, PatchField, GeoMesh>
         (
@@ -205,13 +205,13 @@ tmp
         GeoMesh
     >
 >
-sqr(const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf)
+sqr(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
 
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
 
-    tmp<GeometricField<outerProductType, PatchField, GeoMesh> > tSqr
+    tmp<GeometricField<outerProductType, PatchField, GeoMesh>> tSqr
     (
         new GeometricField<outerProductType, PatchField, GeoMesh>
         (
@@ -248,12 +248,12 @@ void magSqr
 }
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > magSqr
+tmp<GeometricField<scalar, PatchField, GeoMesh>> magSqr
 (
     const GeometricField<Type, PatchField, GeoMesh>& gf
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tMagSqr
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tMagSqr
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -276,14 +276,14 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > magSqr
 }
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > magSqr
+tmp<GeometricField<scalar, PatchField, GeoMesh>> magSqr
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tMagSqr
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tMagSqr
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -320,12 +320,12 @@ void mag
 }
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > mag
+tmp<GeometricField<scalar, PatchField, GeoMesh>> mag
 (
     const GeometricField<Type, PatchField, GeoMesh>& gf
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tMag
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tMag
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -348,14 +348,14 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > mag
 }
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > mag
+tmp<GeometricField<scalar, PatchField, GeoMesh>> mag
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tMag
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tMag
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -411,7 +411,7 @@ cmptAv(const GeometricField<Type, PatchField, GeoMesh>& gf)
     typedef typename GeometricField<Type, PatchField, GeoMesh>::cmptType
         cmptType;
 
-    tmp<GeometricField<cmptType, PatchField, GeoMesh> > CmptAv
+    tmp<GeometricField<cmptType, PatchField, GeoMesh>> CmptAv
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -443,14 +443,14 @@ tmp
         GeoMesh
     >
 >
-cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf)
+cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
 {
     typedef typename GeometricField<Type, PatchField, GeoMesh>::cmptType
         cmptType;
 
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
 
-    tmp<GeometricField<cmptType, PatchField, GeoMesh> > CmptAv
+    tmp<GeometricField<cmptType, PatchField, GeoMesh>> CmptAv
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -494,7 +494,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, template<class> class PatchField, class GeoMesh>         \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 )                                                                             \
 {                                                                             \
     dimensioned<returnType> res = func(tgf1());                               \
@@ -527,7 +527,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, template<class> class PatchField, class GeoMesh>         \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 )                                                                             \
 {                                                                             \
     dimensioned<returnType> res = func(tgf1());                               \
@@ -598,7 +598,7 @@ operator op                                                                   \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes               \
     (                                                                         \
         new GeometricField<productType, PatchField, GeoMesh>                  \
         (                                                                     \
@@ -629,14 +629,14 @@ tmp                                                                           \
 operator op                                                                   \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
                                                                               \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes =             \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
         reuseTmpGeometricField<productType, Type2, PatchField, GeoMesh>::New  \
         (                                                                     \
             tgf2,                                                             \
@@ -660,7 +660,7 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
@@ -668,7 +668,7 @@ operator op                                                                   \
                                                                               \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes =             \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
         reuseTmpGeometricField<productType, Type1, PatchField, GeoMesh>::New  \
         (                                                                     \
             tgf1,                                                             \
@@ -692,8 +692,8 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
@@ -701,7 +701,7 @@ operator op                                                                   \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes =             \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
         reuseTmpTmpGeometricField                                             \
         <productType, Type1, Type1, Type2, PatchField, GeoMesh>::New          \
         (                                                                     \
@@ -736,7 +736,7 @@ void opFunc                                                                   \
                                                                               \
 template                                                                      \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const GeometricField<Type, PatchField, GeoMesh>& gf1,                     \
@@ -745,7 +745,7 @@ operator op                                                                   \
 {                                                                             \
     typedef typename product<Type, Form>::type productType;                   \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes               \
     (                                                                         \
         new GeometricField<productType, PatchField, GeoMesh>                  \
         (                                                                     \
@@ -775,7 +775,7 @@ template                                                                      \
     class Type, template<class> class PatchField,                             \
     class GeoMesh                                                             \
 >                                                                             \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const GeometricField<Type, PatchField, GeoMesh>& gf1,                     \
@@ -788,10 +788,10 @@ operator op                                                                   \
                                                                               \
 template                                                                      \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1,              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
     const dimensioned<Form>& dvs                                              \
 )                                                                             \
 {                                                                             \
@@ -799,7 +799,7 @@ operator op                                                                   \
                                                                               \
     const GeometricField<Type, PatchField, GeoMesh>& gf1 = tgf1();            \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes =             \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
         reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>::New   \
         (                                                                     \
             tgf1,                                                             \
@@ -823,10 +823,10 @@ template                                                                      \
     class Type, template<class> class PatchField,                             \
     class GeoMesh                                                             \
 >                                                                             \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1,              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
 )                                                                             \
 {                                                                             \
@@ -850,7 +850,7 @@ void opFunc                                                                   \
                                                                               \
 template                                                                      \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
@@ -858,7 +858,7 @@ operator op                                                                   \
 )                                                                             \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes               \
     (                                                                         \
         new GeometricField<productType, PatchField, GeoMesh>                  \
         (                                                                     \
@@ -888,7 +888,7 @@ template                                                                      \
     class Type, template<class> class PatchField,                             \
     class GeoMesh                                                             \
 >                                                                             \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
@@ -900,18 +900,18 @@ operator op                                                                   \
                                                                               \
 template                                                                      \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 )                                                                             \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
                                                                               \
     const GeometricField<Type, PatchField, GeoMesh>& gf1 = tgf1();            \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes =             \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
         reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>::New   \
         (                                                                     \
             tgf1,                                                             \
@@ -935,11 +935,11 @@ template                                                                      \
     class Type, template<class> class PatchField,                             \
     class GeoMesh                                                             \
 >                                                                             \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 )                                                                             \
 {                                                                             \
     return dimensioned<Form>(static_cast<const Form&>(vs)) op tgf1;           \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
index 459bb7b7b7..6c7d7c3d9b 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ tmp
 >
 pow
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf,
     typename powProduct<Type, r>::type
 );
 
@@ -117,7 +117,7 @@ tmp
         GeoMesh
     >
 >
-sqr(const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf);
+sqr(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf);
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 void magSqr
@@ -127,15 +127,15 @@ void magSqr
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > magSqr
+tmp<GeometricField<scalar, PatchField, GeoMesh>> magSqr
 (
     const GeometricField<Type, PatchField, GeoMesh>& gf
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > magSqr
+tmp<GeometricField<scalar, PatchField, GeoMesh>> magSqr
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -146,15 +146,15 @@ void mag
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > mag
+tmp<GeometricField<scalar, PatchField, GeoMesh>> mag
 (
     const GeometricField<Type, PatchField, GeoMesh>& gf
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > mag
+tmp<GeometricField<scalar, PatchField, GeoMesh>> mag
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -191,7 +191,7 @@ tmp
         GeoMesh
     >
 >
-cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf);
+cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf);
 
 
 #define UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(returnType, func, gFunc)       \
@@ -205,7 +205,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, template<class> class PatchField, class GeoMesh>         \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 );
 
 UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(Type, max, gMax)
@@ -225,7 +225,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, template<class> class PatchField, class GeoMesh>         \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 );
 
 UNARY_REDUCTION_FUNCTION(Type, sum, gSum)
@@ -297,7 +297,7 @@ tmp                                                                           \
 operator op                                                                   \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 );                                                                            \
                                                                               \
 template                                                                      \
@@ -309,7 +309,7 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 );                                                                            \
                                                                               \
@@ -322,8 +322,8 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 );                                                                            \
                                                                               \
 template                                                                      \
@@ -377,7 +377,7 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1,              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
     const dimensioned<Form>& dvs                                              \
 );                                                                            \
                                                                               \
@@ -396,7 +396,7 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1,              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
 );                                                                            \
                                                                               \
@@ -452,7 +452,7 @@ tmp                                                                           \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 );                                                                            \
                                                                               \
 template                                                                      \
@@ -471,7 +471,7 @@ tmp                                                                           \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 );
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
index 9b598d5bc3..ef97074ca4 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,12 +46,12 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -74,14 +74,14 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -116,12 +116,12 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -144,14 +144,14 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -187,13 +187,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -216,15 +216,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -243,15 +243,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -270,16 +270,16 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpTmpGeometricField                                             \
             <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>            \
@@ -318,13 +318,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -347,7 +347,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const Type1& t1,                                                          \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
@@ -358,15 +358,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -385,10 +385,10 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     return Func(dimensioned<Type1>(t1), tgf2);                                \
@@ -410,13 +410,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -439,7 +439,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const Type2& t2                                                           \
@@ -450,15 +450,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -477,9 +477,9 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const Type2& t2                                                           \
 )                                                                             \
 {                                                                             \
@@ -511,13 +511,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -540,15 +540,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -567,15 +567,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -594,16 +594,16 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpTmpGeometricField                                             \
             <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>::New       \
@@ -642,13 +642,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -671,7 +671,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const Type1& t1,                                                          \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
@@ -682,15 +682,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -709,10 +709,10 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     return dimensioned<Type1>(t1) Op tgf2;                                    \
@@ -734,13 +734,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -763,7 +763,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const Type2& t2                                                           \
@@ -774,15 +774,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -801,9 +801,9 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const Type2& t2                                                           \
 )                                                                             \
 {                                                                             \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
index 417b06ba44..725fefb727 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,15 +28,15 @@ License
 #define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                        \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df                      \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1              \
 );
 
 
@@ -45,15 +45,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 #define UNARY_OPERATOR(ReturnType, Type1, Op, opFunc, Dfunc)                  \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1              \
 );
 
 
@@ -62,31 +62,31 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 #define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );
 
 
@@ -95,61 +95,61 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 #define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const Type1& t1,                                                          \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );
 
 
 #define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const Type2& t2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf2,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf2,             \
     const Type2& t2                                                           \
 );
 
@@ -164,31 +164,31 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 #define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)         \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );
 
 
@@ -197,61 +197,61 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const Type1& t1,                                                          \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );
 
 
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const Type2& t2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
     const Type2& t2                                                           \
 );
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H
index 35885d523f..aeda9e37fe 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 inline const Foam::GeometricField<Type, PatchField, GeoMesh>&
 Foam::GeometricField<Type, PatchField, GeoMesh>::null()
 {
-    return NullObjectRef<GeometricField<Type, PatchField, GeoMesh> >();
+    return NullObjectRef<GeometricField<Type, PatchField, GeoMesh>>();
 }
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
index 5861a2efdd..06970c3c67 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,16 +44,16 @@ class reuseTmpGeometricField
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
         const word& name,
         const dimensionSet& dimensions
     )
     {
         const GeometricField<Type1, PatchField, GeoMesh>& df1 = tdf1();
 
-        return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
         (
             new GeometricField<TypeR, PatchField, GeoMesh>
             (
@@ -71,7 +71,7 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1
     )
     {
         tdf1.clear();
@@ -84,9 +84,9 @@ class reuseTmpGeometricField<TypeR, TypeR, PatchField, GeoMesh>
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -102,7 +102,7 @@ public:
         }
         else
         {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
             (
                 new GeometricField<TypeR, PatchField, GeoMesh>
                 (
@@ -121,7 +121,7 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1
     )
     {
         if (tdf1.isTmp())
@@ -145,17 +145,17 @@ class reuseTmpTmpGeometricField
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2,
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
         const GeometricField<Type1, PatchField, GeoMesh>& df1 = tdf1();
 
-        return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
         (
             new GeometricField<TypeR, PatchField, GeoMesh>
             (
@@ -173,8 +173,8 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2
     )
     {
         tdf1.clear();
@@ -196,10 +196,10 @@ class reuseTmpTmpGeometricField
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf2,
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -216,7 +216,7 @@ public:
         }
         else
         {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
             (
                 new GeometricField<TypeR, PatchField, GeoMesh>
                 (
@@ -235,8 +235,8 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf2
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2
     )
     {
         tdf1.clear();
@@ -259,10 +259,10 @@ class reuseTmpTmpGeometricField<TypeR, TypeR, TypeR, Type2, PatchField, GeoMesh>
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -278,7 +278,7 @@ public:
         }
         else
         {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
             (
                 new GeometricField<TypeR, PatchField, GeoMesh>
                 (
@@ -297,8 +297,8 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2
     )
     {
         if (tdf1.isTmp())
@@ -315,10 +315,10 @@ class reuseTmpTmpGeometricField<TypeR, TypeR, TypeR, TypeR, PatchField, GeoMesh>
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf2,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -342,7 +342,7 @@ public:
         }
         else
         {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
             (
                 new GeometricField<TypeR, PatchField, GeoMesh>
                 (
@@ -361,8 +361,8 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf2
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2
     )
     {
         if (tdf1.isTmp())
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H
index 10150f7a64..637e4314f3 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ void MapGeometricFields
     HashTable<const GeometricField<Type, PatchField, GeoMesh>*> fields
     (
         mapper.thisDb().objectRegistry::template
-            lookupClass<GeometricField<Type, PatchField, GeoMesh> >()
+            lookupClass<GeometricField<Type, PatchField, GeoMesh>>()
     );
 
     // It is necessary to enforce that all old-time fields are stored
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C
index 968f5f4c0f..e53fdf778a 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 template<class GeoField>
 Foam::tmp<GeoField> Foam::uniformInterpolate
 (
-    const HashPtrTable<GeoField, label, Hash<label> >& fields,
+    const HashPtrTable<GeoField, label, Hash<label>>& fields,
     const labelList& indices,
     const scalarField& weights
 )
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
index f196f71c19..4cf01dcf9d 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ namespace Foam
 template<class GeoField>
 tmp<GeoField> uniformInterpolate
 (
-    const HashPtrTable<GeoField, label, Hash<label> >& fields,
+    const HashPtrTable<GeoField, label, Hash<label>>& fields,
     const labelList& indices,
     const scalarField& weights
 );
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
index cb34740ca3..67f4486f11 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,13 +49,13 @@ void stabilise
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > stabilise
+tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf,
     const dimensioned<scalar>& ds
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tRes
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tRes
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -79,15 +79,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > stabilise
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > stabilise
+tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf,
     const dimensioned<scalar>& ds
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tRes
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tRes
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -132,13 +132,13 @@ void pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -166,15 +166,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf1,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf1,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1 = tgsf1();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -197,15 +197,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf2
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2 = tgsf2();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -227,16 +227,16 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf1,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf2
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf1,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1 = tgsf1();
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2 = tgsf2();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         reuseTmpTmpGeometricField
             <scalar, scalar, scalar, scalar, PatchField, GeoMesh>::New
@@ -276,13 +276,13 @@ void pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf,
     const dimensionedScalar& ds
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -305,15 +305,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf,
     const dimensionedScalar& ds
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -331,7 +331,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf,
     const scalar& s
@@ -341,9 +341,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf,
     const scalar& s
 )
 {
@@ -365,13 +365,13 @@ void pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -395,15 +395,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -421,7 +421,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const scalar& s,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf
@@ -431,10 +431,10 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const scalar& s,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf
 )
 {
     return pow(dimensionedScalar(s), tgsf);
@@ -457,13 +457,13 @@ void atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -487,15 +487,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf1,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf1,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1 = tgsf1();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -514,15 +514,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf2
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2 = tgsf2();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -540,16 +540,16 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf1,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf2
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf1,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1 = tgsf1();
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2 = tgsf2();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         reuseTmpTmpGeometricField
             <scalar, scalar, scalar, scalar, PatchField, GeoMesh>::New
@@ -585,13 +585,13 @@ void atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf,
     const dimensionedScalar& ds
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -614,15 +614,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf,
     const dimensionedScalar& ds
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -640,7 +640,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf,
     const scalar& s
@@ -650,9 +650,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf,
     const scalar& s
 )
 {
@@ -674,13 +674,13 @@ void atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const dimensionedScalar& ds,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -704,15 +704,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const dimensionedScalar& ds,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -730,7 +730,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const scalar& s,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf
@@ -740,10 +740,10 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const scalar& s,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf
 )
 {
     return atan2(dimensionedScalar(s), tgsf);
@@ -806,7 +806,7 @@ void func                                                                   \
 }                                                                           \
                                                                             \
 template<template<class> class PatchField, class GeoMesh>                   \
-tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                      \
 (                                                                           \
     const int n,                                                            \
     const GeometricField<scalar, PatchField, GeoMesh>& gsf                  \
@@ -819,7 +819,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tFunc                 \
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tFunc                 \
     (                                                                       \
         new GeometricField<scalar, PatchField, GeoMesh>                     \
         (                                                                   \
@@ -842,10 +842,10 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
 }                                                                           \
                                                                             \
 template<template<class> class PatchField, class GeoMesh>                   \
-tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                      \
 (                                                                           \
     const int n,                                                            \
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf           \
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf           \
 )                                                                           \
 {                                                                           \
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();        \
@@ -857,7 +857,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tFunc                 \
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tFunc                 \
     (                                                                       \
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New    \
         (                                                                   \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
index 78dc2e1d30..5090e5491d 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,16 +57,16 @@ void stabilise
 );
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > stabilise
+tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
 (
     const GeometricField<scalar, PatchField, GeoMesh>&,
     const dimensioned<scalar>&
 );
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > stabilise
+tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >&,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>&,
     const dimensioned<scalar>&
 );
 
@@ -140,17 +140,17 @@ void func                                                                      \
 );                                                                             \
                                                                                \
 template<template<class> class PatchField, class GeoMesh>                      \
-tmp<GeometricField<scalar, PatchField, GeoMesh> > func                         \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                         \
 (                                                                              \
     const int n,                                                               \
     const GeometricField<scalar, PatchField, GeoMesh>&                         \
 );                                                                             \
                                                                                \
 template<template<class> class PatchField, class GeoMesh>                      \
-tmp<GeometricField<scalar, PatchField, GeoMesh> > func                         \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                         \
 (                                                                              \
     const int n,                                                               \
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >&                   \
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>&                   \
 );
 
 BesselFunc(jn)
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
index 1ea9ae6e11..5d7766e4f7 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ template
     template<class> class SlicedPatchField,
     class GeoMesh
 >
-Foam::tmp<Foam::FieldField<PatchField, Type> >
+Foam::tmp<Foam::FieldField<PatchField, Type>>
 Foam::SlicedGeometricField<Type, PatchField, SlicedPatchField, GeoMesh>::
 slicedBoundaryField
 (
@@ -45,7 +45,7 @@ slicedBoundaryField
     const bool preserveProcessorOnly
 )
 {
-    tmp<FieldField<PatchField, Type> > tbf
+    tmp<FieldField<PatchField, Type>> tbf
     (
         new FieldField<PatchField, Type>(mesh.boundary().size())
     );
@@ -113,7 +113,7 @@ template
     template<class> class SlicedPatchField,
     class GeoMesh
 >
-Foam::tmp<Foam::FieldField<PatchField, Type> >
+Foam::tmp<Foam::FieldField<PatchField, Type>>
 Foam::SlicedGeometricField<Type, PatchField, SlicedPatchField, GeoMesh>::
 slicedBoundaryField
 (
@@ -122,7 +122,7 @@ slicedBoundaryField
     const bool preserveCouples
 )
 {
-    tmp<FieldField<PatchField, Type> > tbf
+    tmp<FieldField<PatchField, Type>> tbf
     (
         new FieldField<PatchField, Type>(mesh.boundary().size())
     );
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
index dd23712e67..594315715e 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ private:
 
         //- Slice the given field and a create a PtrList of SlicedPatchField
         //  from which the boundary field is built
-        tmp<FieldField<PatchField, Type> >  slicedBoundaryField
+        tmp<FieldField<PatchField, Type>>  slicedBoundaryField
         (
             const Mesh& mesh,
             const Field<Type>& completeField,
@@ -89,7 +89,7 @@ private:
 
         //- Slice the given field and a create a PtrList of SlicedPatchField
         //  from which the boundary field is built
-        tmp<FieldField<PatchField, Type> >  slicedBoundaryField
+        tmp<FieldField<PatchField, Type>>  slicedBoundaryField
         (
             const Mesh& mesh,
             const FieldField<PatchField, Type>& bField,
@@ -108,7 +108,7 @@ private:
 
         //- Disallow standard assignment to tmp<GeometricField>,
         //  == assignment is allowed.
-        void operator=(const tmp<GeometricField<Type, PatchField, GeoMesh> >&);
+        void operator=(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
 
 
 public:
diff --git a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C
index 677f7a4358..e3b75000b4 100644
--- a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,13 +51,13 @@ void transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const GeometricField<tensor, PatchField, GeoMesh>& trf,
     const GeometricField<Type, PatchField, GeoMesh>& tf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf
     (
         new GeometricField<Type, PatchField, GeoMesh>
         (
@@ -81,13 +81,13 @@ tmp<GeometricField<Type, PatchField, GeoMesh> > transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const GeometricField<tensor, PatchField, GeoMesh>& trf,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& ttf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& ttf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf =
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf =
         transform(trf, ttf());
     ttf.clear();
     return tranf;
@@ -95,13 +95,13 @@ tmp<GeometricField<Type, PatchField, GeoMesh> > transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
-    const tmp<GeometricField<tensor, PatchField, GeoMesh> >& ttrf,
+    const tmp<GeometricField<tensor, PatchField, GeoMesh>>& ttrf,
     const GeometricField<Type, PatchField, GeoMesh>& tf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf =
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf =
         transform(ttrf(), tf);
     ttrf.clear();
     return tranf;
@@ -109,13 +109,13 @@ tmp<GeometricField<Type, PatchField, GeoMesh> > transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
-    const tmp<GeometricField<tensor, PatchField, GeoMesh> >& ttrf,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& ttf
+    const tmp<GeometricField<tensor, PatchField, GeoMesh>>& ttrf,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& ttf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf =
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf =
         transform(ttrf(), ttf());
     ttf.clear();
     ttrf.clear();
@@ -137,13 +137,13 @@ void transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const dimensionedTensor& t,
     const GeometricField<Type, PatchField, GeoMesh>& tf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf
     (
         new GeometricField<vector, PatchField, GeoMesh>
         (
@@ -167,13 +167,13 @@ tmp<GeometricField<Type, PatchField, GeoMesh> > transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const dimensionedTensor& t,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& ttf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& ttf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf =
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf =
         transform(t, ttf());
     ttf.clear();
     return tranf;
diff --git a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
index 5c0a582fe6..36307c90aa 100644
--- a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,31 +54,31 @@ void transform
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const GeometricField<tensor, PatchField, GeoMesh>&,
     const GeometricField<Type, PatchField, GeoMesh>&
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const GeometricField<tensor, PatchField, GeoMesh>&,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>&
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
-    const tmp<GeometricField<tensor, PatchField, GeoMesh> >&,
+    const tmp<GeometricField<tensor, PatchField, GeoMesh>>&,
     const GeometricField<Type, PatchField, GeoMesh>&
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
-    const tmp<GeometricField<tensor, PatchField, GeoMesh> >&,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+    const tmp<GeometricField<tensor, PatchField, GeoMesh>>&,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>&
 );
 
 
@@ -91,17 +91,17 @@ void transform
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const dimensionedTensor&,
     const GeometricField<Type, PatchField, GeoMesh>&
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const dimensionedTensor&,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>&
 );
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C
index 85c718e703..c4e7b18a0c 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ void Foam::basicSymmetryPointPatchField<Type>::evaluate
 {
     const vectorField& nHat = this->patch().pointNormals();
 
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
     (
         (
             this->patchInternalField()
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
index cb006fcda9..45f1945ad8 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,9 +82,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new basicSymmetryPointPatchField<Type>
                 (
@@ -101,12 +101,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new basicSymmetryPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
index 74846139eb..2d48607cce 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ Foam::calculatedPointPatchField<Type>::calculatedPointPatchField
 
 template<class Type>
 template<class Type2>
-Foam::autoPtr<Foam::pointPatchField<Type> >
+Foam::autoPtr<Foam::pointPatchField<Type>>
 Foam::pointPatchField<Type>::NewCalculatedType
 (
     const pointPatchField<Type2>& pf
@@ -96,7 +96,7 @@ Foam::pointPatchField<Type>::NewCalculatedType
 
     if (patchTypeCstrIter != pointPatchConstructorTablePtr_->end())
     {
-        return autoPtr<pointPatchField<Type> >
+        return autoPtr<pointPatchField<Type>>
         (
             patchTypeCstrIter()
             (
@@ -107,7 +107,7 @@ Foam::pointPatchField<Type>::NewCalculatedType
     }
     else
     {
-        return autoPtr<pointPatchField<Type> >
+        return autoPtr<pointPatchField<Type>>
         (
             new calculatedPointPatchField<Type>
             (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
index 6e9bc9ca8e..b331000367 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,9 +85,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new calculatedPointPatchField<Type>
                 (
@@ -104,10 +104,10 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> >
+        virtual autoPtr<pointPatchField<Type>>
         clone(const DimensionedField<Type, pointMesh>& iF) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new calculatedPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
index bd52d255f5..283c8cf3b8 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const = 0;
+        virtual autoPtr<pointPatchField<Type>> clone() const = 0;
 
         //- Construct as copy setting internal field reference
         coupledPointPatchField
@@ -96,7 +96,7 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const = 0;
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
index d739bc239f..3b0aa4e59f 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new fixedValuePointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new fixedValuePointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index 747e3daa7f..e40a781a35 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,7 @@ void Foam::valuePointPatchField<Type>::rmap
 {
     Field<Type>::rmap
     (
-        refCast<const valuePointPatchField<Type> >
+        refCast<const valuePointPatchField<Type>>
         (
             ptf
         ),
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
index a98b2be40e..aedb5b5ceb 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,9 +91,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new valuePointPatchField<Type>
                 (
@@ -110,12 +110,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new valuePointPatchField<Type>
                 (
@@ -209,7 +209,7 @@ public:
 // which enables simple backward compatability with verions using
 // referenceLevel in GeometicField
 template<class Type>
-tmp<Field<Type> > operator+
+tmp<Field<Type>> operator+
 (
     const valuePointPatchField<Type>& vsppf,
     const Type& t
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
index c32c776a44..6f288f86ab 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,9 +85,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new zeroGradientPointPatchField<Type>
                 (
@@ -104,12 +104,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new zeroGradientPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
index 1ebadbb40c..ff745bf315 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,13 +121,13 @@ void Foam::cyclicPointPatchField<Type>::swapAddSeparated
 
         // Get neighbouring pointPatchField
         const GeometricField<Type, pointPatchField, pointMesh>& fld =
-            refCast<const GeometricField<Type, pointPatchField, pointMesh> >
+            refCast<const GeometricField<Type, pointPatchField, pointMesh>>
             (
                 this->dimensionedInternalField()
             );
 
         const cyclicPointPatchField<Type>& nbr =
-            refCast<const cyclicPointPatchField<Type> >
+            refCast<const cyclicPointPatchField<Type>>
             (
                 fld.boundaryField()[nbrPatch.index()]
             );
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
index 4737062fbe..981f7ee0d9 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,9 +91,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicPointPatchField<Type>
                 (
@@ -110,12 +110,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C
index 0b822b1a43..8bceca0831 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ void Foam::cyclicSlipPointPatchField<Type>::evaluate(const Pstream::commsTypes)
 {
     const vectorField& nHat = this->patch().pointNormals();
 
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
     (
         (
             this->patchInternalField()
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
index 9c37aadada..b33f1ed47a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicSlipPointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicSlipPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
index 042879c9c8..6f7dfda203 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new emptyPointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new emptyPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C
index 3f31c34d2e..f2d0ac7b2d 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ void Foam::nonuniformTransformCyclicPointPatchField<Type>::evaluate
 {
     const vectorField& nHat = this->patch().pointNormals();
 
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
     (
         (
             this->patchInternalField()
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
index c3f6792245..8a3c17e453 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new nonuniformTransformCyclicPointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new nonuniformTransformCyclicPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
index 5dfceda2d1..68565fa3fd 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,9 +90,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new processorPointPatchField<Type>
                 (
@@ -109,12 +109,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new processorPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
index ee1084541f..bca065d7a7 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,9 +94,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new processorCyclicPointPatchField<Type>
                 (
@@ -113,12 +113,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new processorCyclicPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
index aa8aac7cee..098f484e81 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new symmetryPointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new symmetryPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
index c402bad230..e90c1454fd 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ void Foam::symmetryPlanePointPatchField<Type>::evaluate
 {
     vector nHat = symmetryPlanePatch_.n();
 
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
     (
         (
             this->patchInternalField()
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
index c3774789d8..4090b6b9f2 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,9 +91,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new symmetryPlanePointPatchField<Type>
                 (
@@ -110,12 +110,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new symmetryPlanePointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C
index 52e55ef0cc..8a5c7f2da2 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ void Foam::wedgePointPatchField<Type>::evaluate(const Pstream::commsTypes)
     // normal vector from the first point
     const vector& nHat = this->patch().pointNormals()[0];
 
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
         transform(I - nHat*nHat, this->patchInternalField());
 
     // Get internal field to insert values into
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
index f0ddee6d9e..27270b5fd1 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new wedgePointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new wedgePointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
index 71212ed4d9..bc2a08de68 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ class codedFixedValuePointPatchField
 
         const word redirectType_;
 
-        mutable autoPtr<pointPatchField<Type> > redirectPatchFieldPtr_;
+        mutable autoPtr<pointPatchField<Type>> redirectPatchFieldPtr_;
 
     // Private Member Functions
 
@@ -186,9 +186,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new codedFixedValuePointPatchField<Type>(*this)
             );
@@ -202,12 +202,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new codedFixedValuePointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
index 38975b2661..00454c22d8 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ void Foam::fixedNormalSlipPointPatchField<Type>::evaluate
     const Pstream::commsTypes
 )
 {
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
         transform(I - n_*n_, this->patchInternalField());
 
     // Get internal field to insert values into
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
index 669b66bdfa..fa0692d96d 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,9 +103,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new fixedNormalSlipPointPatchField<Type>
                 (
@@ -122,12 +122,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new fixedNormalSlipPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
index f2b0c726ec..f21b4ef1b9 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,9 +85,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new slipPointPatchField<Type>
                 (
@@ -104,12 +104,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new slipPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H
index e1509c88ea..40c18a6dc0 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,9 +100,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new timeVaryingUniformFixedValuePointPatchField<Type>(*this)
             );
@@ -116,12 +116,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new timeVaryingUniformFixedValuePointPatchField<Type>(*this, iF)
             );
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
index 120f1ffe16..0a3f45df6a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ class uniformFixedValuePointPatchField
 {
     // Private data
 
-        autoPtr<DataEntry<Type> > uniformValue_;
+        autoPtr<DataEntry<Type>> uniformValue_;
 
 
 public:
@@ -109,9 +109,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new uniformFixedValuePointPatchField<Type>
                 (
@@ -129,12 +129,12 @@ public:
 
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new uniformFixedValuePointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index 92c62d0703..fdd069525d 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ void Foam::pointPatchField<Type>::write(Ostream& os) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::pointPatchField<Type>::patchInternalField() const
 {
     return patchInternalField(internalField());
@@ -133,7 +133,7 @@ Foam::pointPatchField<Type>::patchInternalField() const
 
 template<class Type>
 template<class Type1>
-Foam::tmp<Foam::Field<Type1> >
+Foam::tmp<Foam::Field<Type1>>
 Foam::pointPatchField<Type>::patchInternalField
 (
     const Field<Type1>& iF,
@@ -150,13 +150,13 @@ Foam::pointPatchField<Type>::patchInternalField
             << abort(FatalError);
     }
 
-    return tmp<Field<Type1> >(new Field<Type1>(iF, meshPoints));
+    return tmp<Field<Type1>>(new Field<Type1>(iF, meshPoints));
 }
 
 
 template<class Type>
 template<class Type1>
-Foam::tmp<Foam::Field<Type1> >
+Foam::tmp<Foam::Field<Type1>>
 Foam::pointPatchField<Type>::patchInternalField
 (
     const Field<Type1>& iF
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index 88e6bfecfe..45b3efba95 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -180,7 +180,7 @@ public:
         pointPatchField(const pointPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const = 0;
+        virtual autoPtr<pointPatchField<Type>> clone() const = 0;
 
         //- Construct as copy setting internal field reference
         pointPatchField
@@ -190,7 +190,7 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const = 0;
@@ -201,7 +201,7 @@ public:
         //- Return a pointer to a new patchField created on freestore given
         //  patch and internal field
         //  (does not set the patch field values)
-        static autoPtr<pointPatchField<Type> > New
+        static autoPtr<pointPatchField<Type>> New
         (
             const word&,
             const pointPatch&,
@@ -212,7 +212,7 @@ public:
         //  patch and internal field
         //  (does not set the patch field values).
         //  Allows override of constraint type
-        static autoPtr<pointPatchField<Type> > New
+        static autoPtr<pointPatchField<Type>> New
         (
             const word&,
             const word& actualPatchType,
@@ -222,7 +222,7 @@ public:
 
         //- Return a pointer to a new patchField created on freestore from
         //  a given pointPatchField mapped onto a new patch
-        static autoPtr<pointPatchField<Type> > New
+        static autoPtr<pointPatchField<Type>> New
         (
             const pointPatchField<Type>&,
             const pointPatch&,
@@ -232,7 +232,7 @@ public:
 
         //- Return a pointer to a new patchField created on freestore
         //  from dictionary
-        static autoPtr<pointPatchField<Type> > New
+        static autoPtr<pointPatchField<Type>> New
         (
             const pointPatch&,
             const DimensionedField<Type, pointMesh>&,
@@ -243,7 +243,7 @@ public:
         //- Return a pointer to a new CalculatedpointPatchField created on
         //  freestore without setting patchField values
         template<class Type2>
-        static autoPtr<pointPatchField<Type> >
+        static autoPtr<pointPatchField<Type>>
         NewCalculatedType
         (
             const pointPatchField<Type2>&
@@ -318,12 +318,12 @@ public:
             }
 
             //- Return field created from appropriate internal field values
-            tmp<Field<Type> > patchInternalField() const;
+            tmp<Field<Type>> patchInternalField() const;
 
             //- Return field created from appropriate internal field values
             //  given internal field reference
             template<class Type1>
-            tmp<Field<Type1> > patchInternalField
+            tmp<Field<Type1>> patchInternalField
             (
                 const Field<Type1>& iF
             ) const;
@@ -331,7 +331,7 @@ public:
             //- Return field created from selected internal field values
             //  given internal field reference
             template<class Type1>
-            tmp<Field<Type1> > patchInternalField
+            tmp<Field<Type1>> patchInternalField
             (
                 const Field<Type1>& iF,
                 const labelList& meshPoints
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
index 25f955bbce..4a05a01acb 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         |2011 OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 (
     const word& patchFieldType,
     const word& actualPatchType,
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
             << exit(FatalError);
     }
 
-    autoPtr<pointPatchField<Type> > pfPtr(cstrIter()(p, iF));
+    autoPtr<pointPatchField<Type>> pfPtr(cstrIter()(p, iF));
 
     if
     (
@@ -95,7 +95,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 
 
 template<class Type>
-Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 (
     const word& patchFieldType,
     const pointPatch& p,
@@ -107,7 +107,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 
 
 template<class Type>
-Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -148,7 +148,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
     }
 
     // Construct (but not necesarily returned)
-    autoPtr<pointPatchField<Type> > pfPtr(cstrIter()(p, iF, dict));
+    autoPtr<pointPatchField<Type>> pfPtr(cstrIter()(p, iF, dict));
 
     if
     (
@@ -189,7 +189,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 // Return a pointer to a new patch created on freestore from
 // a given pointPatchField<Type> mapped onto a new patch
 template<class Type>
-Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 (
     const pointPatchField<Type>& ptf,
     const pointPatch& p,
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
index cfe912888b..d12ce331da 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ void Foam::interpolation2DTable<Type>::readTable()
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable()
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >(),
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
     boundsHandling_(interpolation2DTable::WARN),
     fileName_("fileNameIsUndefined"),
     reader_(NULL)
@@ -64,12 +64,12 @@ Foam::interpolation2DTable<Type>::interpolation2DTable()
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable
 (
-    const List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >& values,
+    const List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& values,
     const boundsHandling bounds,
     const fileName& fName
 )
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >(values),
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(values),
     boundsHandling_(bounds),
     fileName_(fName),
     reader_(NULL)
@@ -79,7 +79,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable(const fileName& fName)
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >(),
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
     boundsHandling_(interpolation2DTable::WARN),
     fileName_(fName),
     reader_(new openFoamTableReader<Type>(dictionary()))
@@ -91,7 +91,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable(const fileName& fName)
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable(const dictionary& dict)
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >(),
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
     boundsHandling_(wordToBoundsHandling(dict.lookup("outOfBounds"))),
     fileName_(dict.lookup("fileName")),
     reader_(tableReader<Type>::New(dict))
@@ -106,7 +106,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable
      const interpolation2DTable& interpTable
 )
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >(interpTable),
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(interpTable),
     boundsHandling_(interpTable.boundsHandling_),
     fileName_(interpTable.fileName_),
     reader_(interpTable.reader_)    // note: steals reader. Used in write().
@@ -119,7 +119,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable
 template<class Type>
 Type Foam::interpolation2DTable<Type>::interpolateValue
 (
-    const List<Tuple2<scalar, Type> >& data,
+    const List<Tuple2<scalar, Type>>& data,
     const scalar lookupValue
 ) const
 {
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
index c34090c985..be6fb45e33 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ namespace Foam
 template<class Type>
 class interpolation2DTable
 :
-    public List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >
+    public List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>
 {
 public:
 
@@ -67,7 +67,7 @@ public:
         };
 
         //- Cconvenience typedef
-        typedef List<Tuple2<scalar, List<Tuple2<scalar, Type> > > > table;
+        typedef List<Tuple2<scalar, List<Tuple2<scalar, Type>>>> table;
 
 
 private:
@@ -81,7 +81,7 @@ private:
         fileName fileName_;
 
         //- The actual reader
-        autoPtr<tableReader<Type> > reader_;
+        autoPtr<tableReader<Type>> reader_;
 
 
     // Private Member Functions
@@ -92,7 +92,7 @@ private:
         //- Return interpolated value in List
         Type interpolateValue
         (
-            const List<Tuple2<scalar, Type> >& data,
+            const List<Tuple2<scalar, Type>>& data,
             const scalar
         ) const;
 
@@ -116,7 +116,7 @@ public:
         //- Construct from components
         interpolation2DTable
         (
-            const List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >& values,
+            const List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& values,
             const boundsHandling bounds,
             const fileName& fName
         );
@@ -153,7 +153,7 @@ public:
     // Member Operators
 
         //- Return an element of constant Tuple2<scalar, Type>
-        const List<Tuple2<scalar, Type> >& operator[](const label) const;
+        const List<Tuple2<scalar, Type>>& operator[](const label) const;
 
         //- Return an interpolated value
         Type operator()(const scalar, const scalar) const;
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
index 4fd0b07483..63b7bad322 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ void Foam::interpolationTable<Type>::readTable()
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable()
 :
-    List<Tuple2<scalar, Type> >(),
+    List<Tuple2<scalar, Type>>(),
     boundsHandling_(interpolationTable::WARN),
     fileName_("fileNameIsUndefined"),
     reader_(NULL)
@@ -68,12 +68,12 @@ Foam::interpolationTable<Type>::interpolationTable()
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable
 (
-    const List<Tuple2<scalar, Type> >& values,
+    const List<Tuple2<scalar, Type>>& values,
     const boundsHandling bounds,
     const fileName& fName
 )
 :
-    List<Tuple2<scalar, Type> >(values),
+    List<Tuple2<scalar, Type>>(values),
     boundsHandling_(bounds),
     fileName_(fName),
     reader_(NULL)
@@ -83,7 +83,7 @@ Foam::interpolationTable<Type>::interpolationTable
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable(const fileName& fName)
 :
-    List<Tuple2<scalar, Type> >(),
+    List<Tuple2<scalar, Type>>(),
     boundsHandling_(interpolationTable::WARN),
     fileName_(fName),
     reader_(new openFoamTableReader<Type>(dictionary()))
@@ -95,7 +95,7 @@ Foam::interpolationTable<Type>::interpolationTable(const fileName& fName)
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable(const dictionary& dict)
 :
-    List<Tuple2<scalar, Type> >(),
+    List<Tuple2<scalar, Type>>(),
     boundsHandling_(wordToBoundsHandling(dict.lookup("outOfBounds"))),
     fileName_(dict.lookup("fileName")),
     reader_(tableReader<Type>::New(dict))
@@ -110,7 +110,7 @@ Foam::interpolationTable<Type>::interpolationTable
      const interpolationTable& interpTable
 )
 :
-    List<Tuple2<scalar, Type> >(interpTable),
+    List<Tuple2<scalar, Type>>(interpTable),
     boundsHandling_(interpTable.boundsHandling_),
     fileName_(interpTable.fileName_),
     reader_(interpTable.reader_)    // note: steals reader. Used in write().
@@ -206,12 +206,12 @@ template<class Type>
 void Foam::interpolationTable<Type>::check() const
 {
     label n = this->size();
-    scalar prevValue = List<Tuple2<scalar, Type> >::operator[](0).first();
+    scalar prevValue = List<Tuple2<scalar, Type>>::operator[](0).first();
 
     for (label i=1; i<n; ++i)
     {
         const scalar currValue =
-            List<Tuple2<scalar, Type> >::operator[](i).first();
+            List<Tuple2<scalar, Type>>::operator[](i).first();
 
         // avoid duplicate values (divide-by-zero error)
         if (currValue <= prevValue)
@@ -251,8 +251,8 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
         return 0;
     }
 
-    scalar minLimit = List<Tuple2<scalar, Type> >::operator[](0).first();
-    scalar maxLimit = List<Tuple2<scalar, Type> >::operator[](n-1).first();
+    scalar minLimit = List<Tuple2<scalar, Type>>::operator[](0).first();
+    scalar maxLimit = List<Tuple2<scalar, Type>>::operator[](n-1).first();
     scalar lookupValue = value;
 
     if (lookupValue < minLimit)
@@ -328,7 +328,7 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
     // look for the correct range
     for (label i = 0; i < n; ++i)
     {
-        if (lookupValue >= List<Tuple2<scalar, Type> >::operator[](i).first())
+        if (lookupValue >= List<Tuple2<scalar, Type>>::operator[](i).first())
         {
             lo = hi = i;
         }
@@ -356,13 +356,13 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
         return
         (
             (
-                List<Tuple2<scalar, Type> >::operator[](hi).second()
-              - List<Tuple2<scalar, Type> >::operator[](lo).second()
+                List<Tuple2<scalar, Type>>::operator[](hi).second()
+              - List<Tuple2<scalar, Type>>::operator[](lo).second()
             )
            /(
-               List<Tuple2<scalar, Type> >::operator[](hi).first()
+               List<Tuple2<scalar, Type>>::operator[](hi).first()
              + minLimit
-             - List<Tuple2<scalar, Type> >::operator[](lo).first()
+             - List<Tuple2<scalar, Type>>::operator[](lo).first()
             )
         );
     }
@@ -372,12 +372,12 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
         return
         (
             (
-                List<Tuple2<scalar, Type> >::operator[](hi).second()
-              - List<Tuple2<scalar, Type> >::operator[](lo).second()
+                List<Tuple2<scalar, Type>>::operator[](hi).second()
+              - List<Tuple2<scalar, Type>>::operator[](lo).second()
             )
            /(
-                List<Tuple2<scalar, Type> >::operator[](hi).first()
-              - List<Tuple2<scalar, Type> >::operator[](lo).first()
+                List<Tuple2<scalar, Type>>::operator[](hi).first()
+              - List<Tuple2<scalar, Type>>::operator[](lo).first()
             )
         );
     }
@@ -466,7 +466,7 @@ Foam::interpolationTable<Type>::operator[](const label i) const
         }
     }
 
-    return List<Tuple2<scalar, Type> >::operator[](ii);
+    return List<Tuple2<scalar, Type>>::operator[](ii);
 }
 
 
@@ -477,11 +477,11 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
 
     if (n <= 1)
     {
-        return List<Tuple2<scalar, Type> >::operator[](0).second();
+        return List<Tuple2<scalar, Type>>::operator[](0).second();
     }
 
-    scalar minLimit = List<Tuple2<scalar, Type> >::operator[](0).first();
-    scalar maxLimit = List<Tuple2<scalar, Type> >::operator[](n-1).first();
+    scalar minLimit = List<Tuple2<scalar, Type>>::operator[](0).first();
+    scalar maxLimit = List<Tuple2<scalar, Type>>::operator[](n-1).first();
     scalar lookupValue = value;
 
     if (lookupValue < minLimit)
@@ -505,7 +505,7 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
             }
             case interpolationTable::CLAMP:
             {
-                return List<Tuple2<scalar, Type> >::operator[](0).second();
+                return List<Tuple2<scalar, Type>>::operator[](0).second();
                 break;
             }
             case interpolationTable::REPEAT:
@@ -538,7 +538,7 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
             }
             case interpolationTable::CLAMP:
             {
-                return List<Tuple2<scalar, Type> >::operator[](n-1).second();
+                return List<Tuple2<scalar, Type>>::operator[](n-1).second();
                 break;
             }
             case interpolationTable::REPEAT:
@@ -557,7 +557,7 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
     // look for the correct range
     for (label i = 0; i < n; ++i)
     {
-        if (lookupValue >= List<Tuple2<scalar, Type> >::operator[](i).first())
+        if (lookupValue >= List<Tuple2<scalar, Type>>::operator[](i).first())
         {
             lo = hi = i;
         }
@@ -571,7 +571,7 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
     if (lo == hi)
     {
         // we are at the end of the table - or there is only a single entry
-        return List<Tuple2<scalar, Type> >::operator[](hi).second();
+        return List<Tuple2<scalar, Type>>::operator[](hi).second();
     }
     else if (hi == 0)
     {
@@ -584,10 +584,10 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
 
         return
         (
-            List<Tuple2<scalar, Type> >::operator[](lo).second()
+            List<Tuple2<scalar, Type>>::operator[](lo).second()
           + (
-                List<Tuple2<scalar, Type> >::operator[](hi).second()
-              - List<Tuple2<scalar, Type> >::operator[](lo).second()
+                List<Tuple2<scalar, Type>>::operator[](hi).second()
+              - List<Tuple2<scalar, Type>>::operator[](lo).second()
             )
            *(lookupValue / minLimit)
         );
@@ -597,18 +597,18 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
         // normal interpolation
         return
         (
-            List<Tuple2<scalar, Type> >::operator[](lo).second()
+            List<Tuple2<scalar, Type>>::operator[](lo).second()
           + (
-                List<Tuple2<scalar, Type> >::operator[](hi).second()
-              - List<Tuple2<scalar, Type> >::operator[](lo).second()
+                List<Tuple2<scalar, Type>>::operator[](hi).second()
+              - List<Tuple2<scalar, Type>>::operator[](lo).second()
             )
            *(
                 lookupValue
-              - List<Tuple2<scalar, Type> >::operator[](lo).first()
+              - List<Tuple2<scalar, Type>>::operator[](lo).first()
             )
            /(
-                List<Tuple2<scalar, Type> >::operator[](hi).first()
-              - List<Tuple2<scalar, Type> >::operator[](lo).first()
+                List<Tuple2<scalar, Type>>::operator[](hi).first()
+              - List<Tuple2<scalar, Type>>::operator[](lo).first()
             )
         );
     }
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
index 21523832e8..83382d343c 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ namespace Foam
 template<class Type>
 class interpolationTable
 :
-    public List<Tuple2<scalar, Type> >
+    public List<Tuple2<scalar, Type>>
 {
 public:
 
@@ -104,7 +104,7 @@ private:
         fileName fileName_;
 
         //- The actual reader
-        autoPtr<tableReader<Type> > reader_;
+        autoPtr<tableReader<Type>> reader_;
 
     // Private Member Functions
 
@@ -122,7 +122,7 @@ public:
         //- Construct from components
         interpolationTable
         (
-            const List<Tuple2<scalar, Type> >& values,
+            const List<Tuple2<scalar, Type>>& values,
             const boundsHandling bounds,
             const fileName& fName
         );
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
index 8f544c0709..130f5b9c93 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,12 +105,12 @@ template<class Type>
 void Foam::csvTableReader<Type>::operator()
 (
     const fileName& fName,
-    List<Tuple2<scalar, Type> >& data
+    List<Tuple2<scalar, Type>>& data
 )
 {
     IFstream in(fName);
 
-    DynamicList<Tuple2<scalar, Type> > values;
+    DynamicList<Tuple2<scalar, Type>> values;
 
     // Skip header
     if (headerLine_)
@@ -162,7 +162,7 @@ template<class Type>
 void Foam::csvTableReader<Type>::operator()
 (
     const fileName& fName,
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >& data
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& data
 )
 {
     NotImplemented;
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
index f3f067b0c4..46949da452 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,9 +82,9 @@ public:
         csvTableReader(const dictionary& dict);
 
         //- Construct and return a copy
-        virtual autoPtr<tableReader<Type> > clone() const
+        virtual autoPtr<tableReader<Type>> clone() const
         {
-            return autoPtr<tableReader<Type> >
+            return autoPtr<tableReader<Type>>
             (
                 new csvTableReader<Type>
                 (
@@ -101,13 +101,13 @@ public:
     // Member Functions
 
         //- Read the table
-        virtual void operator()(const fileName&, List<Tuple2<scalar, Type> >&);
+        virtual void operator()(const fileName&, List<Tuple2<scalar, Type>>&);
 
         //- Read 2D table
         virtual void operator()
         (
             const fileName&,
-            List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >&
+            List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>&
         );
 
         //- Write the remaining parameters
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C
index aa48da7b68..dc5451a502 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ template<class Type>
 void Foam::openFoamTableReader<Type>::operator()
 (
     const fileName& fName,
-    List<Tuple2<scalar, Type> >& data
+    List<Tuple2<scalar, Type>>& data
 )
 {
     // Read data from file
@@ -60,7 +60,7 @@ template<class Type>
 void Foam::openFoamTableReader<Type>::operator()
 (
     const fileName& fName,
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >& data
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& data
 )
 {
     // Read data from file
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
index e40990cafd..ee44fe6799 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,9 +64,9 @@ public:
         openFoamTableReader(const dictionary &dict);
 
         //- Construct and return a copy
-        virtual autoPtr<tableReader<Type> > clone() const
+        virtual autoPtr<tableReader<Type>> clone() const
         {
-            return autoPtr<tableReader<Type> >
+            return autoPtr<tableReader<Type>>
             (
                 new openFoamTableReader<Type>
                 (
@@ -83,13 +83,13 @@ public:
     // Member functions
 
         //- Read the table
-        virtual void operator()(const fileName&, List<Tuple2<scalar, Type> > &);
+        virtual void operator()(const fileName&, List<Tuple2<scalar, Type>> &);
 
         //- Read 2D table
         virtual void operator()
         (
             const fileName&,
-            List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >&
+            List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>&
         );
 };
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
index cd27159ec6..3955291941 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr<Foam::tableReader<Type> > Foam::tableReader<Type>::New
+Foam::autoPtr<Foam::tableReader<Type>> Foam::tableReader<Type>::New
 (
     const dictionary& spec
 )
@@ -53,7 +53,7 @@ Foam::autoPtr<Foam::tableReader<Type> > Foam::tableReader<Type>::New
             << exit(FatalError);
     }
 
-    return autoPtr<tableReader<Type> >(cstrIter()(spec));
+    return autoPtr<tableReader<Type>>(cstrIter()(spec));
 }
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
index d68ea92e7d..7540e37fa0 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ public:
         tableReader(const dictionary& dict);
 
         //- Construct and return a clone
-        virtual autoPtr<tableReader<Type> > clone() const = 0;
+        virtual autoPtr<tableReader<Type>> clone() const = 0;
 
 
     // Selectors
@@ -100,14 +100,14 @@ public:
         virtual void operator()
         (
             const fileName&,
-            List<Tuple2<scalar, Type> >&
+            List<Tuple2<scalar, Type>>&
         ) = 0;
 
         //- Read the 2D table
         virtual void operator()
         (
             const fileName&,
-            List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >&
+            List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>&
         ) = 0;
 
         //- Write additional information
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
index b4242b2305..8993cdbdb8 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ namespace Foam
 //- Interpolate point field
 template<class FromPatch, class ToPatch>
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 (
     const Field<Type>& pf
@@ -50,7 +50,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -90,13 +90,13 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 
 template<class FromPatch, class ToPatch>
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 (
-    const tmp<Field<Type> >& tpf
+    const tmp<Field<Type>>& tpf
 ) const
 {
-    tmp<Field<Type> > tint = pointInterpolate<Type>(tpf());
+    tmp<Field<Type>> tint = pointInterpolate<Type>(tpf());
     tpf.clear();
     return tint;
 }
@@ -105,7 +105,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 //- Interpolate face field
 template<class FromPatch, class ToPatch>
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
 (
     const Field<Type>& ff
@@ -119,7 +119,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -161,13 +161,13 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
 
 template<class FromPatch, class ToPatch>
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
 (
-    const tmp<Field<Type> >& tff
+    const tmp<Field<Type>>& tff
 ) const
 {
-    tmp<Field<Type> > tint = faceInterpolate(tff());
+    tmp<Field<Type>> tint = faceInterpolate(tff());
     tff.clear();
     return tint;
 }
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
index b8b282fa82..04cea8be20 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -208,17 +208,17 @@ public:
 
         //- Interpolate point field
         template<class Type>
-        tmp<Field<Type> > pointInterpolate(const Field<Type>& pf) const;
+        tmp<Field<Type>> pointInterpolate(const Field<Type>& pf) const;
 
         template<class Type>
-        tmp<Field<Type> > pointInterpolate(const tmp<Field<Type> >& tpf) const;
+        tmp<Field<Type>> pointInterpolate(const tmp<Field<Type>>& tpf) const;
 
         //- Interpolate face field
         template<class Type>
-        tmp<Field<Type> > faceInterpolate(const Field<Type>& pf) const;
+        tmp<Field<Type>> faceInterpolate(const Field<Type>& pf) const;
 
         template<class Type>
-        tmp<Field<Type> > faceInterpolate(const tmp<Field<Type> >& tpf) const;
+        tmp<Field<Type>> faceInterpolate(const tmp<Field<Type>>& tpf) const;
 
 };
 
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
index bfd3b4a6d6..fd77c9a677 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -170,7 +170,7 @@ PrimitivePatchInterpolation<Patch>::~PrimitivePatchInterpolation()
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 (
     const Field<Type>& ff
 ) const
@@ -184,7 +184,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -214,12 +214,12 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 (
-    const tmp<Field<Type> >& tff
+    const tmp<Field<Type>>& tff
 ) const
 {
-    tmp<Field<Type> > tint = faceToPointInterpolate(tff());
+    tmp<Field<Type>> tint = faceToPointInterpolate(tff());
     tff.clear();
     return tint;
 }
@@ -227,7 +227,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 (
     const Field<Type>& pf
 ) const
@@ -240,7 +240,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -271,12 +271,12 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 (
-    const tmp<Field<Type> >& tpf
+    const tmp<Field<Type>>& tpf
 ) const
 {
-    tmp<Field<Type> > tint = pointToFaceInterpolate(tpf());
+    tmp<Field<Type>> tint = pointToFaceInterpolate(tpf());
     tpf.clear();
     return tint;
 }
@@ -284,7 +284,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
 (
     const Field<Type>& pf
 ) const
@@ -298,7 +298,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>(patch_.nEdges(), pTraits<Type>::zero)
     );
@@ -328,12 +328,12 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
 (
-    const tmp<Field<Type> >& tpf
+    const tmp<Field<Type>>& tpf
 ) const
 {
-    tmp<Field<Type> > tint = faceToEdgeInterpolate(tpf());
+    tmp<Field<Type>> tint = faceToEdgeInterpolate(tpf());
     tpf.clear();
     return tint;
 }
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
index ee61e2e42e..14f2228772 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,41 +107,41 @@ public:
 
         //- Interpolate from faces to points
         template<class Type>
-        tmp<Field<Type> > faceToPointInterpolate
+        tmp<Field<Type>> faceToPointInterpolate
         (
             const Field<Type>& ff
         ) const;
 
         template<class Type>
-        tmp<Field<Type> > faceToPointInterpolate
+        tmp<Field<Type>> faceToPointInterpolate
         (
-            const tmp<Field<Type> >& tff
+            const tmp<Field<Type>>& tff
         ) const;
 
         //- Interpolate from points to faces
         template<class Type>
-        tmp<Field<Type> > pointToFaceInterpolate
+        tmp<Field<Type>> pointToFaceInterpolate
         (
             const Field<Type>& pf
         ) const;
 
         template<class Type>
-        tmp<Field<Type> > pointToFaceInterpolate
+        tmp<Field<Type>> pointToFaceInterpolate
         (
-            const tmp<Field<Type> >& tpf
+            const tmp<Field<Type>>& tpf
         ) const;
 
         //- Interpolate from faces to edges
         template<class Type>
-        tmp<Field<Type> > faceToEdgeInterpolate
+        tmp<Field<Type>> faceToEdgeInterpolate
         (
             const Field<Type>& ff
         ) const;
 
         template<class Type>
-        tmp<Field<Type> > faceToEdgeInterpolate
+        tmp<Field<Type>> faceToEdgeInterpolate
         (
-            const tmp<Field<Type> >& tff
+            const tmp<Field<Type>>& tff
         ) const;
 
         //- Do what is neccessary if the mesh has moved
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H
index b669a565d9..8276118282 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,13 +47,13 @@ namespace Foam
 template<class Type>
 class LduInterfaceFieldPtrsList
 :
-    public UPtrList<const LduInterfaceField<Type> >
+    public UPtrList<const LduInterfaceField<Type>>
 {
 public:
 
     LduInterfaceFieldPtrsList(label size)
     :
-        UPtrList<const LduInterfaceField<Type> >(size)
+        UPtrList<const LduInterfaceField<Type>>(size)
     {}
 };
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
index d00069911d..ef4d65de81 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -595,10 +595,10 @@ public:
             void sumMagOffDiag(Field<LUType>& sumOff) const;
 
             //- Matrix multiplication
-            void Amul(Field<Type>&, const tmp<Field<Type> >&) const;
+            void Amul(Field<Type>&, const tmp<Field<Type>>&) const;
 
             //- Matrix transpose multiplication
-            void Tmul(Field<Type>&, const tmp<Field<Type> >&) const;
+            void Tmul(Field<Type>&, const tmp<Field<Type>>&) const;
 
 
             //- Sum the coefficients on each row of the matrix
@@ -607,7 +607,7 @@ public:
 
             void residual(Field<Type>& rA, const Field<Type>& psi) const;
 
-            tmp<Field<Type> > residual(const Field<Type>& psi) const;
+            tmp<Field<Type>> residual(const Field<Type>& psi) const;
 
 
             //- Initialise the update of interfaced interfaces
@@ -628,11 +628,11 @@ public:
             ) const;
 
 
-            tmp<Field<Type> > H(const Field<Type>&) const;
-            tmp<Field<Type> > H(const tmp<Field<Type> >&) const;
+            tmp<Field<Type>> H(const Field<Type>&) const;
+            tmp<Field<Type>> H(const tmp<Field<Type>>&) const;
 
-            tmp<Field<Type> > faceH(const Field<Type>&) const;
-            tmp<Field<Type> > faceH(const tmp<Field<Type> >&) const;
+            tmp<Field<Type>> faceH(const Field<Type>&) const;
+            tmp<Field<Type>> faceH(const tmp<Field<Type>>&) const;
 
 
     // Member operators
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
index 805b133a3b..73a0af2c66 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ template<class Type, class DType, class LUType>
 void Foam::LduMatrix<Type, DType, LUType>::Amul
 (
     Field<Type>& Apsi,
-    const tmp<Field<Type> >& tpsi
+    const tmp<Field<Type>>& tpsi
 ) const
 {
     Type* __restrict__ ApsiPtr = Apsi.begin();
@@ -117,7 +117,7 @@ template<class Type, class DType, class LUType>
 void Foam::LduMatrix<Type, DType, LUType>::Tmul
 (
     Field<Type>& Tpsi,
-    const tmp<Field<Type> >& tpsi
+    const tmp<Field<Type>>& tpsi
 ) const
 {
     Type* __restrict__ TpsiPtr = Tpsi.begin();
@@ -280,12 +280,12 @@ void Foam::LduMatrix<Type, DType, LUType>::residual
 
 
 template<class Type, class DType, class LUType>
-Foam::tmp<Foam::Field<Type> > Foam::LduMatrix<Type, DType, LUType>::residual
+Foam::tmp<Foam::Field<Type>> Foam::LduMatrix<Type, DType, LUType>::residual
 (
     const Field<Type>& psi
 ) const
 {
-    tmp<Field<Type> > trA(new Field<Type>(psi.size()));
+    tmp<Field<Type>> trA(new Field<Type>(psi.size()));
     residual(trA(), psi);
     return trA;
 }
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
index 3685bbe20d..1c43bebcaf 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,10 +84,10 @@ void Foam::LduMatrix<Type, DType, LUType>::sumMagOffDiag
 
 
 template<class Type, class DType, class LUType>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::LduMatrix<Type, DType, LUType>::H(const Field<Type>& psi) const
 {
-    tmp<Field<Type> > tHpsi
+    tmp<Field<Type>> tHpsi
     (
         new Field<Type>(lduAddr().size(), pTraits<Type>::zero)
     );
@@ -119,17 +119,17 @@ Foam::LduMatrix<Type, DType, LUType>::H(const Field<Type>& psi) const
 }
 
 template<class Type, class DType, class LUType>
-Foam::tmp<Foam::Field<Type> >
-Foam::LduMatrix<Type, DType, LUType>::H(const tmp<Field<Type> >& tpsi) const
+Foam::tmp<Foam::Field<Type>>
+Foam::LduMatrix<Type, DType, LUType>::H(const tmp<Field<Type>>& tpsi) const
 {
-    tmp<Field<Type> > tHpsi(H(tpsi()));
+    tmp<Field<Type>> tHpsi(H(tpsi()));
     tpsi.clear();
     return tHpsi;
 }
 
 
 template<class Type, class DType, class LUType>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::LduMatrix<Type, DType, LUType>::faceH(const Field<Type>& psi) const
 {
     const Field<LUType>& Lower = const_cast<const LduMatrix&>(*this).lower();
@@ -139,7 +139,7 @@ Foam::LduMatrix<Type, DType, LUType>::faceH(const Field<Type>& psi) const
     const unallocLabelList& l = lduAddr().lowerAddr();
     const unallocLabelList& u = lduAddr().upperAddr();
 
-    tmp<Field<Type> > tfaceHpsi(new Field<Type> (Lower.size()));
+    tmp<Field<Type>> tfaceHpsi(new Field<Type> (Lower.size()));
     Field<Type> & faceHpsi = tfaceHpsi();
 
     for (label face=0; face<l.size(); face++)
@@ -152,10 +152,10 @@ Foam::LduMatrix<Type, DType, LUType>::faceH(const Field<Type>& psi) const
 
 
 template<class Type, class DType, class LUType>
-Foam::tmp<Foam::Field<Type> >
-Foam::LduMatrix<Type, DType, LUType>::faceH(const tmp<Field<Type> >& tpsi) const
+Foam::tmp<Foam::Field<Type>>
+Foam::LduMatrix<Type, DType, LUType>::faceH(const tmp<Field<Type>>& tpsi) const
 {
-    tmp<Field<Type> > tfaceHpsi(faceH(tpsi()));
+    tmp<Field<Type>> tfaceHpsi(faceH(tpsi()));
     tpsi.clear();
     return tfaceHpsi;
 }
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 005982d9e0..dc8e1f9e88 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ public:
         Matrix(Istream&);
 
         //- Clone
-        inline autoPtr<Matrix<Form, Type> > clone() const;
+        inline autoPtr<Matrix<Form, Type>> clone() const;
 
 
     //- Destructor
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index ccffa5c3db..07e987580b 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,10 +35,10 @@ inline Foam::Matrix<Form, Type>::Matrix()
 
 
 template<class Form, class Type>
-inline Foam::autoPtr<Foam::Matrix<Form, Type> > Foam::Matrix<Form, Type>::
+inline Foam::autoPtr<Foam::Matrix<Form, Type>> Foam::Matrix<Form, Type>::
 clone() const
 {
-    return autoPtr<Matrix<Form, Type> >(new Matrix<Form, Type>(*this));
+    return autoPtr<Matrix<Form, Type>>(new Matrix<Form, Type>(*this));
 }
 
 
@@ -47,7 +47,7 @@ clone() const
 template<class Form, class Type>
 inline const Foam::Matrix<Form, Type>& Foam::Matrix<Form, Type>::null()
 {
-    return NullObjectRef<Matrix<Form, Type> >();
+    return NullObjectRef<Matrix<Form, Type>>();
 }
 
 
diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
index ca91c9ca5b..fa255b03b4 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ public:
         inline RectangularMatrix(Istream&);
 
         //- Clone
-        inline autoPtr<RectangularMatrix<Type> > clone() const;
+        inline autoPtr<RectangularMatrix<Type>> clone() const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
index 2319b778a1..55c3f69699 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,10 +59,10 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix(Istream& is)
 {}
 
 template<class Type>
-inline Foam::autoPtr<Foam::RectangularMatrix<Type> >
+inline Foam::autoPtr<Foam::RectangularMatrix<Type>>
 Foam::RectangularMatrix<Type>::clone() const
 {
-    return autoPtr<RectangularMatrix<Type> >
+    return autoPtr<RectangularMatrix<Type>>
     (
         new RectangularMatrix<Type>(*this)
     );
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
index 531b649588..3938728b36 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
         inline SquareMatrix(Istream&);
 
         //- Clone
-        inline autoPtr<SquareMatrix<Type> > clone() const;
+        inline autoPtr<SquareMatrix<Type>> clone() const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
index 243d31904e..74d7bdb95c 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,10 +73,10 @@ inline Foam::SquareMatrix<Type>::SquareMatrix(Istream& is)
 {}
 
 template<class Type>
-inline Foam::autoPtr<Foam::SquareMatrix<Type> >
+inline Foam::autoPtr<Foam::SquareMatrix<Type>>
 Foam::SquareMatrix<Type>::clone() const
 {
-    return autoPtr<SquareMatrix<Type> >(new SquareMatrix<Type>(*this));
+    return autoPtr<SquareMatrix<Type>>(new SquareMatrix<Type>(*this));
 }
 
 
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
index 6983250078..f6fee5f732 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ public:
         inline SymmetricSquareMatrix(Istream&);
 
         //- Clone
-        inline autoPtr<SymmetricSquareMatrix<Type> > clone() const;
+        inline autoPtr<SymmetricSquareMatrix<Type>> clone() const;
 
 
         //- Return subscript-checked row of Matrix.
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
index b067cc2669..00757eabc6 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,10 +84,10 @@ inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix(Istream& is)
 
 
 template<class Type>
-inline Foam::autoPtr<Foam::SymmetricSquareMatrix<Type> >
+inline Foam::autoPtr<Foam::SymmetricSquareMatrix<Type>>
 Foam::SymmetricSquareMatrix<Type>::clone() const
 {
-    return autoPtr<SymmetricSquareMatrix<Type> >
+    return autoPtr<SymmetricSquareMatrix<Type>>
     (
         new SymmetricSquareMatrix<Type>(*this)
     );
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
index 2a4f156c8d..2ca3c7290c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ public:
 
             //- Raw field receive function returning field
             template<class Type>
-            tmp<Field<Type> > receive
+            tmp<Field<Type>> receive
             (
                 const Pstream::commsTypes commsType,
                 const label size
@@ -144,7 +144,7 @@ public:
 
             //- Raw field receive function with data compression returning field
             template<class Type>
-            tmp<Field<Type> > compressedReceive
+            tmp<Field<Type>> compressedReceive
             (
                 const Pstream::commsTypes commsType,
                 const label size
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
index 645c1de157..bcbc3385f8 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,13 +119,13 @@ void Foam::processorLduInterface::receive
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::processorLduInterface::receive
+Foam::tmp<Foam::Field<Type>> Foam::processorLduInterface::receive
 (
     const Pstream::commsTypes commsType,
     const label size
 ) const
 {
-    tmp<Field<Type> > tf(new Field<Type>(size));
+    tmp<Field<Type>> tf(new Field<Type>(size));
     receive(commsType, tf());
     return tf;
 }
@@ -261,13 +261,13 @@ void Foam::processorLduInterface::compressedReceive
 }
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::processorLduInterface::compressedReceive
+Foam::tmp<Foam::Field<Type>> Foam::processorLduInterface::compressedReceive
 (
     const Pstream::commsTypes commsType,
     const label size
 ) const
 {
-    tmp<Field<Type> > tf(new Field<Type>(size));
+    tmp<Field<Type>> tf(new Field<Type>(size));
     compressedReceive(commsType, tf());
     return tf;
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index e9ae3af889..43566e164f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -684,18 +684,18 @@ public:
 
 
             template<class Type>
-            tmp<Field<Type> > H(const Field<Type>&) const;
+            tmp<Field<Type>> H(const Field<Type>&) const;
 
             template<class Type>
-            tmp<Field<Type> > H(const tmp<Field<Type> >&) const;
+            tmp<Field<Type>> H(const tmp<Field<Type>>&) const;
 
             tmp<scalarField> H1() const;
 
             template<class Type>
-            tmp<Field<Type> > faceH(const Field<Type>&) const;
+            tmp<Field<Type>> faceH(const Field<Type>&) const;
 
             template<class Type>
-            tmp<Field<Type> > faceH(const tmp<Field<Type> >&) const;
+            tmp<Field<Type>> faceH(const tmp<Field<Type>>&) const;
 
 
         // Info
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
index a473b2d637..f674bba7a9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,9 +31,9 @@ Description
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::lduMatrix::H(const Field<Type>& psi) const
+Foam::tmp<Foam::Field<Type>> Foam::lduMatrix::H(const Field<Type>& psi) const
 {
-    tmp<Field<Type> > tHpsi
+    tmp<Field<Type>> tHpsi
     (
         new Field<Type>(lduAddr().size(), pTraits<Type>::zero)
     );
@@ -65,17 +65,17 @@ Foam::tmp<Foam::Field<Type> > Foam::lduMatrix::H(const Field<Type>& psi) const
 }
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
-Foam::lduMatrix::H(const tmp<Field<Type> >& tpsi) const
+Foam::tmp<Foam::Field<Type>>
+Foam::lduMatrix::H(const tmp<Field<Type>>& tpsi) const
 {
-    tmp<Field<Type> > tHpsi(H(tpsi()));
+    tmp<Field<Type>> tHpsi(H(tpsi()));
     tpsi.clear();
     return tHpsi;
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::lduMatrix::faceH(const Field<Type>& psi) const
 {
     if (lowerPtr_ || upperPtr_)
@@ -86,7 +86,7 @@ Foam::lduMatrix::faceH(const Field<Type>& psi) const
         const labelUList& l = lduAddr().lowerAddr();
         const labelUList& u = lduAddr().upperAddr();
 
-        tmp<Field<Type> > tfaceHpsi(new Field<Type> (Lower.size()));
+        tmp<Field<Type>> tfaceHpsi(new Field<Type> (Lower.size()));
         Field<Type> & faceHpsi = tfaceHpsi();
 
         for (label face=0; face<l.size(); face++)
@@ -105,16 +105,16 @@ Foam::lduMatrix::faceH(const Field<Type>& psi) const
                " the matrix does not have any off-diagonal coefficients."
             << exit(FatalError);
 
-        return tmp<Field<Type> >(NULL);
+        return tmp<Field<Type>>(NULL);
     }
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
-Foam::lduMatrix::faceH(const tmp<Field<Type> >& tpsi) const
+Foam::tmp<Foam::Field<Type>>
+Foam::lduMatrix::faceH(const tmp<Field<Type>>& tpsi) const
 {
-    tmp<Field<Type> > tfaceHpsi(faceH(tpsi()));
+    tmp<Field<Type>> tfaceHpsi(faceH(tpsi()));
     tpsi.clear();
     return tfaceHpsi;
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
index 1c93711dd3..a7cdae8e4e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ class manualGAMGProcAgglomeration
     // Private data
 
         //- Per level the agglomeration map
-        const List<Tuple2<label, List<labelList> > > procAgglomMaps_;
+        const List<Tuple2<label, List<labelList>>> procAgglomMaps_;
 
         //- Any allocated communicators
         DynamicList<label> comms_;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index 689ae4455c..c34040c27d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ Foam::procFacesGAMGProcAgglomeration::singleCellMesh
 ) const
 {
     // Count number of faces per processor
-    List<Map<label> > procFaces(UPstream::nProcs(mesh.comm()));
+    List<Map<label>> procFaces(UPstream::nProcs(mesh.comm()));
     Map<label>& myNeighbours = procFaces[UPstream::myProcNo(mesh.comm())];
 
     {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
index 2ced631e39..9e220067d1 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,16 +116,16 @@ class GAMGSolver
         PtrList<lduMatrix> matrixLevels_;
 
         //- Hierarchy of interfaces.
-        PtrList<PtrList<lduInterfaceField> > primitiveInterfaceLevels_;
+        PtrList<PtrList<lduInterfaceField>> primitiveInterfaceLevels_;
 
         //- Hierarchy of interfaces in lduInterfaceFieldPtrs form
         PtrList<lduInterfaceFieldPtrsList> interfaceLevels_;
 
         //- Hierarchy of interface boundary coefficients
-        PtrList<FieldField<Field, scalar> > interfaceLevelsBouCoeffs_;
+        PtrList<FieldField<Field, scalar>> interfaceLevelsBouCoeffs_;
 
         //- Hierarchy of interface internal coefficients
-        PtrList<FieldField<Field, scalar> > interfaceLevelsIntCoeffs_;
+        PtrList<FieldField<Field, scalar>> interfaceLevelsIntCoeffs_;
 
         //- LU decompsed coarsest matrix
         autoPtr<LUscalarMatrix> coarsestLUMatrixPtr_;
@@ -191,10 +191,10 @@ class GAMGSolver
             const lduInterfaceFieldPtrsList& interfaces,
 
             PtrList<lduMatrix>& otherMats,
-            PtrList<FieldField<Field, scalar> >& otherBouCoeffs,
-            PtrList<FieldField<Field, scalar> >& otherIntCoeffs,
+            PtrList<FieldField<Field, scalar>>& otherBouCoeffs,
+            PtrList<FieldField<Field, scalar>>& otherIntCoeffs,
             List<boolList>& otherTransforms,
-            List<List<label> >& otherRanks
+            List<List<label>>& otherRanks
         ) const;
 
         //- Agglomerate processor matrices
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index d848394675..e12be87d61 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -293,10 +293,10 @@ void Foam::GAMGSolver::gatherMatrices
     const lduInterfaceFieldPtrsList& interfaces,
 
     PtrList<lduMatrix>& otherMats,
-    PtrList<FieldField<Field, scalar> >& otherBouCoeffs,
-    PtrList<FieldField<Field, scalar> >& otherIntCoeffs,
+    PtrList<FieldField<Field, scalar>>& otherBouCoeffs,
+    PtrList<FieldField<Field, scalar>>& otherIntCoeffs,
     List<boolList>& otherTransforms,
-    List<List<label> >& otherRanks
+    List<List<label>>& otherRanks
 ) const
 {
     if (debug)
@@ -448,10 +448,10 @@ void Foam::GAMGSolver::procAgglomerateMatrix
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     PtrList<lduMatrix> otherMats;
-    PtrList<FieldField<Field, scalar> > otherBouCoeffs;
-    PtrList<FieldField<Field, scalar> > otherIntCoeffs;
+    PtrList<FieldField<Field, scalar>> otherBouCoeffs;
+    PtrList<FieldField<Field, scalar>> otherIntCoeffs;
     List<boolList> otherTransforms;
-    List<List<label> > otherRanks;
+    List<List<label>> otherRanks;
     gatherMatrices
     (
         agglomProcIDs,
@@ -751,15 +751,15 @@ void Foam::GAMGSolver::procAgglomerateMatrix
 )
 {
     autoPtr<lduMatrix> allMatrixPtr;
-    autoPtr<FieldField<Field, scalar> > allInterfaceBouCoeffs
+    autoPtr<FieldField<Field, scalar>> allInterfaceBouCoeffs
     (
         new FieldField<Field, scalar>(0)
     );
-    autoPtr<FieldField<Field, scalar> > allInterfaceIntCoeffs
+    autoPtr<FieldField<Field, scalar>> allInterfaceIntCoeffs
     (
         new FieldField<Field, scalar>(0)
     );
-    autoPtr<PtrList<lduInterfaceField> > allPrimitiveInterfaces
+    autoPtr<PtrList<lduInterfaceField>> allPrimitiveInterfaces
     (
         new PtrList<lduInterfaceField>(0)
     );
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
index 66c1ab2f32..dea8a20d36 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -238,7 +238,7 @@ public:
 
             //- Return the interface internal field of the given field
             template<class Type>
-            tmp<Field<Type> > interfaceInternalField
+            tmp<Field<Type>> interfaceInternalField
             (
                 const UList<Type>& internalData
             ) const;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
index 79e5f04259..2f55a362ee 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,12 +28,12 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::GAMGInterface::interfaceInternalField
+Foam::tmp<Foam::Field<Type>> Foam::GAMGInterface::interfaceInternalField
 (
     const UList<Type>& iF
 ) const
 {
-    tmp<Field<Type> > tresult(new Field<Type>(size()));
+    tmp<Field<Type>> tresult(new Field<Type>(size()));
     interfaceInternalField(iF, tresult());
     return tresult;
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 4610c24c89..94e3e03dc9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
     );
 
     // From coarse cell pair to coarse face
-    HashTable<label, labelPair, labelPair::Hash<> > cellsToCoarseFace
+    HashTable<label, labelPair, labelPair::Hash<>> cellsToCoarseFace
     (
         2*localRestrictAddressing.size()
     );
@@ -126,7 +126,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
             );
         }
 
-        HashTable<label, labelPair, labelPair::Hash<> >::const_iterator fnd =
+        HashTable<label, labelPair, labelPair::Hash<>>::const_iterator fnd =
             cellsToCoarseFace.find(cellPair);
 
         if (fnd == cellsToCoarseFace.end())
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index d0cbc9ade6..f68e1a853b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
     );
 
     // From coarse cell pair to coarse face
-    HashTable<label, labelPair, labelPair::Hash<> > cellsToCoarseFace
+    HashTable<label, labelPair, labelPair::Hash<>> cellsToCoarseFace
     (
         2*localRestrictAddressing.size()
     );
@@ -114,7 +114,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
             );
         }
 
-        HashTable<label, labelPair, labelPair::Hash<> >::const_iterator fnd =
+        HashTable<label, labelPair, labelPair::Hash<>>::const_iterator fnd =
             cellsToCoarseFace.find(cellPair);
 
         if (fnd == cellsToCoarseFace.end())
@@ -213,7 +213,7 @@ Foam::tmp<Foam::labelField> Foam::processorGAMGInterface::internalFieldTransfer
     label oldWarn = UPstream::warnComm;
     UPstream::warnComm = comm();
 
-    tmp<Field<label> > tfld(receive<label>(commsType, this->size()));
+    tmp<Field<label>> tfld(receive<label>(commsType, this->size()));
 
     UPstream::warnComm = oldWarn;
 
diff --git a/src/OpenFOAM/memory/Xfer/XferI.H b/src/OpenFOAM/memory/Xfer/XferI.H
index d1127393df..eddfa5cd18 100644
--- a/src/OpenFOAM/memory/Xfer/XferI.H
+++ b/src/OpenFOAM/memory/Xfer/XferI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 template<class T>
 inline const Foam::Xfer<T>& Foam::Xfer<T>::null()
 {
-    return NullObjectRef<Xfer<T> >();
+    return NullObjectRef<Xfer<T>>();
 }
 
 
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.C b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
index 53267d90aa..f8fae85d41 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.C
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -287,7 +287,7 @@ void Foam::meshObject::movePoints(objectRegistry& obr)
 {
     HashTable<GeometricMeshObject<Mesh>*> meshObjects
     (
-        obr.lookupClass<GeometricMeshObject<Mesh> >()
+        obr.lookupClass<GeometricMeshObject<Mesh>>()
     );
 
     if (meshObject::debug)
@@ -304,7 +304,7 @@ void Foam::meshObject::movePoints(objectRegistry& obr)
         iter
     )
     {
-        if (isA<MoveableMeshObject<Mesh> >(*iter()))
+        if (isA<MoveableMeshObject<Mesh>>(*iter()))
         {
             if (meshObject::debug)
             {
@@ -329,7 +329,7 @@ void Foam::meshObject::updateMesh(objectRegistry& obr, const mapPolyMesh& mpm)
 {
     HashTable<GeometricMeshObject<Mesh>*> meshObjects
     (
-        obr.lookupClass<GeometricMeshObject<Mesh> >()
+        obr.lookupClass<GeometricMeshObject<Mesh>>()
     );
 
     if (meshObject::debug)
@@ -346,7 +346,7 @@ void Foam::meshObject::updateMesh(objectRegistry& obr, const mapPolyMesh& mpm)
         iter
     )
     {
-        if (isA<UpdateableMeshObject<Mesh> >(*iter()))
+        if (isA<UpdateableMeshObject<Mesh>>(*iter()))
         {
             if (meshObject::debug)
             {
@@ -371,7 +371,7 @@ void Foam::meshObject::clear(objectRegistry& obr)
 {
     HashTable<MeshObjectType<Mesh>*> meshObjects
     (
-        obr.lookupClass<MeshObjectType<Mesh> >()
+        obr.lookupClass<MeshObjectType<Mesh>>()
     );
 
     if (meshObject::debug)
@@ -402,7 +402,7 @@ void Foam::meshObject::clearUpto(objectRegistry& obr)
 {
     HashTable<FromType<Mesh>*> meshObjects
     (
-        obr.lookupClass<FromType<Mesh> >()
+        obr.lookupClass<FromType<Mesh>>()
     );
 
     if (meshObject::debug)
@@ -414,7 +414,7 @@ void Foam::meshObject::clearUpto(objectRegistry& obr)
 
     forAllIter(typename HashTable<FromType<Mesh>*>, meshObjects, iter)
     {
-        if (!isA<ToType<Mesh> >(*iter()))
+        if (!isA<ToType<Mesh>>(*iter()))
         {
             if (meshObject::debug)
             {
diff --git a/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C b/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
index ca625a2a88..c7992b7823 100644
--- a/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
+++ b/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ Foam::commSchedule::commSchedule
     procSchedule_(nProcs)
 {
     // Determine comms per processor.
-    List<DynamicList<label> > procToComms(nProcs);
+    List<DynamicList<label>> procToComms(nProcs);
 
     forAll(comms, commI)
     {
diff --git a/src/OpenFOAM/meshes/data/dataTemplates.C b/src/OpenFOAM/meshes/data/dataTemplates.C
index 8929ee123c..536c433081 100644
--- a/src/OpenFOAM/meshes/data/dataTemplates.C
+++ b/src/OpenFOAM/meshes/data/dataTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ void Foam::data::setSolverPerformance
 {
     dictionary& dict = const_cast<dictionary&>(solverPerformanceDict());
 
-    List<SolverPerformance<Type> > perfs;
+    List<SolverPerformance<Type>> perfs;
 
     if (prevTimeIndex_ != this->time().timeIndex())
     {
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H b/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
index 11596bc4eb..971202495c 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ namespace Foam
 template<class T>
 class EdgeMap
 :
-    public HashTable<T, edge, Hash<edge> >
+    public HashTable<T, edge, Hash<edge>>
 {
 
 public:
@@ -57,19 +57,19 @@ public:
         //- Construct given initial map size
         EdgeMap(const label size = 128)
         :
-            HashTable<T, edge, Hash<edge> >(size)
+            HashTable<T, edge, Hash<edge>>(size)
         {}
 
         //- Construct from Istream
         EdgeMap(Istream& is)
         :
-            HashTable<T, edge, Hash<edge> >(is)
+            HashTable<T, edge, Hash<edge>>(is)
         {}
 
         //- Construct as copy
         EdgeMap(const EdgeMap<T>& map)
         :
-            HashTable<T, edge, Hash<edge> >(map)
+            HashTable<T, edge, Hash<edge>>(map)
         {}
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 6db7480093..59705a16e1 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1051,7 +1051,7 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
     // Construct map
     globalEdgeTransformedSlavesPtr_.reset(new labelListList());
 
-    List<Map<label> > compactMap(Pstream::nProcs());
+    List<Map<label>> compactMap(Pstream::nProcs());
     globalEdgeSlavesMapPtr_.reset
     (
         new mapDistribute
@@ -1435,7 +1435,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
     }
 
     // Construct a map to get the face data directly
-    List<Map<label> > compactMap(Pstream::nProcs());
+    List<Map<label>> compactMap(Pstream::nProcs());
 
     globalPointTransformedBoundaryFacesPtr_.reset
     (
@@ -1662,7 +1662,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
     }
 
     // Construct a map to get the cell data directly
-    List<Map<label> > compactMap(Pstream::nProcs());
+    List<Map<label>> compactMap(Pstream::nProcs());
 
     globalPointTransformedBoundaryCellsPtr_.reset
     (
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index 35543fd093..3c1cb48cb0 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,7 +153,7 @@ class globalMeshData
             //      edges : meshEdges(), meshEdgeMap()
             mutable autoPtr<indirectPrimitivePatch> coupledPatchPtr_;
             mutable autoPtr<labelList> coupledPatchMeshEdgesPtr_;
-            mutable autoPtr<Map<label> > coupledPatchMeshEdgeMapPtr_;
+            mutable autoPtr<Map<label>> coupledPatchMeshEdgeMapPtr_;
 
             //- Global numbering for coupledPatch points
             mutable autoPtr<globalIndex> globalPointNumberingPtr_;
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index 2b6b17da92..53399ca8d2 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1061,7 +1061,7 @@ void Foam::globalPoints::calculateSharedPoints
     }
 
 
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     map_.reset
     (
         new mapDistribute
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index c7d93e6d9c..5d0650ef2e 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -145,7 +145,7 @@ Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
     List<labelPair> allComms;
 
     {
-        HashSet<labelPair, labelPair::Hash<> > commsSet(Pstream::nProcs());
+        HashSet<labelPair, labelPair::Hash<>> commsSet(Pstream::nProcs());
 
         // Find what communication is required
         forAll(subMap, procI)
@@ -365,7 +365,7 @@ void Foam::mapDistribute::calcCompactAddressing
 (
     const globalIndex& globalNumbering,
     const labelList& elements,
-    List<Map<label> >& compactMap
+    List<Map<label>>& compactMap
 ) const
 {
     compactMap.setSize(Pstream::nProcs());
@@ -414,7 +414,7 @@ void Foam::mapDistribute::calcCompactAddressing
 (
     const globalIndex& globalNumbering,
     const labelListList& cellCells,
-    List<Map<label> >& compactMap
+    List<Map<label>>& compactMap
 ) const
 {
     compactMap.setSize(Pstream::nProcs());
@@ -474,7 +474,7 @@ void Foam::mapDistribute::exchangeAddressing
     const int tag,
     const globalIndex& globalNumbering,
     labelList& elements,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     labelList& compactStart
 )
 {
@@ -554,7 +554,7 @@ void Foam::mapDistribute::exchangeAddressing
     const int tag,
     const globalIndex& globalNumbering,
     labelListList& cellCells,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     labelList& compactStart
 )
 {
@@ -754,7 +754,7 @@ Foam::mapDistribute::mapDistribute
 (
     const globalIndex& globalNumbering,
     labelList& elements,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     const int tag
 )
 :
@@ -812,7 +812,7 @@ Foam::mapDistribute::mapDistribute
 (
     const globalIndex& globalNumbering,
     labelListList& cellCells,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     const int tag
 )
 :
@@ -873,7 +873,7 @@ Foam::mapDistribute::mapDistribute
     const globalIndexAndTransform& globalTransforms,
     const labelPairList& transformedElements,
     labelList& transformedIndices,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     const int tag
 )
 :
@@ -979,7 +979,7 @@ Foam::mapDistribute::mapDistribute
     const globalIndexAndTransform& globalTransforms,
     const List<labelPairList>& transformedElements,
     labelListList& transformedIndices,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     const int tag
 )
 :
@@ -1141,7 +1141,7 @@ Foam::Xfer<Foam::mapDistribute> Foam::mapDistribute::xfer()
 Foam::label Foam::mapDistribute::renumber
 (
     const globalIndex& globalNumbering,
-    const List<Map<label> >& compactMap,
+    const List<Map<label>>& compactMap,
     const label globalI
 )
 {
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
index 28540fa8e2..8a5b06d446 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -174,7 +174,7 @@ class mapDistribute
 
 
         //- Schedule
-        mutable autoPtr<List<labelPair> > schedulePtr_;
+        mutable autoPtr<List<labelPair>> schedulePtr_;
 
 
    // Private Member Functions
@@ -190,13 +190,13 @@ class mapDistribute
         (
             const globalIndex& globalNumbering,
             const labelList& elements,
-            List<Map<label> >& compactMap
+            List<Map<label>>& compactMap
         ) const;
         void calcCompactAddressing
         (
             const globalIndex& globalNumbering,
             const labelListList& elements,
-            List<Map<label> >& compactMap
+            List<Map<label>>& compactMap
         ) const;
 
         void exchangeAddressing
@@ -204,7 +204,7 @@ class mapDistribute
             const int tag,
             const globalIndex& globalNumbering,
             labelList& elements,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             labelList& compactStart
         );
         void exchangeAddressing
@@ -212,7 +212,7 @@ class mapDistribute
             const int tag,
             const globalIndex& globalNumbering,
             labelListList& elements,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             labelList& compactStart
         );
 
@@ -268,7 +268,7 @@ public:
             (
                 const vectorTensorTransform& vt,
                 const bool forward,
-                List<List<Type> >& flds
+                List<List<Type>>& flds
             ) const
             {
                 forAll(flds, i)
@@ -325,7 +325,7 @@ public:
             (
                 const vectorTensorTransform& vt,
                 const bool forward,
-                List<List<point> >& flds
+                List<List<point>>& flds
             ) const
             {
                 forAll(flds, i)
@@ -403,7 +403,7 @@ public:
         (
             const globalIndex&,
             labelList& elements,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             const int tag = Pstream::msgType()
         );
 
@@ -414,7 +414,7 @@ public:
         (
             const globalIndex&,
             labelListList& cellCells,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             const int tag = Pstream::msgType()
         );
 
@@ -431,7 +431,7 @@ public:
             const globalIndexAndTransform&,
             const labelPairList& transformedElements,
             labelList& transformedIndices,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             const int tag = Pstream::msgType()
         );
 
@@ -443,7 +443,7 @@ public:
             const globalIndexAndTransform&,
             const List<labelPairList>& transformedElements,
             labelListList& transformedIndices,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             const int tag = Pstream::msgType()
         );
 
@@ -535,7 +535,7 @@ public:
             static label renumber
             (
                 const globalIndex&,
-                const List<Map<label> >& compactMap,
+                const List<Map<label>>& compactMap,
                 const label globalElement
             );
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index becc4a77ce..849b3ee366 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -267,7 +267,7 @@ void Foam::mapDistribute::distribute
         {
             // Set up sends to neighbours
 
-            List<List<T > > sendFields(Pstream::nProcs());
+            List<List<T >> sendFields(Pstream::nProcs());
 
             for (label domain = 0; domain < Pstream::nProcs(); domain++)
             {
@@ -295,7 +295,7 @@ void Foam::mapDistribute::distribute
 
             // Set up receives from neighbours
 
-            List<List<T > > recvFields(Pstream::nProcs());
+            List<List<T >> recvFields(Pstream::nProcs());
 
             for (label domain = 0; domain < Pstream::nProcs(); domain++)
             {
@@ -615,7 +615,7 @@ void Foam::mapDistribute::distribute
         {
             // Set up sends to neighbours
 
-            List<List<T > > sendFields(Pstream::nProcs());
+            List<List<T >> sendFields(Pstream::nProcs());
 
             for (label domain = 0; domain < Pstream::nProcs(); domain++)
             {
@@ -643,7 +643,7 @@ void Foam::mapDistribute::distribute
 
             // Set up receives from neighbours
 
-            List<List<T > > recvFields(Pstream::nProcs());
+            List<List<T >> recvFields(Pstream::nProcs());
 
             for (label domain = 0; domain < Pstream::nProcs(); domain++)
             {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index a795557339..4b90fb078b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -299,7 +299,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
 
         // From mesh edge (expressed as a point pair so as not to construct
         // point addressing) to patch + relative edge index.
-        HashTable<labelPair, edge, Hash<edge> > pointsToEdge(nEdgePairs);
+        HashTable<labelPair, edge, Hash<edge>> pointsToEdge(nEdgePairs);
 
         forAll(*this, patchI)
         {
@@ -320,7 +320,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
                 // Edge in mesh points.
                 edge meshEdge(pp.meshPoints()[e[0]], pp.meshPoints()[e[1]]);
 
-                HashTable<labelPair, edge, Hash<edge> >::iterator fnd =
+                HashTable<labelPair, edge, Hash<edge>>::iterator fnd =
                     pointsToEdge.find(meshEdge);
 
                 if (fnd == pointsToEdge.end())
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 1906b422ac..114fc23168 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,10 +70,10 @@ class polyBoundaryMesh
 
         mutable autoPtr<labelList> patchIDPtr_;
 
-        mutable autoPtr<HashTable<labelList, word> > groupPatchIDsPtr_;
+        mutable autoPtr<HashTable<labelList, word>> groupPatchIDsPtr_;
 
         //- Edges of neighbouring patches
-        mutable autoPtr<List<labelPairList> > neighbourEdgesPtr_;
+        mutable autoPtr<List<labelPairList>> neighbourEdgesPtr_;
 
 
     // Private Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 11d60fec9f..9ce9703810 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,7 +153,7 @@ private:
             mutable autoPtr<labelList> tetBasePtIsPtr_;
 
             //- Search tree to allow spatial cell searching
-            mutable autoPtr<indexedOctree<treeDataCell> > cellTreePtr_;
+            mutable autoPtr<indexedOctree<treeDataCell>> cellTreePtr_;
 
 
         // Zoning information
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index bd77828520..ec1495c267 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ Foam::labelListList Foam::polyMesh::cellShapePointCells
     const cellShapeList& c
 ) const
 {
-    List<DynamicList<label, primitiveMesh::cellsPerPoint_> >
+    List<DynamicList<label, primitiveMesh::cellsPerPoint_>>
         pc(points().size());
 
     // For each cell
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
index 99fc0a9498..18aff56892 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ public:
 
 
 template<class T>
-class pTraits<List<T> >
+class pTraits<List<T>>
 :
     public List<T>
 {
@@ -76,7 +76,7 @@ public:
 };
 
 template<class T>
-class pTraits<UList<T> >
+class pTraits<UList<T>>
 :
     public UList<T>
 {
@@ -90,7 +90,7 @@ public:
 };
 
 template<class T>
-class pTraits<Field<T> >
+class pTraits<Field<T>>
 :
     public Field<T>
 {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
index ee47e50a85..635dd02096 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ void Foam::PatchTools::gatherAndMerge
     // Collect points from all processors
     labelList pointSizes;
     {
-        List<Field<PointType> > gatheredPoints(Pstream::nProcs());
+        List<Field<PointType>> gatheredPoints(Pstream::nProcs());
         gatheredPoints[Pstream::myProcNo()] = p.points();
 
         Pstream::gatherList(gatheredPoints);
@@ -61,13 +61,13 @@ void Foam::PatchTools::gatherAndMerge
             pointSizes = ListListOps::subSizes
             (
                 gatheredPoints,
-                accessOp<Field<PointType> >()
+                accessOp<Field<PointType>>()
             );
 
-            mergedPoints = ListListOps::combine<Field<PointType> >
+            mergedPoints = ListListOps::combine<Field<PointType>>
             (
                 gatheredPoints,
-                accessOp<Field<PointType> >()
+                accessOp<Field<PointType>>()
             );
         }
     }
@@ -75,7 +75,7 @@ void Foam::PatchTools::gatherAndMerge
     // Collect faces from all processors and renumber using sizes of
     // gathered points
     {
-        List<List<Face> > gatheredFaces(Pstream::nProcs());
+        List<List<Face>> gatheredFaces(Pstream::nProcs());
         gatheredFaces[Pstream::myProcNo()] = p;
         Pstream::gatherList(gatheredFaces);
 
@@ -83,11 +83,11 @@ void Foam::PatchTools::gatherAndMerge
         {
             mergedFaces = static_cast<const List<Face>&>
             (
-                ListListOps::combineOffset<List<Face> >
+                ListListOps::combineOffset<List<Face>>
                 (
                     gatheredFaces,
                     pointSizes,
-                    accessOp<List<Face> >(),
+                    accessOp<List<Face>>(),
                     offsetOp<Face>()
                 )
             );
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
index 50f0162915..82f5851f33 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ Foam::PatchTools::pointNormals
 
     {
         // Collect local pointFaces (sized on patch points only)
-        List<List<point> > pointFaceNormals(map.constructSize());
+        List<List<point>> pointFaceNormals(map.constructSize());
         forAll(p.meshPoints(), patchPointI)
         {
             label meshPointI = p.meshPoints()[patchPointI];
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
index cd2f92e61e..ade55ed719 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,8 +73,8 @@ template
 Foam::PrimitivePatch<Face, FaceList, PointField, PointType>::
 PrimitivePatch
 (
-    const Xfer<FaceList<Face> >& faces,
-    const Xfer<List<PointType> >& points
+    const Xfer<FaceList<Face>>& faces,
+    const Xfer<List<PointType>>& points
 )
 :
     FaceList<Face>(faces),
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
index 354dfa3f99..9137ed673f 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -246,8 +246,8 @@ public:
         //- Construct from components
         PrimitivePatch
         (
-            const Xfer<FaceList<Face> >& faces,
-            const Xfer<List<PointType> >& points
+            const Xfer<FaceList<Face>>& faces,
+            const Xfer<List<PointType>>& points
         );
 
         //- Construct from components, reuse storage
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
index 0508eb3165..c6cdcc83dd 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,7 @@ calcAddressing() const
 
     // faceFaces created using a dynamic list.  Cannot guess size because
     // of multiple connections
-    List<DynamicList<label> > ff(locFcs.size());
+    List<DynamicList<label>> ff(locFcs.size());
 
     faceEdgesPtr_ = new labelListList(locFcs.size());
     labelListList& faceEdges = *faceEdgesPtr_;
@@ -132,8 +132,8 @@ calcAddressing() const
         const edgeList& curEdges = faceIntoEdges[faceI];
 
         // Record the neighbour face.  Multiple connectivity allowed
-        List<DynamicList<label> > neiFaces(curF.size());
-        List<DynamicList<label> > edgeOfNeiFace(curF.size());
+        List<DynamicList<label>> neiFaces(curF.size());
+        List<DynamicList<label>> edgeOfNeiFace(curF.size());
 
         label nNeighbours = 0;
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
index 22374efe12..497e38f918 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ calcPointFaces() const
     const List<Face>& f = localFaces();
 
     // set up storage for pointFaces
-    List<SLList<label> > pointFcs(meshPoints().size());
+    List<SLList<label>> pointFcs(meshPoints().size());
 
     forAll(f, faceI)
     {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index f886d80162..78702ecaf5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -212,7 +212,7 @@ class primitiveMesh
             //- Helper: return (after optional creation) edge between two points
             static label getEdge
             (
-                List<DynamicList<label> >&,
+                List<DynamicList<label>>&,
                 DynamicList<edge>&,
                 const label,
                 const label
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
index a4e449af37..de155dd7f4 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ void Foam::primitiveMesh::calcCellEdges() const
     else
     {
         // Set up temporary storage
-        List<DynamicList<label, edgesPerCell_> > ce(nCells());
+        List<DynamicList<label, edgesPerCell_>> ce(nCells());
 
 
         // Get reference to faceCells and faceEdges
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
index b79879f01f..cb51679385 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ License
 // Returns edgeI between two points.
 Foam::label Foam::primitiveMesh::getEdge
 (
-    List<DynamicList<label> >& pe,
+    List<DynamicList<label>>& pe,
     DynamicList<edge>& es,
 
     const label pointI,
@@ -104,7 +104,7 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
         // ~~~~~~~~~~~~~
 
         // Estimate pointEdges storage
-        List<DynamicList<label> > pe(nPoints());
+        List<DynamicList<label>> pe(nPoints());
         forAll(pe, pointI)
         {
             pe[pointI].setCapacity(primitiveMesh::edgesPerPoint_);
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
index 5db52eb1bb..c22f547895 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -190,7 +190,7 @@ public:
 };
 
 template<class Cmpt>
-class outerProduct<Cmpt, SphericalTensor<Cmpt> >
+class outerProduct<Cmpt, SphericalTensor<Cmpt>>
 {
 public:
 
@@ -199,7 +199,7 @@ public:
 
 
 template<class Cmpt>
-class innerProduct<SphericalTensor<Cmpt>, SphericalTensor<Cmpt> >
+class innerProduct<SphericalTensor<Cmpt>, SphericalTensor<Cmpt>>
 {
 public:
 
@@ -208,7 +208,7 @@ public:
 
 
 template<class Cmpt>
-class innerProduct<SphericalTensor<Cmpt>, Vector<Cmpt> >
+class innerProduct<SphericalTensor<Cmpt>, Vector<Cmpt>>
 {
 public:
 
@@ -216,7 +216,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<Vector<Cmpt>, SphericalTensor<Cmpt> >
+class innerProduct<Vector<Cmpt>, SphericalTensor<Cmpt>>
 {
 public:
 
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
index 389180fe5c..18bf88f0a5 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -172,7 +172,7 @@ public:
 };
 
 template<class Cmpt>
-class outerProduct<Cmpt, SphericalTensor2D<Cmpt> >
+class outerProduct<Cmpt, SphericalTensor2D<Cmpt>>
 {
 public:
 
@@ -181,7 +181,7 @@ public:
 
 
 template<class Cmpt>
-class innerProduct<SphericalTensor2D<Cmpt>, SphericalTensor2D<Cmpt> >
+class innerProduct<SphericalTensor2D<Cmpt>, SphericalTensor2D<Cmpt>>
 {
 public:
 
@@ -190,7 +190,7 @@ public:
 
 
 template<class Cmpt>
-class innerProduct<SphericalTensor2D<Cmpt>, Vector2D<Cmpt> >
+class innerProduct<SphericalTensor2D<Cmpt>, Vector2D<Cmpt>>
 {
 public:
 
@@ -198,7 +198,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<Vector2D<Cmpt>, SphericalTensor2D<Cmpt> >
+class innerProduct<Vector2D<Cmpt>, SphericalTensor2D<Cmpt>>
 {
 public:
 
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index 26e849f720..b0e64c9009 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -536,7 +536,7 @@ public:
 };
 
 template<class Cmpt>
-class outerProduct<Cmpt, SymmTensor<Cmpt> >
+class outerProduct<Cmpt, SymmTensor<Cmpt>>
 {
 public:
 
@@ -544,7 +544,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<SymmTensor<Cmpt>, SymmTensor<Cmpt> >
+class innerProduct<SymmTensor<Cmpt>, SymmTensor<Cmpt>>
 {
 public:
 
@@ -552,7 +552,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<SymmTensor<Cmpt>, Vector<Cmpt> >
+class innerProduct<SymmTensor<Cmpt>, Vector<Cmpt>>
 {
 public:
 
@@ -560,7 +560,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<Vector<Cmpt>, SymmTensor<Cmpt> >
+class innerProduct<Vector<Cmpt>, SymmTensor<Cmpt>>
 {
 public:
 
@@ -569,7 +569,7 @@ public:
 
 
 template<class Cmpt>
-class typeOfSum<SphericalTensor<Cmpt>, SymmTensor<Cmpt> >
+class typeOfSum<SphericalTensor<Cmpt>, SymmTensor<Cmpt>>
 {
 public:
 
@@ -577,7 +577,7 @@ public:
 };
 
 template<class Cmpt>
-class typeOfSum<SymmTensor<Cmpt>, SphericalTensor<Cmpt> >
+class typeOfSum<SymmTensor<Cmpt>, SphericalTensor<Cmpt>>
 {
 public:
 
@@ -585,7 +585,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<SphericalTensor<Cmpt>, SymmTensor<Cmpt> >
+class innerProduct<SphericalTensor<Cmpt>, SymmTensor<Cmpt>>
 {
 public:
 
@@ -593,7 +593,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<SymmTensor<Cmpt>, SphericalTensor<Cmpt> >
+class innerProduct<SymmTensor<Cmpt>, SphericalTensor<Cmpt>>
 {
 public:
 
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
index 1a139d8f64..2212a6f13d 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -445,7 +445,7 @@ public:
 };
 
 template<class Cmpt>
-class outerProduct<Cmpt, SymmTensor2D<Cmpt> >
+class outerProduct<Cmpt, SymmTensor2D<Cmpt>>
 {
 public:
 
@@ -453,7 +453,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<SymmTensor2D<Cmpt>, SymmTensor2D<Cmpt> >
+class innerProduct<SymmTensor2D<Cmpt>, SymmTensor2D<Cmpt>>
 {
 public:
 
@@ -461,7 +461,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<SymmTensor2D<Cmpt>, Vector2D<Cmpt> >
+class innerProduct<SymmTensor2D<Cmpt>, Vector2D<Cmpt>>
 {
 public:
 
@@ -469,7 +469,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<Vector2D<Cmpt>, SymmTensor2D<Cmpt> >
+class innerProduct<Vector2D<Cmpt>, SymmTensor2D<Cmpt>>
 {
 public:
 
@@ -478,7 +478,7 @@ public:
 
 
 template<class Cmpt>
-class typeOfSum<SphericalTensor2D<Cmpt>, SymmTensor2D<Cmpt> >
+class typeOfSum<SphericalTensor2D<Cmpt>, SymmTensor2D<Cmpt>>
 {
 public:
 
@@ -486,7 +486,7 @@ public:
 };
 
 template<class Cmpt>
-class typeOfSum<SymmTensor2D<Cmpt>, SphericalTensor2D<Cmpt> >
+class typeOfSum<SymmTensor2D<Cmpt>, SphericalTensor2D<Cmpt>>
 {
 public:
 
@@ -494,7 +494,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<SphericalTensor2D<Cmpt>, SymmTensor2D<Cmpt> >
+class innerProduct<SphericalTensor2D<Cmpt>, SymmTensor2D<Cmpt>>
 {
 public:
 
@@ -502,7 +502,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<SymmTensor2D<Cmpt>, SphericalTensor2D<Cmpt> >
+class innerProduct<SymmTensor2D<Cmpt>, SphericalTensor2D<Cmpt>>
 {
 public:
 
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index 985ca6b081..046ebfba19 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ public:
         inline Tensor(const SymmTensor<Cmpt>&);
 
         //- Construct given triad
-        inline Tensor(const Vector<Vector<Cmpt> >&);
+        inline Tensor(const Vector<Vector<Cmpt>>&);
 
         //- Construct given the three vector components
         inline Tensor
@@ -171,7 +171,7 @@ public:
         inline void operator=(const SymmTensor<Cmpt>&);
 
         //- Assign to a triad
-        inline void operator=(const Vector<Vector<Cmpt> >&);
+        inline void operator=(const Vector<Vector<Cmpt>>&);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 03b0594f1d..b128d0eebd 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ inline Tensor<Cmpt>::Tensor(const SymmTensor<Cmpt>& st)
 
 
 template<class Cmpt>
-inline Tensor<Cmpt>::Tensor(const Vector<Vector<Cmpt> >& tr)
+inline Tensor<Cmpt>::Tensor(const Vector<Vector<Cmpt>>& tr)
 {
     this->v_[XX] = tr.x().x();
     this->v_[XY] = tr.x().y();
@@ -315,7 +315,7 @@ inline void Tensor<Cmpt>::operator=(const SymmTensor<Cmpt>& st)
 
 
 template<class Cmpt>
-inline void Tensor<Cmpt>::operator=(const Vector<Vector<Cmpt> >& tr)
+inline void Tensor<Cmpt>::operator=(const Vector<Vector<Cmpt>>& tr)
 {
     this->v_[XX] = tr.x().x();
     this->v_[XY] = tr.x().y();
@@ -353,7 +353,7 @@ inline Tensor<Cmpt> operator*(const Vector<Cmpt>& v)
 
 
 template<class Cmpt>
-inline typename innerProduct<Tensor<Cmpt>, Tensor<Cmpt> >::type
+inline typename innerProduct<Tensor<Cmpt>, Tensor<Cmpt>>::type
 operator&(const Tensor<Cmpt>& t1, const Tensor<Cmpt>& t2)
 {
     return Tensor<Cmpt>
@@ -374,7 +374,7 @@ operator&(const Tensor<Cmpt>& t1, const Tensor<Cmpt>& t2)
 
 
 template<class Cmpt>
-inline typename innerProduct<Tensor<Cmpt>, Vector<Cmpt> >::type
+inline typename innerProduct<Tensor<Cmpt>, Vector<Cmpt>>::type
 operator&(const Tensor<Cmpt>& t, const Vector<Cmpt>& v)
 {
     return Vector<Cmpt>
@@ -387,7 +387,7 @@ operator&(const Tensor<Cmpt>& t, const Vector<Cmpt>& v)
 
 
 template<class Cmpt>
-inline typename innerProduct<Vector<Cmpt>, Tensor<Cmpt> >::type
+inline typename innerProduct<Vector<Cmpt>, Tensor<Cmpt>>::type
 operator&(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
 {
     return Vector<Cmpt>
@@ -400,7 +400,7 @@ operator&(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
 
 
 template<class Cmpt>
-inline typename outerProduct<Vector<Cmpt>, Vector<Cmpt> >::type
+inline typename outerProduct<Vector<Cmpt>, Vector<Cmpt>>::type
 operator*(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)
 {
     return Tensor<Cmpt>
@@ -413,7 +413,7 @@ operator*(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)
 
 
 template<class Cmpt>
-inline typename innerProduct<Vector<Cmpt>, Tensor<Cmpt> >::type
+inline typename innerProduct<Vector<Cmpt>, Tensor<Cmpt>>::type
 operator/(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
 {
     return inv(t) & v;
@@ -698,7 +698,7 @@ operator&&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
 
 
 template<class Cmpt>
-class typeOfSum<SphericalTensor<Cmpt>, Tensor<Cmpt> >
+class typeOfSum<SphericalTensor<Cmpt>, Tensor<Cmpt>>
 {
 public:
 
@@ -707,7 +707,7 @@ public:
 
 
 template<class Cmpt>
-class typeOfSum<Tensor<Cmpt>, SphericalTensor<Cmpt> >
+class typeOfSum<Tensor<Cmpt>, SphericalTensor<Cmpt>>
 {
 public:
 
@@ -716,7 +716,7 @@ public:
 
 
 template<class Cmpt>
-class innerProduct<SphericalTensor<Cmpt>, Tensor<Cmpt> >
+class innerProduct<SphericalTensor<Cmpt>, Tensor<Cmpt>>
 {
 public:
 
@@ -725,7 +725,7 @@ public:
 
 
 template<class Cmpt>
-class innerProduct<Tensor<Cmpt>, SphericalTensor<Cmpt> >
+class innerProduct<Tensor<Cmpt>, SphericalTensor<Cmpt>>
 {
 public:
 
@@ -860,7 +860,7 @@ operator&&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
 
 
 template<class Cmpt>
-class typeOfSum<SymmTensor<Cmpt>, Tensor<Cmpt> >
+class typeOfSum<SymmTensor<Cmpt>, Tensor<Cmpt>>
 {
 public:
 
@@ -869,7 +869,7 @@ public:
 
 
 template<class Cmpt>
-class typeOfSum<Tensor<Cmpt>, SymmTensor<Cmpt> >
+class typeOfSum<Tensor<Cmpt>, SymmTensor<Cmpt>>
 {
 public:
 
@@ -878,7 +878,7 @@ public:
 
 
 template<class Cmpt>
-class innerProduct<SymmTensor<Cmpt>, Tensor<Cmpt> >
+class innerProduct<SymmTensor<Cmpt>, Tensor<Cmpt>>
 {
 public:
 
@@ -887,7 +887,7 @@ public:
 
 
 template<class Cmpt>
-class innerProduct<Tensor<Cmpt>, SymmTensor<Cmpt> >
+class innerProduct<Tensor<Cmpt>, SymmTensor<Cmpt>>
 {
 public:
 
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
index f5ddd4d650..230ebe7005 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -188,7 +188,7 @@ inline void Tensor2D<Cmpt>::operator=(const SphericalTensor2D<Cmpt>& st)
 
 //- Inner-product between two tensors
 template<class Cmpt>
-inline typename innerProduct<Tensor2D<Cmpt>, Tensor2D<Cmpt> >::type
+inline typename innerProduct<Tensor2D<Cmpt>, Tensor2D<Cmpt>>::type
 operator&(const Tensor2D<Cmpt>& t1, const Tensor2D<Cmpt>& t2)
 {
     return Tensor2D<Cmpt>
@@ -203,7 +203,7 @@ operator&(const Tensor2D<Cmpt>& t1, const Tensor2D<Cmpt>& t2)
 
 //- Inner-product between a tensor and a vector
 template<class Cmpt>
-inline typename innerProduct<Tensor2D<Cmpt>, Vector2D<Cmpt> >::type
+inline typename innerProduct<Tensor2D<Cmpt>, Vector2D<Cmpt>>::type
 operator&(const Tensor2D<Cmpt>& t, const Vector2D<Cmpt>& v)
 {
     return Vector2D<Cmpt>
@@ -215,7 +215,7 @@ operator&(const Tensor2D<Cmpt>& t, const Vector2D<Cmpt>& v)
 
 //- Inner-product between a vector and a tensor
 template<class Cmpt>
-inline typename innerProduct<Vector2D<Cmpt>, Tensor2D<Cmpt> >::type
+inline typename innerProduct<Vector2D<Cmpt>, Tensor2D<Cmpt>>::type
 operator&(const Vector2D<Cmpt>& v, const Tensor2D<Cmpt>& t)
 {
     return Vector2D<Cmpt>
@@ -227,7 +227,7 @@ operator&(const Vector2D<Cmpt>& v, const Tensor2D<Cmpt>& t)
 
 //- Outer-product between two vectors
 template<class Cmpt>
-inline typename outerProduct<Vector2D<Cmpt>, Vector2D<Cmpt> >::type
+inline typename outerProduct<Vector2D<Cmpt>, Vector2D<Cmpt>>::type
 operator*(const Vector2D<Cmpt>& v1, const Vector2D<Cmpt>& v2)
 {
     return Tensor2D<Cmpt>
@@ -580,7 +580,7 @@ operator&&(const Tensor2D<Cmpt>& t1, const SymmTensor2D<Cmpt>& st2)
 
 
 template<class Cmpt>
-class typeOfSum<SphericalTensor2D<Cmpt>, Tensor2D<Cmpt> >
+class typeOfSum<SphericalTensor2D<Cmpt>, Tensor2D<Cmpt>>
 {
 public:
 
@@ -588,7 +588,7 @@ public:
 };
 
 template<class Cmpt>
-class typeOfSum<Tensor2D<Cmpt>, SphericalTensor2D<Cmpt> >
+class typeOfSum<Tensor2D<Cmpt>, SphericalTensor2D<Cmpt>>
 {
 public:
 
@@ -597,7 +597,7 @@ public:
 
 
 template<class Cmpt>
-class innerProduct<Tensor2D<Cmpt>, Tensor2D<Cmpt> >
+class innerProduct<Tensor2D<Cmpt>, Tensor2D<Cmpt>>
 {
 public:
 
@@ -605,7 +605,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<SphericalTensor2D<Cmpt>, Tensor2D<Cmpt> >
+class innerProduct<SphericalTensor2D<Cmpt>, Tensor2D<Cmpt>>
 {
 public:
 
@@ -613,7 +613,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<Tensor2D<Cmpt>, SphericalTensor2D<Cmpt> >
+class innerProduct<Tensor2D<Cmpt>, SphericalTensor2D<Cmpt>>
 {
 public:
 
@@ -621,7 +621,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<Tensor2D<Cmpt>, Vector2D<Cmpt> >
+class innerProduct<Tensor2D<Cmpt>, Vector2D<Cmpt>>
 {
 public:
 
@@ -629,7 +629,7 @@ public:
 };
 
 template<class Cmpt>
-class innerProduct<Vector2D<Cmpt>, Tensor2D<Cmpt> >
+class innerProduct<Vector2D<Cmpt>, Tensor2D<Cmpt>>
 {
 public:
 
@@ -638,7 +638,7 @@ public:
 
 
 template<class Cmpt>
-class outerProduct<Vector2D<Cmpt>, Vector2D<Cmpt> >
+class outerProduct<Vector2D<Cmpt>, Vector2D<Cmpt>>
 {
 public:
 
diff --git a/src/OpenFOAM/primitives/Vector/Vector.H b/src/OpenFOAM/primitives/Vector/Vector.H
index 8eda8e99ab..3cfa3e3c05 100644
--- a/src/OpenFOAM/primitives/Vector/Vector.H
+++ b/src/OpenFOAM/primitives/Vector/Vector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,7 +121,7 @@ public:
         //- Return *this (used for point which is a typedef to Vector<scalar>.
         inline const Vector<Cmpt>& centre
         (
-            const Foam::List<Vector<Cmpt> >&
+            const Foam::List<Vector<Cmpt>>&
         ) const;
 };
 
diff --git a/src/OpenFOAM/primitives/Vector/VectorI.H b/src/OpenFOAM/primitives/Vector/VectorI.H
index cf26a40722..1135e31c34 100644
--- a/src/OpenFOAM/primitives/Vector/VectorI.H
+++ b/src/OpenFOAM/primitives/Vector/VectorI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ inline Cmpt& Vector<Cmpt>::z()
 template<class Cmpt>
 inline const Vector<Cmpt>& Vector<Cmpt>::centre
 (
-    const Foam::List<Vector<Cmpt> >&
+    const Foam::List<Vector<Cmpt>>&
 )const
 {
     return *this;
@@ -114,7 +114,7 @@ inline const Vector<Cmpt>& Vector<Cmpt>::centre
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline typename innerProduct<Vector<Cmpt>, Vector<Cmpt> >::type
+inline typename innerProduct<Vector<Cmpt>, Vector<Cmpt>>::type
 operator&(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)
 {
     return Cmpt(v1.x()*v2.x() + v1.y()*v2.y() + v1.z()*v2.z());
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
index beb077485f..b3e5f6c63a 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ inline Cmpt& Vector2D<Cmpt>::y()
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline typename innerProduct<Vector2D<Cmpt>, Vector2D<Cmpt> >::type
+inline typename innerProduct<Vector2D<Cmpt>, Vector2D<Cmpt>>::type
 operator&(const Vector2D<Cmpt>& v1, const Vector2D<Cmpt>& v2)
 {
     return Cmpt(v1.x()*v2.x() + v1.y()*v2.y());
diff --git a/src/OpenFOAM/primitives/bools/lists/boolList.H b/src/OpenFOAM/primitives/bools/lists/boolList.H
index d53189c5bf..82c5ae27ab 100644
--- a/src/OpenFOAM/primitives/bools/lists/boolList.H
+++ b/src/OpenFOAM/primitives/bools/lists/boolList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ namespace Foam
     typedef UList<bool> boolUList;
 
     typedef List<bool> boolList;
-    typedef List<List<bool> > boolListList;
+    typedef List<List<bool>> boolListList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/contiguous/contiguous.H b/src/OpenFOAM/primitives/contiguous/contiguous.H
index 3567ac85c6..902af66dca 100644
--- a/src/OpenFOAM/primitives/contiguous/contiguous.H
+++ b/src/OpenFOAM/primitives/contiguous/contiguous.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,93 +60,93 @@ inline bool contiguous()                                   {return false;}
 template<>
 inline bool contiguous<bool>()                              {return true;}
 template<>
-inline bool contiguous<FixedList<bool, 2> >()               {return true;}
+inline bool contiguous<FixedList<bool, 2>>()               {return true;}
 template<>
-inline bool contiguous<Pair<bool> >()                       {return true;}
+inline bool contiguous<Pair<bool>>()                       {return true;}
 
 template<>
 inline bool contiguous<char>()                              {return true;}
 template<>
-inline bool contiguous<FixedList<char, 2> >()               {return true;}
+inline bool contiguous<FixedList<char, 2>>()               {return true;}
 template<>
-inline bool contiguous<Pair<char> >()                       {return true;}
+inline bool contiguous<Pair<char>>()                       {return true;}
 
 template<>
 inline bool contiguous<int8_t>()                            {return true;}
 template<>
-inline bool contiguous<FixedList<int8_t, 2> >()             {return true;}
+inline bool contiguous<FixedList<int8_t, 2>>()             {return true;}
 template<>
-inline bool contiguous<Pair<int8_t> >()                     {return true;}
+inline bool contiguous<Pair<int8_t>>()                     {return true;}
 
 template<>
 inline bool contiguous<uint8_t>()                           {return true;}
 template<>
-inline bool contiguous<FixedList<uint8_t, 2> >()            {return true;}
+inline bool contiguous<FixedList<uint8_t, 2>>()            {return true;}
 template<>
-inline bool contiguous<Pair<uint8_t> >()                    {return true;}
+inline bool contiguous<Pair<uint8_t>>()                    {return true;}
 
 template<>
 inline bool contiguous<int16_t>()                           {return true;}
 template<>
-inline bool contiguous<FixedList<int16_t, 2> >()            {return true;}
+inline bool contiguous<FixedList<int16_t, 2>>()            {return true;}
 template<>
-inline bool contiguous<Pair<int16_t> >()                    {return true;}
+inline bool contiguous<Pair<int16_t>>()                    {return true;}
 
 template<>
 inline bool contiguous<uint16_t>()                          {return true;}
 template<>
-inline bool contiguous<FixedList<uint16_t, 2> >()           {return true;}
+inline bool contiguous<FixedList<uint16_t, 2>>()           {return true;}
 template<>
-inline bool contiguous<Pair<uint16_t> >()                   {return true;}
+inline bool contiguous<Pair<uint16_t>>()                   {return true;}
 
 template<>
 inline bool contiguous<int32_t>()                           {return true;}
 template<>
-inline bool contiguous<FixedList<int32_t, 2> >()            {return true;}
+inline bool contiguous<FixedList<int32_t, 2>>()            {return true;}
 template<>
-inline bool contiguous<Pair<int32_t> >()                    {return true;}
+inline bool contiguous<Pair<int32_t>>()                    {return true;}
 
 template<>
 inline bool contiguous<uint32_t>()                          {return true;}
 template<>
-inline bool contiguous<FixedList<uint32_t, 2> >()           {return true;}
+inline bool contiguous<FixedList<uint32_t, 2>>()           {return true;}
 template<>
-inline bool contiguous<Pair<uint32_t> >()                   {return true;}
+inline bool contiguous<Pair<uint32_t>>()                   {return true;}
 
 template<>
 inline bool contiguous<int64_t>()                           {return true;}
 template<>
-inline bool contiguous<FixedList<int64_t, 2> >()            {return true;}
+inline bool contiguous<FixedList<int64_t, 2>>()            {return true;}
 template<>
-inline bool contiguous<Pair<int64_t> >()                    {return true;}
+inline bool contiguous<Pair<int64_t>>()                    {return true;}
 
 template<>
 inline bool contiguous<uint64_t>()                          {return true;}
 template<>
-inline bool contiguous<FixedList<uint64_t, 2> >()           {return true;}
+inline bool contiguous<FixedList<uint64_t, 2>>()           {return true;}
 template<>
-inline bool contiguous<Pair<uint64_t> >()                   {return true;}
+inline bool contiguous<Pair<uint64_t>>()                   {return true;}
 
 template<>
 inline bool contiguous<float>()                             {return true;}
 template<>
-inline bool contiguous<FixedList<float, 2> >()              {return true;}
+inline bool contiguous<FixedList<float, 2>>()              {return true;}
 template<>
-inline bool contiguous<Pair<float> >()                      {return true;}
+inline bool contiguous<Pair<float>>()                      {return true;}
 
 template<>
 inline bool contiguous<double>()                            {return true;}
 template<>
-inline bool contiguous<FixedList<double, 2> >()             {return true;}
+inline bool contiguous<FixedList<double, 2>>()             {return true;}
 template<>
-inline bool contiguous<Pair<double> >()                     {return true;}
+inline bool contiguous<Pair<double>>()                     {return true;}
 
 template<>
 inline bool contiguous<long double>()                       {return true;}
 template<>
-inline bool contiguous<FixedList<long double, 2> >()        {return true;}
+inline bool contiguous<FixedList<long double, 2>>()        {return true;}
 template<>
-inline bool contiguous<Pair<long double> >()                {return true;}
+inline bool contiguous<Pair<long double>>()                {return true;}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
index 4f3d1b12d3..7da4aad80d 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ void Foam::CSV<Type>::read()
             << exit(FatalIOError);
     }
 
-    DynamicList<Tuple2<scalar, Type> > values;
+    DynamicList<Tuple2<scalar, Type>> values;
 
     // skip header
     for (label i = 0; i < nHeaderLine_; i++)
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
index 1d0b0620e9..13566168bd 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,9 +137,9 @@ public:
         CSV(const CSV<Type>& tbl);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type> > clone() const
+        virtual tmp<DataEntry<Type>> clone() const
         {
-            return tmp<DataEntry<Type> >(new CSV<Type>(*this));
+            return tmp<DataEntry<Type>>(new CSV<Type>(*this));
         }
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H b/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H
index 8ce8d28170..682a3a562e 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,9 +94,9 @@ public:
         CompatibilityConstant(const CompatibilityConstant<Type>& cnst);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type> > clone() const
+        virtual tmp<DataEntry<Type>> clone() const
         {
-            return tmp<DataEntry<Type> >
+            return tmp<DataEntry<Type>>
             (
                 new CompatibilityConstant<Type>(*this)
             );
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
index 0c251fec03..c59da3becd 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,9 @@ public:
         Constant(const Constant<Type>& cnst);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type> > clone() const
+        virtual tmp<DataEntry<Type>> clone() const
         {
-            return tmp<DataEntry<Type> >(new Constant<Type>(*this));
+            return tmp<DataEntry<Type>>(new Constant<Type>(*this));
         }
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
index 51cea62185..3a4fb3aabf 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,12 +86,12 @@ Type Foam::DataEntry<Type>::integrate(const scalar x1, const scalar x2) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::DataEntry<Type>::value
+Foam::tmp<Foam::Field<Type>> Foam::DataEntry<Type>::value
 (
     const scalarField& x
 ) const
 {
-    tmp<Field<Type> > tfld(new Field<Type>(x.size()));
+    tmp<Field<Type>> tfld(new Field<Type>(x.size()));
     Field<Type>& fld = tfld();
 
     forAll(x, i)
@@ -103,13 +103,13 @@ Foam::tmp<Foam::Field<Type> > Foam::DataEntry<Type>::value
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::DataEntry<Type>::integrate
+Foam::tmp<Foam::Field<Type>> Foam::DataEntry<Type>::integrate
 (
     const scalarField& x1,
     const scalarField& x2
 ) const
 {
-    tmp<Field<Type> > tfld(new Field<Type>(x1.size()));
+    tmp<Field<Type>> tfld(new Field<Type>(x1.size()));
     Field<Type>& fld = tfld();
 
     forAll(x1, i)
@@ -144,23 +144,23 @@ Foam::dimensioned<Type> Foam::DataEntry<Type>::dimIntegrate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Foam::dimensioned<Type> > >
+Foam::tmp<Foam::Field<Foam::dimensioned<Type>>>
 Foam::DataEntry<Type>::dimValue
 (
     const scalarField& x
 ) const
 {
 
-    tmp<Field<dimensioned<Type> > > tfld
+    tmp<Field<dimensioned<Type>>> tfld
     (
-        new Field<dimensioned<Type> >
+        new Field<dimensioned<Type>>
         (
             x.size(),
             dimensioned<Type>("zero", dimless, pTraits<Type>::zero)
         )
     );
 
-    Field<dimensioned<Type> >& fld = tfld();
+    Field<dimensioned<Type>>& fld = tfld();
 
     forAll(x, i)
     {
@@ -171,19 +171,19 @@ Foam::DataEntry<Type>::dimValue
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Foam::dimensioned<Type> > >
+Foam::tmp<Foam::Field<Foam::dimensioned<Type>>>
 Foam::DataEntry<Type>::dimIntegrate
 (
     const scalarField& x1,
     const scalarField& x2
 ) const
 {
-    tmp<Field<dimensioned<Type> > > tfld
+    tmp<Field<dimensioned<Type>>> tfld
     (
-        new Field<dimensioned<Type> >(x1.size())
+        new Field<dimensioned<Type>>(x1.size())
     );
 
-    Field<dimensioned<Type> >& fld = tfld();
+    Field<dimensioned<Type>>& fld = tfld();
 
     forAll(x1, i)
     {
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
index a9b1686d58..7e3f6e4b91 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,14 +110,14 @@ public:
         DataEntry(const DataEntry<Type>& de);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type> > clone() const
+        virtual tmp<DataEntry<Type>> clone() const
         {
-            return tmp<DataEntry<Type> >(new DataEntry<Type>(*this));
+            return tmp<DataEntry<Type>>(new DataEntry<Type>(*this));
         }
 
 
     //- Selector
-    static autoPtr<DataEntry<Type> > New
+    static autoPtr<DataEntry<Type>> New
     (
         const word& entryName,
         const dictionary& dict
@@ -148,13 +148,13 @@ public:
             virtual Type value(const scalar x) const;
 
             //- Return value as a function of (scalar) independent variable
-            virtual tmp<Field<Type> > value(const scalarField& x) const;
+            virtual tmp<Field<Type>> value(const scalarField& x) const;
 
             //- Integrate between two (scalar) values
             virtual Type integrate(const scalar x1, const scalar x2) const;
 
             //- Integrate between two (scalar) values
-            virtual tmp<Field<Type> > integrate
+            virtual tmp<Field<Type>> integrate
             (
                 const scalarField& x1,
                 const scalarField& x2
@@ -164,7 +164,7 @@ public:
             virtual dimensioned<Type> dimValue(const scalar x) const;
 
             //- Return dimensioned type as a function of (scalar)
-            virtual tmp<Field<dimensioned<Type> > > dimValue
+            virtual tmp<Field<dimensioned<Type>>> dimValue
             (
                 const scalarField& x
             ) const;
@@ -178,7 +178,7 @@ public:
 
             //- Integrate between two scalar fields and return a field of
             //  dimensioned type
-            virtual tmp<Field<dimensioned<Type> > > dimIntegrate
+            virtual tmp<Field<dimensioned<Type>>> dimIntegrate
             (
                 const scalarField& x1,
                 const scalarField& x2
@@ -220,7 +220,7 @@ public:
                                                                               \
     defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                         \
                                                                               \
-    DataEntry<Type>::adddictionaryConstructorToTable<SS<Type> >               \
+    DataEntry<Type>::adddictionaryConstructorToTable<SS<Type>>               \
         add##SS##Type##ConstructorToTable_;
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
index e2edd026fd..6a0269e0ed 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
+Foam::autoPtr<Foam::DataEntry<Type>> Foam::DataEntry<Type>::New
 (
     const word& entryName,
     const dictionary& dict
@@ -71,7 +71,7 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
             << exit(FatalError);
     }
 
-    return autoPtr<DataEntry<Type> >(cstrIter()(entryName, dict));
+    return autoPtr<DataEntry<Type>>(cstrIter()(entryName, dict));
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
index 7479702cdf..f5d312f7df 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ template<class Type>
 Foam::PolynomialEntry<Type>::PolynomialEntry
 (
     const word& entryName,
-    const List<Tuple2<Type, Type> >& coeffs
+    const List<Tuple2<Type, Type>>& coeffs
 )
 :
     DataEntry<Type>(entryName),
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
index f5a783139f..5bb2411546 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ class PolynomialEntry
     // Private data
 
         //- PolynomialEntry coefficients - list of prefactor, exponent
-        List<Tuple2<Type, Type> > coeffs_;
+        List<Tuple2<Type, Type>> coeffs_;
 
         //- Flag to indicate whether poly can be integrated
         bool canIntegrate_;
@@ -105,16 +105,16 @@ public:
         PolynomialEntry
         (
             const word& entryName,
-            const List<Tuple2<Type, Type> >&
+            const List<Tuple2<Type, Type>>&
         );
 
         //- Copy constructor
         PolynomialEntry(const PolynomialEntry& poly);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type> > clone() const
+        virtual tmp<DataEntry<Type>> clone() const
         {
-            return tmp<DataEntry<Type> >(new PolynomialEntry(*this));
+            return tmp<DataEntry<Type>>(new PolynomialEntry(*this));
         }
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
index 9f45b69d15..0ae210f32b 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,9 @@ public:
         Table(const Table<Type>& tbl);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type> > clone() const
+        virtual tmp<DataEntry<Type>> clone() const
         {
-            return tmp<DataEntry<Type> >(new Table<Type>(*this));
+            return tmp<DataEntry<Type>>(new Table<Type>(*this));
         }
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
index 8d781f541f..e807adad97 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -408,9 +408,9 @@ Foam::tmp<Foam::scalarField> Foam::TableBase<Type>::x() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::TableBase<Type>::y() const
+Foam::tmp<Foam::Field<Type>> Foam::TableBase<Type>::y() const
 {
-    tmp<Field<Type> > tfld(new Field<Type>(table_.size(), pTraits<Type>::zero));
+    tmp<Field<Type>> tfld(new Field<Type>(table_.size(), pTraits<Type>::zero));
     Field<Type>& fld = tfld();
 
     forAll(table_, i)
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
index df7542e6fd..c924c8c892 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ protected:
         const word interpolationScheme_;
 
         //- Table data
-        List<Tuple2<scalar, Type> > table_;
+        List<Tuple2<scalar, Type>> table_;
 
         //- The dimension set
         dimensionSet dimensions_;
@@ -178,7 +178,7 @@ public:
         virtual tmp<scalarField> x() const;
 
         //- Return the dependent values
-        virtual tmp<Field<Type> > y() const;
+        virtual tmp<Field<Type>> y() const;
 
 
     // I/O
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
index dc34c00e79..6f519773f1 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,9 +111,9 @@ public:
         TableFile(const TableFile<Type>& tbl);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type> > clone() const
+        virtual tmp<DataEntry<Type>> clone() const
         {
-            return tmp<DataEntry<Type> >(new TableFile<Type>(*this));
+            return tmp<DataEntry<Type>>(new TableFile<Type>(*this));
         }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
index 6d0d874cef..0b24c9578f 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Foam::Ostream& Foam::operator<<
 )
 {
     os  << static_cast
-            <VectorSpace<Polynomial<PolySize>, scalar, PolySize> >(poly);
+            <VectorSpace<Polynomial<PolySize>, scalar, PolySize>>(poly);
 
     // Check state of Ostream
     os.check
diff --git a/src/OpenFOAM/primitives/functions/TimeDataEntry/TimeDataEntry/TimeDataEntry.H b/src/OpenFOAM/primitives/functions/TimeDataEntry/TimeDataEntry/TimeDataEntry.H
index 2cbe1a6115..1b5ee544cd 100644
--- a/src/OpenFOAM/primitives/functions/TimeDataEntry/TimeDataEntry/TimeDataEntry.H
+++ b/src/OpenFOAM/primitives/functions/TimeDataEntry/TimeDataEntry/TimeDataEntry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ protected:
         const word name_;
 
         //- The underlying DataEntry
-        autoPtr<DataEntry<Type> > entry_;
+        autoPtr<DataEntry<Type>> entry_;
 
 
 public:
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
index 178898eb07..3ca3a0e4c7 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -234,7 +234,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
 
     // Collect transforms on master
 
-    List<List<vectorTensorTransform> > allTransforms(Pstream::nProcs());
+    List<List<vectorTensorTransform>> allTransforms(Pstream::nProcs());
     allTransforms[Pstream::myProcNo()] = transforms_;
     Pstream::gatherList(allTransforms);
 
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
index b0698ad673..ccfb5d51c2 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ private:
         //- Mapping from patch index to which transform it matches (or
         //  -1 for none) (.first()) and what sign to use for it,
         //  i.e. +/- 1 (.second()).
-        List<Pair<label> > patchTransformSign_;
+        List<Pair<label>> patchTransformSign_;
 
 
     // Private static data
@@ -264,7 +264,7 @@ public:
             inline label nullTransformIndex() const;
 
             //- Return access to the per-patch transform-sign pairs
-            inline const List<Pair<label> >& patchTransformSign() const;
+            inline const List<Pair<label>>& patchTransformSign() const;
 
             //- Access the overall (permuted) transform corresponding
             //  to the transformIndex
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
index 5ce965ea48..ddd43327ef 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -432,7 +432,7 @@ Foam::label Foam::globalIndexAndTransform::nullTransformIndex() const
 }
 
 
-const Foam::List<Foam::Pair<Foam::label> >&
+const Foam::List<Foam::Pair<Foam::label>>&
 Foam::globalIndexAndTransform::patchTransformSign() const
 {
     return patchTransformSign_;
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
index 8605fee30a..9f06005074 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ Foam::word Foam::name(const vectorTensorTransform& s)
 
 
 template<>
-Foam::tmp<Foam::Field<bool> > Foam::vectorTensorTransform::transform
+Foam::tmp<Foam::Field<bool>> Foam::vectorTensorTransform::transform
 (
     const Field<bool>& fld
 ) const
@@ -77,7 +77,7 @@ Foam::tmp<Foam::Field<bool> > Foam::vectorTensorTransform::transform
     return fld;
 }
 template<>
-Foam::tmp<Foam::Field<Foam::label> > Foam::vectorTensorTransform::transform
+Foam::tmp<Foam::Field<Foam::label>> Foam::vectorTensorTransform::transform
 (
     const Field<label>& fld
 ) const
@@ -85,7 +85,7 @@ Foam::tmp<Foam::Field<Foam::label> > Foam::vectorTensorTransform::transform
     return fld;
 }
 template<>
-Foam::tmp<Foam::Field<Foam::scalar> > Foam::vectorTensorTransform::transform
+Foam::tmp<Foam::Field<Foam::scalar>> Foam::vectorTensorTransform::transform
 (
     const Field<scalar>& fld
 ) const
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H
index 1006784e17..d56741a79b 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,7 +146,7 @@ public:
 
             //- Transform the given field
             template<class Type>
-            tmp<Field<Type> > transform(const Field<Type>&) const;
+            tmp<Field<Type>> transform(const Field<Type>&) const;
 
 
     // Member operators
@@ -186,11 +186,11 @@ inline bool contiguous<vectorTensorTransform>() {return true;}
 
 //- Template specialisations
 template<>
-tmp<Field<bool> > vectorTensorTransform::transform(const Field<bool>&) const;
+tmp<Field<bool>> vectorTensorTransform::transform(const Field<bool>&) const;
 template<>
-tmp<Field<label> > vectorTensorTransform::transform(const Field<label>&) const;
+tmp<Field<label>> vectorTensorTransform::transform(const Field<label>&) const;
 template<>
-tmp<Field<scalar> > vectorTensorTransform::transform(const Field<scalar>&)
+tmp<Field<scalar>> vectorTensorTransform::transform(const Field<scalar>&)
 const;
 
 
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformTemplates.C b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformTemplates.C
index fe964ea0fd..6878a6123c 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformTemplates.C
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::vectorTensorTransform::transform
+Foam::tmp<Foam::Field<Type>> Foam::vectorTensorTransform::transform
 (
     const Field<Type>& fld
 ) const
diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C
index 92b7aa226e..3b2b1d7100 100644
--- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ CompressibleTurbulenceModel
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class TransportModel>
-Foam::autoPtr<Foam::CompressibleTurbulenceModel<TransportModel> >
+Foam::autoPtr<Foam::CompressibleTurbulenceModel<TransportModel>>
 Foam::CompressibleTurbulenceModel<TransportModel>::New
 (
     const volScalarField& rho,
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
index 487582a8d5..baaa6070ff 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::ThermalDiffusivity
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-Foam::autoPtr<Foam::ThermalDiffusivity<BasicTurbulenceModel> >
+Foam::autoPtr<Foam::ThermalDiffusivity<BasicTurbulenceModel>>
 Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
 (
     const alphaField& alpha,
@@ -87,7 +87,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
 
 
 template<class BasicTurbulenceModel>
-Foam::autoPtr<Foam::ThermalDiffusivity<BasicTurbulenceModel> >
+Foam::autoPtr<Foam::ThermalDiffusivity<BasicTurbulenceModel>>
 Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
 (
     const volScalarField& rho,
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
index 84404f7625..8d192f9970 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -178,22 +178,22 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData
     {
         int tag = Pstream::msgType() + 1;
 
-        List<Field<scalar> > magSfs(Pstream::nProcs());
+        List<Field<scalar>> magSfs(Pstream::nProcs());
         magSfs[Pstream::myProcNo()].setSize(this->patch().size());
         magSfs[Pstream::myProcNo()] = this->patch().magSf();
         Pstream::gatherList(magSfs, tag);
 
-        List<Field<scalar> > values(Pstream::nProcs());
+        List<Field<scalar>> values(Pstream::nProcs());
         values[Pstream::myProcNo()].setSize(this->patch().size());
         values[Pstream::myProcNo()] = Tp;
         Pstream::gatherList(values, tag);
 
-        List<Field<scalar> > qDots(Pstream::nProcs());
+        List<Field<scalar>> qDots(Pstream::nProcs());
         qDots[Pstream::myProcNo()].setSize(this->patch().size());
         qDots[Pstream::myProcNo()] = qDot;
         Pstream::gatherList(qDots, tag);
 
-        List<Field<scalar> > htcs(Pstream::nProcs());
+        List<Field<scalar>> htcs(Pstream::nProcs());
         htcs[Pstream::myProcNo()].setSize(this->patch().size());
         htcs[Pstream::myProcNo()] = htc;
         Pstream::gatherList(htcs, tag);
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
index 763f285560..ae2e3d4fbb 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -172,9 +172,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<scalar> > clone() const
+        virtual tmp<fvPatchField<scalar>> clone() const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new externalCoupledTemperatureMixedFvPatchScalarField(*this)
             );
@@ -188,12 +188,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<scalar> > clone
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new externalCoupledTemperatureMixedFvPatchScalarField
                 (
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index d3d5116348..576793f6aa 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,10 +154,10 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs()
 
     const label patchI = patch().index();
 
-    const LESModel<EddyDiffusivity<compressible::turbulenceModel> >& turbModel =
+    const LESModel<EddyDiffusivity<compressible::turbulenceModel>>& turbModel =
         db().lookupObject
         <
-            LESModel<EddyDiffusivity<compressible::turbulenceModel> >
+            LESModel<EddyDiffusivity<compressible::turbulenceModel>>
         >
         (
             IOobject::groupName
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
index a6313f71ae..2a54af8c40 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,9 +106,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<scalar> > clone() const
+        virtual tmp<fvPatchField<scalar>> clone() const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new
                 totalFlowRateAdvectiveDiffusiveFvPatchScalarField(*this)
@@ -123,12 +123,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<scalar> > clone
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new
                 totalFlowRateAdvectiveDiffusiveFvPatchScalarField
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
index d4c21d4b96..33d479fb93 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ License
             dictionary                                                         \
         );                                                                     \
                                                                                \
-        typedef TDModel<BaseModel<Transport> >                                 \
+        typedef TDModel<BaseModel<Transport>>                                 \
             Transport##BaseModel;                                              \
                                                                                \
                                                                                \
@@ -60,7 +60,7 @@ License
         );                                                                     \
                                                                                \
                                                                                \
-        typedef RASModel<EddyDiffusivity<Transport##BaseModel> >               \
+        typedef RASModel<EddyDiffusivity<Transport##BaseModel>>               \
             RAS##Transport##BaseModel;                                         \
                                                                                \
         defineNamedTemplateTypeNameAndDebug(RAS##Transport##BaseModel, 0);     \
@@ -76,7 +76,7 @@ License
         );                                                                     \
                                                                                \
                                                                                \
-        typedef LESModel<EddyDiffusivity<Transport##BaseModel> >               \
+        typedef LESModel<EddyDiffusivity<Transport##BaseModel>>               \
             LES##Transport##BaseModel;                                         \
                                                                                \
         defineNamedTemplateTypeNameAndDebug(LES##Transport##BaseModel, 0);     \
@@ -94,7 +94,7 @@ License
 
 
 #define makeTemplatedTurbulenceModel(BaseModel, SType, Type)                   \
-    typedef Foam::SType##Models::Type<Foam::EddyDiffusivity<Foam::BaseModel> > \
+    typedef Foam::SType##Models::Type<Foam::EddyDiffusivity<Foam::BaseModel>> \
         Type##SType##BaseModel;                                                \
     defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0);            \
                                                                                \
@@ -102,7 +102,7 @@ License
     {                                                                          \
         namespace SType##Models                                                \
         {                                                                      \
-            typedef Type<EddyDiffusivity<BaseModel> > Type##SType##BaseModel;  \
+            typedef Type<EddyDiffusivity<BaseModel>> Type##SType##BaseModel;  \
                                                                                \
             addToRunTimeSelectionTable                                         \
             (                                                                  \
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
index 9420f89864..0be10e1b0e 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,11 +56,11 @@ namespace Foam
 {
     namespace compressible
     {
-        typedef ThermalDiffusivity<CompressibleTurbulenceModel<fluidThermo> >
+        typedef ThermalDiffusivity<CompressibleTurbulenceModel<fluidThermo>>
             turbulenceModel;
 
-        typedef RASModel<EddyDiffusivity<turbulenceModel> > RASModel;
-        typedef LESModel<EddyDiffusivity<turbulenceModel> > LESModel;
+        typedef RASModel<EddyDiffusivity<turbulenceModel>> RASModel;
+        typedef LESModel<EddyDiffusivity<turbulenceModel>> LESModel;
 
         template<class BasicCompressibleTurbulenceModel>
         autoPtr<BasicCompressibleTurbulenceModel> New
diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C
index 2da3007b12..253b1a0cb0 100644
--- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ IncompressibleTurbulenceModel
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class TransportModel>
-Foam::autoPtr<Foam::IncompressibleTurbulenceModel<TransportModel> >
+Foam::autoPtr<Foam::IncompressibleTurbulenceModel<TransportModel>>
 Foam::IncompressibleTurbulenceModel<TransportModel>::New
 (
     const volVectorField& U,
diff --git a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
index 212ec4da2e..12e23ea702 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
+++ b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,7 +138,7 @@ NicenoKEqn<BasicTurbulenceModel>::gasTurbulence() const
 
         gasTurbulencePtr_ =
            &U.db()
-           .lookupObject<PhaseCompressibleTurbulenceModel<transportModel> >
+           .lookupObject<PhaseCompressibleTurbulenceModel<transportModel>>
             (
                 IOobject::groupName
                 (
diff --git a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
index 24a5aaa70f..c682d0b29a 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
+++ b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ SmagorinskyZhang<BasicTurbulenceModel>::gasTurbulence() const
 
         gasTurbulencePtr_ =
            &U.db()
-           .lookupObject<PhaseCompressibleTurbulenceModel<transportModel> >
+           .lookupObject<PhaseCompressibleTurbulenceModel<transportModel>>
             (
                 IOobject::groupName
                 (
diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C
index a09689d068..b78cdb4f5e 100644
--- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ PhaseCompressibleTurbulenceModel
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class TransportModel>
-Foam::autoPtr<Foam::PhaseCompressibleTurbulenceModel<TransportModel> >
+Foam::autoPtr<Foam::PhaseCompressibleTurbulenceModel<TransportModel>>
 Foam::PhaseCompressibleTurbulenceModel<TransportModel>::New
 (
     const volScalarField& alpha,
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
index f70d750ee0..7d923e013f 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,7 +149,7 @@ LaheyKEpsilon<BasicTurbulenceModel>::gasTurbulence() const
 
         gasTurbulencePtr_ =
            &U.db()
-           .lookupObject<PhaseCompressibleTurbulenceModel<transportModel> >
+           .lookupObject<PhaseCompressibleTurbulenceModel<transportModel>>
             (
                 IOobject::groupName
                 (
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
index f65de4583d..25e47992f2 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ kOmegaSSTSato<BasicTurbulenceModel>::gasTurbulence() const
 
         gasTurbulencePtr_ =
            &U.db()
-           .lookupObject<PhaseCompressibleTurbulenceModel<transportModel> >
+           .lookupObject<PhaseCompressibleTurbulenceModel<transportModel>>
             (
                 IOobject::groupName
                 (
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
index c65a63cb40..8c0e6b5984 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
     const word& type
 )
 :
-    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    eddyViscosity<RASModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -311,7 +311,7 @@ void mixtureKEpsilon<BasicTurbulenceModel>::initMixtureFields()
 template<class BasicTurbulenceModel>
 bool mixtureKEpsilon<BasicTurbulenceModel>::read()
 {
-    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
+    if (eddyViscosity<RASModel<BasicTurbulenceModel>>::read())
     {
         Cmu_.readIfPresent(this->coeffDict());
         C1_.readIfPresent(this->coeffDict());
@@ -357,7 +357,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::liquidTurbulence() const
         liquidTurbulencePtr_ =
            &const_cast<mixtureKEpsilon<BasicTurbulenceModel>&>
             (
-                U.db().lookupObject<mixtureKEpsilon<BasicTurbulenceModel> >
+                U.db().lookupObject<mixtureKEpsilon<BasicTurbulenceModel>>
                 (
                     IOobject::groupName
                     (
@@ -580,7 +580,7 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
 
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
+    eddyViscosity<RASModel<BasicTurbulenceModel>>::correct();
 
     // Update the effective mixture density
     rhom = this->rhom();
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
index 27773a0c6a..1bf8985e91 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ namespace RASModels
 template<class BasicTurbulenceModel>
 class mixtureKEpsilon
 :
-    public eddyViscosity<RASModel<BasicTurbulenceModel> >
+    public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
     // Private data
 
diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C
index f563357970..aadd2aac26 100644
--- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ PhaseIncompressibleTurbulenceModel
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class TransportModel>
-Foam::autoPtr<Foam::PhaseIncompressibleTurbulenceModel<TransportModel> >
+Foam::autoPtr<Foam::PhaseIncompressibleTurbulenceModel<TransportModel>>
 Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::New
 (
     const volScalarField& alpha,
diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
index 921ed47cf9..40f670e36a 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ DeardorffDiffStress<BasicTurbulenceModel>::DeardorffDiffStress
     const word& type
 )
 :
-    ReynoldsStress<LESModel<BasicTurbulenceModel> >
+    ReynoldsStress<LESModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -123,7 +123,7 @@ DeardorffDiffStress<BasicTurbulenceModel>::DeardorffDiffStress
 template<class BasicTurbulenceModel>
 bool DeardorffDiffStress<BasicTurbulenceModel>::read()
 {
-    if (ReynoldsStress<LESModel<BasicTurbulenceModel> >::read())
+    if (ReynoldsStress<LESModel<BasicTurbulenceModel>>::read())
     {
         Ck_.readIfPresent(this->coeffDict());
         Cm_.readIfPresent(this->coeffDict());
@@ -178,7 +178,7 @@ void DeardorffDiffStress<BasicTurbulenceModel>::correct()
     volSymmTensorField& R = this->R_;
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    ReynoldsStress<LESModel<BasicTurbulenceModel> >::correct();
+    ReynoldsStress<LESModel<BasicTurbulenceModel>>::correct();
 
     tmp<volTensorField> tgradU(fvc::grad(U));
     const volTensorField& gradU = tgradU();
diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
index 08b3eadb82..241c4598f8 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ namespace LESModels
 template<class BasicTurbulenceModel>
 class DeardorffDiffStress
 :
-    public ReynoldsStress<LESModel<BasicTurbulenceModel> >
+    public ReynoldsStress<LESModel<BasicTurbulenceModel>>
 {
     // Private Member Functions
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
index afb9719c34..319febe26f 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,7 +99,7 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-Foam::autoPtr<Foam::LESModel<BasicTurbulenceModel> >
+Foam::autoPtr<Foam::LESModel<BasicTurbulenceModel>>
 Foam::LESModel<BasicTurbulenceModel>::New
 (
     const alphaField& alpha,
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C
index 2a58c71e35..13416d2357 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ LESeddyViscosity<BasicTurbulenceModel>::LESeddyViscosity
     const word& propertiesName
 )
 :
-    eddyViscosity<LESModel<BasicTurbulenceModel> >
+    eddyViscosity<LESModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -76,7 +76,7 @@ LESeddyViscosity<BasicTurbulenceModel>::LESeddyViscosity
 template<class BasicTurbulenceModel>
 bool LESeddyViscosity<BasicTurbulenceModel>::read()
 {
-    if (eddyViscosity<LESModel<BasicTurbulenceModel> >::read())
+    if (eddyViscosity<LESModel<BasicTurbulenceModel>>::read())
     {
         Ce_.readIfPresent(this->coeffDict());
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
index 1a71e556bf..f2ac98f60e 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ namespace LESModels
 template<class BasicTurbulenceModel>
 class LESeddyViscosity
 :
-    public eddyViscosity<LESModel<BasicTurbulenceModel> >
+    public eddyViscosity<LESModel<BasicTurbulenceModel>>
 {
     // Private Member Functions
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
index a955b9a205..63625919d8 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ LRR<BasicTurbulenceModel>::LRR
     const word& type
 )
 :
-    ReynoldsStress<RASModel<BasicTurbulenceModel> >
+    ReynoldsStress<RASModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -216,7 +216,7 @@ LRR<BasicTurbulenceModel>::LRR
 template<class BasicTurbulenceModel>
 bool LRR<BasicTurbulenceModel>::read()
 {
-    if (ReynoldsStress<RASModel<BasicTurbulenceModel> >::read())
+    if (ReynoldsStress<RASModel<BasicTurbulenceModel>>::read())
     {
         Cmu_.readIfPresent(this->coeffDict());
         C1_.readIfPresent(this->coeffDict());
@@ -284,7 +284,7 @@ void LRR<BasicTurbulenceModel>::correct()
     volSymmTensorField& R = this->R_;
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    ReynoldsStress<RASModel<BasicTurbulenceModel> >::correct();
+    ReynoldsStress<RASModel<BasicTurbulenceModel>>::correct();
 
     tmp<volTensorField> tgradU(fvc::grad(U));
     const volTensorField& gradU = tgradU();
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
index 68c9bd2d7d..8ebdb31b46 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ namespace RASModels
 template<class BasicTurbulenceModel>
 class LRR
 :
-    public ReynoldsStress<RASModel<BasicTurbulenceModel> >
+    public ReynoldsStress<RASModel<BasicTurbulenceModel>>
 {
     // Private Member Functions
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index e5fa331c72..c69c7b13c4 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
     const word& type
 )
 :
-    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    eddyViscosity<RASModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -216,7 +216,7 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
 template<class BasicTurbulenceModel>
 bool LaunderSharmaKE<BasicTurbulenceModel>::read()
 {
-    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
+    if (eddyViscosity<RASModel<BasicTurbulenceModel>>::read())
     {
         Cmu_.readIfPresent(this->coeffDict());
         C1_.readIfPresent(this->coeffDict());
@@ -250,7 +250,7 @@ void LaunderSharmaKE<BasicTurbulenceModel>::correct()
     volScalarField& nut = this->nut_;
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
+    eddyViscosity<RASModel<BasicTurbulenceModel>>::correct();
 
     volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index df2bbc0f5d..09614303d2 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ namespace RASModels
 template<class BasicTurbulenceModel>
 class LaunderSharmaKE
 :
-    public eddyViscosity<RASModel<BasicTurbulenceModel> >
+    public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
     // Private Member Functions
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
index e55e79f4d4..d95f2bffb3 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-Foam::autoPtr<Foam::RASModel<BasicTurbulenceModel> >
+Foam::autoPtr<Foam::RASModel<BasicTurbulenceModel>>
 Foam::RASModel<BasicTurbulenceModel>::New
 (
     const alphaField& alpha,
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
index cc473482bb..c88dffbc84 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
     const word& type
 )
 :
-    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    eddyViscosity<RASModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -217,7 +217,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
 template<class BasicTurbulenceModel>
 bool RNGkEpsilon<BasicTurbulenceModel>::read()
 {
-    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
+    if (eddyViscosity<RASModel<BasicTurbulenceModel>>::read())
     {
         Cmu_.readIfPresent(this->coeffDict());
         C1_.readIfPresent(this->coeffDict());
@@ -253,7 +253,7 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
     volScalarField& nut = this->nut_;
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
+    eddyViscosity<RASModel<BasicTurbulenceModel>>::correct();
 
     volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
index 23d60ac788..de28164e96 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ namespace RASModels
 template<class BasicTurbulenceModel>
 class RNGkEpsilon
 :
-    public eddyViscosity<RASModel<BasicTurbulenceModel> >
+    public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
     // Private Member Functions
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
index 3e30c1fbed..dc8815d8f3 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ SSG<BasicTurbulenceModel>::SSG
     const word& type
 )
 :
-    ReynoldsStress<RASModel<BasicTurbulenceModel> >
+    ReynoldsStress<RASModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -225,7 +225,7 @@ SSG<BasicTurbulenceModel>::SSG
 template<class BasicTurbulenceModel>
 bool SSG<BasicTurbulenceModel>::read()
 {
-    if (ReynoldsStress<RASModel<BasicTurbulenceModel> >::read())
+    if (ReynoldsStress<RASModel<BasicTurbulenceModel>>::read())
     {
         Cmu_.readIfPresent(this->coeffDict());
         C1_.readIfPresent(this->coeffDict());
@@ -294,7 +294,7 @@ void SSG<BasicTurbulenceModel>::correct()
     volSymmTensorField& R = this->R_;
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    ReynoldsStress<RASModel<BasicTurbulenceModel> >::correct();
+    ReynoldsStress<RASModel<BasicTurbulenceModel>>::correct();
 
     tmp<volTensorField> tgradU(fvc::grad(U));
     const volTensorField& gradU = tgradU();
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
index a0977fba60..ac8cfb05f8 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ namespace RASModels
 template<class BasicTurbulenceModel>
 class SSG
 :
-    public ReynoldsStress<RASModel<BasicTurbulenceModel> >
+    public ReynoldsStress<RASModel<BasicTurbulenceModel>>
 {
     // Private Member Functions
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
index 0883ea88e5..23446bc657 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,7 +153,7 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
     const word& type
 )
 :
-    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    eddyViscosity<RASModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -267,7 +267,7 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
 template<class BasicTurbulenceModel>
 bool SpalartAllmaras<BasicTurbulenceModel>::read()
 {
-    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
+    if (eddyViscosity<RASModel<BasicTurbulenceModel>>::read())
     {
         sigmaNut_.readIfPresent(this->coeffDict());
         kappa_.readIfPresent(this->coeffDict());
@@ -358,7 +358,7 @@ void SpalartAllmaras<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
+    eddyViscosity<RASModel<BasicTurbulenceModel>>::correct();
 
     const volScalarField chi(this->chi());
     const volScalarField fv1(this->fv1(chi));
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
index 51d303361c..e4d123e1af 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ namespace RASModels
 template<class BasicTurbulenceModel>
 class SpalartAllmaras
 :
-    public eddyViscosity<RASModel<BasicTurbulenceModel> >
+    public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
     // Private Member Functions
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
index 1340268835..2fd57bbc3f 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
     const word& type
 )
 :
-    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    eddyViscosity<RASModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -199,7 +199,7 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
 template<class BasicTurbulenceModel>
 bool kEpsilon<BasicTurbulenceModel>::read()
 {
-    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
+    if (eddyViscosity<RASModel<BasicTurbulenceModel>>::read())
     {
         Cmu_.readIfPresent(this->coeffDict());
         C1_.readIfPresent(this->coeffDict());
@@ -233,7 +233,7 @@ void kEpsilon<BasicTurbulenceModel>::correct()
     volScalarField& nut = this->nut_;
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
+    eddyViscosity<RASModel<BasicTurbulenceModel>>::correct();
 
     volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
index ace0d15ce4..f7690b6aa9 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ namespace RASModels
 template<class BasicTurbulenceModel>
 class kEpsilon
 :
-    public eddyViscosity<RASModel<BasicTurbulenceModel> >
+    public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
     // Private Member Functions
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
index 81a986b07a..0a45b35325 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ kOmega<BasicTurbulenceModel>::kOmega
     const word& type
 )
 :
-    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    eddyViscosity<RASModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -160,7 +160,7 @@ kOmega<BasicTurbulenceModel>::kOmega
 template<class BasicTurbulenceModel>
 bool kOmega<BasicTurbulenceModel>::read()
 {
-    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
+    if (eddyViscosity<RASModel<BasicTurbulenceModel>>::read())
     {
         Cmu_.readIfPresent(this->coeffDict());
         beta_.readIfPresent(this->coeffDict());
@@ -193,7 +193,7 @@ void kOmega<BasicTurbulenceModel>::correct()
     volScalarField& nut = this->nut_;
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
+    eddyViscosity<RASModel<BasicTurbulenceModel>>::correct();
 
     volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H
index 5c297a02d4..fd3f7b79a7 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ namespace RASModels
 template<class BasicTurbulenceModel>
 class kOmega
 :
-    public eddyViscosity<RASModel<BasicTurbulenceModel> >
+    public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
index 3255ff3411..ffbb4cb895 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -190,7 +190,7 @@ kOmegaSST<BasicTurbulenceModel>::kOmegaSST
     const word& type
 )
 :
-    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    eddyViscosity<RASModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -362,7 +362,7 @@ kOmegaSST<BasicTurbulenceModel>::kOmegaSST
 template<class BasicTurbulenceModel>
 bool kOmegaSST<BasicTurbulenceModel>::read()
 {
-    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
+    if (eddyViscosity<RASModel<BasicTurbulenceModel>>::read())
     {
         alphaK1_.readIfPresent(this->coeffDict());
         alphaK2_.readIfPresent(this->coeffDict());
@@ -403,7 +403,7 @@ void kOmegaSST<BasicTurbulenceModel>::correct()
     volScalarField& nut = this->nut_;
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
+    eddyViscosity<RASModel<BasicTurbulenceModel>>::correct();
 
     volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
index 1bbbedc91d..b784dc5b5f 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,7 +120,7 @@ namespace RASModels
 template<class BasicTurbulenceModel>
 class kOmegaSST
 :
-    public eddyViscosity<RASModel<BasicTurbulenceModel> >
+    public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
     // Private Member Functions
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
index d955b973ef..f5b7dcf76a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -140,7 +140,7 @@ realizableKE<BasicTurbulenceModel>::realizableKE
     const word& type
 )
 :
-    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    eddyViscosity<RASModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -238,7 +238,7 @@ realizableKE<BasicTurbulenceModel>::realizableKE
 template<class BasicTurbulenceModel>
 bool realizableKE<BasicTurbulenceModel>::read()
 {
-    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
+    if (eddyViscosity<RASModel<BasicTurbulenceModel>>::read())
     {
         Cmu_.readIfPresent(this->coeffDict());
         A0_.readIfPresent(this->coeffDict());
@@ -271,7 +271,7 @@ void realizableKE<BasicTurbulenceModel>::correct()
     volScalarField& nut = this->nut_;
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
+    eddyViscosity<RASModel<BasicTurbulenceModel>>::correct();
 
     volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H
index b68f257ec5..e9640e92d2 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ namespace RASModels
 template<class BasicTurbulenceModel>
 class realizableKE
 :
-    public eddyViscosity<RASModel<BasicTurbulenceModel> >
+    public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
index 7d92909849..84b12dc1b8 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ v2f<BasicTurbulenceModel>::v2f
     const word& type
 )
 :
-    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    eddyViscosity<RASModel<BasicTurbulenceModel>>
     (
         type,
         alpha,
@@ -250,7 +250,7 @@ v2f<BasicTurbulenceModel>::v2f
 template<class BasicTurbulenceModel>
 bool v2f<BasicTurbulenceModel>::read()
 {
-    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
+    if (eddyViscosity<RASModel<BasicTurbulenceModel>>::read())
     {
         Cmu_.readIfPresent(this->coeffDict());
         CmuKEps_.readIfPresent(this->coeffDict());
@@ -288,7 +288,7 @@ void v2f<BasicTurbulenceModel>::correct()
     volScalarField& nut = this->nut_;
     fv::options& fvOptions(fv::options::New(this->mesh_));
 
-    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
+    eddyViscosity<RASModel<BasicTurbulenceModel>>::correct();
 
     volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H
index 099e0cb079..8b05497c16 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,7 +120,7 @@ namespace RASModels
 template<class BasicTurbulenceModel>
 class v2f
 :
-    public eddyViscosity<RASModel<BasicTurbulenceModel> >,
+    public eddyViscosity<RASModel<BasicTurbulenceModel>>,
     public v2fBase
 {
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
index ba58f78cad..6ec6e0ca69 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -159,9 +159,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<scalar> > clone() const
+        virtual tmp<fvPatchField<scalar>> clone() const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new porousBafflePressureFvPatchField(*this)
             );
@@ -175,12 +175,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<scalar> > clone
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new porousBafflePressureFvPatchField(*this, iF)
             );
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
index 87ff8cd800..5d6f316e3f 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ void Foam::epsilonLowReWallFunctionFvPatchScalarField::calculate
     const scalarField magGradUw(mag(Uw.snGrad()));
 
     const DimensionedField<scalar, volMesh>& G =
-        db().lookupObject<DimensionedField<scalar, volMesh> >
+        db().lookupObject<DimensionedField<scalar, volMesh>>
         (
             turbModel.GName()
         );
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
index 63dd111500..3ee2d514b3 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ protected:
         label master_;
 
         //- List of averaging corner weights
-        List<List<scalar> > cornerWeights_;
+        List<List<scalar>> cornerWeights_;
 
 
     // Protected Member Functions
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
index ddd4532390..20ad29982c 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,9 +119,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new kqRWallFunctionFvPatchField(*this)
             );
@@ -135,12 +135,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new kqRWallFunctionFvPatchField(*this, iF)
             );
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
index ceecad1d3b..daf4899344 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ protected:
         label master_;
 
         //- List of averaging corner weights
-        List<List<scalar> > cornerWeights_;
+        List<List<scalar>> cornerWeights_;
 
 
     // Protected Member Functions
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
index 55fc7cf62d..cb7a802655 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ Foam::laminar<BasicTurbulenceModel>::laminar
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-Foam::autoPtr<Foam::laminar<BasicTurbulenceModel> >
+Foam::autoPtr<Foam::laminar<BasicTurbulenceModel>>
 Foam::laminar<BasicTurbulenceModel>::New
 (
     const alphaField& alpha,
diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.C b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
index 0f6dd8adc5..9441984861 100644
--- a/src/combustionModels/singleStepCombustion/singleStepCombustion.C
+++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ singleStepCombustion<CombThermoType, ThermoType>::singleStepCombustion
     ),
     semiImplicit_(readBool(this->coeffs_.lookup("semiImplicit")))
 {
-    if (isA<singleStepReactingMixture<ThermoType> >(this->thermo()))
+    if (isA<singleStepReactingMixture<ThermoType>>(this->thermo()))
     {
         singleMixturePtr_ =
             &dynamic_cast<singleStepReactingMixture<ThermoType>&>
diff --git a/src/conversion/meshReader/meshReader.H b/src/conversion/meshReader/meshReader.H
index a0b696d6dc..c07bf3cd9c 100644
--- a/src/conversion/meshReader/meshReader.H
+++ b/src/conversion/meshReader/meshReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -158,7 +158,7 @@ private:
         List<labelPair> interfaces_;
 
         //- List of cells/faces id pairs for each baffle
-        List<List<cellFaceIdentifier> > baffleIds_;
+        List<List<cellFaceIdentifier>> baffleIds_;
 
         //- Global face list for polyMesh
         faceList meshFaces_;
@@ -261,7 +261,7 @@ protected:
 
         //- Identify boundary faces by cells and their faces
         //  for each patch
-        List<List<cellFaceIdentifier> > boundaryIds_;
+        List<List<cellFaceIdentifier>> boundaryIds_;
 
         //- Boundary patch types
         wordList patchTypes_;
diff --git a/src/conversion/meshTables/cellTable.C b/src/conversion/meshTables/cellTable.C
index 04af94aeb5..d745d7dc5a 100644
--- a/src/conversion/meshTables/cellTable.C
+++ b/src/conversion/meshTables/cellTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -444,7 +444,7 @@ void Foam::cellTable::addCellZones
 ) const
 {
     Map<label> typeToZone = zoneMap();
-    List<DynamicList<label> > zoneCells(size());
+    List<DynamicList<label>> zoneCells(size());
 
     forAll(tableIds, cellI)
     {
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index d7daba5486..35979a147e 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -196,7 +196,7 @@ void Foam::dynamicRefineFvMesh::readDict()
         ).subDict(typeName + "Coeffs")
     );
 
-    List<Pair<word> > fluxVelocities = List<Pair<word> >
+    List<Pair<word>> fluxVelocities = List<Pair<word>>
     (
         refineDict.lookup("correctFluxes")
     );
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
index c8319cd95f..0709072491 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,9 +99,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<vector> > clone() const
+        virtual autoPtr<pointPatchField<vector>> clone() const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new solidBodyMotionDisplacementPointPatchVectorField
                 (
@@ -119,12 +119,12 @@ public:
 
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<vector> > clone
+        virtual autoPtr<pointPatchField<vector>> clone
         (
             const DimensionedField<vector, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new solidBodyMotionDisplacementPointPatchVectorField
                 (
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
index 169d5d17aa..d1d18511cf 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ class rotatingMotion
         const vector axis_;
 
         //- Angular velocty (rad/sec)
-        autoPtr<DataEntry<scalar> > omega_;
+        autoPtr<DataEntry<scalar>> omega_;
 
 
     // Private Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
index 2410e72f04..4f76bcd0b5 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ bool Foam::solidBodyMotionFunctions::tabulated6DoFMotion::read
 
         if (dataStream.good())
         {
-            List<Tuple2<scalar, translationRotationVectors> > timeValues
+            List<Tuple2<scalar, translationRotationVectors>> timeValues
             (
                 dataStream
             );
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index 1276900588..aed63e9f62 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -925,7 +925,7 @@ Foam::labelList Foam::boundaryMesh::getNearest
     bbMax.z() += 2*tol;
 
     const scalar planarTol =
-        indexedOctree<treeDataPrimitivePatch<uindirectPrimitivePatch> >::
+        indexedOctree<treeDataPrimitivePatch<uindirectPrimitivePatch>>::
         perturbTol();
 
 
@@ -1259,7 +1259,7 @@ void Foam::boundaryMesh::patchify
 
     if (newPatchPtrList.size())
     {
-        List<DynamicList<label> > patchFaces(nNewPatches);
+        List<DynamicList<label>> patchFaces(nNewPatches);
 
         // Give reasonable estimate for size of patches
         label nAvgFaces =
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
index b7d579d928..c85d79793f 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -256,14 +256,14 @@ void Foam::fvMeshAdder::MapVolFields
     HashTable<const GeometricField<Type, fvPatchField, volMesh>*> fields
     (
         mesh.objectRegistry::lookupClass
-        <GeometricField<Type, fvPatchField, volMesh> >
+        <GeometricField<Type, fvPatchField, volMesh>>
         ()
     );
 
     HashTable<const GeometricField<Type, fvPatchField, volMesh>*> fieldsToAdd
     (
         meshToAdd.objectRegistry::lookupClass
-        <GeometricField<Type, fvPatchField, volMesh> >
+        <GeometricField<Type, fvPatchField, volMesh>>
         ()
     );
 
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 025c378edf..3da445b570 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -397,15 +397,15 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::repatch
     // is currently not supported by updateMesh.
 
     // Store boundary fields (we only do this for surfaceFields)
-    PtrList<FieldField<fvsPatchField, scalar> > sFlds;
+    PtrList<FieldField<fvsPatchField, scalar>> sFlds;
     saveBoundaryFields<scalar, surfaceMesh>(sFlds);
-    PtrList<FieldField<fvsPatchField, vector> > vFlds;
+    PtrList<FieldField<fvsPatchField, vector>> vFlds;
     saveBoundaryFields<vector, surfaceMesh>(vFlds);
-    PtrList<FieldField<fvsPatchField, sphericalTensor> > sptFlds;
+    PtrList<FieldField<fvsPatchField, sphericalTensor>> sptFlds;
     saveBoundaryFields<sphericalTensor, surfaceMesh>(sptFlds);
-    PtrList<FieldField<fvsPatchField, symmTensor> > sytFlds;
+    PtrList<FieldField<fvsPatchField, symmTensor>> sytFlds;
     saveBoundaryFields<symmTensor, surfaceMesh>(sytFlds);
-    PtrList<FieldField<fvsPatchField, tensor> > tFlds;
+    PtrList<FieldField<fvsPatchField, tensor>> tFlds;
     saveBoundaryFields<tensor, surfaceMesh>(tFlds);
 
     // Change the mesh (no inflation). Note: parallel comms allowed.
@@ -763,7 +763,7 @@ void Foam::fvMeshDistribute::findCouples
 {
     // Store domain neighbour as map so we can easily look for pair
     // with same face+proc.
-    HashTable<label, labelPair, labelPair::Hash<> > map(domainFace.size());
+    HashTable<label, labelPair, labelPair::Hash<>> map(domainFace.size());
 
     forAll(domainProc, bFaceI)
     {
@@ -790,7 +790,7 @@ void Foam::fvMeshDistribute::findCouples
         {
             labelPair myData(sourceFace[bFaceI], sourceProc[bFaceI]);
 
-            HashTable<label, labelPair, labelPair::Hash<> >::const_iterator
+            HashTable<label, labelPair, labelPair::Hash<>>::const_iterator
                 iter = map.find(myData);
 
             if (iter != map.end())
@@ -906,7 +906,7 @@ void Foam::fvMeshDistribute::addProcPatches
 (
     const labelList& nbrProc,       // processor that neighbour is now on
     const labelList& referPatchID,  // patchID (or -1) I originated from
-    List<Map<label> >& procPatchID
+    List<Map<label>>& procPatchID
 )
 {
     // Now use the neighbourFace/Proc to repatch the mesh. These lists
@@ -1016,7 +1016,7 @@ Foam::labelList Foam::fvMeshDistribute::getBoundaryPatch
 (
     const labelList& nbrProc,               // new processor per boundary face
     const labelList& referPatchID,          // patchID (or -1) I originated from
-    const List<Map<label> >& procPatchID    // per proc the new procPatches
+    const List<Map<label>>& procPatchID    // per proc the new procPatches
 )
 {
     labelList patchIDs(nbrProc);
@@ -2199,7 +2199,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     // Per neighbour processor, per originating patch, the patchID
     // For faces resulting from internal faces or normal processor patches
     // the originating patch is -1. For cyclics this is the cyclic patchID.
-    List<Map<label> > procPatchID;
+    List<Map<label>> procPatchID;
 
     // Add processor and processorCyclic patches.
     addProcPatches(sourceNewNbrProc, sourcePatch, procPatchID);
@@ -2233,11 +2233,11 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
 
     // Bit of hack: processorFvPatchField does not get reset since created
     // from nothing so explicitly reset.
-    initPatchFields<volScalarField, processorFvPatchField<scalar> >
+    initPatchFields<volScalarField, processorFvPatchField<scalar>>
     (
         pTraits<scalar>::zero
     );
-    initPatchFields<volVectorField, processorFvPatchField<vector> >
+    initPatchFields<volVectorField, processorFvPatchField<vector>>
     (
         pTraits<vector>::zero
     );
@@ -2249,20 +2249,20 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     (
         pTraits<sphericalTensor>::zero
     );
-    initPatchFields<volSymmTensorField, processorFvPatchField<symmTensor> >
+    initPatchFields<volSymmTensorField, processorFvPatchField<symmTensor>>
     (
         pTraits<symmTensor>::zero
     );
-    initPatchFields<volTensorField, processorFvPatchField<tensor> >
+    initPatchFields<volTensorField, processorFvPatchField<tensor>>
     (
         pTraits<tensor>::zero
     );
 
-    initPatchFields<surfaceScalarField, processorFvsPatchField<scalar> >
+    initPatchFields<surfaceScalarField, processorFvsPatchField<scalar>>
     (
         pTraits<scalar>::zero
     );
-    initPatchFields<surfaceVectorField, processorFvsPatchField<vector> >
+    initPatchFields<surfaceVectorField, processorFvsPatchField<vector>>
     (
         pTraits<vector>::zero
     );
@@ -2282,7 +2282,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     (
         pTraits<symmTensor>::zero
     );
-    initPatchFields<surfaceTensorField, processorFvsPatchField<tensor> >
+    initPatchFields<surfaceTensorField, processorFvsPatchField<tensor>>
     (
         pTraits<tensor>::zero
     );
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index a469d99d13..bc87c5ec31 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,7 +106,7 @@ class fvMeshDistribute
             template<class T, class Mesh>
             void saveBoundaryFields
             (
-                PtrList<FieldField<fvsPatchField, T> >& bflds
+                PtrList<FieldField<fvsPatchField, T>>& bflds
             ) const;
 
             //- Map boundary fields
@@ -114,7 +114,7 @@ class fvMeshDistribute
             void mapBoundaryFields
             (
                 const mapPolyMesh& map,
-                const PtrList<FieldField<fvsPatchField, T> >& oldBflds
+                const PtrList<FieldField<fvsPatchField, T>>& oldBflds
             );
 
             //- Init patch fields of certain type
@@ -232,7 +232,7 @@ class fvMeshDistribute
             (
                 const labelList&, // processor that neighbour is now on
                 const labelList&, // -1 or patch that face originated from
-                List<Map<label> >& procPatchID
+                List<Map<label>>& procPatchID
             );
 
             //- Get boundary faces to be repatched. Is -1 or new patchID
@@ -240,7 +240,7 @@ class fvMeshDistribute
             (
                 const labelList& neighbourNewProc,  // new processor per b. face
                 const labelList& referPatchID,      // -1 or original patch
-                const List<Map<label> >& procPatchID// patchID
+                const List<Map<label>>& procPatchID// patchID
             );
 
             //- Send mesh and coupling data.
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
index ecddb02f79..5ccf6d8b56 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ void Foam::fvMeshDistribute::printFieldInfo(const fvMesh& mesh)
 template<class T, class Mesh>
 void Foam::fvMeshDistribute::saveBoundaryFields
 (
-    PtrList<FieldField<fvsPatchField, T> >& bflds
+    PtrList<FieldField<fvsPatchField, T>>& bflds
 ) const
 {
     typedef GeometricField<T, fvsPatchField, Mesh> fldType;
@@ -89,7 +89,7 @@ template<class T, class Mesh>
 void Foam::fvMeshDistribute::mapBoundaryFields
 (
     const mapPolyMesh& map,
-    const PtrList<FieldField<fvsPatchField, T> >& oldBflds
+    const PtrList<FieldField<fvsPatchField, T>>& oldBflds
 )
 {
     const labelList& oldPatchStarts = map.oldPatchStarts();
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
index 1e81226a4b..a844376723 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -405,7 +405,7 @@ Foam::boundaryCutter::~boundaryCutter()
 void Foam::boundaryCutter::setRefinement
 (
     const Map<point>& pointToPos,
-    const Map<List<point> >& edgeToCuts,
+    const Map<List<point>>& edgeToCuts,
     const Map<labelPair>& faceToSplit,
     const Map<point>& faceToFeaturePoint,
     polyTopoChange& meshMod
@@ -446,7 +446,7 @@ void Foam::boundaryCutter::setRefinement
     // Map from edge label to sorted list of points
     Map<labelList> edgeToAddedPoints(edgeToCuts.size());
 
-    forAllConstIter(Map<List<point> >, edgeToCuts, iter)
+    forAllConstIter(Map<List<point>>, edgeToCuts, iter)
     {
         label edgeI = iter.key();
 
@@ -869,12 +869,12 @@ void Foam::boundaryCutter::updateMesh(const mapPolyMesh& morphMap)
 
     {
         // Create copy since we're deleting entries
-        HashTable<labelList, edge, Hash<edge> >
+        HashTable<labelList, edge, Hash<edge>>
             newEdgeAddedPoints(edgeAddedPoints_.size());
 
         for
         (
-            HashTable<labelList, edge, Hash<edge> >::const_iterator iter =
+            HashTable<labelList, edge, Hash<edge>>::const_iterator iter =
                 edgeAddedPoints_.begin();
             iter != edgeAddedPoints_.end();
             ++iter
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
index 6f45ad5dc8..1189148823 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ class boundaryCutter
         const polyMesh& mesh_;
 
         //- Per edge sorted (start to end) list of points added.
-        HashTable<labelList, edge, Hash<edge> > edgeAddedPoints_;
+        HashTable<labelList, edge, Hash<edge>> edgeAddedPoints_;
 
         //- Per face the mid point added.
         Map<label> faceAddedPoint_;
@@ -146,7 +146,7 @@ public:
             void setRefinement
             (
                 const Map<point>& pointToPos,
-                const Map<List<point> >& edgeToCuts,
+                const Map<List<point>>& edgeToCuts,
                 const Map<labelPair>& faceToSplit,
                 const Map<point>& faceToFeaturePoint,
                 polyTopoChange& meshMod
@@ -159,7 +159,7 @@ public:
         // Access
 
             //- Per edge a sorted list (start to end) of added points.
-            const HashTable<labelList, edge, Hash<edge> >& edgeAddedPoints()
+            const HashTable<labelList, edge, Hash<edge>>& edgeAddedPoints()
              const
             {
                 return edgeAddedPoints_;
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index a3b768e9cd..449f1f24c4 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -492,7 +492,7 @@ Foam::face Foam::meshCutAndRemove::addEdgeCutsToFace(const label faceI) const
         // Check if edge has been cut.
         label fp1 = f.fcIndex(fp);
 
-        HashTable<label, edge, Hash<edge> >::const_iterator fnd =
+        HashTable<label, edge, Hash<edge>>::const_iterator fnd =
             addedPoints_.find(edge(f[fp], f[fp1]));
 
         if (fnd != addedPoints_.end())
@@ -554,7 +554,7 @@ Foam::face Foam::meshCutAndRemove::loopToFace
                 if (edgeI != -1)
                 {
                     // Existing edge. Insert split-edge point if any.
-                    HashTable<label, edge, Hash<edge> >::const_iterator fnd =
+                    HashTable<label, edge, Hash<edge>>::const_iterator fnd =
                         addedPoints_.find(mesh().edges()[edgeI]);
 
                     if (fnd != addedPoints_.end())
@@ -1315,11 +1315,11 @@ void Foam::meshCutAndRemove::updateMesh(const mapPolyMesh& map)
     }
 
     {
-        HashTable<label, edge, Hash<edge> > newAddedPoints(addedPoints_.size());
+        HashTable<label, edge, Hash<edge>> newAddedPoints(addedPoints_.size());
 
         for
         (
-            HashTable<label, edge, Hash<edge> >::const_iterator iter =
+            HashTable<label, edge, Hash<edge>>::const_iterator iter =
                 addedPoints_.begin();
             iter != addedPoints_.end();
             ++iter
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
index 57fe27af79..571349c17e 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ class meshCutAndRemove
 
         //- Points added in last setRefinement. Per split edge label of added
         //  point
-        HashTable<label, edge, Hash<edge> > addedPoints_;
+        HashTable<label, edge, Hash<edge>> addedPoints_;
 
 
     // Private Static Functions
@@ -225,7 +225,7 @@ public:
             //- Points added. Per split edge label of added point.
             //  (note: fairly useless across topology changes since one of the
             //  points of the edge will probably disappear)
-            const HashTable<label, edge, Hash<edge> >& addedPoints() const
+            const HashTable<label, edge, Hash<edge>>& addedPoints() const
             {
                 return addedPoints_;
             }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index 5c3f0e61a6..a57bfe72f5 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -424,7 +424,7 @@ Foam::face Foam::meshCutter::addEdgeCutsToFace(const label faceI) const
         // Check if edge has been cut.
         label fp1 = f.fcIndex(fp);
 
-        HashTable<label, edge, Hash<edge> >::const_iterator fnd =
+        HashTable<label, edge, Hash<edge>>::const_iterator fnd =
             addedPoints_.find(edge(f[fp], f[fp1]));
 
         if (fnd != addedPoints_.end())
@@ -483,7 +483,7 @@ Foam::face Foam::meshCutter::loopToFace
                 if (edgeI != -1)
                 {
                     // Existing edge. Insert split-edge point if any.
-                    HashTable<label, edge, Hash<edge> >::const_iterator fnd =
+                    HashTable<label, edge, Hash<edge>>::const_iterator fnd =
                         addedPoints_.find(mesh().edges()[edgeI]);
 
                     if (fnd != addedPoints_.end())
@@ -1043,11 +1043,11 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
     }
 
     {
-        HashTable<label, edge, Hash<edge> > newAddedPoints(addedPoints_.size());
+        HashTable<label, edge, Hash<edge>> newAddedPoints(addedPoints_.size());
 
         for
         (
-            HashTable<label, edge, Hash<edge> >::const_iterator iter =
+            HashTable<label, edge, Hash<edge>>::const_iterator iter =
                 addedPoints_.begin();
             iter != addedPoints_.end();
             ++iter
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
index 9c2f47911b..2fc84062ba 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,7 +148,7 @@ class meshCutter
 
         //- Points added in last setRefinement. Per split edge label of added
         //  point
-        HashTable<label, edge, Hash<edge> > addedPoints_;
+        HashTable<label, edge, Hash<edge>> addedPoints_;
 
 
     // Private Static Functions
@@ -307,7 +307,7 @@ public:
             }
 
             //- Points added. Per split edge label of added point
-            const HashTable<label, edge, Hash<edge> >& addedPoints() const
+            const HashTable<label, edge, Hash<edge>>& addedPoints() const
             {
                 return addedPoints_;
             }
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
index 3e68ebb6c4..bebb9ea3aa 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -770,7 +770,7 @@ Foam::tmp<Foam::pointField> Foam::motionSmootherAlgo::curPoints() const
         actualPatchFieldTypes.setSize(pfld.size());
         forAll(pfld, patchI)
         {
-            if (isA<fixedValuePointPatchField<vector> >(pfld[patchI]))
+            if (isA<fixedValuePointPatchField<vector>>(pfld[patchI]))
             {
                 // Get rid of funny
                 actualPatchFieldTypes[patchI] =
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
index d4c1054860..6d21f2cb05 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -171,7 +171,7 @@ class motionSmootherAlgo
 
         //- Average of connected points.
         template<class Type>
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > avg
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> avg
         (
             const GeometricField<Type, pointPatchField, pointMesh>& fld,
             const scalarField& edgeWeight
@@ -179,7 +179,7 @@ class motionSmootherAlgo
 
         //- Average postion of connected points.
         template<class Type>
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > avgPositions
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> avgPositions
         (
             const GeometricField<Type, pointPatchField, pointMesh>& fld,
             const scalarField& edgeWeight
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
index abd1d1f04b..f59703c56f 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,14 +135,14 @@ void Foam::motionSmootherAlgo::checkConstraints
 
 // Average of connected points.
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::motionSmootherAlgo::avg
 (
     const GeometricField<Type, pointPatchField, pointMesh>& fld,
     const scalarField& edgeWeight
 ) const
 {
-    tmp<GeometricField<Type, pointPatchField, pointMesh> > tres
+    tmp<GeometricField<Type, pointPatchField, pointMesh>> tres
     (
         new GeometricField<Type, pointPatchField, pointMesh>
         (
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
index 6490133653..ce4e33829b 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,7 +142,7 @@ SourceFiles
 namespace Foam
 {
 
-typedef HashTable<labelList, edge, Hash<edge> > edgeLookup;
+typedef HashTable<labelList, edge, Hash<edge>> edgeLookup;
 
 
 // Forward declaration of classes
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index d018a3baa5..d9fe330794 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -872,7 +872,7 @@ void Foam::polyMeshAdder::mergePointZones
 
     DynamicList<word>& zoneNames,
     labelList& from1ToAll,
-    List<DynamicList<label> >& pzPoints
+    List<DynamicList<label>>& pzPoints
 )
 {
     zoneNames.setCapacity(pz0.size() + pz1.size());
@@ -1011,8 +1011,8 @@ void Foam::polyMeshAdder::mergeFaceZones
 
     DynamicList<word>& zoneNames,
     labelList& from1ToAll,
-    List<DynamicList<label> >& fzFaces,
-    List<DynamicList<bool> >& fzFlips
+    List<DynamicList<label>>& fzFaces,
+    List<DynamicList<bool>>& fzFlips
 )
 {
     const faceZoneMesh& fz0 = mesh0.faceZones();
@@ -1199,7 +1199,7 @@ void Foam::polyMeshAdder::mergeCellZones
 
     DynamicList<word>& zoneNames,
     labelList& from1ToAll,
-    List<DynamicList<label> >& czCells
+    List<DynamicList<label>>& czCells
 )
 {
     zoneNames.setCapacity(cz0.size() + cz1.size());
@@ -1335,14 +1335,14 @@ void Foam::polyMeshAdder::mergeZones
     const labelList& from1ToAllCells,
 
     DynamicList<word>& pointZoneNames,
-    List<DynamicList<label> >& pzPoints,
+    List<DynamicList<label>>& pzPoints,
 
     DynamicList<word>& faceZoneNames,
-    List<DynamicList<label> >& fzFaces,
-    List<DynamicList<bool> >& fzFlips,
+    List<DynamicList<label>>& fzFaces,
+    List<DynamicList<bool>>& fzFlips,
 
     DynamicList<word>& cellZoneNames,
-    List<DynamicList<label> >& czCells
+    List<DynamicList<label>>& czCells
 )
 {
     labelList from1ToAllPZones;
@@ -1393,14 +1393,14 @@ void Foam::polyMeshAdder::mergeZones
 void Foam::polyMeshAdder::addZones
 (
     const DynamicList<word>& pointZoneNames,
-    const List<DynamicList<label> >& pzPoints,
+    const List<DynamicList<label>>& pzPoints,
 
     const DynamicList<word>& faceZoneNames,
-    const List<DynamicList<label> >& fzFaces,
-    const List<DynamicList<bool> >& fzFlips,
+    const List<DynamicList<label>>& fzFaces,
+    const List<DynamicList<bool>>& fzFlips,
 
     const DynamicList<word>& cellZoneNames,
-    const List<DynamicList<label> >& czCells,
+    const List<DynamicList<label>>& czCells,
 
     polyMesh& mesh
 )
@@ -1546,14 +1546,14 @@ Foam::autoPtr<Foam::polyMesh> Foam::polyMeshAdder::add
     // ~~~~~
 
     DynamicList<word> pointZoneNames;
-    List<DynamicList<label> > pzPoints;
+    List<DynamicList<label>> pzPoints;
 
     DynamicList<word> faceZoneNames;
-    List<DynamicList<label> > fzFaces;
-    List<DynamicList<bool> > fzFlips;
+    List<DynamicList<label>> fzFaces;
+    List<DynamicList<bool>> fzFlips;
 
     DynamicList<word> cellZoneNames;
-    List<DynamicList<label> > czCells;
+    List<DynamicList<label>> czCells;
 
     mergeZones
     (
@@ -1763,14 +1763,14 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
     // ~~~~~
 
     DynamicList<word> pointZoneNames;
-    List<DynamicList<label> > pzPoints;
+    List<DynamicList<label>> pzPoints;
 
     DynamicList<word> faceZoneNames;
-    List<DynamicList<label> > fzFaces;
-    List<DynamicList<bool> > fzFlips;
+    List<DynamicList<label>> fzFaces;
+    List<DynamicList<bool>> fzFlips;
 
     DynamicList<word> cellZoneNames;
-    List<DynamicList<label> > czCells;
+    List<DynamicList<label>> czCells;
 
     mergeZones
     (
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
index 77baed3f03..3305848fad 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -169,7 +169,7 @@ private:
 
             DynamicList<word>& zoneNames,
             labelList& from1ToAll,
-            List<DynamicList<label> >& pzPoints
+            List<DynamicList<label>>& pzPoints
         );
 
         //- Merge face zones
@@ -185,8 +185,8 @@ private:
 
             DynamicList<word>& zoneNames,
             labelList& from1ToAll,
-            List<DynamicList<label> >& fzFaces,
-            List<DynamicList<bool> >& fzFlips
+            List<DynamicList<label>>& fzFaces,
+            List<DynamicList<bool>>& fzFlips
         );
 
         //- Merge cell zones
@@ -200,7 +200,7 @@ private:
 
             DynamicList<word>& zoneNames,
             labelList& from1ToAll,
-            List<DynamicList<label> >& czCells
+            List<DynamicList<label>>& czCells
         );
 
         //- Merge point/face/cell zone information
@@ -219,28 +219,28 @@ private:
             const labelList& from1ToAllCells,
 
             DynamicList<word>& pointZoneNames,
-            List<DynamicList<label> >& pzPoints,
+            List<DynamicList<label>>& pzPoints,
 
             DynamicList<word>& faceZoneNames,
-            List<DynamicList<label> >& fzFaces,
-            List<DynamicList<bool> >& fzFlips,
+            List<DynamicList<label>>& fzFaces,
+            List<DynamicList<bool>>& fzFlips,
 
             DynamicList<word>& cellZoneNames,
-            List<DynamicList<label> >& czCells
+            List<DynamicList<label>>& czCells
         );
 
         //- Create new zones and add to new mesh.
         static void addZones
         (
             const DynamicList<word>& pointZoneNames,
-            const List<DynamicList<label> >& pzPoints,
+            const List<DynamicList<label>>& pzPoints,
 
             const DynamicList<word>& faceZoneNames,
-            const List<DynamicList<label> >& fzFaces,
-            const List<DynamicList<bool> >& fzFlips,
+            const List<DynamicList<label>>& fzFaces,
+            const List<DynamicList<bool>>& fzFlips,
 
             const DynamicList<word>& cellZoneNames,
-            const List<DynamicList<label> >& czCells,
+            const List<DynamicList<label>>& czCells,
 
             polyMesh& mesh
         );
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index 2bb25c9049..7ee5f74e14 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1120,7 +1120,7 @@ Foam::label Foam::edgeCollapser::syncCollapse
 
 void Foam::edgeCollapser::filterFace
 (
-    const Map<DynamicList<label> >& collapseStrings,
+    const Map<DynamicList<label>>& collapseStrings,
     const List<pointEdgeCollapse>& allPointInfo,
     face& f
 ) const
@@ -1317,7 +1317,7 @@ bool Foam::edgeCollapser::setRefinement
 
     // Create strings of edges.
     // Map from collapseIndex(=global master point) to set of points
-    Map<DynamicList<label> > collapseStrings;
+    Map<DynamicList<label>> collapseStrings;
     {
         // 1. Count elements per collapseIndex
         Map<label> nPerIndex(mesh_.nPoints()/10);
@@ -1363,7 +1363,7 @@ bool Foam::edgeCollapser::setRefinement
 
 //    OFstream str2("collapseStrings_" + name(count) + ".obj");
 //    // Dump point collapses
-//    forAllConstIter(Map<DynamicList<label> >, collapseStrings, iter)
+//    forAllConstIter(Map<DynamicList<label>>, collapseStrings, iter)
 //    {
 //        const label masterPoint = iter.key();
 //        const DynamicList<label>& edgeCollapses = iter();
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
index dab8bd298b..8a13628f2f 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -231,7 +231,7 @@ private:
         //- Renumber f with new vertices. Removes consecutive duplicates
         void filterFace
         (
-            const Map<DynamicList<label> >& collapseStrings,
+            const Map<DynamicList<label>>& collapseStrings,
             const List<pointEdgeCollapse>& allPointInfo,
             face& f
         ) const;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index 6e840a75fb..1fadffcb71 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -4632,7 +4632,7 @@ void Foam::hexRef8::checkMesh() const
             {
                 // Check how many faces between owner and neighbour. Should
                 // be only one.
-                HashTable<label, labelPair, labelPair::Hash<> >
+                HashTable<label, labelPair, labelPair::Hash<>>
                     cellToFace(2*pp.size());
 
                 label faceI = pp.start();
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 85a167806d..f7bd8e4808 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1316,7 +1316,7 @@ Foam::labelList Foam::polyTopoChange::selectFaces
 // label)
 void Foam::polyTopoChange::calcPatchPointMap
 (
-    const List<Map<label> >& oldPatchMeshPointMaps,
+    const List<Map<label>>& oldPatchMeshPointMaps,
     const polyBoundaryMesh& boundary,
     labelListList& patchPointMap
 ) const
@@ -1867,7 +1867,7 @@ void Foam::polyTopoChange::resetZones
 void Foam::polyTopoChange::calcFaceZonePointMap
 (
     const polyMesh& mesh,
-    const List<Map<label> >& oldFaceZoneMeshPointMaps,
+    const List<Map<label>>& oldFaceZoneMeshPointMaps,
     labelListList& faceZonePointMap
 ) const
 {
@@ -2051,10 +2051,10 @@ void Foam::polyTopoChange::compactAndReorder
     List<objectMap>& cellsFromEdges,
     List<objectMap>& cellsFromFaces,
     List<objectMap>& cellsFromCells,
-    List<Map<label> >& oldPatchMeshPointMaps,
+    List<Map<label>>& oldPatchMeshPointMaps,
     labelList& oldPatchNMeshPoints,
     labelList& oldPatchStarts,
-    List<Map<label> >& oldFaceZoneMeshPointMaps
+    List<Map<label>>& oldFaceZoneMeshPointMaps
 )
 {
     if (mesh.boundaryMesh().size() != nPatches_)
@@ -3059,10 +3059,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
     List<objectMap> cellsFromFaces;
     List<objectMap> cellsFromCells;
     // old mesh info
-    List<Map<label> > oldPatchMeshPointMaps;
+    List<Map<label>> oldPatchMeshPointMaps;
     labelList oldPatchNMeshPoints;
     labelList oldPatchStarts;
-    List<Map<label> > oldFaceZoneMeshPointMaps;
+    List<Map<label>> oldFaceZoneMeshPointMaps;
 
     // Compact, reorder patch faces and calculate mesh/patch maps.
     compactAndReorder
@@ -3328,10 +3328,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::makeMesh
     List<objectMap> cellsFromCells;
 
     // old mesh info
-    List<Map<label> > oldPatchMeshPointMaps;
+    List<Map<label>> oldPatchMeshPointMaps;
     labelList oldPatchNMeshPoints;
     labelList oldPatchStarts;
-    List<Map<label> > oldFaceZoneMeshPointMaps;
+    List<Map<label>> oldFaceZoneMeshPointMaps;
 
     // Compact, reorder patch faces and calculate mesh/patch maps.
     compactAndReorder
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
index d9544b2810..e8de772018 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -201,7 +201,7 @@ class polyTopoChange
         template<class T>
         static void reorder(const labelList& map, DynamicList<T>&);
         template<class T>
-        static void reorder(const labelList& map, List<DynamicList<T> >&);
+        static void reorder(const labelList& map, List<DynamicList<T>>&);
         template<class T>
         static void renumberKey(const labelList& map, Map<T>&);
 
@@ -322,7 +322,7 @@ class polyTopoChange
         //- Calculate mapping for patchpoints only
         void calcPatchPointMap
         (
-            const List<Map<label> >&,
+            const List<Map<label>>&,
             const polyBoundaryMesh&,
             labelListList&
         ) const;
@@ -356,7 +356,7 @@ class polyTopoChange
         void calcFaceZonePointMap
         (
             const polyMesh&,
-            const List<Map<label> >&,
+            const List<Map<label>>&,
             labelListList&
         ) const;
 
@@ -391,10 +391,10 @@ class polyTopoChange
             List<objectMap>& cellsFromEdges,
             List<objectMap>& cellsFromFaces,
             List<objectMap>& cellsFromCells,
-            List<Map<label> >& oldPatchMeshPointMaps,
+            List<Map<label>>& oldPatchMeshPointMaps,
             labelList& oldPatchNMeshPoints,
             labelList& oldPatchStarts,
-            List<Map<label> >& oldFaceZoneMeshPointMaps
+            List<Map<label>>& oldFaceZoneMeshPointMaps
         );
 
 public:
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeTemplates.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeTemplates.C
index 69da6c4a2e..ddca640d04 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeTemplates.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,11 +53,11 @@ template<class T>
 void Foam::polyTopoChange::reorder
 (
     const labelList& oldToNew,
-    List<DynamicList<T> >& lst
+    List<DynamicList<T>>& lst
 )
 {
     // Create copy
-    List<DynamicList<T> > oldLst(lst);
+    List<DynamicList<T>> oldLst(lst);
 
     forAll(oldToNew, elemI)
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
index 6e962bff62..ff47fa4224 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -258,7 +258,7 @@ void Foam::refinementHistory::freeSplitCell(const label index)
     // Make sure parent does not point to me anymore.
     if (split.parent_ >= 0)
     {
-        autoPtr<FixedList<label, 8> >& subCellsPtr =
+        autoPtr<FixedList<label, 8>>& subCellsPtr =
             splitCells_[split.parent_].addedCellsPtr_;
 
         if (subCellsPtr.valid())
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.H
index 6eca2f6b30..6b5ac660c6 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
         label parent_;
 
         //- Cells this cell was refined into
-        autoPtr<FixedList<label, 8> > addedCellsPtr_;
+        autoPtr<FixedList<label, 8>> addedCellsPtr_;
 
         //- Construct null (parent = -1)
         splitCell8();
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
index 154d0e442e..425a0afffe 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
 //class dummyTransformList
 //{
 //public:
-//    void operator()(const coupledPolyPatch&, Field<List<T> >&) const
+//    void operator()(const coupledPolyPatch&, Field<List<T>>&) const
 //    {}
 //};
 //// Dummy template specialisation. Used in synchronisation.
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index 6138a7785b..6cb0df6d4a 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -239,8 +239,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     // For every master and slave edge make a list of points to be added into
     // that edge.
-    List<DynamicList<label> > pointsIntoMasterEdges(masterEdges.size());
-    List<DynamicList<label> > pointsIntoSlaveEdges(slaveEdges.size());
+    List<DynamicList<label>> pointsIntoMasterEdges(masterEdges.size());
+    List<DynamicList<label>> pointsIntoSlaveEdges(slaveEdges.size());
 
     // Add all points from the slave patch that have hit the edge
     forAll(slavePointEdgeHits, pointI)
@@ -400,7 +400,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             << abort(FatalError);
     }
 
-    Map<Pair<edge> >& addToCpepm = *cutPointEdgePairMapPtr_;
+    Map<Pair<edge>>& addToCpepm = *cutPointEdgePairMapPtr_;
 
     // Clear the old map
     addToCpepm.clear();
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index 26450d01f4..ef65f5ac8f 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,8 +94,8 @@ void Foam::enrichedPatch::calcCutFaces() const
     //    the points projected onto the face.
 
     // Create a set of edge usage parameters
-    HashSet<edge, Hash<edge> > edgesUsedOnce(pp.size());
-    HashSet<edge, Hash<edge> > edgesUsedTwice
+    HashSet<edge, Hash<edge>> edgesUsedOnce(pp.size());
+    HashSet<edge, Hash<edge>> edgesUsedTwice
         (pp.size()*primitiveMesh::edgesPerPoint_);
 
 
@@ -361,7 +361,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                         );
 
                         // Increment the usage count using two hash sets
-                        HashSet<edge, Hash<edge> >::iterator euoIter =
+                        HashSet<edge, Hash<edge>>::iterator euoIter =
                             edgesUsedOnce.find(curCutFaceEdge);
 
                         if (euoIter == edgesUsedOnce.end())
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
index 6ca5214419..5113594293 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
     // Master face points lists the points of the enriched master face plus
     // points projected into the master face
 
-    Map<DynamicList<label> > mpf(meshPoints().size());
+    Map<DynamicList<label>> mpf(meshPoints().size());
 
     const faceList& ef = enrichedFaces();
 
@@ -62,7 +62,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
 //         Pout<< "Cur face in pfAddr: " << curFace << endl;
         forAll(curFace, pointI)
         {
-            Map<DynamicList<label> >::iterator mpfIter =
+            Map<DynamicList<label>>::iterator mpfIter =
                 mpf.find(curFace[pointI]);
 
             if (mpfIter == mpf.end())
@@ -101,7 +101,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
             const label mergedSmp =
                 pointMergeMap().find(slaveMeshPoints[pointI])();
 
-            Map<DynamicList<label> >::iterator mpfIter =
+            Map<DynamicList<label>>::iterator mpfIter =
                 mpf.find(mergedSmp);
 
             if (mpfIter == mpf.end())
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
index f2fd9e3aac..0ef540e9ba 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ void Foam::enrichedPatch::calcPointPoints() const
     // Go through all faces and add the previous and next point as the
     // neighbour for each point. While inserting points, reject the
     // duplicates (as every internal edge will be visited twice).
-    List<DynamicList<label, primitiveMesh::edgesPerPoint_> >
+    List<DynamicList<label, primitiveMesh::edgesPerPoint_>>
         pp(meshPoints().size());
 
     const faceList& lf = localFaces();
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 79d1faa891..65f2150c81 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -298,7 +298,7 @@ Foam::slidingInterface::slidingInterface
 
         retiredPointMapPtr_ = new Map<label>(dict.lookup("retiredPointMap"));
         cutPointEdgePairMapPtr_ =
-            new Map<Pair<edge> >(dict.lookup("cutPointEdgePairMap"));
+            new Map<Pair<edge>>(dict.lookup("cutPointEdgePairMap"));
     }
     else
     {
@@ -434,7 +434,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
 
         const Map<label>& rpm = retiredPointMap();
 
-        const Map<Pair<edge> >& cpepm = cutPointEdgePairMap();
+        const Map<Pair<edge>>& cpepm = cutPointEdgePairMap();
 
         const Map<label>& slaveZonePointMap =
             mesh.faceZones()[slaveFaceZoneID_.index()]().meshPointMap();
@@ -471,7 +471,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
                 // A cut point is not a projected slave point.  Therefore, it
                 // must be an edge-to-edge intersection.
 
-                Map<Pair<edge> >::const_iterator cpepmIter =
+                Map<Pair<edge>>::const_iterator cpepmIter =
                     cpepm.find(cutPoints[pointI]);
 
                 if (cpepmIter != cpepm.end())
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.H b/src/dynamicMesh/slidingInterface/slidingInterface.H
index bbec12db11..6474e985ed 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.H
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,7 +185,7 @@ private:
             //- Cut edge pairs
             //  For cut points created by intersection two edges,
             //  store the master-slave edge pair used in creation
-            mutable Map<Pair<edge> >* cutPointEdgePairMapPtr_;
+            mutable Map<Pair<edge>>* cutPointEdgePairMapPtr_;
 
             //- Slave point hit.  The index of master point hit by the
             //  slave point in projection.  For no point hit, set to -1
@@ -250,7 +250,7 @@ private:
             const Map<label>& retiredPointMap() const;
 
             //- Cut point edge pair map
-            const Map<Pair<edge> >& cutPointEdgePairMap() const;
+            const Map<Pair<edge>>& cutPointEdgePairMap() const;
 
              //- Clear addressing
              void clearAddressing() const;
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
index e30f099746..4293675519 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -210,7 +210,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
         // Ditto for cut point edge map.  This is a rough guess of its size
         //
         cutPointEdgePairMapPtr_ =
-            new Map<Pair<edge> >
+            new Map<Pair<edge>>
             (
                 faceZones[slaveFaceZoneID_.index()]().nEdges()
             );
@@ -390,10 +390,10 @@ void Foam::slidingInterface::renumberAttachedAddressing
     }
 
     // Renumber the cut point edge pair map. Need to take a copy!
-    const Map<Pair<edge> > cpepm = cutPointEdgePairMap();
+    const Map<Pair<edge>> cpepm = cutPointEdgePairMap();
 
-    Map<Pair<edge> >* newCpepmPtr = new Map<Pair<edge> >(cpepm.size());
-    Map<Pair<edge> >& newCpepm = *newCpepmPtr;
+    Map<Pair<edge>>* newCpepmPtr = new Map<Pair<edge>>(cpepm.size());
+    Map<Pair<edge>>& newCpepm = *newCpepmPtr;
 
     const labelList cpepmToc = cpepm.toc();
 
@@ -539,7 +539,7 @@ const Foam::Map<Foam::label>& Foam::slidingInterface::retiredPointMap() const
 }
 
 
-const Foam::Map<Foam::Pair<Foam::edge> >&
+const Foam::Map<Foam::Pair<Foam::edge>>&
 Foam::slidingInterface::cutPointEdgePairMap() const
 {
     if (!cutPointEdgePairMapPtr_)
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index d7bfa4b2f6..fa67abf460 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -658,7 +658,7 @@ void Foam::extendedEdgeMesh::nearestFeatureEdgeByType
     List<pointIndexHit>& info
 ) const
 {
-    const PtrList<indexedOctree<treeDataEdge> >& edgeTrees = edgeTreesByType();
+    const PtrList<indexedOctree<treeDataEdge>>& edgeTrees = edgeTreesByType();
 
     info.setSize(edgeTrees.size());
 
@@ -725,7 +725,7 @@ void Foam::extendedEdgeMesh::allNearestFeatureEdges
     List<pointIndexHit>& info
 ) const
 {
-    const PtrList<indexedOctree<treeDataEdge> >& edgeTrees = edgeTreesByType();
+    const PtrList<indexedOctree<treeDataEdge>>& edgeTrees = edgeTreesByType();
 
     info.setSize(edgeTrees.size());
 
@@ -856,7 +856,7 @@ Foam::extendedEdgeMesh::edgeTree() const
 }
 
 
-const Foam::PtrList<Foam::indexedOctree<Foam::treeDataEdge> >&
+const Foam::PtrList<Foam::indexedOctree<Foam::treeDataEdge>>&
 Foam::extendedEdgeMesh::edgeTreesByType() const
 {
     if (edgeTreesByType_.size() == 0)
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
index 58e2ba8cab..3e4a823d9d 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -191,13 +191,13 @@ protected:
         labelList regionEdges_;
 
         //- Search tree for all feature points
-        mutable autoPtr<indexedOctree<treeDataPoint> > pointTree_;
+        mutable autoPtr<indexedOctree<treeDataPoint>> pointTree_;
 
         //- Search tree for all edges
-        mutable autoPtr<indexedOctree<treeDataEdge> > edgeTree_;
+        mutable autoPtr<indexedOctree<treeDataEdge>> edgeTree_;
 
         //- Individual search trees for each type of edge
-        mutable PtrList<indexedOctree<treeDataEdge> > edgeTreesByType_;
+        mutable PtrList<indexedOctree<treeDataEdge>> edgeTreesByType_;
 
 
     // Private Member Functions
@@ -479,7 +479,7 @@ public:
             const indexedOctree<treeDataEdge>& edgeTree() const;
 
             //- Demand driven construction of octree for boundary edges by type
-            const PtrList<indexedOctree<treeDataEdge> >&
+            const PtrList<indexedOctree<treeDataEdge>>&
             edgeTreesByType() const;
 
 
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
index ffa8317fa7..a35d894a13 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -208,7 +208,7 @@ void Foam::extendedEdgeMesh::sortPointsAndEdges
     }
 
     // Reorder the edges by classification
-    List<DynamicList<label> > allEds(nEdgeTypes);
+    List<DynamicList<label>> allEds(nEdgeTypes);
 
     DynamicList<label>& externalEds(allEds[0]);
     DynamicList<label>& internalEds(allEds[1]);
@@ -295,7 +295,7 @@ void Foam::extendedEdgeMesh::sortPointsAndEdges
 
     // Reorder the feature points by classification
 
-    List<DynamicList<label> > allPts(3);
+    List<DynamicList<label>> allPts(3);
 
     DynamicList<label>& convexPts(allPts[0]);
     DynamicList<label>& concavePts(allPts[1]);
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
index 9a33bcc96a..8e9cc5b409 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -208,7 +208,7 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
     }
 
     // Reorder the edges by classification
-    List<DynamicList<label> > allEds(nEdgeTypes);
+    List<DynamicList<label>> allEds(nEdgeTypes);
 
     DynamicList<label>& externalEds(allEds[0]);
     DynamicList<label>& internalEds(allEds[1]);
@@ -295,7 +295,7 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
 
     // Reorder the feature points by classification
 
-    List<DynamicList<label> > allPts(3);
+    List<DynamicList<label>> allPts(3);
 
     DynamicList<label>& convexPts(allPts[0]);
     DynamicList<label>& concavePts(allPts[1]);
diff --git a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
index 44762d043c..8d69d32cb3 100644
--- a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ void Foam::csvSetWriter<Type>::write
     const bool writeTracks,
     const PtrList<coordSet>& points,
     const wordList& valueSetNames,
-    const List<List<Field<Type> > >& valueSets,
+    const List<List<Field<Type>>>& valueSets,
     Ostream& os
 ) const
 {
diff --git a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H
index 8e4b9c7d70..c15c9f6f04 100644
--- a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ public:
             const bool writeTracks,
             const PtrList<coordSet>&,
             const wordList& valueSetNames,
-            const List<List<Field<Type> > >&,
+            const List<List<Field<Type>>>&,
             Ostream&
         ) const;
 };
diff --git a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C
index 4b874e201d..901eac5232 100644
--- a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -181,7 +181,7 @@ void Foam::ensightSetWriter<Type>::write
     const bool writeTracks,
     const PtrList<coordSet>& tracks,
     const wordList& valueSetNames,
-    const List<List<Field<Type> > >& valueSets,
+    const List<List<Field<Type>>>& valueSets,
     Ostream& os
 ) const
 {
@@ -279,7 +279,7 @@ void Foam::ensightSetWriter<Type>::write
         {
             os  << pTraits<Type>::typeName << nl;
 
-            const List<Field<Type> >& fieldVals = valueSets[setI];
+            const List<Field<Type>>& fieldVals = valueSets[setI];
             forAll(fieldVals, trackI)
             {
                 os  << "part" << nl
diff --git a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H
index 14a735b2ed..2d5a0a0634 100644
--- a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ public:
             const bool writeTracks,
             const PtrList<coordSet>&,
             const wordList& valueSetNames,
-            const List<List<Field<Type> > >&,
+            const List<List<Field<Type>>>&,
             Ostream&
         ) const;
 };
diff --git a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C
index 5f2d2b66bb..4809bb3504 100644
--- a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ void Foam::gnuplotSetWriter<Type>::write
     const bool writeTracks,
     const PtrList<coordSet>& trackPoints,
     const wordList& valueSetNames,
-    const List<List<Field<Type> > >& valueSets,
+    const List<List<Field<Type>>>& valueSets,
     Ostream& os
 ) const
 {
diff --git a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H
index 74688771e8..74ab086a6c 100644
--- a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ public:
             const bool writeTracks,
             const PtrList<coordSet>&,
             const wordList& valueSetNames,
-            const List<List<Field<Type> > >&,
+            const List<List<Field<Type>>>&,
             Ostream&
         ) const;
 };
diff --git a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
index 613b7f6b5e..bdaf888067 100644
--- a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ public:
             const bool writeTracks,
             const PtrList<coordSet>&,
             const wordList& valueSetNames,
-            const List<List<Field<Type> > >&,
+            const List<List<Field<Type>>>&,
             Ostream&
         ) const
         {
diff --git a/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C
index bd1b5e5525..ec98384af1 100644
--- a/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ void Foam::rawSetWriter<Type>::write
     const bool writeTracks,
     const PtrList<coordSet>& points,
     const wordList& valueSetNames,
-    const List<List<Field<Type> > >& valueSets,
+    const List<List<Field<Type>>>& valueSets,
     Ostream& os
 ) const
 {
diff --git a/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H
index 89c857d779..36b067b09d 100644
--- a/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ public:
             const bool writeTracks,
             const PtrList<coordSet>&,
             const wordList& valueSetNames,
-            const List<List<Field<Type> > >&,
+            const List<List<Field<Type>>>&,
             Ostream&
         ) const;
 };
diff --git a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
index d3208e968d..4663b0878f 100644
--- a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ void Foam::vtkSetWriter<Type>::write
     const bool writeTracks,
     const PtrList<coordSet>& tracks,
     const wordList& valueSetNames,
-    const List<List<Field<Type> > >& valueSets,
+    const List<List<Field<Type>>>& valueSets,
     Ostream& os
 ) const
 {
@@ -172,7 +172,7 @@ void Foam::vtkSetWriter<Type>::write
         os  << valueSetNames[setI] << ' ' << pTraits<Type>::nComponents << ' '
             << nPoints << " float" << nl;
 
-        const List<Field<Type> >& fieldVals = valueSets[setI];
+        const List<Field<Type>>& fieldVals = valueSets[setI];
 
         forAll(fieldVals, i)
         {
diff --git a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H
index 21bd80ef1e..583a304165 100644
--- a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ public:
             const bool writeTracks,
             const PtrList<coordSet>&,
             const wordList& valueSetNames,
-            const List<List<Field<Type> > >&,
+            const List<List<Field<Type>>>&,
             Ostream&
         ) const;
 };
diff --git a/src/fileFormats/sampledSetWriters/writer.C b/src/fileFormats/sampledSetWriters/writer.C
index a6abbed258..aa195da043 100644
--- a/src/fileFormats/sampledSetWriters/writer.C
+++ b/src/fileFormats/sampledSetWriters/writer.C
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::writer<Type>> Foam::writer<Type>::New
             << exit(FatalError);
     }
 
-    return autoPtr<writer<Type> >(cstrIter()());
+    return autoPtr<writer<Type>>(cstrIter()());
 }
 
 
@@ -155,7 +155,7 @@ void Foam::writer<Type>::write
 (
     const coordSet& points,
     const wordList& valueSetNames,
-    const List<Field<Type> >& valueSets,
+    const List<Field<Type>>& valueSets,
     Ostream& os
 ) const
 {
diff --git a/src/fileFormats/sampledSetWriters/writer.H b/src/fileFormats/sampledSetWriters/writer.H
index 8c754bd47b..ab198560ec 100644
--- a/src/fileFormats/sampledSetWriters/writer.H
+++ b/src/fileFormats/sampledSetWriters/writer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
     Example:
     \verbatim
         // Construct writer of xmgr type
-        autoPtr<writer<scalar> > scalarFormatter(writer<scalar>::New("xmgr"));
+        autoPtr<writer<scalar>> scalarFormatter(writer<scalar>::New("xmgr"));
 
         // Output list of points and corresponding values
         scalarFormatter().write
@@ -165,7 +165,7 @@ public:
         (
             const coordSet&,
             const wordList&,
-            const List<Field<Type> >&,
+            const List<Field<Type>>&,
             Ostream&
         ) const;
 
@@ -178,7 +178,7 @@ public:
             const bool writeTracks,
             const PtrList<coordSet>&,
             const wordList& valueSetNames,
-            const List<List<Field<Type> > >&,
+            const List<List<Field<Type>>>&,
             Ostream&
         ) const = 0;
 
diff --git a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C
index 15f2e0eaf8..23f30cc9a6 100644
--- a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ void Foam::xmgraceSetWriter<Type>::write
     const bool writeTracks,
     const PtrList<coordSet>& trackPoints,
     const wordList& valueSetNames,
-    const List<List<Field<Type> > >& valueSets,
+    const List<List<Field<Type>>>& valueSets,
     Ostream& os
 ) const
 {
diff --git a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H
index 47c3628936..fb18ac6aff 100644
--- a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ public:
             const bool writeTracks,
             const PtrList<coordSet>&,
             const wordList& valueSetNames,
-            const List<List<Field<Type> > >&,
+            const List<List<Field<Type>>>&,
             Ostream&
         ) const;
 };
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index dfe213c390..c499cf91a2 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ class MRFZone
         vector axis_;
 
         //- Angular velocty (rad/sec)
-        autoPtr<DataEntry<scalar> > omega_;
+        autoPtr<DataEntry<scalar>> omega_;
 
 
     // Private Member Functions
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
index 29c13a6fd2..b9a64b2fb0 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -230,13 +230,13 @@ Foam::tmp<Foam::surfaceScalarField> Foam::MRFZoneList::relative
 }
 
 
-Foam::tmp<Foam::FieldField<Foam::fvsPatchField, Foam::scalar> >
+Foam::tmp<Foam::FieldField<Foam::fvsPatchField, Foam::scalar>>
 Foam::MRFZoneList::relative
 (
-    const tmp<FieldField<fvsPatchField, scalar> >& phi
+    const tmp<FieldField<fvsPatchField, scalar>>& phi
 ) const
 {
-    tmp<FieldField<fvsPatchField, scalar> > rphi(phi.ptr());
+    tmp<FieldField<fvsPatchField, scalar>> rphi(phi.ptr());
 
     forAll(*this, i)
     {
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
index 016bbded84..3139e7e76b 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,9 +137,9 @@ public:
 
         //- Return the given absolute boundary flux relative within
         //  the MRF region
-        tmp<FieldField<fvsPatchField, scalar> > relative
+        tmp<FieldField<fvsPatchField, scalar>> relative
         (
-            const tmp<FieldField<fvsPatchField, scalar> >& tphi
+            const tmp<FieldField<fvsPatchField, scalar>>& tphi
         ) const;
 
         //- Make the given absolute mass-flux relative within the MRF region
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
index 07cd9cb307..928777483f 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,10 +118,10 @@ const Foam::dimensionedVector& Foam::SRF::SRFModel::omega() const
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
 Foam::SRF::SRFModel::Fcoriolis() const
 {
-    return tmp<DimensionedField<vector, volMesh> >
+    return tmp<DimensionedField<vector, volMesh>>
     (
         new DimensionedField<vector, volMesh>
         (
@@ -139,10 +139,10 @@ Foam::SRF::SRFModel::Fcoriolis() const
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
 Foam::SRF::SRFModel::Fcentrifugal() const
 {
-    return tmp<DimensionedField<vector, volMesh> >
+    return tmp<DimensionedField<vector, volMesh>>
     (
         new DimensionedField<vector, volMesh>
         (
@@ -160,7 +160,7 @@ Foam::SRF::SRFModel::Fcentrifugal() const
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
 Foam::SRF::SRFModel::Su() const
 {
     return Fcoriolis() + Fcentrifugal();
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
index 35c0a0dea4..998bb12f33 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,13 +162,13 @@ public:
             const dimensionedVector& omega() const;
 
             //- Return the coriolis force
-            tmp<DimensionedField<vector, volMesh> > Fcoriolis() const;
+            tmp<DimensionedField<vector, volMesh>> Fcoriolis() const;
 
             //- Return the centrifugal force
-            tmp<DimensionedField<vector, volMesh> > Fcentrifugal() const;
+            tmp<DimensionedField<vector, volMesh>> Fcentrifugal() const;
 
             //- Source term component for momentum equation
-            tmp<DimensionedField<vector, volMesh> > Su() const;
+            tmp<DimensionedField<vector, volMesh>> Su() const;
 
             //- Return velocity vector from positions
             vectorField velocity(const vectorField& positions) const;
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.H b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.H
index c881fb01b8..78df2901e1 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.H
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,14 +125,14 @@ public:
 
             //- Return source for equation
             template<class Type>
-            tmp<fvMatrix<Type> > operator()
+            tmp<fvMatrix<Type>> operator()
             (
                 GeometricField<Type, fvPatchField, volMesh>& field
             );
 
             //- Return source for equation with specified name
             template<class Type>
-            tmp<fvMatrix<Type> > operator()
+            tmp<fvMatrix<Type>> operator()
             (
                 GeometricField<Type, fvPatchField, volMesh>& field,
                 const word& fieldName
@@ -140,7 +140,7 @@ public:
 
             //- Return source for equation
             template<class Type>
-            tmp<fvMatrix<Type> > operator()
+            tmp<fvMatrix<Type>> operator()
             (
                 const volScalarField& rho,
                 GeometricField<Type, fvPatchField, volMesh>& field
@@ -148,7 +148,7 @@ public:
 
             //- Return source for equation with specified name
             template<class Type>
-            tmp<fvMatrix<Type> > operator()
+            tmp<fvMatrix<Type>> operator()
             (
                 const volScalarField& rho,
                 GeometricField<Type, fvPatchField, volMesh>& field,
@@ -157,7 +157,7 @@ public:
 
             //- Return source for equation
             template<class Type>
-            tmp<fvMatrix<Type> > operator()
+            tmp<fvMatrix<Type>> operator()
             (
                 const volScalarField& alpha,
                 const volScalarField& rho,
@@ -166,7 +166,7 @@ public:
 
             //- Return source for equation with specified name
             template<class Type>
-            tmp<fvMatrix<Type> > operator()
+            tmp<fvMatrix<Type>> operator()
             (
                 const volScalarField& alpha,
                 const volScalarField& rho,
@@ -176,7 +176,7 @@ public:
 
             //- Return source for equation
             template<class Type>
-            tmp<fvMatrix<Type> > operator()
+            tmp<fvMatrix<Type>> operator()
             (
                 const volScalarField& alpha,
                 const geometricOneField& rho,
@@ -185,7 +185,7 @@ public:
 
             //- Return source for equation
             template<class Type>
-            tmp<fvMatrix<Type> > operator()
+            tmp<fvMatrix<Type>> operator()
             (
                 const geometricOneField& alpha,
                 const volScalarField& rho,
@@ -194,7 +194,7 @@ public:
 
             //- Return source for equation
             template<class Type>
-            tmp<fvMatrix<Type> > operator()
+            tmp<fvMatrix<Type>> operator()
             (
                 const geometricOneField& alpha,
                 const geometricOneField& rho,
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
index 58e362df07..ca14e2b24e 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
 (
     GeometricField<Type, fvPatchField, volMesh>& field
 )
@@ -36,7 +36,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
 (
     GeometricField<Type, fvPatchField, volMesh>& field,
     const word& fieldName
@@ -46,7 +46,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
 
     const dimensionSet ds = field.dimensions()/dimTime*dimVolume;
 
-    tmp<fvMatrix<Type> > tmtx(new fvMatrix<Type>(field, ds));
+    tmp<fvMatrix<Type>> tmtx(new fvMatrix<Type>(field, ds));
     fvMatrix<Type>& mtx = tmtx();
 
     forAll(*this, i)
@@ -77,7 +77,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
 (
     const volScalarField& rho,
     GeometricField<Type, fvPatchField, volMesh>& field
@@ -88,7 +88,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
 (
     const volScalarField& rho,
     GeometricField<Type, fvPatchField, volMesh>& field,
@@ -102,7 +102,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
         rho.dimensions()*field.dimensions()/dimTime*dimVolume
     );
 
-    tmp<fvMatrix<Type> > tmtx(new fvMatrix<Type>(field, ds));
+    tmp<fvMatrix<Type>> tmtx(new fvMatrix<Type>(field, ds));
     fvMatrix<Type>& mtx = tmtx();
 
     forAll(*this, i)
@@ -133,7 +133,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
 (
     const volScalarField& alpha,
     const volScalarField& rho,
@@ -145,7 +145,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
 (
     const volScalarField& alpha,
     const volScalarField& rho,
@@ -161,7 +161,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
        /dimTime*dimVolume
     );
 
-    tmp<fvMatrix<Type> > tmtx(new fvMatrix<Type>(field, ds));
+    tmp<fvMatrix<Type>> tmtx(new fvMatrix<Type>(field, ds));
     fvMatrix<Type>& mtx = tmtx();
 
     forAll(*this, i)
@@ -192,7 +192,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
 (
     const geometricOneField& alpha,
     const geometricOneField& rho,
@@ -204,7 +204,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
 (
     const volScalarField& alpha,
     const geometricOneField& rho,
@@ -231,7 +231,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
 (
     const geometricOneField& alpha,
     const volScalarField& rho,
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/makeFvOption.H b/src/finiteVolume/cfdTools/general/fvOptions/makeFvOption.H
index bb4c686a4c..79ff887d0f 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/makeFvOption.H
+++ b/src/finiteVolume/cfdTools/general/fvOptions/makeFvOption.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ License
     );                                                                        \
                                                                               \
     Foam::fv::option::adddictionaryConstructorToTable                         \
-        <Foam::fv::Option<Foam::Type> >                                       \
+        <Foam::fv::Option<Foam::Type>>                                       \
         add##Option##Type##dictionary##ConstructorTooptionTable_
 
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
index da151d335b..fb5a15414f 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,7 +185,7 @@ void Foam::solutionControl::maxTypeResidual
 
     if (mesh_.foundObject<fieldType>(fieldName))
     {
-        const List<SolverPerformance<Type> > sp(data);
+        const List<SolverPerformance<Type>> sp(data);
         firstRes = cmptMax(sp.first().initialResidual());
         lastRes = cmptMax(sp.last().initialResidual());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C
index 4c40b1ef7c..927928e162 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ Foam::basicSymmetryFvPatchField<Type>::basicSymmetryFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::basicSymmetryFvPatchField<Type>::snGrad() const
 {
     tmp<vectorField> nHat = this->patch().nf();
@@ -126,7 +126,7 @@ void Foam::basicSymmetryFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::basicSymmetryFvPatchField<Type>::snGradTransformDiag() const
 {
     const vectorField nHat(this->patch().nf());
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
index c6caad802e..9713c6050d 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new basicSymmetryFvPatchField<Type>(*this)
             );
@@ -108,12 +108,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new basicSymmetryFvPatchField<Type>(*this, iF)
             );
@@ -125,7 +125,7 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const;
+            virtual tmp<Field<Type>> snGrad() const;
 
             //- Evaluate the patch field
             virtual void evaluate
@@ -134,7 +134,7 @@ public:
             );
 
             //- Return face-gradient transform diagonal
-            virtual tmp<Field<Type> > snGradTransformDiag() const;
+            virtual tmp<Field<Type>> snGradTransformDiag() const;
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
index 401e456881..1b4018776d 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ Foam::calculatedFvPatchField<Type>::calculatedFvPatchField
 
 
 template<class Type>
-Foam::tmp<Foam::fvPatchField<Type> >
+Foam::tmp<Foam::fvPatchField<Type>>
 Foam::fvPatchField<Type>::NewCalculatedType
 (
     const fvPatch& p
@@ -115,7 +115,7 @@ Foam::fvPatchField<Type>::NewCalculatedType
     }
     else
     {
-        return tmp<fvPatchField<Type> >
+        return tmp<fvPatchField<Type>>
         (
             new calculatedFvPatchField<Type>
             (
@@ -129,7 +129,7 @@ Foam::fvPatchField<Type>::NewCalculatedType
 
 template<class Type>
 template<class Type2>
-Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::NewCalculatedType
+Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::NewCalculatedType
 (
     const fvPatchField<Type2>& pf
 )
@@ -141,7 +141,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::NewCalculatedType
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::calculatedFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
@@ -161,7 +161,7 @@ Foam::calculatedFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::calculatedFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
@@ -181,7 +181,7 @@ Foam::calculatedFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::calculatedFvPatchField<Type>::gradientInternalCoeffs() const
 {
     FatalErrorInFunction
@@ -198,7 +198,7 @@ Foam::calculatedFvPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::calculatedFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     FatalErrorInFunction
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
index 7caa505a8d..c34005a6d5 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,9 +108,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new calculatedFvPatchField<Type>(*this)
             );
@@ -124,12 +124,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new calculatedFvPatchField<Type>(*this, iF)
             );
@@ -153,25 +153,25 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            tmp<Field<Type> > gradientInternalCoeffs() const;
+            tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            tmp<Field<Type>> gradientBoundaryCoeffs() const;
 
 
         //- Write
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
index 38b1e11a10..5a6f29aa89 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ Foam::coupledFvPatchField<Type>::coupledFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::coupledFvPatchField<Type>::snGrad
+Foam::tmp<Foam::Field<Type>> Foam::coupledFvPatchField<Type>::snGrad
 (
     const scalarField& deltaCoeffs
 ) const
@@ -145,7 +145,7 @@ void Foam::coupledFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::coupledFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>& w
@@ -156,7 +156,7 @@ Foam::coupledFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::coupledFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>& w
@@ -167,7 +167,7 @@ Foam::coupledFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::coupledFvPatchField<Type>::gradientInternalCoeffs
 (
     const scalarField& deltaCoeffs
@@ -178,7 +178,7 @@ Foam::coupledFvPatchField<Type>::gradientInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::coupledFvPatchField<Type>::gradientInternalCoeffs() const
 {
     NotImplemented;
@@ -187,7 +187,7 @@ Foam::coupledFvPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::coupledFvPatchField<Type>::gradientBoundaryCoeffs
 (
     const scalarField& deltaCoeffs
@@ -198,7 +198,7 @@ Foam::coupledFvPatchField<Type>::gradientBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::coupledFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     NotImplemented;
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
index 546e2ee5f8..44d7a76bed 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const = 0;
+        virtual tmp<fvPatchField<Type>> clone() const = 0;
 
         //- Construct as copy setting internal field reference
         coupledFvPatchField
@@ -115,7 +115,7 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>&
         ) const = 0;
@@ -133,19 +133,19 @@ public:
             }
 
             //- Return neighbour field of internal field
-            virtual tmp<Field<Type> > patchNeighbourField() const = 0;
+            virtual tmp<Field<Type>> patchNeighbourField() const = 0;
 
 
         // Evaluation functions
 
             //- Return patch-normal gradient
-            virtual tmp<Field<Type> > snGrad
+            virtual tmp<Field<Type>> snGrad
             (
                 const scalarField& deltaCoeffs
             ) const;
 
             //- Return patch-normal gradient
-            virtual tmp<Field<Type> > snGrad() const
+            virtual tmp<Field<Type>> snGrad() const
             {
                 NotImplemented;
                 return *this;
@@ -165,39 +165,39 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs
+            virtual tmp<Field<Type>> gradientInternalCoeffs
             (
                 const scalarField& deltaCoeffs
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs() const;
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs
             (
                 const scalarField& deltaCoeffs
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const;
 
 
         // Coupled interface functionality
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
index 200dabf29a..3e45bdbedf 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ void Foam::directionMixedFvPatchField<Type>::rmap
     transformFvPatchField<Type>::rmap(ptf, addr);
 
     const directionMixedFvPatchField<Type>& dmptf =
-        refCast<const directionMixedFvPatchField<Type> >(ptf);
+        refCast<const directionMixedFvPatchField<Type>>(ptf);
 
     refValue_.rmap(dmptf.refValue_, addr);
     refGrad_.rmap(dmptf.refGrad_, addr);
@@ -133,16 +133,16 @@ void Foam::directionMixedFvPatchField<Type>::rmap
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::directionMixedFvPatchField<Type>::snGrad() const
 {
     const Field<Type> pif(this->patchInternalField());
 
-    tmp<Field<Type> > normalValue = transform(valueFraction_, refValue_);
+    tmp<Field<Type>> normalValue = transform(valueFraction_, refValue_);
 
-    tmp<Field<Type> > gradValue = pif + refGrad_/this->patch().deltaCoeffs();
+    tmp<Field<Type>> gradValue = pif + refGrad_/this->patch().deltaCoeffs();
 
-    tmp<Field<Type> > transformGradValue =
+    tmp<Field<Type>> transformGradValue =
         transform(I - valueFraction_, gradValue);
 
     return
@@ -159,12 +159,12 @@ void Foam::directionMixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
         this->updateCoeffs();
     }
 
-    tmp<Field<Type> > normalValue = transform(valueFraction_, refValue_);
+    tmp<Field<Type>> normalValue = transform(valueFraction_, refValue_);
 
-    tmp<Field<Type> > gradValue =
+    tmp<Field<Type>> gradValue =
         this->patchInternalField() + refGrad_/this->patch().deltaCoeffs();
 
-    tmp<Field<Type> > transformGradValue =
+    tmp<Field<Type>> transformGradValue =
         transform(I - valueFraction_, gradValue);
 
     Field<Type>::operator=(normalValue + transformGradValue);
@@ -174,7 +174,7 @@ void Foam::directionMixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::directionMixedFvPatchField<Type>::snGradTransformDiag() const
 {
     vectorField diag(valueFraction_.size());
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
index 54686db761..f7314852dc 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,9 +100,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new directionMixedFvPatchField<Type>(*this)
             );
@@ -116,12 +116,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new directionMixedFvPatchField<Type>(*this, iF)
             );
@@ -193,7 +193,7 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const;
+            virtual tmp<Field<Type>> snGrad() const;
 
             //- Evaluate the patch field
             virtual void evaluate
@@ -202,7 +202,7 @@ public:
             );
 
             //- Return face-gradient transform diagonal
-            virtual tmp<Field<Type> > snGradTransformDiag() const;
+            virtual tmp<Field<Type>> snGradTransformDiag() const;
 
 
         //- Write
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
index 2165282197..f66d376e38 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ void Foam::fixedGradientFvPatchField<Type>::rmap
     fvPatchField<Type>::rmap(ptf, addr);
 
     const fixedGradientFvPatchField<Type>& fgptf =
-        refCast<const fixedGradientFvPatchField<Type> >(ptf);
+        refCast<const fixedGradientFvPatchField<Type>>(ptf);
 
     gradient_.rmap(fgptf.gradient_, addr);
 }
@@ -149,18 +149,18 @@ void Foam::fixedGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedGradientFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<Type> >(new Field<Type>(this->size(), pTraits<Type>::one));
+    return tmp<Field<Type>>(new Field<Type>(this->size(), pTraits<Type>::one));
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedGradientFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
@@ -171,10 +171,10 @@ Foam::fixedGradientFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedGradientFvPatchField<Type>::gradientInternalCoeffs() const
 {
-    return tmp<Field<Type> >
+    return tmp<Field<Type>>
     (
         new Field<Type>(this->size(), pTraits<Type>::zero)
     );
@@ -182,7 +182,7 @@ Foam::fixedGradientFvPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedGradientFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return gradient();
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H
index 4596364f62..276fdd433d 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,9 +128,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedGradientFvPatchField<Type>(*this)
             );
@@ -144,12 +144,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedGradientFvPatchField<Type>(*this, iF)
             );
@@ -191,7 +191,7 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const
+            virtual tmp<Field<Type>> snGrad() const
             {
                 return gradient_;
             }
@@ -204,25 +204,25 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs() const;
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const;
 
 
         //- Write
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
index 442d1b0fea..3c09e36a1d 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,13 +97,13 @@ Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedValueFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<Type> >
+    return tmp<Field<Type>>
     (
         new Field<Type>(this->size(), pTraits<Type>::zero)
     );
@@ -111,7 +111,7 @@ Foam::fixedValueFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedValueFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
@@ -122,7 +122,7 @@ Foam::fixedValueFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedValueFvPatchField<Type>::gradientInternalCoeffs() const
 {
     return -pTraits<Type>::one*this->patch().deltaCoeffs();
@@ -130,7 +130,7 @@ Foam::fixedValueFvPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedValueFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return this->patch().deltaCoeffs()*(*this);
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
index 8e1b21691f..105a1afddc 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,9 +112,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedValueFvPatchField<Type>(*this)
             );
@@ -128,12 +128,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedValueFvPatchField<Type>(*this, iF)
             );
@@ -157,25 +157,25 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs() const;
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const;
 
 
         //- Write
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index fca0149d0c..bcec377834 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ void Foam::mixedFvPatchField<Type>::rmap
     fvPatchField<Type>::rmap(ptf, addr);
 
     const mixedFvPatchField<Type>& mptf =
-        refCast<const mixedFvPatchField<Type> >(ptf);
+        refCast<const mixedFvPatchField<Type>>(ptf);
 
     refValue_.rmap(mptf.refValue_, addr);
     refGrad_.rmap(mptf.refGrad_, addr);
@@ -168,7 +168,7 @@ void Foam::mixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::mixedFvPatchField<Type>::snGrad() const
 {
     return
@@ -180,7 +180,7 @@ Foam::mixedFvPatchField<Type>::snGrad() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::mixedFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
@@ -192,7 +192,7 @@ Foam::mixedFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::mixedFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
@@ -205,7 +205,7 @@ Foam::mixedFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::mixedFvPatchField<Type>::gradientInternalCoeffs() const
 {
     return -Type(pTraits<Type>::one)*valueFraction_*this->patch().deltaCoeffs();
@@ -213,7 +213,7 @@ Foam::mixedFvPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::mixedFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
index 77dba4ada8..3ef0d50d79 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,9 +139,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mixedFvPatchField<Type>(*this)
             );
@@ -155,12 +155,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mixedFvPatchField<Type>(*this, iF)
             );
@@ -232,7 +232,7 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const;
+            virtual tmp<Field<Type>> snGrad() const;
 
             //- Evaluate the patch field
             virtual void evaluate
@@ -242,25 +242,25 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs() const;
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const;
 
 
         //- Write
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
index 9938891051..37b209e8c4 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,10 +97,10 @@ Foam::slicedFvPatchField<Type>::slicedFvPatchField
 
 
 template<class Type>
-Foam::tmp<Foam::fvPatchField<Type> >
+Foam::tmp<Foam::fvPatchField<Type>>
 Foam::slicedFvPatchField<Type>::clone() const
 {
-    return tmp<fvPatchField<Type> >
+    return tmp<fvPatchField<Type>>
     (
         new slicedFvPatchField<Type>(*this)
     );
@@ -126,13 +126,13 @@ Foam::slicedFvPatchField<Type>::slicedFvPatchField
 
 
 template<class Type>
-Foam::tmp<Foam::fvPatchField<Type> >
+Foam::tmp<Foam::fvPatchField<Type>>
 Foam::slicedFvPatchField<Type>::clone
 (
     const DimensionedField<Type, volMesh>& iF
 ) const
 {
-    return tmp<fvPatchField<Type> >
+    return tmp<fvPatchField<Type>>
     (
         new slicedFvPatchField<Type>(*this, iF)
     );
@@ -151,7 +151,7 @@ Foam::slicedFvPatchField<Type>::~slicedFvPatchField()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::slicedFvPatchField<Type>::snGrad() const
+Foam::tmp<Foam::Field<Type>> Foam::slicedFvPatchField<Type>::snGrad() const
 {
     NotImplemented;
 
@@ -167,7 +167,7 @@ void Foam::slicedFvPatchField<Type>::updateCoeffs()
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::slicedFvPatchField<Type>::patchInternalField() const
 {
     NotImplemented;
@@ -184,7 +184,7 @@ void Foam::slicedFvPatchField<Type>::patchInternalField(Field<Type>&) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::slicedFvPatchField<Type>::patchNeighbourField
 (
     const Field<Type>& iField
@@ -197,7 +197,7 @@ Foam::slicedFvPatchField<Type>::patchNeighbourField
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::slicedFvPatchField<Type>::patchNeighbourField() const
 {
     NotImplemented;
@@ -207,7 +207,7 @@ Foam::slicedFvPatchField<Type>::patchNeighbourField() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::slicedFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
@@ -220,7 +220,7 @@ Foam::slicedFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::slicedFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
@@ -233,7 +233,7 @@ Foam::slicedFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::slicedFvPatchField<Type>::gradientInternalCoeffs() const
 {
     NotImplemented;
@@ -243,7 +243,7 @@ Foam::slicedFvPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::slicedFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     NotImplemented;
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
index b9c794641d..49e9a1d7a6 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ public:
         slicedFvPatchField(const slicedFvPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const;
+        virtual tmp<fvPatchField<Type>> clone() const;
 
         //- Construct as copy setting internal field reference
         slicedFvPatchField
@@ -119,7 +119,7 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const;
@@ -145,27 +145,27 @@ public:
         // Evaluation functions
 
             //- Return patch-normal gradient
-            virtual tmp<Field<Type> > snGrad() const;
+            virtual tmp<Field<Type>> snGrad() const;
 
             //- Update the coefficients associated with the patch field
             //  Sets Updated to true
             virtual void updateCoeffs();
 
             //- Return internal field next to patch as patch field
-            virtual tmp<Field<Type> > patchInternalField() const;
+            virtual tmp<Field<Type>> patchInternalField() const;
 
             //- Return internal field next to patch as patch field
             virtual void patchInternalField(Field<Type>&) const;
 
             //- Return neighbour coupled given internal cell data
-            virtual tmp<Field<Type> > patchNeighbourField
+            virtual tmp<Field<Type>> patchNeighbourField
             (
                 const Field<Type>& iField
             ) const;
 
             //- Return patchField of the values on the patch or on the
             //  opposite patch
-            virtual tmp<Field<Type> > patchNeighbourField() const;
+            virtual tmp<Field<Type>> patchNeighbourField() const;
 
             //- Initialise the evaluation of the patch field
             virtual void initEvaluate
@@ -183,25 +183,25 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs() const;
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const;
 
 
         //- Write
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
index 901c81e9cc..bccf65ef16 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,7 @@ Foam::transformFvPatchField<Type>::transformFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::transformFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
@@ -100,7 +100,7 @@ Foam::transformFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::transformFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
@@ -117,7 +117,7 @@ Foam::transformFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::transformFvPatchField<Type>::gradientInternalCoeffs() const
 {
     return -this->patch().deltaCoeffs()*snGradTransformDiag();
@@ -125,7 +125,7 @@ Foam::transformFvPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::transformFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
index 76174f2627..ae10a70cbd 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const = 0;
+        virtual tmp<fvPatchField<Type>> clone() const = 0;
 
         //- Construct as copy setting internal field reference
         transformFvPatchField
@@ -105,7 +105,7 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>&
         ) const = 0;
@@ -116,32 +116,32 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const = 0;
+            virtual tmp<Field<Type>> snGrad() const = 0;
 
             //- Return face-gradient transform diagonal
-            virtual tmp<Field<Type> > snGradTransformDiag() const = 0;
+            virtual tmp<Field<Type>> snGradTransformDiag() const = 0;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs() const;
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const;
 
 
     // Member operators
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
index af57247f24..4601904a39 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,13 +103,13 @@ void Foam::zeroGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::zeroGradientFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<Type> >
+    return tmp<Field<Type>>
     (
         new Field<Type>(this->size(), pTraits<Type>::one)
     );
@@ -117,13 +117,13 @@ Foam::zeroGradientFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::zeroGradientFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<Type> >
+    return tmp<Field<Type>>
     (
         new Field<Type>(this->size(), pTraits<Type>::zero)
     );
@@ -131,10 +131,10 @@ Foam::zeroGradientFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::zeroGradientFvPatchField<Type>::gradientInternalCoeffs() const
 {
-    return tmp<Field<Type> >
+    return tmp<Field<Type>>
     (
         new Field<Type>(this->size(), pTraits<Type>::zero)
     );
@@ -142,10 +142,10 @@ Foam::zeroGradientFvPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::zeroGradientFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
-    return tmp<Field<Type> >
+    return tmp<Field<Type>>
     (
         new Field<Type>(this->size(), pTraits<Type>::zero)
     );
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
index cb238253f1..a0e0efe62a 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,9 +106,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new zeroGradientFvPatchField<Type>(*this)
             );
@@ -122,12 +122,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new zeroGradientFvPatchField<Type>(*this, iF)
             );
@@ -139,9 +139,9 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const
+            virtual tmp<Field<Type>> snGrad() const
             {
-                return tmp<Field<Type> >
+                return tmp<Field<Type>>
                 (
                     new Field<Type>(this->size(), pTraits<Type>::zero)
                 );
@@ -155,25 +155,25 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs() const;
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const;
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 2e404f3a4a..835de2a5f1 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,14 +119,14 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::cyclicFvPatchField<Type>::patchNeighbourField() const
 {
     const Field<Type>& iField = this->internalField();
     const labelUList& nbrFaceCells =
         cyclicPatch().cyclicPatch().neighbPatch().faceCells();
 
-    tmp<Field<Type> > tpnf(new Field<Type>(this->size()));
+    tmp<Field<Type>> tpnf(new Field<Type>(this->size()));
     Field<Type>& pnf = tpnf();
 
 
@@ -162,7 +162,7 @@ Foam::cyclicFvPatchField<Type>::neighbourPatchField() const
         this->internalField()
     );
 
-    return refCast<const cyclicFvPatchField<Type> >
+    return refCast<const cyclicFvPatchField<Type>>
     (
         fld.boundaryField()[this->cyclicPatch().neighbPatchID()]
     );
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
index ded4696854..99177eca6c 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ class cyclicFvPatchField
 
         //- Return neighbour side field given internal fields
         template<class Type2>
-        tmp<Field<Type2> > neighbourSideField
+        tmp<Field<Type2>> neighbourSideField
         (
             const Field<Type2>&
         ) const;
@@ -128,9 +128,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new cyclicFvPatchField<Type>(*this)
             );
@@ -144,12 +144,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new cyclicFvPatchField<Type>(*this, iF)
             );
@@ -170,7 +170,7 @@ public:
         // Evaluation functions
 
             //- Return neighbour coupled internal cell data
-            tmp<Field<Type> > patchNeighbourField() const;
+            tmp<Field<Type>> patchNeighbourField() const;
 
             //- Return reference to neighbour patchField
             const cyclicFvPatchField<Type>& neighbourPatchField() const;
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
index 33db8bfe64..194aabf65e 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,7 +133,7 @@ bool Foam::cyclicACMIFvPatchField<Type>::coupled() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::cyclicACMIFvPatchField<Type>::patchNeighbourField() const
 {
     const Field<Type>& iField = this->internalField();
@@ -145,7 +145,7 @@ Foam::cyclicACMIFvPatchField<Type>::patchNeighbourField() const
     Field<Type> pnfCoupled(iField, nbrFaceCellsCoupled);
     Field<Type> pfNonOverlap(iField, faceCellsNonOverlap);
 
-    tmp<Field<Type> > tpnf
+    tmp<Field<Type>> tpnf
     (
         new Field<Type>
         (
@@ -176,7 +176,7 @@ Foam::cyclicACMIFvPatchField<Type>::neighbourPatchField() const
             this->internalField()
         );
 
-    return refCast<const cyclicACMIFvPatchField<Type> >
+    return refCast<const cyclicACMIFvPatchField<Type>>
     (
         fld.boundaryField()[cyclicACMIPatch_.neighbPatchID()]
     );
@@ -259,7 +259,7 @@ void Foam::cyclicACMIFvPatchField<Type>::updateInterfaceMatrix
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIFvPatchField<Type>::snGrad
+Foam::tmp<Foam::Field<Type>> Foam::cyclicACMIFvPatchField<Type>::snGrad
 (
     const scalarField& deltaCoeffs
 ) const
@@ -330,7 +330,7 @@ void Foam::cyclicACMIFvPatchField<Type>::evaluate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::cyclicACMIFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>& w
@@ -343,7 +343,7 @@ Foam::cyclicACMIFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::cyclicACMIFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>& w
@@ -356,7 +356,7 @@ Foam::cyclicACMIFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::cyclicACMIFvPatchField<Type>::gradientInternalCoeffs
 (
     const scalarField& deltaCoeffs
@@ -369,7 +369,7 @@ Foam::cyclicACMIFvPatchField<Type>::gradientInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::cyclicACMIFvPatchField<Type>::gradientInternalCoeffs() const
 {
     // note: do not blend based on mask field
@@ -379,7 +379,7 @@ Foam::cyclicACMIFvPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::cyclicACMIFvPatchField<Type>::gradientBoundaryCoeffs
 (
     const scalarField& deltaCoeffs
@@ -392,7 +392,7 @@ Foam::cyclicACMIFvPatchField<Type>::gradientBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::cyclicACMIFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     // note: do not blend based on mask field
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
index dd2d8d751b..cf50ae1576 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ class cyclicACMIFvPatchField
 
         //- Return neighbour side field given internal fields
         template<class Type2>
-        tmp<Field<Type2> > neighbourSideField
+        tmp<Field<Type2>> neighbourSideField
         (
             const Field<Type2>&
         ) const;
@@ -124,9 +124,9 @@ public:
         cyclicACMIFvPatchField(const cyclicACMIFvPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new cyclicACMIFvPatchField<Type>(*this)
             );
@@ -140,12 +140,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new cyclicACMIFvPatchField<Type>(*this, iF)
             );
@@ -191,7 +191,7 @@ public:
 
 
             //- Return neighbour coupled internal cell data
-            virtual tmp<Field<Type> > patchNeighbourField() const;
+            virtual tmp<Field<Type>> patchNeighbourField() const;
 
             //- Return reference to neighbour patchField
             const cyclicACMIFvPatchField<Type>& neighbourPatchField() const;
@@ -219,7 +219,7 @@ public:
             ) const;
 
             //- Return patch-normal gradient
-            virtual tmp<Field<Type> > snGrad
+            virtual tmp<Field<Type>> snGrad
             (
                 const scalarField& deltaCoeffs
             ) const;
@@ -241,39 +241,39 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs
+            virtual tmp<Field<Type>> gradientInternalCoeffs
             (
                 const scalarField& deltaCoeffs
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs() const;
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs
             (
                 const scalarField& deltaCoeffs
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const;
 
             //- Manipulate matrix
             virtual void manipulateMatrix(fvMatrix<Type>& matrix);
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index b4d804c978..f993a8d8d9 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,7 +130,7 @@ bool Foam::cyclicAMIFvPatchField<Type>::coupled() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::cyclicAMIFvPatchField<Type>::patchNeighbourField() const
 {
     const Field<Type>& iField = this->internalField();
@@ -139,7 +139,7 @@ Foam::cyclicAMIFvPatchField<Type>::patchNeighbourField() const
 
     Field<Type> pnf(iField, nbrFaceCells);
 
-    tmp<Field<Type> > tpnf;
+    tmp<Field<Type>> tpnf;
     if (cyclicAMIPatch_.applyLowWeightCorrection())
     {
         tpnf = cyclicAMIPatch_.interpolate(pnf, this->patchInternalField()());
@@ -168,7 +168,7 @@ Foam::cyclicAMIFvPatchField<Type>::neighbourPatchField() const
             this->internalField()
         );
 
-    return refCast<const cyclicAMIFvPatchField<Type> >
+    return refCast<const cyclicAMIFvPatchField<Type>>
     (
         fld.boundaryField()[cyclicAMIPatch_.neighbPatchID()]
     );
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
index c9ad16c6c9..53278b796f 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ class cyclicAMIFvPatchField
 
         //- Return neighbour side field given internal fields
         template<class Type2>
-        tmp<Field<Type2> > neighbourSideField
+        tmp<Field<Type2>> neighbourSideField
         (
             const Field<Type2>&
         ) const;
@@ -129,9 +129,9 @@ public:
         cyclicAMIFvPatchField(const cyclicAMIFvPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new cyclicAMIFvPatchField<Type>(*this)
             );
@@ -145,12 +145,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new cyclicAMIFvPatchField<Type>(*this, iF)
             );
@@ -175,7 +175,7 @@ public:
             virtual bool coupled() const;
 
             //- Return neighbour coupled internal cell data
-            virtual tmp<Field<Type> > patchNeighbourField() const;
+            virtual tmp<Field<Type>> patchNeighbourField() const;
 
             //- Return reference to neighbour patchField
             const cyclicAMIFvPatchField<Type>& neighbourPatchField() const;
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H
index 3c68fe2b36..f53b7650cd 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,9 +109,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new cyclicSlipFvPatchField<Type>(*this)
             );
@@ -125,12 +125,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new cyclicSlipFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
index 7b88714619..0afffe0abc 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,9 +108,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new emptyFvPatchField<Type>(*this)
             );
@@ -124,12 +124,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new emptyFvPatchField<Type>(*this, iF)
             );
@@ -166,36 +166,36 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const
             {
-                return tmp<Field<Type> >(new Field<Type>(0));
+                return tmp<Field<Type>>(new Field<Type>(0));
             }
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const
             {
-                return tmp<Field<Type> >(new Field<Type>(0));
+                return tmp<Field<Type>>(new Field<Type>(0));
             }
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            tmp<Field<Type> > gradientInternalCoeffs() const
+            tmp<Field<Type>> gradientInternalCoeffs() const
             {
-                return tmp<Field<Type> >(new Field<Type>(0));
+                return tmp<Field<Type>>(new Field<Type>(0));
             }
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            tmp<Field<Type> > gradientBoundaryCoeffs() const
+            tmp<Field<Type>> gradientBoundaryCoeffs() const
             {
-                return tmp<Field<Type> >(new Field<Type>(0));
+                return tmp<Field<Type>>(new Field<Type>(0));
             }
 };
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
index d8564fae53..a66f608955 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,14 +90,14 @@ Foam::jumpCyclicFvPatchField<Type>::jumpCyclicFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::jumpCyclicFvPatchField<Type>::patchNeighbourField() const
 {
     const Field<Type>& iField = this->internalField();
     const labelUList& nbrFaceCells =
         this->cyclicPatch().neighbFvPatch().faceCells();
 
-    tmp<Field<Type> > tpnf(new Field<Type>(this->size()));
+    tmp<Field<Type>> tpnf(new Field<Type>(this->size()));
     Field<Type>& pnf = tpnf();
 
     Field<Type> jf(this->jump());
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
index 42d0c1805f..88114efff0 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,13 +116,13 @@ public:
             }
 
             //- Return the "jump" across the patch as a "half" field
-            virtual tmp<Field<Type> > jump() const = 0;
+            virtual tmp<Field<Type>> jump() const = 0;
 
 
         // Evaluation functions
 
             //- Return neighbour coupled given internal cell data
-            tmp<Field<Type> > patchNeighbourField() const;
+            tmp<Field<Type>> patchNeighbourField() const;
 
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
index 38e6dcf08b..5f2495f4a6 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ Foam::jumpCyclicAMIFvPatchField<Type>::jumpCyclicAMIFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::jumpCyclicAMIFvPatchField<Type>::patchNeighbourField() const
 {
     const Field<Type>& iField = this->internalField();
@@ -99,7 +99,7 @@ Foam::jumpCyclicAMIFvPatchField<Type>::patchNeighbourField() const
         this->cyclicAMIPatch().cyclicAMIPatch().neighbPatch().faceCells();
 
     Field<Type> pnf(iField, nbrFaceCells);
-    tmp<Field<Type> > tpnf;
+    tmp<Field<Type>> tpnf;
 
     if (this->cyclicAMIPatch().applyLowWeightCorrection())
     {
@@ -120,7 +120,7 @@ Foam::jumpCyclicAMIFvPatchField<Type>::patchNeighbourField() const
         tpnf = transform(this->forwardT(), tpnf);
     }
 
-    tmp<Field<Type> > tjf = jump();
+    tmp<Field<Type>> tjf = jump();
     if (!this->cyclicAMIPatch().owner())
     {
         tjf = -tjf;
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.H
index a2e77f0396..2e1ca7c8b8 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,13 +119,13 @@ public:
             }
 
             //- Return the "jump" across the patch as a "half" field
-            virtual tmp<Field<Type> > jump() const = 0;
+            virtual tmp<Field<Type>> jump() const = 0;
 
 
         // Evaluation functions
 
             //- Return neighbour coupled given internal cell data
-            tmp<Field<Type> > patchNeighbourField() const;
+            tmp<Field<Type>> patchNeighbourField() const;
 
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H
index 576d4d0833..bd53a7ea13 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,9 +101,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new nonuniformTransformCyclicFvPatchField<Type>(*this)
             );
@@ -117,12 +117,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new nonuniformTransformCyclicFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 287bebfb33..9d18509418 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -196,7 +196,7 @@ Foam::processorFvPatchField<Type>::~processorFvPatchField()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::processorFvPatchField<Type>::patchNeighbourField() const
 {
     if (debug && !this->ready())
@@ -291,7 +291,7 @@ void Foam::processorFvPatchField<Type>::evaluate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::processorFvPatchField<Type>::snGrad
 (
     const scalarField& deltaCoeffs
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index da29bce16a..71a27f794e 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,9 +136,9 @@ public:
         processorFvPatchField(const processorFvPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new processorFvPatchField<Type>(*this)
             );
@@ -152,12 +152,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new processorFvPatchField<Type>(*this, iF)
             );
@@ -186,7 +186,7 @@ public:
             }
 
             //- Return neighbour field given internal field
-            virtual tmp<Field<Type> > patchNeighbourField() const;
+            virtual tmp<Field<Type>> patchNeighbourField() const;
 
 
         // Evaluation functions
@@ -198,7 +198,7 @@ public:
             virtual void evaluate(const Pstream::commsTypes commsType);
 
             //- Return patch-normal gradient
-            virtual tmp<Field<Type> > snGrad
+            virtual tmp<Field<Type>> snGrad
             (
                 const scalarField& deltaCoeffs
             ) const;
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
index d2c244bd69..7b5abd9ed8 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,9 +122,9 @@ public:
         processorCyclicFvPatchField(const processorCyclicFvPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new processorCyclicFvPatchField<Type>(*this)
             );
@@ -138,12 +138,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new processorCyclicFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.H
index 191bd597d1..1fb4240e8c 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,9 +108,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new symmetryFvPatchField<Type>(*this)
             );
@@ -124,12 +124,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new symmetryFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
index 7ab5a129d7..3515d3c061 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::symmetryPlaneFvPatchField<Type>::snGrad() const
 {
     vector nHat(symmetryPlanePatch_.n());
@@ -151,7 +151,7 @@ void Foam::symmetryPlaneFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::symmetryPlaneFvPatchField<Type>::snGradTransformDiag() const
 {
     vector nHat(symmetryPlanePatch_.n());
@@ -163,7 +163,7 @@ Foam::symmetryPlaneFvPatchField<Type>::snGradTransformDiag() const
         mag(nHat.component(vector::Z))
     );
 
-    return tmp<Field<Type> >
+    return tmp<Field<Type>>
     (
         new Field<Type>
         (
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H
index 5f17938aa4..55ff10c251 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,9 +114,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new symmetryPlaneFvPatchField<Type>(*this)
             );
@@ -130,12 +130,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new symmetryPlaneFvPatchField<Type>(*this, iF)
             );
@@ -147,7 +147,7 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const;
+            virtual tmp<Field<Type>> snGrad() const;
 
             //- Evaluate the patch field
             virtual void evaluate
@@ -156,7 +156,7 @@ public:
             );
 
             //- Return face-gradient transform diagonal
-            virtual tmp<Field<Type> > snGradTransformDiag() const;
+            virtual tmp<Field<Type>> snGradTransformDiag() const;
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
index 03f382fa21..7fbdafde61 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::wedgeFvPatchField<Type>::snGrad() const
+Foam::tmp<Foam::Field<Type>> Foam::wedgeFvPatchField<Type>::snGrad() const
 {
     const Field<Type> pif(this->patchInternalField());
 
@@ -148,7 +148,7 @@ void Foam::wedgeFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::wedgeFvPatchField<Type>::snGradTransformDiag() const
 {
     const diagTensor diagT =
@@ -156,7 +156,7 @@ Foam::wedgeFvPatchField<Type>::snGradTransformDiag() const
 
     const vector diagV(diagT.xx(), diagT.yy(), diagT.zz());
 
-    return tmp<Field<Type> >
+    return tmp<Field<Type>>
     (
         new Field<Type>
         (
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H
index 6ab1a7f081..b2781cfeea 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,9 +109,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new wedgeFvPatchField<Type>(*this)
             );
@@ -125,12 +125,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new wedgeFvPatchField<Type>(*this, iF)
             );
@@ -142,7 +142,7 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const;
+            virtual tmp<Field<Type>> snGrad() const;
 
             //- Evaluate the patch field
             virtual void evaluate
@@ -151,7 +151,7 @@ public:
             );
 
             //- Return face-gradient transform diagonal
-            virtual tmp<Field<Type> > snGradTransformDiag() const;
+            virtual tmp<Field<Type>> snGradTransformDiag() const;
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index daa2d5694b..5fc626e44c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -200,7 +200,7 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
 
     const GeometricField<Type, fvPatchField, volMesh>& field =
         this->db().objectRegistry::template
-        lookupObject<GeometricField<Type, fvPatchField, volMesh> >
+        lookupObject<GeometricField<Type, fvPatchField, volMesh>>
         (
             this->dimensionedInternalField().name()
         );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H
index 443c8472a8..b42da86b5e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,9 +153,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new advectiveFvPatchField<Type>(*this)
             );
@@ -169,12 +169,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new advectiveFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
index e050e2b193..878313c83b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,7 +114,7 @@ class codedFixedValueFvPatchField
 
         const word redirectType_;
 
-        mutable autoPtr<fvPatchField<Type> > redirectPatchFieldPtr_;
+        mutable autoPtr<fvPatchField<Type>> redirectPatchFieldPtr_;
 
 
     // Private Member Functions
@@ -189,9 +189,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new codedFixedValueFvPatchField<Type>(*this)
             );
@@ -205,12 +205,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new codedFixedValueFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
index 52662aee51..0d73332f81 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ class codedMixedFvPatchField
 
         const word redirectType_;
 
-        mutable autoPtr<mixedFvPatchField<Type> > redirectPatchFieldPtr_;
+        mutable autoPtr<mixedFvPatchField<Type>> redirectPatchFieldPtr_;
 
 
     // Private Member Functions
@@ -199,9 +199,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new codedMixedFvPatchField<Type>(*this)
             );
@@ -215,12 +215,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new codedMixedFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
index 4e3db2fdff..db1307dabe 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,13 +97,13 @@ class cylindricalInletVelocityFvPatchVectorField
         const vector axis_;
 
         //- Axial velocity
-        autoPtr<DataEntry<scalar> > axialVelocity_;
+        autoPtr<DataEntry<scalar>> axialVelocity_;
 
         //- Radial velocity
-        autoPtr<DataEntry<scalar> > radialVelocity_;
+        autoPtr<DataEntry<scalar>> radialVelocity_;
 
         //- RPM
-        autoPtr<DataEntry<scalar> > rpm_;
+        autoPtr<DataEntry<scalar>> rpm_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
index a62cbc38c5..e0a3e4e4b1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -721,17 +721,17 @@ void Foam::externalCoupledMixedFvPatchField<Type>::transferData
     {
         int tag = Pstream::msgType() + 1;
 
-        List<Field<scalar> > magSfs(Pstream::nProcs());
+        List<Field<scalar>> magSfs(Pstream::nProcs());
         magSfs[Pstream::myProcNo()].setSize(this->patch().size());
         magSfs[Pstream::myProcNo()] = this->patch().magSf();
         Pstream::gatherList(magSfs, tag);
 
-        List<Field<Type> > values(Pstream::nProcs());
+        List<Field<Type>> values(Pstream::nProcs());
         values[Pstream::myProcNo()].setSize(this->patch().size());
         values[Pstream::myProcNo()] = this->refValue();
         Pstream::gatherList(values, tag);
 
-        List<Field<Type> > snGrads(Pstream::nProcs());
+        List<Field<Type>> snGrads(Pstream::nProcs());
         snGrads[Pstream::myProcNo()].setSize(this->patch().size());
         snGrads[Pstream::myProcNo()] = this->snGrad();
         Pstream::gatherList(snGrads, tag);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
index 22c208923e..61d32bc7c0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
@@ -173,7 +173,7 @@ private:
         bool master_;
 
         //- Offsets in data file to start reading at correct position
-        List<List<label> > offsets_;
+        List<List<label>> offsets_;
 
         //- Initialised flag
         bool initialised_;
@@ -275,9 +275,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new externalCoupledMixedFvPatchField<Type>(*this)
             );
@@ -291,12 +291,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new externalCoupledMixedFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
index 2ad75b1da6..f6e560a7f8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,9 +155,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fanFvPatchField<Type>(*this)
             );
@@ -171,12 +171,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fanFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
index 3a4d46b3d9..2a406f5ffc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ Foam::fanFvPatchField<Foam::scalar>::fanFvPatchField
                     nPows++;
                 }
             }
-            List<Tuple2<scalar, scalar> > coeffs(nPows);
+            List<Tuple2<scalar, scalar>> coeffs(nPows);
             nPows = 0;
             forAll(f, powI)
             {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H
index b10b932be5..85002bb092 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -184,7 +184,7 @@ namespace Foam
     inline void setSnGrad
     (
         volScalarField::GeometricBoundaryField& bf,
-        const tmp<FieldField<fvsPatchField, scalar> >& tsnGrad
+        const tmp<FieldField<fvsPatchField, scalar>>& tsnGrad
     )
     {
         setSnGrad<GradBC>(bf, tsnGrad());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
index 75a9742240..638f76d62e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,9 +116,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedInternalValueFvPatchField<Type>(*this)
             );
@@ -132,12 +132,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedInternalValueFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
index c9d6e367cc..88e9b93b40 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fixedJumpFvPatchField<Type>::jump() const
+Foam::tmp<Foam::Field<Type>> Foam::fixedJumpFvPatchField<Type>::jump() const
 {
     if (this->cyclicPatch().owner())
     {
@@ -117,7 +117,7 @@ Foam::tmp<Foam::Field<Type> > Foam::fixedJumpFvPatchField<Type>::jump() const
     }
     else
     {
-        return refCast<const fixedJumpFvPatchField<Type> >
+        return refCast<const fixedJumpFvPatchField<Type>>
         (
             this->neighbourPatchField()
         ).jump();
@@ -146,7 +146,7 @@ void Foam::fixedJumpFvPatchField<Type>::rmap
     jumpCyclicFvPatchField<Type>::rmap(ptf, addr);
 
     const fixedJumpFvPatchField<Type>& tiptf =
-        refCast<const fixedJumpFvPatchField<Type> >(ptf);
+        refCast<const fixedJumpFvPatchField<Type>>(ptf);
     jump_.rmap(tiptf.jump_, addr);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H
index ede9fea8af..d9f3aa6afa 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,9 +132,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedJumpFvPatchField<Type>(*this)
             );
@@ -148,12 +148,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedJumpFvPatchField<Type>(*this, iF)
             );
@@ -165,7 +165,7 @@ public:
         // Access
 
             //- Return the "jump" across the patch
-            virtual tmp<Field<Type> > jump() const;
+            virtual tmp<Field<Type>> jump() const;
 
 
         // Mapping functions
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
index 21b62c6e2c..59b606b5f7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ Foam::fixedJumpAMIFvPatchField<Type>::fixedJumpAMIFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fixedJumpAMIFvPatchField<Type>::jump() const
+Foam::tmp<Foam::Field<Type>> Foam::fixedJumpAMIFvPatchField<Type>::jump() const
 {
     if (this->cyclicAMIPatch().owner())
     {
@@ -118,7 +118,7 @@ Foam::tmp<Foam::Field<Type> > Foam::fixedJumpAMIFvPatchField<Type>::jump() const
     else
     {
         const fixedJumpAMIFvPatchField& nbrPatch =
-            refCast<const fixedJumpAMIFvPatchField<Type> >
+            refCast<const fixedJumpAMIFvPatchField<Type>>
             (
                 this->neighbourPatchField()
             );
@@ -160,7 +160,7 @@ void Foam::fixedJumpAMIFvPatchField<Type>::rmap
     jumpCyclicAMIFvPatchField<Type>::rmap(ptf, addr);
 
     const fixedJumpAMIFvPatchField<Type>& tiptf =
-        refCast<const fixedJumpAMIFvPatchField<Type> >(ptf);
+        refCast<const fixedJumpAMIFvPatchField<Type>>(ptf);
     jump_.rmap(tiptf.jump_, addr);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.H
index 9a0c4bf520..0f8ff41a5f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,9 +133,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedJumpAMIFvPatchField<Type>(*this)
             );
@@ -149,12 +149,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedJumpAMIFvPatchField<Type>(*this, iF)
             );
@@ -166,7 +166,7 @@ public:
         // Access
 
             //- Return the "jump" across the patch
-            virtual tmp<Field<Type> > jump() const;
+            virtual tmp<Field<Type>> jump() const;
 
 
         // Mapping functions
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
index ed31cfb998..cddd17d298 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,9 +123,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedMeanFvPatchField<Type>(*this)
             );
@@ -139,12 +139,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedMeanFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
index db06a2a003..df658614fb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,14 +116,14 @@ void Foam::fixedNormalSlipFvPatchField<Type>::rmap
     transformFvPatchField<Type>::rmap(ptf, addr);
 
     const fixedNormalSlipFvPatchField<Type>& dmptf =
-        refCast<const fixedNormalSlipFvPatchField<Type> >(ptf);
+        refCast<const fixedNormalSlipFvPatchField<Type>>(ptf);
 
     fixedValue_.rmap(dmptf.fixedValue_, addr);
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedNormalSlipFvPatchField<Type>::snGrad() const
 {
     const vectorField nHat(this->patch().nf());
@@ -160,7 +160,7 @@ void Foam::fixedNormalSlipFvPatchField<Type>::evaluate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedNormalSlipFvPatchField<Type>::snGradTransformDiag() const
 {
     const vectorField nHat(this->patch().nf());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
index bbaf0a257b..e4310a91b9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,9 +119,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedNormalSlipFvPatchField<Type>(*this)
             );
@@ -135,12 +135,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedNormalSlipFvPatchField<Type>(*this, iF)
             );
@@ -181,7 +181,7 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const;
+            virtual tmp<Field<Type>> snGrad() const;
 
             //- Evaluate the patch field
             virtual void evaluate
@@ -190,7 +190,7 @@ public:
             );
 
             //- Return face-gradient transform diagonal
-            virtual tmp<Field<Type> > snGradTransformDiag() const;
+            virtual tmp<Field<Type>> snGradTransformDiag() const;
 
 
         //- Write
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
index d644a8e73c..7d78126cf1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ class fixedProfileFvPatchField
     // Private data
 
         //- Profile data
-        autoPtr<DataEntry<Type> > profile_;
+        autoPtr<DataEntry<Type>> profile_;
 
         //- Profile direction
         vector dir_;
@@ -172,9 +172,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedProfileFvPatchField<Type>(*this)
             );
@@ -188,12 +188,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new fixedProfileFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
index f8e8f491a7..1fbd21c75b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ class flowRateInletVelocityFvPatchVectorField
     // Private data
 
         //- Inlet integral flow rate
-        autoPtr<DataEntry<scalar> > flowRate_;
+        autoPtr<DataEntry<scalar>> flowRate_;
 
         //- Is volumetric?
         bool volumetric_;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
index 057c667b7b..924cf479d8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,9 +118,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new freestreamFvPatchField<Type>(*this)
             );
@@ -134,12 +134,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new freestreamFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
index d141aa07a5..0e1f1187cc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,9 +135,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new inletOutletFvPatchField<Type>(*this)
             );
@@ -151,12 +151,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new inletOutletFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H
index 983df12eb4..da3f5c26a5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -157,9 +157,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mappedFieldFvPatchField<Type>
                 (
@@ -176,12 +176,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mappedFieldFvPatchField<Type>
                 (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
index 5e8c48df97..a4f4856f2a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,7 +166,7 @@ mappedPatchFieldBase<Type>::sampleField() const
 
 
 template<class Type>
-tmp<Field<Type> > mappedPatchFieldBase<Type>::mappedField() const
+tmp<Field<Type>> mappedPatchFieldBase<Type>::mappedField() const
 {
     typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
 
@@ -179,7 +179,7 @@ tmp<Field<Type> > mappedPatchFieldBase<Type>::mappedField() const
     const fvMesh& nbrMesh = refCast<const fvMesh>(mapper_.sampleMesh());
 
     // Result of obtaining remote values
-    tmp<Field<Type> > tnewValues(new Field<Type>(0));
+    tmp<Field<Type>> tnewValues(new Field<Type>(0));
     Field<Type>& newValues = tnewValues();
 
     switch (mapper_.mode())
@@ -203,7 +203,7 @@ tmp<Field<Type> > mappedPatchFieldBase<Type>::mappedField() const
                     samples
                 );
 
-                autoPtr<interpolation<Type> > interpolator
+                autoPtr<interpolation<Type>> interpolator
                 (
                     interpolation<Type>::New
                     (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H
index b8b69fa4ee..f9ec1396e7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -145,7 +145,7 @@ public:
         const GeometricField<Type, fvPatchField, volMesh>& sampleField() const;
 
         //- Map sampleField onto *this patch
-        virtual tmp<Field<Type> > mappedField() const;
+        virtual tmp<Field<Type>> mappedField() const;
 
         //- Write
         virtual void write(Ostream&) const;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H
index a4b48fce8f..909bcfe26b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,9 +126,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mappedFixedInternalValueFvPatchField<Type>(*this)
             );
@@ -142,12 +142,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mappedFixedInternalValueFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H
index 2f9ecedd66..da10304f6f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,9 +127,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mappedFixedPushedInternalValueFvPatchField<Type>
                 (
@@ -146,12 +146,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mappedFixedPushedInternalValueFvPatchField<Type>
                 (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.H
index 49b7d7a96b..4d6be29b8f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,9 +153,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mappedFixedValueFvPatchField<Type>(*this)
             );
@@ -169,12 +169,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mappedFixedValueFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
index 141c69522e..61e82b87e7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,7 +162,7 @@ void Foam::oscillatingFixedValueFvPatchField<Type>::rmap
     fixedValueFvPatchField<Type>::rmap(ptf, addr);
 
     const oscillatingFixedValueFvPatchField<Type>& tiptf =
-        refCast<const oscillatingFixedValueFvPatchField<Type> >(ptf);
+        refCast<const oscillatingFixedValueFvPatchField<Type>>(ptf);
 
     refValue_.rmap(tiptf.refValue_, addr);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H
index d16fb9644a..979f649b98 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,10 +111,10 @@ class oscillatingFixedValueFvPatchField
         Type offset_;
 
         //- Amplitude
-        autoPtr<DataEntry<scalar> > amplitude_;
+        autoPtr<DataEntry<scalar>> amplitude_;
 
         //- Frequency
-        autoPtr<DataEntry<scalar> > frequency_;
+        autoPtr<DataEntry<scalar>> frequency_;
 
         //- Current time index
         label curTimeIndex_;
@@ -166,9 +166,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new oscillatingFixedValueFvPatchField<Type>(*this)
             );
@@ -182,12 +182,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new oscillatingFixedValueFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
index 9d20845488..2b7a69b2f4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,9 +135,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new outletInletFvPatchField<Type>(*this)
             );
@@ -151,12 +151,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new outletInletFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
index 059faeab09..addf6642d5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,9 +127,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new outletMappedUniformInletFvPatchField<Type>(*this)
             );
@@ -143,12 +143,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new outletMappedUniformInletFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
index 1c4a891b05..35655ab3b4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,14 +115,14 @@ void Foam::partialSlipFvPatchField<Type>::rmap
     transformFvPatchField<Type>::rmap(ptf, addr);
 
     const partialSlipFvPatchField<Type>& dmptf =
-        refCast<const partialSlipFvPatchField<Type> >(ptf);
+        refCast<const partialSlipFvPatchField<Type>>(ptf);
 
     valueFraction_.rmap(dmptf.valueFraction_, addr);
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::partialSlipFvPatchField<Type>::snGrad() const
 {
     tmp<vectorField> nHat = this->patch().nf();
@@ -159,7 +159,7 @@ void Foam::partialSlipFvPatchField<Type>::evaluate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::partialSlipFvPatchField<Type>::snGradTransformDiag() const
 {
     const vectorField nHat(this->patch().nf());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
index b4fd5e7ce7..5d1b4c78a1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,9 +120,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new partialSlipFvPatchField<Type>(*this)
             );
@@ -136,12 +136,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new partialSlipFvPatchField<Type>(*this, iF)
             );
@@ -182,7 +182,7 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const;
+            virtual tmp<Field<Type>> snGrad() const;
 
             //- Evaluate the patch field
             virtual void evaluate
@@ -191,7 +191,7 @@ public:
             );
 
             //- Return face-gradient transform diagonal
-            virtual tmp<Field<Type> > snGradTransformDiag() const;
+            virtual tmp<Field<Type>> snGradTransformDiag() const;
 
 
         //- Write
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
index 2335f45739..767856bbe1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ class rotatingPressureInletOutletVelocityFvPatchVectorField
     // Private data
 
         //- Angular velocity of the frame
-        autoPtr<DataEntry<vector> > omega_;
+        autoPtr<DataEntry<vector>> omega_;
 
 
     // Private Member Functions
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H
index af6f11fef3..52e4e3572f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ class rotatingTotalPressureFvPatchScalarField
     // Private data
 
         //- Angular velocity of the frame
-        autoPtr<DataEntry<vector> > omega_;
+        autoPtr<DataEntry<vector>> omega_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
index c94e2985a9..e4d38f3a3b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ class rotatingWallVelocityFvPatchVectorField
         vector axis_;
 
         //- Rotational speed
-        autoPtr<DataEntry<scalar> > omega_;
+        autoPtr<DataEntry<scalar>> omega_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H
index ee50d19881..550f4cfba0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,9 +104,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new slipFvPatchField<Type>(*this)
             );
@@ -120,12 +120,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new slipFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
index a53dd0ca12..8d81fe7440 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,10 +98,10 @@ class swirlFlowRateInletVelocityFvPatchVectorField
         const word rhoName_;
 
         //- Inlet integral flow rate
-        autoPtr<DataEntry<scalar> > flowRate_;
+        autoPtr<DataEntry<scalar>> flowRate_;
 
         //- Angular speed in revolutions per minute (RPM)
-        autoPtr<DataEntry<scalar> > rpm_;
+        autoPtr<DataEntry<scalar>> rpm_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 1ef4675d4e..c418fec1b3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -222,7 +222,7 @@ void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::rmap
     fixedValueFvPatchField<Type>::rmap(ptf, addr);
 
     const timeVaryingMappedFixedValueFvPatchField<Type>& tiptf =
-        refCast<const timeVaryingMappedFixedValueFvPatchField<Type> >(ptf);
+        refCast<const timeVaryingMappedFixedValueFvPatchField<Type>>(ptf);
 
     startSampledValues_.rmap(tiptf.startSampledValues_, addr);
     endSampledValues_.rmap(tiptf.endSampledValues_, addr);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
index 389b965b99..bbe0d22cc8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,7 +135,7 @@ class timeVaryingMappedFixedValueFvPatchField
         Type endAverage_;
 
         //- Time varying offset values to interpolated data
-        autoPtr<DataEntry<Type> > offset_;
+        autoPtr<DataEntry<Type>> offset_;
 
 
 public:
@@ -178,9 +178,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new timeVaryingMappedFixedValueFvPatchField<Type>(*this)
             );
@@ -194,12 +194,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new timeVaryingMappedFixedValueFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index 55a3cda1db..771586d6a8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,7 +144,7 @@ void Foam::turbulentInletFvPatchField<Type>::rmap
     fixedValueFvPatchField<Type>::rmap(ptf, addr);
 
     const turbulentInletFvPatchField<Type>& tiptf =
-        refCast<const turbulentInletFvPatchField<Type> >(ptf);
+        refCast<const turbulentInletFvPatchField<Type>>(ptf);
 
     referenceField_.rmap(tiptf.referenceField_, addr);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
index f99a71cc35..7f167b296e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,9 +152,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new turbulentInletFvPatchField<Type>(*this)
             );
@@ -168,12 +168,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new turbulentInletFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
index 2ad895b362..5d14b0d899 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ class uniformFixedGradientFvPatchField
     // Private data
 
         //- Gradient
-        autoPtr<DataEntry<Type> > uniformGradient_;
+        autoPtr<DataEntry<Type>> uniformGradient_;
 
 
 public:
@@ -134,9 +134,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new uniformFixedGradientFvPatchField<Type>(*this)
             );
@@ -150,12 +150,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new uniformFixedGradientFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
index 6d77aa8857..d586a202fc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ class uniformFixedValueFvPatchField
 {
     // Private data
 
-        autoPtr<DataEntry<Type> > uniformValue_;
+        autoPtr<DataEntry<Type>> uniformValue_;
 
 
 public:
@@ -133,9 +133,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new uniformFixedValueFvPatchField<Type>(*this)
             );
@@ -149,12 +149,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new uniformFixedValueFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
index 2ab8c72ee8..fd886ee3bb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ protected:
         word phiName_;
 
         //- Value
-        autoPtr<DataEntry<Type> > uniformInletValue_;
+        autoPtr<DataEntry<Type>> uniformInletValue_;
 
 
 public:
@@ -137,9 +137,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new uniformInletOutletFvPatchField<Type>(*this)
             );
@@ -153,12 +153,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new uniformInletOutletFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
index aba63cb9d0..19b4a7f9b7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ protected:
     // Protected data
 
         //- "jump" table
-        autoPtr<DataEntry<Type> > jumpTable_;
+        autoPtr<DataEntry<Type>> jumpTable_;
 
 
 public:
@@ -135,9 +135,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new uniformJumpFvPatchField<Type>(*this)
             );
@@ -151,12 +151,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new uniformJumpFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
index e00f9f9991..392f09018b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ protected:
     // Protected data
 
         //- "jump" table
-        autoPtr<DataEntry<Type> > jumpTable_;
+        autoPtr<DataEntry<Type>> jumpTable_;
 
 
 public:
@@ -135,9 +135,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new uniformJumpAMIFvPatchField<Type>(*this)
             );
@@ -151,12 +151,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new uniformJumpAMIFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
index 1e50c82e29..17715b7fce 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ class uniformTotalPressureFvPatchScalarField
         scalar gamma_;
 
         //- Table of time vs total pressure, including the bounding treatment
-        autoPtr<DataEntry<scalar> > pressure_;
+        autoPtr<DataEntry<scalar>> pressure_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H
index 858dd6c1ce..f257f66197 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,9 +139,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<scalar> > clone() const
+        virtual tmp<fvPatchField<scalar>> clone() const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new variableHeightFlowRateFvPatchScalarField(*this)
             );
@@ -155,12 +155,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<scalar> > clone
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new variableHeightFlowRateFvPatchScalarField(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H
index 9ff79884d6..4ec9c16fc9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -145,9 +145,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new waveTransmissiveFvPatchField<Type>(*this)
             );
@@ -161,12 +161,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new waveTransmissiveFvPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index d276bf0459..e46692d50b 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,14 +197,14 @@ void Foam::fvPatchField<Type>::check(const fvPatchField<Type>& ptf) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fvPatchField<Type>::snGrad() const
+Foam::tmp<Foam::Field<Type>> Foam::fvPatchField<Type>::snGrad() const
 {
     return patch_.deltaCoeffs()*(*this - patchInternalField());
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fvPatchField<Type>::patchInternalField() const
 {
     return patch_.patchInternalField(internalField_);
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index dae962c303..1a5d47b3e8 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -204,9 +204,9 @@ public:
         fvPatchField(const fvPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >(new fvPatchField<Type>(*this));
+            return tmp<fvPatchField<Type>>(new fvPatchField<Type>(*this));
         }
 
         //- Construct as copy setting internal field reference
@@ -217,12 +217,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >(new fvPatchField<Type>(*this, iF));
+            return tmp<fvPatchField<Type>>(new fvPatchField<Type>(*this, iF));
         }
 
 
@@ -231,7 +231,7 @@ public:
         //- Return a pointer to a new patchField created on freestore given
         //  patch and internal field
         //  (does not set the patch field values)
-        static tmp<fvPatchField<Type> > New
+        static tmp<fvPatchField<Type>> New
         (
             const word&,
             const fvPatch&,
@@ -242,7 +242,7 @@ public:
         //  patch and internal field
         //  (does not set the patch field values).
         //  Allows override of constraint type
-        static tmp<fvPatchField<Type> > New
+        static tmp<fvPatchField<Type>> New
         (
             const word&,
             const word& actualPatchType,
@@ -252,7 +252,7 @@ public:
 
         //- Return a pointer to a new patchField created on freestore from
         //  a given fvPatchField mapped onto a new patch
-        static tmp<fvPatchField<Type> > New
+        static tmp<fvPatchField<Type>> New
         (
             const fvPatchField<Type>&,
             const fvPatch&,
@@ -262,7 +262,7 @@ public:
 
         //- Return a pointer to a new patchField created on freestore
         //  from dictionary
-        static tmp<fvPatchField<Type> > New
+        static tmp<fvPatchField<Type>> New
         (
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
@@ -271,7 +271,7 @@ public:
 
         //- Return a pointer to a new calculatedFvPatchField created on
         //  freestore without setting patchField values
-        static tmp<fvPatchField<Type> > NewCalculatedType
+        static tmp<fvPatchField<Type>> NewCalculatedType
         (
             const fvPatch&
         );
@@ -279,7 +279,7 @@ public:
         //- Return a pointer to a new calculatedFvPatchField created on
         //  freestore without setting patchField values
         template<class Type2>
-        static tmp<fvPatchField<Type> > NewCalculatedType
+        static tmp<fvPatchField<Type>> NewCalculatedType
         (
             const fvPatchField<Type2>&
         );
@@ -377,11 +377,11 @@ public:
         // Evaluation functions
 
             //- Return patch-normal gradient
-            virtual tmp<Field<Type> > snGrad() const;
+            virtual tmp<Field<Type>> snGrad() const;
 
             //- Return patch-normal gradient for coupled-patches
             //  using the deltaCoeffs provided
-            virtual tmp<Field<Type> > snGrad
+            virtual tmp<Field<Type>> snGrad
             (
                 const scalarField& deltaCoeffs
             ) const
@@ -400,13 +400,13 @@ public:
             virtual void updateCoeffs(const scalarField& weights);
 
             //- Return internal field next to patch as patch field
-            virtual tmp<Field<Type> > patchInternalField() const;
+            virtual tmp<Field<Type>> patchInternalField() const;
 
             //- Return internal field next to patch as patch field
             virtual void patchInternalField(Field<Type>&) const;
 
             //- Return patchField on the opposite patch of a coupled patch
-            virtual tmp<Field<Type> > patchNeighbourField() const
+            virtual tmp<Field<Type>> patchNeighbourField() const
             {
                 NotImplemented;
                 return *this;
@@ -428,9 +428,9 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
-                const tmp<Field<scalar> >&
+                const tmp<Field<scalar>>&
             ) const
             {
                 NotImplemented;
@@ -439,9 +439,9 @@ public:
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
-                const tmp<Field<scalar> >&
+                const tmp<Field<scalar>>&
             ) const
             {
                 NotImplemented;
@@ -450,7 +450,7 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs() const
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const
             {
                 NotImplemented;
                 return *this;
@@ -459,7 +459,7 @@ public:
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this coupled patchField
             //  using the deltaCoeffs provided
-            virtual tmp<Field<Type> > gradientInternalCoeffs
+            virtual tmp<Field<Type>> gradientInternalCoeffs
             (
                 const scalarField& deltaCoeffs
             ) const
@@ -470,7 +470,7 @@ public:
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs() const
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const
             {
                 NotImplemented;
                 return *this;
@@ -479,7 +479,7 @@ public:
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this coupled patchField
             //  using the deltaCoeffs provided
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs
             (
                 const scalarField& deltaCoeffs
             ) const
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
index a88caa7b66..af6e721b8b 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
+Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
 (
     const word& patchFieldType,
     const word& actualPatchType,
@@ -77,7 +77,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
     }
     else
     {
-        tmp<fvPatchField<Type> > tfvp = cstrIter()(p, iF);
+        tmp<fvPatchField<Type>> tfvp = cstrIter()(p, iF);
 
         // Check if constraint type override and store patchType if so
         if ((patchTypeCstrIter != patchConstructorTablePtr_->end()))
@@ -90,7 +90,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
 
 
 template<class Type>
-Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
+Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
 (
     const word& patchFieldType,
     const fvPatch& p,
@@ -102,7 +102,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
 
 
 template<class Type>
-Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
+Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -172,7 +172,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
 
 
 template<class Type>
-Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
+Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
 (
     const fvPatchField<Type>& ptf,
     const fvPatch& p,
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
index e6e1735fa1..5202908f98 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
 
 
 template<class Type>
-Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::tmp<Foam::fvsPatchField<Type>>
 Foam::fvsPatchField<Type>::NewCalculatedType
 (
     const fvPatch& p
@@ -113,7 +113,7 @@ Foam::fvsPatchField<Type>::NewCalculatedType
     }
     else
     {
-        return tmp<fvsPatchField<Type> >
+        return tmp<fvsPatchField<Type>>
         (
             new calculatedFvsPatchField<Type>
             (
@@ -127,7 +127,7 @@ Foam::fvsPatchField<Type>::NewCalculatedType
 
 template<class Type>
 template<class Type2>
-Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::tmp<Foam::fvsPatchField<Type>>
 Foam::fvsPatchField<Type>::NewCalculatedType
 (
     const fvsPatchField<Type2>& pf
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
index 549f9597dc..e9ef84ed7c 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,9 +91,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new calculatedFvsPatchField<Type>(*this)
             );
@@ -107,12 +107,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new calculatedFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H
index 9c56b6f1ad..1458e879fc 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const = 0;
+        virtual tmp<fvsPatchField<Type>> clone() const = 0;
 
         //- Construct as copy setting internal field reference
         coupledFvsPatchField
@@ -110,7 +110,7 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>&
         ) const = 0;
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
index cf8f46bfa3..107313dd4c 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,13 +87,13 @@ Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedValueFvsPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<Type> >
+    return tmp<Field<Type>>
     (
         new Field<Type>(this->size(), pTraits<Type>::zero)
     );
@@ -101,7 +101,7 @@ Foam::fixedValueFvsPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedValueFvsPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
@@ -112,7 +112,7 @@ Foam::fixedValueFvsPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedValueFvsPatchField<Type>::gradientInternalCoeffs() const
 {
     return -pTraits<Type>::one*this->patch().deltaCoeffs();
@@ -120,7 +120,7 @@ Foam::fixedValueFvsPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fixedValueFvsPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return this->patch().deltaCoeffs()*(*this);
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
index baa7241809..5ab20e641a 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new fixedValueFvsPatchField<Type>(*this)
             );
@@ -108,12 +108,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new fixedValueFvsPatchField<Type>(*this, iF)
             );
@@ -137,25 +137,25 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs() const;
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const;
 
 
     // Member operators
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
index 84182ccdfc..9cd047b214 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,10 +97,10 @@ Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
 
 
 template<class Type>
-Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::tmp<Foam::fvsPatchField<Type>>
 Foam::slicedFvsPatchField<Type>::clone() const
 {
-    return tmp<fvsPatchField<Type> >
+    return tmp<fvsPatchField<Type>>
     (
         new slicedFvsPatchField<Type>(*this)
     );
@@ -126,13 +126,13 @@ Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
 
 
 template<class Type>
-Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::tmp<Foam::fvsPatchField<Type>>
 Foam::slicedFvsPatchField<Type>::clone
 (
     const DimensionedField<Type, surfaceMesh>& iF
 ) const
 {
-    return tmp<fvsPatchField<Type> >
+    return tmp<fvsPatchField<Type>>
     (
         new slicedFvsPatchField<Type>(*this, iF)
     );
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
index 5fcc3c18ae..c229d70114 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ public:
         slicedFvsPatchField(const slicedFvsPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const;
+        virtual tmp<fvsPatchField<Type>> clone() const;
 
         //- Construct as copy setting internal field reference
         slicedFvsPatchField
@@ -113,7 +113,7 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const;
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H
index ee62131607..b026877c72 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,9 +97,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new cyclicFvsPatchField<Type>(*this)
             );
@@ -113,12 +113,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new cyclicFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.H
index edd7b9bf15..02c57a0eee 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,9 +97,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new cyclicACMIFvsPatchField<Type>(*this)
             );
@@ -113,12 +113,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new cyclicACMIFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H
index d55ff5cd5d..f7340f5487 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,9 +97,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new cyclicAMIFvsPatchField<Type>(*this)
             );
@@ -113,12 +113,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new cyclicAMIFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H
index 9b3e26cf8e..d6e80130bf 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new cyclicSlipFvsPatchField<Type>(*this)
             );
@@ -108,12 +108,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new cyclicSlipFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
index a2c4f2c0cc..dfafe46a58 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new emptyFvsPatchField<Type>(*this)
             );
@@ -108,12 +108,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new emptyFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H
index 1aac3703cd..ecf3f40a82 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new nonuniformTransformCyclicFvsPatchField<Type>(*this)
             );
@@ -109,12 +109,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new nonuniformTransformCyclicFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
index 38aa5f18c7..29c6e522b4 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,9 +102,9 @@ public:
         processorFvsPatchField(const processorFvsPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new processorFvsPatchField<Type>(*this)
             );
@@ -118,12 +118,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new processorFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H
index c096662b29..2f74fdc88d 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,9 +103,9 @@ public:
         processorCyclicFvsPatchField(const processorCyclicFvsPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new processorCyclicFvsPatchField<Type>(*this)
             );
@@ -119,12 +119,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new processorCyclicFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H
index 64c6c48da7..1ae3aa1a49 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new symmetryFvsPatchField<Type>(*this)
             );
@@ -108,12 +108,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new symmetryFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H
index 8dd2035610..0b7f50d577 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new symmetryPlaneFvsPatchField<Type>(*this)
             );
@@ -109,12 +109,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new symmetryPlaneFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H
index dabd590d7f..12aae142c6 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new wedgeFvsPatchField<Type>(*this)
             );
@@ -108,12 +108,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new wedgeFvsPatchField<Type>(*this, iF)
             );
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 88fb9a7d58..9a8019d7ca 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -179,9 +179,9 @@ public:
         fvsPatchField(const fvsPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual tmp<fvsPatchField<Type> > clone() const
+        virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type> >(new fvsPatchField<Type>(*this));
+            return tmp<fvsPatchField<Type>>(new fvsPatchField<Type>(*this));
         }
 
         //- Construct as copy setting internal field reference
@@ -192,12 +192,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvsPatchField<Type> > clone
+        virtual tmp<fvsPatchField<Type>> clone
         (
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type> >
+            return tmp<fvsPatchField<Type>>
             (
                 new fvsPatchField<Type>(*this, iF)
             );
@@ -209,7 +209,7 @@ public:
         //- Return a pointer to a new patchField created on freestore given
         //  patch and internal field
         //  (does not set the patch field values)
-        static tmp<fvsPatchField<Type> > New
+        static tmp<fvsPatchField<Type>> New
         (
             const word&,
             const fvPatch&,
@@ -220,7 +220,7 @@ public:
         //  patch and internal field
         //  (does not set the patch field values)
         //  Allows override of constraint type
-        static tmp<fvsPatchField<Type> > New
+        static tmp<fvsPatchField<Type>> New
         (
             const word&,
             const word& actualPatchType,
@@ -230,7 +230,7 @@ public:
 
         //- Return a pointer to a new patchField created on freestore from
         //  a given fvsPatchField mapped onto a new patch
-        static tmp<fvsPatchField<Type> > New
+        static tmp<fvsPatchField<Type>> New
         (
             const fvsPatchField<Type>&,
             const fvPatch&,
@@ -240,7 +240,7 @@ public:
 
         //- Return a pointer to a new patchField created on freestore
         //  from dictionary
-        static tmp<fvsPatchField<Type> > New
+        static tmp<fvsPatchField<Type>> New
         (
             const fvPatch&,
             const DimensionedField<Type, surfaceMesh>&,
@@ -249,7 +249,7 @@ public:
 
         //- Return a pointer to a new calculatedFvsPatchField created on
         //  freestore without setting patchField values
-        static tmp<fvsPatchField<Type> > NewCalculatedType
+        static tmp<fvsPatchField<Type>> NewCalculatedType
         (
             const fvPatch&
         );
@@ -257,7 +257,7 @@ public:
         //- Return a pointer to a new calculatedFvsPatchField created on
         //  freestore without setting patchField values
         template<class Type2>
-        static tmp<fvsPatchField<Type> > NewCalculatedType
+        static tmp<fvsPatchField<Type>> NewCalculatedType
         (
             const fvsPatchField<Type2>&
         );
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
index b1f0d186da..c47e89ada2 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
+tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
 (
     const word& patchFieldType,
     const word& actualPatchType,
@@ -86,7 +86,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
 
 
 template<class Type>
-tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
+tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
 (
     const word& patchFieldType,
     const fvPatch& p,
@@ -98,7 +98,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
 
 
 template<class Type>
-tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
+tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
@@ -170,7 +170,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
 // Return a pointer to a new patch created on freestore from
 // a given fvsPatchField<Type> mapped onto a new patch
 template<class Type>
-tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
+tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
 (
     const fvsPatchField<Type>& ptf,
     const fvPatch& p,
diff --git a/src/finiteVolume/fields/volFields/volFields.C b/src/finiteVolume/fields/volFields/volFields.C
index 65dd22e5a3..055e182b72 100644
--- a/src/finiteVolume/fields/volFields/volFields.C
+++ b/src/finiteVolume/fields/volFields/volFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ defineTemplateTypeNameAndDebug(volTensorField, 0);
 
 // specialization for scalar fields
 template<>
-tmp<GeometricField<scalar, fvPatchField, volMesh> >
+tmp<GeometricField<scalar, fvPatchField, volMesh>>
 GeometricField<scalar, fvPatchField, volMesh>::component
 (
     const direction
diff --git a/src/finiteVolume/fields/volFields/volFields.H b/src/finiteVolume/fields/volFields/volFields.H
index ef3a632c30..145fc5dccb 100644
--- a/src/finiteVolume/fields/volFields/volFields.H
+++ b/src/finiteVolume/fields/volFields/volFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<>
-tmp<GeometricField<scalar, fvPatchField, volMesh> >
+tmp<GeometricField<scalar, fvPatchField, volMesh>>
 GeometricField<scalar, fvPatchField, volMesh>::component
 (
     const direction
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.C
index 1e5c911763..5da9b1486c 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 boundedConvectionScheme<Type>::interpolate
 (
     const surfaceScalarField& phi,
@@ -53,7 +53,7 @@ boundedConvectionScheme<Type>::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 boundedConvectionScheme<Type>::flux
 (
     const surfaceScalarField& faceFlux,
@@ -65,7 +65,7 @@ boundedConvectionScheme<Type>::flux
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 boundedConvectionScheme<Type>::fvmDiv
 (
     const surfaceScalarField& faceFlux,
@@ -79,7 +79,7 @@ boundedConvectionScheme<Type>::fvmDiv
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 boundedConvectionScheme<Type>::fvcDiv
 (
     const surfaceScalarField& faceFlux,
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
index 9426104d33..bdbbf14cf8 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ class boundedConvectionScheme
 {
     // Private data
 
-        tmp<fv::convectionScheme<Type> > scheme_;
+        tmp<fv::convectionScheme<Type>> scheme_;
 
 
     // Private Member Functions
@@ -103,25 +103,25 @@ public:
 
     // Member Functions
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<fvMatrix<Type> > fvmDiv
+        tmp<fvMatrix<Type>> fvmDiv
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDiv
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
index a7bbdeed72..851ff9fe84 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ convectionScheme<Type>::convectionScheme(const convectionScheme& cs)
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<convectionScheme<Type> > convectionScheme<Type>::New
+tmp<convectionScheme<Type>> convectionScheme<Type>::New
 (
     const fvMesh& mesh,
     const surfaceScalarField& faceFlux,
@@ -101,7 +101,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
 
 
 template<class Type>
-tmp<convectionScheme<Type> > convectionScheme<Type>::New
+tmp<convectionScheme<Type>> convectionScheme<Type>::New
 (
     const fvMesh& mesh,
     const typename multivariateSurfaceInterpolationScheme<Type>::
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
index 491ed48496..999413beac 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ public:
     // Selectors
 
         //- Return a pointer to a new convectionScheme created on freestore
-        static tmp<convectionScheme<Type> > New
+        static tmp<convectionScheme<Type>> New
         (
             const fvMesh& mesh,
             const surfaceScalarField& faceFlux,
@@ -137,7 +137,7 @@ public:
 
         //- Return a pointer to a new multivariate convectionScheme
         //  created on freestore
-        static tmp<convectionScheme<Type> > New
+        static tmp<convectionScheme<Type>> New
         (
             const fvMesh& mesh,
             const typename multivariateSurfaceInterpolationScheme<Type>::
@@ -159,26 +159,26 @@ public:
             return mesh_;
         }
 
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const = 0;
 
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const = 0;
 
-        virtual tmp<fvMatrix<Type> > fvmDiv
+        virtual tmp<fvMatrix<Type>> fvmDiv
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDiv
+        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -210,7 +210,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            convectionScheme<Type>::addIstreamConstructorToTable<SS<Type> >    \
+            convectionScheme<Type>::addIstreamConstructorToTable<SS<Type>>    \
                 add##SS##Type##IstreamConstructorToTable_;                     \
         }                                                                      \
     }
@@ -232,7 +232,7 @@ makeFvConvectionTypeScheme(SS, tensor)
         namespace fv                                                           \
         {                                                                      \
             convectionScheme<Type>::                                           \
-                addMultivariateConstructorToTable<SS<Type> >                   \
+                addMultivariateConstructorToTable<SS<Type>>                   \
                 add##SS##Type##MultivariateConstructorToTable_;                \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C
index 1c68b9cf12..152b0dc6c4 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ gaussConvectionScheme<Type>::interpScheme() const
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 gaussConvectionScheme<Type>::interpolate
 (
     const surfaceScalarField&,
@@ -60,7 +60,7 @@ gaussConvectionScheme<Type>::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 gaussConvectionScheme<Type>::flux
 (
     const surfaceScalarField& faceFlux,
@@ -72,7 +72,7 @@ gaussConvectionScheme<Type>::flux
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 gaussConvectionScheme<Type>::fvmDiv
 (
     const surfaceScalarField& faceFlux,
@@ -82,7 +82,7 @@ gaussConvectionScheme<Type>::fvmDiv
     tmp<surfaceScalarField> tweights = tinterpScheme_().weights(vf);
     const surfaceScalarField& weights = tweights();
 
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -116,14 +116,14 @@ gaussConvectionScheme<Type>::fvmDiv
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 gaussConvectionScheme<Type>::fvcDiv
 (
     const surfaceScalarField& faceFlux,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tConvection
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tConvection
     (
         fvc::surfaceIntegrate(flux(faceFlux, vf))
     );
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
index 83b50416e9..516e78e2fc 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ class gaussConvectionScheme
 {
     // Private data
 
-        tmp<surfaceInterpolationScheme<Type> > tinterpScheme_;
+        tmp<surfaceInterpolationScheme<Type>> tinterpScheme_;
 
 
     // Private Member Functions
@@ -87,7 +87,7 @@ public:
         (
             const fvMesh& mesh,
             const surfaceScalarField& faceFlux,
-            const tmp<surfaceInterpolationScheme<Type> >& scheme
+            const tmp<surfaceInterpolationScheme<Type>>& scheme
         )
         :
             convectionScheme<Type>(mesh, faceFlux),
@@ -136,25 +136,25 @@ public:
 
         const surfaceInterpolationScheme<Type>& interpScheme() const;
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<fvMatrix<Type> > fvmDiv
+        tmp<fvMatrix<Type>> fvmDiv
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDiv
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.C
index b979f534ab..0a1da8aa97 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 multivariateGaussConvectionScheme<Type>::interpolate
 (
     const surfaceScalarField& faceFlux,
@@ -57,7 +57,7 @@ multivariateGaussConvectionScheme<Type>::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 multivariateGaussConvectionScheme<Type>::flux
 (
     const surfaceScalarField& faceFlux,
@@ -74,7 +74,7 @@ multivariateGaussConvectionScheme<Type>::flux
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 multivariateGaussConvectionScheme<Type>::fvmDiv
 (
     const surfaceScalarField& faceFlux,
@@ -91,7 +91,7 @@ multivariateGaussConvectionScheme<Type>::fvmDiv
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 multivariateGaussConvectionScheme<Type>::fvcDiv
 (
     const surfaceScalarField& faceFlux,
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H
index df8fde08be..3f7288d3c5 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ class multivariateGaussConvectionScheme
 {
     // Private data
 
-        tmp<multivariateSurfaceInterpolationScheme<Type> > tinterpScheme_;
+        tmp<multivariateSurfaceInterpolationScheme<Type>> tinterpScheme_;
 
 
 public:
@@ -92,31 +92,31 @@ public:
 
     // Member Functions
 
-        tmp<multivariateSurfaceInterpolationScheme<Type> >
+        tmp<multivariateSurfaceInterpolationScheme<Type>>
         interpolationScheme() const
         {
             return tinterpScheme_;
         }
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<fvMatrix<Type> > fvmDiv
+        tmp<fvMatrix<Type>> fvmDiv
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDiv
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
index 76064b74f4..6d8a46ba73 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 EulerD2dt2Scheme<Type>::fvcD2dt2
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -72,7 +72,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
         scalarField VV0 = mesh().V() + mesh().V0();
         scalarField V0V00 = mesh().V0() + mesh().V00();
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -99,7 +99,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -117,7 +117,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 EulerD2dt2Scheme<Type>::fvcD2dt2
 (
     const volScalarField& rho,
@@ -162,7 +162,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
             )
         );
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -214,7 +214,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
         const volScalarField rhoRho0(rho + rho.oldTime());
         const volScalarField rho0Rho00(rho.oldTime() +rho.oldTime().oldTime());
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -232,13 +232,13 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 EulerD2dt2Scheme<Type>::fvmD2dt2
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -291,14 +291,14 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 EulerD2dt2Scheme<Type>::fvmD2dt2
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -351,14 +351,14 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 EulerD2dt2Scheme<Type>::fvmD2dt2
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
index a1e8fa0bc3..ff8df9a827 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,29 +95,29 @@ public:
             return fv::d2dt2Scheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcD2dt2
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcD2dt2
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmD2dt2
+        tmp<fvMatrix<Type>> fvmD2dt2
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmD2dt2
+        tmp<fvMatrix<Type>> fvmD2dt2
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmD2dt2
+        tmp<fvMatrix<Type>> fvmD2dt2
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
index da24924115..5189fd4344 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
+tmp<d2dt2Scheme<Type>> d2dt2Scheme<Type>::New
 (
     const fvMesh& mesh,
     Istream& schemeData
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
index 55e2fd21e2..80b20137b8 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ public:
     // Selectors
 
         //- Return a pointer to a new d2dt2Scheme created on freestore
-        static tmp<d2dt2Scheme<Type> > New
+        static tmp<d2dt2Scheme<Type>> New
         (
             const fvMesh& mesh,
             Istream& schemeData
@@ -138,29 +138,29 @@ public:
             return mesh_;
         }
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh> > fvcD2dt2
+        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh> > fvcD2dt2
+        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<fvMatrix<Type> > fvmD2dt2
+        virtual tmp<fvMatrix<Type>> fvmD2dt2
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<fvMatrix<Type> > fvmD2dt2
+        virtual tmp<fvMatrix<Type>> fvmD2dt2
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<fvMatrix<Type> > fvmD2dt2
+        virtual tmp<fvMatrix<Type>> fvmD2dt2
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -187,7 +187,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            d2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type> >         \
+            d2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type>>         \
                 add##SS##Type##IstreamConstructorToTable_;                     \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
index 614279e87c..7f21db69bb 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,13 +40,13 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 steadyStateD2dt2Scheme<Type>::fvcD2dt2
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    return tmp<GeometricField<Type, fvPatchField, volMesh>>
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -71,14 +71,14 @@ steadyStateD2dt2Scheme<Type>::fvcD2dt2
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 steadyStateD2dt2Scheme<Type>::fvcD2dt2
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    return tmp<GeometricField<Type, fvPatchField, volMesh>>
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -103,13 +103,13 @@ steadyStateD2dt2Scheme<Type>::fvcD2dt2
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 steadyStateD2dt2Scheme<Type>::fvmD2dt2
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -123,14 +123,14 @@ steadyStateD2dt2Scheme<Type>::fvmD2dt2
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 steadyStateD2dt2Scheme<Type>::fvmD2dt2
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -144,14 +144,14 @@ steadyStateD2dt2Scheme<Type>::fvmD2dt2
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 steadyStateD2dt2Scheme<Type>::fvmD2dt2
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
index 986e1be05a..835a151eda 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,29 +94,29 @@ public:
             return fv::d2dt2Scheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcD2dt2
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcD2dt2
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmD2dt2
+        tmp<fvMatrix<Type>> fvmD2dt2
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmD2dt2
+        tmp<fvMatrix<Type>> fvmD2dt2
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmD2dt2
+        tmp<fvMatrix<Type>> fvmD2dt2
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index 64cfa89943..89a997ba17 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -151,7 +151,7 @@ tmp<surfaceScalarField> CoEulerDdtScheme<Type>::CofrDeltaT() const
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 CoEulerDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -168,7 +168,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh> > tdtdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -191,7 +191,7 @@ CoEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -211,7 +211,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 CoEulerDdtScheme<Type>::fvcDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -228,7 +228,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -249,7 +249,7 @@ CoEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -262,7 +262,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 CoEulerDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
@@ -280,7 +280,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -301,7 +301,7 @@ CoEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -314,7 +314,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 CoEulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
@@ -332,7 +332,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -356,7 +356,7 @@ CoEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -369,7 +369,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 CoEulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
@@ -388,7 +388,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -421,7 +421,7 @@ CoEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -438,13 +438,13 @@ CoEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 CoEulerDdtScheme<Type>::fvmDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -473,14 +473,14 @@ CoEulerDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 CoEulerDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -510,14 +510,14 @@ CoEulerDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 CoEulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -549,7 +549,7 @@ CoEulerDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 CoEulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
@@ -557,7 +557,7 @@ CoEulerDdtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
index e743a0cb40..f74b739d04 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,53 +117,53 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& psi
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 79f89460bd..c98d9979a9 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -280,14 +280,14 @@ const FieldField<fvPatchField, Type>& ff
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 CrankNicolsonDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
         (
             "ddt0(" + dt.name() + ')',
             dt.dimensions()
@@ -300,7 +300,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
         mesh()
     );
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tdtdt
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -342,14 +342,14 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 CrankNicolsonDdtScheme<Type>::fvcDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
         (
             "ddt0(" + vf.name() + ')',
             vf.dimensions()
@@ -389,7 +389,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -418,7 +418,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
                  - offCentre_(ddt0());
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -431,15 +431,15 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 CrankNicolsonDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
         (
             "ddt0(" + rho.name() + ',' + vf.name() + ')',
             rho.dimensions()*vf.dimensions()
@@ -479,7 +479,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -508,7 +508,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
                  - offCentre_(ddt0());
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -521,15 +521,15 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 CrankNicolsonDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
         (
             "ddt0(" + rho.name() + ',' + vf.name() + ')',
             rho.dimensions()*vf.dimensions()
@@ -573,7 +573,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -607,7 +607,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             ) - offCentre_(ddt0());
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -621,7 +621,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 CrankNicolsonDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
@@ -629,8 +629,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
         (
             "ddt0(" + alpha.name() + ',' + rho.name() + ',' + vf.name() + ')',
             alpha.dimensions()*rho.dimensions()*vf.dimensions()
@@ -682,7 +682,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -733,7 +733,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             ) - offCentre_(ddt0());
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -751,20 +751,20 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 CrankNicolsonDdtScheme<Type>::fvmDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
         (
             "ddt0(" + vf.name() + ')',
             vf.dimensions()
         );
 
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -833,21 +833,21 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 CrankNicolsonDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
         (
             "ddt0(" + rho.name() + ',' + vf.name() + ')',
             rho.dimensions()*vf.dimensions()
         );
 
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -915,21 +915,21 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 CrankNicolsonDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
         (
             "ddt0(" + rho.name() + ',' + vf.name() + ')',
             rho.dimensions()*vf.dimensions()
         );
 
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -1005,7 +1005,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 CrankNicolsonDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
@@ -1013,14 +1013,14 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
         (
             "ddt0(" + alpha.name() + ',' + rho.name() + ',' + vf.name() + ')',
             alpha.dimensions()*rho.dimensions()*vf.dimensions()
         );
 
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -1123,15 +1123,15 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
     const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
         (
             "ddt0(" + U.name() + ')',
             U.dimensions()
         );
 
-    DDt0Field<GeometricField<Type, fvsPatchField, surfaceMesh> >& dUfdt0 =
-        ddt0_<GeometricField<Type, fvsPatchField, surfaceMesh> >
+    DDt0Field<GeometricField<Type, fvsPatchField, surfaceMesh>>& dUfdt0 =
+        ddt0_<GeometricField<Type, fvsPatchField, surfaceMesh>>
         (
             "ddt0(" + Uf.name() + ')',
             Uf.dimensions()
@@ -1184,8 +1184,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
     const fluxFieldType& phi
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
         (
             "ddt0(" + U.name() + ')',
             U.dimensions()
@@ -1252,15 +1252,15 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
      && Uf.dimensions() == rho.dimensions()*dimVelocity
     )
     {
-        DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-            ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+        DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+            ddt0_<GeometricField<Type, fvPatchField, volMesh>>
             (
                 "ddt0(" + rho.name() + ',' + U.name() + ')',
                 U.dimensions()
             );
 
-        DDt0Field<GeometricField<Type, fvsPatchField, surfaceMesh> >& dUfdt0 =
-            ddt0_<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        DDt0Field<GeometricField<Type, fvsPatchField, surfaceMesh>>& dUfdt0 =
+            ddt0_<GeometricField<Type, fvsPatchField, surfaceMesh>>
             (
                 "ddt0(" + Uf.name() + ')',
                 Uf.dimensions()
@@ -1347,8 +1347,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
      && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea
     )
     {
-        DDt0Field<GeometricField<Type, fvPatchField, volMesh> >& ddt0 =
-            ddt0_<GeometricField<Type, fvPatchField, volMesh> >
+        DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
+            ddt0_<GeometricField<Type, fvPatchField, volMesh>>
             (
                 "ddt0(" + rho.name() + ',' + U.name() + ')',
                 U.dimensions()
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
index db2c5a08f0..dabe016b71 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -232,53 +232,53 @@ public:
             return ocCoeff_;
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& psi
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index 1d64797ac7..8cbc6d42a0 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 EulerDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -58,7 +58,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh> > tdtdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -80,7 +80,7 @@ EulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -100,7 +100,7 @@ EulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 EulerDdtScheme<Type>::fvcDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -117,7 +117,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -138,7 +138,7 @@ EulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -151,7 +151,7 @@ EulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 EulerDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
@@ -169,7 +169,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -190,7 +190,7 @@ EulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -203,7 +203,7 @@ EulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 EulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
@@ -221,7 +221,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -245,7 +245,7 @@ EulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -258,7 +258,7 @@ EulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 EulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
@@ -277,7 +277,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -310,7 +310,7 @@ EulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -327,13 +327,13 @@ EulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 EulerDdtScheme<Type>::fvmDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -362,14 +362,14 @@ EulerDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 EulerDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -399,14 +399,14 @@ EulerDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 EulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -438,7 +438,7 @@ EulerDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 EulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
@@ -446,7 +446,7 @@ EulerDdtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
index 2818fa123f..56dcbe2e13 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,53 +95,53 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& psi
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index 6873c38431..f787188a4b 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -151,7 +151,7 @@ tmp<volScalarField> SLTSDdtScheme<Type>::SLrDeltaT() const
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 SLTSDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -168,7 +168,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh> > tdtdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -190,7 +190,7 @@ SLTSDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -210,7 +210,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 SLTSDdtScheme<Type>::fvcDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -227,7 +227,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -248,7 +248,7 @@ SLTSDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -261,7 +261,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 SLTSDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
@@ -279,7 +279,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -300,7 +300,7 @@ SLTSDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -313,7 +313,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 SLTSDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
@@ -331,7 +331,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -355,7 +355,7 @@ SLTSDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -368,7 +368,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 SLTSDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
@@ -387,7 +387,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -420,7 +420,7 @@ SLTSDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -437,13 +437,13 @@ SLTSDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 SLTSDdtScheme<Type>::fvmDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -475,14 +475,14 @@ SLTSDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 SLTSDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -512,14 +512,14 @@ SLTSDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 SLTSDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -551,7 +551,7 @@ SLTSDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 SLTSDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
@@ -559,7 +559,7 @@ SLTSDdtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
index ee92d658b6..fd6bd6eb6f 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,53 +119,53 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& psi
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index 9d17e8dbfc..5108e7d31a 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ scalar backwardDdtScheme<Type>::deltaT0_(const GeoField& vf) const
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 backwardDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -96,7 +96,7 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh> > tdtdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -120,7 +120,7 @@ backwardDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -140,7 +140,7 @@ backwardDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 backwardDdtScheme<Type>::fvcDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -164,7 +164,7 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -193,7 +193,7 @@ backwardDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -211,7 +211,7 @@ backwardDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 backwardDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
@@ -236,7 +236,7 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -265,7 +265,7 @@ backwardDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -283,7 +283,7 @@ backwardDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 backwardDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
@@ -308,7 +308,7 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -340,7 +340,7 @@ backwardDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -358,7 +358,7 @@ backwardDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 backwardDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
@@ -384,7 +384,7 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -433,7 +433,7 @@ backwardDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -452,13 +452,13 @@ backwardDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 backwardDdtScheme<Type>::fvmDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -503,14 +503,14 @@ backwardDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 backwardDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -554,14 +554,14 @@ backwardDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 backwardDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -608,7 +608,7 @@ backwardDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 backwardDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
@@ -616,7 +616,7 @@ backwardDdtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
index 9855ad5599..ff6ff90da3 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,53 +106,53 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& psi
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C
index d5ea7dbcbb..e7dc6dc813 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 boundedDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -53,7 +53,7 @@ boundedDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 boundedDdtScheme<Type>::fvcDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -64,7 +64,7 @@ boundedDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 boundedDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
@@ -76,7 +76,7 @@ boundedDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 boundedDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
@@ -88,7 +88,7 @@ boundedDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 boundedDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
@@ -101,7 +101,7 @@ boundedDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 boundedDdtScheme<Type>::fvmDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -112,7 +112,7 @@ boundedDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 boundedDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
@@ -124,7 +124,7 @@ boundedDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 boundedDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
@@ -136,7 +136,7 @@ boundedDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 boundedDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
index 741e7c1e0f..59abfc9113 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ class boundedDdtScheme
 {
     // Private data
 
-        tmp<fv::ddtScheme<Type> > scheme_;
+        tmp<fv::ddtScheme<Type>> scheme_;
 
 
     // Private Member Functions
@@ -104,53 +104,53 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& psi
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 8777ec8973..8f7bf67b65 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<ddtScheme<Type> > ddtScheme<Type>::New
+tmp<ddtScheme<Type>> ddtScheme<Type>::New
 (
     const fvMesh& mesh,
     Istream& schemeData
@@ -96,7 +96,7 @@ ddtScheme<Type>::~ddtScheme()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > ddtScheme<Type>::fvcDdt
+tmp<GeometricField<Type, fvPatchField, volMesh>> ddtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
@@ -105,7 +105,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > ddtScheme<Type>::fvcDdt
 {
     NotImplemented;
 
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    return tmp<GeometricField<Type, fvPatchField, volMesh>>
     (
         GeometricField<Type, fvPatchField, volMesh>::null()
     );
@@ -113,7 +113,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > ddtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> > ddtScheme<Type>::fvmDdt
+tmp<fvMatrix<Type>> ddtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
@@ -122,7 +122,7 @@ tmp<fvMatrix<Type> > ddtScheme<Type>::fvmDdt
 {
     NotImplemented;
 
-    return tmp<fvMatrix<Type> >
+    return tmp<fvMatrix<Type>>
     (
         new fvMatrix<Type>
         (
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
index 5c35996c38..d3c738ad16 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ public:
     // Selectors
 
         //- Return a pointer to a new ddtScheme created on freestore
-        static tmp<ddtScheme<Type> > New
+        static tmp<ddtScheme<Type>> New
         (
             const fvMesh& mesh,
             Istream& schemeData
@@ -138,53 +138,53 @@ public:
             return mesh_;
         }
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensioned<Type>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<fvMatrix<Type> > fvmDdt
+        virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<fvMatrix<Type> > fvmDdt
+        virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<fvMatrix<Type> > fvmDdt
+        virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<fvMatrix<Type> > fvmDdt
+        virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
@@ -263,7 +263,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            ddtScheme<Type>::addIstreamConstructorToTable<SS<Type> >           \
+            ddtScheme<Type>::addIstreamConstructorToTable<SS<Type>>           \
                 add##SS##Type##IstreamConstructorToTable_;                     \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
index e18f10c95c..c77e3de641 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ const volScalarField& localEulerDdtScheme<Type>::localRDeltaT() const
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 localEulerDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -64,7 +64,7 @@ localEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh> > tdtdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -87,7 +87,7 @@ localEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -107,7 +107,7 @@ localEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 localEulerDdtScheme<Type>::fvcDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -124,7 +124,7 @@ localEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -145,7 +145,7 @@ localEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -158,7 +158,7 @@ localEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 localEulerDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
@@ -176,7 +176,7 @@ localEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -197,7 +197,7 @@ localEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -210,7 +210,7 @@ localEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 localEulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
@@ -228,7 +228,7 @@ localEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -252,7 +252,7 @@ localEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -265,7 +265,7 @@ localEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 localEulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
@@ -284,7 +284,7 @@ localEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -317,7 +317,7 @@ localEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh> >
+        return tmp<GeometricField<Type, fvPatchField, volMesh>>
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -334,13 +334,13 @@ localEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 localEulerDdtScheme<Type>::fvmDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -369,14 +369,14 @@ localEulerDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 localEulerDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -406,14 +406,14 @@ localEulerDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 localEulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -445,7 +445,7 @@ localEulerDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 localEulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
@@ -453,7 +453,7 @@ localEulerDdtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
index b28227939f..dad26f6cc7 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,53 +149,53 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& psi
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
index 3e2ec1350a..b26de564ae 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,13 +40,13 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 steadyStateDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
 )
 {
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    return tmp<GeometricField<Type, fvPatchField, volMesh>>
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -69,13 +69,13 @@ steadyStateDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 steadyStateDdtScheme<Type>::fvcDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    return tmp<GeometricField<Type, fvPatchField, volMesh>>
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -98,14 +98,14 @@ steadyStateDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 steadyStateDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    return tmp<GeometricField<Type, fvPatchField, volMesh>>
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -128,14 +128,14 @@ steadyStateDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 steadyStateDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    return tmp<GeometricField<Type, fvPatchField, volMesh>>
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -158,7 +158,7 @@ steadyStateDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 steadyStateDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
@@ -166,7 +166,7 @@ steadyStateDdtScheme<Type>::fvcDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    return tmp<GeometricField<Type, fvPatchField, volMesh>>
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -189,13 +189,13 @@ steadyStateDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 steadyStateDdtScheme<Type>::fvmDdt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -209,14 +209,14 @@ steadyStateDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 steadyStateDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -230,14 +230,14 @@ steadyStateDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 steadyStateDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -251,7 +251,7 @@ steadyStateDdtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 steadyStateDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
@@ -259,7 +259,7 @@ steadyStateDdtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
index 7d990746f2..635763cdda 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,53 +94,53 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcDdt
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& psi
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmDdt
+        tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
index 59622c9dc4..47d9930bed 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<divScheme<Type> > divScheme<Type>::New
+tmp<divScheme<Type>> divScheme<Type>::New
 (
     const fvMesh& mesh,
     Istream& schemeData
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
index 4032e2d5cf..a50866b4c5 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ protected:
     // Protected data
 
         const fvMesh& mesh_;
-        tmp<surfaceInterpolationScheme<Type> > tinterpScheme_;
+        tmp<surfaceInterpolationScheme<Type>> tinterpScheme_;
 
 
     // Private Member Functions
@@ -122,7 +122,7 @@ public:
     // Selectors
 
         //- Return a pointer to a new divScheme created on freestore
-        static tmp<divScheme<Type> > New
+        static tmp<divScheme<Type>> New
         (
             const fvMesh& mesh,
             Istream& schemeData
@@ -171,7 +171,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            divScheme<Type>::addIstreamConstructorToTable<SS<Type> >           \
+            divScheme<Type>::addIstreamConstructorToTable<SS<Type>>           \
                 add##SS##Type##IstreamConstructorToTable_;                     \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
index c6daac12d2..022a5a688a 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 average
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
@@ -49,7 +49,7 @@ average
 {
     const fvMesh& mesh = ssf.mesh();
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > taverage
+    tmp<GeometricField<Type, fvPatchField, volMesh>> taverage
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -89,13 +89,13 @@ average
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 average
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >& tssf
+    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > taverage
+    tmp<GeometricField<Type, fvPatchField, volMesh>> taverage
     (
         fvc::average(tssf())
     );
@@ -105,7 +105,7 @@ average
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 average
 (
     const GeometricField<Type, fvPatchField, volMesh>& vtf
@@ -116,13 +116,13 @@ average
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 average
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvtf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvtf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > taverage
+    tmp<GeometricField<Type, fvPatchField, volMesh>> taverage
     (
         fvc::average(tvtf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcAverage.H b/src/finiteVolume/finiteVolume/fvc/fvcAverage.H
index e8831f1eb2..3ab02f26fb 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcAverage.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcAverage.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,31 +52,31 @@ namespace fvc
 {
     //- Area-weighted average a surfaceField creating a volField
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > average
+    tmp<GeometricField<Type, fvPatchField, volMesh>> average
     (
         const GeometricField<Type, fvsPatchField, surfaceMesh>&
     );
 
     //- Area-weighted average a surfaceField creating a volField
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > average
+    tmp<GeometricField<Type, fvPatchField, volMesh>> average
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
     );
 
 
     //- Area-weighted average a surfaceField creating a volField
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > average
+    tmp<GeometricField<Type, fvPatchField, volMesh>> average
     (
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     //- Area-weighted average a surfaceField creating a volField
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > average
+    tmp<GeometricField<Type, fvPatchField, volMesh>> average
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
index 63c718375b..55a0c92e95 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class CombineOp>
-tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
+tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf,
     const CombineOp& cop
@@ -93,13 +93,13 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
 
 
 template<class Type, class CombineOp>
-tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
+tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
 (
     const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>&> tssf,
     const CombineOp& cop
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> >
+    tmp<GeometricField<Type, fvPatchField, volMesh>>
         tvf(cellReduce(cop, tssf));
 
    tssf.clear();
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
index 19bd24135a..2519b3d7ce 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,16 +50,16 @@ namespace Foam
 namespace fvc
 {
     template<class Type, class CombineOp>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
+    tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
     (
         const GeometricField<Type, fvsPatchField, surfaceMesh>&,
         const CombineOp& cop
     );
 
     template<class Type, class CombineOp>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
+    tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >&,
+        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&,
         const CombineOp& cop
     );
 }
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCurl.C b/src/finiteVolume/finiteVolume/fvc/fvcCurl.C
index e89d08d1e5..38dee36681 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCurl.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCurl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 curl
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -49,11 +49,11 @@ curl
     word nameCurlVf = "curl(" + vf.name() + ')';
 
     // Gausses theorem curl
-    // tmp<GeometricField<Type, fvPatchField, volMesh> > tcurlVf =
+    // tmp<GeometricField<Type, fvPatchField, volMesh>> tcurlVf =
     //     fvc::surfaceIntegrate(vf.mesh().Sf() ^ fvc::interpolate(vf));
 
     // Calculate curl as the Hodge dual of the skew-symmetric part of grad
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tcurlVf =
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tcurlVf =
         2.0*(*skew(fvc::grad(vf, nameCurlVf)));
 
     tcurlVf().rename(nameCurlVf);
@@ -63,13 +63,13 @@ curl
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 curl
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Curl(fvc::curl(tvf()));
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Curl(fvc::curl(tvf()));
     tvf.clear();
     return Curl;
 }
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCurl.H b/src/finiteVolume/finiteVolume/fvc/fvcCurl.H
index 2a4aeb4ac9..0157d86557 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCurl.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCurl.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,15 +51,15 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > curl
+    tmp<GeometricField<Type, fvPatchField, volMesh>> curl
     (
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > curl
+    tmp<GeometricField<Type, fvPatchField, volMesh>> curl
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C
index 46068fdd43..7468f4bae7 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 d2dt2
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -55,7 +55,7 @@ d2dt2
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 d2dt2
 (
     const volScalarField& rho,
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H
index 6fd6f651d6..76a3db7b50 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,13 +50,13 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > d2dt2
+    tmp<GeometricField<Type, fvPatchField, volMesh>> d2dt2
     (
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > d2dt2
+    tmp<GeometricField<Type, fvPatchField, volMesh>> d2dt2
     (
         const volScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDDt.C b/src/finiteVolume/finiteVolume/fvc/fvcDDt.C
index 29bea9d911..6b507d87f5 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDDt.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDDt.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,14 +40,14 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 DDt
 (
     const surfaceScalarField& phi,
     const GeometricField<Type, fvPatchField, volMesh>& psi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > ddtDivPhiPsi
+    tmp<GeometricField<Type, fvPatchField, volMesh>> ddtDivPhiPsi
         = fvc::ddt(psi) + fvc::div(phi, psi);
 
     if (phi.mesh().moving())
@@ -62,14 +62,14 @@ DDt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 DDt
 (
     const tmp<surfaceScalarField>& tphi,
     const GeometricField<Type, fvPatchField, volMesh>& psi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > DDtPsi
+    tmp<GeometricField<Type, fvPatchField, volMesh>> DDtPsi
     (
         fvc::DDt(tphi(), psi)
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDDt.H b/src/finiteVolume/finiteVolume/fvc/fvcDDt.H
index bdeec0ea07..35da1bce0e 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDDt.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDDt.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,14 +51,14 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > DDt
+    tmp<GeometricField<Type, fvPatchField, volMesh>> DDt
     (
         const surfaceScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > DDt
+    tmp<GeometricField<Type, fvPatchField, volMesh>> DDt
     (
         const tmp<surfaceScalarField>&,
         const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDdt.C b/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
index e300c072d4..3cabcd5154 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 ddt
 (
     const dimensioned<Type> dt,
@@ -56,7 +56,7 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 ddt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -71,7 +71,7 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 ddt
 (
     const dimensionedScalar& rho,
@@ -87,7 +87,7 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 ddt
 (
     const volScalarField& rho,
@@ -103,7 +103,7 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 ddt
 (
     const volScalarField& alpha,
@@ -126,7 +126,7 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 ddt
 (
     const one&,
@@ -138,7 +138,7 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 ddt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -150,7 +150,7 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
 ddtCorr
 (
     const GeometricField<Type, fvPatchField, volMesh>& U,
@@ -166,7 +166,7 @@ ddtCorr
 
 
 template<class Type>
-tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
 ddtCorr
 (
     const GeometricField<Type, fvPatchField, volMesh>& U,
@@ -187,7 +187,7 @@ ddtCorr
 
 
 template<class Type>
-tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
 ddtCorr
 (
     const volScalarField& rho,
@@ -204,7 +204,7 @@ ddtCorr
 
 
 template<class Type>
-tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
 ddtCorr
 (
     const volScalarField& rho,
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDdt.H b/src/finiteVolume/finiteVolume/fvc/fvcDdt.H
index 1f7047cdec..23b158733f 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDdt.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDdt.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,34 +54,34 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > ddt
+    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
     (
         const dimensioned<Type>,
         const fvMesh&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > ddt
+    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
     (
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > ddt
+    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
     (
         const dimensionedScalar&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > ddt
+    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
     (
         const volScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > ddt
+    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
     (
         const volScalarField&,
         const volScalarField&,
@@ -89,14 +89,14 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > ddt
+    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
     (
         const one&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > ddt
+    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
     (
         const GeometricField<Type, fvPatchField, volMesh>&,
         const one&
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDiv.C b/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
index 7734495d95..c788eac5b6 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,13 +42,13 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
 )
 {
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    return tmp<GeometricField<Type, fvPatchField, volMesh>>
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -60,13 +60,13 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >& tssf
+    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Div(fvc::div(tssf()));
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Div(fvc::div(tssf()));
     tssf.clear();
     return Div;
 }
@@ -103,12 +103,12 @@ tmp
 >
 div
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvvf,
     const word& name
 )
 {
     typedef typename innerProduct<vector, Type>::type DivType;
-    tmp<GeometricField<DivType, fvPatchField, volMesh> > Div
+    tmp<GeometricField<DivType, fvPatchField, volMesh>> Div
     (
         fvc::div(tvvf(), name)
     );
@@ -143,18 +143,18 @@ tmp
 >
 div
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvvf
 )
 {
     typedef typename innerProduct<vector, Type>::type DivType;
-    tmp<GeometricField<DivType, fvPatchField, volMesh> > Div(fvc::div(tvvf()));
+    tmp<GeometricField<DivType, fvPatchField, volMesh>> Div(fvc::div(tvvf()));
     tvvf.clear();
     return Div;
 }
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
     const surfaceScalarField& flux,
@@ -172,7 +172,7 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
@@ -180,7 +180,7 @@ div
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
     (
         fvc::div(tflux(), vf, name)
     );
@@ -190,15 +190,15 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
     const surfaceScalarField& flux,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
     (
         fvc::div(flux, tvf(), name)
     );
@@ -208,15 +208,15 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
     (
         fvc::div(tflux(), tvf(), name)
     );
@@ -227,7 +227,7 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
     const surfaceScalarField& flux,
@@ -242,14 +242,14 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
     (
         fvc::div(tflux(), vf)
     );
@@ -259,14 +259,14 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
     const surfaceScalarField& flux,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
     (
         fvc::div(flux, tvf())
     );
@@ -276,14 +276,14 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
     (
         fvc::div(tflux(), tvf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDiv.H b/src/finiteVolume/finiteVolume/fvc/fvcDiv.H
index 8843500dee..333d08e52b 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDiv.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDiv.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,15 +51,15 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
         const GeometricField<Type, fvsPatchField, surfaceMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
     );
 
 
@@ -81,7 +81,7 @@ namespace fvc
         <typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
     > div
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word& name
     );
 
@@ -103,12 +103,12 @@ namespace fvc
         <typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
     > div
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
         const surfaceScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -116,7 +116,7 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
         const tmp<surfaceScalarField>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -124,48 +124,48 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
         const surfaceScalarField&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word& name
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
         const tmp<surfaceScalarField>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word& name
     );
 
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
         const surfaceScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
         const tmp<surfaceScalarField>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
         const surfaceScalarField&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > div
+    tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
         const tmp<surfaceScalarField>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcFlux.C b/src/finiteVolume/finiteVolume/fvc/fvcFlux.C
index 6cd3b0ad54..ab9c346e3f 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcFlux.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcFlux.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 flux
 (
     const surfaceScalarField& phi,
@@ -58,7 +58,7 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
@@ -66,7 +66,7 @@ flux
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > Flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
     (
         fvc::flux(tphi(), vf, name)
     );
@@ -76,15 +76,15 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 flux
 (
     const surfaceScalarField& phi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > Flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
     (
         fvc::flux(phi, tvf(), name)
     );
@@ -94,15 +94,15 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > Flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
     (
         fvc::flux(tphi(), tvf(), name)
     );
@@ -113,7 +113,7 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 flux
 (
     const surfaceScalarField& phi,
@@ -128,14 +128,14 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > Flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
     (
         fvc::flux(tphi(), vf)
     );
@@ -145,14 +145,14 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 flux
 (
     const surfaceScalarField& phi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > Flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
     (
         fvc::flux(phi, tvf())
     );
@@ -162,14 +162,14 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > Flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
     (
         fvc::flux(tphi(), tvf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcFlux.H b/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
index b7a6e21fef..6568664f75 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
     (
         const surfaceScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -59,7 +59,7 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
     (
         const tmp<surfaceScalarField>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -67,48 +67,48 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
     (
         const surfaceScalarField&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word& name
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
     (
         const tmp<surfaceScalarField>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word& name
     );
 
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
     (
         const surfaceScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
     (
         const tmp<surfaceScalarField>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
     (
         const surfaceScalarField&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > flux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
     (
         const tmp<surfaceScalarField>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcGrad.C b/src/finiteVolume/finiteVolume/fvc/fvcGrad.C
index 41a0d495e8..23e36f6c51 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcGrad.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,11 +67,11 @@ tmp
 >
 grad
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >& tssf
+    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > Grad
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> Grad
     (
         fvc::grad(tssf())
     );
@@ -112,7 +112,7 @@ tmp
 >
 grad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
@@ -158,11 +158,11 @@ tmp
 >
 grad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > Grad
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> Grad
     (
         fvc::grad(tvf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcGrad.H b/src/finiteVolume/finiteVolume/fvc/fvcGrad.H
index 583dacfdc9..8982568edd 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcGrad.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > grad
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
     );
 
     template<class Type>
@@ -88,7 +88,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > grad
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word& name
     );
 
@@ -109,7 +109,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > grad
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
index 41231d8bd7..0ec6662ce5 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -56,14 +56,14 @@ laplacian
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(tvf(), name)
     );
@@ -73,7 +73,7 @@ laplacian
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -84,13 +84,13 @@ laplacian
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(tvf())
     );
@@ -102,7 +102,7 @@ laplacian
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const dimensioned<GType>& gamma,
@@ -128,15 +128,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const dimensioned<GType>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(gamma, tvf(), name)
     );
@@ -146,7 +146,7 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const dimensioned<GType>& gamma,
@@ -171,14 +171,14 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const dimensioned<GType>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(gamma, tvf())
     );
@@ -190,7 +190,7 @@ laplacian
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const GeometricField<GType, fvPatchField, volMesh>& gamma,
@@ -207,15 +207,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh> >& tgamma,
+    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(tgamma(), vf, name)
     );
@@ -225,15 +225,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const GeometricField<GType, fvPatchField, volMesh>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(gamma, tvf(), name)
     );
@@ -243,15 +243,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh> >& tgamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(tgamma(), tvf(), name)
     );
@@ -262,7 +262,7 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const GeometricField<GType, fvPatchField, volMesh>& gamma,
@@ -279,10 +279,10 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh> >& tgamma,
+    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
@@ -296,11 +296,11 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const GeometricField<GType, fvPatchField, volMesh>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
     return fvc::laplacian
@@ -313,11 +313,11 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh> >& tgamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
     return fvc::laplacian
@@ -332,7 +332,7 @@ laplacian
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
@@ -349,15 +349,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >& tgamma,
+    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(tgamma(), vf, name)
     );
@@ -367,15 +367,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(gamma, tvf(), name)
     );
@@ -385,14 +385,14 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
 (
-    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >& tgamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(tgamma(), tvf(), name)
     );
@@ -403,7 +403,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
@@ -420,14 +420,14 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >& tgamma,
+    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(tgamma(), vf)
     );
@@ -437,14 +437,14 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(gamma, tvf())
     );
@@ -454,13 +454,13 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
 (
-    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >& tgamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > Laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
     (
         fvc::laplacian(tgamma(), tvf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H
index dbe544e2f2..b962c888d6 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,34 +52,34 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const GeometricField<Type, fvPatchField, volMesh>&,
         const word&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const dimensioned<GType>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -87,30 +87,30 @@ namespace fvc
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const dimensioned<GType>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const dimensioned<GType>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const dimensioned<GType>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const GeometricField<GType, fvPatchField, volMesh>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -118,60 +118,60 @@ namespace fvc
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const GeometricField<GType, fvPatchField, volMesh>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh> >&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const GeometricField<GType, fvPatchField, volMesh>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const GeometricField<GType, fvPatchField, volMesh>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh> >&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -179,55 +179,55 @@ namespace fvc
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
-        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >&,
+        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
-        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
-        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >&,
+        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > laplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
     (
-        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C
index 329c14e230..fbe3bca333 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ template<class Type>
 tmp<volScalarField>
 magSqrGradGrad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
     tmp<volScalarField> tMagSqrGradGrad(fvc::magSqrGradGrad(tvf()));
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H
index 7168278605..7ca54485a0 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ namespace fvc
     template<class Type>
     tmp<volScalarField> magSqrGradGrad
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
index 880bd7f72e..9efe428b49 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ reconstruct
 
     surfaceVectorField SfHat(mesh.Sf()/mesh.magSf());
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > treconField
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> treconField
     (
         new GeometricField<GradType, fvPatchField, volMesh>
         (
@@ -94,11 +94,11 @@ tmp
 >
 reconstruct
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >& tssf
+    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > tvf
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> tvf
     (
         fvc::reconstruct(tssf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H
index 305e7ad820..ba3f0db4d5 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > reconstruct
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
     );
 
     tmp<volScalarField> reconstructMag(const surfaceScalarField&);
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
index a399bf79fd..0c9e6c0b73 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ reconstruct
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > treconField
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> treconField
     (
         new GeometricField<GradType, fvPatchField, volMesh>
         (
@@ -131,11 +131,11 @@ tmp
 >
 reconstruct
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >& tssf
+    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > tvf
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> tvf
     (
         fvc::reconstruct(tssf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C
index 52d9386317..42a565586a 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 snGrad
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -56,14 +56,14 @@ snGrad
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 snGrad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > SnGrad
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> SnGrad
     (
         fvc::snGrad(tvf(), name)
     );
@@ -73,7 +73,7 @@ snGrad
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 snGrad
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -84,13 +84,13 @@ snGrad
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 snGrad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > SnGrad
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> SnGrad
     (
         fvc::snGrad(tvf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H
index 84e4e8a57c..67ce684f57 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,29 +51,29 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > snGrad
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> snGrad
     (
         const GeometricField<Type, fvPatchField, volMesh>&,
         const word& name
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > snGrad
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> snGrad
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word& name
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > snGrad
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> snGrad
     (
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > snGrad
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> snGrad
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSup.C b/src/finiteVolume/finiteVolume/fvc/fvcSup.C
index 67b0e11df7..dcc8f36d3c 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSup.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSup.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 Su
 (
     const GeometricField<Type, fvPatchField, volMesh>& su,
@@ -50,10 +50,10 @@ Su
 }
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 Su
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
@@ -62,7 +62,7 @@ Su
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 Sp
 (
     const volScalarField& sp,
@@ -73,7 +73,7 @@ Sp
 }
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 Sp
 (
     const tmp<volScalarField>& tsp,
@@ -85,7 +85,7 @@ Sp
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 Sp
 (
     const dimensionedScalar& sp,
@@ -97,7 +97,7 @@ Sp
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 SuSp
 (
     const volScalarField& sp,
@@ -108,7 +108,7 @@ SuSp
 }
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 SuSp
 (
     const tmp<volScalarField>& tsp,
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSup.H b/src/finiteVolume/finiteVolume/fvc/fvcSup.H
index 2958d676b9..70a669cbee 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSup.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSup.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,16 +52,16 @@ namespace fvc
    // Explicit source
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > Su
+        tmp<GeometricField<Type, fvPatchField, volMesh>> Su
         (
             const GeometricField<Type, fvPatchField, volMesh>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > Su
+        tmp<GeometricField<Type, fvPatchField, volMesh>> Su
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
@@ -69,14 +69,14 @@ namespace fvc
     // Implicit source
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > Sp
+        tmp<GeometricField<Type, fvPatchField, volMesh>> Sp
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > Sp
+        tmp<GeometricField<Type, fvPatchField, volMesh>> Sp
         (
             const tmp<volScalarField>&,
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -84,7 +84,7 @@ namespace fvc
 
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > Sp
+        tmp<GeometricField<Type, fvPatchField, volMesh>> Sp
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -94,14 +94,14 @@ namespace fvc
     // Implicit/Explicit source depending on sign of coefficient
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > SuSp
+        tmp<GeometricField<Type, fvPatchField, volMesh>> SuSp
         (
             const volScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > SuSp
+        tmp<GeometricField<Type, fvPatchField, volMesh>> SuSp
         (
             const tmp<volScalarField>&,
             const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
index 669b1e46fd..b2c638fe2a 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ void surfaceIntegrate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 surfaceIntegrate
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
@@ -85,7 +85,7 @@ surfaceIntegrate
 {
     const fvMesh& mesh = ssf.mesh();
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tvf
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tvf
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -117,13 +117,13 @@ surfaceIntegrate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 surfaceIntegrate
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >& tssf
+    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tvf
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tvf
     (
         fvc::surfaceIntegrate(tssf())
     );
@@ -133,7 +133,7 @@ surfaceIntegrate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 surfaceSum
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
@@ -141,7 +141,7 @@ surfaceSum
 {
     const fvMesh& mesh = ssf.mesh();
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tvf
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tvf
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -189,12 +189,12 @@ surfaceSum
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > surfaceSum
+tmp<GeometricField<Type, fvPatchField, volMesh>> surfaceSum
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >& tssf
+    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tvf = surfaceSum(tssf());
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tvf = surfaceSum(tssf());
     tssf.clear();
     return tvf;
 }
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H
index 8036b22062..90997d1a9f 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,29 +59,29 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> >
+    tmp<GeometricField<Type, fvPatchField, volMesh>>
     surfaceIntegrate
     (
         const GeometricField<Type, fvsPatchField, surfaceMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> >
+    tmp<GeometricField<Type, fvPatchField, volMesh>>
     surfaceIntegrate
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > surfaceSum
+    tmp<GeometricField<Type, fvPatchField, volMesh>> surfaceSum
     (
         const GeometricField<Type, fvsPatchField, surfaceMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh> > surfaceSum
+    tmp<GeometricField<Type, fvPatchField, volMesh>> surfaceSum
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C
index 783a20482e..77dc814902 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 volumeIntegrate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -51,30 +51,30 @@ volumeIntegrate
 
 
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 volumeIntegrate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<Field<Type> > tvivf = tvf().mesh().V()*tvf().internalField();
+    tmp<Field<Type>> tvivf = tvf().mesh().V()*tvf().internalField();
     tvf.clear();
     return tvivf;
 }
 
 
 template<class Type>
-tmp<Field<Type> > volumeIntegrate(const DimensionedField<Type, volMesh>& df)
+tmp<Field<Type>> volumeIntegrate(const DimensionedField<Type, volMesh>& df)
 {
     return df.mesh().V()*df.field();
 }
 
 
 template<class Type>
-tmp<Field<Type> >
-volumeIntegrate(const tmp<DimensionedField<Type, volMesh> >& tdf)
+tmp<Field<Type>>
+volumeIntegrate(const tmp<DimensionedField<Type, volMesh>>& tdf)
 {
-    tmp<Field<Type> > tdidf = tdf().mesh().V()*tdf().field();
+    tmp<Field<Type>> tdidf = tdf().mesh().V()*tdf().field();
     tdf.clear();
     return tdidf;
 }
@@ -99,7 +99,7 @@ domainIntegrate
 template<class Type>
 dimensioned<Type> domainIntegrate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
     dimensioned<Type> integral = domainIntegrate(tvf());
@@ -126,7 +126,7 @@ dimensioned<Type> domainIntegrate
 template<class Type>
 dimensioned<Type> domainIntegrate
 (
-    const tmp<DimensionedField<Type, volMesh> >& tdf
+    const tmp<DimensionedField<Type, volMesh>>& tdf
 )
 {
     dimensioned<Type> integral = domainIntegrate(tdf());
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H
index 784087ee30..79861e0f5a 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,28 +55,28 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<Field<Type> > volumeIntegrate
+    tmp<Field<Type>> volumeIntegrate
     (
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<Field<Type> > volumeIntegrate
+    tmp<Field<Type>> volumeIntegrate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
 
     template<class Type>
-    tmp<Field<Type> > volumeIntegrate
+    tmp<Field<Type>> volumeIntegrate
     (
         const DimensionedField<Type, volMesh>&
     );
 
     template<class Type>
-    tmp<Field<Type> > volumeIntegrate
+    tmp<Field<Type>> volumeIntegrate
     (
-        const tmp<DimensionedField<Type, volMesh> >&
+        const tmp<DimensionedField<Type, volMesh>>&
     );
 
 
@@ -89,7 +89,7 @@ namespace fvc
     template<class Type>
     dimensioned<Type> domainIntegrate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
 
@@ -102,7 +102,7 @@ namespace fvc
     template<class Type>
     dimensioned<Type> domainIntegrate
     (
-        const tmp<DimensionedField<Type, volMesh> >&
+        const tmp<DimensionedField<Type, volMesh>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
index 9739b77336..b02f92354f 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ namespace fvm
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 d2dt2
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -56,7 +56,7 @@ d2dt2
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 d2dt2
 (
     const dimensionedScalar& rho,
@@ -72,7 +72,7 @@ d2dt2
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 d2dt2
 (
     const volScalarField& rho,
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H
index 94e6b13568..b2f9b3105d 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,20 +50,20 @@ namespace Foam
 namespace fvm
 {
     template<class Type>
-    tmp<fvMatrix<Type> > d2dt2
+    tmp<fvMatrix<Type>> d2dt2
     (
         const dimensionedScalar&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > d2dt2
+    tmp<fvMatrix<Type>> d2dt2
     (
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > d2dt2
+    tmp<fvMatrix<Type>> d2dt2
     (
         const volScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDdt.C b/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
index a2f75da024..2cea308b28 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ namespace fvm
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 ddt
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -56,7 +56,7 @@ ddt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 ddt
 (
     const one&,
@@ -68,7 +68,7 @@ ddt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 ddt
 (
     const dimensionedScalar& rho,
@@ -84,7 +84,7 @@ ddt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 ddt
 (
     const volScalarField& rho,
@@ -100,7 +100,7 @@ ddt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 ddt
 (
     const volScalarField& alpha,
@@ -123,7 +123,7 @@ ddt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 ddt
 (
     const one&,
@@ -136,7 +136,7 @@ ddt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 ddt
 (
     const one&,
@@ -149,7 +149,7 @@ ddt
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 ddt
 (
     const volScalarField& alpha,
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDdt.H b/src/finiteVolume/finiteVolume/fvm/fvmDdt.H
index 4091c5be6b..35915410c4 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDdt.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDdt.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,34 +51,34 @@ namespace Foam
 namespace fvm
 {
     template<class Type>
-    tmp<fvMatrix<Type> > ddt
+    tmp<fvMatrix<Type>> ddt
     (
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > ddt
+    tmp<fvMatrix<Type>> ddt
     (
         const one&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > ddt
+    tmp<fvMatrix<Type>> ddt
     (
         const dimensionedScalar&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > ddt
+    tmp<fvMatrix<Type>> ddt
     (
         const volScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > ddt
+    tmp<fvMatrix<Type>> ddt
     (
         const volScalarField&,
         const volScalarField&,
@@ -86,7 +86,7 @@ namespace fvm
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > ddt
+    tmp<fvMatrix<Type>> ddt
     (
         const one&,
         const one&,
@@ -94,7 +94,7 @@ namespace fvm
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > ddt
+    tmp<fvMatrix<Type>> ddt
     (
         const one&,
         const volScalarField&,
@@ -102,7 +102,7 @@ namespace fvm
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > ddt
+    tmp<fvMatrix<Type>> ddt
     (
         const volScalarField&,
         const one&,
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDiv.C b/src/finiteVolume/finiteVolume/fvm/fvmDiv.C
index d095816f5b..849e3c6a50 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDiv.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDiv.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ namespace fvm
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 div
 (
     const surfaceScalarField& flux,
@@ -58,7 +58,7 @@ div
 }
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
@@ -66,14 +66,14 @@ div
     const word& name
 )
 {
-    tmp<fvMatrix<Type> > Div(fvm::div(tflux(), vf, name));
+    tmp<fvMatrix<Type>> Div(fvm::div(tflux(), vf, name));
     tflux.clear();
     return Div;
 }
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 div
 (
     const surfaceScalarField& flux,
@@ -84,14 +84,14 @@ div
 }
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > Div(fvm::div(tflux(), vf));
+    tmp<fvMatrix<Type>> Div(fvm::div(tflux(), vf));
     tflux.clear();
     return Div;
 }
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDiv.H b/src/finiteVolume/finiteVolume/fvm/fvmDiv.H
index 0cbf085022..ae08924592 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDiv.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDiv.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ namespace Foam
 namespace fvm
 {
     template<class Type>
-    tmp<fvMatrix<Type> > div
+    tmp<fvMatrix<Type>> div
     (
         const surfaceScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -60,7 +60,7 @@ namespace fvm
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > div
+    tmp<fvMatrix<Type>> div
     (
         const tmp<surfaceScalarField>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -69,14 +69,14 @@ namespace fvm
 
 
     template<class Type>
-    tmp<fvMatrix<Type> > div
+    tmp<fvMatrix<Type>> div
     (
         const surfaceScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > div
+    tmp<fvMatrix<Type>> div
     (
         const tmp<surfaceScalarField>&,
         const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
index dfbc5ab579..ef77f56982 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ namespace fvm
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -66,7 +66,7 @@ laplacian
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -95,7 +95,7 @@ laplacian
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const zero&,
@@ -103,7 +103,7 @@ laplacian
     const word& name
 )
 {
-    return tmp<fvMatrix<Type> >
+    return tmp<fvMatrix<Type>>
     (
         new fvMatrix<Type>(vf, dimensionSet(0, 0, -2, 0, 0))
     );
@@ -111,14 +111,14 @@ laplacian
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const zero&,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return tmp<fvMatrix<Type> >
+    return tmp<fvMatrix<Type>>
     (
         new fvMatrix<Type>(vf, dimensionSet(0, 0, -2, 0, 0))
     );
@@ -126,7 +126,7 @@ laplacian
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const one&,
@@ -139,7 +139,7 @@ laplacian
 
 
 template<class Type>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const one&,
@@ -151,7 +151,7 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const dimensioned<GType>& gamma,
@@ -177,7 +177,7 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const dimensioned<GType>& gamma,
@@ -204,7 +204,7 @@ laplacian
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const GeometricField<GType, fvPatchField, volMesh>& gamma,
@@ -221,22 +221,22 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh> >& tgamma,
+    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const word& name
 )
 {
-    tmp<fvMatrix<Type> > Laplacian(fvm::laplacian(tgamma(), vf, name));
+    tmp<fvMatrix<Type>> Laplacian(fvm::laplacian(tgamma(), vf, name));
     tgamma.clear();
     return Laplacian;
 }
 
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const GeometricField<GType, fvPatchField, volMesh>& gamma,
@@ -253,14 +253,14 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh> >& tgamma,
+    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > Laplacian(fvm::laplacian(tgamma(), vf));
+    tmp<fvMatrix<Type>> Laplacian(fvm::laplacian(tgamma(), vf));
     tgamma.clear();
     return Laplacian;
 }
@@ -269,7 +269,7 @@ laplacian
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
@@ -286,22 +286,22 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >& tgamma,
+    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const word& name
 )
 {
-    tmp<fvMatrix<Type> > tLaplacian = fvm::laplacian(tgamma(), vf, name);
+    tmp<fvMatrix<Type>> tLaplacian = fvm::laplacian(tgamma(), vf, name);
     tgamma.clear();
     return tLaplacian;
 }
 
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
@@ -318,14 +318,14 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >& tGamma,
+    const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tGamma,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm(fvm::laplacian(tGamma(), vf));
+    tmp<fvMatrix<Type>> tfvm(fvm::laplacian(tGamma(), vf));
     tGamma.clear();
     return tfvm;
 }
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
index 0790dd1db5..08e9e5db4f 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,21 +53,21 @@ namespace Foam
 namespace fvm
 {
     template<class Type>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const GeometricField<Type, fvPatchField, volMesh>&,
         const word&
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
 
     template<class Type>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const zero&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -75,7 +75,7 @@ namespace fvm
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const zero&,
         const GeometricField<Type, fvPatchField, volMesh>&
@@ -83,7 +83,7 @@ namespace fvm
 
 
     template<class Type>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const one&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -91,7 +91,7 @@ namespace fvm
     );
 
     template<class Type>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const one&,
         const GeometricField<Type, fvPatchField, volMesh>&
@@ -99,7 +99,7 @@ namespace fvm
 
 
     template<class Type, class GType>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const dimensioned<GType>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -107,7 +107,7 @@ namespace fvm
     );
 
     template<class Type, class GType>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const dimensioned<GType>&,
         const GeometricField<Type, fvPatchField, volMesh>&
@@ -115,7 +115,7 @@ namespace fvm
 
 
     template<class Type, class GType>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const GeometricField<GType, fvPatchField, volMesh>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -123,7 +123,7 @@ namespace fvm
     );
 
     template<class Type, class GType>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const GeometricField<GType, fvPatchField, volMesh>&,
         const GeometricField<Type, fvPatchField, volMesh>&
@@ -131,23 +131,23 @@ namespace fvm
 
 
     template<class Type, class GType>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh> >&,
+        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
 
     template<class Type, class GType>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -155,24 +155,24 @@ namespace fvm
     );
 
     template<class Type, class GType>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
-        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >&,
+        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type, class GType>
-    tmp<fvMatrix<Type> > laplacian
+    tmp<fvMatrix<Type>> laplacian
     (
-        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh> >&,
+        const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 }
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmSup.C b/src/finiteVolume/finiteVolume/fvm/fvmSup.C
index b0304e1791..5228eddcae 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmSup.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmSup.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> >
+Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Su
 (
     const DimensionedField<Type, volMesh>& su,
@@ -39,7 +39,7 @@ Foam::fvm::Su
 {
     const fvMesh& mesh = vf.mesh();
 
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -56,28 +56,28 @@ Foam::fvm::Su
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> >
+Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Su
 (
-    const tmp<DimensionedField<Type, volMesh> >& tsu,
+    const tmp<DimensionedField<Type, volMesh>>& tsu,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm = fvm::Su(tsu(), vf);
+    tmp<fvMatrix<Type>> tfvm = fvm::Su(tsu(), vf);
     tsu.clear();
     return tfvm;
 }
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> >
+Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Su
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm = fvm::Su(tsu(), vf);
+    tmp<fvMatrix<Type>> tfvm = fvm::Su(tsu(), vf);
     tsu.clear();
     return tfvm;
 }
@@ -96,7 +96,7 @@ Foam::fvm::Su
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> >
+Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
     const DimensionedField<scalar, volMesh>& sp,
@@ -105,7 +105,7 @@ Foam::fvm::Sp
 {
     const fvMesh& mesh = vf.mesh();
 
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -122,35 +122,35 @@ Foam::fvm::Sp
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> >
+Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
-    const tmp<DimensionedField<scalar, volMesh> >& tsp,
+    const tmp<DimensionedField<scalar, volMesh>>& tsp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm = fvm::Sp(tsp(), vf);
+    tmp<fvMatrix<Type>> tfvm = fvm::Sp(tsp(), vf);
     tsp.clear();
     return tfvm;
 }
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> >
+Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
     const tmp<volScalarField>& tsp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm = fvm::Sp(tsp(), vf);
+    tmp<fvMatrix<Type>> tfvm = fvm::Sp(tsp(), vf);
     tsp.clear();
     return tfvm;
 }
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> >
+Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
     const dimensionedScalar& sp,
@@ -159,7 +159,7 @@ Foam::fvm::Sp
 {
     const fvMesh& mesh = vf.mesh();
 
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -188,7 +188,7 @@ Foam::fvm::Sp
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> >
+Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::SuSp
 (
     const DimensionedField<scalar, volMesh>& susp,
@@ -197,7 +197,7 @@ Foam::fvm::SuSp
 {
     const fvMesh& mesh = vf.mesh();
 
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -217,28 +217,28 @@ Foam::fvm::SuSp
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> >
+Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::SuSp
 (
-    const tmp<DimensionedField<scalar, volMesh> >& tsusp,
+    const tmp<DimensionedField<scalar, volMesh>>& tsusp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm = fvm::SuSp(tsusp(), vf);
+    tmp<fvMatrix<Type>> tfvm = fvm::SuSp(tsusp(), vf);
     tsusp.clear();
     return tfvm;
 }
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> >
+Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::SuSp
 (
     const tmp<volScalarField>& tsusp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm = fvm::SuSp(tsusp(), vf);
+    tmp<fvMatrix<Type>> tfvm = fvm::SuSp(tsusp(), vf);
     tsusp.clear();
     return tfvm;
 }
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmSup.H b/src/finiteVolume/finiteVolume/fvm/fvmSup.H
index bf692cd9eb..c0ef18cb63 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmSup.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmSup.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,23 +53,23 @@ namespace fvm
    // Explicit source
 
         template<class Type>
-        tmp<fvMatrix<Type> > Su
+        tmp<fvMatrix<Type>> Su
         (
             const DimensionedField<Type, volMesh>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
-        tmp<fvMatrix<Type> > Su
+        tmp<fvMatrix<Type>> Su
         (
-            const tmp<DimensionedField<Type, volMesh> >&,
+            const tmp<DimensionedField<Type, volMesh>>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
-        tmp<fvMatrix<Type> > Su
+        tmp<fvMatrix<Type>> Su
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
@@ -84,21 +84,21 @@ namespace fvm
     // Implicit source
 
         template<class Type>
-        tmp<fvMatrix<Type> > Sp
+        tmp<fvMatrix<Type>> Sp
         (
             const DimensionedField<scalar, volMesh>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
-        tmp<fvMatrix<Type> > Sp
+        tmp<fvMatrix<Type>> Sp
         (
-            const tmp<DimensionedField<scalar, volMesh> >&,
+            const tmp<DimensionedField<scalar, volMesh>>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
-        tmp<fvMatrix<Type> > Sp
+        tmp<fvMatrix<Type>> Sp
         (
             const tmp<volScalarField>&,
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -106,7 +106,7 @@ namespace fvm
 
 
         template<class Type>
-        tmp<fvMatrix<Type> > Sp
+        tmp<fvMatrix<Type>> Sp
         (
             const dimensionedScalar&,
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -124,21 +124,21 @@ namespace fvm
     // Implicit/Explicit source depending on sign of coefficient
 
         template<class Type>
-        tmp<fvMatrix<Type> > SuSp
+        tmp<fvMatrix<Type>> SuSp
         (
             const DimensionedField<scalar, volMesh>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
-        tmp<fvMatrix<Type> > SuSp
+        tmp<fvMatrix<Type>> SuSp
         (
-            const tmp<DimensionedField<scalar, volMesh> >&,
+            const tmp<DimensionedField<scalar, volMesh>>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
-        tmp<fvMatrix<Type> > SuSp
+        tmp<fvMatrix<Type>> SuSp
         (
             const tmp<volScalarField>&,
             const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
index 03a6f1c84f..dc04fd0f34 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
         mesh
     );
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > tlsGrad
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> tlsGrad
     (
         new GeometricField<GradType, fvPatchField, volMesh>
         (
@@ -84,8 +84,8 @@ Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
     Field<GradType>& lsGradIf = lsGrad;
 
     const extendedCentredCellToCellStencil& stencil = lsv.stencil();
-    const List<List<label> >& stencilAddr = stencil.stencil();
-    const List<List<vector> >& lsvs = lsv.vectors();
+    const List<List<label>>& stencilAddr = stencil.stencil();
+    const List<List<vector>>& lsvs = lsv.vectors();
 
     // Construct flat version of vtf
     // including all values referred to by the stencil
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
index a71d0e87ab..f65cfa71a1 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -157,7 +157,7 @@ public:
                 LeastSquaresGrad##TYPE##STENCIL##_;                            \
                                                                                \
             gradScheme<Foam::TYPE>::addIstreamConstructorToTable               \
-                <LeastSquaresGrad<Foam::TYPE, Foam::STENCIL> >                 \
+                <LeastSquaresGrad<Foam::TYPE, Foam::STENCIL>>                 \
                 add##SS##STENCIL##TYPE##IstreamConstructorToTable_;            \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.H b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.H
index d454e8cb3f..81944893b7 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,12 +58,12 @@ namespace fv
 template<class Stencil>
 class LeastSquaresVectors
 :
-    public MeshObject<fvMesh, MoveableMeshObject, LeastSquaresVectors<Stencil> >
+    public MeshObject<fvMesh, MoveableMeshObject, LeastSquaresVectors<Stencil>>
 {
     // Private data
 
         //- Least-squares gradient vectors
-        List<List<vector> > vectors_;
+        List<List<vector>> vectors_;
 
 
     // Private Member Functions
@@ -100,7 +100,7 @@ public:
         }
 
         //- Return reference to the least square vectors
-        const List<List<vector> >& vectors() const
+        const List<List<vector>>& vectors() const
         {
             return vectors_;
         }
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
index 2293c126db..32a433c61a 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ Foam::fv::fourthGrad<Type>::calcGrad
 
     // Assemble the second-order least-square gradient
     // Calculate the second-order least-square gradient
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > tsecondfGrad
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> tsecondfGrad
       = leastSquaresGrad<Type>(mesh).grad
         (
             vsf,
@@ -70,7 +70,7 @@ Foam::fv::fourthGrad<Type>::calcGrad
     const GeometricField<GradType, fvPatchField, volMesh>& secondfGrad =
         tsecondfGrad();
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > tfGrad
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> tfGrad
     (
         new GeometricField<GradType, fvPatchField, volMesh>
         (
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
index a4947705ba..73fed99ca5 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Foam::fv::gaussGrad<Type>::gradf
 
     const fvMesh& mesh = ssf.mesh();
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > tgGrad
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> tgGrad
     (
         new GeometricField<GradType, fvPatchField, volMesh>
         (
@@ -128,7 +128,7 @@ Foam::fv::gaussGrad<Type>::calcGrad
 {
     typedef typename outerProduct<vector, Type>::type GradType;
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > tgGrad
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> tgGrad
     (
         gradf(tinterpScheme_().interpolate(vsf), name)
     );
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
index 6559ed22aa..77d3ae84c5 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ class gaussGrad
 {
     // Private data
 
-        tmp<surfaceInterpolationScheme<Type> > tinterpScheme_;
+        tmp<surfaceInterpolationScheme<Type>> tinterpScheme_;
 
 
     // Private Member Functions
@@ -97,7 +97,7 @@ public:
             if (is.eof())
             {
                 tinterpScheme_ =
-                    tmp<surfaceInterpolationScheme<Type> >
+                    tmp<surfaceInterpolationScheme<Type>>
                     (
                         new linear<Type>(mesh)
                     );
@@ -105,7 +105,7 @@ public:
             else
             {
                 tinterpScheme_ =
-                    tmp<surfaceInterpolationScheme<Type> >
+                    tmp<surfaceInterpolationScheme<Type>>
                     (
                         surfaceInterpolationScheme<Type>::New(mesh, is)
                     );
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index 503c8a978f..318bdcd8fa 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::fv::gradScheme<Type> > Foam::fv::gradScheme<Type>::New
+Foam::tmp<Foam::fv::gradScheme<Type>> Foam::fv::gradScheme<Type>::New
 (
     const fvMesh& mesh,
     Istream& schemeData
@@ -200,7 +200,7 @@ Foam::tmp
 >
 Foam::fv::gradScheme<Type>::grad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvsf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvsf
 ) const
 {
     typedef typename outerProduct<vector, Type>::type GradType;
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
index aa508ab8b6..d228b51ef2 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,7 +106,7 @@ public:
     // Selectors
 
         //- Return a pointer to a new gradScheme created on freestore
-        static tmp<gradScheme<Type> > New
+        static tmp<gradScheme<Type>> New
         (
             const fvMesh& mesh,
             Istream& schemeData
@@ -171,7 +171,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > grad
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
         ) const;
 };
 
@@ -195,7 +195,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            gradScheme<Type>::addIstreamConstructorToTable<SS<Type> >          \
+            gradScheme<Type>::addIstreamConstructorToTable<SS<Type>>          \
                 add##SS##Type##IstreamConstructorToTable_;                     \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
index ac1957f9b1..954ea3f85e 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
 
     const fvMesh& mesh = vsf.mesh();
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh> > tlsGrad
+    tmp<GeometricField<GradType, fvPatchField, volMesh>> tlsGrad
     (
         new GeometricField<GradType, fvPatchField, volMesh>
         (
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
index 6ee95bdbcc..129e3f48d5 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ class cellLimitedGrad
 {
     // Private Data
 
-        tmp<fv::gradScheme<Type> > basicGradScheme_;
+        tmp<fv::gradScheme<Type>> basicGradScheme_;
 
         //- Limiter coefficient
         const scalar k_;
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
index 0ef0b44ad6..f4b55ea398 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ class cellMDLimitedGrad
 {
     // Private Data
 
-        tmp<fv::gradScheme<Type> > basicGradScheme_;
+        tmp<fv::gradScheme<Type>> basicGradScheme_;
 
         //- Limiter coefficient
         const scalar k_;
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
index a3ce867666..9b7d698d23 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ class faceLimitedGrad
 {
     // Private Data
 
-        tmp<fv::gradScheme<Type> > basicGradScheme_;
+        tmp<fv::gradScheme<Type>> basicGradScheme_;
 
         //- Limiter coefficient
         const scalar k_;
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
index 9da9990353..5844f6ff0f 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ class faceMDLimitedGrad
 {
     // Private Data
 
-        tmp<fv::gradScheme<Type> > basicGradScheme_;
+        tmp<fv::gradScheme<Type>> basicGradScheme_;
 
         //- Limiter coefficient
         const scalar k_;
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
index 0da6e26eb3..3bf14b57b2 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 gaussLaplacianScheme<Type, GType>::fvmLaplacianUncorrected
 (
     const surfaceScalarField& gammaMagSf,
@@ -50,7 +50,7 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacianUncorrected
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<fvMatrix<Type> > tfvm
+    tmp<fvMatrix<Type>> tfvm
     (
         new fvMatrix<Type>
         (
@@ -89,7 +89,7 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacianUncorrected
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 gaussLaplacianScheme<Type, GType>::gammaSnGradCorr
 (
     const surfaceVectorField& SfGammaCorr,
@@ -98,7 +98,7 @@ gaussLaplacianScheme<Type, GType>::gammaSnGradCorr
 {
     const fvMesh& mesh = this->mesh();
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tgammaSnGradCorr
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tgammaSnGradCorr
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
@@ -132,7 +132,7 @@ gaussLaplacianScheme<Type, GType>::gammaSnGradCorr
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 gaussLaplacianScheme<Type, GType>::fvcLaplacian
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -140,7 +140,7 @@ gaussLaplacianScheme<Type, GType>::fvcLaplacian
 {
     const fvMesh& mesh = this->mesh();
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tLaplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tLaplacian
     (
         fvc::div(this->tsnGradScheme_().snGrad(vf)*mesh.magSf())
     );
@@ -152,7 +152,7 @@ gaussLaplacianScheme<Type, GType>::fvcLaplacian
 
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 gaussLaplacianScheme<Type, GType>::fvmLaplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
@@ -170,7 +170,7 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacian
     );
     const surfaceVectorField SfGammaCorr(SfGamma - SfGammaSn*Sn);
 
-    tmp<fvMatrix<Type> > tfvm = fvmLaplacianUncorrected
+    tmp<fvMatrix<Type>> tfvm = fvmLaplacianUncorrected
     (
         SfGammaSn,
         this->tsnGradScheme_().deltaCoeffs(vf),
@@ -178,7 +178,7 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacian
     );
     fvMatrix<Type>& fvm = tfvm();
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tfaceFluxCorrection
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tfaceFluxCorrection
         = gammaSnGradCorr(SfGammaCorr, vf);
 
     if (this->tsnGradScheme_().corrected())
@@ -199,7 +199,7 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 gaussLaplacianScheme<Type, GType>::fvcLaplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
@@ -216,7 +216,7 @@ gaussLaplacianScheme<Type, GType>::fvcLaplacian
     );
     const surfaceVectorField SfGammaCorr(SfGamma - SfGammaSn*Sn);
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tLaplacian
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tLaplacian
     (
         fvc::div
         (
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
index 1ff2a71843..83a5e46cf5 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ class gaussLaplacianScheme
 {
     // Private Member Functions
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > gammaSnGradCorr
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> gammaSnGradCorr
         (
             const surfaceVectorField& SfGammaCorr,
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -95,8 +95,8 @@ public:
         gaussLaplacianScheme
         (
             const fvMesh& mesh,
-            const tmp<surfaceInterpolationScheme<GType> >& igs,
-            const tmp<snGradScheme<Type> >& sngs
+            const tmp<surfaceInterpolationScheme<GType>>& igs,
+            const tmp<snGradScheme<Type>>& sngs
         )
         :
             laplacianScheme<Type, GType>(mesh, igs, sngs)
@@ -110,25 +110,25 @@ public:
 
     // Member Functions
 
-        static tmp<fvMatrix<Type> > fvmLaplacianUncorrected
+        static tmp<fvMatrix<Type>> fvmLaplacianUncorrected
         (
             const surfaceScalarField& gammaMagSf,
             const surfaceScalarField& deltaCoeffs,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcLaplacian
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<fvMatrix<Type> > fvmLaplacian
+        tmp<fvMatrix<Type>> fvmLaplacian
         (
             const GeometricField<GType, fvsPatchField, surfaceMesh>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh> > fvcLaplacian
+        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
         (
             const GeometricField<GType, fvsPatchField, surfaceMesh>&,
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -142,14 +142,14 @@ public:
 #define defineFvmLaplacianScalarGamma(Type)                                 \
                                                                             \
 template<>                                                                  \
-tmp<fvMatrix<Type> > gaussLaplacianScheme<Type, scalar>::fvmLaplacian       \
+tmp<fvMatrix<Type>> gaussLaplacianScheme<Type, scalar>::fvmLaplacian       \
 (                                                                           \
     const GeometricField<scalar, fvsPatchField, surfaceMesh>&,              \
     const GeometricField<Type, fvPatchField, volMesh>&                      \
 );                                                                          \
                                                                             \
 template<>                                                                  \
-tmp<GeometricField<Type, fvPatchField, volMesh> >                           \
+tmp<GeometricField<Type, fvPatchField, volMesh>>                           \
 gaussLaplacianScheme<Type, scalar>::fvcLaplacian                            \
 (                                                                           \
     const GeometricField<scalar, fvsPatchField, surfaceMesh>&,              \
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
index b7c2e25b8a..ee10741247 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ makeFvLaplacianScheme(gaussLaplacianScheme)
 #define declareFvmLaplacianScalarGamma(Type)                                 \
                                                                              \
 template<>                                                                   \
-Foam::tmp<Foam::fvMatrix<Foam::Type> >                                       \
+Foam::tmp<Foam::fvMatrix<Foam::Type>>                                       \
 Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvmLaplacian       \
 (                                                                            \
     const GeometricField<scalar, fvsPatchField, surfaceMesh>& gamma,         \
@@ -47,7 +47,7 @@ Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvmLaplacian       \
         gamma*mesh.magSf()                                                   \
     );                                                                       \
                                                                              \
-    tmp<fvMatrix<Type> > tfvm = fvmLaplacianUncorrected                      \
+    tmp<fvMatrix<Type>> tfvm = fvmLaplacianUncorrected                      \
     (                                                                        \
         gammaMagSf,                                                          \
         this->tsnGradScheme_().deltaCoeffs(vf),                              \
@@ -88,7 +88,7 @@ Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvmLaplacian       \
                                                                              \
                                                                              \
 template<>                                                                   \
-Foam::tmp<Foam::GeometricField<Foam::Type, Foam::fvPatchField, Foam::volMesh> >\
+Foam::tmp<Foam::GeometricField<Foam::Type, Foam::fvPatchField, Foam::volMesh>>\
 Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvcLaplacian       \
 (                                                                            \
     const GeometricField<scalar, fvsPatchField, surfaceMesh>& gamma,         \
@@ -97,7 +97,7 @@ Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvcLaplacian       \
 {                                                                            \
     const fvMesh& mesh = this->mesh();                                       \
                                                                              \
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tLaplacian             \
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tLaplacian             \
     (                                                                        \
         fvc::div(gamma*this->tsnGradScheme_().snGrad(vf)*mesh.magSf())       \
     );                                                                       \
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
index 09c7def178..e69cfab4bf 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<laplacianScheme<Type, GType> > laplacianScheme<Type, GType>::New
+tmp<laplacianScheme<Type, GType>> laplacianScheme<Type, GType>::New
 (
     const fvMesh& mesh,
     Istream& schemeData
@@ -95,7 +95,7 @@ laplacianScheme<Type, GType>::~laplacianScheme()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<fvMatrix<Type> >
+tmp<fvMatrix<Type>>
 laplacianScheme<Type, GType>::fvmLaplacian
 (
     const GeometricField<GType, fvPatchField, volMesh>& gamma,
@@ -107,7 +107,7 @@ laplacianScheme<Type, GType>::fvmLaplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 laplacianScheme<Type, GType>::fvcLaplacian
 (
     const GeometricField<GType, fvPatchField, volMesh>& gamma,
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
index ad479aa835..4c843f0add 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
@@ -73,8 +73,8 @@ protected:
     // Protected data
 
         const fvMesh& mesh_;
-        tmp<surfaceInterpolationScheme<GType> > tinterpGammaScheme_;
-        tmp<snGradScheme<Type> > tsnGradScheme_;
+        tmp<surfaceInterpolationScheme<GType>> tinterpGammaScheme_;
+        tmp<snGradScheme<Type>> tsnGradScheme_;
 
 
 private:
@@ -123,12 +123,12 @@ public:
             tinterpGammaScheme_(NULL),
             tsnGradScheme_(NULL)
         {
-            tinterpGammaScheme_ = tmp<surfaceInterpolationScheme<GType> >
+            tinterpGammaScheme_ = tmp<surfaceInterpolationScheme<GType>>
             (
                 surfaceInterpolationScheme<GType>::New(mesh, is)
             );
 
-            tsnGradScheme_ = tmp<snGradScheme<Type> >
+            tsnGradScheme_ = tmp<snGradScheme<Type>>
             (
                 snGradScheme<Type>::New(mesh, is)
             );
@@ -138,8 +138,8 @@ public:
         laplacianScheme
         (
             const fvMesh& mesh,
-            const tmp<surfaceInterpolationScheme<GType> >& igs,
-            const tmp<snGradScheme<Type> >& sngs
+            const tmp<surfaceInterpolationScheme<GType>>& igs,
+            const tmp<snGradScheme<Type>>& sngs
         )
         :
             mesh_(mesh),
@@ -151,7 +151,7 @@ public:
     // Selectors
 
         //- Return a pointer to a new laplacianScheme created on freestore
-        static tmp<laplacianScheme<Type, GType> > New
+        static tmp<laplacianScheme<Type, GType>> New
         (
             const fvMesh& mesh,
             Istream& schemeData
@@ -170,30 +170,30 @@ public:
             return mesh_;
         }
 
-        virtual tmp<fvMatrix<Type> > fvmLaplacian
+        virtual tmp<fvMatrix<Type>> fvmLaplacian
         (
             const GeometricField<GType, fvsPatchField, surfaceMesh>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<fvMatrix<Type> > fvmLaplacian
+        virtual tmp<fvMatrix<Type>> fvmLaplacian
         (
             const GeometricField<GType, fvPatchField, volMesh>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh> > fvcLaplacian
+        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh> > fvcLaplacian
+        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
         (
             const GeometricField<GType, fvsPatchField, surfaceMesh>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh> > fvcLaplacian
+        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
         (
             const GeometricField<GType, fvPatchField, volMesh>&,
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -224,7 +224,7 @@ public:
             typedef SS<Type, GType> SS##Type##GType;                           \
                                                                                \
             laplacianScheme<Type, GType>::                                     \
-                addIstreamConstructorToTable<SS<Type, GType> >                 \
+                addIstreamConstructorToTable<SS<Type, GType>>                 \
                 add##SS##Type##GType##IstreamConstructorToTable_;              \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
index f71471dc9a..ed63124fd6 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -213,7 +213,7 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit()
     // Get the cell/face centres in stencil order.
     // Centred face stencils no good for triangles or tets.
     // Need bigger stencils
-    List<List<point> > stencilPoints(mesh.nFaces());
+    List<List<point>> stencilPoints(mesh.nFaces());
     this->stencil().collectData(mesh.C(), stencilPoints);
 
     // find the fit coefficients for every face in the mesh
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
index 4cebfa3e7b..a16ac7bd84 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ public:
         }
 
         //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -132,7 +132,7 @@ public:
                     centralWeight_
                 );
 
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > sft
+            tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> sft
             (
                 stencil.weightedSum(vf, cfd.coeffs())
             );
@@ -169,7 +169,7 @@ public:
         namespace fv                                                           \
         {                                                                      \
             snGradScheme<TYPE>::addMeshConstructorToTable                      \
-                <CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL> >           \
+                <CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL>>           \
                 add##SS##STENCIL##TYPE##MeshConstructorToTable_;               \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
index 56d087107e..b653e839ea 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Foam::fv::correctedSnGrad<Type>::~correctedSnGrad()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fv::correctedSnGrad<Type>::fullGradCorrection
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -49,7 +49,7 @@ Foam::fv::correctedSnGrad<Type>::fullGradCorrection
     const fvMesh& mesh = this->mesh();
 
     // construct GeometricField<Type, fvsPatchField, surfaceMesh>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tssf =
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tssf =
         mesh.nonOrthCorrectionVectors()
       & linear<typename outerProduct<vector, Type>::type>(mesh).interpolate
         (
@@ -66,7 +66,7 @@ Foam::fv::correctedSnGrad<Type>::fullGradCorrection
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fv::correctedSnGrad<Type>::correction
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -75,7 +75,7 @@ Foam::fv::correctedSnGrad<Type>::correction
     const fvMesh& mesh = this->mesh();
 
     // construct GeometricField<Type, fvsPatchField, surfaceMesh>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tssf
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tssf
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
index 1361ed9de2..6d65a107a9 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
 
         //- Return the explicit correction to the correctedSnGrad
         //  for the given field using the gradient of the field
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         fullGradCorrection
         (
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -115,7 +115,7 @@ public:
 
         //- Return the explicit correction to the correctedSnGrad
         //  for the given field using the gradients of the field components
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
 };
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
index 6b04bb2efb..1d13539f40 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Foam::fv::faceCorrectedSnGrad<Type>::~faceCorrectedSnGrad()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fv::faceCorrectedSnGrad<Type>::fullGradCorrection
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -51,7 +51,7 @@ Foam::fv::faceCorrectedSnGrad<Type>::fullGradCorrection
     );
 
     // construct GeometricField<Type, fvsPatchField, surfaceMesh>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
@@ -123,7 +123,7 @@ Foam::fv::faceCorrectedSnGrad<Type>::fullGradCorrection
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fv::faceCorrectedSnGrad<Type>::correction
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -132,7 +132,7 @@ Foam::fv::faceCorrectedSnGrad<Type>::correction
     const fvMesh& mesh = this->mesh();
 
     // construct GeometricField<Type, fvsPatchField, surfaceMesh>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tssf
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tssf
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
index a13dd62d18..7cdb83d7e4 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
 
         //- Return the explicit correction to the faceCorrectedSnGrad
         //  for the given field using the gradient of the field
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         fullGradCorrection
         (
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -115,7 +115,7 @@ public:
 
         //- Return the explicit correction to the faceCorrectedSnGrad
         //  for the given field using the gradients of the field components
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
 };
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
index 63d81a996f..55b4ff38f7 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ limitedSnGrad<Type>::~limitedSnGrad()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 limitedSnGrad<Type>::correction
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
index ca9b2a8a5d..2523e0a223 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ class limitedSnGrad
 {
     // Private data
 
-        tmp<snGradScheme<Type> > correctedScheme_;
+        tmp<snGradScheme<Type>> correctedScheme_;
 
         scalar limitCoeff_;
 
@@ -83,14 +83,14 @@ class limitedSnGrad
 
         //- Lookup function for the corrected to support backward compatibility
         //  of dictionary specification
-        tmp<snGradScheme<Type> > lookupCorrectedScheme(Istream& schemeData)
+        tmp<snGradScheme<Type>> lookupCorrectedScheme(Istream& schemeData)
         {
             token nextToken(schemeData);
 
             if (nextToken.isNumber())
             {
                 limitCoeff_ = nextToken.number();
-                return tmp<snGradScheme<Type> >
+                return tmp<snGradScheme<Type>>
                 (
                     new correctedSnGrad<Type>(this->mesh())
                 );
@@ -98,7 +98,7 @@ class limitedSnGrad
             else
             {
                 schemeData.putBack(nextToken);
-                tmp<snGradScheme<Type> > tcorrectedScheme
+                tmp<snGradScheme<Type>> tcorrectedScheme
                 (
                     fv::snGradScheme<Type>::New(this->mesh(), schemeData)
                 );
@@ -168,7 +168,7 @@ public:
 
         //- Return the explicit correction to the limitedSnGrad
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
 };
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
index 8ae3b15243..f1249ad65f 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,14 +50,14 @@ orthogonalSnGrad<Type>::~orthogonalSnGrad()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 orthogonalSnGrad<Type>::correction
 (
     const GeometricField<Type, fvPatchField, volMesh>&
 ) const
 {
     NotImplemented;
-    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >(NULL);
+    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>(NULL);
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
index b903298162..65026ee5cb 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
 
         //- Return the explicit correction to the orthogonalSnGrad
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
 };
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index 7484c060a2..0335b0d8df 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<snGradScheme<Type> > snGradScheme<Type>::New
+tmp<snGradScheme<Type>> snGradScheme<Type>::New
 (
     const fvMesh& mesh,
     Istream& schemeData
@@ -98,7 +98,7 @@ snGradScheme<Type>::~snGradScheme()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 snGradScheme<Type>::snGrad
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -109,7 +109,7 @@ snGradScheme<Type>::snGrad
     const fvMesh& mesh = vf.mesh();
 
     // construct GeometricField<Type, fvsPatchField, surfaceMesh>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
@@ -160,7 +160,7 @@ snGradScheme<Type>::snGrad
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 snGradScheme<Type>::sndGrad
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -174,13 +174,13 @@ snGradScheme<Type>::sndGrad
 //- Return the face-snGrad of the given cell field
 //  with explicit correction
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 snGradScheme<Type>::snGrad
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
     (
         snGrad(vf, deltaCoeffs(vf))
     );
@@ -197,13 +197,13 @@ snGradScheme<Type>::snGrad
 //- Return the face-snGrad of the given cell field
 //  with explicit correction
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 snGradScheme<Type>::snGrad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 ) const
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
     (
         snGrad(tvf())
     );
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
index e507cc837f..b107d19e10 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ public:
     // Selectors
 
         //- Return new tmp interpolation scheme
-        static tmp<snGradScheme<Type> > New
+        static tmp<snGradScheme<Type>> New
         (
             const fvMesh& mesh,
             Istream& schemeData
@@ -125,7 +125,7 @@ public:
 
 
         //- Return the snGrad of the given cell field with the given deltaCoeffs
-        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         snGrad
         (
             const GeometricField<Type, fvPatchField, volMesh>&,
@@ -134,7 +134,7 @@ public:
         );
 
         //- Return the sndGrad of the given cell field
-        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         sndGrad
         (
             const GeometricField<Type, fvPatchField, volMesh>&,
@@ -155,23 +155,23 @@ public:
 
         //- Return the explicit correction to the snGrad
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const
         {
-            return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >(NULL);
+            return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>(NULL);
         }
 
         //- Return the snGrad of the given cell field
         //  with explicit correction
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         snGrad(const GeometricField<Type, fvPatchField, volMesh>&) const;
 
         //- Return the snGrad of the given tmp cell field
         //  with explicit correction
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         snGrad
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
         ) const;
 };
 
@@ -195,7 +195,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            snGradScheme<Type>::addMeshConstructorToTable<SS<Type> >           \
+            snGradScheme<Type>::addMeshConstructorToTable<SS<Type>>           \
                 add##SS##Type##MeshConstructorToTable_;                        \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
index 32344459fd..5693e6cb7f 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,14 +50,14 @@ uncorrectedSnGrad<Type>::~uncorrectedSnGrad()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 uncorrectedSnGrad<Type>::correction
 (
     const GeometricField<Type, fvPatchField, volMesh>&
 ) const
 {
     NotImplemented;
-    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >(NULL);
+    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>(NULL);
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
index 082eeabbd0..d72aad37ea 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
 
         //- Return the explicit correction to the uncorrectedSnGrad
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
 };
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 8f5a2d3789..f173748ab0 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -60,7 +60,7 @@ template<class Type2>
 void Foam::fvMatrix<Type>::addToInternalField
 (
     const labelUList& addr,
-    const tmp<Field<Type2> >& tpf,
+    const tmp<Field<Type2>>& tpf,
     Field<Type2>& intf
 ) const
 {
@@ -97,7 +97,7 @@ template<class Type2>
 void Foam::fvMatrix<Type>::subtractFromInternalField
 (
     const labelUList& addr,
-    const tmp<Field<Type2> >& tpf,
+    const tmp<Field<Type2>>& tpf,
     Field<Type2>& intf
 ) const
 {
@@ -158,7 +158,7 @@ void Foam::fvMatrix<Type>::addBoundarySource
         }
         else if (couples)
         {
-            tmp<Field<Type> > tpnf = ptf.patchNeighbourField();
+            tmp<Field<Type>> tpnf = ptf.patchNeighbourField();
             const Field<Type>& pnf = tpnf();
 
             const labelUList& addr = lduAddr().patchAddr(patchI);
@@ -352,7 +352,7 @@ Foam::fvMatrix<Type>::fvMatrix(const fvMatrix<Type>& fvm)
 
 #ifndef NoConstructFromTmp
 template<class Type>
-Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type> >& tfvm)
+Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>& tfvm)
 :
     refCount(),
     lduMatrix
@@ -381,7 +381,7 @@ Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type> >& tfvm)
 {
     if (debug)
     {
-        Info<< "fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type> >&) : "
+        Info<< "fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>&) : "
             << "copying fvMatrix<Type> for field " << psi_.name()
             << endl;
     }
@@ -707,9 +707,9 @@ Foam::tmp<Foam::scalarField> Foam::fvMatrix<Type>::D() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fvMatrix<Type>::DD() const
+Foam::tmp<Foam::Field<Type>> Foam::fvMatrix<Type>::DD() const
 {
-    tmp<Field<Type> > tdiag(pTraits<Type>::one*diag());
+    tmp<Field<Type>> tdiag(pTraits<Type>::one*diag());
 
     forAll(psi_.boundaryField(), patchI)
     {
@@ -759,10 +759,10 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::A() const
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvMatrix<Type>::H() const
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tHphi
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tHphi
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -868,7 +868,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::H1() const
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvMatrix<Type>::
 flux() const
 {
@@ -882,7 +882,7 @@ flux() const
     }
 
     // construct GeometricField<Type, fvsPatchField, surfaceMesh>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tfieldFlux
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tfieldFlux
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
@@ -990,7 +990,7 @@ void Foam::fvMatrix<Type>::operator=(const fvMatrix<Type>& fvmv)
 
 
 template<class Type>
-void Foam::fvMatrix<Type>::operator=(const tmp<fvMatrix<Type> >& tfvmv)
+void Foam::fvMatrix<Type>::operator=(const tmp<fvMatrix<Type>>& tfvmv)
 {
     operator=(tfvmv());
     tfvmv.clear();
@@ -1039,7 +1039,7 @@ void Foam::fvMatrix<Type>::operator+=(const fvMatrix<Type>& fvmv)
 
 
 template<class Type>
-void Foam::fvMatrix<Type>::operator+=(const tmp<fvMatrix<Type> >& tfvmv)
+void Foam::fvMatrix<Type>::operator+=(const tmp<fvMatrix<Type>>& tfvmv)
 {
     operator+=(tfvmv());
     tfvmv.clear();
@@ -1071,7 +1071,7 @@ void Foam::fvMatrix<Type>::operator-=(const fvMatrix<Type>& fvmv)
 
 
 template<class Type>
-void Foam::fvMatrix<Type>::operator-=(const tmp<fvMatrix<Type> >& tfvmv)
+void Foam::fvMatrix<Type>::operator-=(const tmp<fvMatrix<Type>>& tfvmv)
 {
     operator-=(tfvmv());
     tfvmv.clear();
@@ -1092,7 +1092,7 @@ void Foam::fvMatrix<Type>::operator+=
 template<class Type>
 void Foam::fvMatrix<Type>::operator+=
 (
-    const tmp<DimensionedField<Type, volMesh> >& tsu
+    const tmp<DimensionedField<Type, volMesh>>& tsu
 )
 {
     operator+=(tsu());
@@ -1103,7 +1103,7 @@ void Foam::fvMatrix<Type>::operator+=
 template<class Type>
 void Foam::fvMatrix<Type>::operator+=
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
 )
 {
     operator+=(tsu());
@@ -1125,7 +1125,7 @@ void Foam::fvMatrix<Type>::operator-=
 template<class Type>
 void Foam::fvMatrix<Type>::operator-=
 (
-    const tmp<DimensionedField<Type, volMesh> >& tsu
+    const tmp<DimensionedField<Type, volMesh>>& tsu
 )
 {
     operator-=(tsu());
@@ -1136,7 +1136,7 @@ void Foam::fvMatrix<Type>::operator-=
 template<class Type>
 void Foam::fvMatrix<Type>::operator-=
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
 )
 {
     operator-=(tsu());
@@ -1213,7 +1213,7 @@ void Foam::fvMatrix<Type>::operator*=
 template<class Type>
 void Foam::fvMatrix<Type>::operator*=
 (
-    const tmp<DimensionedField<scalar, volMesh> >& tdsf
+    const tmp<DimensionedField<scalar, volMesh>>& tdsf
 )
 {
     operator*=(tdsf());
@@ -1339,7 +1339,7 @@ Foam::SolverPerformance<Type> Foam::solve
 template<class Type>
 Foam::SolverPerformance<Type> Foam::solve
 (
-    const tmp<fvMatrix<Type> >& tfvm,
+    const tmp<fvMatrix<Type>>& tfvm,
     const dictionary& solverControls
 )
 {
@@ -1359,7 +1359,7 @@ Foam::SolverPerformance<Type> Foam::solve(fvMatrix<Type>& fvm)
 }
 
 template<class Type>
-Foam::SolverPerformance<Type> Foam::solve(const tmp<fvMatrix<Type> >& tfvm)
+Foam::SolverPerformance<Type> Foam::solve(const tmp<fvMatrix<Type>>& tfvm)
 {
     SolverPerformance<Type> solverPerf =
         const_cast<fvMatrix<Type>&>(tfvm()).solve();
@@ -1371,12 +1371,12 @@ Foam::SolverPerformance<Type> Foam::solve(const tmp<fvMatrix<Type> >& tfvm)
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::correction
+Foam::tmp<Foam::fvMatrix<Type>> Foam::correction
 (
     const fvMatrix<Type>& A
 )
 {
-    tmp<Foam::fvMatrix<Type> > tAcorr = A - (A & A.psi());
+    tmp<Foam::fvMatrix<Type>> tAcorr = A - (A & A.psi());
 
     if
     (
@@ -1392,12 +1392,12 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::correction
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::correction
+Foam::tmp<Foam::fvMatrix<Type>> Foam::correction
 (
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<fvMatrix<Type>>& tA
 )
 {
-    tmp<Foam::fvMatrix<Type> > tAcorr = tA - (tA() & tA().psi());
+    tmp<Foam::fvMatrix<Type>> tAcorr = tA - (tA() & tA().psi());
 
     // Note the matrix coefficients are still that of matrix A
     const fvMatrix<Type>& A = tAcorr();
@@ -1418,7 +1418,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::correction
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
     const fvMatrix<Type>& A,
     const fvMatrix<Type>& B
@@ -1429,9 +1429,9 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
-    const tmp<fvMatrix<Type> >& tA,
+    const tmp<fvMatrix<Type>>& tA,
     const fvMatrix<Type>& B
 )
 {
@@ -1440,10 +1440,10 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
     const fvMatrix<Type>& A,
-    const tmp<fvMatrix<Type> >& tB
+    const tmp<fvMatrix<Type>>& tB
 )
 {
     checkMethod(A, tB(), "==");
@@ -1451,10 +1451,10 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
-    const tmp<fvMatrix<Type> >& tA,
-    const tmp<fvMatrix<Type> >& tB
+    const tmp<fvMatrix<Type>>& tA,
+    const tmp<fvMatrix<Type>>& tB
 )
 {
     checkMethod(tA(), tB(), "==");
@@ -1462,115 +1462,115 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
     const fvMatrix<Type>& A,
     const DimensionedField<Type, volMesh>& su
 )
 {
     checkMethod(A, su, "==");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() += su.mesh().V()*su.field();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
     const fvMatrix<Type>& A,
-    const tmp<DimensionedField<Type, volMesh> >& tsu
+    const tmp<DimensionedField<Type, volMesh>>& tsu
 )
 {
     checkMethod(A, tsu(), "==");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() += tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
     const fvMatrix<Type>& A,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
 )
 {
     checkMethod(A, tsu(), "==");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() += tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
-    const tmp<fvMatrix<Type> >& tA,
+    const tmp<fvMatrix<Type>>& tA,
     const DimensionedField<Type, volMesh>& su
 )
 {
     checkMethod(tA(), su, "==");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() += su.mesh().V()*su.field();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
-    const tmp<fvMatrix<Type> >& tA,
-    const tmp<DimensionedField<Type, volMesh> >& tsu
+    const tmp<fvMatrix<Type>>& tA,
+    const tmp<DimensionedField<Type, volMesh>>& tsu
 )
 {
     checkMethod(tA(), tsu(), "==");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() += tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
-    const tmp<fvMatrix<Type> >& tA,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu
+    const tmp<fvMatrix<Type>>& tA,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
 )
 {
     checkMethod(tA(), tsu(), "==");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() += tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
     const fvMatrix<Type>& A,
     const dimensioned<Type>& su
 )
 {
     checkMethod(A, su, "==");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() += A.psi().mesh().V()*su.value();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
-    const tmp<fvMatrix<Type> >& tA,
+    const tmp<fvMatrix<Type>>& tA,
     const dimensioned<Type>& su
 )
 {
     checkMethod(tA(), su, "==");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() += tC().psi().mesh().V()*su.value();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
     const fvMatrix<Type>& A,
     const zero&
@@ -1581,9 +1581,9 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
-    const tmp<fvMatrix<Type> >& tA,
+    const tmp<fvMatrix<Type>>& tA,
     const zero&
 )
 {
@@ -1592,240 +1592,240 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator==
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const fvMatrix<Type>& A
 )
 {
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().negate();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<fvMatrix<Type>>& tA
 )
 {
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().negate();
     return tC;
 }
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const fvMatrix<Type>& A,
     const fvMatrix<Type>& B
 )
 {
     checkMethod(A, B, "+");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC() += B;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<fvMatrix<Type> >& tA,
+    const tmp<fvMatrix<Type>>& tA,
     const fvMatrix<Type>& B
 )
 {
     checkMethod(tA(), B, "+");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC() += B;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const fvMatrix<Type>& A,
-    const tmp<fvMatrix<Type> >& tB
+    const tmp<fvMatrix<Type>>& tB
 )
 {
     checkMethod(A, tB(), "+");
-    tmp<fvMatrix<Type> > tC(tB.ptr());
+    tmp<fvMatrix<Type>> tC(tB.ptr());
     tC() += A;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<fvMatrix<Type> >& tA,
-    const tmp<fvMatrix<Type> >& tB
+    const tmp<fvMatrix<Type>>& tA,
+    const tmp<fvMatrix<Type>>& tB
 )
 {
     checkMethod(tA(), tB(), "+");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC() += tB();
     tB.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const fvMatrix<Type>& A,
     const DimensionedField<Type, volMesh>& su
 )
 {
     checkMethod(A, su, "+");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const fvMatrix<Type>& A,
-    const tmp<DimensionedField<Type, volMesh> >& tsu
+    const tmp<DimensionedField<Type, volMesh>>& tsu
 )
 {
     checkMethod(A, tsu(), "+");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const fvMatrix<Type>& A,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
 )
 {
     checkMethod(A, tsu(), "+");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<fvMatrix<Type> >& tA,
+    const tmp<fvMatrix<Type>>& tA,
     const DimensionedField<Type, volMesh>& su
 )
 {
     checkMethod(tA(), su, "+");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<fvMatrix<Type> >& tA,
-    const tmp<DimensionedField<Type, volMesh> >& tsu
+    const tmp<fvMatrix<Type>>& tA,
+    const tmp<DimensionedField<Type, volMesh>>& tsu
 )
 {
     checkMethod(tA(), tsu(), "+");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<fvMatrix<Type> >& tA,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu
+    const tmp<fvMatrix<Type>>& tA,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
 )
 {
     checkMethod(tA(), tsu(), "+");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const DimensionedField<Type, volMesh>& su,
     const fvMatrix<Type>& A
 )
 {
     checkMethod(A, su, "+");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<DimensionedField<Type, volMesh> >& tsu,
+    const tmp<DimensionedField<Type, volMesh>>& tsu,
     const fvMatrix<Type>& A
 )
 {
     checkMethod(A, tsu(), "+");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
     const fvMatrix<Type>& A
 )
 {
     checkMethod(A, tsu(), "+");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const DimensionedField<Type, volMesh>& su,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<fvMatrix<Type>>& tA
 )
 {
     checkMethod(tA(), su, "+");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<DimensionedField<Type, volMesh> >& tsu,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<DimensionedField<Type, volMesh>>& tsu,
+    const tmp<fvMatrix<Type>>& tA
 )
 {
     checkMethod(tA(), tsu(), "+");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
+    const tmp<fvMatrix<Type>>& tA
 )
 {
     checkMethod(tA(), tsu(), "+");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
@@ -1833,164 +1833,164 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const fvMatrix<Type>& A,
     const fvMatrix<Type>& B
 )
 {
     checkMethod(A, B, "-");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC() -= B;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<fvMatrix<Type> >& tA,
+    const tmp<fvMatrix<Type>>& tA,
     const fvMatrix<Type>& B
 )
 {
     checkMethod(tA(), B, "-");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC() -= B;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const fvMatrix<Type>& A,
-    const tmp<fvMatrix<Type> >& tB
+    const tmp<fvMatrix<Type>>& tB
 )
 {
     checkMethod(A, tB(), "-");
-    tmp<fvMatrix<Type> > tC(tB.ptr());
+    tmp<fvMatrix<Type>> tC(tB.ptr());
     tC() -= A;
     tC().negate();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<fvMatrix<Type> >& tA,
-    const tmp<fvMatrix<Type> >& tB
+    const tmp<fvMatrix<Type>>& tA,
+    const tmp<fvMatrix<Type>>& tB
 )
 {
     checkMethod(tA(), tB(), "-");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC() -= tB();
     tB.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const fvMatrix<Type>& A,
     const DimensionedField<Type, volMesh>& su
 )
 {
     checkMethod(A, su, "-");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() += su.mesh().V()*su.field();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const fvMatrix<Type>& A,
-    const tmp<DimensionedField<Type, volMesh> >& tsu
+    const tmp<DimensionedField<Type, volMesh>>& tsu
 )
 {
     checkMethod(A, tsu(), "-");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() += tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const fvMatrix<Type>& A,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
 )
 {
     checkMethod(A, tsu(), "-");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() += tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<fvMatrix<Type> >& tA,
+    const tmp<fvMatrix<Type>>& tA,
     const DimensionedField<Type, volMesh>& su
 )
 {
     checkMethod(tA(), su, "-");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() += su.mesh().V()*su.field();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<fvMatrix<Type> >& tA,
-    const tmp<DimensionedField<Type, volMesh> >& tsu
+    const tmp<fvMatrix<Type>>& tA,
+    const tmp<DimensionedField<Type, volMesh>>& tsu
 )
 {
     checkMethod(tA(), tsu(), "-");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() += tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<fvMatrix<Type> >& tA,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu
+    const tmp<fvMatrix<Type>>& tA,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
 )
 {
     checkMethod(tA(), tsu(), "-");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() += tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const DimensionedField<Type, volMesh>& su,
     const fvMatrix<Type>& A
 )
 {
     checkMethod(A, su, "-");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().negate();
     tC().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<DimensionedField<Type, volMesh> >& tsu,
+    const tmp<DimensionedField<Type, volMesh>>& tsu,
     const fvMatrix<Type>& A
 )
 {
     checkMethod(A, tsu(), "-");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().negate();
     tC().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
@@ -1998,14 +1998,14 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
     const fvMatrix<Type>& A
 )
 {
     checkMethod(A, tsu(), "-");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().negate();
     tC().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
@@ -2013,28 +2013,28 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const DimensionedField<Type, volMesh>& su,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<fvMatrix<Type>>& tA
 )
 {
     checkMethod(tA(), su, "-");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().negate();
     tC().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<DimensionedField<Type, volMesh> >& tsu,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<DimensionedField<Type, volMesh>>& tsu,
+    const tmp<fvMatrix<Type>>& tA
 )
 {
     checkMethod(tA(), tsu(), "-");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().negate();
     tC().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
@@ -2042,14 +2042,14 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tsu,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
+    const tmp<fvMatrix<Type>>& tA
 )
 {
     checkMethod(tA(), tsu(), "-");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().negate();
     tC().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
@@ -2057,106 +2057,106 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const fvMatrix<Type>& A,
     const dimensioned<Type>& su
 )
 {
     checkMethod(A, su, "+");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() -= su.value()*A.psi().mesh().V();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<fvMatrix<Type> >& tA,
+    const tmp<fvMatrix<Type>>& tA,
     const dimensioned<Type>& su
 )
 {
     checkMethod(tA(), su, "+");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() -= su.value()*tC().psi().mesh().V();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const dimensioned<Type>& su,
     const fvMatrix<Type>& A
 )
 {
     checkMethod(A, su, "+");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() -= su.value()*A.psi().mesh().V();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator+
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const dimensioned<Type>& su,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<fvMatrix<Type>>& tA
 )
 {
     checkMethod(tA(), su, "+");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() -= su.value()*tC().psi().mesh().V();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const fvMatrix<Type>& A,
     const dimensioned<Type>& su
 )
 {
     checkMethod(A, su, "-");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().source() += su.value()*tC().psi().mesh().V();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<fvMatrix<Type> >& tA,
+    const tmp<fvMatrix<Type>>& tA,
     const dimensioned<Type>& su
 )
 {
     checkMethod(tA(), su, "-");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().source() += su.value()*tC().psi().mesh().V();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const dimensioned<Type>& su,
     const fvMatrix<Type>& A
 )
 {
     checkMethod(A, su, "-");
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC().negate();
     tC().source() -= su.value()*A.psi().mesh().V();
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const dimensioned<Type>& su,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<fvMatrix<Type>>& tA
 )
 {
     checkMethod(tA(), su, "-");
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC().negate();
     tC().source() -= su.value()*tC().psi().mesh().V();
     return tC;
@@ -2164,111 +2164,111 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator-
 
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
     const DimensionedField<scalar, volMesh>& dsf,
     const fvMatrix<Type>& A
 )
 {
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC() *= dsf;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
-    const tmp<DimensionedField<scalar, volMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, volMesh>>& tdsf,
     const fvMatrix<Type>& A
 )
 {
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC() *= tdsf;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
     const tmp<volScalarField>& tvsf,
     const fvMatrix<Type>& A
 )
 {
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC() *= tvsf;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
     const DimensionedField<scalar, volMesh>& dsf,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<fvMatrix<Type>>& tA
 )
 {
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC() *= dsf;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
-    const tmp<DimensionedField<scalar, volMesh> >& tdsf,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<DimensionedField<scalar, volMesh>>& tdsf,
+    const tmp<fvMatrix<Type>>& tA
 )
 {
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC() *= tdsf;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
     const tmp<volScalarField>& tvsf,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<fvMatrix<Type>>& tA
 )
 {
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC() *= tvsf;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
     const dimensioned<scalar>& ds,
     const fvMatrix<Type>& A
 )
 {
-    tmp<fvMatrix<Type> > tC(new fvMatrix<Type>(A));
+    tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
     tC() *= ds;
     return tC;
 }
 
 template<class Type>
-Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
+Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
     const dimensioned<scalar>& ds,
-    const tmp<fvMatrix<Type> >& tA
+    const tmp<fvMatrix<Type>>& tA
 )
 {
-    tmp<fvMatrix<Type> > tC(tA.ptr());
+    tmp<fvMatrix<Type>> tC(tA.ptr());
     tC() *= ds;
     return tC;
 }
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::operator&
 (
     const fvMatrix<Type>& M,
     const DimensionedField<Type, volMesh>& psi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tMphi
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tMphi
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -2313,67 +2313,67 @@ Foam::operator&
 }
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::operator&
 (
     const fvMatrix<Type>& M,
-    const tmp<DimensionedField<Type, volMesh> >& tpsi
+    const tmp<DimensionedField<Type, volMesh>>& tpsi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tMpsi = M & tpsi();
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tMpsi = M & tpsi();
     tpsi.clear();
     return tMpsi;
 }
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::operator&
 (
     const fvMatrix<Type>& M,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tpsi
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tpsi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tMpsi = M & tpsi();
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tMpsi = M & tpsi();
     tpsi.clear();
     return tMpsi;
 }
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::operator&
 (
-    const tmp<fvMatrix<Type> >& tM,
+    const tmp<fvMatrix<Type>>& tM,
     const DimensionedField<Type, volMesh>& psi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tMpsi = tM() & psi;
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tMpsi = tM() & psi;
     tM.clear();
     return tMpsi;
 }
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::operator&
 (
-    const tmp<fvMatrix<Type> >& tM,
-    const tmp<DimensionedField<Type, volMesh> >& tpsi
+    const tmp<fvMatrix<Type>>& tM,
+    const tmp<DimensionedField<Type, volMesh>>& tpsi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tMpsi = tM() & tpsi();
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tMpsi = tM() & tpsi();
     tM.clear();
     tpsi.clear();
     return tMpsi;
 }
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::operator&
 (
-    const tmp<fvMatrix<Type> >& tM,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tpsi
+    const tmp<fvMatrix<Type>>& tM,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tpsi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tMpsi = tM() & tpsi();
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tMpsi = tM() & tpsi();
     tM.clear();
     tpsi.clear();
     return tMpsi;
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 32596afc13..6565f3a9b7 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,45 +60,45 @@ template<class Type>
 class fvMatrix;
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > operator&
+tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
 (
     const fvMatrix<Type>&,
     const DimensionedField<Type, volMesh>&
 );
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > operator&
+tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
 (
     const fvMatrix<Type>&,
-    const tmp<DimensionedField<Type, volMesh> >&
+    const tmp<DimensionedField<Type, volMesh>>&
 );
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > operator&
+tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
 (
     const fvMatrix<Type>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
 );
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > operator&
+tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const DimensionedField<Type, volMesh>&
 );
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > operator&
+tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
 (
-    const tmp<fvMatrix<Type> >&,
-    const tmp<DimensionedField<Type, volMesh> >&
+    const tmp<fvMatrix<Type>>&,
+    const tmp<DimensionedField<Type, volMesh>>&
 );
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > operator&
+tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
 (
-    const tmp<fvMatrix<Type> >&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+    const tmp<fvMatrix<Type>>&,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
 );
 
 template<class Type>
@@ -163,7 +163,7 @@ protected:
         void addToInternalField
         (
             const labelUList& addr,
-            const tmp<Field<Type2> >& tpf,
+            const tmp<Field<Type2>>& tpf,
             Field<Type2>& intf
         ) const;
 
@@ -180,7 +180,7 @@ protected:
         void subtractFromInternalField
         (
             const labelUList& addr,
-            const tmp<Field<Type2> >& tpf,
+            const tmp<Field<Type2>>& tpf,
             Field<Type2>& intf
         ) const;
 
@@ -262,9 +262,9 @@ public:
         //- Construct as copy
         fvMatrix(const fvMatrix<Type>&);
 
-        //- Construct as copy of tmp<fvMatrix<Type> > deleting argument
+        //- Construct as copy of tmp<fvMatrix<Type>> deleting argument
         #ifndef NoConstructFromTmp
-        fvMatrix(const tmp<fvMatrix<Type> >&);
+        fvMatrix(const tmp<fvMatrix<Type>>&);
         #endif
 
         //- Construct from Istream given field to solve for
@@ -404,40 +404,40 @@ public:
             SolverPerformance<Type> solve();
 
             //- Return the matrix residual
-            tmp<Field<Type> > residual() const;
+            tmp<Field<Type>> residual() const;
 
             //- Return the matrix scalar diagonal
             tmp<scalarField> D() const;
 
             //- Return the matrix Type diagonal
-            tmp<Field<Type> > DD() const;
+            tmp<Field<Type>> DD() const;
 
             //- Return the central coefficient
             tmp<volScalarField> A() const;
 
             //- Return the H operation source
-            tmp<GeometricField<Type, fvPatchField, volMesh> > H() const;
+            tmp<GeometricField<Type, fvPatchField, volMesh>> H() const;
 
             //- Return H(1)
             tmp<volScalarField> H1() const;
 
             //- Return the face-flux field from the matrix
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+            tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
                 flux() const;
 
 
     // Member operators
 
         void operator=(const fvMatrix<Type>&);
-        void operator=(const tmp<fvMatrix<Type> >&);
+        void operator=(const tmp<fvMatrix<Type>>&);
 
         void negate();
 
         void operator+=(const fvMatrix<Type>&);
-        void operator+=(const tmp<fvMatrix<Type> >&);
+        void operator+=(const tmp<fvMatrix<Type>>&);
 
         void operator-=(const fvMatrix<Type>&);
-        void operator-=(const tmp<fvMatrix<Type> >&);
+        void operator-=(const tmp<fvMatrix<Type>>&);
 
         void operator+=
         (
@@ -445,11 +445,11 @@ public:
         );
         void operator+=
         (
-            const tmp<DimensionedField<Type, volMesh> >&
+            const tmp<DimensionedField<Type, volMesh>>&
         );
         void operator+=
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
         );
 
         void operator-=
@@ -458,11 +458,11 @@ public:
         );
         void operator-=
         (
-            const tmp<DimensionedField<Type, volMesh> >&
+            const tmp<DimensionedField<Type, volMesh>>&
         );
         void operator-=
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
         );
 
         void operator+=(const dimensioned<Type>&);
@@ -472,7 +472,7 @@ public:
         void operator-=(const zero&);
 
         void operator*=(const DimensionedField<scalar, volMesh>&);
-        void operator*=(const tmp<DimensionedField<scalar, volMesh> >&);
+        void operator*=(const tmp<DimensionedField<scalar, volMesh>>&);
         void operator*=(const tmp<volScalarField>&);
 
         void operator*=(const dimensioned<scalar>&);
@@ -480,32 +480,32 @@ public:
 
     // Friend operators
 
-        friend tmp<GeometricField<Type, fvPatchField, volMesh> >
+        friend tmp<GeometricField<Type, fvPatchField, volMesh>>
         operator& <Type>
         (
             const fvMatrix<Type>&,
             const DimensionedField<Type, volMesh>&
         );
 
-        friend tmp<GeometricField<Type, fvPatchField, volMesh> >
+        friend tmp<GeometricField<Type, fvPatchField, volMesh>>
         operator& <Type>
         (
             const fvMatrix<Type>&,
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
         );
 
-        friend tmp<GeometricField<Type, fvPatchField, volMesh> >
+        friend tmp<GeometricField<Type, fvPatchField, volMesh>>
         operator& <Type>
         (
-            const tmp<fvMatrix<Type> >&,
+            const tmp<fvMatrix<Type>>&,
             const DimensionedField<Type, volMesh>&
         );
 
-        friend tmp<GeometricField<Type, fvPatchField, volMesh> >
+        friend tmp<GeometricField<Type, fvPatchField, volMesh>>
         operator& <Type>
         (
-            const tmp<fvMatrix<Type> >&,
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+            const tmp<fvMatrix<Type>>&,
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
         );
 
 
@@ -558,7 +558,7 @@ SolverPerformance<Type> solve(fvMatrix<Type>&, const dictionary&);
 template<class Type>
 SolverPerformance<Type> solve
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const dictionary&
 );
 
@@ -573,478 +573,478 @@ SolverPerformance<Type> solve(fvMatrix<Type>&);
 //  deleting temporary matrix after solution.
 //  Solver controls read fvSolution
 template<class Type>
-SolverPerformance<Type> solve(const tmp<fvMatrix<Type> >&);
+SolverPerformance<Type> solve(const tmp<fvMatrix<Type>>&);
 
 
 //- Return the correction form of the given matrix
 //  by subtracting the matrix multiplied by the current field
 template<class Type>
-tmp<fvMatrix<Type> > correction(const fvMatrix<Type>&);
+tmp<fvMatrix<Type>> correction(const fvMatrix<Type>&);
 
 
 //- Return the correction form of the given temporary matrix
 //  by subtracting the matrix multiplied by the current field
 template<class Type>
-tmp<fvMatrix<Type> > correction(const tmp<fvMatrix<Type> >&);
+tmp<fvMatrix<Type>> correction(const tmp<fvMatrix<Type>>&);
 
 
 // * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
     const fvMatrix<Type>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
     const fvMatrix<Type>&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
-    const tmp<fvMatrix<Type> >&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&,
+    const tmp<fvMatrix<Type>>&
 );
 
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
     const fvMatrix<Type>&,
     const DimensionedField<Type, volMesh>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
     const fvMatrix<Type>&,
-    const tmp<DimensionedField<Type, volMesh> >&
+    const tmp<DimensionedField<Type, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
     const fvMatrix<Type>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const DimensionedField<Type, volMesh>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
-    const tmp<fvMatrix<Type> >&,
-    const tmp<DimensionedField<Type, volMesh> >&
+    const tmp<fvMatrix<Type>>&,
+    const tmp<DimensionedField<Type, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
-    const tmp<fvMatrix<Type> >&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+    const tmp<fvMatrix<Type>>&,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
     const fvMatrix<Type>&,
     const dimensioned<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const dimensioned<Type>&
 );
 
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
     const fvMatrix<Type>&,
     const zero&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator==
+tmp<fvMatrix<Type>> operator==
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const zero&
 );
 
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&
 );
 
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
     const fvMatrix<Type>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
     const fvMatrix<Type>&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
-    const tmp<fvMatrix<Type> >&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&,
+    const tmp<fvMatrix<Type>>&
 );
 
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
     const fvMatrix<Type>&,
     const DimensionedField<Type, volMesh>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
     const fvMatrix<Type>&,
-    const tmp<DimensionedField<Type, volMesh> >&
+    const tmp<DimensionedField<Type, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
     const fvMatrix<Type>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const DimensionedField<Type, volMesh>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
-    const tmp<fvMatrix<Type> >&,
-    const tmp<DimensionedField<Type, volMesh> >&
+    const tmp<fvMatrix<Type>>&,
+    const tmp<DimensionedField<Type, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
-    const tmp<fvMatrix<Type> >&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+    const tmp<fvMatrix<Type>>&,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
     const DimensionedField<Type, volMesh>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
-    const tmp<DimensionedField<Type, volMesh> >&,
+    const tmp<DimensionedField<Type, volMesh>>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
     const DimensionedField<Type, volMesh>&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
-    const tmp<DimensionedField<Type, volMesh> >&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<DimensionedField<Type, volMesh>>&,
+    const tmp<fvMatrix<Type>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+    const tmp<fvMatrix<Type>>&
 );
 
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
     const fvMatrix<Type>&,
     const dimensioned<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const dimensioned<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
     const dimensioned<Type>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator+
+tmp<fvMatrix<Type>> operator+
 (
     const dimensioned<Type>&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&
 );
 
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
     const fvMatrix<Type>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
     const fvMatrix<Type>&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
-    const tmp<fvMatrix<Type> >&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&,
+    const tmp<fvMatrix<Type>>&
 );
 
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
     const fvMatrix<Type>&,
     const DimensionedField<Type, volMesh>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
     const fvMatrix<Type>&,
-    const tmp<DimensionedField<Type, volMesh> >&
+    const tmp<DimensionedField<Type, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
     const fvMatrix<Type>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const DimensionedField<Type, volMesh>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
-    const tmp<fvMatrix<Type> >&,
-    const tmp<DimensionedField<Type, volMesh> >&
+    const tmp<fvMatrix<Type>>&,
+    const tmp<DimensionedField<Type, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
-    const tmp<fvMatrix<Type> >&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+    const tmp<fvMatrix<Type>>&,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
     const DimensionedField<Type, volMesh>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
-    const tmp<DimensionedField<Type, volMesh> >&,
+    const tmp<DimensionedField<Type, volMesh>>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
     const DimensionedField<Type, volMesh>&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
-    const tmp<DimensionedField<Type, volMesh> >&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<DimensionedField<Type, volMesh>>&,
+    const tmp<fvMatrix<Type>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+    const tmp<fvMatrix<Type>>&
 );
 
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
     const fvMatrix<Type>&,
     const dimensioned<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
-    const tmp<fvMatrix<Type> >&,
+    const tmp<fvMatrix<Type>>&,
     const dimensioned<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
     const dimensioned<Type>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator-
+tmp<fvMatrix<Type>> operator-
 (
     const dimensioned<Type>&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&
 );
 
 
 template<class Type>
-tmp<fvMatrix<Type> > operator*
+tmp<fvMatrix<Type>> operator*
 (
     const DimensionedField<scalar, volMesh>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator*
+tmp<fvMatrix<Type>> operator*
 (
-    const tmp<DimensionedField<scalar, volMesh> >&,
+    const tmp<DimensionedField<scalar, volMesh>>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator*
+tmp<fvMatrix<Type>> operator*
 (
     const tmp<volScalarField>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator*
+tmp<fvMatrix<Type>> operator*
 (
     const DimensionedField<scalar, volMesh>&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator*
+tmp<fvMatrix<Type>> operator*
 (
-    const tmp<DimensionedField<scalar, volMesh> >&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<DimensionedField<scalar, volMesh>>&,
+    const tmp<fvMatrix<Type>>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator*
+tmp<fvMatrix<Type>> operator*
 (
     const tmp<volScalarField>&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&
 );
 
 
 template<class Type>
-tmp<fvMatrix<Type> > operator*
+tmp<fvMatrix<Type>> operator*
 (
     const dimensioned<scalar>&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
-tmp<fvMatrix<Type> > operator*
+tmp<fvMatrix<Type>> operator*
 (
     const dimensioned<scalar>&,
-    const tmp<fvMatrix<Type> >&
+    const tmp<fvMatrix<Type>>&
 );
 
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index ff588e947f..26dab20b75 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -327,9 +327,9 @@ Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solve()
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fvMatrix<Type>::residual() const
+Foam::tmp<Foam::Field<Type>> Foam::fvMatrix<Type>::residual() const
 {
-    tmp<Field<Type> > tres(new Field<Type>(source_));
+    tmp<Field<Type>> tres(new Field<Type>(source_));
     Field<Type>& res = tres();
 
     addBoundarySource(res);
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
index dee4ee411c..06cf50969b 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ public:
             const mapDistribute& map,
             const labelListList& stencil,
             const GeometricField<Type, fvPatchField, volMesh>& fld,
-            const List<List<WeightType> >& stencilWeights
+            const List<List<WeightType>>& stencilWeights
         );
 };
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
index 2a06640370..20b328bb81 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ Foam::tmp
     const mapDistribute& map,
     const labelListList& stencil,
     const GeometricField<Type, fvPatchField, volMesh>& fld,
-    const List<List<WeightType> >& stencilWeights
+    const List<List<WeightType>>& stencilWeights
 )
 {
     typedef typename outerProduct<WeightType, Type>::type WeightedType;
@@ -52,7 +52,7 @@ Foam::tmp
     const fvMesh& mesh = fld.mesh();
 
     // Collect internal and boundary values
-    List<List<Type> > stencilFld;
+    List<List<Type>> stencilFld;
     extendedCellToFaceStencil::collectData(map, stencil, fld, stencilFld);
 
     tmp<WeightedFieldType> twf
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
index f1969f2af1..aae25f9769 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ Foam::extendedCentredCellToCellStencil::extendedCentredCellToCellStencil
     stencil_(stencil)
 {
     // Calculate distribute map (also renumbers elements in stencil)
-    List<Map<label> > compactMap(Pstream::nProcs());
+    List<Map<label>> compactMap(Pstream::nProcs());
     mapPtr_.reset
     (
         new mapDistribute
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
index f325a1fcc8..b38e535941 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ public:
         void collectData
         (
             const GeometricField<Type, fvPatchField, volMesh>& fld,
-            List<List<Type> >& stencilFld
+            List<List<Type>>& stencilFld
         ) const
         {
             extendedCellToFaceStencil::collectData
@@ -128,7 +128,7 @@ public:
         > weightedSum
         (
             const GeometricField<Type, fvPatchField, volMesh>& fld,
-            const List<List<WeightType> >& stencilWeights
+            const List<List<WeightType>>& stencilWeights
         ) const
         {
             return extendedCellToCellStencil::weightedSum
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H
index dd6d2f01a6..fb5f5a5e4e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,18 +103,18 @@ public:
             const mapDistribute& map,
             const labelListList& stencil,
             const GeometricField<T, fvPatchField, volMesh>& fld,
-            List<List<T> >& stencilFld
+            List<List<T>>& stencilFld
         );
 
         //- Sum vol field contributions to create face values
         template<class Type>
-        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         weightedSum
         (
             const mapDistribute& map,
             const labelListList& stencil,
             const GeometricField<Type, fvPatchField, volMesh>& fld,
-            const List<List<scalar> >& stencilWeights
+            const List<List<scalar>>& stencilWeights
         );
 };
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
index 4fc0d1f2bb..a14c06c710 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ void Foam::extendedCellToFaceStencil::collectData
     const mapDistribute& map,
     const labelListList& stencil,
     const GeometricField<Type, fvPatchField, volMesh>& fld,
-    List<List<Type> >& stencilFld
+    List<List<Type>>& stencilFld
 )
 {
     // 1. Construct cell data in compact addressing
@@ -81,22 +81,22 @@ void Foam::extendedCellToFaceStencil::collectData
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::extendedCellToFaceStencil::weightedSum
 (
     const mapDistribute& map,
     const labelListList& stencil,
     const GeometricField<Type, fvPatchField, volMesh>& fld,
-    const List<List<scalar> >& stencilWeights
+    const List<List<scalar>>& stencilWeights
 )
 {
     const fvMesh& mesh = fld.mesh();
 
     // Collect internal and boundary values
-    List<List<Type> > stencilFld;
+    List<List<Type>> stencilFld;
     collectData(map, stencil, fld, stencilFld);
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C
index 6040867855..06060c19b6 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ Foam::extendedCentredCellToFaceStencil::extendedCentredCellToFaceStencil
     stencil_(stencil)
 {
     // Calculate distribute map (also renumbers elements in stencil)
-    List<Map<label> > compactMap(Pstream::nProcs());
+    List<Map<label>> compactMap(Pstream::nProcs());
     mapPtr_.reset
     (
         new mapDistribute
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
index a8f99be1e8..f1a7ce9eba 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ public:
         void collectData
         (
             const GeometricField<T, fvPatchField, volMesh>& fld,
-            List<List<T> >& stencilFld
+            List<List<T>>& stencilFld
         ) const
         {
             extendedCellToFaceStencil::collectData
@@ -116,10 +116,10 @@ public:
 
         //- Sum vol field contributions to create face values
         template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > weightedSum
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> weightedSum
         (
             const GeometricField<Type, fvPatchField, volMesh>& fld,
-            const List<List<scalar> >& stencilWeights
+            const List<List<scalar>>& stencilWeights
         ) const
         {
             return extendedCellToFaceStencil::weightedSum
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
index e3f4c79ebd..61e0de79f3 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -424,7 +424,7 @@ Foam::extendedUpwindCellToFaceStencil::extendedUpwindCellToFaceStencil
     );
 
     {
-        List<Map<label> > compactMap(Pstream::nProcs());
+        List<Map<label>> compactMap(Pstream::nProcs());
         ownMapPtr_.reset
         (
             new mapDistribute
@@ -438,7 +438,7 @@ Foam::extendedUpwindCellToFaceStencil::extendedUpwindCellToFaceStencil
 
     {
 
-        List<Map<label> > compactMap(Pstream::nProcs());
+        List<Map<label>> compactMap(Pstream::nProcs());
         neiMapPtr_.reset
         (
             new mapDistribute
@@ -455,7 +455,7 @@ Foam::extendedUpwindCellToFaceStencil::extendedUpwindCellToFaceStencil
     {
         const fvMesh& mesh = dynamic_cast<const fvMesh&>(stencil.mesh());
 
-        List<List<point> > stencilPoints(ownStencil_.size());
+        List<List<point>> stencilPoints(ownStencil_.size());
 
         // Owner stencil
         // ~~~~~~~~~~~~~
@@ -533,7 +533,7 @@ Foam::extendedUpwindCellToFaceStencil::extendedUpwindCellToFaceStencil
     ownStencil_ = stencil;
 
     {
-        List<Map<label> > compactMap(Pstream::nProcs());
+        List<Map<label>> compactMap(Pstream::nProcs());
         ownMapPtr_.reset
         (
             new mapDistribute
@@ -547,7 +547,7 @@ Foam::extendedUpwindCellToFaceStencil::extendedUpwindCellToFaceStencil
 
     const fvMesh& mesh = dynamic_cast<const fvMesh&>(stencil.mesh());
 
-    List<List<point> > stencilPoints(ownStencil_.size());
+    List<List<point>> stencilPoints(ownStencil_.size());
     collectData(ownMapPtr_(), ownStencil_, mesh.C(), stencilPoints);
 
     // Split stencil into owner and neighbour
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
index 3ddf4bd79c..6412cd7a4f 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -175,12 +175,12 @@ public:
 
         //- Sum vol field contributions to create face values
         template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > weightedSum
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> weightedSum
         (
             const surfaceScalarField& phi,
             const GeometricField<Type, fvPatchField, volMesh>& fld,
-            const List<List<scalar> >& ownWeights,
-            const List<List<scalar> >& neiWeights
+            const List<List<scalar>>& ownWeights,
+            const List<List<scalar>>& neiWeights
         ) const;
 
 };
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
index 99ec07d58b..0607c8e4e0 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,24 +28,24 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::extendedUpwindCellToFaceStencil::weightedSum
 (
     const surfaceScalarField& phi,
     const GeometricField<Type, fvPatchField, volMesh>& fld,
-    const List<List<scalar> >& ownWeights,
-    const List<List<scalar> >& neiWeights
+    const List<List<scalar>>& ownWeights,
+    const List<List<scalar>>& neiWeights
 ) const
 {
     const fvMesh& mesh = fld.mesh();
 
     // Collect internal and boundary values
-    List<List<Type> > ownFld;
+    List<List<Type>> ownFld;
     collectData(ownMap(), ownStencil(), fld, ownFld);
-    List<List<Type> > neiFld;
+    List<List<Type>> neiFld;
     collectData(neiMap(), neiStencil(), fld, neiFld);
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
index fd04606fa6..1b1073cb8c 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ Foam::extendedCentredFaceToCellStencil::extendedCentredFaceToCellStencil
     stencil_(stencil)
 {
     // Calculate distribute map (also renumbers elements in stencil)
-    List<Map<label> > compactMap(Pstream::nProcs());
+    List<Map<label>> compactMap(Pstream::nProcs());
     mapPtr_.reset
     (
         new mapDistribute
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
index d9072ef280..3e3f01f50e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ public:
         void collectData
         (
             const GeometricField<T, fvsPatchField, surfaceMesh>& fld,
-            List<List<T> >& stencilFld
+            List<List<T>>& stencilFld
         ) const
         {
             extendedFaceToCellStencil::collectData
@@ -116,10 +116,10 @@ public:
 
         //- Sum surface field contributions to create cell values
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > weightedSum
+        tmp<GeometricField<Type, fvPatchField, volMesh>> weightedSum
         (
             const GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
-            const List<List<scalar> >& stencilWeights
+            const List<List<scalar>>& stencilWeights
         ) const
         {
             return extendedFaceToCellStencil::weightedSum
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
index 9e7f11b1b8..3e6abebd22 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,17 +77,17 @@ public:
             const mapDistribute& map,
             const labelListList& stencil,
             const GeometricField<T, fvsPatchField, surfaceMesh>& fld,
-            List<List<T> >& stencilFld
+            List<List<T>>& stencilFld
         );
 
         //- Sum surface field contributions to create cell values
         template<class Type>
-        static tmp<GeometricField<Type, fvPatchField, volMesh> > weightedSum
+        static tmp<GeometricField<Type, fvPatchField, volMesh>> weightedSum
         (
             const mapDistribute& map,
             const labelListList& stencil,
             const GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
-            const List<List<scalar> >& stencilWeights
+            const List<List<scalar>>& stencilWeights
         );
 };
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
index 8449ba6f19..d6b47a56b2 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ void Foam::extendedFaceToCellStencil::collectData
     const mapDistribute& map,
     const labelListList& stencil,
     const GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
-    List<List<Type> >& stencilFld
+    List<List<Type>>& stencilFld
 )
 {
     // 1. Construct face data in compact addressing
@@ -78,22 +78,22 @@ void Foam::extendedFaceToCellStencil::collectData
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::extendedFaceToCellStencil::weightedSum
 (
     const mapDistribute& map,
     const labelListList& stencil,
     const GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
-    const List<List<scalar> >& stencilWeights
+    const List<List<scalar>>& stencilWeights
 )
 {
     const fvMesh& mesh = fld.mesh();
 
     // Collect internal and boundary values
-    List<List<Type> > stencilFld;
+    List<List<Type>> stencilFld;
     collectData(map, stencil, fld, stencilFld);
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tsfCorr
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tsfCorr
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 268e76939d..df558664dc 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -301,10 +301,10 @@ public:
             const DimensionedField<scalar, volMesh>& V00() const;
 
             //- Return sub-cycle cell volumes
-            tmp<DimensionedField<scalar, volMesh> > Vsc() const;
+            tmp<DimensionedField<scalar, volMesh>> Vsc() const;
 
             //- Return sub-cycl old-time cell volumes
-            tmp<DimensionedField<scalar, volMesh> > Vsc0() const;
+            tmp<DimensionedField<scalar, volMesh>> Vsc0() const;
 
             //- Return cell face area vectors
             const surfaceVectorField& Sf() const;
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
index 5f2a281d06..2dca7d534f 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -207,7 +207,7 @@ public:
 
             //- Map volume field
             template<class Type>
-            static tmp<GeometricField<Type, fvPatchField, volMesh> >
+            static tmp<GeometricField<Type, fvPatchField, volMesh>>
             interpolate
             (
                 const GeometricField<Type, fvPatchField, volMesh>&,
@@ -218,7 +218,7 @@ public:
             );
 
             template<class Type>
-            tmp<GeometricField<Type, fvPatchField, volMesh> >
+            tmp<GeometricField<Type, fvPatchField, volMesh>>
             interpolate
             (
                 const GeometricField<Type, fvPatchField, volMesh>&
@@ -226,7 +226,7 @@ public:
 
             //- Map surface field
             template<class Type>
-            static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+            static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
             interpolate
             (
                 const GeometricField<Type, fvsPatchField, surfaceMesh>&,
@@ -236,7 +236,7 @@ public:
             );
 
             template<class Type>
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+            tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
             interpolate
             (
                 const GeometricField<Type, fvsPatchField, surfaceMesh>&
@@ -244,7 +244,7 @@ public:
 
             //- Map point field
             template<class Type>
-            static tmp<GeometricField<Type, pointPatchField, pointMesh> >
+            static tmp<GeometricField<Type, pointPatchField, pointMesh>>
             interpolate
             (
                 const GeometricField<Type, pointPatchField, pointMesh>&,
@@ -254,7 +254,7 @@ public:
             );
 
             template<class Type>
-            tmp<GeometricField<Type, pointPatchField, pointMesh> >
+            tmp<GeometricField<Type, pointPatchField, pointMesh>>
             interpolate
             (
                 const GeometricField<Type, pointPatchField, pointMesh>&
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index 7881194818..dbf2c09d77 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > fvMeshSubset::interpolate
+tmp<GeometricField<Type, fvPatchField, volMesh>> fvMeshSubset::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const fvMesh& sMesh,
@@ -48,7 +48,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > fvMeshSubset::interpolate
 )
 {
     // 1. Create the complete field with dummy patch fields
-    PtrList<fvPatchField<Type> > patchFields(patchMap.size());
+    PtrList<fvPatchField<Type>> patchFields(patchMap.size());
 
     forAll(patchFields, patchI)
     {
@@ -82,7 +82,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > fvMeshSubset::interpolate
         }
     }
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tresF
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tresF
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -156,7 +156,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > fvMeshSubset::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > fvMeshSubset::interpolate
+tmp<GeometricField<Type, fvPatchField, volMesh>> fvMeshSubset::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
@@ -173,7 +173,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > fvMeshSubset::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> fvMeshSubset::interpolate
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& vf,
     const fvMesh& sMesh,
@@ -182,7 +182,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
 )
 {
     // 1. Create the complete field with dummy patch fields
-    PtrList<fvsPatchField<Type> > patchFields(patchMap.size());
+    PtrList<fvsPatchField<Type>> patchFields(patchMap.size());
 
     forAll(patchFields, patchI)
     {
@@ -217,7 +217,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
     }
 
     // Create the complete field from the pieces
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tresF
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tresF
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
@@ -327,7 +327,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> fvMeshSubset::interpolate
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& sf
 ) const
@@ -343,7 +343,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, pointPatchField, pointMesh> >
+tmp<GeometricField<Type, pointPatchField, pointMesh>>
 fvMeshSubset::interpolate
 (
     const GeometricField<Type, pointPatchField, pointMesh>& vf,
@@ -353,7 +353,7 @@ fvMeshSubset::interpolate
 )
 {
     // 1. Create the complete field with dummy patch fields
-    PtrList<pointPatchField<Type> > patchFields(patchMap.size());
+    PtrList<pointPatchField<Type>> patchFields(patchMap.size());
 
     forAll(patchFields, patchI)
     {
@@ -388,7 +388,7 @@ fvMeshSubset::interpolate
     }
 
     // Create the complete field from the pieces
-    tmp<GeometricField<Type, pointPatchField, pointMesh> > tresF
+    tmp<GeometricField<Type, pointPatchField, pointMesh>> tresF
     (
         new GeometricField<Type, pointPatchField, pointMesh>
         (
@@ -474,7 +474,7 @@ fvMeshSubset::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, pointPatchField, pointMesh> > fvMeshSubset::interpolate
+tmp<GeometricField<Type, pointPatchField, pointMesh>> fvMeshSubset::interpolate
 (
     const GeometricField<Type, pointPatchField, pointMesh>& sf
 ) const
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.H
index 7ed1693696..f4bfb00ad1 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -175,7 +175,7 @@ public:
             virtual tmp<vectorField> delta() const;
 
             template<class Type>
-            tmp<Field<Type> > interpolate
+            tmp<Field<Type>> interpolate
             (
                 const Field<Type>& fldCoupled
             ) const
@@ -190,9 +190,9 @@ public:
             }
 
             template<class Type>
-            tmp<Field<Type> > interpolate
+            tmp<Field<Type>> interpolate
             (
-                const tmp<Field<Type> >& tfldCoupled
+                const tmp<Field<Type>>& tfldCoupled
             ) const
             {
                 updateAreas();
@@ -205,7 +205,7 @@ public:
             }
 
             template<class Type>
-            tmp<Field<Type> > interpolate
+            tmp<Field<Type>> interpolate
             (
                 const Field<Type>& fldCoupled,
                 const Field<Type>& fldNonOverlap
@@ -222,10 +222,10 @@ public:
             }
 
             template<class Type>
-            tmp<Field<Type> > interpolate
+            tmp<Field<Type>> interpolate
             (
-                const tmp<Field<Type> >& tFldCoupled,
-                const tmp<Field<Type> >& tFldNonOverlap
+                const tmp<Field<Type>>& tFldCoupled,
+                const tmp<Field<Type>>& tFldNonOverlap
             ) const
             {
                 updateAreas();
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
index 6ba8ed4356..0f7553734d 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,7 +162,7 @@ public:
             virtual tmp<vectorField> delta() const;
 
             template<class Type>
-            tmp<Field<Type> > interpolate
+            tmp<Field<Type>> interpolate
             (
                 const Field<Type>& fld,
                 const UList<Type>& defaultValues = UList<Type>()
@@ -172,9 +172,9 @@ public:
             }
 
             template<class Type>
-            tmp<Field<Type> > interpolate
+            tmp<Field<Type>> interpolate
             (
-                const tmp<Field<Type> >& tFld,
+                const tmp<Field<Type>>& tFld,
                 const UList<Type>& defaultValues = UList<Type>()
             ) const
             {
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
index f8cef73a78..1f655bd4b3 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -237,7 +237,7 @@ public:
 
             //- Return given internal field next to patch as patch field
             template<class Type>
-            tmp<Field<Type> > patchInternalField(const UList<Type>&) const;
+            tmp<Field<Type>> patchInternalField(const UList<Type>&) const;
 
             //- Return given internal field next to patch as patch field
             template<class Type>
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
index f9459a7718..21e931f01c 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,12 +28,12 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fvPatch::patchInternalField
+Foam::tmp<Foam::Field<Type>> Foam::fvPatch::patchInternalField
 (
     const UList<Type>& f
 ) const
 {
-    tmp<Field<Type> > tpif(new Field<Type>(size()));
+    tmp<Field<Type>> tpif(new Field<Type>(size()));
     Field<Type>& pif = tpif();
 
     const labelUList& faceCells = this->faceCells();
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
index 073ac268e0..97bd16390c 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -202,7 +202,7 @@ public:
         //- Map volField. Internal field set to average, patch fields straight
         //  copies.
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> >
+        tmp<GeometricField<Type, fvPatchField, volMesh>>
         interpolate
         (
             const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
index 93ef66101f..186fe7d500 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,13 +36,13 @@ namespace Foam
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> > singleCellFvMesh::interpolate
+tmp<GeometricField<Type, fvPatchField, volMesh>> singleCellFvMesh::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
 {
     // 1. Create the complete field with dummy patch fields
-    PtrList<fvPatchField<Type> > patchFields(vf.boundaryField().size());
+    PtrList<fvPatchField<Type>> patchFields(vf.boundaryField().size());
 
     forAll(patchFields, patchI)
     {
@@ -59,7 +59,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > singleCellFvMesh::interpolate
     }
 
     // Create the complete field from the pieces
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tresF
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tresF
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C
index 861fdf4465..7893341b27 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ bool Foam::patchDistMethods::meshWave::correct
     }
 
     // Do mesh wave
-    patchDataWave<wallPointData<vector> > wave
+    patchDataWave<wallPointData<vector>> wave
     (
         mesh_,
         patchIDs_,
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C
index 913f116dca..b02e1d38f4 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ void Foam::wallDistData<TransferType>::correct()
     labelHashSet wallPatchIDs(getPatchIDs<wallPolyPatch>());
 
     // Collect pointers to data on patches
-    UPtrList<Field<Type> > patchData(mesh.boundaryMesh().size());
+    UPtrList<Field<Type>> patchData(mesh.boundaryMesh().size());
 
     forAll(field_.boundaryField(), patchI)
     {
diff --git a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.H b/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.H
index 469cc86f45..ecd615b9f8 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,7 +146,7 @@ public:
 template<>
 inline bool contiguous<wallPointYPlus>()
 {
-    return contiguous<wallPointData<scalar> >();
+    return contiguous<wallPointData<scalar>>();
 }
 
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
index 4f5e34434f..77d747f871 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,14 +91,14 @@ public:
     // Selectors
 
         //- Return a reference to the specified interpolation scheme
-        static autoPtr<interpolation<Type> > New
+        static autoPtr<interpolation<Type>> New
         (
             const word& interpolationType,
             const GeometricField<Type, fvPatchField, volMesh>& psi
         );
 
         //- Return a reference to the selected interpolation scheme
-        static autoPtr<interpolation<Type> > New
+        static autoPtr<interpolation<Type>> New
         (
             const dictionary& interpolationSchemes,
             const GeometricField<Type, fvPatchField, volMesh>& psi
@@ -161,7 +161,7 @@ public:
                                                                                \
 defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                              \
                                                                                \
-interpolation<Type>::adddictionaryConstructorToTable<SS<Type> >                \
+interpolation<Type>::adddictionaryConstructorToTable<SS<Type>>                \
     add##SS##Type##ConstructorToTable_;
 
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C
index 341ad89124..99544f2e6a 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr<Foam::interpolation<Type> > Foam::interpolation<Type>::New
+Foam::autoPtr<Foam::interpolation<Type>> Foam::interpolation<Type>::New
 (
     const word& interpolationType,
     const GeometricField<Type, fvPatchField, volMesh>& psi
@@ -48,12 +48,12 @@ Foam::autoPtr<Foam::interpolation<Type> > Foam::interpolation<Type>::New
             << exit(FatalError);
     }
 
-    return autoPtr<interpolation<Type> >(cstrIter()(psi));
+    return autoPtr<interpolation<Type>>(cstrIter()(psi));
 }
 
 
 template<class Type>
-Foam::autoPtr<Foam::interpolation<Type> > Foam::interpolation<Type>::New
+Foam::autoPtr<Foam::interpolation<Type>> Foam::interpolation<Type>::New
 (
     const dictionary& interpolationSchemes,
     const GeometricField<Type, fvPatchField, volMesh>& psi
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
index 40a1fe3bb5..b188a05586 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ public:
     null()
     {}
 
-    inline tmp<GeometricField<Type, fvPatchField, volMesh> > operator()
+    inline tmp<GeometricField<Type, fvPatchField, volMesh>> operator()
     (
         const GeometricField<Type, fvPatchField, volMesh>& phi
     ) const
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
index 5471da9006..8342412460 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,13 +39,13 @@ void Foam::LimitedScheme<Type, Limiter, LimitFunc>::calcLimiter
 {
     const fvMesh& mesh = this->mesh();
 
-    tmp<GeometricField<typename Limiter::phiType, fvPatchField, volMesh> >
+    tmp<GeometricField<typename Limiter::phiType, fvPatchField, volMesh>>
         tlPhi = LimitFunc<Type>()(phi);
 
     const GeometricField<typename Limiter::phiType, fvPatchField, volMesh>&
         lPhi = tlPhi();
 
-    tmp<GeometricField<typename Limiter::gradPhiType, fvPatchField, volMesh> >
+    tmp<GeometricField<typename Limiter::gradPhiType, fvPatchField, volMesh>>
         tgradc(fvc::grad(lPhi));
     const GeometricField<typename Limiter::gradPhiType, fvPatchField, volMesh>&
         gradc = tgradc();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
index e41b280a12..4af6cda05c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,19 +162,19 @@ defineTemplateTypeNameAndDebugWithName                                        \
     (LimitedScheme##TYPE##LIMITER##NVDTVD##LIMFUNC##_, #SS, 0);               \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                   \
-<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC> >                  \
+<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                  \
     add##SS##LIMFUNC##TYPE##MeshConstructorToTable_;                          \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable               \
-<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC> >                  \
+<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                  \
     add##SS##LIMFUNC##TYPE##MeshFluxConstructorToTable_;                      \
                                                                               \
 limitedSurfaceInterpolationScheme<TYPE>::addMeshConstructorToTable            \
-<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC> >                  \
+<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                  \
     add##SS##LIMFUNC##TYPE##MeshConstructorToLimitedTable_;                   \
                                                                               \
 limitedSurfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable        \
-<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC> >                  \
+<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                  \
     add##SS##LIMFUNC##TYPE##MeshFluxConstructorToLimitedTable_;
 
 
@@ -208,25 +208,25 @@ makeLimitedSurfaceInterpolationTypeScheme(SS,LIMITER,NVDVTVDV,null,vector)
     TYPE                                                                      \
 )                                                                             \
                                                                               \
-typedef LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD> >, limitFuncs::LIMFUNC>  \
+typedef LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>  \
     LimitedScheme##TYPE##LLIMITER##LIMITER##NVDTVD##LIMFUNC##_;               \
 defineTemplateTypeNameAndDebugWithName                                        \
     (LimitedScheme##TYPE##LLIMITER##LIMITER##NVDTVD##LIMFUNC##_, #SS, 0);     \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                   \
-<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD> >, limitFuncs::LIMFUNC> >       \
+<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>       \
     add##SS##LIMFUNC##TYPE##MeshConstructorToTable_;                          \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable               \
-<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD> >, limitFuncs::LIMFUNC> >       \
+<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>       \
     add##SS##LIMFUNC##TYPE##MeshFluxConstructorToTable_;                      \
                                                                               \
 limitedSurfaceInterpolationScheme<TYPE>::addMeshConstructorToTable            \
-<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD> >, limitFuncs::LIMFUNC> >       \
+<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>       \
     add##SS##LIMFUNC##TYPE##MeshConstructorToLimitedTable_;                   \
                                                                               \
 limitedSurfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable        \
-<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD> >, limitFuncs::LIMFUNC> >       \
+<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>       \
     add##SS##LIMFUNC##TYPE##MeshFluxConstructorToLimitedTable_;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
index 358c17e473..7b5bc0a06e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,16 +141,16 @@ typedef PhiScheme<TYPE, WEIGHT> Phischeme##WEIGHT_;                            \
 defineTemplateTypeNameAndDebugWithName(Phischeme##WEIGHT_, #SS, 0);            \
                                                                                \
 surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                    \
-<PhiScheme<TYPE, WEIGHT> > add##SS##TYPE##MeshConstructorToTable_;             \
+<PhiScheme<TYPE, WEIGHT>> add##SS##TYPE##MeshConstructorToTable_;             \
                                                                                \
 surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable                \
-<PhiScheme<TYPE, WEIGHT> > add##SS##TYPE##MeshFluxConstructorToTable_;         \
+<PhiScheme<TYPE, WEIGHT>> add##SS##TYPE##MeshFluxConstructorToTable_;         \
                                                                                \
 limitedSurfaceInterpolationScheme<TYPE>::addMeshConstructorToTable             \
-<PhiScheme<TYPE, WEIGHT> > add##SS##TYPE##MeshConstructorToLimitedTable_;      \
+<PhiScheme<TYPE, WEIGHT>> add##SS##TYPE##MeshConstructorToLimitedTable_;      \
                                                                                \
 limitedSurfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable         \
-<PhiScheme<TYPE, WEIGHT> > add##SS##TYPE##MeshFluxConstructorToLimitedTable_;
+<PhiScheme<TYPE, WEIGHT>> add##SS##TYPE##MeshFluxConstructorToLimitedTable_;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H
index 0c33e74d87..111a240041 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,10 +56,10 @@ class limitWith
     // Private Member Functions
 
         //- Interpolation scheme
-        tmp<surfaceInterpolationScheme<Type> > tInterp_;
+        tmp<surfaceInterpolationScheme<Type>> tInterp_;
 
         //- Limiter
-        tmp<limitedSurfaceInterpolationScheme<Type> > tLimiter_;
+        tmp<limitedSurfaceInterpolationScheme<Type>> tLimiter_;
 
 
         //- Disallow default bitwise copy construct
@@ -141,7 +141,7 @@ public:
 
         //- Return the explicit correction to the face-interpolate
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction(const GeometricField<Type, fvPatchField, volMesh>& vf) const
         {
             return tLimiter_().limiter(vf)*tInterp_().correction(vf);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index 08f2ad37f9..388683c2f9 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::limitedSurfaceInterpolationScheme<Type> >
+Foam::tmp<Foam::limitedSurfaceInterpolationScheme<Type>>
 Foam::limitedSurfaceInterpolationScheme<Type>::New
 (
     const fvMesh& mesh,
@@ -80,7 +80,7 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
 
 
 template<class Type>
-Foam::tmp<Foam::limitedSurfaceInterpolationScheme<Type> >
+Foam::tmp<Foam::limitedSurfaceInterpolationScheme<Type>>
 Foam::limitedSurfaceInterpolationScheme<Type>::New
 (
     const fvMesh& mesh,
@@ -198,7 +198,7 @@ Foam::limitedSurfaceInterpolationScheme<Type>::weights
 }
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::limitedSurfaceInterpolationScheme<Type>::flux
 (
     const GeometricField<Type, fvPatchField, volMesh>& phi
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
index 322608fc99..758334465b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,14 +141,14 @@ public:
     // Selectors
 
         //- Return new tmp interpolation scheme
-        static tmp<limitedSurfaceInterpolationScheme<Type> > New
+        static tmp<limitedSurfaceInterpolationScheme<Type>> New
         (
             const fvMesh& mesh,
             Istream& schemeData
         );
 
         //- Return new tmp interpolation scheme
-        static tmp<limitedSurfaceInterpolationScheme<Type> > New
+        static tmp<limitedSurfaceInterpolationScheme<Type>> New
         (
             const fvMesh& mesh,
             const surfaceScalarField& faceFlux,
@@ -184,7 +184,7 @@ public:
         ) const;
 
         //- Return the interpolation weighting factors
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         flux
         (
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -204,17 +204,17 @@ public:
                                                                                \
 defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                              \
                                                                                \
-surfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type> >         \
+surfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type>>         \
     add##SS##Type##MeshConstructorToTable_;                                    \
                                                                                \
-surfaceInterpolationScheme<Type>::addMeshFluxConstructorToTable<SS<Type> >     \
+surfaceInterpolationScheme<Type>::addMeshFluxConstructorToTable<SS<Type>>     \
     add##SS##Type##MeshFluxConstructorToTable_;                                \
                                                                                \
-limitedSurfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type> >  \
+limitedSurfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type>>  \
     add##SS##Type##MeshConstructorToLimitedTable_;                             \
                                                                                \
 limitedSurfaceInterpolationScheme<Type>::                                      \
-    addMeshFluxConstructorToTable<SS<Type> >                                   \
+    addMeshFluxConstructorToTable<SS<Type>>                                   \
     add##SS##Type##MeshFluxConstructorToLimitedTable_;
 
 #define makelimitedSurfaceInterpolationScheme(SS)                              \
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
index 61a91dcc48..9e2fc9064b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ public:
 
     // Member Operators
 
-        tmp<surfaceInterpolationScheme<Type> > operator()
+        tmp<surfaceInterpolationScheme<Type>> operator()
         (
             const GeometricField<Type, fvPatchField, volMesh>& field
         ) const
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentSchemes.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentSchemes.C
index 1d6f297ada..765770e605 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentSchemes.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentSchemes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ namespace Foam
 defineNamedTemplateTypeNameAndDebug(multivariateIndependentScheme<scalar>, 0);
 
 multivariateSurfaceInterpolationScheme<scalar>::addIstreamConstructorToTable
-    <multivariateIndependentScheme<scalar> >
+    <multivariateIndependentScheme<scalar>>
     addMultivariateIndependentSchemeScalarConstructorToTable_;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
index cb1164c8a7..9673da45bb 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,12 +129,12 @@ public:
                 }
         };
 
-        tmp<surfaceInterpolationScheme<Type> > operator()
+        tmp<surfaceInterpolationScheme<Type>> operator()
         (
             const GeometricField<Type, fvPatchField, volMesh>& field
         ) const
         {
-            return tmp<surfaceInterpolationScheme<Type> >
+            return tmp<surfaceInterpolationScheme<Type>>
             (
                 new fieldScheme(field, weights_)
             );
@@ -181,7 +181,7 @@ multivariateSurfaceInterpolationScheme<scalar>::addIstreamConstructorToTable   \
 typedef multivariateScheme                                                     \
 <                                                                              \
     scalar,                                                                    \
-    LimitedScheme<scalar, LLIMITER<LIMITER<NVDTVD> >, limitFuncs::LIMFUNC>     \
+    LimitedScheme<scalar, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>     \
 >                                                                              \
     multivariateScheme##LLIMITER##LIMITER##NVDTVD##LIMFUNC##_;                 \
 defineTemplateTypeNameAndDebugWithName                                         \
@@ -196,7 +196,7 @@ multivariateSurfaceInterpolationScheme<scalar>::addIstreamConstructorToTable   \
     multivariateScheme                                                         \
     <                                                                          \
         scalar,                                                                \
-        LimitedScheme<scalar, LLIMITER<LIMITER<NVDTVD> >, limitFuncs::LIMFUNC> \
+        LimitedScheme<scalar, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC> \
     >                                                                          \
 >                                                                              \
     addMultivariate##SS##ConstructorToTable_;
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
index 7da6545530..852eab5dd9 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,12 +128,12 @@ public:
                 }
         };
 
-        tmp<surfaceInterpolationScheme<Type> > operator()
+        tmp<surfaceInterpolationScheme<Type>> operator()
         (
             const GeometricField<Type, fvPatchField, volMesh>& field
         ) const
         {
-            return tmp<surfaceInterpolationScheme<Type> >
+            return tmp<surfaceInterpolationScheme<Type>>
             (
                 new fieldScheme(field, weights_)
             );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionSchemes.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionSchemes.C
index 3a93c9cb19..701936836b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionSchemes.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionSchemes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ namespace Foam
 defineNamedTemplateTypeNameAndDebug(multivariateSelectionScheme<scalar>, 0);
 
 multivariateSurfaceInterpolationScheme<scalar>::addIstreamConstructorToTable
-    <multivariateSelectionScheme<scalar> >
+    <multivariateSelectionScheme<scalar>>
     addMultivariateSelectionSchemeScalarConstructorToTable_;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
index 059d88ebf2..516f2387f0 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ multivariateSurfaceInterpolationScheme
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::multivariateSurfaceInterpolationScheme<Type> >
+Foam::tmp<Foam::multivariateSurfaceInterpolationScheme<Type>>
 Foam::multivariateSurfaceInterpolationScheme<Type>::New
 (
     const fvMesh& mesh,
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
index aaea76b2a9..1b9e23c57c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,7 +133,7 @@ public:
     // Selectors
 
         //- Return a pointer to a new gradScheme created on freestore
-        static tmp<multivariateSurfaceInterpolationScheme<Type> > New
+        static tmp<multivariateSurfaceInterpolationScheme<Type>> New
         (
             const fvMesh& mesh,
             const fieldTable& fields,
@@ -192,7 +192,7 @@ public:
                 ) const = 0;
         };
 
-        virtual tmp<surfaceInterpolationScheme<Type> > operator()
+        virtual tmp<surfaceInterpolationScheme<Type>> operator()
         (
             const GeometricField<Type, fvPatchField, volMesh>& field
         ) const = 0;
@@ -212,7 +212,7 @@ public:
 defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                              \
                                                                                \
 multivariateSurfaceInterpolationScheme<Type>::                                 \
-addIstreamConstructorToTable<SS<Type> >                                        \
+addIstreamConstructorToTable<SS<Type>>                                        \
     add##SS##Type##ConstructorToTable_;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H
index b680975aca..504d542eab 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,12 +135,12 @@ public:
                 }
         };
 
-        tmp<surfaceInterpolationScheme<Type> > operator()
+        tmp<surfaceInterpolationScheme<Type>> operator()
         (
             const GeometricField<Type, fvPatchField, volMesh>& field
         ) const
         {
-            return tmp<surfaceInterpolationScheme<Type> >
+            return tmp<surfaceInterpolationScheme<Type>>
             (
                 new fieldScheme(field, faceFlux_)
             );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
index 7aefde8875..0d3669e6b2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ void Foam::CentredFitData<Polynomial>::calcFit()
     // Get the cell/face centres in stencil order.
     // Centred face stencils no good for triangles or tets.
     // Need bigger stencils
-    List<List<point> > stencilPoints(mesh.nFaces());
+    List<List<point>> stencilPoints(mesh.nFaces());
     this->stencil().collectData(mesh.C(), stencilPoints);
 
     // find the fit coefficients for every face in the mesh
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
index 8d6bd3a1f4..bc5d3bb766 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ public:
         }
 
         //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -161,11 +161,11 @@ defineTemplateTypeNameAndDebugWithName                                        \
     (CentredFitScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0);                 \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                   \
-<CentredFitScheme<TYPE, POLYNOMIAL, STENCIL> >                                \
+<CentredFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                \
     add##SS##STENCIL##TYPE##MeshConstructorToTable_;                          \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable               \
-<CentredFitScheme<TYPE, POLYNOMIAL, STENCIL> >                                \
+<CentredFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                \
     add##SS##STENCIL##TYPE##MeshFluxConstructorToTable_;
 
 #define makeCentredFitSurfaceInterpolationScheme(SS, POLYNOMIAL, STENCIL)     \
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
index c2aa8498f9..73cc5ab710 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,13 +87,13 @@ class CoBlended
         const scalar Co1_;
 
         //- Scheme 1
-        tmp<surfaceInterpolationScheme<Type> > tScheme1_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme1_;
 
         //- Courant number above which scheme2 is used
         const scalar Co2_;
 
         //- Scheme 2
-        tmp<surfaceInterpolationScheme<Type> > tScheme2_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme2_;
 
         //- The face-flux used to compute the face Courant number
         const surfaceScalarField& faceFlux_;
@@ -251,7 +251,7 @@ public:
 
         //- Return the face-interpolate of the given cell field
         //  with explicit correction
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -274,7 +274,7 @@ public:
 
         //- Return the explicit correction to the face-interpolate
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -313,7 +313,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
                 (
                     NULL
                 );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H
index 1c407f8a8c..7d97f00bd7 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ public:
         }
 
         //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
index 2070b5ae07..c74797b0a6 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ public:
         }
 
         //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -168,11 +168,11 @@ defineTemplateTypeNameAndDebugWithName                                        \
     (PureUpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0);              \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                   \
-<PureUpwindFitScheme<TYPE, POLYNOMIAL, STENCIL> >                             \
+<PureUpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                             \
     add##SS##STENCIL##TYPE##MeshConstructorToTable_;                          \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable               \
-<PureUpwindFitScheme<TYPE, POLYNOMIAL, STENCIL> >                             \
+<PureUpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                             \
     add##SS##STENCIL##TYPE##MeshFluxConstructorToTable_;
 
 #define makePureUpwindFitSurfaceInterpolationScheme(SS, POLYNOMIAL, STENCIL)  \
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
index 40499a5c8f..6a16f708d1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ void Foam::UpwindFitData<Polynomial>::calcFit()
     // ~~~~~~~~~~~~~~~~~~~~~
 
     // Get the cell/face centres in stencil order.
-    List<List<point> > stencilPoints(mesh.nFaces());
+    List<List<point>> stencilPoints(mesh.nFaces());
     this->stencil().collectData
     (
         this->stencil().ownMap(),
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
index 62ff6b6603..f56b2790d0 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ public:
         }
 
         //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -172,11 +172,11 @@ defineTemplateTypeNameAndDebugWithName                                        \
     (UpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0);                  \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                   \
-<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL> >                                 \
+<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                 \
     add##SS##STENCIL##TYPE##MeshConstructorToTable_;                          \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable               \
-<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL> >                                 \
+<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                 \
     add##SS##STENCIL##TYPE##MeshFluxConstructorToTable_;
 
 #define makeUpwindFitSurfaceInterpolationScheme(SS, POLYNOMIAL, STENCIL)      \
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
index 11e24700a4..7bfc88dce6 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,13 +97,13 @@ class cellCoBlended
         const scalar Co1_;
 
         //- Scheme 1
-        tmp<surfaceInterpolationScheme<Type> > tScheme1_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme1_;
 
         //- Courant number above which scheme2 is used
         const scalar Co2_;
 
         //- Scheme 2
-        tmp<surfaceInterpolationScheme<Type> > tScheme2_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme2_;
 
         //- The face-flux used to compute the face Courant number
         const surfaceScalarField& faceFlux_;
@@ -279,7 +279,7 @@ public:
 
         //- Return the face-interpolate of the given cell field
         //  with explicit correction
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -302,7 +302,7 @@ public:
 
         //- Return the explicit correction to the face-interpolate
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -341,7 +341,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
                 (
                     NULL
                 );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
index b1148be4b7..f8f1397711 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
         }
 
         //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -126,7 +126,7 @@ public:
             const surfaceScalarField kVecP(sqr(scalar(1) - lambda)*lambda);
             const surfaceScalarField kVecN(sqr(lambda)*(lambda - scalar(1)));
 
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr
+            tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr
             (
                 new GeometricField<Type, fvsPatchField, surfaceMesh>
                 (
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
index d521157dad..2d28a49584 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,10 +66,10 @@ class fixedBlended
     // Private Member Functions
 
         //- Scheme 1
-        tmp<surfaceInterpolationScheme<Type> > tScheme1_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme1_;
 
         //- Scheme 2
-        tmp<surfaceInterpolationScheme<Type> > tScheme2_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme2_;
 
 
         //- Disallow default bitwise copy construct
@@ -179,7 +179,7 @@ public:
 
         //- Return the face-interpolate of the given cell field
         //  with explicit correction
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -200,7 +200,7 @@ public:
 
         //- Return the explicit correction to the face-interpolate
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -237,7 +237,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
                 (
                     NULL
                 );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
index 4dd2e87ba3..61b9349913 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,7 +114,7 @@ public:
         }
 
         //- Return the face-interpolate of the given cell field
-        virtual tmp<GeometricField<scalar, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<scalar, fvsPatchField, surfaceMesh>>
         interpolate
         (
             const GeometricField<scalar, fvPatchField, volMesh>& vf
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
index 169036e337..de4294da11 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,13 +60,13 @@ class limiterBlended
     // Private Member Functions
 
         //- Limited scheme providing the limiter
-        tmp<limitedSurfaceInterpolationScheme<Type> > tLimitedScheme_;
+        tmp<limitedSurfaceInterpolationScheme<Type>> tLimitedScheme_;
 
         //- Scheme 1
-        tmp<surfaceInterpolationScheme<Type> > tScheme1_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme1_;
 
         //- Scheme 2
-        tmp<surfaceInterpolationScheme<Type> > tScheme2_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme2_;
 
 
         //- Disallow default bitwise copy construct
@@ -152,7 +152,7 @@ public:
 
         //- Return the face-interpolate of the given cell field
         //  with explicit correction
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate(const GeometricField<Type, fvPatchField, volMesh>& vf) const
         {
             surfaceScalarField blendingFactor
@@ -175,7 +175,7 @@ public:
 
         //- Return the explicit correction to the face-interpolate
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -217,7 +217,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
                 (
                     NULL
                 );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
index 99234939e7..7d06caf18b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ public:
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 linearInterpolate(const GeometricField<Type, fvPatchField, volMesh>& vf)
 {
     return surfaceInterpolationScheme<Type>::interpolate
@@ -116,10 +116,10 @@ linearInterpolate(const GeometricField<Type, fvPatchField, volMesh>& vf)
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-linearInterpolate(const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf)
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+linearInterpolate(const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf)
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tinterp =
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tinterp =
         linearInterpolate(tvf());
     tvf.clear();
     return tinterp;
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
index 84f6865c4c..a2a81508fb 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::linearUpwind<Type>::correction
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -37,7 +37,7 @@ Foam::linearUpwind<Type>::correction
 {
     const fvMesh& mesh = this->mesh();
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
index 1ef0c000f7..6039f416a7 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ class linearUpwind
     // Private Data
 
         word gradSchemeName_;
-        tmp<fv::gradScheme<Type> > gradScheme_;
+        tmp<fv::gradScheme<Type>> gradScheme_;
 
 
     // Private Member Functions
@@ -143,7 +143,7 @@ public:
         }
 
         //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
index 22a04bff7b..85fc6a9594 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::linearUpwindV<Type>::correction
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -39,7 +39,7 @@ Foam::linearUpwindV<Type>::correction
 {
     const fvMesh& mesh = this->mesh();
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
index 88034a7de9..99277ccb6d 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ class linearUpwindV
     // Private Data
 
         word gradSchemeName_;
-        tmp<fv::gradScheme<Type> > gradScheme_;
+        tmp<fv::gradScheme<Type>> gradScheme_;
 
 
     // Private Member Functions
@@ -142,7 +142,7 @@ public:
         }
 
         //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>&
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
index 0e85f0ea76..03fa664712 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,10 +56,10 @@ class localBlended
     // Private Member Functions
 
         //- Scheme 1
-        tmp<surfaceInterpolationScheme<Type> > tScheme1_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme1_;
 
         //- Scheme 2
-        tmp<surfaceInterpolationScheme<Type> > tScheme2_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme2_;
 
 
         //- Disallow default bitwise copy construct
@@ -158,7 +158,7 @@ public:
 
         //- Return the face-interpolate of the given cell field
         //  with explicit correction
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate(const GeometricField<Type, fvPatchField, volMesh>& vf) const
         {
             const surfaceScalarField& blendingFactor =
@@ -185,7 +185,7 @@ public:
 
         //- Return the explicit correction to the face-interpolate
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -229,7 +229,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
                 (
                     NULL
                 );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
index e6d5849bd4..d0cc9fba86 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,7 +114,7 @@ public:
         }
 
         //- Return the face-interpolate of the given cell field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -122,7 +122,7 @@ public:
         {
             const fvMesh& mesh = vf.mesh();
 
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tvff
+            tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tvff
             (
                 new GeometricField<Type, fvsPatchField, surfaceMesh>
                 (
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
index 9cd25a8352..598e45c791 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,7 +114,7 @@ public:
         }
 
         //- Return the face-interpolate of the given cell field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -122,7 +122,7 @@ public:
         {
             const fvMesh& mesh = vf.mesh();
 
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tvff
+            tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tvff
             (
                 new GeometricField<Type, fvsPatchField, surfaceMesh>
                 (
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
index 2860aeb60e..cecbcff033 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ class outletStabilised
     // Private member data
 
         const surfaceScalarField& faceFlux_;
-        tmp<surfaceInterpolationScheme<Type> > tScheme_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme_;
 
 
     // Private Member Functions
@@ -141,10 +141,10 @@ public:
             {
                 if
                 (
-                    isA<zeroGradientFvPatchField<Type> >
+                    isA<zeroGradientFvPatchField<Type>>
                         (vf.boundaryField()[patchi])
-                 || isA<mixedFvPatchField<Type> >(vf.boundaryField()[patchi])
-                 || isA<directionMixedFvPatchField<Type> >
+                 || isA<mixedFvPatchField<Type>>(vf.boundaryField()[patchi])
+                 || isA<directionMixedFvPatchField<Type>>
                     (vf.boundaryField()[patchi])
                 )
                 {
@@ -180,7 +180,7 @@ public:
 
         //- Return the explicit correction to the face-interpolate
         //  set to zero on the near-boundary faces where upwinf is applied
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -188,7 +188,7 @@ public:
         {
             if (tScheme_().corrected())
             {
-                tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tcorr =
+                tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tcorr =
                     tScheme_().correction(vf);
 
                 GeometricField<Type, fvsPatchField, surfaceMesh>& corr =
@@ -201,9 +201,9 @@ public:
                 {
                     if
                     (
-                        isA<zeroGradientFvPatchField<Type> >
+                        isA<zeroGradientFvPatchField<Type>>
                             (vf.boundaryField()[patchi])
-                     || isA<mixedFvPatchField<Type> >
+                     || isA<mixedFvPatchField<Type>>
                             (vf.boundaryField()[patchi])
                     )
                     {
@@ -232,7 +232,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
                 (
                     NULL
                 );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
index ef87cb898f..7b6d3048e5 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::pointLinear<Type>::
 correction
 (
@@ -45,7 +45,7 @@ correction
         volPointInterpolation::New(mesh).interpolate(vf)
     );
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr =
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr =
         linearInterpolate(vf);
 
     Field<Type>& sfCorr = tsfCorr().internalField();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
index e95997d55d..106125d5d1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ public:
         }
 
         //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
index 2adde6c23e..aab20dac76 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ class skewCorrected
 {
     // Private member data
 
-        tmp<surfaceInterpolationScheme<Type> > tScheme_;
+        tmp<surfaceInterpolationScheme<Type>> tScheme_;
 
 
     // Private Member Functions
@@ -127,7 +127,7 @@ public:
              || skewCorrectionVectors::New(this->mesh()).skew();
         }
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         skewCorrection
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -137,7 +137,7 @@ public:
 
             const skewCorrectionVectors& scv = skewCorrectionVectors::New(mesh);
 
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr
+            tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr
             (
                 new GeometricField<Type, fvsPatchField, surfaceMesh>
                 (
@@ -182,7 +182,7 @@ public:
 
 
         //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -207,7 +207,7 @@ public:
             else
             {
                 return
-                    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+                    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
                     (
                         NULL
                     );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
index 02bf978128..cb23171ea6 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::surfaceInterpolationScheme<Type> >
+Foam::tmp<Foam::surfaceInterpolationScheme<Type>>
 Foam::fvc::scheme
 (
     const surfaceScalarField& faceFlux,
@@ -45,7 +45,7 @@ Foam::fvc::scheme
 
 
 template<class Type>
-Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
+Foam::tmp<Foam::surfaceInterpolationScheme<Type>> Foam::fvc::scheme
 (
     const surfaceScalarField& faceFlux,
     const word& name
@@ -61,7 +61,7 @@ Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
 
 
 template<class Type>
-Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
+Foam::tmp<Foam::surfaceInterpolationScheme<Type>> Foam::fvc::scheme
 (
     const fvMesh& mesh,
     Istream& streamData
@@ -76,7 +76,7 @@ Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
 
 
 template<class Type>
-Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
+Foam::tmp<Foam::surfaceInterpolationScheme<Type>> Foam::fvc::scheme
 (
     const fvMesh& mesh,
     const word& name
@@ -91,7 +91,7 @@ Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -111,7 +111,7 @@ Foam::fvc::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -130,15 +130,15 @@ Foam::fvc::interpolate
 }
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const surfaceScalarField& faceFlux,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf =
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf =
         interpolate(tvf(), faceFlux, name);
 
     tvf.clear();
@@ -147,7 +147,7 @@ Foam::fvc::interpolate
 }
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -155,7 +155,7 @@ Foam::fvc::interpolate
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf =
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf =
         interpolate(vf, tFaceFlux(), name);
 
     tFaceFlux.clear();
@@ -164,15 +164,15 @@ Foam::fvc::interpolate
 }
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const tmp<surfaceScalarField>& tFaceFlux,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf =
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf =
         interpolate(tvf(), tFaceFlux(), name);
 
     tvf.clear();
@@ -183,7 +183,7 @@ Foam::fvc::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -201,7 +201,7 @@ Foam::fvc::interpolate
 }
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -220,14 +220,14 @@ Foam::fvc::interpolate
 }
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf =
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf =
         interpolate(tvf(), name);
 
     tvf.clear();
@@ -237,7 +237,7 @@ Foam::fvc::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -256,13 +256,13 @@ Foam::fvc::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf =
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf =
         interpolate(tvf());
     tvf.clear();
     return tsf;
@@ -270,7 +270,7 @@ Foam::fvc::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::FieldField<Foam::fvsPatchField, Type> >
+Foam::tmp<Foam::FieldField<Foam::fvsPatchField, Type>>
 Foam::fvc::interpolate
 (
     const FieldField<fvPatchField, Type>& fvpff
@@ -291,18 +291,18 @@ Foam::fvc::interpolate
         (*fvspffPtr)[patchi] = fvpff[patchi];
     }
 
-    return tmp<FieldField<fvsPatchField, Type> >(fvspffPtr);
+    return tmp<FieldField<fvsPatchField, Type>>(fvspffPtr);
 }
 
 
 template<class Type>
-Foam::tmp<Foam::FieldField<Foam::fvsPatchField, Type> >
+Foam::tmp<Foam::FieldField<Foam::fvsPatchField, Type>>
 Foam::fvc::interpolate
 (
-    const tmp<FieldField<fvPatchField, Type> >& tfvpff
+    const tmp<FieldField<fvPatchField, Type>>& tfvpff
 )
 {
-    tmp<FieldField<fvsPatchField, Type> > tfvspff = interpolate(tfvpff());
+    tmp<FieldField<fvsPatchField, Type>> tfvspff = interpolate(tfvpff());
     tfvpff.clear();
     return tfvspff;
 }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
index 66dce3de59..75415501e0 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ namespace fvc
 {
     //- Return weighting factors for scheme given from Istream
     template<class Type>
-    static tmp<surfaceInterpolationScheme<Type> > scheme
+    static tmp<surfaceInterpolationScheme<Type>> scheme
     (
         const surfaceScalarField& faceFlux,
         Istream& schemeData
@@ -62,7 +62,7 @@ namespace fvc
 
     //- Return weighting factors for scheme given by name in dictionary
     template<class Type>
-    static tmp<surfaceInterpolationScheme<Type> > scheme
+    static tmp<surfaceInterpolationScheme<Type>> scheme
     (
         const surfaceScalarField& faceFlux,
         const word& name
@@ -71,7 +71,7 @@ namespace fvc
 
     //- Return weighting factors for scheme given from Istream
     template<class Type>
-    static tmp<surfaceInterpolationScheme<Type> > scheme
+    static tmp<surfaceInterpolationScheme<Type>> scheme
     (
         const fvMesh& mesh,
         Istream& schemeData
@@ -79,7 +79,7 @@ namespace fvc
 
     //- Return weighting factors for scheme given by name in dictionary
     template<class Type>
-    static tmp<surfaceInterpolationScheme<Type> > scheme
+    static tmp<surfaceInterpolationScheme<Type>> scheme
     (
         const fvMesh& mesh,
         const word& name
@@ -88,7 +88,7 @@ namespace fvc
 
     //- Interpolate field onto faces using scheme given by Istream
     template<class Type>
-    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
     (
         const GeometricField<Type, fvPatchField, volMesh>& tvf,
         const surfaceScalarField& faceFlux,
@@ -97,7 +97,7 @@ namespace fvc
 
     //- Interpolate field onto faces using scheme given by name in fvSchemes
     template<class Type>
-    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
     (
         const GeometricField<Type, fvPatchField, volMesh>& tvf,
         const surfaceScalarField& faceFlux,
@@ -106,16 +106,16 @@ namespace fvc
 
     //- Interpolate field onto faces using scheme given by name in fvSchemes
     template<class Type>
-    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
         const surfaceScalarField& faceFlux,
         const word& name
     );
 
     //- Interpolate field onto faces using scheme given by name in fvSchemes
     template<class Type>
-    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
     (
         const GeometricField<Type, fvPatchField, volMesh>& tvf,
         const tmp<surfaceScalarField>& faceFlux,
@@ -124,9 +124,9 @@ namespace fvc
 
     //- Interpolate field onto faces using scheme given by name in fvSchemes
     template<class Type>
-    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
         const tmp<surfaceScalarField>& faceFlux,
         const word& name
     );
@@ -134,7 +134,7 @@ namespace fvc
 
     //- Interpolate field onto faces using scheme given by Istream
     template<class Type>
-    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
     (
         const GeometricField<Type, fvPatchField, volMesh>& tvf,
         Istream& schemeData
@@ -142,7 +142,7 @@ namespace fvc
 
     //- Interpolate field onto faces using scheme given by name in fvSchemes
     template<class Type>
-    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
     (
         const GeometricField<Type, fvPatchField, volMesh>& tvf,
         const word& name
@@ -150,39 +150,39 @@ namespace fvc
 
     //- Interpolate field onto faces using scheme given by name in fvSchemes
     template<class Type>
-    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
         const word& name
     );
 
 
     //- Interpolate tmp field onto faces using 'interpolate(\<name\>)'
     template<class Type>
-    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
     );
 
     //- Interpolate field onto faces using 'interpolate(\<name\>)'
     template<class Type>
-    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
     (
         const GeometricField<Type, fvPatchField, volMesh>& tvf
     );
 
     //- Interpolate boundary field onto faces (simply a type conversion)
     template<class Type>
-    static tmp<FieldField<fvsPatchField, Type> > interpolate
+    static tmp<FieldField<fvsPatchField, Type>> interpolate
     (
         const FieldField<fvPatchField, Type>& fvpff
     );
 
     //- Interpolate boundary field onto faces (simply a type conversion)
     template<class Type>
-    static tmp<FieldField<fvsPatchField, Type> > interpolate
+    static tmp<FieldField<fvsPatchField, Type>> interpolate
     (
-        const tmp<FieldField<fvPatchField, Type> >& tfvpff
+        const tmp<FieldField<fvPatchField, Type>>& tfvpff
     );
 
     //- Interpolate 'one' returning 'one'
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 788fffab6e..462d93d265 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::surfaceInterpolationScheme<Type> >
+Foam::tmp<Foam::surfaceInterpolationScheme<Type>>
 Foam::surfaceInterpolationScheme<Type>::New
 (
     const fvMesh& mesh,
@@ -81,7 +81,7 @@ Foam::surfaceInterpolationScheme<Type>::New
 
 
 template<class Type>
-Foam::tmp<Foam::surfaceInterpolationScheme<Type> >
+Foam::tmp<Foam::surfaceInterpolationScheme<Type>>
 Foam::surfaceInterpolationScheme<Type>::New
 (
     const fvMesh& mesh,
@@ -141,7 +141,7 @@ Foam::surfaceInterpolationScheme<Type>::~surfaceInterpolationScheme()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::surfaceInterpolationScheme<Type>::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -174,7 +174,7 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
     const labelUList& P = mesh.owner();
     const labelUList& N = mesh.neighbour();
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
@@ -225,7 +225,7 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::surfaceInterpolationScheme<Type>::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -254,7 +254,7 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
     const labelUList& P = mesh.owner();
     const labelUList& N = mesh.neighbour();
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
@@ -302,7 +302,7 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::surfaceInterpolationScheme<Type>::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -319,7 +319,7 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
             << endl;
     }
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
         = interpolate(vf, weights(vf));
 
     if (corrected())
@@ -332,13 +332,13 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::surfaceInterpolationScheme<Type>::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 ) const
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tinterpVf
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tinterpVf
         = interpolate(tvf());
     tvf.clear();
     return tinterpVf;
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
index fa8c1a5c4e..547a53b58a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,14 +118,14 @@ public:
     // Selectors
 
         //- Return new tmp interpolation scheme
-        static tmp<surfaceInterpolationScheme<Type> > New
+        static tmp<surfaceInterpolationScheme<Type>> New
         (
             const fvMesh& mesh,
             Istream& schemeData
         );
 
         //- Return new tmp interpolation scheme
-        static tmp<surfaceInterpolationScheme<Type> > New
+        static tmp<surfaceInterpolationScheme<Type>> New
         (
             const fvMesh& mesh,
             const surfaceScalarField& faceFlux,
@@ -148,7 +148,7 @@ public:
 
         //- Return the face-interpolate of the given cell field
         //  with the given owner and neighbour weigting factors
-        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate
         (
             const GeometricField<Type, fvPatchField, volMesh>&,
@@ -158,7 +158,7 @@ public:
 
         //- Return the face-interpolate of the given cell field
         //  with the given weighting factors
-        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate
         (
             const GeometricField<Type, fvPatchField, volMesh>&,
@@ -180,23 +180,23 @@ public:
 
         //- Return the explicit correction to the face-interpolate
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const
         {
-            return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >(NULL);
+            return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>(NULL);
         }
 
         //- Return the face-interpolate of the given cell field
         //  with explicit correction
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate(const GeometricField<Type, fvPatchField, volMesh>&) const;
 
         //- Return the face-interpolate of the given tmp cell field
         //  with explicit correction
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         interpolate
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
         ) const;
 };
 
@@ -213,10 +213,10 @@ public:
                                                                                \
 defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                              \
                                                                                \
-surfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type> >         \
+surfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type>>         \
     add##SS##Type##MeshConstructorToTable_;                                    \
                                                                                \
-surfaceInterpolationScheme<Type>::addMeshFluxConstructorToTable<SS<Type> >     \
+surfaceInterpolationScheme<Type>::addMeshFluxConstructorToTable<SS<Type>>     \
     add##SS##Type##MeshFluxConstructorToTable_;
 
 #define makeSurfaceInterpolationScheme(SS)                                     \
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C
index 355d031a27..85491c2688 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,9 +95,9 @@ void Foam::pointConstraints::setPatchFields
     {
         pointPatchField<Type>& ppf = pf.boundaryField()[patchI];
 
-        if (isA<valuePointPatchField<Type> >(ppf))
+        if (isA<valuePointPatchField<Type>>(ppf))
         {
-            refCast<valuePointPatchField<Type> >(ppf) =
+            refCast<valuePointPatchField<Type>>(ppf) =
                 ppf.patchInternalField();
         }
     }
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 74f9443967..84f41bba62 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ void Foam::volPointInterpolation::addSeparated
     {
         if (pf.boundaryField()[patchI].coupled())
         {
-            refCast<coupledPointPatchField<Type> >
+            refCast<coupledPointPatchField<Type>>
                 (pf.boundaryField()[patchI]).initSwapAddSeparated
                 (
                     Pstream::nonBlocking,
@@ -106,7 +106,7 @@ void Foam::volPointInterpolation::addSeparated
     {
         if (pf.boundaryField()[patchI].coupled())
         {
-            refCast<coupledPointPatchField<Type> >
+            refCast<coupledPointPatchField<Type>>
                 (pf.boundaryField()[patchI]).swapAddSeparated
                 (
                     Pstream::nonBlocking,
@@ -155,7 +155,7 @@ void Foam::volPointInterpolation::interpolateInternalField
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::volPointInterpolation::flatBoundaryField
+Foam::tmp<Foam::Field<Type>> Foam::volPointInterpolation::flatBoundaryField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
@@ -163,7 +163,7 @@ Foam::tmp<Foam::Field<Type> > Foam::volPointInterpolation::flatBoundaryField
     const fvMesh& mesh = vf.mesh();
     const fvBoundaryMesh& bm = mesh.boundary();
 
-    tmp<Field<Type> > tboundaryVals
+    tmp<Field<Type>> tboundaryVals
     (
         new Field<Type>(mesh.nFaces()-mesh.nInternalFaces())
     );
@@ -213,7 +213,7 @@ void Foam::volPointInterpolation::interpolateBoundaryField
     Field<Type>& pfi = pf.internalField();
 
     // Get face data in flat list
-    tmp<Field<Type> > tboundaryVals(flatBoundaryField(vf));
+    tmp<Field<Type>> tboundaryVals(flatBoundaryField(vf));
     const Field<Type>& boundaryVals = tboundaryVals();
 
 
@@ -296,7 +296,7 @@ void Foam::volPointInterpolation::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -306,7 +306,7 @@ Foam::volPointInterpolation::interpolate
     const pointMesh& pm = pointMesh::New(vf.mesh());
 
     // Construct tmp<pointField>
-    tmp<GeometricField<Type, pointPatchField, pointMesh> > tpf
+    tmp<GeometricField<Type, pointPatchField, pointMesh>> tpf
     (
         new GeometricField<Type, pointPatchField, pointMesh>
         (
@@ -332,15 +332,15 @@ Foam::volPointInterpolation::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const wordList& patchFieldTypes
 ) const
 {
     // Construct tmp<pointField>
-    tmp<GeometricField<Type, pointPatchField, pointMesh> > tpf =
+    tmp<GeometricField<Type, pointPatchField, pointMesh>> tpf =
         interpolate(tvf(), patchFieldTypes);
     tvf.clear();
     return tpf;
@@ -348,7 +348,7 @@ Foam::volPointInterpolation::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -380,7 +380,7 @@ Foam::volPointInterpolation::interpolate
         }
 
 
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > tpf
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> tpf
         (
             new GeometricField<Type, pointPatchField, pointMesh>
             (
@@ -443,7 +443,7 @@ Foam::volPointInterpolation::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -454,14 +454,14 @@ Foam::volPointInterpolation::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 ) const
 {
     // Construct tmp<pointField>
-    tmp<GeometricField<Type, pointPatchField, pointMesh> > tpf =
+    tmp<GeometricField<Type, pointPatchField, pointMesh>> tpf =
         interpolate(tvf());
     tvf.clear();
     return tpf;
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
index 6e82d741e4..b040fc10fd 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ class volPointInterpolation
         //- Get boundary field in same order as boundary faces. Field is
         //  zero on all coupled and empty patches
         template<class Type>
-        tmp<Field<Type> > flatBoundaryField
+        tmp<Field<Type>> flatBoundaryField
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
         ) const;
@@ -152,7 +152,7 @@ public:
         //- Interpolate volField using inverse distance weighting
         //  returning pointField
         template<class Type>
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > interpolate
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> interpolate
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
@@ -160,9 +160,9 @@ public:
         //- Interpolate tmp<volField> using inverse distance weighting
         //  returning pointField
         template<class Type>
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > interpolate
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> interpolate
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
         ) const;
 
         //- Interpolate volField using inverse distance weighting
@@ -170,7 +170,7 @@ public:
         //  to any fixedValue boundary conditions to make them consistent
         //  with internal field
         template<class Type>
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > interpolate
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> interpolate
         (
             const GeometricField<Type, fvPatchField, volMesh>&,
             const wordList& patchFieldTypes
@@ -181,9 +181,9 @@ public:
         //  to any fixedValue boundary conditions to make them consistent
         //  with internal field
         template<class Type>
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > interpolate
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> interpolate
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
             const wordList& patchFieldTypes
         ) const;
 
@@ -229,7 +229,7 @@ public:
             //- Interpolate volField using inverse distance weighting
             //  returning pointField with name. Optionally caches
             template<class Type>
-            tmp<GeometricField<Type, pointPatchField, pointMesh> > interpolate
+            tmp<GeometricField<Type, pointPatchField, pointMesh>> interpolate
             (
                 const GeometricField<Type, fvPatchField, volMesh>&,
                 const word& name,
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
index ecceef966a..ab49334a5d 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
@@ -114,7 +114,7 @@ void Foam::pairPatchAgglomeration::setEdgeWeights
     const label nCoarseI =  max(fineToCoarse) + 1;
     labelListList coarseToFine(invertOneToMany(nCoarseI, fineToCoarse));
 
-    HashSet<edge, Hash<edge> > fineFeaturedFaces(coarsePatch.nEdges()/10);
+    HashSet<edge, Hash<edge>> fineFeaturedFaces(coarsePatch.nEdges()/10);
 
     // Map fine faces with featured edge into coarse faces
     forAllConstIter(EdgeMap<scalar>, facePairWeight_, iter)
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
index 96ba02d31c..f3286af26a 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ namespace Foam
     );
 
     template<>
-    const word IOList<Tuple2<scalar, vector> >::typeName("scalarVectorTable");
+    const word IOList<Tuple2<scalar, vector>>::typeName("scalarVectorTable");
 }
 
 
@@ -65,7 +65,7 @@ displacementInterpolationMotionSolver
     // Get zones and their interpolation tables for displacement
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    List<Pair<word> > faceZoneToTable
+    List<Pair<word>> faceZoneToTable
     (
         coeffDict().lookup("interpolationTables")
     );
@@ -90,7 +90,7 @@ displacementInterpolationMotionSolver
 
         const word& tableName = faceZoneToTable[i][1];
 
-        IOList<Tuple2<scalar, vector> > table
+        IOList<Tuple2<scalar, vector>> table
         (
             IOobject
             (
diff --git a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolverCore/fvMotionSolverCoreTemplates.C b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolverCore/fvMotionSolverCoreTemplates.C
index 71dbdaa69f..35ae23788b 100644
--- a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolverCore/fvMotionSolverCoreTemplates.C
+++ b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolverCore/fvMotionSolverCoreTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::wordList Foam::fvMotionSolverCore::cellMotionBoundaryTypes
 
     forAll(cmUbf, patchi)
     {
-        if (isA<fixedValuePointPatchField<Type> >(pmUbf[patchi]))
+        if (isA<fixedValuePointPatchField<Type>>(pmUbf[patchi]))
         {
             cmUbf[patchi] = cellMotionFvPatchField<Type>::typeName;
         }
diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
index 3c8ba89c37..299ee35293 100644
--- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
+++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ void Foam::cellMotionFvPatchField<Type>::updateCoeffs()
 
     const GeometricField<Type, pointPatchField, pointMesh>& pointMotion =
         this->db().objectRegistry::template
-            lookupObject<GeometricField<Type, pointPatchField, pointMesh> >
+            lookupObject<GeometricField<Type, pointPatchField, pointMesh>>
             (pfName);
 
     forAll(p, i)
diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H
index 559b2500e4..dad854ea25 100644
--- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H
+++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new cellMotionFvPatchField<Type>(*this)
             );
@@ -109,12 +109,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new cellMotionFvPatchField<Type>(*this, iF)
             );
diff --git a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H b/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H
index 67580082c8..06487f714f 100644
--- a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H
+++ b/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,9 +107,9 @@ public:
         {}
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new surfaceSlipDisplacementFvPatchField<Type>(*this)
             );
@@ -126,12 +126,12 @@ public:
         {}
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new surfaceSlipDisplacementFvPatchField<Type>(*this, iF)
             );
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
index a6835327ab..8deae1e6d1 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,9 +94,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<vector> > clone() const
+        virtual autoPtr<pointPatchField<vector>> clone() const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new angularOscillatingDisplacementPointPatchVectorField
                 (
@@ -113,12 +113,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<vector> > clone
+        virtual autoPtr<pointPatchField<vector>> clone
         (
             const DimensionedField<vector, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new angularOscillatingDisplacementPointPatchVectorField
                 (
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
index b69fb3f5d2..7016e88925 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,9 +94,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<vector> > clone() const
+        virtual autoPtr<pointPatchField<vector>> clone() const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new angularOscillatingVelocityPointPatchVectorField
                 (
@@ -113,12 +113,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<vector> > clone
+        virtual autoPtr<pointPatchField<vector>> clone
         (
             const DimensionedField<vector, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new angularOscillatingVelocityPointPatchVectorField
                 (
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
index 9c298a7302..ffa5b7c31b 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,9 +89,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<vector> > clone() const
+        virtual autoPtr<pointPatchField<vector>> clone() const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new oscillatingDisplacementPointPatchVectorField
                 (
@@ -108,12 +108,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<vector> > clone
+        virtual autoPtr<pointPatchField<vector>> clone
         (
             const DimensionedField<vector, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new oscillatingDisplacementPointPatchVectorField
                 (
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
index 1ba4ec5872..48a590cd08 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,9 +91,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<vector> > clone() const
+        virtual autoPtr<pointPatchField<vector>> clone() const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new oscillatingVelocityPointPatchVectorField
                 (
@@ -110,12 +110,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<vector> > clone
+        virtual autoPtr<pointPatchField<vector>> clone
         (
             const DimensionedField<vector, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new oscillatingVelocityPointPatchVectorField
                 (
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index a27dd4ab8c..124d2408c5 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -236,7 +236,7 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::rmap
     fixedValuePointPatchField<Type>::rmap(ptf, addr);
 
     const timeVaryingMappedFixedValuePointPatchField<Type>& tiptf =
-        refCast<const timeVaryingMappedFixedValuePointPatchField<Type> >(ptf);
+        refCast<const timeVaryingMappedFixedValuePointPatchField<Type>>(ptf);
 
     startSampledValues_.rmap(tiptf.startSampledValues_, addr);
     endSampledValues_.rmap(tiptf.endSampledValues_, addr);
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
index 012ac08d3c..1dd70b7012 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ class timeVaryingMappedFixedValuePointPatchField
         Type endAverage_;
 
         //- Time varying offset values to interpolated data
-        autoPtr<DataEntry<Type> > offset_;
+        autoPtr<DataEntry<Type>> offset_;
 
 
 public:
@@ -138,9 +138,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new timeVaryingMappedFixedValuePointPatchField<Type>(*this)
             );
@@ -154,12 +154,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new timeVaryingMappedFixedValuePointPatchField<Type>(*this, iF)
             );
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
index bd1beb36ff..3e7ff244ca 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,9 +124,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<vector> > clone() const
+        virtual autoPtr<pointPatchField<vector>> clone() const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new uniformInterpolatedDisplacementPointPatchVectorField
                 (
@@ -143,12 +143,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<vector> > clone
+        virtual autoPtr<pointPatchField<vector>> clone
         (
             const DimensionedField<vector, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new uniformInterpolatedDisplacementPointPatchVectorField
                 (
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H
index 70d2f6c7f7..c27323b4c1 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,9 +90,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<vector> > clone() const
+        virtual autoPtr<pointPatchField<vector>> clone() const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new waveDisplacementPointPatchVectorField
                 (
@@ -109,12 +109,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<vector> > clone
+        virtual autoPtr<pointPatchField<vector>> clone
         (
             const DimensionedField<vector, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new waveDisplacementPointPatchVectorField
                 (
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index 7ca1285a7b..7c5ae7ceca 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ protected:
         temperatureMode mode_;
 
         //- Uniform temperature [K]
-        autoPtr<DataEntry<scalar> > Tuniform_;
+        autoPtr<DataEntry<scalar>> Tuniform_;
 
         //- Temperature field name
         word TName_;
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
index 663e81de65..a1629d9624 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -169,7 +169,7 @@ protected:
 
         //- 2D look up table efficiency = function of primary and secondary
         // mass flow rates [kg/s]
-        autoPtr<interpolation2DTable<scalar> > eTable_;
+        autoPtr<interpolation2DTable<scalar>> eTable_;
 
         //- Name of velocity field; default = U
         word UName_;
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.C b/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
index e716ccd03a..14a8c44de1 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ Foam::bladeModel::bladeModel(const dictionary& dict)
     chord_(),
     fName_(fileName::null)
 {
-    List<Tuple2<word, vector> > data;
+    List<Tuple2<word, vector>> data;
     if (readFromFile())
     {
         IFstream is(fName_);
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
index aae2e1e07a..4f1eb4e700 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ bool Foam::tabulated6DoFAcceleration::read
 
         if (dataStream.good())
         {
-            List<Tuple2<scalar, accelerationVectors> > timeValues
+            List<Tuple2<scalar, accelerationVectors>> timeValues
             (
                 dataStream
             );
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
index ce0df4a70e..5b22ca6ac8 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ protected:
         scalar VDash_;
 
         //- Source field values
-        List<Tuple2<Type, scalar> > injectionRate_;
+        List<Tuple2<Type, scalar>> injectionRate_;
 
 
     // Protected functions
@@ -170,7 +170,7 @@ public:
             inline const volumeModeType& volumeMode() const;
 
             //- Return const access to the source field values
-            inline const List<Tuple2<Type, scalar> >& injectionRate() const;
+            inline const List<Tuple2<Type, scalar>>& injectionRate() const;
 
 
         // Edit
@@ -179,7 +179,7 @@ public:
             inline volumeModeType& volumeMode();
 
             //- Return access to the source field values
-            inline List<Tuple2<Type, scalar> >& injectionRate();
+            inline List<Tuple2<Type, scalar>>& injectionRate();
 
 
         // Evaluation
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceI.H b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceI.H
index fd1fbf7958..1e1f85054b 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceI.H
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Foam::fv::SemiImplicitSource<Type>::volumeMode() const
 
 
 template<class Type>
-inline const Foam::List<Foam::Tuple2<Type, Foam::scalar> >&
+inline const Foam::List<Foam::Tuple2<Type, Foam::scalar>>&
 Foam::fv::SemiImplicitSource<Type>::injectionRate() const
 {
     return injectionRate_;
@@ -53,7 +53,7 @@ Foam::fv::SemiImplicitSource<Type>::volumeMode()
 
 template<class Type>
 inline Foam::List<Foam::Tuple2<Type,
-Foam::scalar> >& Foam::fv::SemiImplicitSource<Type>::injectionRate()
+Foam::scalar>>& Foam::fv::SemiImplicitSource<Type>::injectionRate()
 {
     return injectionRate_;
 }
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
index f24bbad670..c5810cc321 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ protected:
 
         //- Interpolate field with nbrModel specified
         template<class Type>
-        tmp<Field<Type> > interpolate
+        tmp<Field<Type>> interpolate
         (
             const interRegionHeatTransferModel& nbrModel,
             const Field<Type>& field
@@ -106,7 +106,7 @@ protected:
 
         //- Interpolate field without nbrModel specified
         template<class Type>
-        tmp<Field<Type> > interpolate
+        tmp<Field<Type>> interpolate
         (
             const Field<Type>& field
         ) const;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelTemplates.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelTemplates.C
index 96694477f3..230cb40c5b 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelTemplates.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fv::interRegionHeatTransferModel::interpolate
 (
     const interRegionHeatTransferModel& nbrModel,
@@ -43,7 +43,7 @@ Foam::fv::interRegionHeatTransferModel::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::fv::interRegionHeatTransferModel::interpolate
 (
     const Field<Type>& field
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H
index 3f2be053f8..888f1e97a2 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ private:
         word UNbrName_;
 
         //- 2D look up table
-        autoPtr<interpolation2DTable<scalar> > hTable_;
+        autoPtr<interpolation2DTable<scalar>> hTable_;
 
         //- Area per unit volume of heat exchanger
         autoPtr<volScalarField> AoV_;
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 0a7afe5cb2..298eb67787 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,13 +130,13 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                     else if
                     (
                         fieldToken.compoundToken().type()
-                     == token::Compound<List<scalar> >::typeName
+                     == token::Compound<List<scalar>>::typeName
                     )
                     {
                         scalarField* fPtr = new scalarField;
                         fPtr->transfer
                         (
-                            dynamicCast<token::Compound<List<scalar> > >
+                            dynamicCast<token::Compound<List<scalar>>>
                             (
                                 fieldToken.transferCompoundToken(is)
                             )
@@ -164,13 +164,13 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                     else if
                     (
                         fieldToken.compoundToken().type()
-                     == token::Compound<List<vector> >::typeName
+                     == token::Compound<List<vector>>::typeName
                     )
                     {
                         vectorField* fPtr = new vectorField;
                         fPtr->transfer
                         (
-                            dynamicCast<token::Compound<List<vector> > >
+                            dynamicCast<token::Compound<List<vector>>>
                             (
                                 fieldToken.transferCompoundToken(is)
                             )
@@ -198,7 +198,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                     else if
                     (
                         fieldToken.compoundToken().type()
-                     == token::Compound<List<sphericalTensor> >::typeName
+                     == token::Compound<List<sphericalTensor>>::typeName
                     )
                     {
                         sphericalTensorField* fPtr = new sphericalTensorField;
@@ -206,7 +206,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                         (
                             dynamicCast
                             <
-                                token::Compound<List<sphericalTensor> >
+                                token::Compound<List<sphericalTensor>>
                             >
                             (
                                 fieldToken.transferCompoundToken(is)
@@ -235,7 +235,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                     else if
                     (
                         fieldToken.compoundToken().type()
-                     == token::Compound<List<symmTensor> >::typeName
+                     == token::Compound<List<symmTensor>>::typeName
                     )
                     {
                         symmTensorField* fPtr = new symmTensorField;
@@ -243,7 +243,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                         (
                             dynamicCast
                             <
-                                token::Compound<List<symmTensor> >
+                                token::Compound<List<symmTensor>>
                             >
                             (
                                 fieldToken.transferCompoundToken(is)
@@ -272,13 +272,13 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                     else if
                     (
                         fieldToken.compoundToken().type()
-                     == token::Compound<List<tensor> >::typeName
+                     == token::Compound<List<tensor>>::typeName
                     )
                     {
                         tensorField* fPtr = new tensorField;
                         fPtr->transfer
                         (
-                            dynamicCast<token::Compound<List<tensor> > >
+                            dynamicCast<token::Compound<List<tensor>>>
                             (
                                 fieldToken.transferCompoundToken(is)
                             )
@@ -603,7 +603,7 @@ void Foam::genericFvPatchField<Type>::rmap
     calculatedFvPatchField<Type>::rmap(ptf, addr);
 
     const genericFvPatchField<Type>& dptf =
-        refCast<const genericFvPatchField<Type> >(ptf);
+        refCast<const genericFvPatchField<Type>>(ptf);
 
     forAllIter
     (
@@ -688,7 +688,7 @@ void Foam::genericFvPatchField<Type>::rmap
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::genericFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
@@ -709,7 +709,7 @@ Foam::genericFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::genericFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
@@ -730,7 +730,7 @@ Foam::genericFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::genericFvPatchField<Type>::gradientInternalCoeffs() const
 {
     FatalErrorInFunction
@@ -747,7 +747,7 @@ Foam::genericFvPatchField<Type>::gradientInternalCoeffs() const
 }
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::genericFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     FatalErrorInFunction
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
index c032a32fc2..4f84cce98a 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,9 +108,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new genericFvPatchField<Type>(*this)
             );
@@ -124,12 +124,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new genericFvPatchField<Type>(*this, iF)
             );
@@ -158,25 +158,25 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            tmp<Field<Type> > gradientInternalCoeffs() const;
+            tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
-            tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            tmp<Field<Type>> gradientBoundaryCoeffs() const;
 
 
         //- Write
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index bb7598b26a..8f4970855f 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,13 +108,13 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
                     else if
                     (
                         fieldToken.compoundToken().type()
-                     == token::Compound<List<scalar> >::typeName
+                     == token::Compound<List<scalar>>::typeName
                     )
                     {
                         scalarField* fPtr = new scalarField;
                         fPtr->transfer
                         (
-                            dynamicCast<token::Compound<List<scalar> > >
+                            dynamicCast<token::Compound<List<scalar>>>
                             (
                                 fieldToken.transferCompoundToken(is)
                             )
@@ -142,13 +142,13 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
                     else if
                     (
                         fieldToken.compoundToken().type()
-                     == token::Compound<List<vector> >::typeName
+                     == token::Compound<List<vector>>::typeName
                     )
                     {
                         vectorField* fPtr = new vectorField;
                         fPtr->transfer
                         (
-                            dynamicCast<token::Compound<List<vector> > >
+                            dynamicCast<token::Compound<List<vector>>>
                             (
                                 fieldToken.transferCompoundToken(is)
                             )
@@ -176,7 +176,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
                     else if
                     (
                         fieldToken.compoundToken().type()
-                     == token::Compound<List<sphericalTensor> >::typeName
+                     == token::Compound<List<sphericalTensor>>::typeName
                     )
                     {
                         sphericalTensorField* fPtr = new sphericalTensorField;
@@ -184,7 +184,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
                         (
                             dynamicCast
                             <
-                                token::Compound<List<sphericalTensor> >
+                                token::Compound<List<sphericalTensor>>
                             >
                             (
                                 fieldToken.transferCompoundToken(is)
@@ -213,7 +213,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
                     else if
                     (
                         fieldToken.compoundToken().type()
-                     == token::Compound<List<symmTensor> >::typeName
+                     == token::Compound<List<symmTensor>>::typeName
                     )
                     {
                         symmTensorField* fPtr = new symmTensorField;
@@ -221,7 +221,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
                         (
                             dynamicCast
                             <
-                                token::Compound<List<symmTensor> >
+                                token::Compound<List<symmTensor>>
                             >
                             (
                                 fieldToken.transferCompoundToken(is)
@@ -250,13 +250,13 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
                     else if
                     (
                         fieldToken.compoundToken().type()
-                     == token::Compound<List<tensor> >::typeName
+                     == token::Compound<List<tensor>>::typeName
                     )
                     {
                         tensorField* fPtr = new tensorField;
                         fPtr->transfer
                         (
-                            dynamicCast<token::Compound<List<tensor> > >
+                            dynamicCast<token::Compound<List<tensor>>>
                             (
                                 fieldToken.transferCompoundToken(is)
                             )
@@ -473,7 +473,7 @@ void Foam::genericPointPatchField<Type>::rmap
 )
 {
     const genericPointPatchField<Type>& dptf =
-        refCast<const genericPointPatchField<Type> >(ptf);
+        refCast<const genericPointPatchField<Type>>(ptf);
 
     forAllIter
     (
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
index a7d3f7c6d9..95e9e7b322 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,9 +98,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new genericPointPatchField<Type>
                 (
@@ -117,12 +117,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new genericPointPatchField<Type>
                 (
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
index 3cc13ad356..90608e1f51 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -221,7 +221,7 @@ void Foam::DSMCCloud<ParcelType>::collisions()
     }
 
     // Temporary storage for subCells
-    List<DynamicList<label> > subCells(8);
+    List<DynamicList<label>> subCells(8);
 
     scalar deltaT = mesh().time().deltaTValue();
 
@@ -681,7 +681,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
     ),
     binaryCollisionModel_
     (
-        BinaryCollisionModel<DSMCCloud<ParcelType> >::New
+        BinaryCollisionModel<DSMCCloud<ParcelType>>::New
         (
             particleProperties_,
             *this
@@ -689,7 +689,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
     ),
     wallInteractionModel_
     (
-        WallInteractionModel<DSMCCloud<ParcelType> >::New
+        WallInteractionModel<DSMCCloud<ParcelType>>::New
         (
             particleProperties_,
             *this
@@ -697,7 +697,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
     ),
     inflowBoundaryModel_
     (
-        InflowBoundaryModel<DSMCCloud<ParcelType> >::New
+        InflowBoundaryModel<DSMCCloud<ParcelType>>::New
         (
             particleProperties_,
             *this
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
index 6b57ae1ed7..ea2db73db0 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ class DSMCCloud
         scalar nParticle_;
 
         //- A data structure holding which particles are in which cell
-        List<DynamicList<ParcelType*> > cellOccupancy_;
+        List<DynamicList<ParcelType*>> cellOccupancy_;
 
         //- A field holding the value of (sigmaT * cR)max for each
         //  cell (see Bird p220). Initialised with the parcels,
@@ -149,15 +149,15 @@ class DSMCCloud
         // References to the cloud sub-models
 
             //- Binary collision model
-            autoPtr<BinaryCollisionModel<DSMCCloud<ParcelType> > >
+            autoPtr<BinaryCollisionModel<DSMCCloud<ParcelType>>>
                 binaryCollisionModel_;
 
             //- Wall interaction model
-            autoPtr<WallInteractionModel<DSMCCloud<ParcelType> > >
+            autoPtr<WallInteractionModel<DSMCCloud<ParcelType>>>
                 wallInteractionModel_;
 
             //- Inflow boundary model
-            autoPtr<InflowBoundaryModel<DSMCCloud<ParcelType> > >
+            autoPtr<InflowBoundaryModel<DSMCCloud<ParcelType>>>
                 inflowBoundaryModel_;
 
 
@@ -244,7 +244,7 @@ public:
                 inline scalar nParticle() const;
 
                 //- Return the cell occupancy addressing
-                inline const List<DynamicList<ParcelType*> >&
+                inline const List<DynamicList<ParcelType*>>&
                     cellOccupancy() const;
 
                 //- Return the sigmaTcRMax field.  non-const access to allow
@@ -398,27 +398,27 @@ public:
             // Sub-models
 
                 //- Return reference to binary elastic collision model
-                inline const BinaryCollisionModel<DSMCCloud<ParcelType> >&
+                inline const BinaryCollisionModel<DSMCCloud<ParcelType>>&
                     binaryCollision() const;
 
                 //- Return non-const reference to binary elastic collision model
-                inline BinaryCollisionModel<DSMCCloud<ParcelType> >&
+                inline BinaryCollisionModel<DSMCCloud<ParcelType>>&
                     binaryCollision();
 
                 //- Return reference to wall interaction model
-                inline const WallInteractionModel<DSMCCloud<ParcelType> >&
+                inline const WallInteractionModel<DSMCCloud<ParcelType>>&
                     wallInteraction() const;
 
                 //- Return non-const reference to wall interaction model
-                inline WallInteractionModel<DSMCCloud<ParcelType> >&
+                inline WallInteractionModel<DSMCCloud<ParcelType>>&
                     wallInteraction();
 
                 //- Return reference to wall interaction model
-                inline const InflowBoundaryModel<DSMCCloud<ParcelType> >&
+                inline const InflowBoundaryModel<DSMCCloud<ParcelType>>&
                     inflowBoundary() const;
 
                 //- Return non-const reference to wall interaction model
-                inline InflowBoundaryModel<DSMCCloud<ParcelType> >&
+                inline InflowBoundaryModel<DSMCCloud<ParcelType>>&
                     inflowBoundary();
 
 
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
index 16801a7bf7..9e8465f475 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ inline Foam::scalar Foam::DSMCCloud<ParcelType>::nParticle() const
 
 
 template<class ParcelType>
-inline const Foam::List<Foam::DynamicList<ParcelType*> >&
+inline const Foam::List<Foam::DynamicList<ParcelType*>>&
 Foam::DSMCCloud<ParcelType>::cellOccupancy() const
 {
     return cellOccupancy_;
@@ -205,7 +205,7 @@ Foam::DSMCCloud<ParcelType>::boundaryU() const
 
 
 template<class ParcelType>
-inline const Foam::BinaryCollisionModel<Foam::DSMCCloud<ParcelType> >&
+inline const Foam::BinaryCollisionModel<Foam::DSMCCloud<ParcelType>>&
 Foam::DSMCCloud<ParcelType>::binaryCollision() const
 {
     return binaryCollisionModel_;
@@ -213,7 +213,7 @@ Foam::DSMCCloud<ParcelType>::binaryCollision() const
 
 
 template<class ParcelType>
-inline Foam::BinaryCollisionModel<Foam::DSMCCloud<ParcelType> >&
+inline Foam::BinaryCollisionModel<Foam::DSMCCloud<ParcelType>>&
 Foam::DSMCCloud<ParcelType>::binaryCollision()
 {
     return binaryCollisionModel_();
@@ -221,7 +221,7 @@ Foam::DSMCCloud<ParcelType>::binaryCollision()
 
 
 template<class ParcelType>
-inline const Foam::WallInteractionModel<Foam::DSMCCloud<ParcelType> >&
+inline const Foam::WallInteractionModel<Foam::DSMCCloud<ParcelType>>&
 Foam::DSMCCloud<ParcelType>::wallInteraction() const
 {
     return wallInteractionModel_;
@@ -229,7 +229,7 @@ Foam::DSMCCloud<ParcelType>::wallInteraction() const
 
 
 template<class ParcelType>
-inline Foam::WallInteractionModel<Foam::DSMCCloud<ParcelType> >&
+inline Foam::WallInteractionModel<Foam::DSMCCloud<ParcelType>>&
 Foam::DSMCCloud<ParcelType>::wallInteraction()
 {
     return wallInteractionModel_();
@@ -237,7 +237,7 @@ Foam::DSMCCloud<ParcelType>::wallInteraction()
 
 
 template<class ParcelType>
-inline const Foam::InflowBoundaryModel<Foam::DSMCCloud<ParcelType> >&
+inline const Foam::InflowBoundaryModel<Foam::DSMCCloud<ParcelType>>&
 Foam::DSMCCloud<ParcelType>::inflowBoundary() const
 {
     return inflowBoundaryModel_;
@@ -245,7 +245,7 @@ Foam::DSMCCloud<ParcelType>::inflowBoundary() const
 
 
 template<class ParcelType>
-inline Foam::InflowBoundaryModel<Foam::DSMCCloud<ParcelType> >&
+inline Foam::InflowBoundaryModel<Foam::DSMCCloud<ParcelType>>&
 Foam::DSMCCloud<ParcelType>::inflowBoundary()
 {
     return inflowBoundaryModel_();
diff --git a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.H b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.H
index 10d93b50dd..fc540a3d12 100644
--- a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.H
+++ b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,16 +130,16 @@ public:
     //- Class used to pass kinematic tracking data to the trackToFace function
     class trackingData
     :
-        public particle::TrackingData<DSMCCloud<DSMCParcel<ParcelType> > >
+        public particle::TrackingData<DSMCCloud<DSMCParcel<ParcelType>>>
     {
     public:
 
         // Constructors
 
             //- Construct from components
-            trackingData(DSMCCloud<DSMCParcel<ParcelType> >& cloud)
+            trackingData(DSMCCloud<DSMCParcel<ParcelType>>& cloud)
             :
-                particle::TrackingData<DSMCCloud<DSMCParcel<ParcelType> > >
+                particle::TrackingData<DSMCCloud<DSMCParcel<ParcelType>>>
                 (
                     cloud
                 )
@@ -214,9 +214,9 @@ public:
                 mesh_(mesh)
             {}
 
-            autoPtr<DSMCParcel<ParcelType> > operator()(Istream& is) const
+            autoPtr<DSMCParcel<ParcelType>> operator()(Istream& is) const
             {
-                return autoPtr<DSMCParcel<ParcelType> >
+                return autoPtr<DSMCParcel<ParcelType>>
                 (
                     new DSMCParcel<ParcelType>(mesh_, is, true)
                 );
@@ -307,9 +307,9 @@ public:
 
         // I-O
 
-            static void readFields(Cloud<DSMCParcel<ParcelType> >& c);
+            static void readFields(Cloud<DSMCParcel<ParcelType>>& c);
 
-            static void writeFields(const Cloud<DSMCParcel<ParcelType> >& c);
+            static void writeFields(const Cloud<DSMCParcel<ParcelType>>& c);
 
 
     // Ostream Operator
diff --git a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
index 6c6c545ae9..d9311e7fae 100644
--- a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
+++ b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ Foam::DSMCParcel<ParcelType>::DSMCParcel
 
 
 template<class ParcelType>
-void Foam::DSMCParcel<ParcelType>::readFields(Cloud<DSMCParcel<ParcelType> >& c)
+void Foam::DSMCParcel<ParcelType>::readFields(Cloud<DSMCParcel<ParcelType>>& c)
 {
     if (!c.size())
     {
@@ -95,7 +95,7 @@ void Foam::DSMCParcel<ParcelType>::readFields(Cloud<DSMCParcel<ParcelType> >& c)
     c.checkFieldIOobject(c, typeId);
 
     label i = 0;
-    forAllIter(typename Cloud<DSMCParcel<ParcelType> >, c, iter)
+    forAllIter(typename Cloud<DSMCParcel<ParcelType>>, c, iter)
     {
         DSMCParcel<ParcelType>& p = iter();
 
@@ -110,7 +110,7 @@ void Foam::DSMCParcel<ParcelType>::readFields(Cloud<DSMCParcel<ParcelType> >& c)
 template<class ParcelType>
 void Foam::DSMCParcel<ParcelType>::writeFields
 (
-    const Cloud<DSMCParcel<ParcelType> >& c
+    const Cloud<DSMCParcel<ParcelType>>& c
 )
 {
     ParcelType::writeFields(c);
@@ -122,7 +122,7 @@ void Foam::DSMCParcel<ParcelType>::writeFields
     IOField<label> typeId(c.fieldIOobject("typeId", IOobject::NO_READ), np);
 
     label i = 0;
-    forAllConstIter(typename Cloud<DSMCParcel<ParcelType> >, c, iter)
+    forAllConstIter(typename Cloud<DSMCParcel<ParcelType>>, c, iter)
     {
         const DSMCParcel<ParcelType>& p = iter();
 
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
index cc90269276..d3f228fd0c 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ public:
 
 
     //- Selector
-    static autoPtr<BinaryCollisionModel<CloudType> > New
+    static autoPtr<BinaryCollisionModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -171,7 +171,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
     BinaryCollisionModel<CloudType>::                                         \
-        adddictionaryConstructorToTable<SS<CloudType> >                       \
+        adddictionaryConstructorToTable<SS<CloudType>>                       \
             add##SS##CloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
index 4d528d0304..d01df91c78 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::BinaryCollisionModel<CloudType> >
+Foam::autoPtr<Foam::BinaryCollisionModel<CloudType>>
 Foam::BinaryCollisionModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::BinaryCollisionModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<BinaryCollisionModel<CloudType> >
+    return autoPtr<BinaryCollisionModel<CloudType>>
     (
         cstrIter()(dict, owner)
     );
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index 7fd2bc7537..6df7c26b15 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ Foam::FreeStream<CloudType>::FreeStream
     {
         const polyPatch& patch = cloud.mesh().boundaryMesh()[patches_[p]];
 
-        particleFluxAccumulators_[p] = List<Field<scalar> >
+        particleFluxAccumulators_[p] = List<Field<scalar>>
         (
             molecules.size(),
             Field<scalar>(patch.size(), 0.0)
@@ -128,7 +128,7 @@ void Foam::FreeStream<CloudType>::autoMap(const mapPolyMesh& mapper)
         label patchi = patches_[p];
 
         const polyPatch& patch = mesh.boundaryMesh()[patchi];
-        List<Field<scalar> >& pFA = particleFluxAccumulators_[p];
+        List<Field<scalar>>& pFA = particleFluxAccumulators_[p];
 
         forAll(pFA, facei)
         {
@@ -174,7 +174,7 @@ void Foam::FreeStream<CloudType>::inflow()
         // velocity to point flux into the domain.
 
         // Take a reference to the particleFluxAccumulator for this patch
-        List<Field<scalar> >& pFA = particleFluxAccumulators_[p];
+        List<Field<scalar>>& pFA = particleFluxAccumulators_[p];
 
         forAll(pFA, i)
         {
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.H b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
index eb0ff4ab40..2942937ea8 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ class FreeStream
         // + Inner List - one Field for every species to be introduced
         // + Each field entry corresponding to a face to be injected across
         //   with a particular species
-        List<List<Field<scalar> > > particleFluxAccumulators_;
+        List<List<Field<scalar>>> particleFluxAccumulators_;
 
 
 public:
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
index 3f600f6a6d..86f2c7893c 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ public:
 
 
     //- Selector
-    static autoPtr<InflowBoundaryModel<CloudType> > New
+    static autoPtr<InflowBoundaryModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -157,7 +157,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
     InflowBoundaryModel<CloudType>::                                          \
-        adddictionaryConstructorToTable<SS<CloudType> >                       \
+        adddictionaryConstructorToTable<SS<CloudType>>                       \
             add##SS##CloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
index 9fd145d104..4527542382 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::InflowBoundaryModel<CloudType> >
+Foam::autoPtr<Foam::InflowBoundaryModel<CloudType>>
 Foam::InflowBoundaryModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::InflowBoundaryModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<InflowBoundaryModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<InflowBoundaryModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index e37f16902f..58e0f77db1 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ public:
 
 
     //- Selector
-    static autoPtr<WallInteractionModel<CloudType> > New
+    static autoPtr<WallInteractionModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -157,7 +157,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
                                                                               \
     WallInteractionModel<CloudType>::                                         \
-        adddictionaryConstructorToTable<SS<CloudType> >                       \
+        adddictionaryConstructorToTable<SS<CloudType>>                       \
             add##SS##CloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
index 179bdc6d59..1652caac6c 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::WallInteractionModel<CloudType> >
+Foam::autoPtr<Foam::WallInteractionModel<CloudType>>
 Foam::WallInteractionModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::WallInteractionModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<WallInteractionModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<WallInteractionModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index c42136c92d..9b959cfafa 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -222,14 +222,14 @@ void Foam::Cloud<ParticleType>::move(TrackData& td, const scalar trackTime)
 
     // List of lists of particles to be transfered for all of the
     // neighbour processors
-    List<IDLList<ParticleType> > particleTransferLists
+    List<IDLList<ParticleType>> particleTransferLists
     (
         neighbourProcs.size()
     );
 
     // List of destination processorPatches indices for all of the
     // neighbour processors
-    List<DynamicList<label> > patchIndexTransferLists
+    List<DynamicList<label>> patchIndexTransferLists
     (
         neighbourProcs.size()
     );
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 8a297d9414..2580d779a8 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ void Foam::Cloud<ParticleType>::initCloud(const bool checkClass)
 {
     readCloudUniformProperties();
 
-    IOPosition<Cloud<ParticleType> > ioP(*this);
+    IOPosition<Cloud<ParticleType>> ioP(*this);
 
     if (ioP.headerOk())
     {
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index ec2967ee44..4551a403f5 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -287,7 +287,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
     rilInverse_.setSize(mesh_.nCells());
 
     // Temporary Dynamic lists for accumulation
-    List<DynamicList<label> > rilInverseTemp(rilInverse_.size());
+    List<DynamicList<label>> rilInverseTemp(rilInverse_.size());
 
     // Loop over all referred cells
     forAll(ril_, refCellI)
@@ -504,7 +504,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
     rwfilInverse_.setSize(mesh_.nCells());
 
     // Temporary Dynamic lists for accumulation
-    List<DynamicList<label> > rwfilInverseTemp(rwfilInverse_.size());
+    List<DynamicList<label>> rwfilInverseTemp(rwfilInverse_.size());
 
     // Loop over all referred wall faces
     forAll(rwfil_, refWallFaceI)
@@ -914,7 +914,7 @@ void Foam::InteractionLists<ParticleType>::buildMap
 template<class ParticleType>
 void Foam::InteractionLists<ParticleType>::prepareParticlesToRefer
 (
-    const List<DynamicList<ParticleType*> >& cellOccupancy
+    const List<DynamicList<ParticleType*>>& cellOccupancy
 )
 {
     const globalIndexAndTransform& globalTransforms =
@@ -1159,7 +1159,7 @@ Foam::InteractionLists<ParticleType>::~InteractionLists()
 template<class ParticleType>
 void Foam::InteractionLists<ParticleType>::sendReferredData
 (
-    const List<DynamicList<ParticleType*> >& cellOccupancy,
+    const List<DynamicList<ParticleType*>>& cellOccupancy,
     PstreamBuffers& pBufs
 )
 {
@@ -1184,7 +1184,7 @@ void Foam::InteractionLists<ParticleType>::sendReferredData
         {
             UOPstream toDomain(domain, pBufs);
 
-            UIndirectList<IDLList<ParticleType> > subMappedParticles
+            UIndirectList<IDLList<ParticleType>> subMappedParticles
             (
                 referredParticles_,
                 subMap
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.H b/src/lagrangian/basic/InteractionLists/InteractionLists.H
index bcbac057a2..95af9ec409 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.H
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ Description
     Requiring data:
 
     \verbatim
-    List<DynamicList<typename CloudType::parcelType*> > cellOccupancy_;
+    List<DynamicList<typename CloudType::parcelType*>> cellOccupancy_;
     \endverbatim
 
 SourceFiles
@@ -146,7 +146,7 @@ class InteractionLists
         List<vector> referredWallData_;
 
         //- Referred particle container
-        List<IDLList<ParticleType> > referredParticles_;
+        List<IDLList<ParticleType>> referredParticles_;
 
 
     // Private Member Functions
@@ -178,7 +178,7 @@ class InteractionLists
         //  will be referred
         void prepareParticlesToRefer
         (
-            const List<DynamicList<ParticleType*> >& cellOccupancy
+            const List<DynamicList<ParticleType*>>& cellOccupancy
         );
 
         //- Prepare particle to be referred
@@ -233,7 +233,7 @@ public:
         //  nonBlocking communication
         void sendReferredData
         (
-            const List<DynamicList<ParticleType*> >& cellOccupancy,
+            const List<DynamicList<ParticleType*>>& cellOccupancy,
             PstreamBuffers& pBufs
         );
 
@@ -293,11 +293,11 @@ public:
             inline const List<vector>& referredWallData() const;
 
             //- Return access to the referred particle container
-            inline const List<IDLList<ParticleType> >&
+            inline const List<IDLList<ParticleType>>&
             referredParticles() const;
 
             //- Return non-const access to the referred particle container
-            inline List<IDLList<ParticleType> >& referredParticles();
+            inline List<IDLList<ParticleType>>& referredParticles();
 };
 
 
diff --git a/src/lagrangian/basic/InteractionLists/InteractionListsI.H b/src/lagrangian/basic/InteractionLists/InteractionListsI.H
index 6eaa438587..979367cd37 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionListsI.H
+++ b/src/lagrangian/basic/InteractionLists/InteractionListsI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ Foam::InteractionLists<ParticleType>::referredWallData() const
 
 
 template<class ParticleType>
-const Foam::List<Foam::IDLList<ParticleType> >&
+const Foam::List<Foam::IDLList<ParticleType>>&
 Foam::InteractionLists<ParticleType>::referredParticles() const
 {
     return referredParticles_;
@@ -144,7 +144,7 @@ Foam::InteractionLists<ParticleType>::referredParticles() const
 
 
 template<class ParticleType>
-Foam::List<Foam::IDLList<ParticleType> >&
+Foam::List<Foam::IDLList<ParticleType>>&
 Foam::InteractionLists<ParticleType>::referredParticles()
 {
     return referredParticles_;
diff --git a/src/lagrangian/coalCombustion/coalCloudList/coalCloudList.H b/src/lagrangian/coalCombustion/coalCloudList/coalCloudList.H
index 1a023e27ba..20658beffb 100644
--- a/src/lagrangian/coalCombustion/coalCloudList/coalCloudList.H
+++ b/src/lagrangian/coalCombustion/coalCloudList/coalCloudList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,13 +73,13 @@ public:
         // Source terms
 
             //- Return const reference to momentum source
-            inline tmp<DimensionedField<vector, volMesh> > UTrans() const;
+            inline tmp<DimensionedField<vector, volMesh>> UTrans() const;
 
             //- Return tmp momentum source term
             inline tmp<fvVectorMatrix> SU(volVectorField& U) const;
 
             //- Sensible enthalpy transfer [J/kg]
-            inline tmp<DimensionedField<scalar, volMesh> > hsTrans() const;
+            inline tmp<DimensionedField<scalar, volMesh>> hsTrans() const;
 
             //- Return sensible enthalpy source term [J/kg/m3/s]
             inline tmp<fvScalarMatrix> Sh(volScalarField& hs) const;
@@ -93,15 +93,15 @@ public:
             ) const;
 
             //- Return total mass transfer [kg/m3]
-            inline tmp<DimensionedField<scalar, volMesh> > rhoTrans() const;
+            inline tmp<DimensionedField<scalar, volMesh>> rhoTrans() const;
 
             //- Return tmp total mass source for carrier phase
             //  - fully explicit
-            inline tmp<DimensionedField<scalar, volMesh> > Srho() const;
+            inline tmp<DimensionedField<scalar, volMesh>> Srho() const;
 
             //- Return tmp total mass source for carrier phase specie i
             //  - fully explicit
-            inline tmp<DimensionedField<scalar, volMesh> > Srho
+            inline tmp<DimensionedField<scalar, volMesh>> Srho
             (
                 const label i
             ) const;
diff --git a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
index 005d9ef604..16152ff9dc 100644
--- a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
+++ b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,10 +27,10 @@ License
 #include "volFields.H"
 #include "DimensionedField.H"
 
-Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
 Foam::coalCloudList::UTrans() const
 {
-    tmp<DimensionedField<vector, volMesh> > tfld
+    tmp<DimensionedField<vector, volMesh>> tfld
     (
         new DimensionedField<vector, volMesh>
         (
@@ -75,10 +75,10 @@ Foam::tmp<Foam::fvVectorMatrix> Foam::coalCloudList::SU
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::coalCloudList::hsTrans() const
 {
-    tmp<DimensionedField<scalar, volMesh> > tfld
+    tmp<DimensionedField<scalar, volMesh>> tfld
     (
         new DimensionedField<scalar, volMesh>
         (
@@ -141,10 +141,10 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::coalCloudList::SYi
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::coalCloudList::rhoTrans() const
 {
-    tmp<DimensionedField<scalar, volMesh> > tfld
+    tmp<DimensionedField<scalar, volMesh>> tfld
     (
         new DimensionedField<scalar, volMesh>
         (
@@ -177,10 +177,10 @@ Foam::coalCloudList::rhoTrans() const
 
 
 
-Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::coalCloudList::Srho() const
 {
-    tmp<DimensionedField<scalar, volMesh> > tfld
+    tmp<DimensionedField<scalar, volMesh>> tfld
     (
         new DimensionedField<scalar, volMesh>
         (
@@ -208,13 +208,13 @@ Foam::coalCloudList::Srho() const
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::coalCloudList::Srho
 (
     const label i
 ) const
 {
-    tmp<DimensionedField<scalar, volMesh> > tfld
+    tmp<DimensionedField<scalar, volMesh>> tfld
     (
         new DimensionedField<scalar, volMesh>
         (
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
index 26a741062c..ea95e7a9fe 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,9 +115,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<SurfaceReactionModel<CloudType> > clone() const
+        virtual autoPtr<SurfaceReactionModel<CloudType>> clone() const
         {
-            return autoPtr<SurfaceReactionModel<CloudType> >
+            return autoPtr<SurfaceReactionModel<CloudType>>
             (
                 new COxidationDiffusionLimitedRate<CloudType>(*this)
             );
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.H
index 08e20f74c8..c5022db82a 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,9 +128,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<SurfaceReactionModel<CloudType> > clone() const
+        virtual autoPtr<SurfaceReactionModel<CloudType>> clone() const
         {
-            return autoPtr<SurfaceReactionModel<CloudType> >
+            return autoPtr<SurfaceReactionModel<CloudType>>
             (
                 new COxidationHurtMitchell<CloudType>(*this)
             );
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.H
index ead8d85d26..7b7ba48292 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,9 +133,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<SurfaceReactionModel<CloudType> > clone() const
+        virtual autoPtr<SurfaceReactionModel<CloudType>> clone() const
         {
-            return autoPtr<SurfaceReactionModel<CloudType> >
+            return autoPtr<SurfaceReactionModel<CloudType>>
             (
                 new COxidationIntrinsicRate<CloudType>(*this)
             );
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
index a57c847799..d565d76902 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,9 +120,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<SurfaceReactionModel<CloudType> > clone() const
+        virtual autoPtr<SurfaceReactionModel<CloudType>> clone() const
         {
-            return autoPtr<SurfaceReactionModel<CloudType> >
+            return autoPtr<SurfaceReactionModel<CloudType>>
             (
                 new COxidationKineticDiffusionLimitedRate<CloudType>(*this)
             );
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
index 95dd8b2bce..29558edfc3 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,9 +141,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<SurfaceReactionModel<CloudType> > clone() const
+        virtual autoPtr<SurfaceReactionModel<CloudType>> clone() const
         {
-            return autoPtr<SurfaceReactionModel<CloudType> >
+            return autoPtr<SurfaceReactionModel<CloudType>>
             (
                 new COxidationMurphyShaddix<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
index 89acd80133..e7810d4619 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,9 +63,9 @@ public:
         Analytical(const Analytical& is);
 
         //- Construct and return clone
-        virtual autoPtr<IntegrationScheme<Type> > clone() const
+        virtual autoPtr<IntegrationScheme<Type>> clone() const
         {
-            return autoPtr<IntegrationScheme<Type> >
+            return autoPtr<IntegrationScheme<Type>>
             (
                 new Analytical<Type>(*this)
             );
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
index 0f15aef896..6a0b7ea26c 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,9 +63,9 @@ public:
         Euler(const Euler& is);
 
         //- Construct and return clone
-        virtual autoPtr<IntegrationScheme<Type> > clone() const
+        virtual autoPtr<IntegrationScheme<Type>> clone() const
         {
-            return autoPtr<IntegrationScheme<Type> >(new Euler<Type>(*this));
+            return autoPtr<IntegrationScheme<Type>>(new Euler<Type>(*this));
         }
 
 
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
index 836371dcdd..4684f908cb 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,7 +154,7 @@ public:
         IntegrationScheme(const IntegrationScheme& is);
 
         //- Construct and return clone
-        virtual autoPtr<IntegrationScheme<Type> > clone() const = 0;
+        virtual autoPtr<IntegrationScheme<Type>> clone() const = 0;
 
 
     // Selectors
@@ -205,7 +205,7 @@ public:
                                                                               \
     defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                         \
                                                                               \
-    IntegrationScheme<Type>::adddictionaryConstructorToTable<SS<Type> >       \
+    IntegrationScheme<Type>::adddictionaryConstructorToTable<SS<Type>>       \
         add##SS##Type##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
index 1e8f951741..b85a24c61b 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr<Foam::IntegrationScheme<Type> >
+Foam::autoPtr<Foam::IntegrationScheme<Type>>
 Foam::IntegrationScheme<Type>::New
 (
     const word& phiName,
@@ -54,7 +54,7 @@ Foam::IntegrationScheme<Type>::New
             << exit(FatalError);
     }
 
-    return autoPtr<IntegrationScheme<Type> >(cstrIter()(phiName, dict));
+    return autoPtr<IntegrationScheme<Type>>(cstrIter()(phiName, dict));
 }
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
index f89ee163cf..58662a716c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ void Foam::CollidingCloud<CloudType>::setModels()
 {
     collisionModel_.reset
     (
-        CollisionModel<CollidingCloud<CloudType> >::New
+        CollisionModel<CollidingCloud<CloudType>>::New
         (
             this->subModelProperties(),
             *this
@@ -182,7 +182,7 @@ void Foam::CollidingCloud<CloudType>::evolve()
     if (this->solution().canEvolve())
     {
         typename parcelType::template
-            TrackingData<CollidingCloud<CloudType> > td(*this);
+            TrackingData<CollidingCloud<CloudType>> td(*this);
 
         this->solve(td);
     }
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
index ceac587e93..d679ec5a18 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ private:
     // Private data
 
         //- Cloud copy pointer
-        autoPtr<CollidingCloud<CloudType> > cloudCopyPtr_;
+        autoPtr<CollidingCloud<CloudType>> cloudCopyPtr_;
 
 
     // Private Member Functions
@@ -104,7 +104,7 @@ protected:
         // References to the cloud sub-models
 
             //- Collision model
-            autoPtr<CollisionModel<CollidingCloud<CloudType> > >
+            autoPtr<CollisionModel<CollidingCloud<CloudType>>>
                 collisionModel_;
 
 
@@ -155,18 +155,18 @@ public:
         );
 
         //- Construct and return clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
+        virtual autoPtr<Cloud<parcelType>> clone(const word& name)
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new CollidingCloud(*this, name)
             );
         }
 
         //- Construct and return bare clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
+        virtual autoPtr<Cloud<parcelType>> cloneBare(const word& name) const
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new CollidingCloud(this->mesh(), name, *this)
             );
@@ -199,11 +199,11 @@ public:
             // Sub-models
 
                 //- Return const access to the collision model
-                inline const CollisionModel<CollidingCloud<CloudType> >&
+                inline const CollisionModel<CollidingCloud<CloudType>>&
                     collision() const;
 
                 //- Return reference to the collision model
-                inline CollisionModel<CollidingCloud<CloudType> >&
+                inline CollisionModel<CollidingCloud<CloudType>>&
                     collision();
 
         // Check
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H
index f22610f967..cb4ec402a1 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ Foam::CollidingCloud<CloudType>::constProps() const
 
 
 template<class CloudType>
-inline const Foam::CollisionModel<Foam::CollidingCloud<CloudType> >&
+inline const Foam::CollisionModel<Foam::CollidingCloud<CloudType>>&
 Foam::CollidingCloud<CloudType>::collision() const
 {
     return collisionModel_();
@@ -50,7 +50,7 @@ Foam::CollidingCloud<CloudType>::collision() const
 
 
 template<class CloudType>
-inline Foam::CollisionModel<Foam::CollidingCloud<CloudType> >&
+inline Foam::CollisionModel<Foam::CollidingCloud<CloudType>>&
 Foam::CollidingCloud<CloudType>::collision()
 {
     return collisionModel_();
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 42cced7658..c4f6899966 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ void Foam::KinematicCloud<CloudType>::setModels()
 {
     dispersionModel_.reset
     (
-        DispersionModel<KinematicCloud<CloudType> >::New
+        DispersionModel<KinematicCloud<CloudType>>::New
         (
             subModelProperties_,
             *this
@@ -50,7 +50,7 @@ void Foam::KinematicCloud<CloudType>::setModels()
 
     patchInteractionModel_.reset
     (
-        PatchInteractionModel<KinematicCloud<CloudType> >::New
+        PatchInteractionModel<KinematicCloud<CloudType>>::New
         (
             subModelProperties_,
             *this
@@ -59,7 +59,7 @@ void Foam::KinematicCloud<CloudType>::setModels()
 
     stochasticCollisionModel_.reset
     (
-        StochasticCollisionModel<KinematicCloud<CloudType> >::New
+        StochasticCollisionModel<KinematicCloud<CloudType>>::New
         (
             subModelProperties_,
             *this
@@ -68,7 +68,7 @@ void Foam::KinematicCloud<CloudType>::setModels()
 
     surfaceFilmModel_.reset
     (
-        SurfaceFilmModel<KinematicCloud<CloudType> >::New
+        SurfaceFilmModel<KinematicCloud<CloudType>>::New
         (
             subModelProperties_,
             *this
@@ -133,7 +133,7 @@ void Foam::KinematicCloud<CloudType>::buildCellOccupancy()
     {
         cellOccupancyPtr_.reset
         (
-            new List<DynamicList<parcelType*> >(mesh_.nCells())
+            new List<DynamicList<parcelType*>>(mesh_.nCells())
         );
     }
     else if (cellOccupancyPtr_().size() != mesh_.nCells())
@@ -144,7 +144,7 @@ void Foam::KinematicCloud<CloudType>::buildCellOccupancy()
         cellOccupancyPtr_().setSize(mesh_.nCells());
     }
 
-    List<DynamicList<parcelType*> >& cellOccupancy = cellOccupancyPtr_();
+    List<DynamicList<parcelType*>>& cellOccupancy = cellOccupancyPtr_();
 
     forAll(cellOccupancy, cO)
     {
@@ -678,7 +678,7 @@ void Foam::KinematicCloud<CloudType>::evolve()
     if (solution_.canEvolve())
     {
         typename parcelType::template
-            TrackingData<KinematicCloud<CloudType> > td(*this);
+            TrackingData<KinematicCloud<CloudType>> td(*this);
 
         solve(td);
     }
@@ -854,7 +854,7 @@ void Foam::KinematicCloud<CloudType>::updateMesh()
 template<class CloudType>
 void Foam::KinematicCloud<CloudType>::autoMap(const mapPolyMesh& mapper)
 {
-    typedef typename particle::TrackingData<KinematicCloud<CloudType> > tdType;
+    typedef typename particle::TrackingData<KinematicCloud<CloudType>> tdType;
 
     tdType td(*this);
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 9c2a75157b..b25942b5e1 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,10 +113,10 @@ public:
         typedef KinematicCloud<CloudType> kinematicCloudType;
 
         //- Force models type
-        typedef ParticleForceList<KinematicCloud<CloudType> > forceType;
+        typedef ParticleForceList<KinematicCloud<CloudType>> forceType;
 
         //- Function object type
-        typedef CloudFunctionObjectList<KinematicCloud<CloudType> >
+        typedef CloudFunctionObjectList<KinematicCloud<CloudType>>
             functionType;
 
 
@@ -125,7 +125,7 @@ private:
     // Private data
 
         //- Cloud copy pointer
-        autoPtr<KinematicCloud<CloudType> > cloudCopyPtr_;
+        autoPtr<KinematicCloud<CloudType>> cloudCopyPtr_;
 
 
     // Private Member Functions
@@ -163,7 +163,7 @@ protected:
         cachedRandom rndGen_;
 
         //- Cell occupancy information for each parcel, (demand driven)
-        autoPtr<List<DynamicList<parcelType*> > > cellOccupancyPtr_;
+        autoPtr<List<DynamicList<parcelType*>>> cellOccupancyPtr_;
 
         //- Cell length scale
         scalarField cellLengthScale_;
@@ -200,22 +200,22 @@ protected:
         // References to the cloud sub-models
 
             //- Injector models
-            InjectionModelList<KinematicCloud<CloudType> > injectors_;
+            InjectionModelList<KinematicCloud<CloudType>> injectors_;
 
             //- Dispersion model
-            autoPtr<DispersionModel<KinematicCloud<CloudType> > >
+            autoPtr<DispersionModel<KinematicCloud<CloudType>>>
                 dispersionModel_;
 
             //- Patch interaction model
-            autoPtr<PatchInteractionModel<KinematicCloud<CloudType> > >
+            autoPtr<PatchInteractionModel<KinematicCloud<CloudType>>>
                 patchInteractionModel_;
 
             //- Stochastic collision model
-            autoPtr<StochasticCollisionModel<KinematicCloud<CloudType> > >
+            autoPtr<StochasticCollisionModel<KinematicCloud<CloudType>>>
                 stochasticCollisionModel_;
 
             //- Surface film model
-            autoPtr<SurfaceFilmModel<KinematicCloud<CloudType> > >
+            autoPtr<SurfaceFilmModel<KinematicCloud<CloudType>>>
                 surfaceFilmModel_;
 
 
@@ -228,10 +228,10 @@ protected:
         // Sources
 
             //- Momentum
-            autoPtr<DimensionedField<vector, volMesh> > UTrans_;
+            autoPtr<DimensionedField<vector, volMesh>> UTrans_;
 
             //- Coefficient for carrier phase U equation
-            autoPtr<DimensionedField<scalar, volMesh> > UCoeff_;
+            autoPtr<DimensionedField<scalar, volMesh>> UCoeff_;
 
 
         // Initialisation
@@ -295,18 +295,18 @@ public:
         );
 
         //- Construct and return clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
+        virtual autoPtr<Cloud<parcelType>> clone(const word& name)
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new KinematicCloud(*this, name)
             );
         }
 
         //- Construct and return bare clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
+        virtual autoPtr<Cloud<parcelType>> cloneBare(const word& name) const
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new KinematicCloud(this->mesh(), name, *this)
             );
@@ -369,7 +369,7 @@ public:
                 //  parcel, non-const access, the caller is
                 //  responsible for updating it for its own purposes
                 //  if particles are removed or created.
-                inline List<DynamicList<parcelType*> >& cellOccupancy();
+                inline List<DynamicList<parcelType*>>& cellOccupancy();
 
                 //- Return the cell length scale
                 inline const scalarField& cellLengthScale() const;
@@ -413,44 +413,44 @@ public:
             // Sub-models
 
                 //- Return const access to the injection model
-                inline const InjectionModelList<KinematicCloud<CloudType> >&
+                inline const InjectionModelList<KinematicCloud<CloudType>>&
                     injectors() const;
 
                 //- Return reference to the injection model
-                inline InjectionModelList<KinematicCloud<CloudType> >&
+                inline InjectionModelList<KinematicCloud<CloudType>>&
                     injectors();
 
                 //- Return const-access to the dispersion model
-                inline const DispersionModel<KinematicCloud<CloudType> >&
+                inline const DispersionModel<KinematicCloud<CloudType>>&
                     dispersion() const;
 
                 //- Return reference to the dispersion model
-                inline DispersionModel<KinematicCloud<CloudType> >&
+                inline DispersionModel<KinematicCloud<CloudType>>&
                     dispersion();
 
                 //- Return const-access to the patch interaction model
-                inline const PatchInteractionModel<KinematicCloud<CloudType> >&
+                inline const PatchInteractionModel<KinematicCloud<CloudType>>&
                     patchInteraction() const;
 
                 //- Return reference to the patch interaction model
-                inline PatchInteractionModel<KinematicCloud<CloudType> >&
+                inline PatchInteractionModel<KinematicCloud<CloudType>>&
                     patchInteraction();
 
                 //- Return const-access to the stochastic collision model
                 inline const
-                    StochasticCollisionModel<KinematicCloud<CloudType> >&
+                    StochasticCollisionModel<KinematicCloud<CloudType>>&
                     stochasticCollision() const;
 
                 //- Return reference to the stochastic collision model
-                inline StochasticCollisionModel<KinematicCloud<CloudType> >&
+                inline StochasticCollisionModel<KinematicCloud<CloudType>>&
                     stochasticCollision();
 
                 //- Return const-access to the surface film model
-                inline const SurfaceFilmModel<KinematicCloud<CloudType> >&
+                inline const SurfaceFilmModel<KinematicCloud<CloudType>>&
                     surfaceFilm() const;
 
                 //- Return reference to the surface film model
-                inline SurfaceFilmModel<KinematicCloud<CloudType> >&
+                inline SurfaceFilmModel<KinematicCloud<CloudType>>&
                     surfaceFilm();
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 626d207070..f386091e27 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -173,7 +173,7 @@ Foam::KinematicCloud<CloudType>::functions()
 
 
 template<class CloudType>
-inline const Foam::InjectionModelList<Foam::KinematicCloud<CloudType> >&
+inline const Foam::InjectionModelList<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::injectors() const
 {
     return injectors_;
@@ -181,7 +181,7 @@ Foam::KinematicCloud<CloudType>::injectors() const
 
 
 template<class CloudType>
-inline Foam::InjectionModelList<Foam::KinematicCloud<CloudType> >&
+inline Foam::InjectionModelList<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::injectors()
 {
     return injectors_;
@@ -189,7 +189,7 @@ Foam::KinematicCloud<CloudType>::injectors()
 
 
 template<class CloudType>
-inline const Foam::DispersionModel<Foam::KinematicCloud<CloudType> >&
+inline const Foam::DispersionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::dispersion() const
 {
     return dispersionModel_;
@@ -197,7 +197,7 @@ Foam::KinematicCloud<CloudType>::dispersion() const
 
 
 template<class CloudType>
-inline Foam::DispersionModel<Foam::KinematicCloud<CloudType> >&
+inline Foam::DispersionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::dispersion()
 {
     return dispersionModel_();
@@ -205,7 +205,7 @@ Foam::KinematicCloud<CloudType>::dispersion()
 
 
 template<class CloudType>
-inline const Foam::PatchInteractionModel<Foam::KinematicCloud<CloudType> >&
+inline const Foam::PatchInteractionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::patchInteraction() const
 {
     return patchInteractionModel_;
@@ -213,7 +213,7 @@ Foam::KinematicCloud<CloudType>::patchInteraction() const
 
 
 template<class CloudType>
-inline Foam::PatchInteractionModel<Foam::KinematicCloud<CloudType> >&
+inline Foam::PatchInteractionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::patchInteraction()
 {
     return patchInteractionModel_();
@@ -221,7 +221,7 @@ Foam::KinematicCloud<CloudType>::patchInteraction()
 
 
 template<class CloudType>
-inline const Foam::StochasticCollisionModel<Foam::KinematicCloud<CloudType> >&
+inline const Foam::StochasticCollisionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::stochasticCollision() const
 {
     return stochasticCollisionModel_();
@@ -229,7 +229,7 @@ Foam::KinematicCloud<CloudType>::stochasticCollision() const
 
 
 template<class CloudType>
-inline Foam::StochasticCollisionModel<Foam::KinematicCloud<CloudType> >&
+inline Foam::StochasticCollisionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::stochasticCollision()
 {
     return stochasticCollisionModel_();
@@ -237,7 +237,7 @@ Foam::KinematicCloud<CloudType>::stochasticCollision()
 
 
 template<class CloudType>
-inline const Foam::SurfaceFilmModel<Foam::KinematicCloud<CloudType> >&
+inline const Foam::SurfaceFilmModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::surfaceFilm() const
 {
     return surfaceFilmModel_();
@@ -245,7 +245,7 @@ Foam::KinematicCloud<CloudType>::surfaceFilm() const
 
 
 template<class CloudType>
-inline Foam::SurfaceFilmModel<Foam::KinematicCloud<CloudType> >&
+inline Foam::SurfaceFilmModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::surfaceFilm()
 {
     return surfaceFilmModel_();
@@ -380,8 +380,8 @@ inline Foam::scalar Foam::KinematicCloud<CloudType>::penetration
     }
 
     // lists of parcels mass and distance from initial injection point
-    List<List<scalar> > procMass(Pstream::nProcs());
-    List<List<scalar> > procDist(Pstream::nProcs());
+    List<List<scalar>> procMass(Pstream::nProcs());
+    List<List<scalar>> procDist(Pstream::nProcs());
 
     List<scalar>& mass = procMass[Pstream::myProcNo()];
     List<scalar>& dist = procDist[Pstream::myProcNo()];
@@ -499,7 +499,7 @@ inline Foam::cachedRandom& Foam::KinematicCloud<CloudType>::rndGen()
 
 
 template<class CloudType>
-inline Foam::List<Foam::DynamicList<typename CloudType::particleType*> >&
+inline Foam::List<Foam::DynamicList<typename CloudType::particleType*>>&
 Foam::KinematicCloud<CloudType>::cellOccupancy()
 {
     if (cellOccupancyPtr_.empty())
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
index e155abc375..e8afe4f337 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ class cloudSolution
             Switch resetSourcesOnStartup_;
 
             //- List schemes, e.g. U semiImplicit 1
-            List<Tuple2<word, Tuple2<bool, scalar> > > schemes_;
+            List<Tuple2<word, Tuple2<bool, scalar>>> schemes_;
 
 
     // Private Member Functions
diff --git a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C
index db56ae68fc..f861c8601e 100644
--- a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ void Foam::MPPICCloud<CloudType>::setModels()
 {
     packingModel_.reset
     (
-        PackingModel<MPPICCloud<CloudType> >::New
+        PackingModel<MPPICCloud<CloudType>>::New
         (
             this->subModelProperties(),
             *this
@@ -45,7 +45,7 @@ void Foam::MPPICCloud<CloudType>::setModels()
     );
     dampingModel_.reset
     (
-        DampingModel<MPPICCloud<CloudType> >::New
+        DampingModel<MPPICCloud<CloudType>>::New
         (
             this->subModelProperties(),
             *this
@@ -53,7 +53,7 @@ void Foam::MPPICCloud<CloudType>::setModels()
     );
     isotropyModel_.reset
     (
-        IsotropyModel<MPPICCloud<CloudType> >::New
+        IsotropyModel<MPPICCloud<CloudType>>::New
         (
             this->subModelProperties(),
             *this
@@ -164,7 +164,7 @@ void Foam::MPPICCloud<CloudType>::evolve()
     if (this->solution().canEvolve())
     {
         typename parcelType::template
-            TrackingData<MPPICCloud<CloudType> > td(*this);
+            TrackingData<MPPICCloud<CloudType>> td(*this);
 
         this->solve(td);
     }
diff --git a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H
index 8583f6b739..edc84a1f68 100644
--- a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ private:
     // Private data
 
         //- Cloud copy pointer
-        autoPtr<MPPICCloud<CloudType> > cloudCopyPtr_;
+        autoPtr<MPPICCloud<CloudType>> cloudCopyPtr_;
 
 
     // Private Member Functions
@@ -106,14 +106,14 @@ protected:
         // References to the cloud sub-models
 
             //- Packing model
-            autoPtr<PackingModel<MPPICCloud<CloudType> > > packingModel_;
+            autoPtr<PackingModel<MPPICCloud<CloudType>>> packingModel_;
 
             //- Damping model
-            autoPtr<DampingModel<MPPICCloud<CloudType> > >
+            autoPtr<DampingModel<MPPICCloud<CloudType>>>
                 dampingModel_;
 
             //- Exchange model
-            autoPtr<IsotropyModel<MPPICCloud<CloudType> > >
+            autoPtr<IsotropyModel<MPPICCloud<CloudType>>>
                 isotropyModel_;
 
 
@@ -154,18 +154,18 @@ public:
         );
 
         //- Construct and return clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
+        virtual autoPtr<Cloud<parcelType>> clone(const word& name)
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new MPPICCloud(*this, name)
             );
         }
 
         //- Construct and return bare clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
+        virtual autoPtr<Cloud<parcelType>> cloneBare(const word& name) const
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new MPPICCloud(this->mesh(), name, *this)
             );
@@ -184,25 +184,25 @@ public:
             inline const MPPICCloud& cloudCopy() const;
 
             //- Return const access to the packing model
-            inline const PackingModel<MPPICCloud<CloudType> >&
+            inline const PackingModel<MPPICCloud<CloudType>>&
                 packingModel() const;
 
             //- Return a reference to the packing model
-            inline PackingModel<MPPICCloud<CloudType> >& packingModel();
+            inline PackingModel<MPPICCloud<CloudType>>& packingModel();
 
             //- Return condt access to the damping model
-            inline const DampingModel<MPPICCloud<CloudType> >&
+            inline const DampingModel<MPPICCloud<CloudType>>&
                 dampingModel() const;
 
             //- Return a reference to the damping model
-            inline DampingModel<MPPICCloud<CloudType> >& dampingModel();
+            inline DampingModel<MPPICCloud<CloudType>>& dampingModel();
 
             //- Return condt access to the isotropy model
-            inline const IsotropyModel<MPPICCloud<CloudType> >&
+            inline const IsotropyModel<MPPICCloud<CloudType>>&
                 isotropyModel() const;
 
             //- Return a reference to the isotropy model
-            inline IsotropyModel<MPPICCloud<CloudType> >& isotropyModel();
+            inline IsotropyModel<MPPICCloud<CloudType>>& isotropyModel();
 
 
         // Cloud evolution functions
diff --git a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloudI.H b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloudI.H
index 5211f87002..7d8dee80b9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Foam::MPPICCloud<CloudType>::cloudCopy() const
 
 
 template<class CloudType>
-inline const Foam::PackingModel<Foam::MPPICCloud<CloudType> >&
+inline const Foam::PackingModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::packingModel() const
 {
     return packingModel_();
@@ -42,7 +42,7 @@ Foam::MPPICCloud<CloudType>::packingModel() const
 
 
 template<class CloudType>
-inline Foam::PackingModel<Foam::MPPICCloud<CloudType> >&
+inline Foam::PackingModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::packingModel()
 {
     return packingModel_();
@@ -50,7 +50,7 @@ Foam::MPPICCloud<CloudType>::packingModel()
 
 
 template<class CloudType>
-inline const Foam::DampingModel<Foam::MPPICCloud<CloudType> >&
+inline const Foam::DampingModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::dampingModel() const
 {
     return dampingModel_();
@@ -58,7 +58,7 @@ Foam::MPPICCloud<CloudType>::dampingModel() const
 
 
 template<class CloudType>
-inline Foam::DampingModel<Foam::MPPICCloud<CloudType> >&
+inline Foam::DampingModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::dampingModel()
 {
     return dampingModel_();
@@ -66,7 +66,7 @@ Foam::MPPICCloud<CloudType>::dampingModel()
 
 
 template<class CloudType>
-inline const Foam::IsotropyModel<Foam::MPPICCloud<CloudType> >&
+inline const Foam::IsotropyModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::isotropyModel() const
 {
     return isotropyModel_();
@@ -74,7 +74,7 @@ Foam::MPPICCloud<CloudType>::isotropyModel() const
 
 
 template<class CloudType>
-inline Foam::IsotropyModel<Foam::MPPICCloud<CloudType> >&
+inline Foam::IsotropyModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::isotropyModel()
 {
     return isotropyModel_();
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index fee005bb29..15dfe5f6f3 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ void Foam::ReactingCloud<CloudType>::setModels()
 {
     compositionModel_.reset
     (
-        CompositionModel<ReactingCloud<CloudType> >::New
+        CompositionModel<ReactingCloud<CloudType>>::New
         (
             this->subModelProperties(),
             *this
@@ -44,7 +44,7 @@ void Foam::ReactingCloud<CloudType>::setModels()
 
     phaseChangeModel_.reset
     (
-        PhaseChangeModel<ReactingCloud<CloudType> >::New
+        PhaseChangeModel<ReactingCloud<CloudType>>::New
         (
             this->subModelProperties(),
             *this
@@ -322,7 +322,7 @@ void Foam::ReactingCloud<CloudType>::evolve()
     if (this->solution().canEvolve())
     {
         typename parcelType::template
-            TrackingData<ReactingCloud<CloudType> > td(*this);
+            TrackingData<ReactingCloud<CloudType>> td(*this);
 
         this->solve(td);
     }
@@ -332,7 +332,7 @@ void Foam::ReactingCloud<CloudType>::evolve()
 template<class CloudType>
 void Foam::ReactingCloud<CloudType>::autoMap(const mapPolyMesh& mapper)
 {
-    typedef typename particle::TrackingData<ReactingCloud<CloudType> > tdType;
+    typedef typename particle::TrackingData<ReactingCloud<CloudType>> tdType;
 
     tdType td(*this);
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index ed7d0202cb..af9c5a1a04 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ private:
     // Private data
 
         //- Cloud copy pointer
-        autoPtr<ReactingCloud<CloudType> > cloudCopyPtr_;
+        autoPtr<ReactingCloud<CloudType>> cloudCopyPtr_;
 
 
     // Private member functions
@@ -107,18 +107,18 @@ protected:
         // References to the cloud sub-models
 
             //- Reacting composition model
-            autoPtr<CompositionModel<ReactingCloud<CloudType> > >
+            autoPtr<CompositionModel<ReactingCloud<CloudType>>>
                 compositionModel_;
 
             //- Reacting phase change model
-            autoPtr<PhaseChangeModel<ReactingCloud<CloudType> > >
+            autoPtr<PhaseChangeModel<ReactingCloud<CloudType>>>
                 phaseChangeModel_;
 
 
         // Sources
 
             //- Mass transfer fields - one per carrier phase specie
-            PtrList<DimensionedField<scalar, volMesh> > rhoTrans_;
+            PtrList<DimensionedField<scalar, volMesh>> rhoTrans_;
 
 
     // Protected Member Functions
@@ -173,18 +173,18 @@ public:
         );
 
         //- Construct and return clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
+        virtual autoPtr<Cloud<parcelType>> clone(const word& name)
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new ReactingCloud(*this, name)
             );
         }
 
         //- Construct and return bare clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
+        virtual autoPtr<Cloud<parcelType>> cloneBare(const word& name) const
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new ReactingCloud(this->mesh(), name, *this)
             );
@@ -213,15 +213,15 @@ public:
             // Sub-models
 
                 //- Return const access to reacting composition model
-                inline const CompositionModel<ReactingCloud<CloudType> >&
+                inline const CompositionModel<ReactingCloud<CloudType>>&
                     composition() const;
 
                 //- Return const access to reacting phase change model
-                inline const PhaseChangeModel<ReactingCloud<CloudType> >&
+                inline const PhaseChangeModel<ReactingCloud<CloudType>>&
                     phaseChange() const;
 
                 //- Return reference to reacting phase change model
-                inline PhaseChangeModel<ReactingCloud<CloudType> >&
+                inline PhaseChangeModel<ReactingCloud<CloudType>>&
                     phaseChange();
 
 
@@ -234,11 +234,11 @@ public:
                         rhoTrans(const label i);
 
                     //- Return const access to mass source fields
-                    inline const PtrList<DimensionedField<scalar, volMesh> >&
+                    inline const PtrList<DimensionedField<scalar, volMesh>>&
                         rhoTrans() const;
 
                     //- Return reference to mass source fields
-                    inline PtrList<DimensionedField<scalar, volMesh> >&
+                    inline PtrList<DimensionedField<scalar, volMesh>>&
                         rhoTrans();
 
                     //- Return mass source term for specie i - specie eqn
@@ -249,12 +249,12 @@ public:
                     ) const;
 
                     //- Return tmp mass source for field i - fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh> >
+                    inline tmp<DimensionedField<scalar, volMesh>>
                         Srho(const label i) const;
 
                     //- Return tmp total mass source for carrier phase
                     //  - fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh> > Srho() const;
+                    inline tmp<DimensionedField<scalar, volMesh>> Srho() const;
 
                     //- Return total mass source term [kg/m3/s]
                     inline tmp<fvScalarMatrix> Srho(volScalarField& rho) const;
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 7abbc9f54a..d159381215 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ Foam::ReactingCloud<CloudType>::constProps()
 
 
 template<class CloudType>
-inline const Foam::CompositionModel<Foam::ReactingCloud<CloudType> >&
+inline const Foam::CompositionModel<Foam::ReactingCloud<CloudType>>&
 Foam::ReactingCloud<CloudType>::composition() const
 {
     return compositionModel_;
@@ -58,7 +58,7 @@ Foam::ReactingCloud<CloudType>::composition() const
 
 
 template<class CloudType>
-inline const Foam::PhaseChangeModel<Foam::ReactingCloud<CloudType> >&
+inline const Foam::PhaseChangeModel<Foam::ReactingCloud<CloudType>>&
 Foam::ReactingCloud<CloudType>::phaseChange() const
 {
     return phaseChangeModel_;
@@ -66,7 +66,7 @@ Foam::ReactingCloud<CloudType>::phaseChange() const
 
 
 template<class CloudType>
-inline Foam::PhaseChangeModel<Foam::ReactingCloud<CloudType> >&
+inline Foam::PhaseChangeModel<Foam::ReactingCloud<CloudType>>&
 Foam::ReactingCloud<CloudType>::phaseChange()
 {
     return phaseChangeModel_();
@@ -83,7 +83,7 @@ Foam::ReactingCloud<CloudType>::rhoTrans(const label i)
 
 template<class CloudType>
 inline
-const Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >&
+const Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>&
 Foam::ReactingCloud<CloudType>::rhoTrans() const
 {
     return rhoTrans_;
@@ -91,7 +91,7 @@ Foam::ReactingCloud<CloudType>::rhoTrans() const
 
 
 template<class CloudType>
-inline Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >&
+inline Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>&
 Foam::ReactingCloud<CloudType>::rhoTrans()
 {
     return rhoTrans_;
@@ -154,10 +154,10 @@ inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
 
 
 template<class CloudType>
-inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::ReactingCloud<CloudType>::Srho(const label i) const
 {
-    tmp<DimensionedField<scalar, volMesh> > tRhoi
+    tmp<DimensionedField<scalar, volMesh>> tRhoi
     (
         new DimensionedField<scalar, volMesh>
         (
@@ -191,10 +191,10 @@ Foam::ReactingCloud<CloudType>::Srho(const label i) const
 
 
 template<class CloudType>
-inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::ReactingCloud<CloudType>::Srho() const
 {
-    tmp<DimensionedField<scalar, volMesh> > trhoTrans
+    tmp<DimensionedField<scalar, volMesh>> trhoTrans
     (
         new DimensionedField<scalar, volMesh>
         (
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 963cd985b2..c70e8f04c7 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ void Foam::ReactingMultiphaseCloud<CloudType>::setModels()
 {
     devolatilisationModel_.reset
     (
-        DevolatilisationModel<ReactingMultiphaseCloud<CloudType> >::New
+        DevolatilisationModel<ReactingMultiphaseCloud<CloudType>>::New
         (
             this->subModelProperties(),
             *this
@@ -44,7 +44,7 @@ void Foam::ReactingMultiphaseCloud<CloudType>::setModels()
 
     surfaceReactionModel_.reset
     (
-        SurfaceReactionModel<ReactingMultiphaseCloud<CloudType> >::New
+        SurfaceReactionModel<ReactingMultiphaseCloud<CloudType>>::New
         (
             this->subModelProperties(),
             *this
@@ -245,7 +245,7 @@ void Foam::ReactingMultiphaseCloud<CloudType>::evolve()
     if (this->solution().canEvolve())
     {
         typename parcelType::template
-            TrackingData<ReactingMultiphaseCloud<CloudType> > td(*this);
+            TrackingData<ReactingMultiphaseCloud<CloudType>> td(*this);
 
         this->solve(td);
     }
@@ -258,7 +258,7 @@ void Foam::ReactingMultiphaseCloud<CloudType>::autoMap
     const mapPolyMesh& mapper
 )
 {
-    typedef typename particle::TrackingData<ReactingMultiphaseCloud<CloudType> >
+    typedef typename particle::TrackingData<ReactingMultiphaseCloud<CloudType>>
         tdType;
 
     tdType td(*this);
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index de157da343..25a92b24a3 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ private:
     // Private data
 
         //- Cloud copy pointer
-        autoPtr<ReactingMultiphaseCloud<CloudType> > cloudCopyPtr_;
+        autoPtr<ReactingMultiphaseCloud<CloudType>> cloudCopyPtr_;
 
 
     // Private member functions
@@ -110,14 +110,14 @@ protected:
             //- Devolatilisation model
             autoPtr
             <
-                DevolatilisationModel<ReactingMultiphaseCloud<CloudType> >
+                DevolatilisationModel<ReactingMultiphaseCloud<CloudType>>
             >
             devolatilisationModel_;
 
             //- Surface reaction model
             autoPtr
             <
-                SurfaceReactionModel<ReactingMultiphaseCloud<CloudType> >
+                SurfaceReactionModel<ReactingMultiphaseCloud<CloudType>>
             >
             surfaceReactionModel_;
 
@@ -178,18 +178,18 @@ public:
         );
 
         //- Construct and return clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
+        virtual autoPtr<Cloud<parcelType>> clone(const word& name)
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new ReactingMultiphaseCloud(*this, name)
             );
         }
 
         //- Construct and return bare clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
+        virtual autoPtr<Cloud<parcelType>> cloneBare(const word& name) const
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new ReactingMultiphaseCloud(this->mesh(), name, *this)
             );
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 69666fedde..f2aa3eb699 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
 {
     heatTransferModel_.reset
     (
-        HeatTransferModel<ThermoCloud<CloudType> >::New
+        HeatTransferModel<ThermoCloud<CloudType>>::New
         (
             this->subModelProperties(),
             *this
@@ -472,7 +472,7 @@ void Foam::ThermoCloud<CloudType>::evolve()
     if (this->solution().canEvolve())
     {
         typename parcelType::template
-            TrackingData<ThermoCloud<CloudType> > td(*this);
+            TrackingData<ThermoCloud<CloudType>> td(*this);
 
         this->solve(td);
     }
@@ -482,7 +482,7 @@ void Foam::ThermoCloud<CloudType>::evolve()
 template<class CloudType>
 void Foam::ThermoCloud<CloudType>::autoMap(const mapPolyMesh& mapper)
 {
-    typedef typename particle::TrackingData<ThermoCloud<CloudType> > tdType;
+    typedef typename particle::TrackingData<ThermoCloud<CloudType>> tdType;
 
     tdType td(*this);
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index 4f858d6643..9c211567fb 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ private:
     // Private data
 
         //- Cloud copy pointer
-        autoPtr<ThermoCloud<CloudType> > cloudCopyPtr_;
+        autoPtr<ThermoCloud<CloudType>> cloudCopyPtr_;
 
 
     // Private member functions
@@ -117,7 +117,7 @@ protected:
         // References to the cloud sub-models
 
             //- Heat transfer model
-            autoPtr<HeatTransferModel<ThermoCloud<CloudType> > >
+            autoPtr<HeatTransferModel<ThermoCloud<CloudType>>>
                 heatTransferModel_;
 
 
@@ -133,22 +133,22 @@ protected:
             Switch radiation_;
 
             //- Radiation sum of parcel projected areas
-            autoPtr<DimensionedField<scalar, volMesh> > radAreaP_;
+            autoPtr<DimensionedField<scalar, volMesh>> radAreaP_;
 
             //- Radiation sum of parcel temperature^4
-            autoPtr<DimensionedField<scalar, volMesh> > radT4_;
+            autoPtr<DimensionedField<scalar, volMesh>> radT4_;
 
             //- Radiation sum of parcel projected areas * temperature^4
-            autoPtr<DimensionedField<scalar, volMesh> > radAreaPT4_;
+            autoPtr<DimensionedField<scalar, volMesh>> radAreaPT4_;
 
 
         // Sources
 
             //- Sensible enthalpy transfer [J/kg]
-            autoPtr<DimensionedField<scalar, volMesh> > hsTrans_;
+            autoPtr<DimensionedField<scalar, volMesh>> hsTrans_;
 
             //- Coefficient for carrier phase hs equation [W/K]
-            autoPtr<DimensionedField<scalar, volMesh> > hsCoeff_;
+            autoPtr<DimensionedField<scalar, volMesh>> hsCoeff_;
 
 
     // Protected Member Functions
@@ -192,18 +192,18 @@ public:
         );
 
         //- Construct and return clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
+        virtual autoPtr<Cloud<parcelType>> clone(const word& name)
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new ThermoCloud(*this, name)
             );
         }
 
         //- Construct and return bare clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
+        virtual autoPtr<Cloud<parcelType>> cloneBare(const word& name) const
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new ThermoCloud(this->mesh(), name, *this)
             );
@@ -241,7 +241,7 @@ public:
             // Sub-models
 
                 //- Return reference to heat transfer model
-                inline const HeatTransferModel<ThermoCloud<CloudType> >&
+                inline const HeatTransferModel<ThermoCloud<CloudType>>&
                     heatTransfer() const;
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index ceab06a387..9655ef95f3 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ inline const Foam::volScalarField& Foam::ThermoCloud<CloudType>::p() const
 
 
 template<class CloudType>
-inline const Foam::HeatTransferModel<Foam::ThermoCloud<CloudType> >&
+inline const Foam::HeatTransferModel<Foam::ThermoCloud<CloudType>>&
 Foam::ThermoCloud<CloudType>::heatTransfer() const
 {
     return heatTransferModel_;
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
index 6335b744b0..c42e9401e3 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Description
 
 namespace Foam
 {
-    typedef KinematicCloud<Cloud<basicKinematicParcel> > basicKinematicCloud;
+    typedef KinematicCloud<Cloud<basicKinematicParcel>> basicKinematicCloud;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
index ae98aae256..5bc6051ccc 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -232,9 +232,9 @@ public:
                 mesh_(mesh)
             {}
 
-            autoPtr<CollidingParcel<ParcelType> > operator()(Istream& is) const
+            autoPtr<CollidingParcel<ParcelType>> operator()(Istream& is) const
             {
-                return autoPtr<CollidingParcel<ParcelType> >
+                return autoPtr<CollidingParcel<ParcelType>>
                 (
                     new CollidingParcel<ParcelType>(mesh_, is, true)
                 );
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C
index d72a7fc49e..d8622ad69a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -355,7 +355,7 @@ template<class PairType, class WallType>
 void Foam::CollisionRecordList<PairType, WallType>::update()
 {
     {
-        DynamicList<PairCollisionRecord<PairType> > updatedRecords;
+        DynamicList<PairCollisionRecord<PairType>> updatedRecords;
 
         forAll(pairRecords_, i)
         {
@@ -371,7 +371,7 @@ void Foam::CollisionRecordList<PairType, WallType>::update()
     }
 
     {
-        DynamicList<WallCollisionRecord<WallType> > updatedRecords;
+        DynamicList<WallCollisionRecord<WallType>> updatedRecords;
 
         forAll(wallRecords_, i)
         {
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H
index 57546dfc2e..8a12ac6570 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,10 +80,10 @@ class CollisionRecordList
     // Private data
 
         //- List of active pair collisions
-        DynamicList<PairCollisionRecord<PairType> > pairRecords_;
+        DynamicList<PairCollisionRecord<PairType>> pairRecords_;
 
         //- List of active wall collisions
-        DynamicList<WallCollisionRecord<WallType> > wallRecords_;
+        DynamicList<WallCollisionRecord<WallType>> wallRecords_;
 
 
 public:
@@ -115,11 +115,11 @@ public:
     // Member Functions
 
         //- Return the active pair collisions
-        inline const DynamicList<PairCollisionRecord<PairType> >&
+        inline const DynamicList<PairCollisionRecord<PairType>>&
             pairRecords() const;
 
         //- Return the active wall collisions
-        inline const DynamicList<WallCollisionRecord<WallType> >&
+        inline const DynamicList<WallCollisionRecord<WallType>>&
             wallRecords() const;
 
         // Fields representing the data from each record, i.e if the
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordListI.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordListI.H
index e2dd165a31..43170cf914 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordListI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class PairType, class WallType>
-const Foam::DynamicList<Foam::PairCollisionRecord<PairType> >&
+const Foam::DynamicList<Foam::PairCollisionRecord<PairType>>&
 Foam::CollisionRecordList<PairType, WallType>::pairRecords() const
 {
     return pairRecords_;
@@ -36,7 +36,7 @@ Foam::CollisionRecordList<PairType, WallType>::pairRecords() const
 
 
 template<class PairType, class WallType>
-const Foam::DynamicList<Foam::WallCollisionRecord<WallType> >&
+const Foam::DynamicList<Foam::WallCollisionRecord<WallType>>&
 Foam::CollisionRecordList<PairType, WallType>::wallRecords() const
 {
     return wallRecords_;
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 85d48c5982..864bbb1bbd 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -173,13 +173,13 @@ public:
             // Interpolators for continuous phase fields
 
                 //- Density interpolator
-                autoPtr<interpolation<scalar> > rhoInterp_;
+                autoPtr<interpolation<scalar>> rhoInterp_;
 
                 //- Velocity interpolator
-                autoPtr<interpolation<vector> > UInterp_;
+                autoPtr<interpolation<vector>> UInterp_;
 
                 //- Dynamic viscosity interpolator
-                autoPtr<interpolation<scalar> > muInterp_;
+                autoPtr<interpolation<scalar>> muInterp_;
 
 
             //- Local gravitational or other body-force acceleration
@@ -386,9 +386,9 @@ public:
                 mesh_(mesh)
             {}
 
-            autoPtr<KinematicParcel<ParcelType> > operator()(Istream& is) const
+            autoPtr<KinematicParcel<ParcelType>> operator()(Istream& is) const
             {
-                return autoPtr<KinematicParcel<ParcelType> >
+                return autoPtr<KinematicParcel<ParcelType>>
                 (
                     new KinematicParcel<ParcelType>(mesh_, is, true)
                 );
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H
index b4d6573ea4..38c2ceb4e4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,25 +105,25 @@ public:
             // MPPIC Averages
 
                 //- Volume average
-                autoPtr<AveragingMethod<scalar> > volumeAverage_;
+                autoPtr<AveragingMethod<scalar>> volumeAverage_;
 
                 //- Radius average [ volume^(1/3) ]
-                autoPtr<AveragingMethod<scalar> > radiusAverage_;
+                autoPtr<AveragingMethod<scalar>> radiusAverage_;
 
                 //- Density average
-                autoPtr<AveragingMethod<scalar> > rhoAverage_;
+                autoPtr<AveragingMethod<scalar>> rhoAverage_;
 
                 //- Velocity average
-                autoPtr<AveragingMethod<vector> > uAverage_;
+                autoPtr<AveragingMethod<vector>> uAverage_;
 
                 //- Magnitude velocity sqyuared average
-                autoPtr<AveragingMethod<scalar> > uSqrAverage_;
+                autoPtr<AveragingMethod<scalar>> uSqrAverage_;
 
                 //- Frequency average
-                autoPtr<AveragingMethod<scalar> > frequencyAverage_;
+                autoPtr<AveragingMethod<scalar>> frequencyAverage_;
 
                 //- Mass average
-                autoPtr<AveragingMethod<scalar> > massAverage_;
+                autoPtr<AveragingMethod<scalar>> massAverage_;
 
 
             //- Label specifying the current part of the tracking process
@@ -248,9 +248,9 @@ public:
                 mesh_(mesh)
             {}
 
-            autoPtr<MPPICParcel<ParcelType> > operator()(Istream& is) const
+            autoPtr<MPPICParcel<ParcelType>> operator()(Istream& is) const
             {
-                return autoPtr<MPPICParcel<ParcelType> >
+                return autoPtr<MPPICParcel<ParcelType>>
                 (
                     new MPPICParcel<ParcelType>(mesh_, is, true)
                 );
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
index 4f5edcc47e..dbe94e219a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,7 +156,7 @@ Foam::MPPICParcel<ParcelType>::TrackingData<CloudType>::updateAverages
     massAverage_() = 0;
 
     // temporary weights
-    autoPtr<AveragingMethod<scalar> > weightAveragePtr
+    autoPtr<AveragingMethod<scalar>> weightAveragePtr
     (
         AveragingMethod<scalar>::New
         (
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 4539dc3cb2..b431e36866 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -348,12 +348,12 @@ public:
                 mesh_(mesh)
             {}
 
-            autoPtr<ReactingMultiphaseParcel<ParcelType> > operator()
+            autoPtr<ReactingMultiphaseParcel<ParcelType>> operator()
             (
                 Istream& is
             ) const
             {
-                return autoPtr<ReactingMultiphaseParcel<ParcelType> >
+                return autoPtr<ReactingMultiphaseParcel<ParcelType>>
                 (
                     new ReactingMultiphaseParcel<ParcelType>(mesh_, is, true)
                 );
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index 77dd06b7b8..e219f5ee95 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
     const wordList& stateLabels = compModel.stateLabels();
 
     // Set storage for each Y... for each parcel
-    forAllIter(typename Cloud<ReactingMultiphaseParcel<ParcelType> >, c, iter)
+    forAllIter(typename Cloud<ReactingMultiphaseParcel<ParcelType>>, c, iter)
     {
         ReactingMultiphaseParcel<ParcelType>& p = iter();
         p.YGas_.setSize(gasNames.size(), 0.0);
@@ -148,7 +148,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         label i = 0;
         forAllIter
         (
-            typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+            typename Cloud<ReactingMultiphaseParcel<ParcelType>>,
             c,
             iter
         )
@@ -172,7 +172,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         label i = 0;
         forAllIter
         (
-            typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+            typename Cloud<ReactingMultiphaseParcel<ParcelType>>,
             c,
             iter
         )
@@ -196,7 +196,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         label i = 0;
         forAllIter
         (
-            typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+            typename Cloud<ReactingMultiphaseParcel<ParcelType>>,
             c,
             iter
         )
@@ -250,7 +250,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             label i = 0;
             forAllConstIter
             (
-                typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+                typename Cloud<ReactingMultiphaseParcel<ParcelType>>,
                 c,
                 iter
             )
@@ -279,7 +279,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             label i = 0;
             forAllConstIter
             (
-                typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+                typename Cloud<ReactingMultiphaseParcel<ParcelType>>,
                 c,
                 iter
             )
@@ -308,7 +308,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             label i = 0;
             forAllConstIter
             (
-                typename Cloud<ReactingMultiphaseParcel<ParcelType> >,
+                typename Cloud<ReactingMultiphaseParcel<ParcelType>>,
                 c,
                 iter
             )
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index c077a29bb4..a89bc9c4cf 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ public:
             // Interpolators for continuous phase fields
 
                 //- Interpolator for continuous phase pressure field
-                autoPtr<interpolation<scalar> > pInterp_;
+                autoPtr<interpolation<scalar>> pInterp_;
 
 
     public:
@@ -301,9 +301,9 @@ public:
                 mesh_(mesh)
             {}
 
-            autoPtr<ReactingParcel<ParcelType> > operator()(Istream& is) const
+            autoPtr<ReactingParcel<ParcelType>> operator()(Istream& is) const
             {
-                return autoPtr<ReactingParcel<ParcelType> >
+                return autoPtr<ReactingParcel<ParcelType>>
                 (
                     new ReactingParcel<ParcelType>(mesh_, is, true)
                 );
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index 4a1133accf..f0254656cf 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ void Foam::ReactingParcel<ParcelType>::readFields
     c.checkFieldIOobject(c, mass0);
 
     label i = 0;
-    forAllIter(typename Cloud<ReactingParcel<ParcelType> >, c, iter)
+    forAllIter(typename Cloud<ReactingParcel<ParcelType>>, c, iter)
     {
         ReactingParcel<ParcelType>& p = iter();
         p.mass0_ = mass0[i++];
@@ -133,7 +133,7 @@ void Foam::ReactingParcel<ParcelType>::readFields
 
 
     // Set storage for each Y... for each parcel
-    forAllIter(typename Cloud<ReactingParcel<ParcelType> >, c, iter)
+    forAllIter(typename Cloud<ReactingParcel<ParcelType>>, c, iter)
     {
         ReactingParcel<ParcelType>& p = iter();
         p.Y_.setSize(nPhases, 0.0);
@@ -152,7 +152,7 @@ void Foam::ReactingParcel<ParcelType>::readFields
         );
 
         label i = 0;
-        forAllIter(typename Cloud<ReactingParcel<ParcelType> >, c, iter)
+        forAllIter(typename Cloud<ReactingParcel<ParcelType>>, c, iter)
         {
             ReactingParcel<ParcelType>& p = iter();
             p.Y_[j] = Y[i++];
@@ -186,7 +186,7 @@ void Foam::ReactingParcel<ParcelType>::writeFields
         IOField<scalar> mass0(c.fieldIOobject("mass0", IOobject::NO_READ), np);
 
         label i = 0;
-        forAllConstIter(typename Cloud<ReactingParcel<ParcelType> >, c, iter)
+        forAllConstIter(typename Cloud<ReactingParcel<ParcelType>>, c, iter)
         {
             const ReactingParcel<ParcelType>& p = iter();
             mass0[i++] = p.mass0_;
@@ -215,7 +215,7 @@ void Foam::ReactingParcel<ParcelType>::writeFields
             label i = 0;
             forAllConstIter
             (
-                typename Cloud<ReactingParcel<ParcelType> >,
+                typename Cloud<ReactingParcel<ParcelType>>,
                 c,
                 iter
             )
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 47424b0820..3ea797ff8d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -167,16 +167,16 @@ public:
             // Interpolators for continuous phase fields
 
                 //- Temperature field interpolator
-                autoPtr<interpolation<scalar> > TInterp_;
+                autoPtr<interpolation<scalar>> TInterp_;
 
                 //- Specific heat capacity field interpolator
-                autoPtr<interpolation<scalar> > CpInterp_;
+                autoPtr<interpolation<scalar>> CpInterp_;
 
                 //- Thermal conductivity field interpolator
-                autoPtr<interpolation<scalar> > kappaInterp_;
+                autoPtr<interpolation<scalar>> kappaInterp_;
 
                 //- Radiation field interpolator
-                autoPtr<interpolation<scalar> > GInterp_;
+                autoPtr<interpolation<scalar>> GInterp_;
 
 
     public:
@@ -349,9 +349,9 @@ public:
                 mesh_(mesh)
             {}
 
-            autoPtr<ThermoParcel<ParcelType> > operator()(Istream& is) const
+            autoPtr<ThermoParcel<ParcelType>> operator()(Istream& is) const
             {
-                return autoPtr<ThermoParcel<ParcelType> >
+                return autoPtr<ThermoParcel<ParcelType>>
                 (
                     new ThermoParcel<ParcelType>(mesh_, is, true)
                 );
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
index 0cf0be0bb6..93e60505b8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ void Foam::ThermoParcel<ParcelType>::readFields(CloudType& c)
 
 
     label i = 0;
-    forAllIter(typename Cloud<ThermoParcel<ParcelType> >, c, iter)
+    forAllIter(typename Cloud<ThermoParcel<ParcelType>>, c, iter)
     {
         ThermoParcel<ParcelType>& p = iter();
 
@@ -119,7 +119,7 @@ void Foam::ThermoParcel<ParcelType>::writeFields(const CloudType& c)
     IOField<scalar> Cp(c.fieldIOobject("Cp", IOobject::NO_READ), np);
 
     label i = 0;
-    forAllConstIter(typename Cloud<ThermoParcel<ParcelType> >, c, iter)
+    forAllConstIter(typename Cloud<ThermoParcel<ParcelType>>, c, iter)
     {
         const ThermoParcel<ParcelType>& p = iter();
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H
index 7207cba0f6..80317598ac 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ SourceFiles
 
 namespace Foam
 {
-    typedef CollidingParcel<KinematicParcel<particle> >
+    typedef CollidingParcel<KinematicParcel<particle>>
         basicKinematicCollidingParcel;
 
     template<>
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/basicKinematicMPPICParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/basicKinematicMPPICParcel.H
index d72dd53661..894c10c986 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/basicKinematicMPPICParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/basicKinematicMPPICParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ SourceFiles
 
 namespace Foam
 {
-    typedef MPPICParcel<KinematicParcel<particle> > basicKinematicMPPICParcel;
+    typedef MPPICParcel<KinematicParcel<particle>> basicKinematicMPPICParcel;
 
     template<>
     inline bool contiguous<basicKinematicMPPICParcel>()
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
index e1fe62df4d..1a1c45954e 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ SourceFiles
 
 namespace Foam
 {
-    typedef ReactingParcel<ThermoParcel<KinematicParcel<particle> > >
+    typedef ReactingParcel<ThermoParcel<KinematicParcel<particle>>>
         basicReactingParcel;
 
     template<>
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
index c7778ac1cf..31e8f6f4f6 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ SourceFiles
 
 namespace Foam
 {
-    typedef ThermoParcel<KinematicParcel<particle> > basicThermoParcel;
+    typedef ThermoParcel<KinematicParcel<particle>> basicThermoParcel;
 
     template<>
     inline bool contiguous<basicThermoParcel>()
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
index 523f818e06..47ef1b97c3 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,9 +111,9 @@ public:
         CloudFunctionObject(const CloudFunctionObject<CloudType>& ppm);
 
         //- Construct and return a clone
-        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
         {
-            return autoPtr<CloudFunctionObject<CloudType> >
+            return autoPtr<CloudFunctionObject<CloudType>>
             (
                 new CloudFunctionObject<CloudType>(*this)
             );
@@ -125,7 +125,7 @@ public:
 
 
     //- Selector
-    static autoPtr<CloudFunctionObject<CloudType> > New
+    static autoPtr<CloudFunctionObject<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner,
@@ -213,7 +213,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);      \
                                                                                \
     Foam::CloudFunctionObject<kinematicCloudType>::                            \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> >         \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>         \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
index dd9b77145e..1a5998b391 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::CloudFunctionObject<CloudType> >
+Foam::autoPtr<Foam::CloudFunctionObject<CloudType>>
 Foam::CloudFunctionObject<CloudType>::New
 (
     const dictionary& dict,
@@ -53,7 +53,7 @@ Foam::CloudFunctionObject<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<CloudFunctionObject<CloudType> >
+    return autoPtr<CloudFunctionObject<CloudType>>
     (
         cstrIter()
         (
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C
index 84d2c7d41e..18113a3a61 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Foam::CloudFunctionObjectList<CloudType>::CloudFunctionObjectList
     CloudType& owner
 )
 :
-    PtrList<CloudFunctionObject<CloudType> >(),
+    PtrList<CloudFunctionObject<CloudType>>(),
     owner_(owner),
     dict_(dictionary::null)
 {}
@@ -48,7 +48,7 @@ Foam::CloudFunctionObjectList<CloudType>::CloudFunctionObjectList
     const bool readFields
 )
 :
-    PtrList<CloudFunctionObject<CloudType> >(),
+    PtrList<CloudFunctionObject<CloudType>>(),
     owner_(owner),
     dict_(dict)
 {
@@ -98,7 +98,7 @@ Foam::CloudFunctionObjectList<CloudType>::CloudFunctionObjectList
     const CloudFunctionObjectList& cfol
 )
 :
-    PtrList<CloudFunctionObject<CloudType> >(cfol),
+    PtrList<CloudFunctionObject<CloudType>>(cfol),
     owner_(cfol.owner_),
     dict_(cfol.dict_)
 {}
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H
index 9448d2559c..675d1941d3 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ namespace Foam
 template<class CloudType>
 class CloudFunctionObjectList
 :
-    public PtrList<CloudFunctionObject<CloudType> >
+    public PtrList<CloudFunctionObject<CloudType>>
 {
 protected:
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
index 4db5ed16b2..15e8411d8a 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,9 +135,9 @@ public:
         FacePostProcessing(const FacePostProcessing<CloudType>& ppm);
 
         //- Construct and return a clone
-        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
         {
-            return autoPtr<CloudFunctionObject<CloudType> >
+            return autoPtr<CloudFunctionObject<CloudType>>
             (
                 new FacePostProcessing<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index 10cb1d3c54..ab54ee6617 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ void Foam::ParticleCollector<CloudType>::makeLogFile
 template<class CloudType>
 void Foam::ParticleCollector<CloudType>::initPolygons
 (
-    const List<Field<point> >& polygons
+    const List<Field<point>>& polygons
 )
 {
     mode_ = mtPolygon;
@@ -545,7 +545,7 @@ Foam::ParticleCollector<CloudType>::ParticleCollector
     word mode(this->coeffDict().lookup("mode"));
     if (mode == "polygon")
     {
-        List<Field<point> > polygons(this->coeffDict().lookup("polygons"));
+        List<Field<point>> polygons(this->coeffDict().lookup("polygons"));
 
         initPolygons(polygons);
 
@@ -554,12 +554,12 @@ Foam::ParticleCollector<CloudType>::ParticleCollector
     }
     else if (mode == "polygonWithNormal")
     {
-        List<Tuple2<Field<point>, vector> > polygonAndNormal
+        List<Tuple2<Field<point>, vector>> polygonAndNormal
         (
             this->coeffDict().lookup("polygons")
         );
 
-        List<Field<point> > polygons(polygonAndNormal.size());
+        List<Field<point>> polygons(polygonAndNormal.size());
         normal_.setSize(polygonAndNormal.size());
 
         forAll(polygons, polyI)
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
index e7ed170e97..27ba298b57 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,7 +147,7 @@ private:
         // Polygon collector
 
             //- Triangulation of faces
-            List<List<face> > faceTris_;
+            List<List<face>> faceTris_;
 
         // Concentric circles collector
 
@@ -212,7 +212,7 @@ private:
         );
 
         //- Initialise polygon collectors
-        void initPolygons(const List<Field<point> >& polygons);
+        void initPolygons(const List<Field<point>>& polygons);
 
         //- Initialise concentric circle collectors
         void initConcentricCircles();
@@ -260,9 +260,9 @@ public:
         ParticleCollector(const ParticleCollector<CloudType>& pc);
 
         //- Construct and return a clone
-        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
         {
-            return autoPtr<CloudFunctionObject<CloudType> >
+            return autoPtr<CloudFunctionObject<CloudType>>
             (
                 new ParticleCollector<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
index 5e4e0db1cb..0d309fea30 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,9 +107,9 @@ public:
         ParticleErosion(const ParticleErosion<CloudType>& pe);
 
         //- Construct and return a clone
-        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
         {
-            return autoPtr<CloudFunctionObject<CloudType> >
+            return autoPtr<CloudFunctionObject<CloudType>>
             (
                 new ParticleErosion<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
index 4bf65edd53..6f6a5d5744 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ class ParticleTracks
             typedef typename CloudType::parcelType parcelType;
 
             //- Convenience typedef for hash hit-table
-            typedef HashTable<label, labelPair, typename labelPair::Hash<> >
+            typedef HashTable<label, labelPair, typename labelPair::Hash<>>
                 hitTableType;
 
         //- Number of face-hit intervals between storing parcel data
@@ -75,7 +75,7 @@ class ParticleTracks
         hitTableType faceHitCounter_;
 
         //- Pointer to the cloud storage
-        autoPtr<Cloud<parcelType> > cloudPtr_;
+        autoPtr<Cloud<parcelType>> cloudPtr_;
 
 
 protected:
@@ -106,9 +106,9 @@ public:
         ParticleTracks(const ParticleTracks<CloudType>& ppm);
 
         //- Construct and return a clone
-        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
         {
-            return autoPtr<CloudFunctionObject<CloudType> >
+            return autoPtr<CloudFunctionObject<CloudType>>
             (
                 new ParticleTracks<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
index fc03b0c91a..4c3e045703 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,9 +103,9 @@ public:
         ParticleTrap(const ParticleTrap<CloudType>& pe);
 
         //- Construct and return a clone
-        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
         {
-            return autoPtr<CloudFunctionObject<CloudType> >
+            return autoPtr<CloudFunctionObject<CloudType>>
             (
                 new ParticleTrap<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
index d037b32b61..b19f347fb5 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,11 +56,11 @@ void Foam::PatchPostProcessing<CloudType>::write()
 {
     forAll(patchData_, i)
     {
-        List<List<scalar> > procTimes(Pstream::nProcs());
+        List<List<scalar>> procTimes(Pstream::nProcs());
         procTimes[Pstream::myProcNo()] = times_[i];
         Pstream::gatherList(procTimes);
 
-        List<List<string> > procData(Pstream::nProcs());
+        List<List<string>> procData(Pstream::nProcs());
         procData[Pstream::myProcNo()] = patchData_[i];
         Pstream::gatherList(procData);
 
@@ -82,17 +82,17 @@ void Foam::PatchPostProcessing<CloudType>::write()
             );
 
             List<string> globalData;
-            globalData = ListListOps::combine<List<string> >
+            globalData = ListListOps::combine<List<string>>
             (
                 procData,
-                accessOp<List<string> >()
+                accessOp<List<string>>()
             );
 
             List<scalar> globalTimes;
-            globalTimes = ListListOps::combine<List<scalar> >
+            globalTimes = ListListOps::combine<List<scalar>>
             (
                 procTimes,
-                accessOp<List<scalar> >()
+                accessOp<List<scalar>>()
             );
 
             labelList indices;
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
index 9b023a87e2..64a678d2eb 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,10 +62,10 @@ class PatchPostProcessing
         labelList patchIDs_;
 
         //- List of time for each data record
-        List<DynamicList<scalar> > times_;
+        List<DynamicList<scalar>> times_;
 
         //- List of output data per patch
-        List<DynamicList<string> > patchData_;
+        List<DynamicList<string>> patchData_;
 
 
     // Private Member Functions
@@ -102,9 +102,9 @@ public:
         PatchPostProcessing(const PatchPostProcessing<CloudType>& ppm);
 
         //- Construct and return a clone
-        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
         {
-            return autoPtr<CloudFunctionObject<CloudType> >
+            return autoPtr<CloudFunctionObject<CloudType>>
             (
                 new PatchPostProcessing<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
index a5fb87265f..9ea04da0a4 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ public:
         VoidFraction(const VoidFraction<CloudType>& vf);
 
         //- Construct and return a clone
-        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
         {
-            return autoPtr<CloudFunctionObject<CloudType> >
+            return autoPtr<CloudFunctionObject<CloudType>>
             (
                 new VoidFraction<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
index 81fced59a8..1c7371f439 100644
--- a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
+++ b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Foam::ParticleForceList<CloudType>::ParticleForceList
     const fvMesh& mesh
 )
 :
-    PtrList<ParticleForce<CloudType> >(),
+    PtrList<ParticleForce<CloudType>>(),
     owner_(owner),
     mesh_(mesh),
     dict_(dictionary::null),
@@ -53,7 +53,7 @@ Foam::ParticleForceList<CloudType>::ParticleForceList
     const bool readFields
 )
 :
-    PtrList<ParticleForce<CloudType> >(),
+    PtrList<ParticleForce<CloudType>>(),
     owner_(owner),
     mesh_(mesh),
     dict_(dict),
@@ -118,7 +118,7 @@ Foam::ParticleForceList<CloudType>::ParticleForceList
     const ParticleForceList& pf
 )
 :
-    PtrList<ParticleForce<CloudType> >(pf),
+    PtrList<ParticleForce<CloudType>>(pf),
     owner_(pf.owner_),
     mesh_(pf.mesh_),
     dict_(pf.dict_)
diff --git a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.H b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.H
index 0c7b08a7ed..9b115cbf88 100644
--- a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.H
+++ b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ namespace Foam
 template<class CloudType>
 class ParticleForceList
 :
-    public PtrList<ParticleForce<CloudType> >
+    public PtrList<ParticleForce<CloudType>>
 {
     // Private data
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
index 9134745f62..1404f17388 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ public:
         CollisionModel(const CollisionModel<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<CollisionModel<CloudType> > clone() const = 0;
+        virtual autoPtr<CollisionModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -105,7 +105,7 @@ public:
 
 
     //- Selector
-    static autoPtr<CollisionModel<CloudType> > New
+    static autoPtr<CollisionModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -157,7 +157,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<collidingCloudType>, 0);     \
                                                                               \
     Foam::CollisionModel<collidingCloudType>::                                \
-        adddictionaryConstructorToTable<Foam::SS<collidingCloudType> >        \
+        adddictionaryConstructorToTable<Foam::SS<collidingCloudType>>        \
             add##SS##CloudType##collidingCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
index 5c0d407586..3237690f6f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::CollisionModel<CloudType> >
+Foam::autoPtr<Foam::CollisionModel<CloudType>>
 Foam::CollisionModel<CloudType>::New
 (
     const dictionary& dict,
@@ -51,7 +51,7 @@ Foam::CollisionModel<CloudType>::New
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
-    return autoPtr<CollisionModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<CollisionModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
index 95b029f6d8..1aca7e4ea6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,9 +67,9 @@ public:
         NoCollision(const NoCollision<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<CollisionModel<CloudType> > clone() const
+        virtual autoPtr<CollisionModel<CloudType>> clone() const
         {
-            return autoPtr<CollisionModel<CloudType> >
+            return autoPtr<CollisionModel<CloudType>>
             (
                 new NoCollision<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 6800360b40..c26194be06 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ void Foam::PairCollision<CloudType>::realRealInteraction()
     typename CloudType::parcelType* pA_ptr = NULL;
     typename CloudType::parcelType* pB_ptr = NULL;
 
-    List<DynamicList<typename CloudType::parcelType*> >& cellOccupancy =
+    List<DynamicList<typename CloudType::parcelType*>>& cellOccupancy =
         this->owner().cellOccupancy();
 
     forAll(dil, realCellI)
@@ -127,10 +127,10 @@ void Foam::PairCollision<CloudType>::realReferredInteraction()
     // Referred interaction list (ril)
     const labelListList& ril = il_.ril();
 
-    List<IDLList<typename CloudType::parcelType> >& referredParticles =
+    List<IDLList<typename CloudType::parcelType>>& referredParticles =
         il_.referredParticles();
 
-    List<DynamicList<typename CloudType::parcelType*> >& cellOccupancy =
+    List<DynamicList<typename CloudType::parcelType*>>& cellOccupancy =
         this->owner().cellOccupancy();
 
     // Loop over all referred cells
@@ -185,19 +185,19 @@ void Foam::PairCollision<CloudType>::wallInteraction()
 
     const volVectorField& U = mesh.lookupObject<volVectorField>(il_.UName());
 
-    List<DynamicList<typename CloudType::parcelType*> >& cellOccupancy =
+    List<DynamicList<typename CloudType::parcelType*>>& cellOccupancy =
         this->owner().cellOccupancy();
 
     // Storage for the wall interaction sites
     DynamicList<point> flatSitePoints;
     DynamicList<scalar> flatSiteExclusionDistancesSqr;
-    DynamicList<WallSiteData<vector> > flatSiteData;
+    DynamicList<WallSiteData<vector>> flatSiteData;
     DynamicList<point> otherSitePoints;
     DynamicList<scalar> otherSiteDistances;
-    DynamicList<WallSiteData<vector> > otherSiteData;
+    DynamicList<WallSiteData<vector>> otherSiteData;
     DynamicList<point> sharpSitePoints;
     DynamicList<scalar> sharpSiteExclusionDistancesSqr;
-    DynamicList<WallSiteData<vector> > sharpSiteData;
+    DynamicList<WallSiteData<vector>> sharpSiteData;
 
     forAll(dil, realCellI)
     {
@@ -537,9 +537,9 @@ void Foam::PairCollision<CloudType>::evaluateWall
 (
     typename CloudType::parcelType& p,
     const List<point>& flatSitePoints,
-    const List<WallSiteData<vector> >& flatSiteData,
+    const List<WallSiteData<vector>>& flatSiteData,
     const List<point>& sharpSitePoints,
-    const List<WallSiteData<vector> >& sharpSiteData
+    const List<WallSiteData<vector>>& sharpSiteData
 ) const
 {
     wallModel_->evaluateWall
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
index d17e0af9c7..bea5f5745e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,10 +77,10 @@ class PairCollision
     // Private data
 
         //- PairModel to calculate the interaction between two parcels
-        autoPtr<PairModel<CloudType> > pairModel_;
+        autoPtr<PairModel<CloudType>> pairModel_;
 
         //- WallModel to calculate the interaction between the parcel and walls
-        autoPtr<WallModel<CloudType> > wallModel_;
+        autoPtr<WallModel<CloudType>> wallModel_;
 
         //- Interactions lists determining which cells are in
         //  interaction range of each other
@@ -133,9 +133,9 @@ class PairCollision
         (
             typename CloudType::parcelType& p,
             const List<point>& flatSitePoints,
-            const List<WallSiteData<vector> >& flatSiteData,
+            const List<WallSiteData<vector>>& flatSiteData,
             const List<point>& sharpSitePoints,
-            const List<WallSiteData<vector> >& sharpSiteData
+            const List<WallSiteData<vector>>& sharpSiteData
         ) const;
 
 
@@ -154,9 +154,9 @@ public:
         PairCollision(const PairCollision<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<CollisionModel<CloudType> > clone() const
+        virtual autoPtr<CollisionModel<CloudType>> clone() const
         {
-            return autoPtr<CollisionModel<CloudType> >
+            return autoPtr<CollisionModel<CloudType>>
             (
                 new PairCollision<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
index 1be43b5080..3490b18e17 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,7 +99,7 @@ public:
 
 
     //- Selector
-    static autoPtr<PairModel<CloudType> > New
+    static autoPtr<PairModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -163,7 +163,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<Foam::CloudType>, 0);        \
                                                                               \
     Foam::PairModel<Foam::CloudType>::                                        \
-        adddictionaryConstructorToTable<Foam::SS<Foam::CloudType> >           \
+        adddictionaryConstructorToTable<Foam::SS<Foam::CloudType>>           \
         add##SS##CloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
index f06dcbd813..a9f5b47f5c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::PairModel<CloudType> >
+Foam::autoPtr<Foam::PairModel<CloudType>>
 Foam::PairModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::PairModel<CloudType>::New
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
-    return autoPtr<PairModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<PairModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
index eee940121e..d8efdd992b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -337,9 +337,9 @@ void Foam::WallLocalSpringSliderDashpot<CloudType>::evaluateWall
 (
     typename CloudType::parcelType& p,
     const List<point>& flatSitePoints,
-    const List<WallSiteData<vector> >& flatSiteData,
+    const List<WallSiteData<vector>>& flatSiteData,
     const List<point>& sharpSitePoints,
-    const List<WallSiteData<vector> >& sharpSiteData
+    const List<WallSiteData<vector>>& sharpSiteData
 ) const
 {
     scalar pREff = this->pREff(p);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
index e48e949f57..e7b0e3b6b8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -167,9 +167,9 @@ public:
         (
             typename CloudType::parcelType& p,
             const List<point>& flatSitePoints,
-            const List<WallSiteData<vector> >& flatSiteData,
+            const List<WallSiteData<vector>>& flatSiteData,
             const List<point>& sharpSitePoints,
-            const List<WallSiteData<vector> >& sharpSiteData
+            const List<WallSiteData<vector>>& sharpSiteData
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
index 93ff310ba2..cfa33f8052 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ public:
 
 
     //- Selector
-    static autoPtr<WallModel<CloudType> > New
+    static autoPtr<WallModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -141,9 +141,9 @@ public:
         (
             typename CloudType::parcelType& p,
             const List<point>& flatSitePoints,
-            const List<WallSiteData<vector> >& flatSiteData,
+            const List<WallSiteData<vector>>& flatSiteData,
             const List<point>& sharpSitePoints,
-            const List<WallSiteData<vector> >& sharpSiteData
+            const List<WallSiteData<vector>>& sharpSiteData
         ) const = 0;
 };
 
@@ -173,7 +173,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<Foam::CloudType>, 0);        \
                                                                               \
     Foam::WallModel<Foam::CloudType>::                                        \
-        adddictionaryConstructorToTable<Foam::SS<Foam::CloudType> >           \
+        adddictionaryConstructorToTable<Foam::SS<Foam::CloudType>>           \
             add##SS##CloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
index f53ffd0094..ec49454ff1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::WallModel<CloudType> >
+Foam::autoPtr<Foam::WallModel<CloudType>>
 Foam::WallModel<CloudType>::New
 (
     const dictionary& dict,
@@ -51,7 +51,7 @@ Foam::WallModel<CloudType>::New
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
-    return autoPtr<WallModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<WallModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
index 625a3d54e3..bafdb086d1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -269,9 +269,9 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
 (
     typename CloudType::parcelType& p,
     const List<point>& flatSitePoints,
-    const List<WallSiteData<vector> >& flatSiteData,
+    const List<WallSiteData<vector>>& flatSiteData,
     const List<point>& sharpSitePoints,
-    const List<WallSiteData<vector> >& sharpSiteData
+    const List<WallSiteData<vector>>& sharpSiteData
 ) const
 {
     scalar pREff = this->pREff(p);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
index 88dca9b66c..d3d6ca1166 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,9 +162,9 @@ public:
         (
             typename CloudType::parcelType& p,
             const List<point>& flatSitePoints,
-            const List<WallSiteData<vector> >& flatSiteData,
+            const List<WallSiteData<vector>>& flatSiteData,
             const List<point>& sharpSitePoints,
-            const List<WallSiteData<vector> >& sharpSiteData
+            const List<WallSiteData<vector>>& sharpSiteData
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
index 1af0caeb51..4059faec08 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ public:
         DispersionModel(const DispersionModel<CloudType>& dm);
 
         //- Construct and return a clone
-        virtual autoPtr<DispersionModel<CloudType> > clone() const = 0;
+        virtual autoPtr<DispersionModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -96,7 +96,7 @@ public:
 
 
     //- Selector
-    static autoPtr<DispersionModel<CloudType> > New
+    static autoPtr<DispersionModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -145,7 +145,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);     \
                                                                               \
     Foam::DispersionModel<kinematicCloudType>::                               \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> >        \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>        \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
index 7a3ddd9810..70422ee16b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::DispersionModel<CloudType> >
+Foam::autoPtr<Foam::DispersionModel<CloudType>>
 Foam::DispersionModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::DispersionModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<DispersionModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<DispersionModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
index 887c1b02f9..70dcebd844 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,9 +63,9 @@ public:
         NoDispersion(const NoDispersion<CloudType>& dm);
 
         //- Construct and return a clone
-        virtual autoPtr<DispersionModel<CloudType> > clone() const
+        virtual autoPtr<DispersionModel<CloudType>> clone() const
         {
-            return autoPtr<DispersionModel<CloudType> >
+            return autoPtr<DispersionModel<CloudType>>
             (
                 new NoDispersion<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
index 9edd88736e..ec4faa4d61 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,9 +115,9 @@ public:
         CellZoneInjection(const CellZoneInjection<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new CellZoneInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index f45fd4a4f0..614ea43f61 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ class ConeInjection
     // Private data
 
         //- List of position and axis for each injector
-        List<Tuple2<vector, vector> > positionAxis_;
+        List<Tuple2<vector, vector>> positionAxis_;
 
         //- List of cell labels corresponding to injector positions
         labelList injectorCells_;
@@ -129,9 +129,9 @@ public:
         ConeInjection(const ConeInjection<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new ConeInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
index 1d32db5f72..0440265f07 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,9 +197,9 @@ public:
         ConeNozzleInjection(const ConeNozzleInjection<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new ConeNozzleInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index 704345d8f5..fd48e04aff 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,9 +135,9 @@ public:
         FieldActivatedInjection(const FieldActivatedInjection<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new FieldActivatedInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index 8b80a42b9e..d770ab18d7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -176,7 +176,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
 {
     const polyMesh& mesh = this->owner().mesh();
 
-    List<DynamicList<typename CloudType::parcelType*> >& cellOccupancy =
+    List<DynamicList<typename CloudType::parcelType*>>& cellOccupancy =
         this->owner().cellOccupancy();
 
     scalar gR = growthRate_.value(time1);
@@ -387,7 +387,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
 
     if (Pstream::parRun())
     {
-        List<List<vectorPairScalarPair> > gatheredNewParticles
+        List<List<vectorPairScalarPair>> gatheredNewParticles
         (
             Pstream::nProcs()
         );
@@ -400,10 +400,10 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
         // Combine
         List<vectorPairScalarPair> combinedNewParticles
         (
-            ListListOps::combine<List<vectorPairScalarPair> >
+            ListListOps::combine<List<vectorPairScalarPair>>
             (
                 gatheredNewParticles,
-                accessOp<List<vectorPairScalarPair> >()
+                accessOp<List<vectorPairScalarPair>>()
             )
         );
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
index 8d3dd8dcc7..ec2d13eaa5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ namespace Foam
 // + diameter = vectorPairScalarPair::second().first()
 // + target diameter = vectorPairScalarPair::second().second()
 // One structure to allow single operation parallel comms
-typedef Tuple2<Pair<vector>, Pair<scalar> > vectorPairScalarPair;
+typedef Tuple2<Pair<vector>, Pair<scalar>> vectorPairScalarPair;
 
 
 /*---------------------------------------------------------------------------*\
@@ -131,9 +131,9 @@ public:
         InflationInjection(const InflationInjection<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new InflationInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index b570a6bf4a..19e05f854e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -220,7 +220,7 @@ public:
         InjectionModel(const InjectionModel<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const = 0;
+        virtual autoPtr<InjectionModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -230,14 +230,14 @@ public:
     // Selectors
 
         //- Selector with lookup from dictionary
-        static autoPtr<InjectionModel<CloudType> > New
+        static autoPtr<InjectionModel<CloudType>> New
         (
             const dictionary& dict,
             CloudType& owner
         );
 
         //- Selector with name and type
-        static autoPtr<InjectionModel<CloudType> > New
+        static autoPtr<InjectionModel<CloudType>> New
         (
             const dictionary& dict,
             const word& modelName,
@@ -374,7 +374,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);     \
                                                                               \
     Foam::InjectionModel<kinematicCloudType>::                                \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> >        \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>        \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.C
index ff7f3bdec3..8fa0cce097 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 template<class CloudType>
 Foam::InjectionModelList<CloudType>::InjectionModelList(CloudType& owner)
 :
-    PtrList<InjectionModel<CloudType> >()
+    PtrList<InjectionModel<CloudType>>()
 {}
 
 
@@ -41,7 +41,7 @@ Foam::InjectionModelList<CloudType>::InjectionModelList
     CloudType& owner
 )
 :
-    PtrList<InjectionModel<CloudType> >()
+    PtrList<InjectionModel<CloudType>>()
 {
     wordList modelNames(dict.toc());
 
@@ -96,7 +96,7 @@ Foam::InjectionModelList<CloudType>::InjectionModelList
     const InjectionModelList<CloudType>& iml
 )
 :
-    PtrList<InjectionModel<CloudType> >(iml)
+    PtrList<InjectionModel<CloudType>>(iml)
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.H
index 48de98a7e0..9deceb5501 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ namespace Foam
 template<class CloudType>
 class InjectionModelList
 :
-    public PtrList<InjectionModel<CloudType> >
+    public PtrList<InjectionModel<CloudType>>
 {
 public:
 
@@ -66,9 +66,9 @@ public:
         InjectionModelList(const InjectionModelList<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModelList<CloudType> > clone() const
+        virtual autoPtr<InjectionModelList<CloudType>> clone() const
         {
-            return autoPtr<InjectionModelList<CloudType> >
+            return autoPtr<InjectionModelList<CloudType>>
             (
                 new InjectionModelList<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
index e9a8af2f08..934b86f17f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::InjectionModel<CloudType> >
+Foam::autoPtr<Foam::InjectionModel<CloudType>>
 Foam::InjectionModel<CloudType>::New
 (
     const dictionary& dict,
@@ -51,12 +51,12 @@ Foam::InjectionModel<CloudType>::New
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
-    return autoPtr<InjectionModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<InjectionModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
 template<class CloudType>
-Foam::autoPtr<Foam::InjectionModel<CloudType> >
+Foam::autoPtr<Foam::InjectionModel<CloudType>>
 Foam::InjectionModel<CloudType>::New
 (
     const dictionary& dict,
@@ -80,7 +80,7 @@ Foam::InjectionModel<CloudType>::New
     }
 
     return
-        autoPtr<InjectionModel<CloudType> >
+        autoPtr<InjectionModel<CloudType>>
         (
             cstrIter()
             (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
index f17410bc1d..037409ee10 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,9 +117,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new KinematicLookupTableInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index bbadab5409..23352d3756 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,9 +109,9 @@ public:
         ManualInjection(const ManualInjection<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new ManualInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index 938e8cfad2..7b92401335 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,9 +67,9 @@ public:
         NoInjection(const NoInjection<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new NoInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
index 72ea50e261..c733930a36 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,9 +107,9 @@ public:
         PatchFlowRateInjection(const PatchFlowRateInjection<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new PatchFlowRateInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index c782ad860d..47cf2eaa06 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,9 +104,9 @@ public:
         PatchInjection(const PatchInjection<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new PatchInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.H
index eb9dd62d5d..28884346d9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,9 +81,9 @@ public:
         DistortedSphereDragForce(const DistortedSphereDragForce<CloudType>& df);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new DistortedSphereDragForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H
index 1d10ea6b42..b3f4051c2b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,9 +81,9 @@ public:
         ErgunWenYuDragForce(const ErgunWenYuDragForce<CloudType>& df);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new ErgunWenYuDragForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.H
index 3655ec78cb..1005cc162d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,9 +121,9 @@ public:
         NonSphereDragForce(const NonSphereDragForce<CloudType>& df);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new NonSphereDragForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.H
index 5bd9be8e45..ac8871f969 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,9 +81,9 @@ public:
         PlessisMasliyahDragForce(const PlessisMasliyahDragForce<CloudType>& df);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new PlessisMasliyahDragForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.H
index 6b2a084f0b..d9cd602de0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,9 +73,9 @@ public:
         SphereDragForce(const SphereDragForce<CloudType>& df);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new SphereDragForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.H
index 46a6ff5e19..0268bd8181 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,9 +81,9 @@ public:
         WenYuDragForce(const WenYuDragForce<CloudType>& df);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new WenYuDragForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.H
index cfb2017794..709a73a93a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,9 +80,9 @@ public:
         GravityForce(const GravityForce& gf);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new GravityForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.H
index 13cab0ac54..2a1036f8e4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ protected:
         const word UName_;
 
         //- Curk of carrier phase velocity interpolator
-        autoPtr<interpolation<vector> > curlUcInterpPtr_;
+        autoPtr<interpolation<vector>> curlUcInterpPtr_;
 
 
     // Potected Member Functions
@@ -94,9 +94,9 @@ public:
         LiftForce(const LiftForce& lf);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new LiftForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/SaffmanMeiLift/SaffmanMeiLiftForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/SaffmanMeiLift/SaffmanMeiLiftForce.H
index 66d29416b9..49cf39377a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/SaffmanMeiLift/SaffmanMeiLiftForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/SaffmanMeiLift/SaffmanMeiLiftForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,9 +86,9 @@ public:
         SaffmanMeiLiftForce(const SaffmanMeiLiftForce& lf);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new SaffmanMeiLiftForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/TomiyamaLift/TomiyamaLiftForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/TomiyamaLift/TomiyamaLiftForce.H
index 3edf43b0a3..c84620a134 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/TomiyamaLift/TomiyamaLiftForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/TomiyamaLift/TomiyamaLiftForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ public:
         TomiyamaLiftForce(const TomiyamaLiftForce& lf);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new TomiyamaLiftForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.H
index 7c411002cf..df4edc1180 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,9 +101,9 @@ public:
         NonInertialFrameForce(const NonInertialFrameForce& niff);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new ParticleForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.H
index 2d24eb8c1b..fef02cdbb5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,9 +87,9 @@ public:
         ParamagneticForce(const ParamagneticForce& gf);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new ParamagneticForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
index c2ef62d536..47c0cf2579 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,9 +105,9 @@ public:
         ParticleForce(const ParticleForce& pf);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new ParticleForce<CloudType>(*this)
             );
@@ -119,7 +119,7 @@ public:
 
 
     //- Selector
-    static autoPtr<ParticleForce<CloudType> > New
+    static autoPtr<ParticleForce<CloudType>> New
     (
         CloudType& owner,
         const fvMesh& mesh,
@@ -215,7 +215,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);      \
                                                                                \
     Foam::ParticleForce<kinematicCloudType>::                                  \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> >         \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>         \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
index 7e37875658..d30f34bb99 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::ParticleForce<CloudType> >
+Foam::autoPtr<Foam::ParticleForce<CloudType>>
 Foam::ParticleForce<CloudType>::New
 (
     CloudType& owner,
@@ -53,7 +53,7 @@ Foam::ParticleForce<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<ParticleForce<CloudType> >
+    return autoPtr<ParticleForce<CloudType>>
     (
         cstrIter()
         (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.H
index c4768d0478..31de00f9f6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ protected:
         const word UName_;
 
         //- Rate of change of carrier phase velocity interpolator
-        autoPtr<interpolation<vector> > DUcDtInterpPtr_;
+        autoPtr<interpolation<vector>> DUcDtInterpPtr_;
 
 
 public:
@@ -86,9 +86,9 @@ public:
         PressureGradientForce(const PressureGradientForce& pgf);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new PressureGradientForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.H
index 5c9927473a..91620ab184 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,9 +80,9 @@ public:
         SRFForce(const SRFForce& srff);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new ParticleForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H
index ea0d580932..a0c29ed9bf 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,9 +78,9 @@ public:
         VirtualMassForce(const VirtualMassForce& pgf);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new VirtualMassForce<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
index 3a8c776776..bf5b867455 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,9 +95,9 @@ public:
         LocalInteraction(const LocalInteraction<CloudType>& pim);
 
         //- Construct and return a clone using supplied owner cloud
-        virtual autoPtr<PatchInteractionModel<CloudType> > clone() const
+        virtual autoPtr<PatchInteractionModel<CloudType>> clone() const
         {
-            return autoPtr<PatchInteractionModel<CloudType> >
+            return autoPtr<PatchInteractionModel<CloudType>>
             (
                 new LocalInteraction<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.H
index 673cd325ed..669e9c68f0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ class MultiInteraction
         Switch oneInteractionOnly_;
 
         //- Submodels
-        PtrList<PatchInteractionModel<CloudType> > models_;
+        PtrList<PatchInteractionModel<CloudType>> models_;
 
 
     // Private Member Functions
@@ -117,9 +117,9 @@ public:
         MultiInteraction(const MultiInteraction<CloudType>& pim);
 
         //- Construct and return a clone using supplied owner cloud
-        virtual autoPtr<PatchInteractionModel<CloudType> > clone() const
+        virtual autoPtr<PatchInteractionModel<CloudType>> clone() const
         {
-            return autoPtr<PatchInteractionModel<CloudType> >
+            return autoPtr<PatchInteractionModel<CloudType>>
             (
                 new MultiInteraction<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/NoInteraction/NoInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/NoInteraction/NoInteraction.H
index 41a43685f8..ce503efcaf 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/NoInteraction/NoInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/NoInteraction/NoInteraction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,9 +63,9 @@ public:
         NoInteraction(const NoInteraction<CloudType>& pim);
 
         //- Construct and return a clone
-        virtual autoPtr<PatchInteractionModel<CloudType> > clone() const
+        virtual autoPtr<PatchInteractionModel<CloudType>> clone() const
         {
-            return autoPtr<PatchInteractionModel<CloudType> >
+            return autoPtr<PatchInteractionModel<CloudType>>
             (
                 new NoInteraction<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
index bfc4ae277b..2e1dcf0dd1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ public:
         PatchInteractionModel(const PatchInteractionModel<CloudType>& pim);
 
         //- Construct and return a clone
-        virtual autoPtr<PatchInteractionModel<CloudType> > clone() const = 0;
+        virtual autoPtr<PatchInteractionModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -126,7 +126,7 @@ public:
 
 
     //- Selector
-    static autoPtr<PatchInteractionModel<CloudType> > New
+    static autoPtr<PatchInteractionModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -197,7 +197,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);     \
                                                                               \
     Foam::PatchInteractionModel<kinematicCloudType>::                         \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> >        \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>        \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
index 82c1ada60c..1c711dba11 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::PatchInteractionModel<CloudType> >
+Foam::autoPtr<Foam::PatchInteractionModel<CloudType>>
 Foam::PatchInteractionModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::PatchInteractionModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<PatchInteractionModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<PatchInteractionModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
index d9414b83d4..b8d05c3a53 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,9 +69,9 @@ public:
         Rebound(const Rebound<CloudType>& pim);
 
         //- Construct and return a clone
-        virtual autoPtr<PatchInteractionModel<CloudType> > clone() const
+        virtual autoPtr<PatchInteractionModel<CloudType>> clone() const
         {
-            return autoPtr<PatchInteractionModel<CloudType> >
+            return autoPtr<PatchInteractionModel<CloudType>>
             (
                 new Rebound<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
index 68a5a8965b..744b73527d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,9 +104,9 @@ public:
         StandardWallInteraction(const StandardWallInteraction<CloudType>& pim);
 
         //- Construct and return a clone using supplied owner cloud
-        virtual autoPtr<PatchInteractionModel<CloudType> > clone() const
+        virtual autoPtr<PatchInteractionModel<CloudType>> clone() const
         {
-            return autoPtr<PatchInteractionModel<CloudType> >
+            return autoPtr<PatchInteractionModel<CloudType>>
             (
                 new StandardWallInteraction<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/NoStochasticCollision/NoStochasticCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/NoStochasticCollision/NoStochasticCollision.H
index 81338611e3..40e6c75e20 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/NoStochasticCollision/NoStochasticCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/NoStochasticCollision/NoStochasticCollision.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,9 +70,9 @@ public:
         NoStochasticCollision(const NoStochasticCollision<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<StochasticCollisionModel<CloudType> > clone() const
+        virtual autoPtr<StochasticCollisionModel<CloudType>> clone() const
         {
-            return autoPtr<StochasticCollisionModel<CloudType> >
+            return autoPtr<StochasticCollisionModel<CloudType>>
             (
                 new NoStochasticCollision<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
index 140c9d310d..921b1ae333 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ public:
         StochasticCollisionModel(const StochasticCollisionModel<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<StochasticCollisionModel<CloudType> > clone() const = 0;
+        virtual autoPtr<StochasticCollisionModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -105,7 +105,7 @@ public:
 
 
     //- Selector
-    static autoPtr<StochasticCollisionModel<CloudType> > New
+    static autoPtr<StochasticCollisionModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -149,7 +149,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);     \
                                                                               \
     Foam::StochasticCollisionModel<kinematicCloudType>::                      \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> >        \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>        \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C
index 8faa120fe2..9faff867b5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::StochasticCollisionModel<CloudType> >
+Foam::autoPtr<Foam::StochasticCollisionModel<CloudType>>
 Foam::StochasticCollisionModel<CloudType>::New
 (
     const dictionary& dict,
@@ -51,7 +51,7 @@ Foam::StochasticCollisionModel<CloudType>::New
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
-    return autoPtr<StochasticCollisionModel<CloudType> >
+    return autoPtr<StochasticCollisionModel<CloudType>>
     (
         cstrIter()(dict, owner)
     );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
index b2fd4e7cd2..cf92e35fee 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,9 +74,9 @@ public:
         NoSurfaceFilm(const NoSurfaceFilm<CloudType>& dm);
 
         //- Construct and return a clone
-        virtual autoPtr<SurfaceFilmModel<CloudType> > clone() const
+        virtual autoPtr<SurfaceFilmModel<CloudType>> clone() const
         {
-            return autoPtr<SurfaceFilmModel<CloudType> >
+            return autoPtr<SurfaceFilmModel<CloudType>>
             (
                 new NoSurfaceFilm<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
index 4f93dde527..d8949e8887 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ public:
         SurfaceFilmModel(const SurfaceFilmModel<CloudType>& sfm);
 
         //- Construct and return a clone
-        virtual autoPtr<SurfaceFilmModel<CloudType> > clone() const = 0;
+        virtual autoPtr<SurfaceFilmModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -169,7 +169,7 @@ public:
 
 
     //- Selector
-    static autoPtr<SurfaceFilmModel<CloudType> > New
+    static autoPtr<SurfaceFilmModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -253,7 +253,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);      \
                                                                                \
     Foam::SurfaceFilmModel<kinematicCloudType>::                               \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> >         \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>         \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
index 492a1e1f37..516641d066 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::SurfaceFilmModel<CloudType> >
+Foam::autoPtr<Foam::SurfaceFilmModel<CloudType>>
 Foam::SurfaceFilmModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::SurfaceFilmModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<SurfaceFilmModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<SurfaceFilmModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
index 7ef6edb34d..136140ad5f 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ Foam::AveragingMethod<Type>::AveragingMethod
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr<Foam::AveragingMethod<Type> >
+Foam::autoPtr<Foam::AveragingMethod<Type>>
 Foam::AveragingMethod<Type>::New
 (
     const IOobject& io,
@@ -95,7 +95,7 @@ Foam::AveragingMethod<Type>::New
             << abort(FatalError);
     }
 
-    return autoPtr<AveragingMethod<Type> >(cstrIter()(io, dict, mesh));
+    return autoPtr<AveragingMethod<Type>>(cstrIter()(io, dict, mesh));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
index dddcea6f1a..323d5a5e34 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,11 +113,11 @@ public:
         AveragingMethod(const AveragingMethod<Type>& am);
 
         //- Construct and return a clone
-        virtual autoPtr<AveragingMethod<Type> > clone() const = 0;
+        virtual autoPtr<AveragingMethod<Type>> clone() const = 0;
 
 
     //- Selector
-    static autoPtr<AveragingMethod<Type> > New
+    static autoPtr<AveragingMethod<Type>> New
     (
         const IOobject& io,
         const dictionary& dict,
@@ -164,7 +164,7 @@ public:
         virtual bool write() const;
 
         //- Return an internal field of the average
-        virtual tmp<Field<Type> > internalField() const = 0;
+        virtual tmp<Field<Type>> internalField() const = 0;
 
         //- Assign to another average
         inline void operator=(const AveragingMethod<Type>& x);
@@ -173,16 +173,16 @@ public:
         inline void operator=(const Type& x);
 
         //- Assign to tmp
-        inline void operator=(tmp<FieldField<Field, Type> > x);
+        inline void operator=(tmp<FieldField<Field, Type>> x);
 
         //- Add-equal tmp
-        inline void operator+=(tmp<FieldField<Field, Type> > x);
+        inline void operator+=(tmp<FieldField<Field, Type>> x);
 
         //- Multiply-equal tmp
-        inline void operator*=(tmp<FieldField<Field, Type> > x);
+        inline void operator*=(tmp<FieldField<Field, Type>> x);
 
         //- Divide-equal tmp
-        inline void operator/=(tmp<FieldField<Field, scalar> > x);
+        inline void operator/=(tmp<FieldField<Field, scalar>> x);
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethodI.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethodI.H
index 87bc4ac904..8ebcf68b38 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethodI.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethodI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ inline void Foam::AveragingMethod<Type>::operator=
 template<class Type>
 inline void Foam::AveragingMethod<Type>::operator=
 (
-    tmp<FieldField<Field, Type> > x
+    tmp<FieldField<Field, Type>> x
 )
 {
     FieldField<Field, Type>::operator=(x());
@@ -61,7 +61,7 @@ inline void Foam::AveragingMethod<Type>::operator=
 template<class Type>
 inline void Foam::AveragingMethod<Type>::operator+=
 (
-    tmp<FieldField<Field, Type> > x
+    tmp<FieldField<Field, Type>> x
 )
 {
     FieldField<Field, Type>::operator+=(x());
@@ -72,7 +72,7 @@ inline void Foam::AveragingMethod<Type>::operator+=
 template<class Type>
 inline void Foam::AveragingMethod<Type>::operator*=
 (
-    tmp<FieldField<Field, Type> > x
+    tmp<FieldField<Field, Type>> x
 )
 {
     FieldField<Field, Type>::operator*=(x());
@@ -83,7 +83,7 @@ inline void Foam::AveragingMethod<Type>::operator*=
 template<class Type>
 inline void Foam::AveragingMethod<Type>::operator/=
 (
-    tmp<FieldField<Field, scalar> > x
+    tmp<FieldField<Field, scalar>> x
 )
 {
     FieldField<Field, Type>::operator/=(x());
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
index 576153d96d..c01ae46a01 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,10 +123,10 @@ Foam::AveragingMethods::Basic<Type>::interpolateGrad
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::AveragingMethods::Basic<Type>::internalField() const
 {
-    return tmp<Field<Type> >(data_);
+    return tmp<Field<Type>>(data_);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.H
index 515e018c6c..e5af8fe80f 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,9 +107,9 @@ public:
         Basic(const Basic<Type>& am);
 
         //- Construct and return a clone
-        virtual autoPtr<AveragingMethod<Type> > clone() const
+        virtual autoPtr<AveragingMethod<Type>> clone() const
         {
-            return autoPtr<AveragingMethod<Type> >
+            return autoPtr<AveragingMethod<Type>>
             (
                 new Basic<Type>(*this)
             );
@@ -145,10 +145,10 @@ public:
         ) const;
 
         //- Return an internal field of the average
-        tmp<Field<Type> > internalField() const;
+        tmp<Field<Type>> internalField() const;
 
         //- Return an internal field of the gradient
-        tmp<Field<TypeGrad> > internalFieldGrad() const;
+        tmp<Field<TypeGrad>> internalFieldGrad() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.C
index 54f0749c8f..fe3d477655 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -243,10 +243,10 @@ void Foam::AveragingMethods::Dual<Type>::average
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::AveragingMethods::Dual<Type>::internalField() const
 {
-    return tmp<Field<Type> >(dataCell_);
+    return tmp<Field<Type>>(dataCell_);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
index a3c7579e77..ebc3e2f537 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,9 +136,9 @@ public:
         Dual(const Dual<Type>& am);
 
         //- Construct and return a clone
-        virtual autoPtr<AveragingMethod<Type> > clone() const
+        virtual autoPtr<AveragingMethod<Type>> clone() const
         {
-            return autoPtr<AveragingMethod<Type> >
+            return autoPtr<AveragingMethod<Type>>
             (
                 new Dual<Type>(*this)
             );
@@ -178,10 +178,10 @@ public:
         void average(const AveragingMethod<scalar>& weight);
 
         //- Return an internal field of the average
-        tmp<Field<Type> > internalField() const;
+        tmp<Field<Type>> internalField() const;
 
         //- Return an internal field of the gradient
-        tmp<Field<TypeGrad> > internalFieldGrad() const;
+        tmp<Field<TypeGrad>> internalFieldGrad() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C
index a71e746a1d..0a2d801b85 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,10 +197,10 @@ Foam::AveragingMethods::Moment<Type>::interpolateGrad
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::AveragingMethods::Moment<Type>::internalField() const
 {
-    return tmp<Field<Type> >(data_);
+    return tmp<Field<Type>>(data_);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H
index e429ed43ec..dbd6f93eb0 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,9 +120,9 @@ public:
         Moment(const Moment<Type>& am);
 
         //- Construct and return a clone
-        virtual autoPtr<AveragingMethod<Type> > clone() const
+        virtual autoPtr<AveragingMethod<Type>> clone() const
         {
-            return autoPtr<AveragingMethod<Type> >
+            return autoPtr<AveragingMethod<Type>>
             (
                 new Moment<Type>(*this)
             );
@@ -158,10 +158,10 @@ public:
         ) const;
 
         //- Return an internal field of the average
-        tmp<Field<Type> > internalField() const;
+        tmp<Field<Type>> internalField() const;
 
         //- Return an internal field of the gradient
-        tmp<Field<TypeGrad> > internalFieldGrad() const;
+        tmp<Field<TypeGrad>> internalFieldGrad() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/makeAveragingMethods.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/makeAveragingMethods.C
index dac7edc27a..5eccf6c485 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/makeAveragingMethods.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/makeAveragingMethods.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ defineNamedTemplateTypeNameAndDebug
     0
 );
 Foam::AveragingMethod<Foam::scalar>::
-adddictionaryConstructorToTable<Foam::AveragingMethods::Basic<Foam::scalar> >
+adddictionaryConstructorToTable<Foam::AveragingMethods::Basic<Foam::scalar>>
     addBasicscalarConstructorToTable_;
 
 defineNamedTemplateTypeNameAndDebug
@@ -70,7 +70,7 @@ defineNamedTemplateTypeNameAndDebug
     0
 );
 Foam::AveragingMethod<Foam::vector>::
-adddictionaryConstructorToTable<Foam::AveragingMethods::Basic<Foam::vector> >
+adddictionaryConstructorToTable<Foam::AveragingMethods::Basic<Foam::vector>>
     addBasicvectorConstructorToTable_;
 
 
@@ -81,7 +81,7 @@ defineNamedTemplateTypeNameAndDebug
     0
 );
 Foam::AveragingMethod<Foam::scalar>::
-adddictionaryConstructorToTable<Foam::AveragingMethods::Dual<Foam::scalar> >
+adddictionaryConstructorToTable<Foam::AveragingMethods::Dual<Foam::scalar>>
     addDualscalarConstructorToTable_;
 
 defineNamedTemplateTypeNameAndDebug
@@ -90,7 +90,7 @@ defineNamedTemplateTypeNameAndDebug
     0
 );
 Foam::AveragingMethod<Foam::vector>::
-adddictionaryConstructorToTable<Foam::AveragingMethods::Dual<Foam::vector> >
+adddictionaryConstructorToTable<Foam::AveragingMethods::Dual<Foam::vector>>
     addDualvectorConstructorToTable_;
 
 
@@ -101,7 +101,7 @@ defineNamedTemplateTypeNameAndDebug
     0
 );
 Foam::AveragingMethod<Foam::scalar>::
-adddictionaryConstructorToTable<Foam::AveragingMethods::Moment<Foam::scalar> >
+adddictionaryConstructorToTable<Foam::AveragingMethods::Moment<Foam::scalar>>
     addMomentscalarConstructorToTable_;
 
 defineNamedTemplateTypeNameAndDebug
@@ -110,7 +110,7 @@ defineNamedTemplateTypeNameAndDebug
     0
 );
 Foam::AveragingMethod<Foam::vector>::
-adddictionaryConstructorToTable<Foam::AveragingMethods::Moment<Foam::vector> >
+adddictionaryConstructorToTable<Foam::AveragingMethods::Moment<Foam::vector>>
     addMomentvectorConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C
index 4c765da9c4..d823496d7e 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ Foam::DampingModel<CloudType>::~DampingModel()
 // * * * * * * * * * * * * * * * *  Selector * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::DampingModel<CloudType> >
+Foam::autoPtr<Foam::DampingModel<CloudType>>
 Foam::DampingModel<CloudType>::New
 (
     const dictionary& dict,
@@ -98,7 +98,7 @@ Foam::DampingModel<CloudType>::New
     }
 
     return
-        autoPtr<DampingModel<CloudType> >
+        autoPtr<DampingModel<CloudType>>
         (
             cstrIter()(dict, owner)
         );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
index 9c8e142938..d98ba072bc 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ public:
         DampingModel(const DampingModel<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<DampingModel<CloudType> > clone() const = 0;
+        virtual autoPtr<DampingModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -111,7 +111,7 @@ public:
 
 
     //- Selector
-    static autoPtr<DampingModel<CloudType> > New
+    static autoPtr<DampingModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -162,7 +162,7 @@ public:
                                                                                \
     Foam::DampingModel<MPPICCloudType>::                                       \
         adddictionaryConstructorToTable                                        \
-        <Foam::DampingModels::SS<MPPICCloudType> >                             \
+        <Foam::DampingModels::SS<MPPICCloudType>>                             \
             add##SS##CloudType##MPPICCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.H b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.H
index 34f2b9a967..db30fb7c63 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,9 +66,9 @@ public:
         NoDamping(const NoDamping<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<DampingModel<CloudType> > clone() const
+        virtual autoPtr<DampingModel<CloudType>> clone() const
         {
-            return autoPtr<DampingModel<CloudType> >
+            return autoPtr<DampingModel<CloudType>>
             (
                 new NoDamping<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.C b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.C
index fadd26c67f..3e37bb61ad 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,27 +71,27 @@ void Foam::DampingModels::Relaxation<CloudType>::cacheFields(const bool store)
         const word& cloudName = this->owner().name();
 
         const AveragingMethod<scalar>& volumeAverage =
-            mesh.lookupObject<AveragingMethod<scalar> >
+            mesh.lookupObject<AveragingMethod<scalar>>
             (
                 cloudName + ":volumeAverage"
             );
         const AveragingMethod<scalar>& radiusAverage =
-            mesh.lookupObject<AveragingMethod<scalar> >
+            mesh.lookupObject<AveragingMethod<scalar>>
             (
                 cloudName + ":radiusAverage"
             );
         const AveragingMethod<vector>& uAverage =
-            mesh.lookupObject<AveragingMethod<vector> >
+            mesh.lookupObject<AveragingMethod<vector>>
             (
                 cloudName + ":uAverage"
             );
         const AveragingMethod<scalar>& uSqrAverage =
-            mesh.lookupObject<AveragingMethod<scalar> >
+            mesh.lookupObject<AveragingMethod<scalar>>
             (
                 cloudName + ":uSqrAverage"
             );
         const AveragingMethod<scalar>& frequencyAverage =
-            mesh.lookupObject<AveragingMethod<scalar> >
+            mesh.lookupObject<AveragingMethod<scalar>>
             (
                 cloudName + ":frequencyAverage"
             );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.H b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.H
index d9f6e07e57..41c2805827 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ private:
         const AveragingMethod<vector>* uAverage_;
 
         //- Reciprocal of the time scale average
-        autoPtr<AveragingMethod<scalar> > oneByTimeScaleAverage_;
+        autoPtr<AveragingMethod<scalar>> oneByTimeScaleAverage_;
 
 
 public:
@@ -90,9 +90,9 @@ public:
         Relaxation(const Relaxation<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<DampingModel<CloudType> > clone() const
+        virtual autoPtr<DampingModel<CloudType>> clone() const
         {
-            return autoPtr<DampingModel<CloudType> >
+            return autoPtr<DampingModel<CloudType>>
             (
                 new Relaxation<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C
index eb52e2e5c5..50cad5b9dc 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ Foam::IsotropyModel<CloudType>::~IsotropyModel()
 // * * * * * * * * * * * * * * * *  Selector * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::IsotropyModel<CloudType> >
+Foam::autoPtr<Foam::IsotropyModel<CloudType>>
 Foam::IsotropyModel<CloudType>::New
 (
     const dictionary& dict,
@@ -102,7 +102,7 @@ Foam::IsotropyModel<CloudType>::New
     }
 
     return
-        autoPtr<IsotropyModel<CloudType> >
+        autoPtr<IsotropyModel<CloudType>>
         (
             cstrIter()(dict, owner)
         );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
index 3523effa8f..a7883b4658 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ public:
         IsotropyModel(const IsotropyModel<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<IsotropyModel<CloudType> > clone() const = 0;
+        virtual autoPtr<IsotropyModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -109,7 +109,7 @@ public:
 
 
     //- Selector
-    static autoPtr<IsotropyModel<CloudType> > New
+    static autoPtr<IsotropyModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -156,7 +156,7 @@ public:
                                                                                \
     Foam::IsotropyModel<MPPICCloudType>::                                      \
         adddictionaryConstructorToTable                                        \
-        <Foam::IsotropyModels::SS<MPPICCloudType> >                            \
+        <Foam::IsotropyModels::SS<MPPICCloudType>>                            \
             add##SS##CloudType##MPPICCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/NoIsotropy/NoIsotropy.H b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/NoIsotropy/NoIsotropy.H
index 749b77ae78..ff8cd52296 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/NoIsotropy/NoIsotropy.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/NoIsotropy/NoIsotropy.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,9 +66,9 @@ public:
         NoIsotropy(const NoIsotropy<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<IsotropyModel<CloudType> > clone() const
+        virtual autoPtr<IsotropyModel<CloudType>> clone() const
         {
-            return autoPtr<IsotropyModel<CloudType> >
+            return autoPtr<IsotropyModel<CloudType>>
             (
                 new NoIsotropy<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C
index 820b6d2ecf..6aa5354455 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,38 +103,38 @@ void Foam::IsotropyModels::Stochastic<CloudType>::calculate()
     const scalar oneBySqrtThree = sqrt(1.0/3.0);
 
     const AveragingMethod<scalar>& volumeAverage =
-        mesh.lookupObject<AveragingMethod<scalar> >
+        mesh.lookupObject<AveragingMethod<scalar>>
         (
             this->owner().name() + ":volumeAverage"
         );
     const AveragingMethod<scalar>& radiusAverage =
-        mesh.lookupObject<AveragingMethod<scalar> >
+        mesh.lookupObject<AveragingMethod<scalar>>
         (
             this->owner().name() + ":radiusAverage"
         );
     const AveragingMethod<vector>& uAverage =
-        mesh.lookupObject<AveragingMethod<vector> >
+        mesh.lookupObject<AveragingMethod<vector>>
         (
             this->owner().name() + ":uAverage"
         );
     const AveragingMethod<scalar>& uSqrAverage =
-        mesh.lookupObject<AveragingMethod<scalar> >
+        mesh.lookupObject<AveragingMethod<scalar>>
         (
             this->owner().name() + ":uSqrAverage"
         );
     const AveragingMethod<scalar>& frequencyAverage =
-        mesh.lookupObject<AveragingMethod<scalar> >
+        mesh.lookupObject<AveragingMethod<scalar>>
         (
             this->owner().name() + ":frequencyAverage"
         );
     const AveragingMethod<scalar>& massAverage =
-        mesh.lookupObject<AveragingMethod<scalar> >
+        mesh.lookupObject<AveragingMethod<scalar>>
         (
             this->owner().name() + ":massAverage"
         );
 
     // calculate time scales and pdf exponent
-    autoPtr<AveragingMethod<scalar> > exponentAveragePtr
+    autoPtr<AveragingMethod<scalar>> exponentAveragePtr
     (
         AveragingMethod<scalar>::New
         (
@@ -183,7 +183,7 @@ void Foam::IsotropyModels::Stochastic<CloudType>::calculate()
     }
 
     // correction velocity averages
-    autoPtr<AveragingMethod<vector> > uTildeAveragePtr
+    autoPtr<AveragingMethod<vector>> uTildeAveragePtr
     (
         AveragingMethod<vector>::New
         (
@@ -206,7 +206,7 @@ void Foam::IsotropyModels::Stochastic<CloudType>::calculate()
     }
     uTildeAverage.average(massAverage);
 
-    autoPtr<AveragingMethod<scalar> > uTildeSqrAveragePtr
+    autoPtr<AveragingMethod<scalar>> uTildeSqrAveragePtr
     (
         AveragingMethod<scalar>::New
         (
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.H b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.H
index f1e06f64de..9eb973873c 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,9 +91,9 @@ public:
         Stochastic(const Stochastic<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<IsotropyModel<CloudType> > clone() const
+        virtual autoPtr<IsotropyModel<CloudType>> clone() const
         {
-            return autoPtr<IsotropyModel<CloudType> >
+            return autoPtr<IsotropyModel<CloudType>>
             (
                 new Stochastic<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C
index 41707410a6..d5bdc17687 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,22 +81,22 @@ void Foam::PackingModels::Explicit<CloudType>::cacheFields(const bool store)
         const word& cloudName = this->owner().name();
 
         const AveragingMethod<scalar>& volumeAverage =
-            mesh.lookupObject<AveragingMethod<scalar> >
+            mesh.lookupObject<AveragingMethod<scalar>>
             (
                 cloudName + ":volumeAverage"
             );
         const AveragingMethod<scalar>& rhoAverage =
-            mesh.lookupObject<AveragingMethod<scalar> >
+            mesh.lookupObject<AveragingMethod<scalar>>
             (
                 cloudName + ":rhoAverage"
             );
         const AveragingMethod<vector>& uAverage =
-            mesh.lookupObject<AveragingMethod<vector> >
+            mesh.lookupObject<AveragingMethod<vector>>
             (
                 cloudName + ":uAverage"
             );
         const AveragingMethod<scalar>& uSqrAverage =
-            mesh.lookupObject<AveragingMethod<scalar> >
+            mesh.lookupObject<AveragingMethod<scalar>>
             (
                 cloudName + ":uSqrAverage"
             );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.H
index 15937ffb69..4604a7a6c2 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ private:
         const AveragingMethod<vector>* uAverage_;
 
         //- Stress average field
-        autoPtr<AveragingMethod<scalar> > stressAverage_;
+        autoPtr<AveragingMethod<scalar>> stressAverage_;
 
         //- Correction limiter
         autoPtr<CorrectionLimitingMethod> correctionLimiting_;
@@ -98,9 +98,9 @@ public:
         Explicit(const Explicit<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<PackingModel<CloudType> > clone() const
+        virtual autoPtr<PackingModel<CloudType>> clone() const
         {
-            return autoPtr<PackingModel<CloudType> >
+            return autoPtr<PackingModel<CloudType>>
             (
                 new Explicit<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
index 43d7745abc..5cb2092818 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,12 +98,12 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
         const volScalarField& rhoc = this->owner().rho();
 
         const AveragingMethod<scalar>& rhoAverage =
-            mesh.lookupObject<AveragingMethod<scalar> >
+            mesh.lookupObject<AveragingMethod<scalar>>
             (
                 cloudName + ":rhoAverage"
             );
         const AveragingMethod<scalar>& uSqrAverage =
-            mesh.lookupObject<AveragingMethod<scalar> >
+            mesh.lookupObject<AveragingMethod<scalar>>
             (
                 cloudName + ":uSqrAverage"
             );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
index 566fd95654..9f90dabcbf 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,9 +95,9 @@ public:
         Implicit(const Implicit<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<PackingModel<CloudType> > clone() const
+        virtual autoPtr<PackingModel<CloudType>> clone() const
         {
-            return autoPtr<PackingModel<CloudType> >
+            return autoPtr<PackingModel<CloudType>>
             (
                 new Implicit<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.H
index 67bb37bf5d..9214f4251d 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,9 +66,9 @@ public:
         NoPacking(const NoPacking<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<PackingModel<CloudType> > clone() const
+        virtual autoPtr<PackingModel<CloudType>> clone() const
         {
-            return autoPtr<PackingModel<CloudType> >
+            return autoPtr<PackingModel<CloudType>>
             (
                 new NoPacking<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C
index bacf4d0bc9..e412380d63 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ Foam::PackingModel<CloudType>::~PackingModel()
 // * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::PackingModel<CloudType> >
+Foam::autoPtr<Foam::PackingModel<CloudType>>
 Foam::PackingModel<CloudType>::New
 (
     const dictionary& dict,
@@ -99,7 +99,7 @@ Foam::PackingModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<PackingModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<PackingModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
index 4258773a49..3b7f230391 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ public:
         PackingModel(const PackingModel<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<PackingModel<CloudType> > clone() const = 0;
+        virtual autoPtr<PackingModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -116,7 +116,7 @@ public:
 
 
     //- Selector
-    static autoPtr<PackingModel<CloudType> > New
+    static autoPtr<PackingModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -167,7 +167,7 @@ public:
                                                                                \
     Foam::PackingModel<MPPICCloudType>::                                       \
         adddictionaryConstructorToTable                                        \
-        <Foam::PackingModels::SS<MPPICCloudType> >                             \
+        <Foam::PackingModels::SS<MPPICCloudType>>                             \
             add##SS##CloudType##MPPICCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.C
index ec7715d230..2600555aa3 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ Foam::ParticleStressModels::HarrisCrighton::~HarrisCrighton()
 
 // * * * * * * * * * * * * * Privare Member Functions  * * * * * * * * * * * //
 
-Foam::tmp<Foam::Field<Foam::scalar> >
+Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::ParticleStressModels::HarrisCrighton::denominator
 (
     const Field<scalar>& alpha
@@ -95,7 +95,7 @@ Foam::ParticleStressModels::HarrisCrighton::denominator
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::Field<Foam::scalar> >
+Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::ParticleStressModels::HarrisCrighton::tau
 (
     const Field<scalar>& alpha,
@@ -112,7 +112,7 @@ Foam::ParticleStressModels::HarrisCrighton::tau
 }
 
 
-Foam::tmp<Foam::Field<Foam::scalar> >
+Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::ParticleStressModels::HarrisCrighton::dTaudTheta
 (
     const Field<scalar>& alpha,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.H b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.H
index 9fe56cc954..c2997f59ab 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ class HarrisCrighton
     // Private member functions
 
         //- Return the limited denominator of the radial distribution function
-        tmp<Field<scalar> > denominator(const Field<scalar>& alpha) const;
+        tmp<Field<scalar>> denominator(const Field<scalar>& alpha) const;
 
 
 public:
@@ -119,7 +119,7 @@ public:
     //- Member Functions
 
         //- Collision stress
-        tmp<Field<scalar> > tau
+        tmp<Field<scalar>> tau
         (
             const Field<scalar>& alpha,
             const Field<scalar>& rho,
@@ -127,7 +127,7 @@ public:
         ) const;
 
         //- Collision stress derivaive w.r.t. the volume fraction
-        tmp<Field<scalar> > dTaudTheta
+        tmp<Field<scalar>> dTaudTheta
         (
             const Field<scalar>& alpha,
             const Field<scalar>& rho,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
index 90f3603773..038d11284d 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ Foam::ParticleStressModels::Lun::~Lun()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::Field<Foam::scalar> >
+Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::ParticleStressModels::Lun::tau
 (
     const Field<scalar>& alpha,
@@ -84,7 +84,7 @@ Foam::ParticleStressModels::Lun::tau
     const Field<scalar>& uSqr
 ) const
 {
-    tmp<Field<scalar> > g0
+    tmp<Field<scalar>> g0
     (
         0.6
       / max
@@ -94,13 +94,13 @@ Foam::ParticleStressModels::Lun::tau
         )
     );
 
-    tmp<Field<scalar> > gT(uSqr/3.0);
+    tmp<Field<scalar>> gT(uSqr/3.0);
 
     return alpha*rho*(1.0 + alpha*(1.0 + e_)*g0)*gT;
 }
 
 
-Foam::tmp<Foam::Field<Foam::scalar> >
+Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::ParticleStressModels::Lun::dTaudTheta
 (
     const Field<scalar>& alpha,
@@ -110,7 +110,7 @@ Foam::ParticleStressModels::Lun::dTaudTheta
 {
     NotImplemented;
 
-    return tmp<Field<scalar> >(NULL);
+    return tmp<Field<scalar>>(NULL);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.H b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.H
index 02e686c0bc..369639fa92 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ public:
     //- Member Functions
 
         //- Collision stress
-        tmp<Field<scalar> > tau
+        tmp<Field<scalar>> tau
         (
             const Field<scalar>& alpha,
             const Field<scalar>& rho,
@@ -119,7 +119,7 @@ public:
         ) const;
 
         //- Collision stress derivaive w.r.t. the volume fraction
-        tmp<Field<scalar> > dTaudTheta
+        tmp<Field<scalar>> dTaudTheta
         (
             const Field<scalar>& alpha,
             const Field<scalar>& rho,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
index 0f0c8d6556..7f9509e898 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ Foam::scalar Foam::ParticleStressModel::alphaPacked() const
 }
 
 
-Foam::tmp<Foam::FieldField<Foam::Field, Foam::scalar> >
+Foam::tmp<Foam::FieldField<Foam::Field, Foam::scalar>>
 Foam::ParticleStressModel::tau
 (
     const FieldField<Field, scalar>& alpha,
@@ -106,7 +106,7 @@ Foam::ParticleStressModel::tau
     const FieldField<Field, scalar>& uRms
 ) const
 {
-    tmp<FieldField<Field, scalar> > value
+    tmp<FieldField<Field, scalar>> value
     (
         new FieldField<Field, scalar>(alpha.size())
     );
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H
index 61b117c9f8..477e76ef2e 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ public:
         scalar alphaPacked() const;
 
         //- Collision stress
-        virtual tmp<Field<scalar> > tau
+        virtual tmp<Field<scalar>> tau
         (
             const Field<scalar>& alpha,
             const Field<scalar>& rho,
@@ -120,7 +120,7 @@ public:
         ) const = 0;
 
         //- Collision stress derivaive w.r.t. the volume fraction
-        virtual tmp<Field<scalar> > dTaudTheta
+        virtual tmp<Field<scalar>> dTaudTheta
         (
             const Field<scalar>& alpha,
             const Field<scalar>& rho,
@@ -128,7 +128,7 @@ public:
         ) const = 0;
 
         //- Collision stress using FieldFields
-        tmp<FieldField<Field, scalar> > tau
+        tmp<FieldField<Field, scalar>> tau
         (
             const FieldField<Field, scalar>& alpha,
             const FieldField<Field, scalar>& rho,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.C
index 2ac8811fca..a589fc16ba 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ Foam::ParticleStressModels::exponential::~exponential()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::Field<Foam::scalar> >
+Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::ParticleStressModels::exponential::tau
 (
     const Field<scalar>& alpha,
@@ -90,7 +90,7 @@ Foam::ParticleStressModels::exponential::tau
 }
 
 
-Foam::tmp<Foam::Field<Foam::scalar> >
+Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::ParticleStressModels::exponential::dTaudTheta
 (
     const Field<scalar>& alpha,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.H b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.H
index 5d989622fe..f99c6cc1d1 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ public:
     //- Member Functions
 
         //- Collision stress
-        tmp<Field<scalar> > tau
+        tmp<Field<scalar>> tau
         (
             const Field<scalar>& alpha,
             const Field<scalar>& rho,
@@ -104,7 +104,7 @@ public:
         ) const;
 
         //- Collision stress derivaive w.r.t. the volume fraction
-        tmp<Field<scalar> > dTaudTheta
+        tmp<Field<scalar>> dTaudTheta
         (
             const Field<scalar>& alpha,
             const Field<scalar>& rho,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.H b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.H
index 6a8e6bef50..99ec3e9952 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ public:
     //- Member Functions
 
         //- Time scale
-        virtual tmp<FieldField<Field, scalar> > oneByTau
+        virtual tmp<FieldField<Field, scalar>> oneByTau
         (
             const FieldField<Field, scalar>& alpha,
             const FieldField<Field, scalar>& r32,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.C b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.C
index eee7d5ab89..b9265b898c 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ Foam::TimeScaleModels::equilibrium::~equilibrium()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::FieldField<Foam::Field, Foam::scalar> >
+Foam::tmp<Foam::FieldField<Foam::Field, Foam::scalar>>
 Foam::TimeScaleModels::equilibrium::oneByTau
 (
     const FieldField<Field, scalar>& alpha,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.H b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.H
index a8036d2711..808ac60b84 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ public:
     //- Member Functions
 
         //- Time scale
-        tmp<FieldField<Field, scalar> > oneByTau
+        tmp<FieldField<Field, scalar>> oneByTau
         (
             const FieldField<Field, scalar>& alpha,
             const FieldField<Field, scalar>& r32,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/isotropic/isotropic.C b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/isotropic/isotropic.C
index bb8219e2ae..9beb2f35ce 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/isotropic/isotropic.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/isotropic/isotropic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ Foam::TimeScaleModels::isotropic::~isotropic()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::FieldField<Foam::Field, Foam::scalar> >
+Foam::tmp<Foam::FieldField<Foam::Field, Foam::scalar>>
 Foam::TimeScaleModels::isotropic::oneByTau
 (
     const FieldField<Field, scalar>& alpha,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/isotropic/isotropic.H b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/isotropic/isotropic.H
index 31e0fc3ef1..c056f9449c 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/isotropic/isotropic.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/isotropic/isotropic.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ public:
     //- Member Functions
 
         //- Time scale
-        tmp<FieldField<Field, scalar> > oneByTau
+        tmp<FieldField<Field, scalar>> oneByTau
         (
             const FieldField<Field, scalar>& alpha,
             const FieldField<Field, scalar>& r32,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/nonEquilibrium/nonEquilibrium.C b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/nonEquilibrium/nonEquilibrium.C
index d7462e813a..0521000ec0 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/nonEquilibrium/nonEquilibrium.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/nonEquilibrium/nonEquilibrium.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ Foam::TimeScaleModels::nonEquilibrium::~nonEquilibrium()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::FieldField<Foam::Field, Foam::scalar> >
+Foam::tmp<Foam::FieldField<Foam::Field, Foam::scalar>>
 Foam::TimeScaleModels::nonEquilibrium::oneByTau
 (
     const FieldField<Field, scalar>& alpha,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/nonEquilibrium/nonEquilibrium.H b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/nonEquilibrium/nonEquilibrium.H
index 1c48f9bed1..ef4e9a93d7 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/nonEquilibrium/nonEquilibrium.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/nonEquilibrium/nonEquilibrium.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ public:
     //- Member Functions
 
         //- Time scale
-        tmp<FieldField<Field, scalar> > oneByTau
+        tmp<FieldField<Field, scalar>> oneByTau
         (
             const FieldField<Field, scalar>& alpha,
             const FieldField<Field, scalar>& r32,
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index b57da79fde..0ab2ac3cfa 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
         CompositionModel(const CompositionModel<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<CompositionModel<CloudType> > clone() const = 0;
+        virtual autoPtr<CompositionModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -115,7 +115,7 @@ public:
 
 
     //- Selector
-    static autoPtr<CompositionModel<CloudType> > New
+    static autoPtr<CompositionModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -289,7 +289,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0);      \
                                                                               \
     Foam::CompositionModel<reactingCloudType>::                               \
-        adddictionaryConstructorToTable<Foam::SS<reactingCloudType> >         \
+        adddictionaryConstructorToTable<Foam::SS<reactingCloudType>>         \
             add##SS##CloudType##reactingCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
index a21bcddea8..0323115fd7 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::CompositionModel<CloudType> >
+Foam::autoPtr<Foam::CompositionModel<CloudType>>
 Foam::CompositionModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::CompositionModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<CompositionModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<CompositionModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/NoComposition/NoComposition.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/NoComposition/NoComposition.H
index 716352dc74..c60a9f4e27 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/NoComposition/NoComposition.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/NoComposition/NoComposition.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,9 +67,9 @@ public:
         NoComposition(const NoComposition<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<CompositionModel<CloudType> > clone() const
+        virtual autoPtr<CompositionModel<CloudType>> clone() const
         {
-            return autoPtr<CompositionModel<CloudType> >
+            return autoPtr<CompositionModel<CloudType>>
             (
                 new NoComposition<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
index 1f2e1f8104..71b7d93467 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,9 @@ public:
         SingleMixtureFraction(const SingleMixtureFraction<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<CompositionModel<CloudType> > clone() const
+        virtual autoPtr<CompositionModel<CloudType>> clone() const
         {
-            return autoPtr<CompositionModel<CloudType> >
+            return autoPtr<CompositionModel<CloudType>>
             (
                 new SingleMixtureFraction<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
index 239384cfb2..afb2f9b8b7 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,9 +87,9 @@ public:
         SinglePhaseMixture(const SinglePhaseMixture<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<CompositionModel<CloudType> > clone() const
+        virtual autoPtr<CompositionModel<CloudType>> clone() const
         {
-            return autoPtr<CompositionModel<CloudType> >
+            return autoPtr<CompositionModel<CloudType>>
             (
                 new SinglePhaseMixture<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
index 654109c509..ffe45f5811 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,9 +120,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new ReactingLookupTableInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index f1c3d95830..31535bddbc 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,9 +90,9 @@ public:
         LiquidEvaporation(const LiquidEvaporation<CloudType>& pcm);
 
         //- Construct and return a clone
-        virtual autoPtr<PhaseChangeModel<CloudType> > clone() const
+        virtual autoPtr<PhaseChangeModel<CloudType>> clone() const
         {
-            return autoPtr<PhaseChangeModel<CloudType> >
+            return autoPtr<PhaseChangeModel<CloudType>>
             (
                 new LiquidEvaporation<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H
index f92af8147d..7765690782 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,9 +100,9 @@ public:
         LiquidEvaporationBoil(const LiquidEvaporationBoil<CloudType>& pcm);
 
         //- Construct and return a clone
-        virtual autoPtr<PhaseChangeModel<CloudType> > clone() const
+        virtual autoPtr<PhaseChangeModel<CloudType>> clone() const
         {
-            return autoPtr<PhaseChangeModel<CloudType> >
+            return autoPtr<PhaseChangeModel<CloudType>>
             (
                 new LiquidEvaporationBoil<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index f0d3e459fd..cd86aaf97a 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,9 +62,9 @@ public:
         NoPhaseChange(const NoPhaseChange<CloudType>& pcm);
 
         //- Construct and return a clone
-        virtual autoPtr<PhaseChangeModel<CloudType> > clone() const
+        virtual autoPtr<PhaseChangeModel<CloudType>> clone() const
         {
-            return autoPtr<PhaseChangeModel<CloudType> >
+            return autoPtr<PhaseChangeModel<CloudType>>
             (
                 new NoPhaseChange<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index 6c6ebce20b..36c1c9a72e 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ public:
         PhaseChangeModel(const PhaseChangeModel<CloudType>& pcm);
 
         //- Construct and return a clone
-        virtual autoPtr<PhaseChangeModel<CloudType> > clone() const = 0;
+        virtual autoPtr<PhaseChangeModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -137,7 +137,7 @@ public:
 
 
     //- Selector
-    static autoPtr<PhaseChangeModel<CloudType> > New
+    static autoPtr<PhaseChangeModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -225,7 +225,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0);      \
                                                                               \
     Foam::PhaseChangeModel<reactingCloudType>::                               \
-        adddictionaryConstructorToTable<Foam::SS<reactingCloudType> >         \
+        adddictionaryConstructorToTable<Foam::SS<reactingCloudType>>         \
             add##SS##CloudType##reactingCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
index dcacd8e4b6..bf8ff340bc 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::PhaseChangeModel<CloudType> >
+Foam::autoPtr<Foam::PhaseChangeModel<CloudType>>
 Foam::PhaseChangeModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::PhaseChangeModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<PhaseChangeModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<PhaseChangeModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
index 4b61de316d..407e7f41e4 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ class ConstantRateDevolatilisation
         // Model constants
 
             //- List of volatile data - (name A0)
-            List<Tuple2<word, scalar> > volatileData_;
+            List<Tuple2<word, scalar>> volatileData_;
 
             //- List of initial volatile mass fractions
             List<scalar> YVolatile0_;
@@ -85,9 +85,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<DevolatilisationModel<CloudType> > clone() const
+        virtual autoPtr<DevolatilisationModel<CloudType>> clone() const
         {
-            return autoPtr<DevolatilisationModel<CloudType> >
+            return autoPtr<DevolatilisationModel<CloudType>>
             (
                 new ConstantRateDevolatilisation<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index 334d757b92..086c0b5428 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,7 +99,7 @@ public:
         DevolatilisationModel(const DevolatilisationModel<CloudType>& dm);
 
         //- Construct and return a clone
-        virtual autoPtr<DevolatilisationModel<CloudType> > clone() const = 0;
+        virtual autoPtr<DevolatilisationModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -107,7 +107,7 @@ public:
 
 
     //- Selector
-    static autoPtr<DevolatilisationModel<CloudType> > New
+    static autoPtr<DevolatilisationModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -176,7 +176,7 @@ public:
                                                                               \
     Foam::DevolatilisationModel<reactingMultiphaseCloudType>::                \
         adddictionaryConstructorToTable                                       \
-        <Foam::SS<reactingMultiphaseCloudType> >                              \
+        <Foam::SS<reactingMultiphaseCloudType>>                              \
         add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
index 8e7970ac49..4388b04986 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::DevolatilisationModel<CloudType> >
+Foam::autoPtr<Foam::DevolatilisationModel<CloudType>>
 Foam::DevolatilisationModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::DevolatilisationModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<DevolatilisationModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<DevolatilisationModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
index dab9b47dab..e71a822855 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,9 +63,9 @@ public:
         NoDevolatilisation(const NoDevolatilisation<CloudType>& dm);
 
         //- Construct and return a clone
-        virtual autoPtr<DevolatilisationModel<CloudType> > clone() const
+        virtual autoPtr<DevolatilisationModel<CloudType>> clone() const
         {
-            return autoPtr<DevolatilisationModel<CloudType> >
+            return autoPtr<DevolatilisationModel<CloudType>>
             (
                 new NoDevolatilisation<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
index 6b4802c8f6..6103d96d4d 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -210,9 +210,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<DevolatilisationModel<CloudType> > clone() const
+        virtual autoPtr<DevolatilisationModel<CloudType>> clone() const
         {
-            return autoPtr<DevolatilisationModel<CloudType> >
+            return autoPtr<DevolatilisationModel<CloudType>>
             (
                 new SingleKineticRateDevolatilisation<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
index 81f41d42de..938ff2ef91 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,9 +123,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new ReactingMultiphaseLookupTableInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.H
index 5d02ad4843..a4c6dff4a3 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,9 +80,9 @@ public:
         SuppressionCollision(const SuppressionCollision<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<StochasticCollisionModel<CloudType> > clone() const
+        virtual autoPtr<StochasticCollisionModel<CloudType>> clone() const
         {
-            return autoPtr<StochasticCollisionModel<CloudType> >
+            return autoPtr<StochasticCollisionModel<CloudType>>
             (
                 new SuppressionCollision<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index ae577e705b..8209595f59 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,9 +62,9 @@ public:
         NoSurfaceReaction(const NoSurfaceReaction<CloudType>& srm);
 
         //- Construct and return a clone
-        virtual autoPtr<SurfaceReactionModel<CloudType> > clone() const
+        virtual autoPtr<SurfaceReactionModel<CloudType>> clone() const
         {
-            return autoPtr<SurfaceReactionModel<CloudType> >
+            return autoPtr<SurfaceReactionModel<CloudType>>
             (
                 new NoSurfaceReaction<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index a490a24323..6c6eb1d2b4 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ public:
         SurfaceReactionModel(const SurfaceReactionModel<CloudType>& srm);
 
         //- Construct and return a clone
-        virtual autoPtr<SurfaceReactionModel<CloudType> > clone() const = 0;
+        virtual autoPtr<SurfaceReactionModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -109,7 +109,7 @@ public:
 
 
     //- Selector
-    static autoPtr<SurfaceReactionModel<CloudType> > New
+    static autoPtr<SurfaceReactionModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& cloud
@@ -186,7 +186,7 @@ public:
                                                                               \
     Foam::SurfaceReactionModel<reactingMultiphaseCloudType>::                 \
         adddictionaryConstructorToTable                                       \
-        <Foam::SS<reactingMultiphaseCloudType> >                              \
+        <Foam::SS<reactingMultiphaseCloudType>>                              \
         add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
index 935fd37e60..4fd894b93c 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::SurfaceReactionModel<CloudType> >
+Foam::autoPtr<Foam::SurfaceReactionModel<CloudType>>
 Foam::SurfaceReactionModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::SurfaceReactionModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<SurfaceReactionModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<SurfaceReactionModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
index b2dc21c528..c7be8874d2 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ public:
         HeatTransferModel(const HeatTransferModel<CloudType>& htm);
 
         //- Construct and return a clone
-        virtual autoPtr<HeatTransferModel<CloudType> > clone() const = 0;
+        virtual autoPtr<HeatTransferModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -105,7 +105,7 @@ public:
 
 
     //- Selector
-    static autoPtr<HeatTransferModel<CloudType> > New
+    static autoPtr<HeatTransferModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -171,7 +171,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<thermoCloudType>, 0);        \
                                                                               \
     Foam::HeatTransferModel<thermoCloudType>::                                \
-        adddictionaryConstructorToTable<Foam::SS<thermoCloudType> >           \
+        adddictionaryConstructorToTable<Foam::SS<thermoCloudType>>           \
             add##SS##CloudType##thermoCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
index 609a317e38..6fae8667d2 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::HeatTransferModel<CloudType> >
+Foam::autoPtr<Foam::HeatTransferModel<CloudType>>
 Foam::HeatTransferModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::HeatTransferModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<HeatTransferModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<HeatTransferModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
index 6059489ab4..a53fe6f5cf 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,9 +63,9 @@ public:
         NoHeatTransfer(const NoHeatTransfer<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<HeatTransferModel<CloudType> > clone() const
+        virtual autoPtr<HeatTransferModel<CloudType>> clone() const
         {
-            return autoPtr<HeatTransferModel<CloudType> >
+            return autoPtr<HeatTransferModel<CloudType>>
             (
                 new NoHeatTransfer<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
index d7669e4da6..8d8d20deab 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,9 +64,9 @@ public:
         RanzMarshall(const RanzMarshall<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<HeatTransferModel<CloudType> > clone() const
+        virtual autoPtr<HeatTransferModel<CloudType>> clone() const
         {
-            return autoPtr<HeatTransferModel<CloudType> >
+            return autoPtr<HeatTransferModel<CloudType>>
             (
                 new RanzMarshall<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
index 42c48f290d..54394a9d8c 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,9 +120,9 @@ public:
         );
 
         //- Construct and return a clone using supplied owner cloud
-        virtual autoPtr<InjectionModel<CloudType> > clone() const
+        virtual autoPtr<InjectionModel<CloudType>> clone() const
         {
-            return autoPtr<InjectionModel<CloudType> >
+            return autoPtr<InjectionModel<CloudType>>
             (
                 new ThermoLookupTableInjection<CloudType>(*this)
             );
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
index dd434f1b36..6f97e165f0 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -254,9 +254,9 @@ public:
         ThermoSurfaceFilm(const ThermoSurfaceFilm<CloudType>& sfm);
 
         //- Construct and return a clone using supplied owner cloud
-        virtual autoPtr<SurfaceFilmModel<CloudType> > clone() const
+        virtual autoPtr<SurfaceFilmModel<CloudType>> clone() const
         {
-            return autoPtr<SurfaceFilmModel<CloudType> >
+            return autoPtr<SurfaceFilmModel<CloudType>>
             (
                 new ThermoSurfaceFilm<CloudType>(*this)
             );
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
index e3f9bea103..2bbccf60fc 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
@@ -38,7 +38,7 @@ namespace Foam
 void Foam::distribution::write
 (
     const fileName& file,
-    const List<Pair<scalar> >& pairs
+    const List<Pair<scalar>>& pairs
 )
 {
     OFstream os(file);
@@ -156,7 +156,7 @@ Foam::scalar Foam::distribution::median()
 
     scalar runningSum = 0.0;
 
-    List<Pair<scalar> > normDist(normalised());
+    List<Pair<scalar>> normDist(normalised());
 
     if (normDist.size())
     {
@@ -268,7 +268,7 @@ void Foam::distribution::insertMissingKeys()
 }
 
 
-Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalised()
+Foam::List<Foam::Pair<Foam::scalar>> Foam::distribution::normalised()
 {
     scalar totEnt = approxTotalEntries();
 
@@ -278,7 +278,7 @@ Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalised()
 
     sort(keys);
 
-    List<Pair<scalar> > normDist(size());
+    List<Pair<scalar>> normDist(size());
 
     forAll(keys,k)
     {
@@ -298,20 +298,20 @@ Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalised()
 }
 
 
-Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalisedMinusMean()
+Foam::List<Foam::Pair<Foam::scalar>> Foam::distribution::normalisedMinusMean()
 {
     return normalisedShifted(mean());
 }
 
 
-Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalisedShifted
+Foam::List<Foam::Pair<Foam::scalar>> Foam::distribution::normalisedShifted
 (
     scalar shiftValue
 )
 {
-    List<Pair<scalar> > oldDist(normalised());
+    List<Pair<scalar>> oldDist(normalised());
 
-    List<Pair<scalar> > newDist(oldDist.size());
+    List<Pair<scalar>> newDist(oldDist.size());
 
     forAll(oldDist,u)
     {
@@ -416,7 +416,7 @@ Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalisedShifted
 }
 
 
-Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::raw()
+Foam::List<Foam::Pair<Foam::scalar>> Foam::distribution::raw()
 {
     insertMissingKeys();
 
@@ -424,7 +424,7 @@ Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::raw()
 
     sort(keys);
 
-    List<Pair<scalar> > rawDist(size());
+    List<Pair<scalar>> rawDist(size());
 
     forAll(keys,k)
     {
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
index ed25c5e1f0..db3fe62f21 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ public:
             static void write
             (
                 const fileName& file,
-                const List<Pair<scalar> >& pairs
+                const List<Pair<scalar>>& pairs
             );
 
 
@@ -108,13 +108,13 @@ public:
 
         void insertMissingKeys();
 
-        List<Pair<scalar> > normalised();
+        List<Pair<scalar>> normalised();
 
-        List<Pair<scalar> > normalisedMinusMean();
+        List<Pair<scalar>> normalisedMinusMean();
 
-        List<Pair<scalar> > normalisedShifted(scalar shiftValue);
+        List<Pair<scalar>> normalisedShifted(scalar shiftValue);
 
-        List<Pair<scalar> > raw();
+        List<Pair<scalar>> raw();
 
 
         // Access
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateMDFields.H
index af5c938da4..0099db3f3e 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateMDFields.H
@@ -1,4 +1,4 @@
-const List<DynamicList<molecule*> >& cellOccupancy = molecules.cellOccupancy();
+const List<DynamicList<molecule*>>& cellOccupancy = molecules.cellOccupancy();
 
 forAll(cellOccupancy, cell)
 {
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index 3e48822f03..ae57fb42fa 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -181,7 +181,7 @@ void Foam::moleculeCloud::calculatePairForce()
 
         const labelListList& ril = il_.ril();
 
-        List<IDLList<molecule> >& referredMols = il_.referredParticles();
+        List<IDLList<molecule>>& referredMols = il_.referredParticles();
 
         forAll(ril, r)
         {
@@ -376,7 +376,7 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
 
         const labelListList& ril(il_.ril());
 
-        List<IDLList<molecule> >& referredMols = il_.referredParticles();
+        List<IDLList<molecule>>& referredMols = il_.referredParticles();
 
         forAll(ril, r)
         {
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
index 16685b4132..35a109e940 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ private:
 
         const potential& pot_;
 
-        List<DynamicList<molecule*> > cellOccupancy_;
+        List<DynamicList<molecule*>> cellOccupancy_;
 
         InteractionLists<molecule> il_;
 
@@ -185,7 +185,7 @@ public:
 
             inline const potential& pot() const;
 
-            inline const List<DynamicList<molecule*> >& cellOccupancy() const;
+            inline const List<DynamicList<molecule*>>& cellOccupancy() const;
 
             inline const InteractionLists<molecule>& il() const;
 
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
index 553606bd9f..63f89a69bd 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -353,7 +353,7 @@ inline const Foam::potential& Foam::moleculeCloud::pot() const
 }
 
 
-inline const Foam::List<Foam::DynamicList<Foam::molecule*> >&
+inline const Foam::List<Foam::DynamicList<Foam::molecule*>>&
     Foam::moleculeCloud::cellOccupancy() const
 {
     return cellOccupancy_;
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
index 535a298015..c2adf84221 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
@@ -116,7 +116,7 @@ Foam::scalar Foam::pairPotential::force(const scalar r) const
 Foam::List<Foam::Pair<Foam::scalar>>
 Foam::pairPotential::forceTable() const
 {
-    List<Pair<scalar> > forceTab(forceLookup_.size());
+    List<Pair<scalar>> forceTab(forceLookup_.size());
 
     forAll(forceLookup_,k)
     {
@@ -153,7 +153,7 @@ Foam::scalar Foam::pairPotential::energy(const scalar r) const
 Foam::List<Foam::Pair<Foam::scalar>>
     Foam::pairPotential::energyTable() const
 {
-    List<Pair<scalar> > energyTab(energyLookup_.size());
+    List<Pair<scalar>> energyTab(energyLookup_.size());
 
     forAll(energyLookup_,k)
     {
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
index 9d093d2b8e..e75eaf624e 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,9 +152,9 @@ public:
 
         scalar force (const scalar r) const;
 
-        List<Pair<scalar> > energyTable() const;
+        List<Pair<scalar>> energyTable() const;
 
-        List<Pair<scalar> > forceTable() const;
+        List<Pair<scalar>> forceTable() const;
 
         inline bool writeTables() const;
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
index c1022a6434..e6e604f5bd 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
@@ -31,9 +31,9 @@ bool Foam::pairPotential::writeEnergyAndForceTables(Ostream& os) const
     Info<< "Writing energy and force tables to file for potential "
         << name_ << endl;
 
-    List<Pair <scalar> > eTab(energyTable());
+    List<Pair <scalar>> eTab(energyTable());
 
-    List<Pair <scalar> > fTab(forceTable());
+    List<Pair <scalar>> fTab(forceTable());
 
     forAll(eTab, e)
     {
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.C b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.C
index 4bc55c989e..b6542dc3a7 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.C
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ void Foam::SprayCloud<CloudType>::setModels()
 {
     atomizationModel_.reset
     (
-        AtomizationModel<SprayCloud<CloudType> >::New
+        AtomizationModel<SprayCloud<CloudType>>::New
         (
             this->subModelProperties(),
             *this
@@ -43,7 +43,7 @@ void Foam::SprayCloud<CloudType>::setModels()
 
     breakupModel_.reset
     (
-        BreakupModel<SprayCloud<CloudType> >::New
+        BreakupModel<SprayCloud<CloudType>>::New
         (
             this->subModelProperties(),
             *this
@@ -218,7 +218,7 @@ void Foam::SprayCloud<CloudType>::evolve()
     if (this->solution().canEvolve())
     {
         typename parcelType::template
-            TrackingData<SprayCloud<CloudType> > td(*this);
+            TrackingData<SprayCloud<CloudType>> td(*this);
 
         this->solve(td);
     }
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
index 2055c375e8..68b84d850f 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ private:
     // Private data
 
         //- Cloud copy pointer
-        autoPtr<SprayCloud<CloudType> > cloudCopyPtr_;
+        autoPtr<SprayCloud<CloudType>> cloudCopyPtr_;
 
         //- Average parcel mass
         scalar averageParcelMass_;
@@ -101,11 +101,11 @@ protected:
         // References to the cloud sub-models
 
             //- Atomization model
-            autoPtr<AtomizationModel<SprayCloud<CloudType> > >
+            autoPtr<AtomizationModel<SprayCloud<CloudType>>>
                 atomizationModel_;
 
             //- Break-up model
-            autoPtr<BreakupModel<SprayCloud<CloudType> > > breakupModel_;
+            autoPtr<BreakupModel<SprayCloud<CloudType>>> breakupModel_;
 
 
     // Protected Member Functions
@@ -150,18 +150,18 @@ public:
 
 
         //- Construct and return clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > clone(const word& name)
+        virtual autoPtr<Cloud<parcelType>> clone(const word& name)
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new SprayCloud(*this, name)
             );
         }
 
         //- Construct and return bare clone based on (this) with new name
-        virtual autoPtr<Cloud<parcelType> > cloneBare(const word& name) const
+        virtual autoPtr<Cloud<parcelType>> cloneBare(const word& name) const
         {
-            return autoPtr<Cloud<parcelType> >
+            return autoPtr<Cloud<parcelType>>
             (
                 new SprayCloud(this->mesh(), name, *this)
             );
@@ -186,18 +186,18 @@ public:
             // Sub-models
 
                 //- Return const-access to the atomization model
-                inline const AtomizationModel<SprayCloud<CloudType> >&
+                inline const AtomizationModel<SprayCloud<CloudType>>&
                     atomization() const;
 
                 //- Return reference to the atomization model
-                inline AtomizationModel<SprayCloud<CloudType> >& atomization();
+                inline AtomizationModel<SprayCloud<CloudType>>& atomization();
 
                 //- Return const-access to the breakup model
-                inline const BreakupModel<SprayCloud<CloudType> >&
+                inline const BreakupModel<SprayCloud<CloudType>>&
                     breakup() const;
 
                 //- Return reference to the breakup model
-                inline BreakupModel<SprayCloud<CloudType> >& breakup();
+                inline BreakupModel<SprayCloud<CloudType>>& breakup();
 
 
         // Cloud evolution functions
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
index 834dbbddd4..ecabcb71a2 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Foam::SprayCloud<CloudType>::cloudCopy() const
 
 
 template<class CloudType>
-inline const Foam::AtomizationModel<Foam::SprayCloud<CloudType> >&
+inline const Foam::AtomizationModel<Foam::SprayCloud<CloudType>>&
 Foam::SprayCloud<CloudType>::atomization() const
 {
     return atomizationModel_;
@@ -42,7 +42,7 @@ Foam::SprayCloud<CloudType>::atomization() const
 
 
 template<class CloudType>
-inline Foam::AtomizationModel<Foam::SprayCloud<CloudType> >&
+inline Foam::AtomizationModel<Foam::SprayCloud<CloudType>>&
 Foam::SprayCloud<CloudType>::atomization()
 {
     return atomizationModel_();
@@ -50,7 +50,7 @@ Foam::SprayCloud<CloudType>::atomization()
 
 
 template<class CloudType>
-inline const Foam::BreakupModel<Foam::SprayCloud<CloudType> >&
+inline const Foam::BreakupModel<Foam::SprayCloud<CloudType>>&
 Foam::SprayCloud<CloudType>::breakup() const
 {
     return breakupModel_;
@@ -58,7 +58,7 @@ Foam::SprayCloud<CloudType>::breakup() const
 
 
 template<class CloudType>
-inline Foam::BreakupModel<Foam::SprayCloud<CloudType> >&
+inline Foam::BreakupModel<Foam::SprayCloud<CloudType>>&
 Foam::SprayCloud<CloudType>::breakup()
 {
     return breakupModel_();
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
index 4e1fab22d0..d6d29cd904 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -270,9 +270,9 @@ public:
                 mesh_(mesh)
             {}
 
-            autoPtr<SprayParcel<ParcelType> > operator()(Istream& is) const
+            autoPtr<SprayParcel<ParcelType>> operator()(Istream& is) const
             {
-                return autoPtr<SprayParcel<ParcelType> >
+                return autoPtr<SprayParcel<ParcelType>>
                 (
                     new SprayParcel<ParcelType>(mesh_, is, true)
                 );
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
index 7d85441b1e..101ea7cf79 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -171,7 +171,7 @@ void Foam::SprayParcel<ParcelType>::readFields
     c.checkFieldIOobject(c, user);
 
     label i = 0;
-    forAllIter(typename Cloud<SprayParcel<ParcelType> >, c, iter)
+    forAllIter(typename Cloud<SprayParcel<ParcelType>>, c, iter)
     {
         SprayParcel<ParcelType>& p = iter();
         p.d0_ = d0[i];
@@ -239,7 +239,7 @@ void Foam::SprayParcel<ParcelType>::writeFields
     IOField<scalar> user(c.fieldIOobject("user", IOobject::NO_READ), np);
 
     label i = 0;
-    forAllConstIter(typename Cloud<SprayParcel<ParcelType> >, c, iter)
+    forAllConstIter(typename Cloud<SprayParcel<ParcelType>>, c, iter)
     {
         const SprayParcel<ParcelType>& p = iter();
         d0[i] = p.d0_;
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
index d0e8ecacbf..a4f6ddab7d 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ public:
         AtomizationModel(const AtomizationModel<CloudType>& am);
 
         //- Construct and return a clone
-        virtual autoPtr<AtomizationModel<CloudType> > clone() const = 0;
+        virtual autoPtr<AtomizationModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -99,7 +99,7 @@ public:
 
 
     //- Selector
-    static autoPtr<AtomizationModel<CloudType> > New
+    static autoPtr<AtomizationModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -169,7 +169,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<sprayCloudType>, 0);         \
                                                                               \
     Foam::AtomizationModel<sprayCloudType>::                                  \
-        adddictionaryConstructorToTable<Foam::SS<sprayCloudType> >            \
+        adddictionaryConstructorToTable<Foam::SS<sprayCloudType>>            \
             add##SS##CloudType##sprayCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C
index 3ef9a30928..475f66f088 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::AtomizationModel<CloudType> >
+Foam::autoPtr<Foam::AtomizationModel<CloudType>>
 Foam::AtomizationModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::AtomizationModel<CloudType>::New
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
-    return autoPtr<AtomizationModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<AtomizationModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H
index f6a2af7093..b2ace22a8e 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,9 +82,9 @@ public:
         BlobsSheetAtomization(const BlobsSheetAtomization<CloudType>& am);
 
         //- Construct and return a clone
-        virtual autoPtr<AtomizationModel<CloudType> > clone() const
+        virtual autoPtr<AtomizationModel<CloudType>> clone() const
         {
-            return autoPtr<AtomizationModel<CloudType> >
+            return autoPtr<AtomizationModel<CloudType>>
             (
                 new BlobsSheetAtomization<CloudType>(*this)
             );
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H
index a993c3e911..d46938f646 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,9 +102,9 @@ public:
         LISAAtomization(const LISAAtomization<CloudType>& am);
 
         //- Construct and return a clone
-        virtual autoPtr<AtomizationModel<CloudType> > clone() const
+        virtual autoPtr<AtomizationModel<CloudType>> clone() const
         {
-            return autoPtr<AtomizationModel<CloudType> >
+            return autoPtr<AtomizationModel<CloudType>>
             (
                 new LISAAtomization<CloudType>(*this)
             );
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H b/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H
index 077f544d12..aff33e4036 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,9 +62,9 @@ public:
         NoAtomization(const NoAtomization<CloudType>& am);
 
         //- Construct and return a clone
-        virtual autoPtr<AtomizationModel<CloudType> > clone() const
+        virtual autoPtr<AtomizationModel<CloudType>> clone() const
         {
-            return autoPtr<AtomizationModel<CloudType> >
+            return autoPtr<AtomizationModel<CloudType>>
             (
                 new NoAtomization<CloudType>(*this)
             );
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
index 6300a8fcfa..15554fb608 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,7 +106,7 @@ public:
         BreakupModel(const BreakupModel<CloudType>& bum);
 
         //- Construct and return a clone
-        virtual autoPtr<BreakupModel<CloudType> > clone() const = 0;
+        virtual autoPtr<BreakupModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
@@ -114,7 +114,7 @@ public:
 
 
     //- Selector
-    static autoPtr<BreakupModel<CloudType> > New
+    static autoPtr<BreakupModel<CloudType>> New
     (
         const dictionary& dict,
         CloudType& owner
@@ -216,7 +216,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<sprayCloudType>, 0);         \
                                                                               \
     Foam::BreakupModel<sprayCloudType>::                                      \
-        adddictionaryConstructorToTable<Foam::SS<sprayCloudType> >            \
+        adddictionaryConstructorToTable<Foam::SS<sprayCloudType>>            \
             add##SS##CloudType##sprayCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C
index d60bfc051a..649b465b29 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::BreakupModel<CloudType> >
+Foam::autoPtr<Foam::BreakupModel<CloudType>>
 Foam::BreakupModel<CloudType>::New
 (
     const dictionary& dict,
@@ -52,7 +52,7 @@ Foam::BreakupModel<CloudType>::New
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
-    return autoPtr<BreakupModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<BreakupModel<CloudType>>(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H
index 7a681c8dbe..20881a013b 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,9 @@ public:
         ETAB(const ETAB<CloudType>& bum);
 
         //- Construct and return a clone
-        virtual autoPtr<BreakupModel<CloudType> > clone() const
+        virtual autoPtr<BreakupModel<CloudType>> clone() const
         {
-            return autoPtr<BreakupModel<CloudType> >
+            return autoPtr<BreakupModel<CloudType>>
             (
                 new ETAB<CloudType>(*this)
             );
diff --git a/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H b/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H
index 6371570638..bb9c1424d3 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,9 +62,9 @@ public:
         NoBreakup(const NoBreakup<CloudType>& bum);
 
         //- Construct and return a clone
-        virtual autoPtr<BreakupModel<CloudType> > clone() const
+        virtual autoPtr<BreakupModel<CloudType>> clone() const
         {
-            return autoPtr<BreakupModel<CloudType> >
+            return autoPtr<BreakupModel<CloudType>>
             (
                 new NoBreakup<CloudType>(*this)
             );
diff --git a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H
index 235c9d76c0..c4232a4b60 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,9 +96,9 @@ public:
         PilchErdman(const PilchErdman<CloudType>& bum);
 
         //- Construct and return a clone
-        virtual autoPtr<BreakupModel<CloudType> > clone() const
+        virtual autoPtr<BreakupModel<CloudType>> clone() const
         {
-            return autoPtr<BreakupModel<CloudType> >
+            return autoPtr<BreakupModel<CloudType>>
             (
                 new PilchErdman<CloudType>(*this)
             );
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H
index 9d9081ab34..99bcbc6bd1 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,9 +90,9 @@ public:
         ReitzDiwakar(const ReitzDiwakar<CloudType>& bum);
 
         //- Construct and return a clone
-        virtual autoPtr<BreakupModel<CloudType> > clone() const
+        virtual autoPtr<BreakupModel<CloudType>> clone() const
         {
-            return autoPtr<BreakupModel<CloudType> >
+            return autoPtr<BreakupModel<CloudType>>
             (
                 new ReitzDiwakar<CloudType>(*this)
             );
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H
index 0cc56e8753..0ea6e7b67e 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,9 +77,9 @@ public:
         ReitzKHRT(const ReitzKHRT<CloudType>& bum);
 
         //- Construct and return a clone
-        virtual autoPtr<BreakupModel<CloudType> > clone() const
+        virtual autoPtr<BreakupModel<CloudType>> clone() const
         {
-            return autoPtr<BreakupModel<CloudType> >
+            return autoPtr<BreakupModel<CloudType>>
             (
                 new ReitzKHRT<CloudType>(*this)
             );
diff --git a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H
index 94456c64a8..295b79d4fa 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,9 +119,9 @@ public:
         SHF(const SHF<CloudType>& bum);
 
         //- Construct and return a clone
-        virtual autoPtr<BreakupModel<CloudType> > clone() const
+        virtual autoPtr<BreakupModel<CloudType>> clone() const
         {
-            return autoPtr<BreakupModel<CloudType> >
+            return autoPtr<BreakupModel<CloudType>>
             (
                 new SHF<CloudType>(*this)
             );
diff --git a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H
index f5f6b73c71..f9f17423c5 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,9 +102,9 @@ public:
         TAB(const TAB<CloudType>& im);
 
         //- Construct and return a clone
-        virtual autoPtr<BreakupModel<CloudType> > clone() const
+        virtual autoPtr<BreakupModel<CloudType>> clone() const
         {
-            return autoPtr<BreakupModel<CloudType> >
+            return autoPtr<BreakupModel<CloudType>>
             (
                 new TAB<CloudType>(*this)
             );
diff --git a/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.H b/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.H
index 0e3381a9af..543c9c7c68 100644
--- a/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.H
+++ b/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,9 +108,9 @@ public:
         ORourkeCollision(const ORourkeCollision<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<StochasticCollisionModel<CloudType> > clone() const
+        virtual autoPtr<StochasticCollisionModel<CloudType>> clone() const
         {
-            return autoPtr<StochasticCollisionModel<CloudType> >
+            return autoPtr<StochasticCollisionModel<CloudType>>
             (
                 new ORourkeCollision<CloudType>(*this)
             );
diff --git a/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.H b/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.H
index ebd23198a0..31c9ca80b6 100644
--- a/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.H
+++ b/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,9 @@ public:
         TrajectoryCollision(const TrajectoryCollision<CloudType>& cm);
 
         //- Construct and return a clone
-        virtual autoPtr<StochasticCollisionModel<CloudType> > clone() const
+        virtual autoPtr<StochasticCollisionModel<CloudType>> clone() const
         {
-            return autoPtr<StochasticCollisionModel<CloudType> >
+            return autoPtr<StochasticCollisionModel<CloudType>>
             (
                 new TrajectoryCollision<CloudType>(*this)
             );
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
index 278192e506..6e95c15749 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ public:
         DispersionRASModel(const DispersionRASModel<CloudType>& dm);
 
         //- Construct and return a clone
-        virtual autoPtr<DispersionModel<CloudType> > clone() const = 0;
+        virtual autoPtr<DispersionModel<CloudType>> clone() const = 0;
 
 
     //- Destructor
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
index c48025d41b..ee9453d31a 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,9 +78,9 @@ public:
         GradientDispersionRAS(const GradientDispersionRAS<CloudType>& dm);
 
         //- Construct and return a clone
-        virtual autoPtr<DispersionModel<CloudType> > clone() const
+        virtual autoPtr<DispersionModel<CloudType>> clone() const
         {
-            return autoPtr<DispersionModel<CloudType> >
+            return autoPtr<DispersionModel<CloudType>>
             (
                 new GradientDispersionRAS<CloudType>(*this)
             );
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
index fe6acc7ae0..53c5f3904f 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,9 +65,9 @@ public:
         StochasticDispersionRAS(const StochasticDispersionRAS<CloudType>& dm);
 
         //- Construct and return a clone
-        virtual autoPtr<DispersionModel<CloudType> > clone() const
+        virtual autoPtr<DispersionModel<CloudType>> clone() const
         {
-            return autoPtr<DispersionModel<CloudType> >
+            return autoPtr<DispersionModel<CloudType>>
             (
                 new StochasticDispersionRAS<CloudType>(*this)
             );
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
index b3df4ac786..8cac9f0e6f 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,9 +100,9 @@ public:
         BrownianMotionForce(const BrownianMotionForce& bmf);
 
         //- Construct and return a clone
-        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
         {
-            return autoPtr<ParticleForce<CloudType> >
+            return autoPtr<ParticleForce<CloudType>>
             (
                 new BrownianMotionForce<CloudType>(*this)
             );
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
index f355d8cfed..adb49d5a93 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -531,8 +531,8 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
     // edge for extrusion.
 
 
-    List<List<point> > edgeFaceNormals(pp.nEdges());
-    List<List<bool> > edgeFaceExtrude(pp.nEdges());
+    List<List<point>> edgeFaceNormals(pp.nEdges());
+    List<List<bool>> edgeFaceExtrude(pp.nEdges());
 
     const labelListList& edgeFaces = pp.edgeFaces();
     const vectorField& faceNormals = pp.faceNormals();
@@ -557,7 +557,7 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
         mesh,
         meshEdges,
         edgeFaceNormals,
-        globalMeshData::ListPlusEqOp<List<point> >(),   // combine operator
+        globalMeshData::ListPlusEqOp<List<point>>(),   // combine operator
         List<point>()               // null value
     );
 
@@ -566,7 +566,7 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
         mesh,
         meshEdges,
         edgeFaceExtrude,
-        globalMeshData::ListPlusEqOp<List<bool> >(),    // combine operator
+        globalMeshData::ListPlusEqOp<List<bool>>(),    // combine operator
         List<bool>()                // null value
     );
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
index b72d147a84..d04c5ac43e 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -189,9 +189,9 @@ class autoSnapDriver
                     const vectorField& faceSurfaceNormal,
                     const labelList& faceSurfaceRegion,
 
-                    List<List<point> >& pointFaceSurfNormals,
-                    List<List<point> >& pointFaceDisp,
-                    List<List<point> >& pointFaceCentres,
+                    List<List<point>>& pointFaceSurfNormals,
+                    List<List<point>>& pointFaceDisp,
+                    List<List<point>>& pointFaceCentres,
                     List<labelList>&    pointFacePatchID
                 ) const;
                 void correctAttraction
@@ -233,7 +233,7 @@ class autoSnapDriver
                     const indirectPrimitivePatch& pp,
                     const scalarField& snapDist,
 
-                    const List<List<point> >& pointFaceCentres,
+                    const List<List<point>>& pointFaceCentres,
                     const labelListList& pointFacePatchID,
 
                     const vectorField& rawPatchAttraction,
@@ -302,9 +302,9 @@ class autoSnapDriver
                     const vectorField& nearestDisp,
                     const label pointI,
 
-                    const List<List<point> >& pointFaceSurfNormals,
-                    const List<List<point> >& pointFaceDisp,
-                    const List<List<point> >& pointFaceCentres,
+                    const List<List<point>>& pointFaceSurfNormals,
+                    const List<List<point>>& pointFaceDisp,
+                    const List<List<point>>& pointFaceCentres,
                     const labelListList& pointFacePatchID,
 
                     DynamicList<point>& surfacePoints,
@@ -326,9 +326,9 @@ class autoSnapDriver
                     const scalarField& snapDist,
                     const vectorField& nearestDisp,
 
-                    const List<List<point> >& pointFaceSurfNormals,
-                    const List<List<point> >& pointFaceDisp,
-                    const List<List<point> >& pointFaceCentres,
+                    const List<List<point>>& pointFaceSurfNormals,
+                    const List<List<point>>& pointFaceDisp,
+                    const List<List<point>>& pointFaceCentres,
                     const labelListList& pointFacePatchID,
 
                     vectorField& patchAttraction,
@@ -347,16 +347,16 @@ class autoSnapDriver
                     const scalarField& snapDist,
                     const vectorField& nearestDisp,
 
-                    const List<List<point> >& pointFaceSurfNormals,
-                    const List<List<point> >& pointFaceDisp,
-                    const List<List<point> >& pointFaceCentres,
+                    const List<List<point>>& pointFaceSurfNormals,
+                    const List<List<point>>& pointFaceDisp,
+                    const List<List<point>>& pointFaceCentres,
                     const labelListList& pointFacePatchID,
 
                     List<labelList>& pointAttractor,
-                    List<List<pointConstraint> >& pointConstraints,
+                    List<List<pointConstraint>>& pointConstraints,
                     // Feature-edge to pp point
-                    List<List<DynamicList<point> > >& edgeAttractors,
-                    List<List<DynamicList<pointConstraint> > >& edgeConstraints,
+                    List<List<DynamicList<point>>>& edgeAttractors,
+                    List<List<DynamicList<pointConstraint>>>& edgeConstraints,
                     vectorField& patchAttraction,
                     List<pointConstraint>& patchConstraints
                 ) const;
@@ -373,10 +373,10 @@ class autoSnapDriver
 
                     // Feature-point to pp point
                     List<labelList>& pointAttractor,
-                    List<List<pointConstraint> >& pointConstraints,
+                    List<List<pointConstraint>>& pointConstraints,
                     // Feature-edge to pp point
-                    List<List<DynamicList<point> > >& edgeAttractors,
-                    List<List<DynamicList<pointConstraint> > >& edgeConstraints,
+                    List<List<DynamicList<point>>>& edgeAttractors,
+                    List<List<DynamicList<pointConstraint>>>& edgeConstraints,
                     // pp point to nearest feature
                     vectorField& patchAttraction,
                     List<pointConstraint>& patchConstraints
@@ -390,10 +390,10 @@ class autoSnapDriver
 
                     // Feature-point to pp point
                     const List<labelList>& pointAttractor,
-                    const List<List<pointConstraint> >& pointConstraints,
+                    const List<List<pointConstraint>>& pointConstraints,
                     // Feature-edge to pp point
-                    const List<List<DynamicList<point> > >& edgeAttractors,
-                    const List<List<DynamicList<pointConstraint> > >&,
+                    const List<List<DynamicList<point>>>& edgeAttractors,
+                    const List<List<DynamicList<pointConstraint>>>&,
 
                     const vectorField& rawPatchAttraction,
                     const List<pointConstraint>& rawPatchConstraints,
@@ -415,8 +415,8 @@ class autoSnapDriver
                     const label pointI,
                     const point& estimatedPt,
 
-                    List<List<DynamicList<point> > >&,
-                    List<List<DynamicList<pointConstraint> > >&,
+                    List<List<DynamicList<point>>>&,
+                    List<List<DynamicList<pointConstraint>>>&,
                     vectorField&,
                     List<pointConstraint>&
                 ) const;
@@ -438,10 +438,10 @@ class autoSnapDriver
 
                     // Feature-point to pp point
                     List<labelList>& pointAttractor,
-                    List<List<pointConstraint> >& pointConstraints,
+                    List<List<pointConstraint>>& pointConstraints,
                     // Feature-edge to pp point
-                    List<List<DynamicList<point> > >& edgeAttractors,
-                    List<List<DynamicList<pointConstraint> > >& edgeConstraints,
+                    List<List<DynamicList<point>>>& edgeAttractors,
+                    List<List<DynamicList<pointConstraint>>>& edgeConstraints,
                     // pp point to nearest feature
                     vectorField& patchAttraction,
                     List<pointConstraint>& patchConstraints
@@ -457,9 +457,9 @@ class autoSnapDriver
                     const scalarField& snapDist,
                     const vectorField& nearestDisp,
 
-                    const List<List<point> >& pointFaceSurfNormals,
-                    const List<List<point> >& pointFaceDisp,
-                    const List<List<point> >& pointFaceCentres,
+                    const List<List<point>>& pointFaceSurfNormals,
+                    const List<List<point>>& pointFaceDisp,
+                    const List<List<point>>& pointFaceCentres,
                     const labelListList& pointFacePatchID,
 
                     vectorField& patchAttraction,
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
index 183b59a445..c8571fb210 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -450,9 +450,9 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
     const vectorField& faceSurfaceNormal,
     const labelList& faceSurfaceGlobalRegion,
 
-    List<List<point> >& pointFaceSurfNormals,
-    List<List<point> >& pointFaceDisp,
-    List<List<point> >& pointFaceCentres,
+    List<List<point>>& pointFaceSurfNormals,
+    List<List<point>>& pointFaceDisp,
+    List<List<point>>& pointFaceCentres,
     List<labelList>&    pointFacePatchID
 ) const
 {
@@ -827,9 +827,9 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
     const vectorField& nearestDisp,
     const label pointI,
 
-    const List<List<point> >& pointFaceSurfNormals,
-    const List<List<point> >& pointFaceDisp,
-    const List<List<point> >& pointFaceCentres,
+    const List<List<point>>& pointFaceSurfNormals,
+    const List<List<point>>& pointFaceDisp,
+    const List<List<point>>& pointFaceCentres,
     const labelListList& pointFacePatchID,
 
     DynamicList<point>& surfacePoints,
@@ -1020,9 +1020,9 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
     const scalarField& snapDist,
     const vectorField& nearestDisp,
 
-    const List<List<point> >& pointFaceSurfNormals,
-    const List<List<point> >& pointFaceDisp,
-    const List<List<point> >& pointFaceCentres,
+    const List<List<point>>& pointFaceSurfNormals,
+    const List<List<point>>& pointFaceDisp,
+    const List<List<point>>& pointFaceCentres,
     const labelListList& pointFacePatchID,
 
     vectorField& patchAttraction,
@@ -1314,7 +1314,7 @@ void Foam::autoSnapDriver::releasePointsNextToMultiPatch
     const indirectPrimitivePatch& pp,
     const scalarField& snapDist,
 
-    const List<List<point> >& pointFaceCentres,
+    const List<List<point>>& pointFaceCentres,
     const labelListList& pointFacePatchID,
 
     const vectorField& rawPatchAttraction,
@@ -1609,8 +1609,8 @@ Foam::autoSnapDriver::findNearFeatureEdge
     const label pointI,
     const point& estimatedPt,
 
-    List<List<DynamicList<point> > >& edgeAttractors,
-    List<List<DynamicList<pointConstraint> > >& edgeConstraints,
+    List<List<DynamicList<point>>>& edgeAttractors,
+    List<List<DynamicList<pointConstraint>>>& edgeConstraints,
     vectorField& patchAttraction,
     List<pointConstraint>& patchConstraints
 ) const
@@ -1679,10 +1679,10 @@ Foam::autoSnapDriver::findNearFeaturePoint
 
     // Feature-point to pp point
     List<labelList>& pointAttractor,
-    List<List<pointConstraint> >& pointConstraints,
+    List<List<pointConstraint>>& pointConstraints,
     // Feature-edge to pp point
-    List<List<DynamicList<point> > >& edgeAttractors,
-    List<List<DynamicList<pointConstraint> > >& edgeConstraints,
+    List<List<DynamicList<point>>>& edgeAttractors,
+    List<List<DynamicList<pointConstraint>>>& edgeConstraints,
     // pp point to nearest feature
     vectorField& patchAttraction,
     List<pointConstraint>& patchConstraints
@@ -1783,17 +1783,17 @@ void Foam::autoSnapDriver::determineFeatures
     const scalarField& snapDist,
     const vectorField& nearestDisp,
 
-    const List<List<point> >& pointFaceSurfNormals,
-    const List<List<point> >& pointFaceDisp,
-    const List<List<point> >& pointFaceCentres,
+    const List<List<point>>& pointFaceSurfNormals,
+    const List<List<point>>& pointFaceDisp,
+    const List<List<point>>& pointFaceCentres,
     const labelListList& pointFacePatchID,
 
     // Feature-point to pp point
     List<labelList>& pointAttractor,
-    List<List<pointConstraint> >& pointConstraints,
+    List<List<pointConstraint>>& pointConstraints,
     // Feature-edge to pp point
-    List<List<DynamicList<point> > >& edgeAttractors,
-    List<List<DynamicList<pointConstraint> > >& edgeConstraints,
+    List<List<DynamicList<point>>>& edgeAttractors,
+    List<List<DynamicList<pointConstraint>>>& edgeConstraints,
     // pp point to nearest feature
     vectorField& patchAttraction,
     List<pointConstraint>& patchConstraints
@@ -2205,10 +2205,10 @@ void Foam::autoSnapDriver::determineBaffleFeatures
 
     // Feature-point to pp point
     List<labelList>& pointAttractor,
-    List<List<pointConstraint> >& pointConstraints,
+    List<List<pointConstraint>>& pointConstraints,
     // Feature-edge to pp point
-    List<List<DynamicList<point> > >& edgeAttractors,
-    List<List<DynamicList<pointConstraint> > >& edgeConstraints,
+    List<List<DynamicList<point>>>& edgeAttractors,
+    List<List<DynamicList<pointConstraint>>>& edgeConstraints,
     // pp point to nearest feature
     vectorField& patchAttraction,
     List<pointConstraint>& patchConstraints
@@ -2218,7 +2218,7 @@ void Foam::autoSnapDriver::determineBaffleFeatures
     const refinementFeatures& features = meshRefiner_.features();
 
     // Calculate edge-faces
-    List<List<point> > edgeFaceNormals(pp.nEdges());
+    List<List<point>> edgeFaceNormals(pp.nEdges());
 
     // Fill local data
     forAll(pp.edgeFaces(), edgeI)
@@ -2462,10 +2462,10 @@ void Foam::autoSnapDriver::reverseAttractMeshPoints
 
     // Feature-point to pp point
     const List<labelList>& pointAttractor,
-    const List<List<pointConstraint> >& pointConstraints,
+    const List<List<pointConstraint>>& pointConstraints,
     // Feature-edge to pp point
-    const List<List<DynamicList<point> > >& edgeAttractors,
-    const List<List<DynamicList<pointConstraint> > >& edgeConstraints,
+    const List<List<DynamicList<point>>>& edgeAttractors,
+    const List<List<DynamicList<pointConstraint>>>& edgeConstraints,
 
     const vectorField& rawPatchAttraction,
     const List<pointConstraint>& rawPatchConstraints,
@@ -2594,8 +2594,8 @@ void Foam::autoSnapDriver::reverseAttractMeshPoints
 
     forAll(edgeAttractors, featI)
     {
-        const List<DynamicList<point> >& edgeAttr = edgeAttractors[featI];
-        const List<DynamicList<pointConstraint> >& edgeConstr =
+        const List<DynamicList<point>>& edgeAttr = edgeAttractors[featI];
+        const List<DynamicList<pointConstraint>>& edgeConstr =
             edgeConstraints[featI];
 
         forAll(edgeAttr, featEdgeI)
@@ -2723,9 +2723,9 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
     const scalarField& snapDist,
     const vectorField& nearestDisp,
 
-    const List<List<point> >& pointFaceSurfNormals,
-    const List<List<point> >& pointFaceDisp,
-    const List<List<point> >& pointFaceCentres,
+    const List<List<point>>& pointFaceSurfNormals,
+    const List<List<point>>& pointFaceDisp,
+    const List<List<point>>& pointFaceCentres,
     const labelListList& pointFacePatchID,
 
     vectorField& patchAttraction,
@@ -2739,8 +2739,8 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
 
     // Per feature, per feature-edge a list of attraction points and their
     // originating vertex.
-    List<List<DynamicList<point> > > edgeAttractors(features.size());
-    List<List<DynamicList<pointConstraint> > > edgeConstraints
+    List<List<DynamicList<point>>> edgeAttractors(features.size());
+    List<List<DynamicList<pointConstraint>>> edgeConstraints
     (
         features.size()
     );
@@ -2755,7 +2755,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
     // This list is only used to subset the feature-points that are actually
     // used.
     List<labelList> pointAttractor(features.size());
-    List<List<pointConstraint> > pointConstraints(features.size());
+    List<List<pointConstraint>> pointConstraints(features.size());
     forAll(features, featI)
     {
         label nFeatPoints = features[featI].points().size();
@@ -3076,9 +3076,9 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
     // - faceSurfaceNormal
     // - faceDisp
     // - faceCentres
-    List<List<point> > pointFaceSurfNormals;
-    List<List<point> > pointFaceDisp;
-    List<List<point> > pointFaceCentres;
+    List<List<point>> pointFaceSurfNormals;
+    List<List<point>> pointFaceDisp;
+    List<List<point>> pointFaceCentres;
     List<labelList> pointFacePatchID;
 
     {
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index b699a825a7..80afad310d 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,9 +63,9 @@ Foam::labelList Foam::medialAxisMeshMover::getFixedValueBCs
         const pointPatchField<vector>& patchFld =
             fld.boundaryField()[patchI];
 
-        if (isA<valuePointPatchField<vector> >(patchFld))
+        if (isA<valuePointPatchField<vector>>(patchFld))
         {
-            if (isA<zeroFixedValuePointPatchField<vector> >(patchFld))
+            if (isA<zeroFixedValuePointPatchField<vector>>(patchFld))
             {
                 // Special condition of fixed boundary condition. Does not
                 // get adapted
@@ -1116,8 +1116,8 @@ handleFeatureAngleLayerTerminations
     // edge for extrusion.
 
 
-    List<List<point> > edgeFaceNormals(pp.nEdges());
-    List<List<bool> > edgeFaceExtrude(pp.nEdges());
+    List<List<point>> edgeFaceNormals(pp.nEdges());
+    List<List<bool>> edgeFaceExtrude(pp.nEdges());
 
     const labelListList& edgeFaces = pp.edgeFaces();
     const vectorField& faceNormals = pp.faceNormals();
@@ -1141,7 +1141,7 @@ handleFeatureAngleLayerTerminations
         mesh(),
         meshEdges,
         edgeFaceNormals,
-        globalMeshData::ListPlusEqOp<List<point> >(),   // combine operator
+        globalMeshData::ListPlusEqOp<List<point>>(),   // combine operator
         List<point>()               // null value
     );
 
@@ -1150,7 +1150,7 @@ handleFeatureAngleLayerTerminations
         mesh(),
         meshEdges,
         edgeFaceExtrude,
-        globalMeshData::ListPlusEqOp<List<bool> >(),    // combine operator
+        globalMeshData::ListPlusEqOp<List<bool>>(),    // combine operator
         List<bool>()                // null value
     );
 
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
index f57942147a..be683e731b 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,9 +99,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new zeroFixedValuePointPatchField<Type>
                 (
@@ -119,12 +119,12 @@ public:
 
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new zeroFixedValuePointPatchField<Type>
                 (
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index ff2a971da7..868e7cce3f 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1015,7 +1015,7 @@ Pout<< "face:" << faceI << " verts:" << f
 //
 //
 //    // Transfer lists.
-//    PtrList<HashSet<edge, Hash<edge> > > regionConnectivity
+//    PtrList<HashSet<edge, Hash<edge>>> regionConnectivity
 //    (Pstream::nProcs());
 //    forAll(regionConnectivity, procI)
 //    {
@@ -1024,7 +1024,7 @@ Pout<< "face:" << faceI << " verts:" << f
 //            regionConnectivity.set
 //            (
 //                procI,
-//                new HashSet<edge, Hash<edge> >
+//                new HashSet<edge, Hash<edge>>
 //                (
 //                    coupledRegionToShifted.size()
 //                  / Pstream::nProcs()
@@ -1123,7 +1123,7 @@ Pout<< "face:" << faceI << " verts:" << f
 //        {
 //            for
 //            (
-//                HashSet<edge, Hash<edge> >::const_iterator iter =
+//                HashSet<edge, Hash<edge>>::const_iterator iter =
 //                    regionConnectivity[procI].begin();
 //                iter != regionConnectivity[procI].end();
 //                ++iter
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
index 741416991b..3184e808e2 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -184,7 +184,7 @@ private:
         labelIOList surfaceIndex_;
 
         //- User supplied face based data.
-        List<Tuple2<mapType, labelList> > userFaceData_;
+        List<Tuple2<mapType, labelList>> userFaceData_;
 
         //- Meshed patches - are treated differently. Stored as wordList since
         //  order changes.
@@ -673,12 +673,12 @@ public:
             //  topo changes. Every entry is a list over all faces.
             //  Bit of a hack. Additional flag to say whether to maintain master
             //  only (false) or increase set to account for face-from-face.
-            const List<Tuple2<mapType, labelList> >& userFaceData() const
+            const List<Tuple2<mapType, labelList>>& userFaceData() const
             {
                 return userFaceData_;
             }
 
-            List<Tuple2<mapType, labelList> >& userFaceData()
+            List<Tuple2<mapType, labelList>>& userFaceData()
             {
                 return userFaceData_;
             }
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
index 1f4a43e28c..544d895c89 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,7 +185,7 @@ void Foam::refinementFeatures::read
 
         if (dict.found("levels"))
         {
-            List<Tuple2<scalar, label> > distLevels(dict["levels"]);
+            List<Tuple2<scalar, label>> distLevels(dict["levels"]);
 
             if (dict.size() < 1)
             {
@@ -298,16 +298,16 @@ void Foam::refinementFeatures::buildTrees(const label featI)
 }
 
 
-const Foam::PtrList<Foam::indexedOctree<Foam::treeDataEdge> >&
+const Foam::PtrList<Foam::indexedOctree<Foam::treeDataEdge>>&
 Foam::refinementFeatures::regionEdgeTrees() const
 {
     if (!regionEdgeTreesPtr_.valid())
     {
         regionEdgeTreesPtr_.reset
         (
-            new PtrList<indexedOctree<treeDataEdge> >(size())
+            new PtrList<indexedOctree<treeDataEdge>>(size())
         );
-        PtrList<indexedOctree<treeDataEdge> >& trees = regionEdgeTreesPtr_();
+        PtrList<indexedOctree<treeDataEdge>>& trees = regionEdgeTreesPtr_();
 
         forAll(*this, featI)
         {
@@ -597,7 +597,7 @@ void Foam::refinementFeatures::findNearestRegionEdge
     nearNormal = vector::zero;
 
 
-    const PtrList<indexedOctree<treeDataEdge> >& regionTrees =
+    const PtrList<indexedOctree<treeDataEdge>>& regionTrees =
         regionEdgeTrees();
 
     forAll(regionTrees, featI)
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.H b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.H
index 5c923508b8..c0a0a5fcfe 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.H
+++ b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,13 +64,13 @@ private:
         labelListList levels_;
 
         //- Edge
-        PtrList<indexedOctree<treeDataEdge> > edgeTrees_;
+        PtrList<indexedOctree<treeDataEdge>> edgeTrees_;
 
         //- Features points
-        PtrList<indexedOctree<treeDataPoint> > pointTrees_;
+        PtrList<indexedOctree<treeDataPoint>> pointTrees_;
 
         //- Region edge trees (demand driven)
-        mutable autoPtr<PtrList<indexedOctree<treeDataEdge> > >
+        mutable autoPtr<PtrList<indexedOctree<treeDataEdge>>>
             regionEdgeTreesPtr_;
 
 
@@ -93,18 +93,18 @@ private:
 
 protected:
 
-        const PtrList<indexedOctree<treeDataEdge> >& edgeTrees() const
+        const PtrList<indexedOctree<treeDataEdge>>& edgeTrees() const
         {
             return edgeTrees_;
         }
 
-        const PtrList<indexedOctree<treeDataPoint> >& pointTrees() const
+        const PtrList<indexedOctree<treeDataPoint>>& pointTrees() const
         {
             return pointTrees_;
         }
 
 
-        const PtrList<indexedOctree<treeDataEdge> >& regionEdgeTrees() const;
+        const PtrList<indexedOctree<treeDataEdge>>& regionEdgeTrees() const;
 
 public:
 
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index 92bfa75ae9..5046f34166 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,11 +74,11 @@ Foam::refinementSurfaces::refinementSurfaces
     labelList globalLevelIncr(surfI, 0);
     scalarField globalAngle(surfI, -GREAT);
     PtrList<dictionary> globalPatchInfo(surfI);
-    List<Map<label> > regionMinLevel(surfI);
-    List<Map<label> > regionMaxLevel(surfI);
-    List<Map<label> > regionLevelIncr(surfI);
-    List<Map<scalar> > regionAngle(surfI);
-    List<Map<autoPtr<dictionary> > > regionPatchInfo(surfI);
+    List<Map<label>> regionMinLevel(surfI);
+    List<Map<label>> regionMaxLevel(surfI);
+    List<Map<label>> regionLevelIncr(surfI);
+    List<Map<scalar>> regionAngle(surfI);
+    List<Map<autoPtr<dictionary>>> regionPatchInfo(surfI);
 
 
     HashSet<word> unmatchedKeys(surfacesDict.toc());
@@ -289,8 +289,8 @@ Foam::refinementSurfaces::refinementSurfaces
             perpendicularAngle_[globalRegionI] = regionAngle[surfI][iter.key()];
         }
 
-        const Map<autoPtr<dictionary> >& localInfo = regionPatchInfo[surfI];
-        forAllConstIter(Map<autoPtr<dictionary> >, localInfo, iter)
+        const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfI];
+        forAllConstIter(Map<autoPtr<dictionary>>, localInfo, iter)
         {
             label globalRegionI = regionOffset_[surfI] + iter.key();
 
@@ -621,7 +621,7 @@ void Foam::refinementSurfaces::findAllHigherIntersections
     }
 
     // Work arrays
-    List<List<pointIndexHit> > hitInfo;
+    List<List<pointIndexHit>> hitInfo;
     labelList pRegions;
     vectorField pNormals;
 
@@ -711,7 +711,7 @@ void Foam::refinementSurfaces::findAllHigherIntersections
     }
 
     // Work arrays
-    List<List<pointIndexHit> > hitInfo;
+    List<List<pointIndexHit>> hitInfo;
     labelList pRegions;
     vectorField pNormals;
 
diff --git a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
index a92a2b0114..2b89bfcca0 100644
--- a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
+++ b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ const NamedEnum<shellSurfaces::refineMode, 3> shellSurfaces::refineModeNames_;
 void Foam::shellSurfaces::setAndCheckLevels
 (
     const label shellI,
-    const List<Tuple2<scalar, label> >& distLevels
+    const List<Tuple2<scalar, label>>& distLevels
 )
 {
     if (modes_[shellI] != DISTANCE && distLevels.size() != 1)
diff --git a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H
index 9b0e4c9e05..3008655396 100644
--- a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H
+++ b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ private:
         void setAndCheckLevels
         (
             const label shellI,
-            const List<Tuple2<scalar, label> >&
+            const List<Tuple2<scalar, label>>&
         );
 
         void orient();
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
index 802581ab6d..6c357b095a 100644
--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ public:
     //- Class used to pass tracking data to the trackToFace function
     class trackingData
     :
-        public particle::TrackingData<Cloud<trackedParticle> >
+        public particle::TrackingData<Cloud<trackedParticle>>
     {
     public:
 
@@ -97,7 +97,7 @@ public:
                 List<PackedBoolList>& featureEdgeVisited
             )
             :
-                particle::TrackingData<Cloud<trackedParticle> >(cloud),
+                particle::TrackingData<Cloud<trackedParticle>>(cloud),
                 maxLevel_(maxLevel),
                 featureEdgeVisited_(featureEdgeVisited)
             {}
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C b/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C
index 2936da2643..38f529968d 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ void setBlockFaceCorrespondence
     const cellList& topoCells,
     const faceList::subList& topoInternalFaces,
     const labelList& topoFaceCell,
-    List<Pair<label> >& mergeBlock
+    List<Pair<label>>& mergeBlock
 )
 {
     forAll(topoInternalFaces, topoFacei)
@@ -338,7 +338,7 @@ void Foam::blockMesh::calcMergeInfoFast()
         topology().nInternalFaces()
     );
 
-    List<Pair<label> > mergeBlockP(topoInternalFaces.size());
+    List<Pair<label>> mergeBlockP(topoInternalFaces.size());
     setBlockFaceCorrespondence
     (
         topoCells,
@@ -347,7 +347,7 @@ void Foam::blockMesh::calcMergeInfoFast()
         mergeBlockP
     );
 
-    List<Pair<label> > mergeBlockN(topoInternalFaces.size());
+    List<Pair<label>> mergeBlockN(topoInternalFaces.size());
     setBlockFaceCorrespondence
     (
         topoCells,
diff --git a/src/mesh/extrudeModel/radial/radial.H b/src/mesh/extrudeModel/radial/radial.H
index dae9546f3b..d05971ff0d 100644
--- a/src/mesh/extrudeModel/radial/radial.H
+++ b/src/mesh/extrudeModel/radial/radial.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ class radial
 {
     // Private data
 
-        autoPtr<DataEntry<scalar> > R_;
+        autoPtr<DataEntry<scalar>> R_;
 
 
 public:
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index f3b6c56638..ce776051c1 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -922,7 +922,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
             );
 
         // calculate AMI interpolation
-        autoPtr<AMIMethod<SourcePatch, TargetPatch> > AMIPtr
+        autoPtr<AMIMethod<SourcePatch, TargetPatch>> AMIPtr
         (
             AMIMethod<SourcePatch, TargetPatch>::New
             (
@@ -1027,7 +1027,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
         );
 
         // cache maps and reset addresses
-        List<Map<label> > cMap;
+        List<Map<label>> cMap;
         srcMapPtr_.reset(new mapDistribute(globalSrcFaces, tgtAddress_, cMap));
         tgtMapPtr_.reset(new mapDistribute(globalTgtFaces, srcAddress_, cMap));
 
@@ -1039,7 +1039,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
     else
     {
         // calculate AMI interpolation
-        autoPtr<AMIMethod<SourcePatch, TargetPatch> > AMIPtr
+        autoPtr<AMIMethod<SourcePatch, TargetPatch>> AMIPtr
         (
             AMIMethod<SourcePatch, TargetPatch>::New
             (
@@ -1271,7 +1271,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
 
 template<class SourcePatch, class TargetPatch>
 template<class Type, class CombineOp>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
 (
     const Field<Type>& fld,
@@ -1279,7 +1279,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
     const UList<Type>& defaultValues
 ) const
 {
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -1302,10 +1302,10 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
 
 template<class SourcePatch, class TargetPatch>
 template<class Type, class CombineOp>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
 (
-    const tmp<Field<Type> >& tFld,
+    const tmp<Field<Type>>& tFld,
     const CombineOp& cop,
     const UList<Type>& defaultValues
 ) const
@@ -1316,7 +1316,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
 
 template<class SourcePatch, class TargetPatch>
 template<class Type, class CombineOp>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
 (
     const Field<Type>& fld,
@@ -1324,7 +1324,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
     const UList<Type>& defaultValues
 ) const
 {
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -1347,10 +1347,10 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
 
 template<class SourcePatch, class TargetPatch>
 template<class Type, class CombineOp>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
 (
-    const tmp<Field<Type> >& tFld,
+    const tmp<Field<Type>>& tFld,
     const CombineOp& cop,
     const UList<Type>& defaultValues
 ) const
@@ -1361,7 +1361,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
 
 template<class SourcePatch, class TargetPatch>
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
 (
     const Field<Type>& fld,
@@ -1374,10 +1374,10 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
 
 template<class SourcePatch, class TargetPatch>
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
 (
-    const tmp<Field<Type> >& tFld,
+    const tmp<Field<Type>>& tFld,
     const UList<Type>& defaultValues
 ) const
 {
@@ -1387,7 +1387,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
 
 template<class SourcePatch, class TargetPatch>
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
 (
     const Field<Type>& fld,
@@ -1400,10 +1400,10 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
 
 template<class SourcePatch, class TargetPatch>
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
 (
-    const tmp<Field<Type> >& tFld,
+    const tmp<Field<Type>>& tFld,
     const UList<Type>& defaultValues
 ) const
 {
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
index 27d077f126..130a9c230d 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -448,7 +448,7 @@ public:
 
             //- Interpolate from target to source with supplied op
             template<class Type, class CombineOp>
-            tmp<Field<Type> > interpolateToSource
+            tmp<Field<Type>> interpolateToSource
             (
                 const Field<Type>& fld,
                 const CombineOp& cop,
@@ -457,16 +457,16 @@ public:
 
             //- Interpolate from target tmp field to source with supplied op
             template<class Type, class CombineOp>
-            tmp<Field<Type> > interpolateToSource
+            tmp<Field<Type>> interpolateToSource
             (
-                const tmp<Field<Type> >& tFld,
+                const tmp<Field<Type>>& tFld,
                 const CombineOp& cop,
                 const UList<Type>& defaultValues = UList<Type>::null()
             ) const;
 
             //- Interpolate from source to target with supplied op
             template<class Type, class CombineOp>
-            tmp<Field<Type> > interpolateToTarget
+            tmp<Field<Type>> interpolateToTarget
             (
                 const Field<Type>& fld,
                 const CombineOp& cop,
@@ -475,16 +475,16 @@ public:
 
             //- Interpolate from source tmp field to target with supplied op
             template<class Type, class CombineOp>
-            tmp<Field<Type> > interpolateToTarget
+            tmp<Field<Type>> interpolateToTarget
             (
-                const tmp<Field<Type> >& tFld,
+                const tmp<Field<Type>>& tFld,
                 const CombineOp& cop,
                 const UList<Type>& defaultValues = UList<Type>::null()
             ) const;
 
             //- Interpolate from target to source
             template<class Type>
-            tmp<Field<Type> > interpolateToSource
+            tmp<Field<Type>> interpolateToSource
             (
                 const Field<Type>& fld,
                 const UList<Type>& defaultValues = UList<Type>::null()
@@ -492,15 +492,15 @@ public:
 
             //- Interpolate from target tmp field
             template<class Type>
-            tmp<Field<Type> > interpolateToSource
+            tmp<Field<Type>> interpolateToSource
             (
-                const tmp<Field<Type> >& tFld,
+                const tmp<Field<Type>>& tFld,
                 const UList<Type>& defaultValues = UList<Type>::null()
             ) const;
 
             //- Interpolate from source to target
             template<class Type>
-            tmp<Field<Type> > interpolateToTarget
+            tmp<Field<Type>> interpolateToTarget
             (
                 const Field<Type>& fld,
                 const UList<Type>& defaultValues = UList<Type>::null()
@@ -508,9 +508,9 @@ public:
 
             //- Interpolate from source tmp field
             template<class Type>
-            tmp<Field<Type> > interpolateToTarget
+            tmp<Field<Type>> interpolateToTarget
             (
-                const tmp<Field<Type> >& tFld,
+                const tmp<Field<Type>>& tFld,
                 const UList<Type>& defaultValues = UList<Type>::null()
             ) const;
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
index 5abe0778eb..f42fd92bb8 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -384,7 +384,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcProcMap
 
     {
         // Per processor indices into all segments to send
-        List<DynamicList<label> > dynSendMap(Pstream::nProcs());
+        List<DynamicList<label>> dynSendMap(Pstream::nProcs());
 
         // Work array - whether processor bb overlaps the face bounds
         boolList procBbOverlaps(Pstream::nProcs());
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
index 2e9417782d..cc8b6216ce 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ protected:
         labelList srcNonOverlap_;
 
         //- Octree used to find face seeds
-        autoPtr<indexedOctree<treeType> > treePtr_;
+        autoPtr<indexedOctree<treeType>> treePtr_;
 
         //- Face triangulation mode
         const faceAreaIntersect::triangulationMode triMode_;
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C
index 3d1463305c..a16a91fa6b 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class SourcePatch, class TargetPatch>
-Foam::autoPtr<Foam::AMIMethod<SourcePatch, TargetPatch> >
+Foam::autoPtr<Foam::AMIMethod<SourcePatch, TargetPatch>>
 Foam::AMIMethod<SourcePatch, TargetPatch>::New
 (
     const word& methodName,
@@ -56,7 +56,7 @@ Foam::AMIMethod<SourcePatch, TargetPatch>::New
             << componentsConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
-    return autoPtr<AMIMethod<SourcePatch, TargetPatch> >
+    return autoPtr<AMIMethod<SourcePatch, TargetPatch>>
     (
         cstrIter()
         (
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.C
index b63e0f7ae0..e3fe92160d 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -250,8 +250,8 @@ void Foam::directAMI<SourcePatch, TargetPatch>::calculate
 
 
     // temporary storage for addressing and weights
-    List<DynamicList<label> > srcAddr(this->srcPatch_.size());
-    List<DynamicList<label> > tgtAddr(this->tgtPatch_.size());
+    List<DynamicList<label>> srcAddr(this->srcPatch_.size());
+    List<DynamicList<label>> tgtAddr(this->tgtPatch_.size());
 
 
     // construct weights and addressing
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C
index da5c84ac97..976430e930 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,10 +30,10 @@ License
 template<class SourcePatch, class TargetPatch>
 void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::calcAddressing
 (
-    List<DynamicList<label> >& srcAddr,
-    List<DynamicList<scalar> >& srcWght,
-    List<DynamicList<label> >& tgtAddr,
-    List<DynamicList<scalar> >& tgtWght,
+    List<DynamicList<label>>& srcAddr,
+    List<DynamicList<scalar>>& srcWght,
+    List<DynamicList<label>>& tgtAddr,
+    List<DynamicList<scalar>>& tgtWght,
     label srcFaceI,
     label tgtFaceI
 )
@@ -117,10 +117,10 @@ bool Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::processSourceFace
     DynamicList<label>& visitedFaces,
 
     // temporary storage for addressing and weights
-    List<DynamicList<label> >& srcAddr,
-    List<DynamicList<scalar> >& srcWght,
-    List<DynamicList<label> >& tgtAddr,
-    List<DynamicList<scalar> >& tgtWght
+    List<DynamicList<label>>& srcAddr,
+    List<DynamicList<scalar>>& srcWght,
+    List<DynamicList<label>>& tgtAddr,
+    List<DynamicList<scalar>>& tgtWght
 )
 {
     if (tgtStartFaceI == -1)
@@ -358,10 +358,10 @@ template<class SourcePatch, class TargetPatch>
 void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::
 restartUncoveredSourceFace
 (
-    List<DynamicList<label> >& srcAddr,
-    List<DynamicList<scalar> >& srcWght,
-    List<DynamicList<label> >& tgtAddr,
-    List<DynamicList<scalar> >& tgtWght
+    List<DynamicList<label>>& srcAddr,
+    List<DynamicList<scalar>>& srcWght,
+    List<DynamicList<label>>& tgtAddr,
+    List<DynamicList<scalar>>& tgtWght
 )
 {
     // Collect all src faces with a low weight
@@ -518,10 +518,10 @@ void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::calculate
     }
 
     // temporary storage for addressing and weights
-    List<DynamicList<label> > srcAddr(this->srcPatch_.size());
-    List<DynamicList<scalar> > srcWght(srcAddr.size());
-    List<DynamicList<label> > tgtAddr(this->tgtPatch_.size());
-    List<DynamicList<scalar> > tgtWght(tgtAddr.size());
+    List<DynamicList<label>> srcAddr(this->srcPatch_.size());
+    List<DynamicList<scalar>> srcWght(srcAddr.size());
+    List<DynamicList<label>> tgtAddr(this->tgtPatch_.size());
+    List<DynamicList<scalar>> tgtWght(tgtAddr.size());
 
     calcAddressing
     (
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
index 2d1b552018..b410de737e 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,10 +74,10 @@ protected:
             //- Calculate addressing and weights using temporary storage
             virtual void calcAddressing
             (
-                List<DynamicList<label> >& srcAddress,
-                List<DynamicList<scalar> >& srcWeights,
-                List<DynamicList<label> >& tgtAddress,
-                List<DynamicList<scalar> >& tgtWeights,
+                List<DynamicList<label>>& srcAddress,
+                List<DynamicList<scalar>>& srcWeights,
+                List<DynamicList<label>>& tgtAddress,
+                List<DynamicList<scalar>>& tgtWeights,
                 label srcFaceI,
                 label tgtFaceI
             );
@@ -89,19 +89,19 @@ protected:
                 const label tgtStartFaceI,
                 DynamicList<label>& nbrFaces,
                 DynamicList<label>& visitedFaces,
-                List<DynamicList<label> >& srcAddr,
-                List<DynamicList<scalar> >& srcWght,
-                List<DynamicList<label> >& tgtAddr,
-                List<DynamicList<scalar> >& tgtWght
+                List<DynamicList<label>>& srcAddr,
+                List<DynamicList<scalar>>& srcWght,
+                List<DynamicList<label>>& tgtAddr,
+                List<DynamicList<scalar>>& tgtWght
             );
 
             //- Attempt to re-evaluate source faces that have not been included
             virtual void restartUncoveredSourceFace
             (
-                List<DynamicList<label> >& srcAddr,
-                List<DynamicList<scalar> >& srcWght,
-                List<DynamicList<label> >& tgtAddr,
-                List<DynamicList<scalar> >& tgtWght
+                List<DynamicList<label>>& srcAddr,
+                List<DynamicList<scalar>>& srcWght,
+                List<DynamicList<label>>& tgtAddr,
+                List<DynamicList<scalar>>& tgtWght
             );
 
             //- Set the source and target seed faces
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C
index 0efaf241f4..030434a7d3 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ template<class SourcePatch, class TargetPatch>
 Foam::label Foam::mapNearestAMI<SourcePatch, TargetPatch>::findMappedSrcFace
 (
     const label tgtFaceI,
-    const List<DynamicList<label> >& tgtToSrc
+    const List<DynamicList<label>>& tgtToSrc
 ) const
 {
     DynamicList<label> testFaces(10);
@@ -230,8 +230,8 @@ void Foam::mapNearestAMI<SourcePatch, TargetPatch>::calculate
 
 
     // temporary storage for addressing and weights
-    List<DynamicList<label> > srcAddr(this->srcPatch_.size());
-    List<DynamicList<label> > tgtAddr(this->tgtPatch_.size());
+    List<DynamicList<label>> srcAddr(this->srcPatch_.size());
+    List<DynamicList<label>> tgtAddr(this->tgtPatch_.size());
 
 
     // construct weights and addressing
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H
index 86d8c615f2..73734ab8ea 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ private:
             label findMappedSrcFace
             (
                 const label tgtFaceI,
-                const List<DynamicList<label> >& tgtToSrc
+                const List<DynamicList<label>>& tgtToSrc
             ) const;
 
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.C
index 4eddbe6328..eed906230a 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,10 +125,10 @@ void Foam::partialFaceAreaWeightAMI<SourcePatch, TargetPatch>::calculate
     }
 
     // temporary storage for addressing and weights
-    List<DynamicList<label> > srcAddr(this->srcPatch_.size());
-    List<DynamicList<scalar> > srcWght(srcAddr.size());
-    List<DynamicList<label> > tgtAddr(this->tgtPatch_.size());
-    List<DynamicList<scalar> > tgtWght(tgtAddr.size());
+    List<DynamicList<label>> srcAddr(this->srcPatch_.size());
+    List<DynamicList<scalar>> srcWght(srcAddr.size());
+    List<DynamicList<label>> tgtAddr(this->tgtPatch_.size());
+    List<DynamicList<scalar>> tgtWght(tgtAddr.size());
 
     faceAreaWeightAMI<SourcePatch, TargetPatch>::calcAddressing
     (
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C
index 038f403fff..e3af8a1345 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,13 +129,13 @@ void Foam::cyclicACMIPointPatchField<Type>::swapAddSeparated
 
         // Get neighbouring pointPatchField
         const GeometricField<Type, pointPatchField, pointMesh>& fld =
-            refCast<const GeometricField<Type, pointPatchField, pointMesh> >
+            refCast<const GeometricField<Type, pointPatchField, pointMesh>>
             (
                 this->dimensionedInternalField()
             );
 
         const cyclicACMIPointPatchField<Type>& nbr =
-            refCast<const cyclicACMIPointPatchField<Type> >
+            refCast<const cyclicACMIPointPatchField<Type>>
             (
                 fld.boundaryField()[nbrPatch.index()]
             );
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
index 7d490280bf..0d236dd04a 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,10 +59,10 @@ class cyclicACMIPointPatchField
         const cyclicACMIPointPatch& cyclicACMIPatch_;
 
         //- Owner side patch interpolation pointer
-        mutable autoPtr<PrimitivePatchInterpolation<primitivePatch> > ppiPtr_;
+        mutable autoPtr<PrimitivePatchInterpolation<primitivePatch>> ppiPtr_;
 
         //- Neighbour side patch interpolation pointer
-        mutable autoPtr<PrimitivePatchInterpolation<primitivePatch> >
+        mutable autoPtr<PrimitivePatchInterpolation<primitivePatch>>
             nbrPpiPtr_;
 
 
@@ -136,9 +136,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicACMIPointPatchField<Type>
                 (
@@ -155,12 +155,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicACMIPointPatchField<Type>
                 (
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.H
index b153034d87..987adc4dae 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -280,7 +280,7 @@ public:
 
                 //- Interpolate field
                 template<class Type>
-                tmp<Field<Type> > interpolate
+                tmp<Field<Type>> interpolate
                 (
                     const Field<Type>& fldCouple,
                     const Field<Type>& fldNonOverlap
@@ -288,10 +288,10 @@ public:
 
                 //- Interpolate tmp field
                 template<class Type>
-                tmp<Field<Type> > interpolate
+                tmp<Field<Type>> interpolate
                 (
-                    const tmp<Field<Type> >& tFldCouple,
-                    const tmp<Field<Type> >& tFldNonOverlap
+                    const tmp<Field<Type>>& tFldCouple,
+                    const tmp<Field<Type>>& tFldNonOverlap
                 ) const;
 
                 //- Low-level interpolate List
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatchTemplates.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatchTemplates.C
index 82bce867c1..336e8caa2d 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatchTemplates.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatchTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
+Foam::tmp<Foam::Field<Type>> Foam::cyclicACMIPolyPatch::interpolate
 (
     const Field<Type>& fldCouple,
     const Field<Type>& fldNonOverlap
@@ -49,10 +49,10 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
+Foam::tmp<Foam::Field<Type>> Foam::cyclicACMIPolyPatch::interpolate
 (
-    const tmp<Field<Type> >& tFldCouple,
-    const tmp<Field<Type> >& tFldNonOverlap
+    const tmp<Field<Type>>& tFldCouple,
+    const tmp<Field<Type>>& tFldNonOverlap
 ) const
 {
     return interpolate(tFldCouple(), tFldNonOverlap());
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C
index 7bfdf7de80..58be0afc3c 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,13 +129,13 @@ void Foam::cyclicAMIPointPatchField<Type>::swapAddSeparated
 
         // Get neighbouring pointPatchField
         const GeometricField<Type, pointPatchField, pointMesh>& fld =
-            refCast<const GeometricField<Type, pointPatchField, pointMesh> >
+            refCast<const GeometricField<Type, pointPatchField, pointMesh>>
             (
                 this->dimensionedInternalField()
             );
 
         const cyclicAMIPointPatchField<Type>& nbr =
-            refCast<const cyclicAMIPointPatchField<Type> >
+            refCast<const cyclicAMIPointPatchField<Type>>
             (
                 fld.boundaryField()[nbrPatch.index()]
             );
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
index e9f9212eab..e50759d7ba 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,10 +59,10 @@ class cyclicAMIPointPatchField
         const cyclicAMIPointPatch& cyclicAMIPatch_;
 
         //- Owner side patch interpolation pointer
-        mutable autoPtr<PrimitivePatchInterpolation<primitivePatch> > ppiPtr_;
+        mutable autoPtr<PrimitivePatchInterpolation<primitivePatch>> ppiPtr_;
 
         //- Neighbour side patch interpolation pointer
-        mutable autoPtr<PrimitivePatchInterpolation<primitivePatch> >
+        mutable autoPtr<PrimitivePatchInterpolation<primitivePatch>>
             nbrPpiPtr_;
 
 
@@ -136,9 +136,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicAMIPointPatchField<Type>
                 (
@@ -155,12 +155,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicAMIPointPatchField<Type>
                 (
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
index fe783cd2e3..7ae90c7774 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -348,7 +348,7 @@ public:
 
                 //- Interpolate field
                 template<class Type>
-                tmp<Field<Type> > interpolate
+                tmp<Field<Type>> interpolate
                 (
                     const Field<Type>& fld,
                     const UList<Type>& defaultValues = UList<Type>()
@@ -356,9 +356,9 @@ public:
 
                 //- Interpolate tmp field
                 template<class Type>
-                tmp<Field<Type> > interpolate
+                tmp<Field<Type>> interpolate
                 (
-                    const tmp<Field<Type> >& tFld,
+                    const tmp<Field<Type>>& tFld,
                     const UList<Type>& defaultValues = UList<Type>()
                 ) const;
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
index 50f285a444..2ab9386445 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::cyclicAMIPolyPatch::interpolate
+Foam::tmp<Foam::Field<Type>> Foam::cyclicAMIPolyPatch::interpolate
 (
     const Field<Type>& fld,
     const UList<Type>& defaultValues
@@ -44,9 +44,9 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicAMIPolyPatch::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::cyclicAMIPolyPatch::interpolate
+Foam::tmp<Foam::Field<Type>> Foam::cyclicAMIPolyPatch::interpolate
 (
-    const tmp<Field<Type> >& tFld,
+    const tmp<Field<Type>>& tFld,
     const UList<Type>& defaultValues
 ) const
 {
diff --git a/src/meshTools/cellDist/patchWave/patchDataWave.C b/src/meshTools/cellDist/patchWave/patchDataWave.C
index 2231458e78..3acd17dc43 100644
--- a/src/meshTools/cellDist/patchWave/patchDataWave.C
+++ b/src/meshTools/cellDist/patchWave/patchDataWave.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -172,7 +172,7 @@ Foam::patchDataWave<TransferType>::patchDataWave
 (
     const polyMesh& mesh,
     const labelHashSet& patchIDs,
-    const UPtrList<Field<Type> >& initialPatchValuePtrs,
+    const UPtrList<Field<Type>>& initialPatchValuePtrs,
     const bool correctWalls
 )
 :
diff --git a/src/meshTools/cellDist/patchWave/patchDataWave.H b/src/meshTools/cellDist/patchWave/patchDataWave.H
index a08740222b..180b239f5d 100644
--- a/src/meshTools/cellDist/patchWave/patchDataWave.H
+++ b/src/meshTools/cellDist/patchWave/patchDataWave.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ private:
         labelHashSet patchIDs_;
 
         //- Reference to initial extra data at patch faces
-        const UPtrList<Field<Type> >& initialPatchValuePtrs_;
+        const UPtrList<Field<Type>>& initialPatchValuePtrs_;
 
         //- Do accurate distance calculation for near-wall cells.
         bool correctWalls_;
@@ -128,7 +128,7 @@ public:
         (
             const polyMesh& mesh,
             const labelHashSet& patchIDs,
-            const UPtrList<Field<Type> >& initialPatchValuePtrs,
+            const UPtrList<Field<Type>>& initialPatchValuePtrs,
             bool correctWalls = true
         );
 
diff --git a/src/meshTools/cellDist/wallPoint/wallPointData.H b/src/meshTools/cellDist/wallPoint/wallPointData.H
index c1463de254..06595dc20b 100644
--- a/src/meshTools/cellDist/wallPoint/wallPointData.H
+++ b/src/meshTools/cellDist/wallPoint/wallPointData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -164,37 +164,37 @@ public:
 //  ones.
 
 template<>
-inline bool contiguous<wallPointData<bool> >()
+inline bool contiguous<wallPointData<bool>>()
 {
     return contiguous<wallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<label> >()
+inline bool contiguous<wallPointData<label>>()
 {
     return contiguous<wallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<scalar> >()
+inline bool contiguous<wallPointData<scalar>>()
 {
     return contiguous<wallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<vector> >()
+inline bool contiguous<wallPointData<vector>>()
 {
     return contiguous<wallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<sphericalTensor> >()
+inline bool contiguous<wallPointData<sphericalTensor>>()
 {
     return contiguous<wallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<symmTensor> >()
+inline bool contiguous<wallPointData<symmTensor>>()
 {
     return contiguous<wallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<tensor> >()
+inline bool contiguous<wallPointData<tensor>>()
 {
     return contiguous<wallPoint>();
 }
diff --git a/src/meshTools/cellFeatures/cellFeatures.H b/src/meshTools/cellFeatures/cellFeatures.H
index b5d79ac52c..fb8a523c4d 100644
--- a/src/meshTools/cellFeatures/cellFeatures.H
+++ b/src/meshTools/cellFeatures/cellFeatures.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ class cellFeatures
         mutable faceList* facesPtr_;
 
         //- New to old face mapping
-        mutable List<DynamicList<label> > faceMap_;
+        mutable List<DynamicList<label>> faceMap_;
 
 
     // Private Member Functions
@@ -147,7 +147,7 @@ public:
             }
 
             //- New to old faceMap. Guaranteed to be shrunk.
-            const List<DynamicList<label> >& faceMap() const
+            const List<DynamicList<label>>& faceMap() const
             {
                 if (!facesPtr_)
                 {
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.C b/src/meshTools/coordinateSystems/coordinateSystems.C
index 34d1b83715..f49a25835c 100644
--- a/src/meshTools/coordinateSystems/coordinateSystems.C
+++ b/src/meshTools/coordinateSystems/coordinateSystems.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ Foam::coordinateSystems::coordinateSystems
 Foam::coordinateSystems::coordinateSystems
 (
     const IOobject& io,
-    const Xfer<PtrList<coordinateSystem> >& lst
+    const Xfer<PtrList<coordinateSystem>>& lst
 )
 :
     IOPtrList<coordinateSystem>(io, lst)
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.H b/src/meshTools/coordinateSystems/coordinateSystems.H
index a27629aa6c..d59b47bfc9 100644
--- a/src/meshTools/coordinateSystems/coordinateSystems.H
+++ b/src/meshTools/coordinateSystems/coordinateSystems.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ public:
         coordinateSystems
         (
             const IOobject&,
-            const Xfer<PtrList<coordinateSystem> >&
+            const Xfer<PtrList<coordinateSystem>>&
         );
 
 
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index 67fd126264..40d0c4f17e 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::treeDataPrimitivePatch<PatchType>::treeDataPrimitivePatch
 template<class PatchType>
 Foam::treeDataPrimitivePatch<PatchType>::findNearestOp::findNearestOp
 (
-    const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree
+    const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree
 )
 :
     tree_(tree)
@@ -98,7 +98,7 @@ Foam::treeDataPrimitivePatch<PatchType>::findNearestOp::findNearestOp
 template<class PatchType>
 Foam::treeDataPrimitivePatch<PatchType>::findIntersectOp::findIntersectOp
 (
-    const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree
+    const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree
 )
 :
     tree_(tree)
@@ -108,7 +108,7 @@ Foam::treeDataPrimitivePatch<PatchType>::findIntersectOp::findIntersectOp
 template<class PatchType>
 Foam::treeDataPrimitivePatch<PatchType>::findAllIntersectOp::findAllIntersectOp
 (
-    const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree,
+    const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree,
     DynamicList<label>& shapeMask
 )
 :
@@ -121,7 +121,7 @@ template<class PatchType>
 Foam::treeDataPrimitivePatch<PatchType>::
 findSelfIntersectOp::findSelfIntersectOp
 (
-    const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree,
+    const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree,
     const label edgeID
 )
 :
@@ -151,7 +151,7 @@ Foam::pointField Foam::treeDataPrimitivePatch<PatchType>::shapePoints() const
 template<class PatchType>
 Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
 (
-    const indexedOctree<treeDataPrimitivePatch<PatchType> >& oc,
+    const indexedOctree<treeDataPrimitivePatch<PatchType>>& oc,
     const point& sample
 ) const
 {
@@ -611,7 +611,7 @@ bool Foam::treeDataPrimitivePatch<PatchType>::findSelfIntersectOp::operator()
 template<class PatchType>
 bool Foam::treeDataPrimitivePatch<PatchType>::findIntersection
 (
-    const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree,
+    const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree,
     const label index,
     const point& start,
     const point& end,
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
index 08d5705a60..ddd84f2e9c 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -232,7 +232,7 @@ public:
             //  Only makes sense for closed surfaces.
             volumeType getVolumeType
             (
-                const indexedOctree<treeDataPrimitivePatch<PatchType> >&,
+                const indexedOctree<treeDataPrimitivePatch<PatchType>>&,
                 const point&
             ) const;
 
@@ -254,7 +254,7 @@ public:
             //- Helper: find intersection of line with shapes
             static bool findIntersection
             (
-                const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree,
+                const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree,
                 const label index,
                 const point& start,
                 const point& end,
diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.C b/src/meshTools/indexedOctree/treeDataTriSurface.C
index c8c69d7f85..f88465d650 100644
--- a/src/meshTools/indexedOctree/treeDataTriSurface.C
+++ b/src/meshTools/indexedOctree/treeDataTriSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 template<>
 Foam::volumeType Foam::treeDataPrimitivePatch<Foam::triSurface>::getVolumeType
 (
-    const indexedOctree<treeDataPrimitivePatch<triSurface> >& oc,
+    const indexedOctree<treeDataPrimitivePatch<triSurface>>& oc,
     const point& sample
 ) const
 {
diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.H b/src/meshTools/indexedOctree/treeDataTriSurface.H
index fbc3d00b12..6beb4fd28b 100644
--- a/src/meshTools/indexedOctree/treeDataTriSurface.H
+++ b/src/meshTools/indexedOctree/treeDataTriSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ namespace Foam
     template<>
     volumeType treeDataPrimitivePatch<triSurface>::getVolumeType
     (
-        const indexedOctree<treeDataPrimitivePatch<triSurface> >& oc,
+        const indexedOctree<treeDataPrimitivePatch<triSurface>>& oc,
         const point& sample
     ) const;
 }
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
index 7a05f77836..173de6e80a 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,7 +135,7 @@ public:
     //  - point+local index
     //  - sqr(distance)
     //  - processor
-    typedef Tuple2<pointIndexHit, Tuple2<scalar, label> > nearInfo;
+    typedef Tuple2<pointIndexHit, Tuple2<scalar, label>> nearInfo;
 
     class nearestEqOp
     {
diff --git a/src/meshTools/meshSearch/meshSearch.H b/src/meshTools/meshSearch/meshSearch.H
index 73c1434607..fa0be07f8e 100644
--- a/src/meshTools/meshSearch/meshSearch.H
+++ b/src/meshTools/meshSearch/meshSearch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,8 +69,8 @@ class meshSearch
         mutable autoPtr<treeBoundBox> overallBbPtr_;
 
         //- Demand driven octrees
-        mutable autoPtr<indexedOctree<treeDataFace> > boundaryTreePtr_;
-        mutable autoPtr<indexedOctree<treeDataCell> > cellTreePtr_;
+        mutable autoPtr<indexedOctree<treeDataFace>> boundaryTreePtr_;
+        mutable autoPtr<indexedOctree<treeDataCell>> cellTreePtr_;
 
 
     // Private Member Functions
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.H b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.H
index b28d4351a0..a19ff3af2d 100644
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.H
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,13 +161,13 @@ public:
 
                 //- Interpolate field
                 template<class Type>
-                tmp<Field<Type> > interpolate(const Field<Type>& fld) const;
+                tmp<Field<Type>> interpolate(const Field<Type>& fld) const;
 
                 //- Interpolate tmp field
                 template<class Type>
-                tmp<Field<Type> > interpolate
+                tmp<Field<Type>> interpolate
                 (
-                    const tmp<Field<Type> >& tFld
+                    const tmp<Field<Type>>& tFld
                 ) const;
 
                 //- Low-level interpolate List
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBaseTemplates.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBaseTemplates.C
index 125af8d35b..3ee267f759 100644
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBaseTemplates.C
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBaseTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::regionCoupledBase::interpolate
+Foam::tmp<Foam::Field<Type>> Foam::regionCoupledBase::interpolate
 (
     const Field<Type>& fld
 ) const
@@ -43,9 +43,9 @@ Foam::tmp<Foam::Field<Type> > Foam::regionCoupledBase::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::regionCoupledBase::interpolate
+Foam::tmp<Foam::Field<Type>> Foam::regionCoupledBase::interpolate
 (
-    const tmp<Field<Type> >& tFld
+    const tmp<Field<Type>>& tFld
 ) const
 {
     if (owner())
diff --git a/src/meshTools/searchableSurface/searchableBox.C b/src/meshTools/searchableSurface/searchableBox.C
index 5eac58aa33..a293385436 100644
--- a/src/meshTools/searchableSurface/searchableBox.C
+++ b/src/meshTools/searchableSurface/searchableBox.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -497,7 +497,7 @@ void Foam::searchableBox::findLineAll
 (
     const pointField& start,
     const pointField& end,
-    List<List<pointIndexHit> >& info
+    List<List<pointIndexHit>>& info
 ) const
 {
     info.setSize(start.size());
diff --git a/src/meshTools/searchableSurface/searchableBox.H b/src/meshTools/searchableSurface/searchableBox.H
index 306ec460be..9162e253c5 100644
--- a/src/meshTools/searchableSurface/searchableBox.H
+++ b/src/meshTools/searchableSurface/searchableBox.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -231,7 +231,7 @@ public:
             (
                 const pointField& start,
                 const pointField& end,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const;
 
             //- From a set of points and indices get the region
diff --git a/src/meshTools/searchableSurface/searchableCylinder.C b/src/meshTools/searchableSurface/searchableCylinder.C
index 496cd04ab2..01eee6e635 100644
--- a/src/meshTools/searchableSurface/searchableCylinder.C
+++ b/src/meshTools/searchableSurface/searchableCylinder.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -595,7 +595,7 @@ void Foam::searchableCylinder::findLineAll
 (
     const pointField& start,
     const pointField& end,
-    List<List<pointIndexHit> >& info
+    List<List<pointIndexHit>>& info
 ) const
 {
     info.setSize(start.size());
diff --git a/src/meshTools/searchableSurface/searchableCylinder.H b/src/meshTools/searchableSurface/searchableCylinder.H
index 12117c2b51..2c1508d9d2 100644
--- a/src/meshTools/searchableSurface/searchableCylinder.H
+++ b/src/meshTools/searchableSurface/searchableCylinder.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -205,7 +205,7 @@ public:
             (
                 const pointField& start,
                 const pointField& end,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const;
 
             //- From a set of points and indices get the region
diff --git a/src/meshTools/searchableSurface/searchableDisk.C b/src/meshTools/searchableSurface/searchableDisk.C
index db8f92f0a9..b7a7347d5e 100644
--- a/src/meshTools/searchableSurface/searchableDisk.C
+++ b/src/meshTools/searchableSurface/searchableDisk.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -266,7 +266,7 @@ void Foam::searchableDisk::findLineAll
 (
     const pointField& start,
     const pointField& end,
-    List<List<pointIndexHit> >& info
+    List<List<pointIndexHit>>& info
 ) const
 {
     info.setSize(start.size());
diff --git a/src/meshTools/searchableSurface/searchableDisk.H b/src/meshTools/searchableSurface/searchableDisk.H
index 2dbf8b4df1..8e6bee01b2 100644
--- a/src/meshTools/searchableSurface/searchableDisk.H
+++ b/src/meshTools/searchableSurface/searchableDisk.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -198,7 +198,7 @@ public:
             (
                 const pointField& start,
                 const pointField& end,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const;
 
             //- From a set of points and indices get the region
diff --git a/src/meshTools/searchableSurface/searchablePlane.C b/src/meshTools/searchableSurface/searchablePlane.C
index 5f931758f9..c704e18d9c 100644
--- a/src/meshTools/searchableSurface/searchablePlane.C
+++ b/src/meshTools/searchableSurface/searchablePlane.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,7 +206,7 @@ void Foam::searchablePlane::findLineAll
 (
     const pointField& start,
     const pointField& end,
-    List<List<pointIndexHit> >& info
+    List<List<pointIndexHit>>& info
 ) const
 {
     List<pointIndexHit> nearestInfo;
diff --git a/src/meshTools/searchableSurface/searchablePlane.H b/src/meshTools/searchableSurface/searchablePlane.H
index 4b2ffefb01..3e15a8e34c 100644
--- a/src/meshTools/searchableSurface/searchablePlane.H
+++ b/src/meshTools/searchableSurface/searchablePlane.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -182,7 +182,7 @@ public:
             (
                 const pointField& start,
                 const pointField& end,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const;
 
             //- From a set of points and indices get the region
diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C
index a6ad5eeb6b..e017b4e43c 100644
--- a/src/meshTools/searchableSurface/searchablePlate.C
+++ b/src/meshTools/searchableSurface/searchablePlate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -386,7 +386,7 @@ void Foam::searchablePlate::findLineAll
 (
     const pointField& start,
     const pointField& end,
-    List<List<pointIndexHit> >& info
+    List<List<pointIndexHit>>& info
 ) const
 {
     List<pointIndexHit> nearestInfo;
diff --git a/src/meshTools/searchableSurface/searchablePlate.H b/src/meshTools/searchableSurface/searchablePlate.H
index d1b69462a9..48d270987f 100644
--- a/src/meshTools/searchableSurface/searchablePlate.H
+++ b/src/meshTools/searchableSurface/searchablePlate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -193,7 +193,7 @@ public:
             (
                 const pointField& start,
                 const pointField& end,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const;
 
             //- From a set of points and indices get the region
diff --git a/src/meshTools/searchableSurface/searchableSphere.C b/src/meshTools/searchableSurface/searchableSphere.C
index e4eae4ab27..dbdc208e6b 100644
--- a/src/meshTools/searchableSurface/searchableSphere.C
+++ b/src/meshTools/searchableSurface/searchableSphere.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -268,7 +268,7 @@ void Foam::searchableSphere::findLineAll
 (
     const pointField& start,
     const pointField& end,
-    List<List<pointIndexHit> >& info
+    List<List<pointIndexHit>>& info
 ) const
 {
     info.setSize(start.size());
diff --git a/src/meshTools/searchableSurface/searchableSphere.H b/src/meshTools/searchableSurface/searchableSphere.H
index 992c28d1a3..4096d2f460 100644
--- a/src/meshTools/searchableSurface/searchableSphere.H
+++ b/src/meshTools/searchableSurface/searchableSphere.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -188,7 +188,7 @@ public:
             (
                 const pointField& start,
                 const pointField& end,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const;
 
             //- From a set of points and indices get the region
diff --git a/src/meshTools/searchableSurface/searchableSurface.H b/src/meshTools/searchableSurface/searchableSurface.H
index 32fad48b09..c7e25cc94a 100644
--- a/src/meshTools/searchableSurface/searchableSurface.H
+++ b/src/meshTools/searchableSurface/searchableSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -304,7 +304,7 @@ public:
             (
                 const pointField& start,
                 const pointField& end,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const = 0;
 
             //- From a set of points and indices get the region
diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.C b/src/meshTools/searchableSurface/searchableSurfaceCollection.C
index 98ae2a26e0..868a959941 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceCollection.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ void Foam::searchableSurfaceCollection::findNearest
 void Foam::searchableSurfaceCollection::sortHits
 (
     const List<pointIndexHit>& info,
-    List<List<pointIndexHit> >& surfInfo,
+    List<List<pointIndexHit>>& surfInfo,
     labelListList& infoMap
 ) const
 {
@@ -560,7 +560,7 @@ void Foam::searchableSurfaceCollection::findLineAll
 (
     const pointField& start,
     const pointField& end,
-    List<List<pointIndexHit> >& info
+    List<List<pointIndexHit>>& info
 ) const
 {
     // To be done. Assume for now only one intersection.
@@ -608,9 +608,9 @@ void Foam::searchableSurfaceCollection::getRegion
         // Multiple surfaces. Sort by surface.
 
         // Per surface the hit
-        List<List<pointIndexHit> > surfInfo;
+        List<List<pointIndexHit>> surfInfo;
         // Per surface the original position
-        List<List<label> > infoMap;
+        List<List<label>> infoMap;
         sortHits(info, surfInfo, infoMap);
 
         region.setSize(info.size());
@@ -665,9 +665,9 @@ void Foam::searchableSurfaceCollection::getNormal
         // Multiple surfaces. Sort by surface.
 
         // Per surface the hit
-        List<List<pointIndexHit> > surfInfo;
+        List<List<pointIndexHit>> surfInfo;
         // Per surface the original position
-        List<List<label> > infoMap;
+        List<List<label>> infoMap;
         sortHits(info, surfInfo, infoMap);
 
         normal.setSize(info.size());
@@ -774,9 +774,9 @@ void Foam::searchableSurfaceCollection::getField
         // Multiple surfaces. Sort by surface.
 
         // Per surface the hit
-        List<List<pointIndexHit> > surfInfo;
+        List<List<pointIndexHit>> surfInfo;
         // Per surface the original position
-        List<List<label> > infoMap;
+        List<List<label>> infoMap;
         sortHits(info, surfInfo, infoMap);
 
         // Do surface tests
diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.H b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
index bbfdff5822..66a9e81228 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceCollection.H
+++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,7 +106,7 @@ private:
         void sortHits
         (
             const List<pointIndexHit>& info,
-            List<List<pointIndexHit> >& surfInfo,
+            List<List<pointIndexHit>>& surfInfo,
             labelListList& infoMap
         ) const;
 
@@ -227,7 +227,7 @@ public:
             (
                 const pointField& start,
                 const pointField& end,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const;
 
             //- From a set of points and indices get the region
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
index 93c95778b8..d9d578c876 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -341,7 +341,7 @@ void Foam::searchableSurfaceWithGaps::findLineAll
 (
     const pointField& start,
     const pointField& end,
-    List<List<pointIndexHit> >& info
+    List<List<pointIndexHit>>& info
 ) const
 {
     // To be done. Assume for now only one intersection.
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
index 0cd23e807a..13b0b13af5 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -220,7 +220,7 @@ public:
             (
                 const pointField& start,
                 const pointField& end,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const;
 
             //- From a set of points and indices get the region
diff --git a/src/meshTools/searchableSurface/searchableSurfaces.C b/src/meshTools/searchableSurface/searchableSurfaces.C
index 7152bbd4ca..507b3d3826 100644
--- a/src/meshTools/searchableSurface/searchableSurfaces.C
+++ b/src/meshTools/searchableSurface/searchableSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -332,7 +332,7 @@ void Foam::searchableSurfaces::findAllIntersections
     const pointField& start,
     const pointField& end,
     labelListList& hitSurfaces,
-    List<List<pointIndexHit> >& hitInfo
+    List<List<pointIndexHit>>& hitInfo
 ) const
 {
     searchableSurfacesQueries::findAllIntersections
@@ -609,7 +609,7 @@ bool Foam::searchableSurfaces::checkSizes
 bool Foam::searchableSurfaces::checkIntersection
 (
     const scalar tolerance,
-    const autoPtr<writer<scalar> >& setWriter,
+    const autoPtr<writer<scalar>>& setWriter,
     const bool report
 ) const
 {
@@ -837,7 +837,7 @@ Foam::label Foam::searchableSurfaces::checkGeometry
 (
     const scalar maxRatio,
     const scalar tol,
-    const autoPtr<writer<scalar> >& setWriter,
+    const autoPtr<writer<scalar>>& setWriter,
     const scalar minQuality,
     const bool report
 ) const
diff --git a/src/meshTools/searchableSurface/searchableSurfaces.H b/src/meshTools/searchableSurface/searchableSurfaces.H
index 1931c8d5b7..9c85e3f042 100644
--- a/src/meshTools/searchableSurface/searchableSurfaces.H
+++ b/src/meshTools/searchableSurface/searchableSurfaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -174,7 +174,7 @@ public:
                 const pointField& start,
                 const pointField& end,
                 labelListList& surfaces,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const;
 
             //Find intersections of edge nearest to both endpoints.
@@ -237,7 +237,7 @@ public:
             bool checkIntersection
             (
                 const scalar tol,
-                const autoPtr<writer<scalar> >&,
+                const autoPtr<writer<scalar>>&,
                 const bool report
             ) const;
 
@@ -256,7 +256,7 @@ public:
             (
                 const scalar maxRatio,
                 const scalar tolerance,
-                const autoPtr<writer<scalar> >& setWriter,
+                const autoPtr<writer<scalar>>& setWriter,
                 const scalar minQuality,
                 const bool report
             ) const;
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index aaa9ffbf01..4a3a8dcf41 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -263,7 +263,7 @@ bool Foam::searchableSurfacesQueries::morphTet
 //    const pointField& start,
 //    const pointField& end,
 //    const vectorField& smallVec,
-//    List<List<pointIndexHit> >& surfaceHitInfo
+//    List<List<pointIndexHit>>& surfaceHitInfo
 //)
 //{
 //    surfaceHitInfo.setSize(start.size());
@@ -460,7 +460,7 @@ void Foam::searchableSurfacesQueries::findAllIntersections
     const pointField& start,
     const pointField& end,
     labelListList& hitSurfaces,
-    List<List<pointIndexHit> >& hitInfo
+    List<List<pointIndexHit>>& hitInfo
 )
 {
     // Note: maybe move the single-surface all intersections test into
@@ -505,7 +505,7 @@ void Foam::searchableSurfacesQueries::findAllIntersections
         // Test the other surfaces and merge (according to distance from start).
         for (label testI = 1; testI < surfacesToTest.size(); testI++)
         {
-            List<List<pointIndexHit> > surfHits;
+            List<List<pointIndexHit>> surfHits;
             allSurfaces[surfacesToTest[testI]].findLineAll
             (
                 start,
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.H b/src/meshTools/searchableSurface/searchableSurfacesQueries.H
index 529d4b94fa..789584dc7d 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.H
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ class searchableSurfacesQueries
         //    const pointField& start,
         //    const pointField& end,
         //    const vectorField& smallVec,
-        //    List<List<pointIndexHit> >&
+        //    List<List<pointIndexHit>>&
         //);
 
         static void mergeHits
@@ -155,7 +155,7 @@ public:
                 const pointField& start,
                 const pointField& end,
                 labelListList& surfaces,
-                List<List<pointIndexHit> >& surfaceHits
+                List<List<pointIndexHit>>& surfaceHits
             );
 
             //Find intersections of edge nearest to both endpoints.
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index 3aaeb06edf..794c3e0953 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -602,7 +602,7 @@ void Foam::triSurfaceMesh::findLineAll
 (
     const pointField& start,
     const pointField& end,
-    List<List<pointIndexHit> >& info
+    List<List<pointIndexHit>>& info
 ) const
 {
     triSurfaceSearch::findLineAll(start, end, info);
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.H b/src/meshTools/searchableSurface/triSurfaceMesh.H
index 401dea10ff..fe512f67a0 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.H
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ private:
         scalar minQuality_;
 
         //- Search tree for boundary edges.
-        mutable autoPtr<indexedOctree<treeDataEdge> > edgeTree_;
+        mutable autoPtr<indexedOctree<treeDataEdge>> edgeTree_;
 
         //- Names of regions
         mutable wordList regions_;
@@ -236,7 +236,7 @@ public:
             (
                 const pointField& start,
                 const pointField& end,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const;
 
             //- From a set of points and indices get the region
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
index 3a39a47525..f287a4d67f 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -164,7 +164,7 @@ Foam::edgeSurface::edgeSurface
 
     DynamicList<edge> allEdges(surf.nEdges() + inter.cutEdges().size());
     DynamicList<label> allParentEdges(surf.nEdges());
-    List<DynamicList<label> > allFaceEdges(surf.size());
+    List<DynamicList<label>> allFaceEdges(surf.size());
 
 
     // Copy surface edges (can be split!)
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 0c294d0c32..10ba05bc64 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -282,7 +282,7 @@ void Foam::intersectedSurface::incCount
 // Calculate point to edge addressing for the face given by the edge
 // subset faceEdges. Constructs facePointEdges which for every point
 // gives a list of edge labels connected to it.
-Foam::Map<Foam::DynamicList<Foam::label> >
+Foam::Map<Foam::DynamicList<Foam::label>>
 Foam::intersectedSurface::calcPointEdgeAddressing
 (
     const edgeSurface& eSurf,
@@ -294,7 +294,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
 
     const labelList& fEdges = eSurf.faceEdges()[faceI];
 
-    Map<DynamicList<label> > facePointEdges(4*fEdges.size());
+    Map<DynamicList<label>> facePointEdges(4*fEdges.size());
 
     forAll(fEdges, i)
     {
@@ -303,7 +303,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
         const edge& e = edges[edgeI];
 
         // Add e.start to point-edges
-        Map<DynamicList<label> >::iterator iter =
+        Map<DynamicList<label>>::iterator iter =
             facePointEdges.find(e.start());
 
         if (iter == facePointEdges.end())
@@ -318,7 +318,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
         }
 
         // Add e.end to point-edges
-        Map<DynamicList<label> >::iterator iter2 =
+        Map<DynamicList<label>>::iterator iter2 =
             facePointEdges.find(e.end());
 
         if (iter2 == facePointEdges.end())
@@ -383,7 +383,7 @@ Foam::label Foam::intersectedSurface::nextEdge
     const Map<label>& visited,
     const label faceI,
     const vector& n,
-    const Map<DynamicList<label> >& facePointEdges,
+    const Map<DynamicList<label>>& facePointEdges,
     const label prevEdgeI,
     const label prevVertI
 )
@@ -561,7 +561,7 @@ Foam::face Foam::intersectedSurface::walkFace
     const edgeSurface& eSurf,
     const label faceI,
     const vector& n,
-    const Map<DynamicList<label> >& facePointEdges,
+    const Map<DynamicList<label>>& facePointEdges,
 
     const label startEdgeI,
     const label startVertI,
@@ -637,7 +637,7 @@ void Foam::intersectedSurface::findNearestVisited
 (
     const edgeSurface& eSurf,
     const label faceI,
-    const Map<DynamicList<label> >& facePointEdges,
+    const Map<DynamicList<label>>& facePointEdges,
     const Map<label>& pointVisited,
     const point& pt,
     const label excludePointI,
@@ -699,7 +699,7 @@ Foam::faceList Foam::intersectedSurface::resplitFace
 (
     const triSurface& surf,
     const label faceI,
-    const Map<DynamicList<label> >& facePointEdges,
+    const Map<DynamicList<label>>& facePointEdges,
     const Map<label>& visited,
     edgeSurface& eSurf
 )
@@ -786,7 +786,7 @@ Foam::faceList Foam::intersectedSurface::resplitFace
     {
         scalar minDist = GREAT;
 
-        forAllConstIter(Map<DynamicList<label> >, facePointEdges, iter)
+        forAllConstIter(Map<DynamicList<label>>, facePointEdges, iter)
         {
             label pointI = iter.key();
 
@@ -831,7 +831,7 @@ Foam::faceList Foam::intersectedSurface::resplitFace
     {
         scalar minDist = GREAT;
 
-        forAllConstIter(Map<DynamicList<label> >, facePointEdges, iter)
+        forAllConstIter(Map<DynamicList<label>>, facePointEdges, iter)
         {
             label pointI = iter.key();
 
@@ -918,7 +918,7 @@ Foam::faceList Foam::intersectedSurface::splitFace
     const labelList& fEdges = eSurf.faceEdges()[faceI];
 
     // Create local (for the face only) point-edge connectivity.
-    Map<DynamicList<label> > facePointEdges
+    Map<DynamicList<label>> facePointEdges
     (
         calcPointEdgeAddressing
         (
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.H b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.H
index c6499cb4d3..8b0c105c7d 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.H
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -167,7 +167,7 @@ private:
         );
 
         //- Calculate point-edge addressing for single face only.
-        static Map<DynamicList<label> > calcPointEdgeAddressing
+        static Map<DynamicList<label>> calcPointEdgeAddressing
         (
             const edgeSurface&,
             const label faceI
@@ -181,7 +181,7 @@ private:
             const Map<label>& visited,
             const label faceI,
             const vector& n,                // original triangle normal
-            const Map<DynamicList<label> >& facePointEdges,
+            const Map<DynamicList<label>>& facePointEdges,
             const label prevEdgeI,
             const label prevVertI
         );
@@ -192,7 +192,7 @@ private:
             const edgeSurface& eSurf,
             const label faceI,
             const vector& n,
-            const Map<DynamicList<label> >& facePointEdges,
+            const Map<DynamicList<label>>& facePointEdges,
 
             const label startEdgeI,
             const label startVertI,
@@ -206,7 +206,7 @@ private:
         (
             const edgeSurface& eSurf,
             const label faceI,
-            const Map<DynamicList<label> >& facePointEdges,
+            const Map<DynamicList<label>>& facePointEdges,
             const Map<label>& pointVisited,
             const point& pt,
             const label excludeFaceI,
@@ -221,7 +221,7 @@ private:
         (
             const triSurface& surf,
             const label faceI,
-            const Map<DynamicList<label> >& facePointEdges,
+            const Map<DynamicList<label>>& facePointEdges,
             const Map<label>& visited,
             edgeSurface& eSurf
         );
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index 3685fdd597..72b8c6bb4a 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,7 +146,7 @@ void Foam::edgeIntersections::intersectEdges
         edgeDirs[i] = n;
     }
 
-    List<List<pointIndexHit> > edgeIntersections;
+    List<List<pointIndexHit>> edgeIntersections;
     querySurf2.findLineAll
     (
         start,
@@ -457,7 +457,7 @@ bool Foam::edgeIntersections::offsetPerturb
 // Construct null
 Foam::edgeIntersections::edgeIntersections()
 :
-    List<List<pointIndexHit> >(),
+    List<List<pointIndexHit>>(),
     classification_()
 {}
 
@@ -470,7 +470,7 @@ Foam::edgeIntersections::edgeIntersections
     const scalarField& surf1PointTol
 )
 :
-    List<List<pointIndexHit> >(surf1.nEdges()),
+    List<List<pointIndexHit>>(surf1.nEdges()),
     classification_(surf1.nEdges())
 {
     checkEdges(surf1);
@@ -500,11 +500,11 @@ Foam::edgeIntersections::edgeIntersections
 // Construct from components
 Foam::edgeIntersections::edgeIntersections
 (
-    const List<List<pointIndexHit> >& intersections,
+    const List<List<pointIndexHit>>& intersections,
     const labelListList& classification
 )
 :
-    List<List<pointIndexHit> >(intersections),
+    List<List<pointIndexHit>>(intersections),
     classification_(classification)
 {}
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
index d1822151f6..3411a05948 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ class edge;
 
 class edgeIntersections
 :
-    public List<List<pointIndexHit> >
+    public List<List<pointIndexHit>>
 {
     // Private data
 
@@ -165,7 +165,7 @@ public:
         //- Construct from components
         edgeIntersections
         (
-            const List<List<pointIndexHit> >&,
+            const List<List<pointIndexHit>>&,
             const labelListList&
         );
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 9a9f88b6c8..9aeb2864a2 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -282,7 +282,7 @@ void Foam::surfaceIntersection::classifyHit
 
     DynamicList<edge>& allCutEdges,
     DynamicList<point>& allCutPoints,
-    List<DynamicList<label> >& surfEdgeCuts
+    List<DynamicList<label>>& surfEdgeCuts
 )
 {
     const edge& e = surf1.edges()[edgeI];
@@ -563,7 +563,7 @@ void Foam::surfaceIntersection::doCutEdges
 
     DynamicList<edge>& allCutEdges,
     DynamicList<point>& allCutPoints,
-    List<DynamicList<label> >& surfEdgeCuts
+    List<DynamicList<label>>& surfEdgeCuts
 )
 {
     scalar oldTol = intersection::setPlanarTol(1e-3);
@@ -738,7 +738,7 @@ Foam::surfaceIntersection::surfaceIntersection
 
 
     // From edge to cut index on surface1
-    List<DynamicList<label> > edgeCuts1(query1.surface().nEdges());
+    List<DynamicList<label>> edgeCuts1(query1.surface().nEdges());
 
     doCutEdges
     (
@@ -765,7 +765,7 @@ Foam::surfaceIntersection::surfaceIntersection
     }
 
     // From edge to cut index
-    List<DynamicList<label> > edgeCuts2(query2.surface().nEdges());
+    List<DynamicList<label>> edgeCuts2(query2.surface().nEdges());
 
     doCutEdges
     (
@@ -842,7 +842,7 @@ Foam::surfaceIntersection::surfaceIntersection
 
     {
         // From edge to cut index on surface1
-        List<DynamicList<label> > edgeCuts1(surf1.nEdges());
+        List<DynamicList<label>> edgeCuts1(surf1.nEdges());
 
         forAll(intersections1, edgeI)
         {
@@ -883,7 +883,7 @@ Foam::surfaceIntersection::surfaceIntersection
 
     {
         // From edge to cut index on surface2
-        List<DynamicList<label> > edgeCuts2(surf2.nEdges());
+        List<DynamicList<label>> edgeCuts2(surf2.nEdges());
 
         forAll(intersections2, edgeI)
         {
@@ -1000,7 +1000,7 @@ Foam::surfaceIntersection::surfaceIntersection
     DynamicList<point> allCutPoints;
 
     // From edge to cut index on surface1
-    List<DynamicList<label> > edgeCuts1(query1.surface().nEdges());
+    List<DynamicList<label>> edgeCuts1(query1.surface().nEdges());
 
     doCutEdges
     (
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
index 73638b4332..857ebc673c 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,9 +119,9 @@ class surfaceIntersection
             Ostream&
         );
 
-        //- Transfer contents of List<DynamicList<..> > to List<List<..>>
+        //- Transfer contents of List<DynamicList<..>> to List<List<..>>
         template<class T>
-        static void transfer(List<DynamicList<T> >&,  List<List<T> >&);
+        static void transfer(List<DynamicList<T>>&,  List<List<T>>&);
 
         //- Get minimum length of all edges connected to point
         static scalar minEdgeLen(const triSurface& surf, const label pointI);
@@ -216,7 +216,7 @@ class surfaceIntersection
 
             DynamicList<edge>& allCutEdges,
             DynamicList<point>& allCutPoints,
-            List<DynamicList<label> >& surfEdgeCuts
+            List<DynamicList<label>>& surfEdgeCuts
         );
 
         //- Cut edges of surf1 with surface 2.
@@ -229,7 +229,7 @@ class surfaceIntersection
 
             DynamicList<edge>& allCutEdges,
             DynamicList<point>& allCutPoints,
-            List<DynamicList<label> >& surfEdgeCuts
+            List<DynamicList<label>>& surfEdgeCuts
         );
 
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
index 753eeec355..aff5455ae0 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -184,7 +184,7 @@ Foam::edgeList Foam::surfaceIntersection::filterEdges
     labelList& map
 )
 {
-    HashSet<edge, Hash<edge> > uniqueEdges(10*edges.size());
+    HashSet<edge, Hash<edge>> uniqueEdges(10*edges.size());
 
     edgeList newEdges(edges.size());
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
index 938216f3c9..af0ce2cf41 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,8 +31,8 @@ License
 template<class T>
 void Foam::surfaceIntersection::transfer
 (
-    List<DynamicList<T> >& srcLst,
-    List<List<T> >& dstLst
+    List<DynamicList<T>>& srcLst,
+    List<List<T>>& dstLst
 )
 {
     dstLst.setSize(srcLst.size());
diff --git a/src/meshTools/triSurface/orientedSurface/orientedSurface.C b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
index 05ad8dc768..2f117fd9b9 100644
--- a/src/meshTools/triSurface/orientedSurface/orientedSurface.C
+++ b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -259,7 +259,7 @@ void Foam::orientedSurface::findZoneSide
     isOutside = false;
 
     pointField start(1, outsidePoint);
-    List<List<pointIndexHit> > hits(1, List<pointIndexHit>());
+    List<List<pointIndexHit>> hits(1, List<pointIndexHit>());
 
     forAll(faceZone, faceI)
     {
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
index fc8d29ecd7..15eb7dcf25 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -377,7 +377,7 @@ void Foam::triSurfaceSearch::findLineAll
 (
     const pointField& start,
     const pointField& end,
-    List<List<pointIndexHit> >& info
+    List<List<pointIndexHit>>& info
 ) const
 {
     const indexedOctree<treeDataTriSurface>& octree = tree();
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H
index f4176f3cfa..1debfc8ff6 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ class triSurfaceSearch
         label maxTreeDepth_;
 
         //- Octree for searches
-        mutable autoPtr<indexedOctree<treeDataTriSurface> > treePtr_;
+        mutable autoPtr<indexedOctree<treeDataTriSurface>> treePtr_;
 
 
     // Private Member Functions
@@ -176,7 +176,7 @@ public:
         (
             const pointField& start,
             const pointField& end,
-            List<List<pointIndexHit> >& info
+            List<List<pointIndexHit>>& info
         ) const;
 };
 
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
index 4683dcd4e4..b5484532ce 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,11 +67,11 @@ class pointToPointPlanarInterpolation
 
         //- Current interpolation addressing to face centres of underlying
         //  patch
-        List<FixedList<label, 3> > nearestVertex_;
+        List<FixedList<label, 3>> nearestVertex_;
 
         //- Current interpolation factors to face centres of underlying
         //  patch
-        List<FixedList<scalar, 3> > nearestVertexWeight_;
+        List<FixedList<scalar, 3>> nearestVertexWeight_;
 
     // Private Member Functions
 
@@ -130,14 +130,14 @@ public:
         }
 
         //  patch
-        const List<FixedList<label, 3> >& nearestVertex() const
+        const List<FixedList<label, 3>>& nearestVertex() const
         {
             return nearestVertex_;
         }
 
         //- Current interpolation factors to face centres of underlying
         //  patch
-        const List<FixedList<scalar, 3> >& nearestVertexWeight() const
+        const List<FixedList<scalar, 3>>& nearestVertexWeight() const
         {
             return nearestVertexWeight_;
         }
@@ -157,7 +157,7 @@ public:
 
         //- Interpolate from field on source points to dest points
         template<class Type>
-        tmp<Field<Type> > interpolate(const Field<Type>& sourceFld) const;
+        tmp<Field<Type>> interpolate(const Field<Type>& sourceFld) const;
 
 };
 
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C
index 96c9481f5c..4b9f3b2dc2 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::pointToPointPlanarInterpolation::interpolate
+Foam::tmp<Foam::Field<Type>> Foam::pointToPointPlanarInterpolation::interpolate
 (
     const Field<Type>& sourceFld
 ) const
@@ -41,7 +41,7 @@ Foam::tmp<Foam::Field<Type> > Foam::pointToPointPlanarInterpolation::interpolate
             << exit(FatalError);
     }
 
-    tmp<Field<Type> > tfld(new Field<Type>(nearestVertex_.size()));
+    tmp<Field<Type>> tfld(new Field<Type>(nearestVertex_.size()));
     Field<Type>& fld = tfld();
 
     forAll(fld, i)
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index 441f6136e9..0c21a1b380 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -451,8 +451,8 @@ void Foam::triSurfaceTools::getMergedEdges
     const triSurface& surf,
     const label edgeI,
     const labelHashSet& collapsedFaces,
-    HashTable<label, label, Hash<label> >& edgeToEdge,
-    HashTable<label, label, Hash<label> >& edgeToFace
+    HashTable<label, label, Hash<label>>& edgeToEdge,
+    HashTable<label, label, Hash<label>>& edgeToFace
 )
 {
     const edge& e = surf.edges()[edgeI];
@@ -534,8 +534,8 @@ Foam::scalar Foam::triSurfaceTools::edgeCosAngle
     const label v1,
     const point& pt,
     const labelHashSet& collapsedFaces,
-    const HashTable<label, label, Hash<label> >& edgeToEdge,
-    const HashTable<label, label, Hash<label> >& edgeToFace,
+    const HashTable<label, label, Hash<label>>& edgeToEdge,
+    const HashTable<label, label, Hash<label>>& edgeToFace,
     const label faceI,
     const label edgeI
 )
@@ -632,8 +632,8 @@ Foam::scalar Foam::triSurfaceTools::collapseMinCosAngle
     const label v1,
     const point& pt,
     const labelHashSet& collapsedFaces,
-    const HashTable<label, label, Hash<label> >& edgeToEdge,
-    const HashTable<label, label, Hash<label> >& edgeToFace
+    const HashTable<label, label, Hash<label>>& edgeToEdge,
+    const HashTable<label, label, Hash<label>>& edgeToFace
 )
 {
     const labelList& v1Faces = surf.pointFaces()[v1];
@@ -686,8 +686,8 @@ bool Foam::triSurfaceTools::collapseCreatesFold
     const label v1,
     const point& pt,
     const labelHashSet& collapsedFaces,
-    const HashTable<label, label, Hash<label> >& edgeToEdge,
-    const HashTable<label, label, Hash<label> >& edgeToFace,
+    const HashTable<label, label, Hash<label>>& edgeToEdge,
+    const HashTable<label, label, Hash<label>>& edgeToFace,
     const scalar minCos
 )
 {
@@ -751,7 +751,7 @@ bool Foam::triSurfaceTools::collapseCreatesFold
 //    // neighbours actually contains the
 //    // edge with which triangle connects to collapsedFaces.
 //
-//    HashTable<label, label, Hash<label> > neighbours;
+//    HashTable<label, label, Hash<label>> neighbours;
 //
 //    labelList collapsed = collapsedFaces.toc();
 //
@@ -2621,8 +2621,8 @@ void Foam::triSurfaceTools::calcInterpolationWeights
 (
     const triSurface& s,
     const pointField& samplePts,
-    List<FixedList<label, 3> >& allVerts,
-    List<FixedList<scalar, 3> >& allWeights
+    List<FixedList<label, 3>>& allVerts,
+    List<FixedList<scalar, 3>>& allWeights
 )
 {
     allVerts.setSize(samplePts.size());
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
index 82a808b1d7..ed7a14daf6 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,8 +139,8 @@ class triSurfaceTools
                 const triSurface& surf,
                 const label edgeI,
                 const labelHashSet& collapsedFaces,
-                HashTable<label, label, Hash<label> >& edgeToEdge,
-                HashTable<label, label, Hash<label> >& edgeToFace
+                HashTable<label, label, Hash<label>>& edgeToEdge,
+                HashTable<label, label, Hash<label>>& edgeToFace
             );
 
             //- Calculates (cos of) angle across edgeI of faceI,
@@ -152,8 +152,8 @@ class triSurfaceTools
                 const label v1,
                 const point& pt,
                 const labelHashSet& collapsedFaces,
-                const HashTable<label, label, Hash<label> >& edgeToEdge,
-                const HashTable<label, label, Hash<label> >& edgeToFace,
+                const HashTable<label, label, Hash<label>>& edgeToEdge,
+                const HashTable<label, label, Hash<label>>& edgeToFace,
                 const label faceI,
                 const label edgeI
             );
@@ -168,8 +168,8 @@ class triSurfaceTools
                 const label v1,
                 const point& pt,
                 const labelHashSet& collapsedFaces,
-                const HashTable<label, label, Hash<label> >& edgeToEdge,
-                const HashTable<label, label, Hash<label> >& edgeToFace
+                const HashTable<label, label, Hash<label>>& edgeToEdge,
+                const HashTable<label, label, Hash<label>>& edgeToFace
             );
 
             //- Like collapseMinCosAngle but return true for value < minCos
@@ -179,8 +179,8 @@ class triSurfaceTools
                 const label v1,
                 const point& pt,
                 const labelHashSet& collapsedFaces,
-                const HashTable<label, label, Hash<label> >& edgeToEdge,
-                const HashTable<label, label, Hash<label> >& edgeToFace,
+                const HashTable<label, label, Hash<label>>& edgeToEdge,
+                const HashTable<label, label, Hash<label>>& edgeToFace,
                 const scalar minCos
             );
 
@@ -190,7 +190,7 @@ class triSurfaceTools
             //(
             //    const triSurface& surf,
             //    const label edgeI,
-            //    const HashTable<bool, label, Hash<label> >& collapsedFaces
+            //    const HashTable<bool, label, Hash<label>>& collapsedFaces
             //);
 
         // Tracking
@@ -507,8 +507,8 @@ public:
         (
             const triSurface& s,
             const pointField& samplePts,
-            List<FixedList<label, 3> >& verts,
-            List<FixedList<scalar, 3> >& weights
+            List<FixedList<label, 3>>& verts,
+            List<FixedList<scalar, 3>>& weights
         );
 
         //- Do unconstrained Delaunay of points. Returns triSurface with 3D
diff --git a/src/parallel/decompose/decompose/fvFieldDecomposer.H b/src/parallel/decompose/decompose/fvFieldDecomposer.H
index 0bf83369e6..1a5e672614 100644
--- a/src/parallel/decompose/decompose/fvFieldDecomposer.H
+++ b/src/parallel/decompose/decompose/fvFieldDecomposer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -256,7 +256,7 @@ public:
 
         //- Decompose volume field
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> >
+        tmp<GeometricField<Type, fvPatchField, volMesh>>
         decomposeField
         (
             const GeometricField<Type, fvPatchField, volMesh>& field,
@@ -265,7 +265,7 @@ public:
 
         //- Decompose surface field
         template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         decomposeField
         (
             const GeometricField<Type, fvsPatchField, surfaceMesh>& field
diff --git a/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C b/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
index fa3594d93a..24a3b377da 100644
--- a/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
+++ b/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvFieldDecomposer::decomposeField
 (
     const GeometricField<Type, fvPatchField, volMesh>& field,
@@ -41,7 +41,7 @@ Foam::fvFieldDecomposer::decomposeField
 ) const
 {
     // 1. Create the complete field with dummy patch fields
-    PtrList<fvPatchField<Type> > patchFields(boundaryAddressing_.size());
+    PtrList<fvPatchField<Type>> patchFields(boundaryAddressing_.size());
 
     forAll(boundaryAddressing_, patchi)
     {
@@ -58,7 +58,7 @@ Foam::fvFieldDecomposer::decomposeField
     }
 
     // Create the field for the processor
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tresF
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tresF
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -160,7 +160,7 @@ Foam::fvFieldDecomposer::decomposeField
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvFieldDecomposer::decomposeField
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& field
@@ -212,7 +212,7 @@ Foam::fvFieldDecomposer::decomposeField
 
 
     // 1. Create the complete field with dummy patch fields
-    PtrList<fvsPatchField<Type> > patchFields(boundaryAddressing_.size());
+    PtrList<fvsPatchField<Type>> patchFields(boundaryAddressing_.size());
 
     forAll(boundaryAddressing_, patchi)
     {
@@ -228,7 +228,7 @@ Foam::fvFieldDecomposer::decomposeField
         );
     }
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tresF
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tresF
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index d7af8cd81c..bf37bfd1ff 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1213,7 +1213,7 @@ void Foam::decompositionMethod::setConstraints
     label nProcSets = 0;
     if (decompositionDict_.found("singleProcessorFaceSets"))
     {
-        List<Tuple2<word, label> > zNameAndProcs
+        List<Tuple2<word, label>> zNameAndProcs
         (
             decompositionDict_.lookup("singleProcessorFaceSets")
         );
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
index f282c211e6..f99e59bfba 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ void Foam::multiLevelDecomp::subsetGlobalCellCells
     subCellCells = UIndirectList<labelList>(cellCells, set);
 
     // Get new indices for neighbouring processors
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     mapDistribute map(globalCells, subCellCells, compactMap);
     map.distribute(oldToNew);
     labelList allDist(dist);
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 200a4d2a1d..1db0c9b5df 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -180,7 +180,7 @@ void Foam::distributedTriSurfaceMesh::distributeSegment
 
     DynamicList<segment>& allSegments,
     DynamicList<label>& allSegmentMap,
-    List<DynamicList<label> >& sendMap
+    List<DynamicList<label>>& sendMap
 ) const
 {
     // 1. Fully local already handled outside. Note: retest is cheap.
@@ -277,7 +277,7 @@ Foam::distributedTriSurfaceMesh::distributeSegments
         // Original index of segment
         DynamicList<label> dynAllSegmentMap(start.size());
         // Per processor indices into allSegments to send
-        List<DynamicList<label> > dynSendMap(Pstream::nProcs());
+        List<DynamicList<label>> dynSendMap(Pstream::nProcs());
 
         forAll(start, segmentI)
         {
@@ -711,7 +711,7 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
         // Original index of segment
         DynamicList<label> dynAllSegmentMap(centres.size());
         // Per processor indices into allSegments to send
-        List<DynamicList<label> > dynSendMap(Pstream::nProcs());
+        List<DynamicList<label>> dynSendMap(Pstream::nProcs());
 
         // Work array - whether processor bb overlaps the bounding sphere.
         boolList procBbOverlaps(Pstream::nProcs());
@@ -807,7 +807,7 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
 // Returns a per processor a list of bounding boxes that most accurately
 // describe the shape. For now just a single bounding box per processor but
 // optimisation might be to determine a better fitting shape.
-Foam::List<Foam::List<Foam::treeBoundBox> >
+Foam::List<Foam::List<Foam::treeBoundBox>>
 Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
 (
     const triSurface& s
@@ -866,7 +866,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
     // Find bounding box for all triangles on new distribution.
 
     // Initialise to inverted box (VGREAT, -VGREAT)
-    List<List<treeBoundBox> > bbs(Pstream::nProcs());
+    List<List<treeBoundBox>> bbs(Pstream::nProcs());
     forAll(bbs, procI)
     {
         bbs[procI].setSize(1);
@@ -1715,7 +1715,7 @@ void Foam::distributedTriSurfaceMesh::findLineAll
 (
     const pointField& start,
     const pointField& end,
-    List<List<pointIndexHit> >& info
+    List<List<pointIndexHit>>& info
 ) const
 {
     // Reuse fineLine. We could modify all of findLine to do multiple
@@ -2056,7 +2056,7 @@ void Foam::distributedTriSurfaceMesh::distribute
     // ~~~~~~~~~~~~~~~~~~~~~~
 
     {
-        List<List<treeBoundBox> > newProcBb(Pstream::nProcs());
+        List<List<treeBoundBox>> newProcBb(Pstream::nProcs());
 
         switch(distType_)
         {
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
index 30c559f517..c99d560395 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ private:
         IOdictionary dict_;
 
         //- Bounding boxes of all processors
-        List<List<treeBoundBox> > procBb_;
+        List<List<treeBoundBox>> procBb_;
 
         //- Global triangle numbering
         mutable autoPtr<globalIndex> globalTris_;
@@ -152,7 +152,7 @@ private:
 
                 DynamicList<segment>&,
                 DynamicList<label>&,
-                List<DynamicList<label> >&
+                List<DynamicList<label>>&
             ) const;
 
             //- Divide edges into local and remote segments. Construct map to
@@ -211,7 +211,7 @@ private:
         // Surface redistribution
 
             //- Finds new bounds based on an indepedent decomposition.
-            List<List<treeBoundBox> > independentlyDistributedBbs
+            List<List<treeBoundBox>> independentlyDistributedBbs
             (
                 const triSurface&
             );
@@ -378,7 +378,7 @@ public:
             (
                 const pointField& start,
                 const pointField& end,
-                List<List<pointIndexHit> >&
+                List<List<pointIndexHit>>&
             ) const;
 
             //- From a set of points and indices get the region
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
index 0ee1decbb4..35122ad04a 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -151,46 +151,46 @@ public:
 
         //- Reconstruct volume internal field
         template<class Type>
-        tmp<DimensionedField<Type, volMesh> >
+        tmp<DimensionedField<Type, volMesh>>
         reconstructFvVolumeInternalField
         (
             const IOobject& fieldIoObject,
-            const PtrList<DimensionedField<Type, volMesh> >& procFields
+            const PtrList<DimensionedField<Type, volMesh>>& procFields
         ) const;
 
         //- Read and reconstruct volume internal field
         template<class Type>
-        tmp<DimensionedField<Type, volMesh> >
+        tmp<DimensionedField<Type, volMesh>>
         reconstructFvVolumeInternalField(const IOobject& fieldIoObject) const;
 
 
         //- Reconstruct volume field
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> >
+        tmp<GeometricField<Type, fvPatchField, volMesh>>
         reconstructFvVolumeField
         (
             const IOobject& fieldIoObject,
-            const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
+            const PtrList<GeometricField<Type, fvPatchField, volMesh>>&
         ) const;
 
         //- Read and reconstruct volume field
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> >
+        tmp<GeometricField<Type, fvPatchField, volMesh>>
         reconstructFvVolumeField(const IOobject& fieldIoObject) const;
 
 
         //- Reconstruct surface field
         template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         reconstructFvSurfaceField
         (
             const IOobject& fieldIoObject,
-            const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+            const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>&
         ) const;
 
         //- Read and reconstruct surface field
         template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         reconstructFvSurfaceField(const IOobject& fieldIoObject) const;
 
         //- Read, reconstruct and write all/selected volume internal fields
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
index 7a9487667d..889af083be 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,11 +34,11 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh>>
 Foam::fvFieldReconstructor::reconstructFvVolumeInternalField
 (
     const IOobject& fieldIoObject,
-    const PtrList<DimensionedField<Type, volMesh> >& procFields
+    const PtrList<DimensionedField<Type, volMesh>>& procFields
 ) const
 {
     // Create the internalField
@@ -56,7 +56,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeInternalField
         );
     }
 
-    return tmp<DimensionedField<Type, volMesh> >
+    return tmp<DimensionedField<Type, volMesh>>
     (
         new DimensionedField<Type, volMesh>
         (
@@ -70,14 +70,14 @@ Foam::fvFieldReconstructor::reconstructFvVolumeInternalField
 
 
 template<class Type>
-Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh>>
 Foam::fvFieldReconstructor::reconstructFvVolumeInternalField
 (
     const IOobject& fieldIoObject
 ) const
 {
     // Read the field for all the processors
-    PtrList<DimensionedField<Type, volMesh> > procFields
+    PtrList<DimensionedField<Type, volMesh>> procFields
     (
         procMeshes_.size()
     );
@@ -119,18 +119,18 @@ Foam::fvFieldReconstructor::reconstructFvVolumeInternalField
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvFieldReconstructor::reconstructFvVolumeField
 (
     const IOobject& fieldIoObject,
-    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& procFields
+    const PtrList<GeometricField<Type, fvPatchField, volMesh>>& procFields
 ) const
 {
     // Create the internalField
     Field<Type> internalField(mesh_.nCells());
 
     // Create the patch fields
-    PtrList<fvPatchField<Type> > patchFields(mesh_.boundary().size());
+    PtrList<fvPatchField<Type>> patchFields(mesh_.boundary().size());
 
     forAll(procFields, procI)
     {
@@ -282,7 +282,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
 
     // Now construct and write the field
     // setting the internalField and patchFields
-    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    return tmp<GeometricField<Type, fvPatchField, volMesh>>
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -297,14 +297,14 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvFieldReconstructor::reconstructFvVolumeField
 (
     const IOobject& fieldIoObject
 ) const
 {
     // Read the field for all the processors
-    PtrList<GeometricField<Type, fvPatchField, volMesh> > procFields
+    PtrList<GeometricField<Type, fvPatchField, volMesh>> procFields
     (
         procMeshes_.size()
     );
@@ -345,18 +345,18 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvFieldReconstructor::reconstructFvSurfaceField
 (
     const IOobject& fieldIoObject,
-    const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& procFields
+    const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& procFields
 ) const
 {
     // Create the internalField
     Field<Type> internalField(mesh_.nInternalFaces());
 
     // Create the patch fields
-    PtrList<fvsPatchField<Type> > patchFields(mesh_.boundary().size());
+    PtrList<fvsPatchField<Type>> patchFields(mesh_.boundary().size());
 
 
     forAll(procMeshes_, procI)
@@ -523,7 +523,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
 
     // Now construct and write the field
     // setting the internalField and patchFields
-    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
     (
         new GeometricField<Type, fvsPatchField, surfaceMesh>
         (
@@ -538,14 +538,14 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvFieldReconstructor::reconstructFvSurfaceField
 (
     const IOobject& fieldIoObject
 ) const
 {
     // Read the field for all the processors
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> > procFields
+    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>> procFields
     (
         procMeshes_.size()
     );
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
index c15b7111da..4c5c514c29 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,7 +146,7 @@ public:
 
         //- Reconstruct field
         template<class Type>
-        tmp<GeometricField<Type, pointPatchField, pointMesh> >
+        tmp<GeometricField<Type, pointPatchField, pointMesh>>
         reconstructField(const IOobject& fieldIoObject);
 
         //- Reconstruct and write all fields
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
index 8d1ddd2e6c..68b617a157 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,11 +28,11 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
 {
     // Read the field for all the processors
-    PtrList<GeometricField<Type, pointPatchField, pointMesh> > procFields
+    PtrList<GeometricField<Type, pointPatchField, pointMesh>> procFields
     (
         procMeshes_.size()
     );
@@ -62,7 +62,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
     Field<Type> internalField(mesh_.size());
 
     // Create the patch fields
-    PtrList<pointPatchField<Type> > patchFields(mesh_.boundary().size());
+    PtrList<pointPatchField<Type>> patchFields(mesh_.boundary().size());
 
 
     forAll(procMeshes_, proci)
@@ -117,7 +117,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
 
     // Construct and write the field
     // setting the internalField and patchFields
-    return tmp<GeometricField<Type, pointPatchField, pointMesh> >
+    return tmp<GeometricField<Type, pointPatchField, pointMesh>>
     (
         new GeometricField<Type, pointPatchField, pointMesh>
         (
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H b/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H
index 06c2b56a60..9b33dcdebf 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ void reconstructLagrangianPositions
 
 
 template<class Type>
-tmp<IOField<Type> > reconstructLagrangianField
+tmp<IOField<Type>> reconstructLagrangianField
 (
     const word& cloudName,
     const polyMesh& mesh,
@@ -69,7 +69,7 @@ tmp<IOField<Type> > reconstructLagrangianField
 
 
 template<class Type>
-tmp<CompactIOField<Field<Type>, Type> > reconstructLagrangianFieldField
+tmp<CompactIOField<Field<Type>, Type>> reconstructLagrangianFieldField
 (
     const word& cloudName,
     const polyMesh& mesh,
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
index 3c72a5399d..1fb0a26ac0 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::IOField<Type> > Foam::reconstructLagrangianField
+Foam::tmp<Foam::IOField<Type>> Foam::reconstructLagrangianField
 (
     const word& cloudName,
     const polyMesh& mesh,
@@ -39,7 +39,7 @@ Foam::tmp<Foam::IOField<Type> > Foam::reconstructLagrangianField
 )
 {
     // Construct empty field on mesh
-    tmp<IOField<Type> > tfield
+    tmp<IOField<Type>> tfield
     (
         new IOField<Type>
         (
@@ -89,7 +89,7 @@ Foam::tmp<Foam::IOField<Type> > Foam::reconstructLagrangianField
 
 
 template<class Type>
-Foam::tmp<Foam::CompactIOField<Foam::Field<Type>, Type> >
+Foam::tmp<Foam::CompactIOField<Foam::Field<Type>, Type>>
 Foam::reconstructLagrangianFieldField
 (
     const word& cloudName,
@@ -99,7 +99,7 @@ Foam::reconstructLagrangianFieldField
 )
 {
     // Construct empty field on mesh
-    tmp<CompactIOField<Field<Type>, Type > > tfield
+    tmp<CompactIOField<Field<Type>, Type >> tfield
     (
         new CompactIOField<Field<Type>, Type>
         (
@@ -112,10 +112,10 @@ Foam::reconstructLagrangianFieldField
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            Field<Field<Type> >(0)
+            Field<Field<Type>>(0)
         )
     );
-    Field<Field<Type> >& field = tfield();
+    Field<Field<Type>>& field = tfield();
 
     forAll(meshes, i)
     {
@@ -236,7 +236,7 @@ void Foam::reconstructLagrangianFieldFields
     }
 
     {
-        const word fieldClassName(IOField<Field<Type> >::typeName);
+        const word fieldClassName(IOField<Field<Type>>::typeName);
 
         IOobjectList fields = objects.lookupClass(fieldClassName);
 
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
index 0aaebd02cc..2136819b6c 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ void Foam::reconstructLagrangianPositions
         }
     }
 
-    IOPosition<Cloud<passiveParticle> >(lagrangianPositions).write();
+    IOPosition<Cloud<passiveParticle>>(lagrangianPositions).write();
 }
 
 
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
index 09197a671d..4d896b6026 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
+++ b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,15 +137,15 @@ protected:
         void loadField
         (
             const word&,
-            UPtrList<GeometricField<Type, fvPatchField, volMesh> >&,
-            UPtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+            UPtrList<GeometricField<Type, fvPatchField, volMesh>>&,
+            UPtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>&
         ) const;
 
         template<class Type>
         void changeWriteOptions
         (
-            UPtrList<GeometricField<Type, fvPatchField, volMesh> >&,
-            UPtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&,
+            UPtrList<GeometricField<Type, fvPatchField, volMesh>>&,
+            UPtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>&,
             const IOobject::writeOption
         ) const;
 
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C b/src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C
index 56e0089313..ea6683fffe 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C
+++ b/src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,8 +34,8 @@ template<class Type>
 void Foam::partialWrite::loadField
 (
     const word& fieldName,
-    UPtrList<GeometricField<Type, fvPatchField, volMesh> >& vflds,
-    UPtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& sflds
+    UPtrList<GeometricField<Type, fvPatchField, volMesh>>& vflds,
+    UPtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& sflds
 ) const
 {
     typedef GeometricField<Type, fvPatchField, volMesh> vfType;
@@ -85,8 +85,8 @@ void Foam::partialWrite::loadField
 template<class Type>
 void Foam::partialWrite::changeWriteOptions
 (
-    UPtrList<GeometricField<Type, fvPatchField, volMesh> >& vflds,
-    UPtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& sflds,
+    UPtrList<GeometricField<Type, fvPatchField, volMesh>>& vflds,
+    UPtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& sflds,
     const IOobject::writeOption wOption
 ) const
 {
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
index 42f788d884..169a816eee 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -212,7 +212,7 @@ protected:
 
         //- Insert field values into values list
         template<class Type>
-        tmp<Field<Type> > setFieldValues
+        tmp<Field<Type>> setFieldValues
         (
             const word& fieldName,
             const bool mustGet = false
@@ -276,7 +276,7 @@ public:
 
             //- Filter a field according to cellIds
             template<class Type>
-            tmp<Field<Type> > filterField(const Field<Type>& field) const;
+            tmp<Field<Type>> filterField(const Field<Type>& field) const;
 };
 
 
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
index 8c6f4e7b92..217f1f58f3 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ bool Foam::fieldValues::cellSource::validField(const word& fieldName) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fieldValues::cellSource::setFieldValues
+Foam::tmp<Foam::Field<Type>> Foam::fieldValues::cellSource::setFieldValues
 (
     const word& fieldName,
     const bool mustGet
@@ -63,7 +63,7 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::cellSource::setFieldValues
             << abort(FatalError);
     }
 
-    return tmp<Field<Type> >(new Field<Type>(0.0));
+    return tmp<Field<Type>>(new Field<Type>(0.0));
 }
 
 
@@ -211,12 +211,12 @@ bool Foam::fieldValues::cellSource::writeValues(const word& fieldName)
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fieldValues::cellSource::filterField
+Foam::tmp<Foam::Field<Type>> Foam::fieldValues::cellSource::filterField
 (
     const Field<Type>& field
 ) const
 {
-    return tmp<Field<Type> >(new Field<Type>(field, cellId_));
+    return tmp<Field<Type>>(new Field<Type>(field, cellId_));
 }
 
 
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
index e74b840f18..8389711a90 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -300,7 +300,7 @@ protected:
 
         //- Return field values by looking up field name
         template<class Type>
-        tmp<Field<Type> > getFieldValues
+        tmp<Field<Type>> getFieldValues
         (
             const word& fieldName,
             const bool mustGet = false,
@@ -387,7 +387,7 @@ public:
 
             //- Filter a surface field according to faceIds
             template<class Type>
-            tmp<Field<Type> > filterField
+            tmp<Field<Type>> filterField
             (
                 const GeometricField<Type, fvsPatchField, surfaceMesh>& field,
                 const bool applyOrientation
@@ -395,7 +395,7 @@ public:
 
             //- Filter a volume field according to faceIds
             template<class Type>
-            tmp<Field<Type> > filterField
+            tmp<Field<Type>> filterField
             (
                 const GeometricField<Type, fvPatchField, volMesh>& field,
                 const bool applyOrientation
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
index 7af3ca2245..e633d9e72b 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ bool Foam::fieldValues::faceSource::validField(const word& fieldName) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::getFieldValues
+Foam::tmp<Foam::Field<Type>> Foam::fieldValues::faceSource::getFieldValues
 (
     const word& fieldName,
     const bool mustGet,
@@ -74,12 +74,12 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::getFieldValues
             if (surfacePtr_().interpolate())
             {
                 const interpolationCellPoint<Type> interp(fld);
-                tmp<Field<Type> > tintFld(surfacePtr_().interpolate(interp));
+                tmp<Field<Type>> tintFld(surfacePtr_().interpolate(interp));
                 const Field<Type>& intFld = tintFld();
 
                 // Average
                 const faceList& faces = surfacePtr_().faces();
-                tmp<Field<Type> > tavg
+                tmp<Field<Type>> tavg
                 (
                     new Field<Type>(faces.size(), pTraits<Type>::zero)
                 );
@@ -115,7 +115,7 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::getFieldValues
             << abort(FatalError);
     }
 
-    return tmp<Field<Type> >(new Field<Type>(0));
+    return tmp<Field<Type>>(new Field<Type>(0));
 }
 
 
@@ -348,13 +348,13 @@ bool Foam::fieldValues::faceSource::writeValues
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::filterField
+Foam::tmp<Foam::Field<Type>> Foam::fieldValues::faceSource::filterField
 (
     const GeometricField<Type, fvPatchField, volMesh>& field,
     const bool applyOrientation
 ) const
 {
-    tmp<Field<Type> > tvalues(new Field<Type>(faceId_.size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(faceId_.size()));
     Field<Type>& values = tvalues();
 
     forAll(values, i)
@@ -389,13 +389,13 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::filterField
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::filterField
+Foam::tmp<Foam::Field<Type>> Foam::fieldValues::faceSource::filterField
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& field,
     const bool applyOrientation
 ) const
 {
-    tmp<Field<Type> > tvalues(new Field<Type>(faceId_.size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(faceId_.size()));
     Field<Type>& values = tvalues();
 
     forAll(values, i)
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
index 9d852cdfb7..92606dea3c 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,7 +206,7 @@ public:
 
             //- Combine fields from all processor domains into single field
             template<class Type>
-            void combineFields(tmp<Field<Type> >&);
+            void combineFields(tmp<Field<Type>>&);
 };
 
 
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C
index 43d1a18d99..78e3142bd2 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ License
 template<class Type>
 void Foam::fieldValue::combineFields(Field<Type>& field)
 {
-    List<Field<Type> > allValues(Pstream::nProcs());
+    List<Field<Type>> allValues(Pstream::nProcs());
 
     allValues[Pstream::myProcNo()] = field;
 
@@ -41,17 +41,17 @@ void Foam::fieldValue::combineFields(Field<Type>& field)
     if (Pstream::master())
     {
         field =
-            ListListOps::combine<Field<Type> >
+            ListListOps::combine<Field<Type>>
             (
                 allValues,
-                accessOp<Field<Type> >()
+                accessOp<Field<Type>>()
             );
     }
 }
 
 
 template<class Type>
-void Foam::fieldValue::combineFields(tmp<Field<Type> >& field)
+void Foam::fieldValue::combineFields(tmp<Field<Type>>& field)
 {
     combineFields(field());
 }
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.H b/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.H
index b3e7b4f90d..852a3d5d4d 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.H
+++ b/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,10 +69,10 @@ public:
     //- Class used to pass tracking data to the trackToFace function
     class trackingData
     :
-        public particle::TrackingData<Cloud<findCellParticle> >
+        public particle::TrackingData<Cloud<findCellParticle>>
     {
         labelListList& cellToData_;
-        List<List<point> >& cellToEnd_;
+        List<List<point>>& cellToEnd_;
 
     public:
 
@@ -82,10 +82,10 @@ public:
             (
                 Cloud<findCellParticle>& cloud,
                 labelListList& cellToData,
-                List<List<point> >& cellToEnd
+                List<List<point>>& cellToEnd
             )
             :
-                particle::TrackingData<Cloud<findCellParticle> >(cloud),
+                particle::TrackingData<Cloud<findCellParticle>>(cloud),
                 cellToData_(cellToData),
                 cellToEnd_(cellToEnd)
             {}
@@ -98,7 +98,7 @@ public:
                 return cellToData_;
             }
 
-            List<List<point> >& cellToEnd()
+            List<List<point>>& cellToEnd()
             {
                 return cellToEnd_;
             }
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
index 3df21efc22..7a8c162f45 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -180,7 +180,7 @@ void Foam::nearWallFields::calcAddressing()
 
 
     // Rework cell-to-globalpatchface into a map
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     getPatchDataMapPtr_.reset
     (
         new mapDistribute
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
index 014313b2aa..7362f9e32d 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ protected:
         // Read from dictionary
 
             //- Fields to process
-            List<Tuple2<word, word> > fieldSet_;
+            List<Tuple2<word, word>> fieldSet_;
 
             //- Patches to sample
             labelHashSet patchSet_;
@@ -130,7 +130,7 @@ protected:
             labelListList cellToWalls_;
 
             //- From cell to tracked end point
-            List<List<point> > cellToSamples_;
+            List<List<point>> cellToSamples_;
 
             //- Map from cell based data back to patch based data
             autoPtr<mapDistribute> getPatchDataMapPtr_;
@@ -153,7 +153,7 @@ protected:
         template<class Type>
         void createFields
         (
-            PtrList<GeometricField<Type, fvPatchField, volMesh> >&
+            PtrList<GeometricField<Type, fvPatchField, volMesh>>&
         ) const;
 
         //- Override boundary fields with sampled values
@@ -167,7 +167,7 @@ protected:
         template<class Type>
         void sampleFields
         (
-            PtrList<GeometricField<Type, fvPatchField, volMesh> >&
+            PtrList<GeometricField<Type, fvPatchField, volMesh>>&
         ) const;
 
 
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
index 42b1b2abef..c01104a8e4 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 template<class Type>
 void Foam::nearWallFields::createFields
 (
-    PtrList<GeometricField<Type, fvPatchField, volMesh> >& sflds
+    PtrList<GeometricField<Type, fvPatchField, volMesh>>& sflds
 ) const
 {
     typedef GeometricField<Type, fvPatchField, volMesh> vfType;
@@ -121,7 +121,7 @@ void Foam::nearWallFields::sampleBoundaryField
 template<class Type>
 void Foam::nearWallFields::sampleFields
 (
-    PtrList<GeometricField<Type, fvPatchField, volMesh> >& sflds
+    PtrList<GeometricField<Type, fvPatchField, volMesh>>& sflds
 ) const
 {
     typedef GeometricField<Type, fvPatchField, volMesh> vfType;
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index bf13dac4e4..c9cc882a8c 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,8 +128,8 @@ protected:
         void loadField
         (
             const word&,
-            PtrList<GeometricField<Type, fvPatchField, volMesh> >&,
-            PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+            PtrList<GeometricField<Type, fvPatchField, volMesh>>&,
+            PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>&
         ) const;
 
 
diff --git a/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C b/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
index 0d7a89bc00..be8ab7a6d2 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,8 +34,8 @@ template<class Type>
 void Foam::readFields::loadField
 (
     const word& fieldName,
-    PtrList<GeometricField<Type, fvPatchField, volMesh> >& vflds,
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& sflds
+    PtrList<GeometricField<Type, fvPatchField, volMesh>>& vflds,
+    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& sflds
 ) const
 {
     typedef GeometricField<Type, fvPatchField, volMesh> vfType;
diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index b639d8e251..3976cfe672 100644
--- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,7 +166,7 @@ class regionSizeDistribution
         wordReList fields_;
 
         //- Output formatter to write
-        autoPtr<writer<scalar> > formatterPtr_;
+        autoPtr<writer<scalar>> formatterPtr_;
 
         //- Optional coordinate system
         autoPtr<coordinateSystem> coordSysPtr_;
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.C b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
index 35b61ca03c..bde66938ab 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,9 +132,9 @@ void Foam::streamLine::track()
 
     // Read or lookup fields
     PtrList<volScalarField> vsFlds;
-    PtrList<interpolation<scalar> > vsInterp;
+    PtrList<interpolation<scalar>> vsInterp;
     PtrList<volVectorField> vvFlds;
-    PtrList<interpolation<vector> > vvInterp;
+    PtrList<interpolation<vector>> vvInterp;
 
     label UIndex = -1;
 
@@ -664,7 +664,7 @@ void Foam::streamLine::write()
 
             if (allScalars_.size() > 0)
             {
-                List<List<scalarField> > scalarValues(allScalars_.size());
+                List<List<scalarField>> scalarValues(allScalars_.size());
 
                 forAll(allScalars_, scalarI)
                 {
@@ -705,7 +705,7 @@ void Foam::streamLine::write()
 
             if (allVectors_.size() > 0)
             {
-                List<List<vectorField> > vectorValues(allVectors_.size());
+                List<List<vectorField>> vectorValues(allVectors_.size());
 
                 forAll(allVectors_, vectorI)
                 {
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
index 59d9d9026e..16ae0ca96b 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -195,22 +195,22 @@ class streamLine
             word sampledSetAxis_;
 
             //- File writer for scalar data
-            autoPtr<writer<scalar> > scalarFormatterPtr_;
+            autoPtr<writer<scalar>> scalarFormatterPtr_;
 
             //- File writer for vector data
-            autoPtr<writer<vector> > vectorFormatterPtr_;
+            autoPtr<writer<vector>> vectorFormatterPtr_;
 
 
         // Generated data
 
             //- All tracks. Per particle the points it passed through
-            DynamicList<List<point> > allTracks_;
+            DynamicList<List<point>> allTracks_;
 
             //- Per scalarField, per particle, the sampled value.
-            List<DynamicList<scalarList> > allScalars_;
+            List<DynamicList<scalarList>> allScalars_;
 
             //- Per scalarField, per particle, the sampled value.
-            List<DynamicList<vectorList> > allVectors_;
+            List<DynamicList<vectorList>> allVectors_;
 
 
         //- Construct patch out of all wall patch faces
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
index ca939f96a6..d200175232 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,22 +62,22 @@ public:
     //- Class used to pass tracking data to the trackToFace function
     class trackingData
     :
-        public particle::TrackingData<Cloud<streamLineParticle> >
+        public particle::TrackingData<Cloud<streamLineParticle>>
     {
 
     public:
 
 
-        const PtrList<interpolation<scalar> >& vsInterp_;
-        const PtrList<interpolation<vector> >& vvInterp_;
+        const PtrList<interpolation<scalar>>& vsInterp_;
+        const PtrList<interpolation<vector>>& vvInterp_;
         const label UIndex_;
         const bool trackForward_;
         const label nSubCycle_;
         const scalar trackLength_;
 
         DynamicList<vectorList>& allPositions_;
-        List<DynamicList<scalarList> >& allScalars_;
-        List<DynamicList<vectorList> >& allVectors_;
+        List<DynamicList<scalarList>>& allScalars_;
+        List<DynamicList<vectorList>>& allVectors_;
 
 
         // Constructors
@@ -85,19 +85,19 @@ public:
             trackingData
             (
                 Cloud<streamLineParticle>& cloud,
-                const PtrList<interpolation<scalar> >& vsInterp,
-                const PtrList<interpolation<vector> >& vvInterp,
+                const PtrList<interpolation<scalar>>& vsInterp,
+                const PtrList<interpolation<vector>>& vvInterp,
                 const label UIndex,
                 const bool trackForward,
                 const label nSubCycle,
                 const scalar trackLength,
 
-                DynamicList<List<point> >& allPositions,
-                List<DynamicList<scalarList> >& allScalars,
-                List<DynamicList<vectorList> >& allVectors
+                DynamicList<List<point>>& allPositions,
+                List<DynamicList<scalarList>>& allScalars,
+                List<DynamicList<vectorList>>& allVectors
             )
             :
-                particle::TrackingData<Cloud<streamLineParticle> >(cloud),
+                particle::TrackingData<Cloud<streamLineParticle>>(cloud),
                 vsInterp_(vsInterp),
                 vvInterp_(vvInterp),
                 UIndex_(UIndex),
@@ -123,10 +123,10 @@ private:
         DynamicList<point> sampledPositions_;
 
         //- Sampled scalars
-        List<DynamicList<scalar> > sampledScalars_;
+        List<DynamicList<scalar>> sampledScalars_;
 
         //- Sampled vectors
-        List<DynamicList<vector> > sampledVectors_;
+        List<DynamicList<vector>> sampledVectors_;
 
 
     // Private Member Functions
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
index 1a5d38a075..0e55e6b4fc 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ protected:
 
         //- Fields to process
         //wordList fieldSet_;
-        List<Tuple2<word, word> > fieldSet_;
+        List<Tuple2<word, word>> fieldSet_;
 
         //- Locally constructed fields
         PtrList<surfaceScalarField> ssf_;
@@ -125,7 +125,7 @@ protected:
         template<class Type>
         void interpolateFields
         (
-            PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+            PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>&
         ) const;
 
 
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C
index f302ae1f2c..9285ef28e9 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ License
 template<class Type>
 void Foam::surfaceInterpolateFields::interpolateFields
 (
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& sflds
+    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& sflds
 ) const
 {
     typedef GeometricField<Type, fvPatchField, volMesh> vfType;
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
index ab06b1c04e..7bcf797c43 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -240,9 +240,9 @@ void Foam::wallBoundedStreamLine::track()
 
     // Read or lookup fields
     PtrList<volScalarField> vsFlds;
-    PtrList<interpolation<scalar> > vsInterp;
+    PtrList<interpolation<scalar>> vsInterp;
     PtrList<volVectorField> vvFlds;
-    PtrList<interpolation<vector> > vvInterp;
+    PtrList<interpolation<vector>> vvInterp;
 
     label UIndex = -1;
 
@@ -784,7 +784,7 @@ void Foam::wallBoundedStreamLine::write()
 
             if (allScalars_.size() > 0)
             {
-                List<List<scalarField> > scalarValues(allScalars_.size());
+                List<List<scalarField>> scalarValues(allScalars_.size());
 
                 forAll(allScalars_, scalarI)
                 {
@@ -825,7 +825,7 @@ void Foam::wallBoundedStreamLine::write()
 
             if (allVectors_.size() > 0)
             {
-                List<List<vectorField> > vectorValues(allVectors_.size());
+                List<List<vectorField>> vectorValues(allVectors_.size());
 
                 forAll(allVectors_, vectorI)
                 {
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
index 98956ba9ca..7a728b0fe5 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,21 +194,21 @@ class wallBoundedStreamLine
             word sampledSetAxis_;
 
             //- File output writer
-            autoPtr<writer<scalar> > scalarFormatterPtr_;
+            autoPtr<writer<scalar>> scalarFormatterPtr_;
 
-            autoPtr<writer<vector> > vectorFormatterPtr_;
+            autoPtr<writer<vector>> vectorFormatterPtr_;
 
 
         // Generated data
 
             //- All tracks. Per particle the points it passed through
-            DynamicList<List<point> > allTracks_;
+            DynamicList<List<point>> allTracks_;
 
             //- Per scalarField, per particle, the sampled value.
-            List<DynamicList<scalarList> > allScalars_;
+            List<DynamicList<scalarList>> allScalars_;
 
             //- Per scalarField, per particle, the sampled value.
-            List<DynamicList<vectorList> > allVectors_;
+            List<DynamicList<vectorList>> allVectors_;
 
 
         //- Construct patch out of all wall patch faces
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.H
index 2a8d2f3591..cbc82be2a1 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.H
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,15 +72,15 @@ public:
     public:
 
 
-        const PtrList<interpolation<scalar> >& vsInterp_;
-        const PtrList<interpolation<vector> >& vvInterp_;
+        const PtrList<interpolation<scalar>>& vsInterp_;
+        const PtrList<interpolation<vector>>& vvInterp_;
         const label UIndex_;
         const bool trackForward_;
         const scalar trackLength_;
 
         DynamicList<vectorList>& allPositions_;
-        List<DynamicList<scalarList> >& allScalars_;
-        List<DynamicList<vectorList> >& allVectors_;
+        List<DynamicList<scalarList>>& allScalars_;
+        List<DynamicList<vectorList>>& allVectors_;
 
 
         // Constructors
@@ -88,16 +88,16 @@ public:
             trackingData
             (
                 Cloud<wallBoundedStreamLineParticle>& cloud,
-                const PtrList<interpolation<scalar> >& vsInterp,
-                const PtrList<interpolation<vector> >& vvInterp,
+                const PtrList<interpolation<scalar>>& vsInterp,
+                const PtrList<interpolation<vector>>& vvInterp,
                 const label UIndex,
                 const bool trackForward,
                 const scalar trackLength,
                 const PackedBoolList& isWallPatch,
 
-                DynamicList<List<point> >& allPositions,
-                List<DynamicList<scalarList> >& allScalars,
-                List<DynamicList<vectorList> >& allVectors
+                DynamicList<List<point>>& allPositions,
+                List<DynamicList<scalarList>>& allScalars,
+                List<DynamicList<vectorList>>& allVectors
             )
             :
                 wallBoundedParticle::TrackingData
@@ -132,10 +132,10 @@ private:
         DynamicList<point> sampledPositions_;
 
         //- Sampled scalars
-        List<DynamicList<scalar> > sampledScalars_;
+        List<DynamicList<scalar>> sampledScalars_;
 
         //- Sampled vectors
-        List<DynamicList<vector> > sampledVectors_;
+        List<DynamicList<vector>> sampledVectors_;
 
 
     // Private Member Functions
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 6730410c2c..41c0f5f3db 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,7 +206,7 @@ void Foam::forceCoeffs::write()
         Field<vector> totForce(force_[0] + force_[1] + force_[2]);
         Field<vector> totMoment(moment_[0] + moment_[1] + moment_[2]);
 
-        List<Field<scalar> > coeffs(3);
+        List<Field<scalar>> coeffs(3);
         coeffs[0].setSize(nBin_);
         coeffs[1].setSize(nBin_);
         coeffs[2].setSize(nBin_);
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index 05f84d09b7..75ebd61f32 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -441,8 +441,8 @@ void Foam::forces::writeBins()
         return;
     }
 
-    List<Field<vector> > f(force_);
-    List<Field<vector> > m(moment_);
+    List<Field<vector>> f(force_);
+    List<Field<vector>> m(moment_);
 
     if (binCumulative_)
     {
@@ -474,8 +474,8 @@ void Foam::forces::writeBins()
 
     if (localSystem_)
     {
-        List<Field<vector> > lf(3);
-        List<Field<vector> > lm(3);
+        List<Field<vector>> lf(3);
+        List<Field<vector>> lm(3);
         lf[0] = coordSys_.localVector(force_[0]);
         lf[1] = coordSys_.localVector(force_[1]);
         lf[2] = coordSys_.localVector(force_[2]);
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H
index f0131f0c32..fc9436583e 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.H
+++ b/src/postProcessing/functionObjects/forces/forces/forces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -160,10 +160,10 @@ protected:
         Switch log_;
 
         //- Pressure, viscous and porous force per bin
-        List<Field<vector> > force_;
+        List<Field<vector>> force_;
 
         //- Pressure, viscous and porous moment per bin
-        List<Field<vector> > moment_;
+        List<Field<vector>> moment_;
 
 
         // Read from dictionary
diff --git a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C
index 78cb411a3c..a9b3121f4b 100644
--- a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,16 +88,16 @@ void Foam::blendingFactor::calc()
     const surfaceScalarField& phi =
         mesh.lookupObject<surfaceScalarField>(phiName_);
 
-    tmp<fv::convectionScheme<Type> > cs =
+    tmp<fv::convectionScheme<Type>> cs =
         fv::convectionScheme<Type>::New(mesh, phi, its);
 
     const fv::gaussConvectionScheme<Type>& gcs =
-        refCast<const fv::gaussConvectionScheme<Type> >(cs());
+        refCast<const fv::gaussConvectionScheme<Type>>(cs());
 
     const surfaceInterpolationScheme<Type>& interpScheme =
         gcs.interpScheme();
 
-    if (!isA<blendedSchemeBase<Type> >(interpScheme))
+    if (!isA<blendedSchemeBase<Type>>(interpScheme))
     {
         FatalErrorInFunction
             << interpScheme.typeName << " is not a blended scheme"
@@ -106,7 +106,7 @@ void Foam::blendingFactor::calc()
 
     // retrieve the face-based blending factor
     const blendedSchemeBase<Type>& blendedScheme =
-        refCast<const blendedSchemeBase<Type> >(interpScheme);
+        refCast<const blendedSchemeBase<Type>>(interpScheme);
     const surfaceScalarField factorf(blendedScheme.blendingFactor(field));
 
     // convert into vol field whose values represent the local face maxima
diff --git a/src/postProcessing/functionObjects/utilities/residuals/residualsTemplates.C b/src/postProcessing/functionObjects/utilities/residuals/residualsTemplates.C
index f57b76af8f..6709a0827f 100644
--- a/src/postProcessing/functionObjects/utilities/residuals/residualsTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/residuals/residualsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ void Foam::residuals::writeResidual(const word& fieldName)
 
         if (solverDict.found(fieldName))
         {
-            const List<SolverPerformance<Type> > sp
+            const List<SolverPerformance<Type>> sp
             (
                 solverDict.lookup(fieldName)
             );
diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
index 3f03f3ddcc..3ecfa51e82 100644
--- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ class setTimeStepFunctionObject
             bool enabled_;
 
             //- Time step
-            autoPtr<DataEntry<scalar> > timeStepPtr_;
+            autoPtr<DataEntry<scalar>> timeStepPtr_;
 
 
         //- Disallow default bitwise copy construct
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
index e2f168eaf2..42e5144a87 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ class timeActivatedFileUpdate
         fileName fileToUpdate_;
 
         //- List of times vs filenames
-        List<Tuple2<scalar, fileName> > timeVsFile_;
+        List<Tuple2<scalar, fileName>> timeVsFile_;
 
         //- Index of last file copied
         label lastIndex_;
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
index 422af29812..ea08fc132f 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -168,7 +168,7 @@ protected:
         void processField
         (
             const word& fieldName,
-            const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvalue
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvalue
         );
 
 
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
index e5746b6b4b..727917928a 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ template<class Type>
 void Foam::turbulenceFields::processField
 (
     const word& fieldName,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvalue
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvalue
 )
 {
     typedef GeometricField<Type, fvPatchField, volMesh> FieldType;
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
index 89973ded9c..697405daf7 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -344,7 +344,7 @@ void Foam::energyRegionCoupledFvPatchScalarField::evaluate
 }
 
 
-Foam::tmp<Foam::Field<Foam::scalar> >
+Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::energyRegionCoupledFvPatchScalarField::
 patchNeighbourField() const
 {
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H
index 7103f1f1f1..df8a2c8fd8 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,9 +148,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<scalar> > clone() const
+        virtual tmp<fvPatchField<scalar>> clone() const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new energyRegionCoupledFvPatchScalarField(*this)
             );
@@ -164,12 +164,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<scalar> > clone
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new energyRegionCoupledFvPatchScalarField(*this, iF)
             );
diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H
index f0179b8150..a93e49282b 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.H
+++ b/src/regionModels/regionModel/regionModel/regionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ protected:
             mutable wordList interRegionAMINames_;
 
             //- List of AMI objects per coupled region
-            mutable PtrList<PtrList<AMIPatchToPatchInterpolation> >
+            mutable PtrList<PtrList<AMIPatchToPatchInterpolation>>
                 interRegionAMI_;
 
 
@@ -260,7 +260,7 @@ public:
 
             //- Map patch field from another region model to local patch
             template<class Type>
-            tmp<Foam::Field<Type> > mapRegionPatchField
+            tmp<Foam::Field<Type>> mapRegionPatchField
             (
                 const regionModel& nbrRegion,
                 const label regionPatchI,
@@ -271,7 +271,7 @@ public:
 
             //- Map patch field from another region model to local patch
             template<class Type>
-            tmp<Field<Type> > mapRegionPatchField
+            tmp<Field<Type>> mapRegionPatchField
             (
                 const regionModel& nbrRegion,
                 const word& fieldName,
@@ -282,7 +282,7 @@ public:
             //- Map patch internal field from another region model to local
             //  patch
             template<class Type>
-            tmp<Field<Type> > mapRegionPatchInternalField
+            tmp<Field<Type>> mapRegionPatchInternalField
             (
                 const regionModel& nbrRegion,
                 const word& fieldName,
diff --git a/src/regionModels/regionModel/regionModel/regionModelTemplates.C b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
index c100552632..8722957966 100644
--- a/src/regionModels/regionModel/regionModel/regionModelTemplates.C
+++ b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::regionModels::regionModel::mapRegionPatchField
 (
     const regionModel& nbrRegion,
@@ -40,7 +40,7 @@ Foam::regionModels::regionModel::mapRegionPatchField
     const AMIPatchToPatchInterpolation& ami =
         interRegionAMI(nbrRegion, regionPatchI, nbrPatchI, flip);
 
-    tmp<Field<Type> > tresult(ami.interpolateToSource(nbrField));
+    tmp<Field<Type>> tresult(ami.interpolateToSource(nbrField));
 
     UPstream::msgType() = oldTag;
 
@@ -49,7 +49,7 @@ Foam::regionModels::regionModel::mapRegionPatchField
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::regionModels::regionModel::mapRegionPatchField
 (
     const regionModel& nbrRegion,
@@ -77,7 +77,7 @@ Foam::regionModels::regionModel::mapRegionPatchField
 
         const Field<Type>& nbrFieldp = nbrField.boundaryField()[nbrPatchI];
 
-        tmp<Field<Type> > tresult(ami.interpolateToSource(nbrFieldp));
+        tmp<Field<Type>> tresult(ami.interpolateToSource(nbrFieldp));
 
         UPstream::msgType() = oldTag;
 
@@ -88,7 +88,7 @@ Foam::regionModels::regionModel::mapRegionPatchField
         const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI];
 
         return
-            tmp<Field<Type> >
+            tmp<Field<Type>>
             (
                 new Field<Type>
                 (
@@ -101,7 +101,7 @@ Foam::regionModels::regionModel::mapRegionPatchField
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::regionModels::regionModel::mapRegionPatchInternalField
 (
     const regionModel& nbrRegion,
@@ -130,7 +130,7 @@ Foam::regionModels::regionModel::mapRegionPatchInternalField
         const fvPatchField<Type>& nbrFieldp =
             nbrField.boundaryField()[nbrPatchI];
 
-        tmp<Field<Type> > tresult
+        tmp<Field<Type>> tresult
         (
             ami.interpolateToSource(nbrFieldp.patchInternalField())
         );
@@ -144,7 +144,7 @@ Foam::regionModels::regionModel::mapRegionPatchInternalField
         const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI];
 
         return
-            tmp<Field<Type> >
+            tmp<Field<Type>>
             (
                 new Field<Type>
                 (
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
index 7be767718d..e9cd1669fb 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,13 +57,13 @@ class inclinedFilmNusseltHeightFvPatchScalarField
     // Private data
 
         //- Mean mass flow rate per unit length [kg/s/m]
-        autoPtr<DataEntry<scalar> > GammaMean_;
+        autoPtr<DataEntry<scalar>> GammaMean_;
 
         //- Perturbation amplitude [m]
-        autoPtr<DataEntry<scalar> > a_;
+        autoPtr<DataEntry<scalar>> a_;
 
         //- Perturbation frequency [rad/s/m]
-        autoPtr<DataEntry<scalar> > omega_;
+        autoPtr<DataEntry<scalar>> omega_;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
index 211ea77561..40327fa796 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,13 +57,13 @@ class inclinedFilmNusseltInletVelocityFvPatchVectorField
     // Private data
 
         //- Mean mass flow rate per unit length [kg/s/m]
-        autoPtr<DataEntry<scalar> > GammaMean_;
+        autoPtr<DataEntry<scalar>> GammaMean_;
 
         //- Perturbation amplitude [m]
-        autoPtr<DataEntry<scalar> > a_;
+        autoPtr<DataEntry<scalar>> a_;
 
         //- Perturbation frequency [rad/s/m]
-        autoPtr<DataEntry<scalar> > omega_;
+        autoPtr<DataEntry<scalar>> omega_;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index b881553f5c..13a4cb8627 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1089,9 +1089,9 @@ void kinematicSingleLayer::info()
 }
 
 
-tmp<DimensionedField<scalar, volMesh> > kinematicSingleLayer::Srho() const
+tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Srho() const
 {
-    return tmp<DimensionedField<scalar, volMesh> >
+    return tmp<DimensionedField<scalar, volMesh>>
     (
         new DimensionedField<scalar, volMesh>
         (
@@ -1111,12 +1111,12 @@ tmp<DimensionedField<scalar, volMesh> > kinematicSingleLayer::Srho() const
 }
 
 
-tmp<DimensionedField<scalar, volMesh> > kinematicSingleLayer::Srho
+tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Srho
 (
     const label i
 ) const
 {
-    return tmp<DimensionedField<scalar, volMesh> >
+    return tmp<DimensionedField<scalar, volMesh>>
     (
         new DimensionedField<scalar, volMesh>
         (
@@ -1136,9 +1136,9 @@ tmp<DimensionedField<scalar, volMesh> > kinematicSingleLayer::Srho
 }
 
 
-tmp<DimensionedField<scalar, volMesh> > kinematicSingleLayer::Sh() const
+tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Sh() const
 {
-    return tmp<DimensionedField<scalar, volMesh> >
+    return tmp<DimensionedField<scalar, volMesh>>
     (
         new DimensionedField<scalar, volMesh>
         (
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
index ace33f055a..8c533e0114 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -510,16 +510,16 @@ public:
             // Mapped into primary region
 
                 //- Return total mass source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Srho() const;
+                virtual tmp<DimensionedField<scalar, volMesh>> Srho() const;
 
                 //- Return mass source for specie i - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Srho
+                virtual tmp<DimensionedField<scalar, volMesh>> Srho
                 (
                     const label i
                 ) const;
 
                 //- Return enthalpy source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Sh() const;
+                virtual tmp<DimensionedField<scalar, volMesh>> Sh() const;
 
 
         // I-O
diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
index 30affb2af9..4f65dc8d17 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -244,9 +244,9 @@ const volScalarField& noFilm::cloudDiameterTrans() const
 }
 
 
-tmp<DimensionedField<scalar, volMesh> > noFilm::Srho() const
+tmp<DimensionedField<scalar, volMesh>> noFilm::Srho() const
 {
-    return tmp<DimensionedField<scalar, volMesh> >
+    return tmp<DimensionedField<scalar, volMesh>>
     (
         new DimensionedField<scalar, volMesh>
         (
@@ -266,9 +266,9 @@ tmp<DimensionedField<scalar, volMesh> > noFilm::Srho() const
 }
 
 
-tmp<DimensionedField<scalar, volMesh> > noFilm::Srho(const label i) const
+tmp<DimensionedField<scalar, volMesh>> noFilm::Srho(const label i) const
 {
-    return tmp<DimensionedField<scalar, volMesh> >
+    return tmp<DimensionedField<scalar, volMesh>>
     (
         new DimensionedField<scalar, volMesh>
         (
@@ -288,9 +288,9 @@ tmp<DimensionedField<scalar, volMesh> > noFilm::Srho(const label i) const
 }
 
 
-tmp<DimensionedField<scalar, volMesh> > noFilm::Sh() const
+tmp<DimensionedField<scalar, volMesh>> noFilm::Sh() const
 {
-    return tmp<DimensionedField<scalar, volMesh> >
+    return tmp<DimensionedField<scalar, volMesh>>
     (
         new DimensionedField<scalar, volMesh>
         (
diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
index e8d22be6c4..e8c091402d 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -167,16 +167,16 @@ public:
             // Mapped into primary region
 
                 //- Return total mass source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Srho() const;
+                virtual tmp<DimensionedField<scalar, volMesh>> Srho() const;
 
                 //- Return mass source for specie i - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Srho
+                virtual tmp<DimensionedField<scalar, volMesh>> Srho
                 (
                     const label i
                 ) const;
 
                 //- Return enthalpy source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Sh() const;
+                virtual tmp<DimensionedField<scalar, volMesh>> Sh() const;
 };
 
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index 8121a2ce5d..2709cd08a5 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -240,10 +240,10 @@ curvatureSeparation::curvatureSeparation
 
     gHat_ = owner.g().value()/magG_;
 
-    List<Tuple2<word, scalar> > prIn(coeffDict_.lookup("definedPatchRadii"));
+    List<Tuple2<word, scalar>> prIn(coeffDict_.lookup("definedPatchRadii"));
     const wordList& allPatchNames = owner.regionMesh().boundaryMesh().names();
 
-    DynamicList<Tuple2<label, scalar> > prData(allPatchNames.size());
+    DynamicList<Tuple2<label, scalar>> prData(allPatchNames.size());
 
     labelHashSet uniquePatchIDs;
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
index fa1acd3f4f..26d8fa57a0 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ protected:
 
         //- List of radii for patches - if patch not defined, radius
         // calculated based on mesh geometry
-        List<Tuple2<label, scalar> > definedPatchRadii_;
+        List<Tuple2<label, scalar>> definedPatchRadii_;
 
         //- Magnitude of gravity vector
         scalar magG_;
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
index f007b3d043..57d1f97915 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,28 +89,28 @@ Foam::scalar surfaceFilmModel::CourantNumber() const
 }
 
 
-tmp<DimensionedField<scalar, volMesh> > surfaceFilmModel::Srho() const
+tmp<DimensionedField<scalar, volMesh>> surfaceFilmModel::Srho() const
 {
     NotImplemented;
 
-    return tmp<DimensionedField<scalar, volMesh> >(NULL);
+    return tmp<DimensionedField<scalar, volMesh>>(NULL);
 }
 
 
-tmp<DimensionedField<scalar, volMesh> >
+tmp<DimensionedField<scalar, volMesh>>
 surfaceFilmModel::Srho(const label) const
 {
     NotImplemented;
 
-    return tmp<DimensionedField<scalar, volMesh> >(NULL);
+    return tmp<DimensionedField<scalar, volMesh>>(NULL);
 }
 
 
-tmp<DimensionedField<scalar, volMesh> > surfaceFilmModel::Sh() const
+tmp<DimensionedField<scalar, volMesh>> surfaceFilmModel::Sh() const
 {
     NotImplemented;
 
-    return tmp<DimensionedField<scalar, volMesh> >(NULL);
+    return tmp<DimensionedField<scalar, volMesh>>(NULL);
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
index 88b193d1d0..77817d5809 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -219,16 +219,16 @@ public:
             // Mapped into primary region
 
                 //- Return total mass source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Srho() const;
+                virtual tmp<DimensionedField<scalar, volMesh>> Srho() const;
 
                 //- Return mass source for specie i - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Srho
+                virtual tmp<DimensionedField<scalar, volMesh>> Srho
                 (
                     const label i
                 ) const;
 
                 //- Return enthalpy source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Sh() const;
+                virtual tmp<DimensionedField<scalar, volMesh>> Sh() const;
 };
 
 
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 03b6de267a..4161f1a95d 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,7 +114,7 @@ void thermoSingleLayer::correctHsForMappedT()
     forAll(T_.boundaryField(), patchI)
     {
         const fvPatchField<scalar>& Tp = T_.boundaryField()[patchI];
-        if (isA<mappedFieldFvPatchField<scalar> >(Tp))
+        if (isA<mappedFieldFvPatchField<scalar>>(Tp))
         {
             hs_.boundaryField()[patchI] == hs(Tp, patchI);
         }
@@ -731,9 +731,9 @@ void thermoSingleLayer::info()
 }
 
 
-tmp<DimensionedField<scalar, volMesh> > thermoSingleLayer::Srho() const
+tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho() const
 {
-    tmp<DimensionedField<scalar, volMesh> > tSrho
+    tmp<DimensionedField<scalar, volMesh>> tSrho
     (
         new DimensionedField<scalar, volMesh>
         (
@@ -778,14 +778,14 @@ tmp<DimensionedField<scalar, volMesh> > thermoSingleLayer::Srho() const
 }
 
 
-tmp<DimensionedField<scalar, volMesh> > thermoSingleLayer::Srho
+tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho
 (
     const label i
 ) const
 {
     const label vapId = thermo_.carrierId(filmThermo_->name());
 
-    tmp<DimensionedField<scalar, volMesh> > tSrho
+    tmp<DimensionedField<scalar, volMesh>> tSrho
     (
         new DimensionedField<scalar, volMesh>
         (
@@ -833,9 +833,9 @@ tmp<DimensionedField<scalar, volMesh> > thermoSingleLayer::Srho
 }
 
 
-tmp<DimensionedField<scalar, volMesh> > thermoSingleLayer::Sh() const
+tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Sh() const
 {
-    tmp<DimensionedField<scalar, volMesh> > tSh
+    tmp<DimensionedField<scalar, volMesh>> tSh
     (
         new DimensionedField<scalar, volMesh>
         (
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
index 143833bca5..d2f13c10ed 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -389,16 +389,16 @@ public:
             // Mapped into primary region
 
                 //- Return total mass source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Srho() const;
+                virtual tmp<DimensionedField<scalar, volMesh>> Srho() const;
 
                 //- Return mass source for specie i - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Srho
+                virtual tmp<DimensionedField<scalar, volMesh>> Srho
                 (
                     const label i
                 ) const;
 
                 //- Return enthalpy source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh> > Sh() const;
+                virtual tmp<DimensionedField<scalar, volMesh>> Sh() const;
 
 
        // I-O
diff --git a/src/sampling/cuttingPlane/cuttingPlane.H b/src/sampling/cuttingPlane/cuttingPlane.H
index 8bb9889262..0119f2b30b 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.H
+++ b/src/sampling/cuttingPlane/cuttingPlane.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -169,10 +169,10 @@ public:
 
         //- Sample the cell field
         template<class Type>
-        tmp<Field<Type> > sample(const Field<Type>&) const;
+        tmp<Field<Type>> sample(const Field<Type>&) const;
 
         template<class Type>
-        tmp<Field<Type> > sample(const tmp<Field<Type> >&) const;
+        tmp<Field<Type>> sample(const tmp<Field<Type>>&) const;
 
 
     // Member Operators
diff --git a/src/sampling/cuttingPlane/cuttingPlaneTemplates.C b/src/sampling/cuttingPlane/cuttingPlaneTemplates.C
index c71cc9c980..ba1c80eb72 100644
--- a/src/sampling/cuttingPlane/cuttingPlaneTemplates.C
+++ b/src/sampling/cuttingPlane/cuttingPlaneTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,22 +33,22 @@ Description
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::cuttingPlane::sample
+Foam::tmp<Foam::Field<Type>> Foam::cuttingPlane::sample
 (
     const Field<Type>& fld
 ) const
 {
-    return tmp<Field<Type> >(new Field<Type>(fld, cutCells()));
+    return tmp<Field<Type>>(new Field<Type>(fld, cutCells()));
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::cuttingPlane::sample
+Foam::tmp<Foam::Field<Type>> Foam::cuttingPlane::sample
 (
-    const tmp<Field<Type> >& tfld
+    const tmp<Field<Type>>& tfld
 ) const
 {
-    tmp<Field<Type> > tsf = sample(tfld());
+    tmp<Field<Type>> tsf = sample(tfld());
     tfld.clear();
     return tsf;
 }
diff --git a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
index 863301bbce..a6b02c5e13 100644
--- a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,11 +106,11 @@ void Foam::cellVolumeWeightMethod::calculateAddressing
     label srcCellI = srcSeedI;
     label tgtCellI = tgtSeedI;
 
-    List<DynamicList<label> > srcToTgtAddr(src_.nCells());
-    List<DynamicList<scalar> > srcToTgtWght(src_.nCells());
+    List<DynamicList<label>> srcToTgtAddr(src_.nCells());
+    List<DynamicList<scalar>> srcToTgtWght(src_.nCells());
 
-    List<DynamicList<label> > tgtToSrcAddr(tgt_.nCells());
-    List<DynamicList<scalar> > tgtToSrcWght(tgt_.nCells());
+    List<DynamicList<label>> tgtToSrcAddr(tgt_.nCells());
+    List<DynamicList<scalar>> tgtToSrcWght(tgt_.nCells());
 
     // list of tgt cell neighbour cells
     DynamicList<label> nbrTgtCells(10);
diff --git a/src/sampling/meshToMesh/calcMethod/direct/directMethod.C b/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
index 7468fd4fd0..af4203002e 100644
--- a/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,8 +116,8 @@ void Foam::directMethod::calculateAddressing
     // store a list of src cells already mapped
     labelList srcTgtSeed(src_.nCells(), -1);
 
-    List<DynamicList<label> > srcToTgt(src_.nCells());
-    List<DynamicList<label> > tgtToSrc(tgt_.nCells());
+    List<DynamicList<label>> srcToTgt(src_.nCells());
+    List<DynamicList<label>> tgtToSrc(tgt_.nCells());
 
     DynamicList<label> srcSeeds(10);
 
diff --git a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
index 70190d3feb..b0a04ef6d0 100644
--- a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,8 +102,8 @@ void Foam::mapNearestMethod::calculateAddressing
     label& startSeedI
 )
 {
-    List<DynamicList<label> > srcToTgt(src_.nCells());
-    List<DynamicList<label> > tgtToSrc(tgt_.nCells());
+    List<DynamicList<label>> srcToTgt(src_.nCells());
+    List<DynamicList<label>> tgtToSrc(tgt_.nCells());
 
     const scalarField& srcVc = src_.cellVolumes();
     const scalarField& tgtVc = tgt_.cellVolumes();
@@ -284,7 +284,7 @@ void Foam::mapNearestMethod::setNextNearestCells
 Foam::label Foam::mapNearestMethod::findMappedSrcCell
 (
     const label tgtCellI,
-    const List<DynamicList<label> >& tgtToSrc
+    const List<DynamicList<label>>& tgtToSrc
 ) const
 {
     DynamicList<label> testCells(10);
diff --git a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H
index b26bc645ac..2cbee3182c 100644
--- a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ protected:
         virtual label findMappedSrcCell
         (
             const label tgtCellI,
-            const List<DynamicList<label> >& tgtToSrc
+            const List<DynamicList<label>>& tgtToSrc
         ) const;
 
         //- Disallow default bitwise copy construct
diff --git a/src/sampling/meshToMesh/meshToMesh.C b/src/sampling/meshToMesh/meshToMesh.C
index faea30db51..e37fb7f414 100644
--- a/src/sampling/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMesh/meshToMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -306,7 +306,7 @@ void Foam::meshToMesh::calculate(const word& methodName)
         );
 
         // cache maps and reset addresses
-        List<Map<label> > cMap;
+        List<Map<label>> cMap;
         srcMapPtr_.reset
         (
             new mapDistribute(globalSrcCells, tgtToSrcCellAddr_, cMap)
diff --git a/src/sampling/meshToMesh/meshToMesh.H b/src/sampling/meshToMesh/meshToMesh.H
index 718270e4f5..84e24bbdef 100644
--- a/src/sampling/meshToMesh/meshToMesh.H
+++ b/src/sampling/meshToMesh/meshToMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -341,7 +341,7 @@ public:
                 //- Return the src field mapped to the tgt mesh with a defined
                 //  operation.  Initial values of the result are set to zero
                 template<class Type, class CombineOp>
-                tmp<Field<Type> > mapSrcToTgt
+                tmp<Field<Type>> mapSrcToTgt
                 (
                     const Field<Type>& srcFld,
                     const CombineOp& cop
@@ -350,16 +350,16 @@ public:
                 //- Convenience function to map a tmp field to the tgt mesh
                 //  with a defined operation
                 template<class Type, class CombineOp>
-                tmp<Field<Type> > mapSrcToTgt
+                tmp<Field<Type>> mapSrcToTgt
                 (
-                    const tmp<Field<Type> >& tsrcFld,
+                    const tmp<Field<Type>>& tsrcFld,
                     const CombineOp& cop
                 ) const;
 
                 //- Convenience function to map a field to the tgt mesh with a
                 //  default operation (plusEqOp)
                 template<class Type>
-                tmp<Field<Type> > mapSrcToTgt
+                tmp<Field<Type>> mapSrcToTgt
                 (
                     const Field<Type>& srcFld
                 ) const;
@@ -367,9 +367,9 @@ public:
                 //- Convenience function to map a tmp field to the tgt mesh
                 //  with a default operation (plusEqOp)
                 template<class Type>
-                tmp<Field<Type> > mapSrcToTgt
+                tmp<Field<Type>> mapSrcToTgt
                 (
-                    const tmp<Field<Type> >& tsrcFld
+                    const tmp<Field<Type>>& tsrcFld
                 ) const;
 
 
@@ -389,7 +389,7 @@ public:
                 //- Return the tgt field mapped to the src mesh with a defined
                 //  operation.  Initial values of the result are set to zero
                 template<class Type, class CombineOp>
-                tmp<Field<Type> > mapTgtToSrc
+                tmp<Field<Type>> mapTgtToSrc
                 (
                     const Field<Type>& tgtFld,
                     const CombineOp& cop
@@ -398,16 +398,16 @@ public:
                 //- Convenience function to map a tmp field to the src mesh
                 //  with a defined operation
                 template<class Type, class CombineOp>
-                tmp<Field<Type> > mapTgtToSrc
+                tmp<Field<Type>> mapTgtToSrc
                 (
-                    const tmp<Field<Type> >& ttgtFld,
+                    const tmp<Field<Type>>& ttgtFld,
                     const CombineOp& cop
                 ) const;
 
                 //- Convenience function to map a field to the src mesh with a
                 //  default operation (plusEqOp)
                 template<class Type>
-                tmp<Field<Type> > mapTgtToSrc
+                tmp<Field<Type>> mapTgtToSrc
                 (
                     const Field<Type>& tgtFld
                 ) const;
@@ -415,9 +415,9 @@ public:
                 //- Convenience function to map a tmp field to the src mesh
                 //  with a default operation (plusEqOp)
                 template<class Type>
-                tmp<Field<Type> > mapTgtToSrc
+                tmp<Field<Type>> mapTgtToSrc
                 (
-                    const tmp<Field<Type> >& ttgtFld
+                    const tmp<Field<Type>>& ttgtFld
                 ) const;
 
 
@@ -437,7 +437,7 @@ public:
                 //- Interpolate a field with a defined operation.  The initial
                 //  values of the result are set to zero
                 template<class Type, class CombineOp>
-                tmp<GeometricField<Type, fvPatchField, volMesh> > mapSrcToTgt
+                tmp<GeometricField<Type, fvPatchField, volMesh>> mapSrcToTgt
                 (
                     const GeometricField<Type, fvPatchField, volMesh>& field,
                     const CombineOp& cop
@@ -446,9 +446,9 @@ public:
                 //- Interpolate a tmp field with a defined operation.  The
                 //  initial values of the result are set to zero
                 template<class Type, class CombineOp>
-                tmp<GeometricField<Type, fvPatchField, volMesh> > mapSrcToTgt
+                tmp<GeometricField<Type, fvPatchField, volMesh>> mapSrcToTgt
                 (
-                    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+                    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
                         tfield,
                     const CombineOp& cop
                 ) const;
@@ -456,7 +456,7 @@ public:
                 //- Convenience function to map a field with a default
                 //  operation (plusEqOp)
                 template<class Type>
-                tmp<GeometricField<Type, fvPatchField, volMesh> > mapSrcToTgt
+                tmp<GeometricField<Type, fvPatchField, volMesh>> mapSrcToTgt
                 (
                     const GeometricField<Type, fvPatchField, volMesh>& field
                 ) const;
@@ -464,9 +464,9 @@ public:
                 //- Convenience function to map a tmp field with a default
                 //  operation (plusEqOp)
                 template<class Type>
-                tmp<GeometricField<Type, fvPatchField, volMesh> > mapSrcToTgt
+                tmp<GeometricField<Type, fvPatchField, volMesh>> mapSrcToTgt
                 (
-                    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+                    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
                         tfield
                 ) const;
 
@@ -487,7 +487,7 @@ public:
                 //- Interpolate a field with a defined operation.  The initial
                 //  values of the result are set to zero
                 template<class Type, class CombineOp>
-                tmp<GeometricField<Type, fvPatchField, volMesh> > mapTgtToSrc
+                tmp<GeometricField<Type, fvPatchField, volMesh>> mapTgtToSrc
                 (
                     const GeometricField<Type, fvPatchField, volMesh>& field,
                     const CombineOp& cop
@@ -496,9 +496,9 @@ public:
                 //- Interpolate a tmp field with a defined operation.  The
                 //  initial values of the result are set to zero
                 template<class Type, class CombineOp>
-                tmp<GeometricField<Type, fvPatchField, volMesh> > mapTgtToSrc
+                tmp<GeometricField<Type, fvPatchField, volMesh>> mapTgtToSrc
                 (
-                    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+                    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
                         tfield,
                     const CombineOp& cop
                 ) const;
@@ -506,7 +506,7 @@ public:
                 //- Convenience function to map a field with a default
                 //  operation (plusEqOp)
                 template<class Type>
-                tmp<GeometricField<Type, fvPatchField, volMesh> > mapTgtToSrc
+                tmp<GeometricField<Type, fvPatchField, volMesh>> mapTgtToSrc
                 (
                     const GeometricField<Type, fvPatchField, volMesh>& field
                 ) const;
@@ -514,9 +514,9 @@ public:
                 //- Convenience function to map a tmp field with a default
                 //  operation (plusEqOp)
                 template<class Type>
-                tmp<GeometricField<Type, fvPatchField, volMesh> > mapTgtToSrc
+                tmp<GeometricField<Type, fvPatchField, volMesh>> mapTgtToSrc
                 (
-                    const tmp<GeometricField<Type, fvPatchField, volMesh> >&
+                    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
                         tfield
                 ) const;
 };
diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index ad7d5f3843..d83deb104c 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,7 +156,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
 
     {
         // per processor indices into all segments to send
-        List<DynamicList<label> > dynSendMap(Pstream::nProcs());
+        List<DynamicList<label>> dynSendMap(Pstream::nProcs());
         label iniSize = floor(tgt.nCells()/Pstream::nProcs());
 
         forAll(dynSendMap, procI)
@@ -579,7 +579,7 @@ void Foam::meshToMesh::distributeAndMergeCells
 
     // Count any coupled faces
     typedef FixedList<label, 3> label3;
-    typedef HashTable<label, label3, label3::Hash<> > procCoupleInfo;
+    typedef HashTable<label, label3, label3::Hash<>> procCoupleInfo;
     procCoupleInfo procFaceToGlobalCell;
 
     forAll(allNbrProcIDs, procI)
diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C
index fb12d6e898..24d01d89a3 100644
--- a/src/sampling/meshToMesh/meshToMeshTemplates.C
+++ b/src/sampling/meshToMesh/meshToMeshTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,13 +146,13 @@ void Foam::meshToMesh::mapSrcToTgt
 
 
 template<class Type, class CombineOp>
-Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
+Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapSrcToTgt
 (
     const Field<Type>& srcField,
     const CombineOp& cop
 ) const
 {
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -168,9 +168,9 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
 
 
 template<class Type, class CombineOp>
-Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
+Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapSrcToTgt
 (
-    const tmp<Field<Type> >& tsrcField,
+    const tmp<Field<Type>>& tsrcField,
     const CombineOp& cop
 ) const
 {
@@ -179,7 +179,7 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
+Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapSrcToTgt
 (
     const Field<Type>& srcField
 ) const
@@ -189,9 +189,9 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
+Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapSrcToTgt
 (
-    const tmp<Field<Type> >& tsrcField
+    const tmp<Field<Type>>& tsrcField
 ) const
 {
     return mapSrcToTgt(tsrcField());
@@ -265,13 +265,13 @@ void Foam::meshToMesh::mapTgtToSrc
 
 
 template<class Type, class CombineOp>
-Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
+Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapTgtToSrc
 (
     const Field<Type>& tgtField,
     const CombineOp& cop
 ) const
 {
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -287,9 +287,9 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
 
 
 template<class Type, class CombineOp>
-Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
+Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapTgtToSrc
 (
-    const tmp<Field<Type> >& ttgtField,
+    const tmp<Field<Type>>& ttgtField,
     const CombineOp& cop
 ) const
 {
@@ -298,7 +298,7 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
+Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapTgtToSrc
 (
     const Field<Type>& tgtField
 ) const
@@ -308,9 +308,9 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
+Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapTgtToSrc
 (
-    const tmp<Field<Type> >& ttgtField
+    const tmp<Field<Type>>& ttgtField
 ) const
 {
     return mapTgtToSrc(ttgtField(), plusEqOp<Type>());
@@ -342,7 +342,7 @@ void Foam::meshToMesh::mapSrcToTgt
         if (AMIList[i].singlePatchProc() != -1)
         {
             // Clone and map (since rmap does not do general mapping)
-            tmp<fvPatchField<Type> > tnewTgt
+            tmp<fvPatchField<Type>> tnewTgt
             (
                 fvPatchField<Type>::New
                 (
@@ -383,7 +383,7 @@ void Foam::meshToMesh::mapSrcToTgt
 
 
 template<class Type, class CombineOp>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh::mapSrcToTgt
 (
     const GeometricField<Type, fvPatchField, volMesh>& field,
@@ -398,7 +398,7 @@ Foam::meshToMesh::mapSrcToTgt
     const typename fieldType::GeometricBoundaryField& srcBfld =
         field.boundaryField();
 
-    PtrList<fvPatchField<Type> > tgtPatchFields(tgtBm.size());
+    PtrList<fvPatchField<Type>> tgtPatchFields(tgtBm.size());
 
     // constuct tgt boundary patch types as copy of 'field' boundary types
     // note: this will provide place holders for fields with additional
@@ -473,10 +473,10 @@ Foam::meshToMesh::mapSrcToTgt
 
 
 template<class Type, class CombineOp>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh::mapSrcToTgt
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfield,
     const CombineOp& cop
 ) const
 {
@@ -485,7 +485,7 @@ Foam::meshToMesh::mapSrcToTgt
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh::mapSrcToTgt
 (
     const GeometricField<Type, fvPatchField, volMesh>& field
@@ -496,10 +496,10 @@ Foam::meshToMesh::mapSrcToTgt
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh::mapSrcToTgt
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfield
 ) const
 {
     return mapSrcToTgt(tfield(), plusEqOp<Type>());
@@ -531,7 +531,7 @@ void Foam::meshToMesh::mapTgtToSrc
         if (AMIList[i].singlePatchProc() != -1)
         {
             // Clone and map (since rmap does not do general mapping)
-            tmp<fvPatchField<Type> > tnewSrc
+            tmp<fvPatchField<Type>> tnewSrc
             (
                 fvPatchField<Type>::New
                 (
@@ -572,7 +572,7 @@ void Foam::meshToMesh::mapTgtToSrc
 
 
 template<class Type, class CombineOp>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh::mapTgtToSrc
 (
     const GeometricField<Type, fvPatchField, volMesh>& field,
@@ -587,7 +587,7 @@ Foam::meshToMesh::mapTgtToSrc
     const typename fieldType::GeometricBoundaryField& tgtBfld =
         field.boundaryField();
 
-    PtrList<fvPatchField<Type> > srcPatchFields(srcBm.size());
+    PtrList<fvPatchField<Type>> srcPatchFields(srcBm.size());
 
     // constuct src boundary patch types as copy of 'field' boundary types
     // note: this will provide place holders for fields with additional
@@ -662,10 +662,10 @@ Foam::meshToMesh::mapTgtToSrc
 
 
 template<class Type, class CombineOp>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh::mapTgtToSrc
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfield,
     const CombineOp& cop
 ) const
 {
@@ -674,7 +674,7 @@ Foam::meshToMesh::mapTgtToSrc
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh::mapTgtToSrc
 (
     const GeometricField<Type, fvPatchField, volMesh>& field
@@ -685,10 +685,10 @@ Foam::meshToMesh::mapTgtToSrc
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh::mapTgtToSrc
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfield
 ) const
 {
     return mapTgtToSrc(tfield(), plusEqOp<Type>());
diff --git a/src/sampling/meshToMesh0/meshToMesh0.H b/src/sampling/meshToMesh0/meshToMesh0.H
index d2c7ff03e4..9907e79f5b 100644
--- a/src/sampling/meshToMesh0/meshToMesh0.H
+++ b/src/sampling/meshToMesh0/meshToMesh0.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -311,7 +311,7 @@ public:
             void interpolateInternalField
             (
                 Field<Type>&,
-                const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+                const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
                 order=INTERPOLATE,
                 const CombineOp& cop = eqOp<Type>()
             ) const;
@@ -331,7 +331,7 @@ public:
             void interpolate
             (
                 GeometricField<Type, fvPatchField, volMesh>&,
-                const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+                const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
                 order=INTERPOLATE,
                 const CombineOp& cop = eqOp<Type>()
             ) const;
@@ -339,7 +339,7 @@ public:
 
             //- Interpolate volume field
             template<class Type, class CombineOp>
-            tmp<GeometricField<Type, fvPatchField, volMesh> > interpolate
+            tmp<GeometricField<Type, fvPatchField, volMesh>> interpolate
             (
                 const GeometricField<Type, fvPatchField, volMesh>&,
                 order=INTERPOLATE,
@@ -347,9 +347,9 @@ public:
             ) const;
 
             template<class Type, class CombineOp>
-            tmp<GeometricField<Type, fvPatchField, volMesh> > interpolate
+            tmp<GeometricField<Type, fvPatchField, volMesh>> interpolate
             (
-                const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
+                const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
                 order=INTERPOLATE,
                 const CombineOp& cop = eqOp<Type>()
             ) const;
diff --git a/src/sampling/meshToMesh0/meshToMesh0Templates.C b/src/sampling/meshToMesh0/meshToMesh0Templates.C
index c535ee07a2..b4805a5c98 100644
--- a/src/sampling/meshToMesh0/meshToMesh0Templates.C
+++ b/src/sampling/meshToMesh0/meshToMesh0Templates.C
@@ -232,7 +232,7 @@ template<class Type, class CombineOp>
 void Foam::meshToMesh0::interpolateInternalField
 (
     Field<Type>& toF,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
     meshToMesh0::order ord,
     const CombineOp& cop
 ) const
@@ -310,9 +310,9 @@ void Foam::meshToMesh0::interpolate
                         << exit(FatalError);
             }
 
-            if (isA<mixedFvPatchField<Type> >(toVf.boundaryField()[patchi]))
+            if (isA<mixedFvPatchField<Type>>(toVf.boundaryField()[patchi]))
             {
-                refCast<mixedFvPatchField<Type> >
+                refCast<mixedFvPatchField<Type>>
                 (
                     toVf.boundaryField()[patchi]
                 ).refValue() = toVf.boundaryField()[patchi];
@@ -354,7 +354,7 @@ template<class Type, class CombineOp>
 void Foam::meshToMesh0::interpolate
 (
     GeometricField<Type, fvPatchField, volMesh>& toVf,
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
     meshToMesh0::order ord,
     const CombineOp& cop
 ) const
@@ -365,7 +365,7 @@ void Foam::meshToMesh0::interpolate
 
 
 template<class Type, class CombineOp>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh0::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& fromVf,
@@ -388,7 +388,7 @@ Foam::meshToMesh0::interpolate
     }
 
     // Create and map the patch field values
-    PtrList<fvPatchField<Type> > patchFields
+    PtrList<fvPatchField<Type>> patchFields
     (
         boundaryAddressing_.size()
     );
@@ -413,7 +413,7 @@ Foam::meshToMesh0::interpolate
 
 
     // Create the complete field from the pieces
-    tmp<GeometricField<Type, fvPatchField, volMesh> > ttoF
+    tmp<GeometricField<Type, fvPatchField, volMesh>> ttoF
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
@@ -437,15 +437,15 @@ Foam::meshToMesh0::interpolate
 
 
 template<class Type, class CombineOp>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh0::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
     meshToMesh0::order ord,
     const CombineOp& cop
 ) const
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tint =
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tint =
         interpolate(tfromVf(), ord, cop);
     tfromVf.clear();
 
diff --git a/src/sampling/probes/patchProbes.H b/src/sampling/probes/patchProbes.H
index 2425b67f77..01d1f618c2 100644
--- a/src/sampling/probes/patchProbes.H
+++ b/src/sampling/probes/patchProbes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ class patchProbes
 
         //- Sample a volume field at all locations
         template<class Type>
-        tmp<Field<Type> > sample
+        tmp<Field<Type>> sample
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
@@ -102,7 +102,7 @@ class patchProbes
 
         //- Sample a surface field at all locations
         template<class Type>
-        tmp<Field<Type> > sample
+        tmp<Field<Type>> sample
         (
             const GeometricField<Type, fvsPatchField, surfaceMesh>&
         ) const;
@@ -110,7 +110,7 @@ class patchProbes
 
         //- Sample a single field on all sample locations
         template<class Type>
-        tmp<Field<Type> > sample(const word& fieldName) const;
+        tmp<Field<Type>> sample(const word& fieldName) const;
 
 
         //- Disallow default bitwise copy construct
diff --git a/src/sampling/probes/patchProbesTemplates.C b/src/sampling/probes/patchProbesTemplates.C
index 7e8ddd74b4..325ff16a0e 100644
--- a/src/sampling/probes/patchProbesTemplates.C
+++ b/src/sampling/probes/patchProbesTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,7 +123,7 @@ void Foam::patchProbes::sampleAndWrite
                 sampleAndWrite
                 (
                     mesh_.lookupObject
-                    <GeometricField<Type, fvPatchField, volMesh> >
+                    <GeometricField<Type, fvPatchField, volMesh>>
                     (
                         fields[fieldI]
                     )
@@ -175,7 +175,7 @@ void Foam::patchProbes::sampleAndWriteSurfaceFields
                 sampleAndWrite
                 (
                     mesh_.lookupObject
-                    <GeometricField<Type, fvsPatchField, surfaceMesh> >
+                    <GeometricField<Type, fvsPatchField, surfaceMesh>>
                     (
                         fields[fieldI]
                     )
@@ -189,7 +189,7 @@ void Foam::patchProbes::sampleAndWriteSurfaceFields
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::patchProbes::sample
 (
     const GeometricField<Type, fvPatchField, volMesh>& vField
@@ -197,7 +197,7 @@ Foam::patchProbes::sample
 {
     const Type unsetVal(-VGREAT*pTraits<Type>::one);
 
-    tmp<Field<Type> > tValues
+    tmp<Field<Type>> tValues
     (
         new Field<Type>(this->size(), unsetVal)
     );
@@ -226,12 +226,12 @@ Foam::patchProbes::sample
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::patchProbes::sample(const word& fieldName) const
 {
     return sample
     (
-        mesh_.lookupObject<GeometricField<Type, fvPatchField, volMesh> >
+        mesh_.lookupObject<GeometricField<Type, fvPatchField, volMesh>>
         (
             fieldName
         )
@@ -240,7 +240,7 @@ Foam::patchProbes::sample(const word& fieldName) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::patchProbes::sample
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& sField
@@ -248,7 +248,7 @@ Foam::patchProbes::sample
 {
     const Type unsetVal(-VGREAT*pTraits<Type>::one);
 
-    tmp<Field<Type> > tValues
+    tmp<Field<Type>> tValues
     (
         new Field<Type>(this->size(), unsetVal)
     );
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index 5cc8c9f50c..6845576d7e 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -274,22 +274,22 @@ public:
 
         //- Sample a volume field at all locations
         template<class Type>
-        tmp<Field<Type> > sample
+        tmp<Field<Type>> sample
         (
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
         //- Sample a single vol field on all sample locations
         template<class Type>
-        tmp<Field<Type> > sample(const word& fieldName) const;
+        tmp<Field<Type>> sample(const word& fieldName) const;
 
         //- Sample a single scalar field on all sample locations
         template<class Type>
-        tmp<Field<Type> > sampleSurfaceFields(const word& fieldName) const;
+        tmp<Field<Type>> sampleSurfaceFields(const word& fieldName) const;
 
         //- Sample a surface field at all locations
         template<class Type>
-        tmp<Field<Type> > sample
+        tmp<Field<Type>> sample
         (
             const GeometricField<Type, fvsPatchField, surfaceMesh>&
         ) const;
diff --git a/src/sampling/probes/probesTemplates.C b/src/sampling/probes/probesTemplates.C
index 6e358f9795..f035d5fe03 100644
--- a/src/sampling/probes/probesTemplates.C
+++ b/src/sampling/probes/probesTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,7 +150,7 @@ void Foam::probes::sampleAndWrite(const fieldGroup<Type>& fields)
                 sampleAndWrite
                 (
                     mesh_.lookupObject
-                    <GeometricField<Type, fvPatchField, volMesh> >
+                    <GeometricField<Type, fvPatchField, volMesh>>
                     (
                         fields[fieldI]
                     )
@@ -199,7 +199,7 @@ void Foam::probes::sampleAndWriteSurfaceFields(const fieldGroup<Type>& fields)
                 sampleAndWrite
                 (
                     mesh_.lookupObject
-                    <GeometricField<Type, fvsPatchField, surfaceMesh> >
+                    <GeometricField<Type, fvsPatchField, surfaceMesh>>
                     (
                         fields[fieldI]
                     )
@@ -212,7 +212,7 @@ void Foam::probes::sampleAndWriteSurfaceFields(const fieldGroup<Type>& fields)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::probes::sample
 (
     const GeometricField<Type, fvPatchField, volMesh>& vField
@@ -220,7 +220,7 @@ Foam::probes::sample
 {
     const Type unsetVal(-VGREAT*pTraits<Type>::one);
 
-    tmp<Field<Type> > tValues
+    tmp<Field<Type>> tValues
     (
         new Field<Type>(this->size(), unsetVal)
     );
@@ -229,7 +229,7 @@ Foam::probes::sample
 
     if (fixedLocations_)
     {
-        autoPtr<interpolation<Type> > interpolator
+        autoPtr<interpolation<Type>> interpolator
         (
             interpolation<Type>::New(interpolationScheme_, vField)
         );
@@ -268,12 +268,12 @@ Foam::probes::sample
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::probes::sample(const word& fieldName) const
 {
     return sample
     (
-        mesh_.lookupObject<GeometricField<Type, fvPatchField, volMesh> >
+        mesh_.lookupObject<GeometricField<Type, fvPatchField, volMesh>>
         (
             fieldName
         )
@@ -282,7 +282,7 @@ Foam::probes::sample(const word& fieldName) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::probes::sample
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& sField
@@ -290,7 +290,7 @@ Foam::probes::sample
 {
     const Type unsetVal(-VGREAT*pTraits<Type>::one);
 
-    tmp<Field<Type> > tValues
+    tmp<Field<Type>> tValues
     (
         new Field<Type>(this->size(), unsetVal)
     );
@@ -313,12 +313,12 @@ Foam::probes::sample
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::probes::sampleSurfaceFields(const word& fieldName) const
 {
     return sample
     (
-        mesh_.lookupObject<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        mesh_.lookupObject<GeometricField<Type, fvsPatchField, surfaceMesh>>
         (
             fieldName
         )
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 89d6f2561f..538249d1af 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ void Foam::sampledSets::combineSampledSets
         const sampledSet& samplePts = sampledSets[setI];
 
         // Collect data from all processors
-        List<List<point> > gatheredPts(Pstream::nProcs());
+        List<List<point>> gatheredPts(Pstream::nProcs());
         gatheredPts[Pstream::myProcNo()] = samplePts;
         Pstream::gatherList(gatheredPts);
 
@@ -79,9 +79,9 @@ void Foam::sampledSets::combineSampledSets
         // Combine processor lists into one big list.
         List<point> allPts
         (
-            ListListOps::combine<List<point> >
+            ListListOps::combine<List<point>>
             (
-                gatheredPts, accessOp<List<point> >()
+                gatheredPts, accessOp<List<point>>()
             )
         );
         labelList allSegments
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index 7efa29fcca..5a3985ef6c 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -108,7 +108,7 @@ class sampledSets
         template<class Type>
         class volFieldSampler
         :
-            public List<Field<Type> >
+            public List<Field<Type>>
         {
             //- Name of this collection of values
             const word name_;
@@ -133,7 +133,7 @@ class sampledSets
             //- Construct from components
             volFieldSampler
             (
-                const List<Field<Type> >& values,
+                const List<Field<Type>>& values,
                 const word& name
             );
 
@@ -224,16 +224,16 @@ class sampledSets
         template<class T>
         void combineSampledValues
         (
-            const PtrList<volFieldSampler<T> >& sampledFields,
+            const PtrList<volFieldSampler<T>>& sampledFields,
             const labelListList& indexSets,
-            PtrList<volFieldSampler<T> >& masterFields
+            PtrList<volFieldSampler<T>>& masterFields
         );
 
         template<class Type>
         void writeSampleFile
         (
             const coordSet& masterSampleSet,
-            const PtrList<volFieldSampler<Type> >& masterFields,
+            const PtrList<volFieldSampler<Type>>& masterFields,
             const label setI,
             const fileName& timeDir,
             const writer<Type>& formatter
diff --git a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
index ae899307c1..a2a51a3d64 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,10 +37,10 @@ Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
     const PtrList<sampledSet>& samplers
 )
 :
-    List<Field<Type> >(samplers.size()),
+    List<Field<Type>>(samplers.size()),
     name_(field.name())
 {
-    autoPtr<interpolation<Type> > interpolator
+    autoPtr<interpolation<Type>> interpolator
     (
         interpolation<Type>::New(interpolationScheme, field)
     );
@@ -83,7 +83,7 @@ Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
     const PtrList<sampledSet>& samplers
 )
 :
-    List<Field<Type> >(samplers.size()),
+    List<Field<Type>>(samplers.size()),
     name_(field.name())
 {
     forAll(samplers, setI)
@@ -112,11 +112,11 @@ Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
 template<class Type>
 Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
 (
-    const List<Field<Type> >& values,
+    const List<Field<Type>>& values,
     const word& name
 )
 :
-    List<Field<Type> >(values),
+    List<Field<Type>>(values),
     name_(name)
 {}
 
@@ -125,7 +125,7 @@ template<class Type>
 void Foam::sampledSets::writeSampleFile
 (
     const coordSet& masterSampleSet,
-    const PtrList<volFieldSampler<Type> >& masterFields,
+    const PtrList<volFieldSampler<Type>>& masterFields,
     const label setI,
     const fileName& timeDir,
     const writer<Type>& formatter
@@ -168,19 +168,19 @@ void Foam::sampledSets::writeSampleFile
 template<class T>
 void Foam::sampledSets::combineSampledValues
 (
-    const PtrList<volFieldSampler<T> >& sampledFields,
+    const PtrList<volFieldSampler<T>>& sampledFields,
     const labelListList& indexSets,
-    PtrList<volFieldSampler<T> >& masterFields
+    PtrList<volFieldSampler<T>>& masterFields
 )
 {
     forAll(sampledFields, fieldi)
     {
-        List<Field<T> > masterValues(indexSets.size());
+        List<Field<T>> masterValues(indexSets.size());
 
         forAll(indexSets, setI)
         {
             // Collect data from all processors
-            List<Field<T> > gatheredData(Pstream::nProcs());
+            List<Field<T>> gatheredData(Pstream::nProcs());
             gatheredData[Pstream::myProcNo()] = sampledFields[fieldi][setI];
             Pstream::gatherList(gatheredData);
 
@@ -188,10 +188,10 @@ void Foam::sampledSets::combineSampledValues
             {
                 Field<T> allData
                 (
-                    ListListOps::combine<Field<T> >
+                    ListListOps::combine<Field<T>>
                     (
                         gatheredData,
-                        Foam::accessOp<Field<T> >()
+                        Foam::accessOp<Field<T>>()
                     )
                 );
 
@@ -233,7 +233,7 @@ void Foam::sampledSets::sampleAndWrite
         }
 
         // Storage for interpolated values
-        PtrList<volFieldSampler<Type> > sampledFields(fields.size());
+        PtrList<volFieldSampler<Type>> sampledFields(fields.size());
 
         forAll(fields, fieldi)
         {
@@ -292,7 +292,7 @@ void Foam::sampledSets::sampleAndWrite
                         (
                             interpolationScheme_,
                             mesh_.lookupObject
-                            <GeometricField<Type, fvPatchField, volMesh> >
+                            <GeometricField<Type, fvPatchField, volMesh>>
                             (fields[fieldi]),
                             *this
                         )
@@ -306,7 +306,7 @@ void Foam::sampledSets::sampleAndWrite
                         new volFieldSampler<Type>
                         (
                             mesh_.lookupObject
-                            <GeometricField<Type, fvPatchField, volMesh> >
+                            <GeometricField<Type, fvPatchField, volMesh>>
                             (fields[fieldi]),
                             *this
                         )
@@ -318,7 +318,7 @@ void Foam::sampledSets::sampleAndWrite
         // Combine sampled fields from processors.
         // Note: only master results are valid
 
-        PtrList<volFieldSampler<Type> > masterFields(sampledFields.size());
+        PtrList<volFieldSampler<Type>> masterFields(sampledFields.size());
         combineSampledValues(sampledFields, indexSets_, masterFields);
 
         if (Pstream::master())
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
index 73cd555e05..3442f96f58 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,14 +105,14 @@ class distanceSurface
 
         //- Sample field on faces
         template<class Type>
-        tmp<Field<Type> > sampleField
+        tmp<Field<Type>> sampleField
         (
             const GeometricField<Type, fvPatchField, volMesh>& vField
         ) const;
 
 
         template<class Type>
-        tmp<Field<Type> >
+        tmp<Field<Type>>
         interpolateField(const interpolation<Type>&) const;
 
 
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C b/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C
index fb076b86ea..c1411e378b 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::distanceSurface::sampleField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vField
@@ -39,14 +39,14 @@ Foam::distanceSurface::sampleField
 {
     if (cell_)
     {
-        return tmp<Field<Type> >
+        return tmp<Field<Type>>
         (
             new Field<Type>(vField, isoSurfCellPtr_().meshCells())
         );
     }
     else
     {
-        return tmp<Field<Type> >
+        return tmp<Field<Type>>
         (
             new Field<Type>(vField, isoSurfPtr_().meshCells())
         );
@@ -55,7 +55,7 @@ Foam::distanceSurface::sampleField
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::distanceSurface::interpolateField
 (
     const interpolation<Type>& interpolator
@@ -67,7 +67,7 @@ Foam::distanceSurface::interpolateField
     const GeometricField<Type, fvPatchField, volMesh>& volFld =
         interpolator.psi();
 
-    tmp<GeometricField<Type, pointPatchField, pointMesh> > pointFld
+    tmp<GeometricField<Type, pointPatchField, pointMesh>> pointFld
     (
         volPointInterpolation::New(fvm).interpolate(volFld)
     );
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index 81307ac614..a9d57ad500 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1205,7 +1205,7 @@ bool Foam::isoSurface::validTri(const triSurface& surf, const label faceI)
 void Foam::isoSurface::calcAddressing
 (
     const triSurface& surf,
-    List<FixedList<label, 3> >& faceEdges,
+    List<FixedList<label, 3>>& faceEdges,
     labelList& edgeFace0,
     labelList& edgeFace1,
     Map<labelList>& edgeFacesRest
@@ -1404,7 +1404,7 @@ void Foam::isoSurface::calcAddressing
 void Foam::isoSurface::walkOrientation
 (
     const triSurface& surf,
-    const List<FixedList<label, 3> >& faceEdges,
+    const List<FixedList<label, 3>>& faceEdges,
     const labelList& edgeFace0,
     const labelList& edgeFace1,
     const label seedTriI,
@@ -1490,7 +1490,7 @@ void Foam::isoSurface::walkOrientation
 void Foam::isoSurface::orientSurface
 (
     triSurface& surf,
-    const List<FixedList<label, 3> >& faceEdges,
+    const List<FixedList<label, 3>>& faceEdges,
     const labelList& edgeFace0,
     const labelList& edgeFace1,
     const Map<labelList>& edgeFacesRest
@@ -1585,7 +1585,7 @@ bool Foam::isoSurface::danglingTriangle
 // Mark triangles to keep. Returns number of dangling triangles.
 Foam::label Foam::isoSurface::markDanglingTriangles
 (
-    const List<FixedList<label, 3> >& faceEdges,
+    const List<FixedList<label, 3>>& faceEdges,
     const labelList& edgeFace0,
     const labelList& edgeFace1,
     const Map<labelList>& edgeFacesRest,
@@ -2021,7 +2021,7 @@ Foam::isoSurface::isoSurface
 
     if (false)
     {
-        List<FixedList<label, 3> > faceEdges;
+        List<FixedList<label, 3>> faceEdges;
         labelList edgeFace0, edgeFace1;
         Map<labelList> edgeFacesRest;
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.H b/src/sampling/sampledSurface/isoSurface/isoSurface.H
index 9f6dc7d76e..f05035369c 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -236,7 +236,7 @@ class isoSurface
         //- Return input field with coupled (and empty) patch values rewritten
         template<class Type>
         tmp<SlicedGeometricField
-        <Type, fvPatchField, slicedFvPatchField, volMesh> >
+        <Type, fvPatchField, slicedFvPatchField, volMesh>>
         adaptPatchFields
         (
             const GeometricField<Type, fvPatchField, volMesh>& fld
@@ -338,7 +338,7 @@ class isoSurface
         void calcAddressing
         (
             const triSurface& surf,
-            List<FixedList<label, 3> >& faceEdges,
+            List<FixedList<label, 3>>& faceEdges,
             labelList& edgeFace0,
             labelList& edgeFace1,
             Map<labelList>& edgeFacesRest
@@ -348,7 +348,7 @@ class isoSurface
         static void walkOrientation
         (
             const triSurface& surf,
-            const List<FixedList<label, 3> >& faceEdges,
+            const List<FixedList<label, 3>>& faceEdges,
             const labelList& edgeFace0,
             const labelList& edgeFace1,
             const label seedTriI,
@@ -359,7 +359,7 @@ class isoSurface
         static void orientSurface
         (
             triSurface&,
-            const List<FixedList<label, 3> >& faceEdges,
+            const List<FixedList<label, 3>>& faceEdges,
             const labelList& edgeFace0,
             const labelList& edgeFace1,
             const Map<labelList>& edgeFacesRest
@@ -375,7 +375,7 @@ class isoSurface
         //- Mark all non-fully connected triangles
         static label markDanglingTriangles
         (
-            const List<FixedList<label, 3> >& faceEdges,
+            const List<FixedList<label, 3>>& faceEdges,
             const labelList& edgeFace0,
             const labelList& edgeFace1,
             const Map<labelList>& edgeFacesRest,
@@ -428,7 +428,7 @@ public:
         //- Interpolates cCoords,pCoords. Uses the references to the original
         //  fields used to create the iso surface.
         template<class Type>
-        tmp<Field<Type> > interpolate
+        tmp<Field<Type>> interpolate
         (
             const GeometricField<Type, fvPatchField, volMesh>& cCoords,
             const Field<Type>& pCoords
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index d82f072a13..c2fec19741 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1124,7 +1124,7 @@ bool Foam::isoSurfaceCell::validTri(const triSurface& surf, const label faceI)
 void Foam::isoSurfaceCell::calcAddressing
 (
     const triSurface& surf,
-    List<FixedList<label, 3> >& faceEdges,
+    List<FixedList<label, 3>>& faceEdges,
     labelList& edgeFace0,
     labelList& edgeFace1,
     Map<labelList>& edgeFacesRest
@@ -1225,7 +1225,7 @@ void Foam::isoSurfaceCell::calcAddressing
 //void Foam::isoSurfaceCell::walkOrientation
 //(
 //    const triSurface& surf,
-//    const List<FixedList<label, 3> >& faceEdges,
+//    const List<FixedList<label, 3>>& faceEdges,
 //    const labelList& edgeFace0,
 //    const labelList& edgeFace1,
 //    const label seedTriI,
@@ -1293,7 +1293,7 @@ void Foam::isoSurfaceCell::calcAddressing
 //void Foam::isoSurfaceCell::orientSurface
 //(
 //    triSurface& surf,
-//    const List<FixedList<label, 3> >& faceEdges,
+//    const List<FixedList<label, 3>>& faceEdges,
 //    const labelList& edgeFace0,
 //    const labelList& edgeFace1,
 //    const Map<labelList>& edgeFacesRest
@@ -1388,7 +1388,7 @@ bool Foam::isoSurfaceCell::danglingTriangle
 // Mark triangles to keep. Returns number of dangling triangles.
 Foam::label Foam::isoSurfaceCell::markDanglingTriangles
 (
-    const List<FixedList<label, 3> >& faceEdges,
+    const List<FixedList<label, 3>>& faceEdges,
     const labelList& edgeFace0,
     const labelList& edgeFace1,
     const Map<labelList>& edgeFacesRest,
@@ -1671,7 +1671,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
 
     if (regularise)
     {
-        List<FixedList<label, 3> > faceEdges;
+        List<FixedList<label, 3>> faceEdges;
         labelList edgeFace0, edgeFace1;
         Map<labelList> edgeFacesRest;
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
index 7e12efc7bb..20a0abfd32 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -265,7 +265,7 @@ class isoSurfaceCell
         void calcAddressing
         (
             const triSurface& surf,
-            List<FixedList<label, 3> >& faceEdges,
+            List<FixedList<label, 3>>& faceEdges,
             labelList& edgeFace0,
             labelList& edgeFace1,
             Map<labelList>& edgeFacesRest
@@ -275,7 +275,7 @@ class isoSurfaceCell
         //static void walkOrientation
         //(
         //    const triSurface& surf,
-        //    const List<FixedList<label, 3> >& faceEdges,
+        //    const List<FixedList<label, 3>>& faceEdges,
         //    const labelList& edgeFace0,
         //    const labelList& edgeFace1,
         //    const label seedTriI,
@@ -286,7 +286,7 @@ class isoSurfaceCell
         //static void orientSurface
         //(
         //    triSurface&,
-        //    const List<FixedList<label, 3> >& faceEdges,
+        //    const List<FixedList<label, 3>>& faceEdges,
         //    const labelList& edgeFace0,
         //    const labelList& edgeFace1,
         //    const Map<labelList>& edgeFacesRest
@@ -302,7 +302,7 @@ class isoSurfaceCell
         //- Mark all non-fully connected triangles
         static label markDanglingTriangles
         (
-            const List<FixedList<label, 3> >& faceEdges,
+            const List<FixedList<label, 3>>& faceEdges,
             const labelList& edgeFace0,
             const labelList& edgeFace1,
             const Map<labelList>& edgeFacesRest,
@@ -358,7 +358,7 @@ public:
         //- Interpolates cCoords,pCoords. Takes the original fields
         //  used to create the iso surface.
         template<class Type>
-        tmp<Field<Type> > interpolate
+        tmp<Field<Type>> interpolate
         (
             const scalarField& cVals,
             const scalarField& pVals,
@@ -368,7 +368,7 @@ public:
 
         //- Interpolates cCoords,pCoords.
         template<class Type>
-        tmp<Field<Type> > interpolate
+        tmp<Field<Type>> interpolate
         (
             const Field<Type>& cCoords,
             const Field<Type>& pCoords
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
index 6d54e471bb..ac27677924 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -507,7 +507,7 @@ void Foam::isoSurfaceCell::generateTriPoints
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::isoSurfaceCell::interpolate
 (
     const scalarField& cVals,
@@ -543,7 +543,7 @@ Foam::isoSurfaceCell::interpolate
 
 
     // One value per point
-    tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
     Field<Type>& values = tvalues();
 
     forAll(triPoints, i)
@@ -561,7 +561,7 @@ Foam::isoSurfaceCell::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::isoSurfaceCell::interpolate
 (
     const Field<Type>& cCoords,
@@ -595,7 +595,7 @@ Foam::isoSurfaceCell::interpolate
 
 
     // One value per point
-    tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
     Field<Type>& values = tvalues();
 
     forAll(triPoints, i)
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
index 75a79c9f2b..58950e006b 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ Foam::tmp<Foam::SlicedGeometricField
     Foam::fvPatchField,
     Foam::slicedFvPatchField,
     Foam::volMesh
-> >
+>>
 Foam::isoSurface::adaptPatchFields
 (
     const GeometricField<Type, fvPatchField, volMesh>& fld
@@ -125,7 +125,7 @@ Foam::isoSurface::adaptPatchFields
 
             const scalarField& w = mesh.weights().boundaryField()[patchI];
 
-            tmp<Field<Type> > f =
+            tmp<Field<Type>> f =
                 w*pfld.patchInternalField()
               + (1.0-w)*pfld.patchNeighbourField();
 
@@ -682,15 +682,15 @@ void Foam::isoSurface::generateTriPoints
 
 
 //template<class Type>
-//Foam::tmp<Foam::Field<Type> >
+//Foam::tmp<Foam::Field<Type>>
 //Foam::isoSurface::sample(const Field<Type>& vField) const
 //{
-//    return tmp<Field<Type> >(new Field<Type>(vField, meshCells()));
+//    return tmp<Field<Type>>(new Field<Type>(vField, meshCells()));
 //}
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::isoSurface::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& cCoords,
@@ -704,7 +704,7 @@ Foam::isoSurface::interpolate
         fvPatchField,
         slicedFvPatchField,
         volMesh
-    > > c2(adaptPatchFields(cCoords));
+    >> c2(adaptPatchFields(cCoords));
 
 
     DynamicList<Type> triPoints(nCutCells_);
@@ -733,7 +733,7 @@ Foam::isoSurface::interpolate
 
 
     // One value per point
-    tmp<Field<Type> > tvalues
+    tmp<Field<Type>> tvalues
     (
         new Field<Type>(points().size(), pTraits<Type>::zero)
     );
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
index 8cfd14c3c1..c07338b5f5 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,14 +123,14 @@ class sampledIsoSurface
 
         //- Sample field on faces
         template<class Type>
-        tmp<Field<Type> > sampleField
+        tmp<Field<Type>> sampleField
         (
             const GeometricField<Type, fvPatchField, volMesh>& vField
         ) const;
 
 
         template<class Type>
-        tmp<Field<Type> >
+        tmp<Field<Type>>
         interpolateField(const interpolation<Type>&) const;
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
index 7021bf0b97..a990173b6e 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,14 +92,14 @@ class sampledIsoSurfaceCell
 
         //- Sample field on faces
         template<class Type>
-        tmp<Field<Type> > sampleField
+        tmp<Field<Type>> sampleField
         (
             const GeometricField<Type, fvPatchField, volMesh>& vField
         ) const;
 
 
         template<class Type>
-        tmp<Field<Type> >
+        tmp<Field<Type>>
         interpolateField(const interpolation<Type>&) const;
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
index b0d6eaa6eb..a80bd81a3b 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledIsoSurfaceCell::sampleField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vField
@@ -41,12 +41,12 @@ Foam::sampledIsoSurfaceCell::sampleField
     // Recreate geometry if time has changed
     updateGeometry();
 
-    return tmp<Field<Type> >(new Field<Type>(vField, meshCells_));
+    return tmp<Field<Type>>(new Field<Type>(vField, meshCells_));
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledIsoSurfaceCell::interpolateField
 (
     const interpolation<Type>& interpolator
@@ -56,7 +56,7 @@ Foam::sampledIsoSurfaceCell::interpolateField
     updateGeometry();
 
     // One value per point
-    tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
     Field<Type>& values = tvalues();
 
     boolList pointDone(points().size(), false);
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
index 513cf2fb5d..55acd17b19 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledIsoSurface::sampleField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vField
@@ -40,12 +40,12 @@ Foam::sampledIsoSurface::sampleField
     // Recreate geometry if time has changed
     updateGeometry();
 
-    return tmp<Field<Type> >(new Field<Type>(vField, surface().meshCells()));
+    return tmp<Field<Type>>(new Field<Type>(vField, surface().meshCells()));
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledIsoSurface::interpolateField
 (
     const interpolation<Type>& interpolator
@@ -60,13 +60,13 @@ Foam::sampledIsoSurface::interpolateField
 
     if (subMeshPtr_.valid())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh> > tvolSubFld =
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tvolSubFld =
             subMeshPtr_().interpolate(volFld);
 
         const GeometricField<Type, fvPatchField, volMesh>& volSubFld =
             tvolSubFld();
 
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > tpointSubFld =
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> tpointSubFld =
             volPointInterpolation::New(volSubFld.mesh()).interpolate(volSubFld);
 
         // Sample.
@@ -82,7 +82,7 @@ Foam::sampledIsoSurface::interpolateField
     }
     else
     {
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > tpointFld =
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> tpointFld =
             volPointInterpolation::New(volFld.mesh()).interpolate(volFld);
 
         // Sample.
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
index a8aa477407..17a6dc59bc 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,14 +103,14 @@ class sampledCuttingPlane
 
         //- Sample field on faces
         template<class Type>
-        tmp<Field<Type> > sampleField
+        tmp<Field<Type>> sampleField
         (
             const GeometricField<Type, fvPatchField, volMesh>& vField
         ) const;
 
 
         template<class Type>
-        tmp<Field<Type> >
+        tmp<Field<Type>>
         interpolateField(const interpolation<Type>&) const;
 
 
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
index 00171fce51..8756deabd0 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,18 +31,18 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledCuttingPlane::sampleField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vField
 ) const
 {
-    return tmp<Field<Type> >(new Field<Type>(vField, surface().meshCells()));
+    return tmp<Field<Type>>(new Field<Type>(vField, surface().meshCells()));
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledCuttingPlane::interpolateField
 (
     const interpolation<Type>& interpolator
@@ -54,13 +54,13 @@ Foam::sampledCuttingPlane::interpolateField
 
     if (subMeshPtr_.valid())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh> > tvolSubFld =
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tvolSubFld =
             subMeshPtr_().interpolate(volFld);
 
         const GeometricField<Type, fvPatchField, volMesh>& volSubFld =
             tvolSubFld();
 
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > tpointSubFld =
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> tpointSubFld =
             volPointInterpolation::New(volSubFld.mesh()).interpolate(volSubFld);
 
         // Sample.
@@ -76,7 +76,7 @@ Foam::sampledCuttingPlane::interpolateField
     }
     else
     {
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > tpointFld
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> tpointFld
         (
             volPointInterpolation::New(volFld.mesh()).interpolate(volFld)
         );
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
index f0b810a5ba..ec5821c556 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,20 +84,20 @@ class sampledPatch
 
         //- Sample field on faces
         template<class Type>
-        tmp<Field<Type> > sampleField
+        tmp<Field<Type>> sampleField
         (
             const GeometricField<Type, fvPatchField, volMesh>& vField
         ) const;
 
         //- Sample surface field on faces
         template<class Type>
-        tmp<Field<Type> > sampleField
+        tmp<Field<Type>> sampleField
         (
             const GeometricField<Type, fvsPatchField, surfaceMesh>& sField
         ) const;
 
         template<class Type>
-        tmp<Field<Type> > interpolateField(const interpolation<Type>&) const;
+        tmp<Field<Type>> interpolateField(const interpolation<Type>&) const;
 
         //- Re-map action on triangulation or cleanup
         virtual void remapFaces(const labelUList& faceMap);
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
index 2ffcb3a010..dc7f0cbb6e 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,14 +28,14 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledPatch::sampleField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vField
 ) const
 {
     // One value per face
-    tmp<Field<Type> > tvalues(new Field<Type>(patchFaceLabels_.size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(patchFaceLabels_.size()));
     Field<Type>& values = tvalues();
     forAll(patchFaceLabels_, i)
     {
@@ -49,14 +49,14 @@ Foam::sampledPatch::sampleField
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledPatch::sampleField
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& sField
 ) const
 {
     // One value per face
-    tmp<Field<Type> > tvalues(new Field<Type>(patchFaceLabels_.size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(patchFaceLabels_.size()));
     Field<Type>& values = tvalues();
 
     forAll(patchFaceLabels_, i)
@@ -70,14 +70,14 @@ Foam::sampledPatch::sampleField
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledPatch::interpolateField
 (
     const interpolation<Type>& interpolator
 ) const
 {
     // One value per vertex
-    tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
     Field<Type>& values = tvalues();
 
     const labelList& own = mesh().faceOwner();
diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
index 8a423c60e8..3e7d33e74c 100644
--- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
+++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,13 +66,13 @@ class sampledPatchInternalField
 
         //- Sample field on faces
         template<class Type>
-        tmp<Field<Type> > sampleField
+        tmp<Field<Type>> sampleField
         (
             const GeometricField<Type, fvPatchField, volMesh>& vField
         ) const;
 
         template<class Type>
-        tmp<Field<Type> > interpolateField(const interpolation<Type>&) const;
+        tmp<Field<Type>> interpolateField(const interpolation<Type>&) const;
 
 
 public:
diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
index 2d187fa314..56852b4ec2 100644
--- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,14 +30,14 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledPatchInternalField::sampleField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vField
 ) const
 {
     // One value per face
-    tmp<Field<Type> > tvalues(new Field<Type>(patchFaceLabels().size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(patchFaceLabels().size()));
     Field<Type>& values = tvalues();
 
     forAll(patchStart(), i)
@@ -65,7 +65,7 @@ Foam::sampledPatchInternalField::sampleField
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledPatchInternalField::interpolateField
 (
     const interpolation<Type>& interpolator
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
index 4add35f3f6..f4134573b1 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,14 +70,14 @@ class sampledPlane
 
         //- Sample field on faces
         template<class Type>
-        tmp<Field<Type> > sampleField
+        tmp<Field<Type>> sampleField
         (
             const GeometricField<Type, fvPatchField, volMesh>& vField
         ) const;
 
 
         template<class Type>
-        tmp<Field<Type> >
+        tmp<Field<Type>>
         interpolateField(const interpolation<Type>&) const;
 
 
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
index b508380376..52e830d75f 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,25 +28,25 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledPlane::sampleField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vField
 ) const
 {
-    return tmp<Field<Type> >(new Field<Type>(vField, meshCells()));
+    return tmp<Field<Type>>(new Field<Type>(vField, meshCells()));
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledPlane::interpolateField
 (
     const interpolation<Type>& interpolator
 ) const
 {
     // One value per point
-    tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
     Field<Type>& values = tvalues();
 
     boolList pointDone(points().size(), false);
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
index acf3558bba..59a34de598 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -287,10 +287,10 @@ Foam::tmp<Foam::tensorField> Foam::sampledSurface::sample
 }
 
 
-Foam::tmp<Foam::Field<Foam::scalar> >
+Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::sampledSurface::project(const Field<scalar>& field) const
 {
-    tmp<Field<scalar> > tRes(new Field<scalar>(faces().size()));
+    tmp<Field<scalar>> tRes(new Field<scalar>(faces().size()));
     Field<scalar>& res = tRes();
 
     forAll(faces(), faceI)
@@ -302,37 +302,37 @@ Foam::sampledSurface::project(const Field<scalar>& field) const
 }
 
 
-Foam::tmp<Foam::Field<Foam::scalar> >
+Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::sampledSurface::project(const Field<vector>& field) const
 {
-    tmp<Field<scalar> > tRes(new Field<scalar>(faces().size()));
+    tmp<Field<scalar>> tRes(new Field<scalar>(faces().size()));
     project(tRes(), field);
     return tRes;
 }
 
 
-Foam::tmp<Foam::Field<Foam::vector> >
+Foam::tmp<Foam::Field<Foam::vector>>
 Foam::sampledSurface::project(const Field<sphericalTensor>& field) const
 {
-    tmp<Field<vector> > tRes(new Field<vector>(faces().size()));
+    tmp<Field<vector>> tRes(new Field<vector>(faces().size()));
     project(tRes(), field);
     return tRes;
 }
 
 
-Foam::tmp<Foam::Field<Foam::vector> >
+Foam::tmp<Foam::Field<Foam::vector>>
 Foam::sampledSurface::project(const Field<symmTensor>& field) const
 {
-    tmp<Field<vector> > tRes(new Field<vector>(faces().size()));
+    tmp<Field<vector>> tRes(new Field<vector>(faces().size()));
     project(tRes(), field);
     return tRes;
 }
 
 
-Foam::tmp<Foam::Field<Foam::vector> >
+Foam::tmp<Foam::Field<Foam::vector>>
 Foam::sampledSurface::project(const Field<tensor>& field) const
 {
-    tmp<Field<vector> > tRes(new Field<vector>(faces().size()));
+    tmp<Field<vector>> tRes(new Field<vector>(faces().size()));
     project(tRes(), field);
     return tRes;
 }
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
index fca1b028b2..243906b385 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,12 +135,12 @@ class sampledSurface
         void project
         (
             Field<ReturnType>&,
-            const tmp<Field<Type> >&
+            const tmp<Field<Type>>&
         ) const;
 
         //- Project field onto surface
         template<class ReturnType, class Type>
-        tmp<Field<ReturnType> > project(const tmp<Field<Type> >&) const;
+        tmp<Field<ReturnType>> project(const tmp<Field<Type>>&) const;
 
 
 protected:
@@ -295,7 +295,7 @@ public:
 
         //- Integration of a field across the surface
         template<class Type>
-        Type integrate(const tmp<Field<Type> >&) const;
+        Type integrate(const tmp<Field<Type>>&) const;
 
         //- Area-averaged value of a field across the surface
         template<class Type>
@@ -303,26 +303,26 @@ public:
 
         //- Area-averaged value of a field across the surface
         template<class Type>
-        Type average(const tmp<Field<Type> >&) const;
+        Type average(const tmp<Field<Type>>&) const;
 
         //- Project field onto surface
-        tmp<Field<scalar> > project(const Field<scalar>&) const;
+        tmp<Field<scalar>> project(const Field<scalar>&) const;
 
         //- Project field onto surface
-        tmp<Field<scalar> > project(const Field<vector>&) const;
+        tmp<Field<scalar>> project(const Field<vector>&) const;
 
         //- Project field onto surface
-        tmp<Field<vector> > project(const Field<sphericalTensor>&) const;
+        tmp<Field<vector>> project(const Field<sphericalTensor>&) const;
 
         //- Project field onto surface
-        tmp<Field<vector> > project(const Field<symmTensor>&) const;
+        tmp<Field<vector>> project(const Field<symmTensor>&) const;
 
         //- Project field onto surface
-        tmp<Field<vector> > project(const Field<tensor>&) const;
+        tmp<Field<vector>> project(const Field<tensor>&) const;
 
         //- Interpolate from points to cell centre
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > pointAverage
+        tmp<GeometricField<Type, fvPatchField, volMesh>> pointAverage
         (
             const GeometricField<Type, pointPatchField, pointMesh>& pfld
         ) const;
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
index 2ad3b90e79..d361cdd029 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ Type Foam::sampledSurface::integrate(const Field<Type>& field) const
 
 
 template<class Type>
-Type Foam::sampledSurface::integrate(const tmp<Field<Type> >& field) const
+Type Foam::sampledSurface::integrate(const tmp<Field<Type>>& field) const
 {
     Type value = integrate(field());
     field.clear();
@@ -95,7 +95,7 @@ Type Foam::sampledSurface::average(const Field<Type>& field) const
 
 
 template<class Type>
-Type Foam::sampledSurface::average(const tmp<Field<Type> >& field) const
+Type Foam::sampledSurface::average(const tmp<Field<Type>>& field) const
 {
     Type value = average(field());
     field.clear();
@@ -130,7 +130,7 @@ template<class ReturnType, class Type>
 void Foam::sampledSurface::project
 (
     Field<ReturnType>& res,
-    const tmp<Field<Type> >& field
+    const tmp<Field<Type>>& field
 ) const
 {
     project(res, field());
@@ -139,20 +139,20 @@ void Foam::sampledSurface::project
 
 
 template<class ReturnType, class Type>
-Foam::tmp<Foam::Field<ReturnType> >
+Foam::tmp<Foam::Field<ReturnType>>
 Foam::sampledSurface::project
 (
-    const tmp<Field<Type> >& field
+    const tmp<Field<Type>>& field
 ) const
 {
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(faces().size()));
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(faces().size()));
     project(tRes(), field);
     return tRes;
 }
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::sampledSurface::pointAverage
 (
     const GeometricField<Type, pointPatchField, pointMesh>& pfld
@@ -160,7 +160,7 @@ Foam::sampledSurface::pointAverage
 {
     const fvMesh& mesh = dynamic_cast<const fvMesh&>(pfld.mesh()());
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > tcellAvg
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tcellAvg
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
index 8683e320dc..a080190c34 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ void Foam::sampledSurfaces::writeSurface
     if (Pstream::parRun())
     {
         // Collect values from all processors
-        List<Field<Type> > gatheredValues(Pstream::nProcs());
+        List<Field<Type>> gatheredValues(Pstream::nProcs());
         gatheredValues[Pstream::myProcNo()] = values;
         Pstream::gatherList(gatheredValues);
 
@@ -54,10 +54,10 @@ void Foam::sampledSurfaces::writeSurface
             // Combine values into single field
             Field<Type> allValues
             (
-                ListListOps::combine<Field<Type> >
+                ListListOps::combine<Field<Type>>
                 (
                     gatheredValues,
-                    accessOp<Field<Type> >()
+                    accessOp<Field<Type>>()
                 )
             );
 
@@ -113,7 +113,7 @@ void Foam::sampledSurfaces::sampleAndWrite
 )
 {
     // interpolator for this field
-    autoPtr<interpolation<Type> > interpolatorPtr;
+    autoPtr<interpolation<Type>> interpolatorPtr;
 
     const word& fieldName = vField.name();
     const fileName outputDir = outputPath_/vField.time().timeName();
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
index 973beb2acb..2f1b12cb8d 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ private:
         mutable bool needsUpdate_;
 
         //- Search tree for all non-coupled boundary faces
-        mutable autoPtr<indexedOctree<treeDataFace> > boundaryTreePtr_;
+        mutable autoPtr<indexedOctree<treeDataFace>> boundaryTreePtr_;
 
         //- From local surface triangle to mesh cell/face.
         labelList sampleElements_;
@@ -134,14 +134,14 @@ private:
 
         //- Sample field on faces
         template<class Type>
-        tmp<Field<Type> > sampleField
+        tmp<Field<Type>> sampleField
         (
             const GeometricField<Type, fvPatchField, volMesh>& vField
         ) const;
 
 
         template<class Type>
-        tmp<Field<Type> >
+        tmp<Field<Type>>
         interpolateField(const interpolation<Type>&) const;
 
         bool update(const meshSearch& meshSearcher);
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
index d251431a55..40190c9ae3 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,14 +28,14 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledTriSurfaceMesh::sampleField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vField
 ) const
 {
     // One value per face
-    tmp<Field<Type> > tvalues(new Field<Type>(sampleElements_.size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(sampleElements_.size()));
     Field<Type>& values = tvalues();
 
     if (sampleSource_ == cells || sampleSource_ == insideCells)
@@ -84,14 +84,14 @@ Foam::sampledTriSurfaceMesh::sampleField
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledTriSurfaceMesh::interpolateField
 (
     const interpolation<Type>& interpolator
 ) const
 {
     // One value per vertex
-    tmp<Field<Type> > tvalues(new Field<Type>(sampleElements_.size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(sampleElements_.size()));
     Field<Type>& values = tvalues();
 
     if (sampleSource_ == cells || sampleSource_ == insideCells)
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
index f3758a6239..4d78b2ab19 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,14 +90,14 @@ class sampledThresholdCellFaces
 
         //- Sample field on faces
         template<class Type>
-        tmp<Field<Type> > sampleField
+        tmp<Field<Type>> sampleField
         (
             const GeometricField<Type, fvPatchField, volMesh>& vField
         ) const;
 
 
         template<class Type>
-        tmp<Field<Type> >
+        tmp<Field<Type>>
         interpolateField(const interpolation<Type>&) const;
 
 
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
index ed6b5c3a9f..d78da36837 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledThresholdCellFaces::sampleField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vField
@@ -42,12 +42,12 @@ Foam::sampledThresholdCellFaces::sampleField
     // Recreate geometry if time has changed
     updateGeometry();
 
-    return tmp<Field<Type> >(new Field<Type>(vField, meshCells_));
+    return tmp<Field<Type>>(new Field<Type>(vField, meshCells_));
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::sampledThresholdCellFaces::interpolateField
 (
     const interpolation<Type>& interpolator
@@ -57,7 +57,7 @@ Foam::sampledThresholdCellFaces::interpolateField
     updateGeometry();
 
     // One value per point
-    tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
+    tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
     Field<Type>& values = tvalues();
 
     boolList pointDone(points().size(), false);
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
index b0fa51ca70..f4b358760a 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -261,7 +261,7 @@ void Foam::nastranSurfaceWriter::writeGeometry
 (
     const pointField& points,
     const faceList& faces,
-    List<DynamicList<face> >& decomposedFaces,
+    List<DynamicList<face>>& decomposedFaces,
     OFstream& os
 ) const
 {
@@ -339,7 +339,7 @@ Foam::nastranSurfaceWriter::nastranSurfaceWriter(const dictionary& options)
         writeFormat_ = writeFormatNames_.read(options.lookup("format"));
     }
 
-    List<Tuple2<word, word> > fieldSet(options.lookup("fields"));
+    List<Tuple2<word, word>> fieldSet(options.lookup("fields"));
 
     forAll(fieldSet, i)
     {
@@ -382,7 +382,7 @@ void Foam::nastranSurfaceWriter::write
         << "$" << nl
         << "BEGIN BULK" << nl;
 
-    List<DynamicList<face> > decomposedFaces(faces.size());
+    List<DynamicList<face>> decomposedFaces(faces.size());
 
     writeGeometry(points, faces, decomposedFaces, os);
 
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
index e80383a303..5dfcf44e7a 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ private:
         (
             const pointField& points,
             const faceList& faces,
-            List<DynamicList<face> >& decomposedFaces,
+            List<DynamicList<face>>& decomposedFaces,
             OFstream& os
         ) const;
 
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
index d8ea7cc516..994f7bf467 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,7 +163,7 @@ void Foam::nastranSurfaceWriter::writeTemplate
         << "$" << nl
         << "BEGIN BULK" << nl;
 
-    List<DynamicList<face> > decomposedFaces(faces.size());
+    List<DynamicList<face>> decomposedFaces(faces.size());
 
     writeGeometry(points, faces, decomposedFaces, os);
 
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
index a4d9865a36..6eb52b4c39 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,9 +121,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<vector> > clone() const
+        virtual autoPtr<pointPatchField<vector>> clone() const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new sixDoFRigidBodyDisplacementPointPatchVectorField
                 (
@@ -140,12 +140,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<vector> > clone
+        virtual autoPtr<pointPatchField<vector>> clone
         (
             const DimensionedField<vector, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new sixDoFRigidBodyDisplacementPointPatchVectorField
                 (
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
index bd7538ad71..b5025104db 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,9 +96,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<vector> > clone() const
+        virtual autoPtr<pointPatchField<vector>> clone() const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
                 (
@@ -115,12 +115,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<vector> > clone
+        virtual autoPtr<pointPatchField<vector>> clone
         (
             const DimensionedField<vector, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<vector> >
+            return autoPtr<pointPatchField<vector>>
             (
                 new uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
                 (
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index a79dfe0521..bc36bdcf09 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -168,7 +168,7 @@ template<class Face>
 Foam::MeshedSurface<Face>::MeshedSurface
 (
     const Xfer<pointField>& pointLst,
-    const Xfer<List<Face> >& faceLst,
+    const Xfer<List<Face>>& faceLst,
     const Xfer<surfZoneList>& zoneLst
 )
 :
@@ -183,7 +183,7 @@ template<class Face>
 Foam::MeshedSurface<Face>::MeshedSurface
 (
     const Xfer<pointField>& pointLst,
-    const Xfer<List<Face> >& faceLst,
+    const Xfer<List<Face>>& faceLst,
     const labelUList& zoneSizes,
     const UList<word>& zoneNames
 )
@@ -392,7 +392,7 @@ Foam::MeshedSurface<Face>::MeshedSurface
 template<class Face>
 Foam::MeshedSurface<Face>::MeshedSurface
 (
-    const Xfer<UnsortedMeshedSurface<Face> >& surf
+    const Xfer<UnsortedMeshedSurface<Face>>& surf
 )
 :
     ParentType(List<Face>(), pointField())
@@ -404,7 +404,7 @@ Foam::MeshedSurface<Face>::MeshedSurface
 template<class Face>
 Foam::MeshedSurface<Face>::MeshedSurface
 (
-    const Xfer<MeshedSurface<Face> >& surf
+    const Xfer<MeshedSurface<Face>>& surf
 )
 :
     ParentType(List<Face>(), pointField())
@@ -515,7 +515,7 @@ template<class Face>
 void Foam::MeshedSurface<Face>::reset
 (
     const Xfer<pointField>& pointLst,
-    const Xfer<List<Face> >& faceLst,
+    const Xfer<List<Face>>& faceLst,
     const Xfer<surfZoneList>& zoneLst
 )
 {
@@ -543,8 +543,8 @@ void Foam::MeshedSurface<Face>::reset
 template<class Face>
 void Foam::MeshedSurface<Face>::reset
 (
-    const Xfer<List<point> >& pointLst,
-    const Xfer<List<Face> >& faceLst,
+    const Xfer<List<point>>& pointLst,
+    const Xfer<List<Face>>& faceLst,
     const Xfer<surfZoneList>& zoneLst
 )
 {
@@ -1091,7 +1091,7 @@ void Foam::MeshedSurface<Face>::transfer
 
 
 template<class Face>
-Foam::Xfer<Foam::MeshedSurface<Face> > Foam::MeshedSurface<Face>::xfer()
+Foam::Xfer<Foam::MeshedSurface<Face>> Foam::MeshedSurface<Face>::xfer()
 {
     return xferMove(*this);
 }
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index 00e25f46e8..f420fd34d3 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -145,8 +145,8 @@ protected:
         //- Sort faces by zones and store sorted faces
         void sortFacesAndStore
         (
-            const Xfer<List<Face> >& unsortedFaces,
-            const Xfer<List<label> >& zoneIds,
+            const Xfer<List<Face>>& unsortedFaces,
+            const Xfer<List<label>>& zoneIds,
             const bool sorted
         );
 
@@ -192,7 +192,7 @@ public:
         MeshedSurface
         (
             const Xfer<pointField>&,
-            const Xfer<List<Face> >&,
+            const Xfer<List<Face>>&,
             const Xfer<surfZoneList>&
         );
 
@@ -201,7 +201,7 @@ public:
         MeshedSurface
         (
             const Xfer<pointField>&,
-            const Xfer<List<Face> >&,
+            const Xfer<List<Face>>&,
             const labelUList& zoneSizes = labelUList(),
             const UList<word>& zoneNames = UList<word>()
         );
@@ -223,10 +223,10 @@ public:
         MeshedSurface(const surfMesh&);
 
         //- Construct by transferring the contents from a UnsortedMeshedSurface
-        MeshedSurface(const Xfer<UnsortedMeshedSurface<Face> >&);
+        MeshedSurface(const Xfer<UnsortedMeshedSurface<Face>>&);
 
         //- Construct by transferring the contents from a MeshedSurface
-        MeshedSurface(const Xfer<MeshedSurface<Face> >&);
+        MeshedSurface(const Xfer<MeshedSurface<Face>>&);
 
         //- Construct from file name (uses extension to determine type)
         MeshedSurface(const fileName&);
@@ -354,7 +354,7 @@ public:
             virtual void reset
             (
                 const Xfer<pointField >& points,
-                const Xfer<List<Face> >& faces,
+                const Xfer<List<Face>>& faces,
                 const Xfer<surfZoneList>& zones
             );
 
@@ -362,8 +362,8 @@ public:
             //  Note, optimized to avoid overwriting data (with Xfer::null)
             virtual void reset
             (
-                const Xfer<List<point> >& points,
-                const Xfer<List<Face> >& faces,
+                const Xfer<List<point>>& points,
+                const Xfer<List<Face>>& faces,
                 const Xfer<surfZoneList >& zones
             );
 
@@ -412,7 +412,7 @@ public:
             void transfer(UnsortedMeshedSurface<Face>&);
 
             //- Transfer contents to the Xfer container
-            Xfer<MeshedSurface<Face> > xfer();
+            Xfer<MeshedSurface<Face>> xfer();
 
 
         // Read
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
index cea56fc072..f99d18179a 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,8 +64,8 @@ void Foam::MeshedSurface<Face>::checkZones()
 template<class Face>
 void Foam::MeshedSurface<Face>::sortFacesAndStore
 (
-    const Xfer<List<Face> >& unsortedFaces,
-    const Xfer<List<label> >& zoneIds,
+    const Xfer<List<Face>>& unsortedFaces,
+    const Xfer<List<label>>& zoneIds,
     const bool sorted
 )
 {
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
index ddf71ab6e1..9d063409df 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ void Foam::MeshedSurfaceIOAllocator::clear()
 
 void Foam::MeshedSurfaceIOAllocator::resetFaces
 (
-    const Xfer<List<face> >& faces,
+    const Xfer<List<face>>& faces,
     const Xfer<surfZoneList>& zones
 )
 {
@@ -120,7 +120,7 @@ void Foam::MeshedSurfaceIOAllocator::reset
 
 void Foam::MeshedSurfaceIOAllocator::reset
 (
-    const Xfer<List<point> >& points,
+    const Xfer<List<point>>& points,
     const Xfer<faceList>& faces,
     const Xfer<surfZoneList>& zones
 )
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
index bd4d8ad6b5..0e9d481cb4 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -173,7 +173,7 @@ public:
             //  Note, optimized to avoid overwriting data (with Xfer::null)
             void reset
             (
-                const Xfer<List<point> >& points,
+                const Xfer<List<point>>& points,
                 const Xfer<faceList>& faces,
                 const Xfer<surfZoneList>& zones
             );
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 16d2ad18eb..1315c05536 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,8 +156,8 @@ template<class Face>
 Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 (
     const Xfer<pointField>& pointLst,
-    const Xfer<List<Face> >& faceLst,
-    const Xfer<List<label> >& zoneIds,
+    const Xfer<List<Face>>& faceLst,
+    const Xfer<List<label>>& zoneIds,
     const Xfer<surfZoneIdentifierList>& zoneTofc
 )
 :
@@ -171,7 +171,7 @@ template<class Face>
 Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 (
     const Xfer<pointField>& pointLst,
-    const Xfer<List<Face> >& faceLst,
+    const Xfer<List<Face>>& faceLst,
     const labelUList& zoneSizes,
     const UList<word>& zoneNames
 )
@@ -231,7 +231,7 @@ Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 template<class Face>
 Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 (
-    const Xfer<UnsortedMeshedSurface<Face> >& surf
+    const Xfer<UnsortedMeshedSurface<Face>>& surf
 )
 :
     ParentType()
@@ -243,7 +243,7 @@ Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 template<class Face>
 Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 (
-    const Xfer<MeshedSurface<Face> >& surf
+    const Xfer<MeshedSurface<Face>>& surf
 )
 :
     ParentType()
@@ -598,8 +598,8 @@ template<class Face>
 void Foam::UnsortedMeshedSurface<Face>::reset
 (
     const Xfer<pointField>& pointLst,
-    const Xfer<List<Face> >& faceLst,
-    const Xfer<List<label> >& zoneIds
+    const Xfer<List<Face>>& faceLst,
+    const Xfer<List<label>>& zoneIds
 )
 {
     ParentType::reset
@@ -619,9 +619,9 @@ void Foam::UnsortedMeshedSurface<Face>::reset
 template<class Face>
 void Foam::UnsortedMeshedSurface<Face>::reset
 (
-    const Xfer<List<point> >& pointLst,
-    const Xfer<List<Face> >& faceLst,
-    const Xfer<List<label> >& zoneIds
+    const Xfer<List<point>>& pointLst,
+    const Xfer<List<Face>>& faceLst,
+    const Xfer<List<label>>& zoneIds
 )
 {
     ParentType::reset
@@ -677,7 +677,7 @@ void Foam::UnsortedMeshedSurface<Face>::transfer
 
 
 template<class Face>
-Foam::Xfer<Foam::UnsortedMeshedSurface<Face> >
+Foam::Xfer<Foam::UnsortedMeshedSurface<Face>>
 Foam::UnsortedMeshedSurface<Face>::xfer()
 {
     return xferMove(*this);
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index 1a8cc16d2e..23254afa66 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,8 +166,8 @@ public:
         UnsortedMeshedSurface
         (
             const Xfer<pointField>&,
-            const Xfer<List<Face> >&,
-            const Xfer<List<label> >& zoneIds,
+            const Xfer<List<Face>>&,
+            const Xfer<List<label>>& zoneIds,
             const Xfer<surfZoneIdentifierList>&
         );
 
@@ -176,7 +176,7 @@ public:
         UnsortedMeshedSurface
         (
             const Xfer<pointField>&,
-            const Xfer<List<Face> >&,
+            const Xfer<List<Face>>&,
             const labelUList& zoneSizes = labelUList(),
             const UList<word>& zoneNames = UList<word>()
         );
@@ -188,10 +188,10 @@ public:
         UnsortedMeshedSurface(const MeshedSurface<Face>&);
 
         //- Construct by transferring the contents from a UnsortedMeshedSurface
-        UnsortedMeshedSurface(const Xfer<UnsortedMeshedSurface<Face> >&);
+        UnsortedMeshedSurface(const Xfer<UnsortedMeshedSurface<Face>>&);
 
         //- Construct by transferring the contents from a meshedSurface
-        UnsortedMeshedSurface(const Xfer<MeshedSurface<Face> >&);
+        UnsortedMeshedSurface(const Xfer<MeshedSurface<Face>>&);
 
         //- Construct from file name (uses extension to determine type)
         UnsortedMeshedSurface(const fileName&);
@@ -323,16 +323,16 @@ public:
             virtual void reset
             (
                 const Xfer<pointField>&,
-                const Xfer<List<Face> >&,
-                const Xfer<List<label> >& zoneIds
+                const Xfer<List<Face>>&,
+                const Xfer<List<label>>& zoneIds
             );
 
             //- Transfer components (points, faces, zone ids).
             virtual void reset
             (
-                const Xfer<List<point> >&,
-                const Xfer<List<Face> >&,
-                const Xfer<List<label> >& zoneIds
+                const Xfer<List<point>>&,
+                const Xfer<List<Face>>&,
+                const Xfer<List<label>>& zoneIds
             );
 
             //- Transfer the contents of the argument and annul the argument
@@ -342,7 +342,7 @@ public:
             void transfer(MeshedSurface<Face>&);
 
             //- Transfer contents to the Xfer container
-            Xfer<UnsortedMeshedSurface<Face> > xfer();
+            Xfer<UnsortedMeshedSurface<Face>> xfer();
 
 
         // Read
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
index c1974960f7..750edb8996 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
@@ -48,7 +48,7 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
         if (supported.found(ext))
         {
             // create indirectly
-            autoPtr<UnsortedMeshedSurface<Face> > surf
+            autoPtr<UnsortedMeshedSurface<Face>> surf
             (
                 new UnsortedMeshedSurface<Face>
             );
@@ -67,7 +67,7 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
             << exit(FatalError);
     }
 
-    return autoPtr<UnsortedMeshedSurface<Face> >(cstrIter()(name));
+    return autoPtr<UnsortedMeshedSurface<Face>>(cstrIter()(name));
 }
 
 
diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C
index 6d234e8e8f..af64864ecb 100644
--- a/src/surfMesh/surfMesh/surfMesh.C
+++ b/src/surfMesh/surfMesh/surfMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -157,7 +157,7 @@ Foam::surfMesh::surfMesh
 Foam::surfMesh::surfMesh
 (
     const IOobject& io,
-    const Xfer<MeshedSurface<face> >& surf,
+    const Xfer<MeshedSurface<face>>& surf,
     const word& surfName
 )
 :
@@ -288,9 +288,9 @@ void Foam::surfMesh::transfer
 }
 
 
-Foam::Xfer<Foam::MeshedSurface<Foam::face> > Foam::surfMesh::xfer()
+Foam::Xfer<Foam::MeshedSurface<Foam::face>> Foam::surfMesh::xfer()
 {
-    Xfer<MeshedSurface<face> > xf;
+    Xfer<MeshedSurface<face>> xf;
 
     xf().storedPoints().transfer(this->storedPoints());
     xf().storedFaces().transfer(this->storedFaces());
diff --git a/src/surfMesh/surfMesh/surfMesh.H b/src/surfMesh/surfMesh/surfMesh.H
index 1a9204afd7..5388626803 100644
--- a/src/surfMesh/surfMesh/surfMesh.H
+++ b/src/surfMesh/surfMesh/surfMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -171,7 +171,7 @@ public:
         surfMesh
         (
             const IOobject&,
-            const Xfer<MeshedSurface<face> >& surf,
+            const Xfer<MeshedSurface<face>>& surf,
             const word& surfName=""
         );
 
@@ -271,7 +271,7 @@ public:
         //  Storage management
 
             //- Transfer contents to the Xfer container as a MeshedSurface
-            Xfer<MeshedSurface<face> > xfer();
+            Xfer<MeshedSurface<face>> xfer();
 
             //- Clear geometry
             void clearGeom();
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
index d613b0ce2c..4b05228f03 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,9 +84,9 @@ public:
     // Selectors
 
         //- Read file and return surface
-        static autoPtr<MeshedSurface<Face> > New(const fileName& name)
+        static autoPtr<MeshedSurface<Face>> New(const fileName& name)
         {
-            return autoPtr<MeshedSurface<Face> >
+            return autoPtr<MeshedSurface<Face>>
             (
                 new AC3DsurfaceFormat<Face>(name)
             );
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
index a2829ecc0d..33b4f5b7b8 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,9 +105,9 @@ public:
     // Selectors
 
         //- Read file and return surface
-        static autoPtr<UnsortedMeshedSurface<Face> > New(const fileName& name)
+        static autoPtr<UnsortedMeshedSurface<Face>> New(const fileName& name)
         {
-            return autoPtr<UnsortedMeshedSurface<Face> >
+            return autoPtr<UnsortedMeshedSurface<Face>>
             (
                 new FTRsurfaceFormat<Face>(name)
             );
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
index 2f182822cb..db1c75cc20 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,9 +77,9 @@ public:
     // Selectors
 
         //- Read file and return surface
-        static autoPtr<UnsortedMeshedSurface<Face> > New(const fileName& name)
+        static autoPtr<UnsortedMeshedSurface<Face>> New(const fileName& name)
         {
-            return autoPtr<UnsortedMeshedSurface<Face> >
+            return autoPtr<UnsortedMeshedSurface<Face>>
             (
                 new GTSsurfaceFormat<Face>(name)
             );
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
index 45425dcfef..b1c57c8828 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,9 +85,9 @@ public:
     // Selectors
 
         //- Read file and return surface
-        static autoPtr<MeshedSurface<Face> > New(const fileName& name)
+        static autoPtr<MeshedSurface<Face>> New(const fileName& name)
         {
-            return autoPtr<MeshedSurface<Face> >
+            return autoPtr<MeshedSurface<Face>>
             (
                 new NASsurfaceFormat<Face>(name)
             );
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
index 8b53a0223c..4fb383662e 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,9 +77,9 @@ public:
     // Selectors
 
         //- Read file and return surface
-        static autoPtr<MeshedSurface<Face> > New(const fileName& name)
+        static autoPtr<MeshedSurface<Face>> New(const fileName& name)
         {
-            return autoPtr<MeshedSurface<Face> >
+            return autoPtr<MeshedSurface<Face>>
             (
                 new OBJsurfaceFormat<Face>(name)
             );
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
index 34b72915cd..1326e2a5cf 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,9 +85,9 @@ public:
     // Selectors
 
         //- Read file and return surface
-        static autoPtr<MeshedSurface<Face> > New(const fileName& name)
+        static autoPtr<MeshedSurface<Face>> New(const fileName& name)
         {
-            return autoPtr<MeshedSurface<Face> >
+            return autoPtr<MeshedSurface<Face>>
             (
                 new OFFsurfaceFormat(name)
             );
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
index d80e0b3bff..838268c25e 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,9 +82,9 @@ public:
     // Selectors
 
         //- Read file and return surface
-        static autoPtr<MeshedSurface<Face> > New(const fileName& name)
+        static autoPtr<MeshedSurface<Face>> New(const fileName& name)
         {
-            return autoPtr<MeshedSurface<Face> >
+            return autoPtr<MeshedSurface<Face>>
             (
                 new OFSsurfaceFormat<Face>(name)
             );
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
index 3c5a1974fb..404b9b9d5b 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,9 +100,9 @@ public:
     // Selectors
 
         //- Read file and return surface
-        static autoPtr<MeshedSurface<Face> > New(const fileName& name)
+        static autoPtr<MeshedSurface<Face>> New(const fileName& name)
         {
-            return autoPtr<MeshedSurface<Face> >
+            return autoPtr<MeshedSurface<Face>>
             (
                 new STARCDsurfaceFormat<Face>(name)
             );
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
index 900f5a20dc..87baed1a80 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,9 +98,9 @@ public:
     // Selectors
 
         //- Read file and return surface
-        static autoPtr<MeshedSurface<Face> > New(const fileName& name)
+        static autoPtr<MeshedSurface<Face>> New(const fileName& name)
         {
-            return autoPtr<MeshedSurface<Face> >
+            return autoPtr<MeshedSurface<Face>>
             (
                 new STLsurfaceFormat<Face>(name)
             );
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
index 7ab51e69bd..c2ffcb99df 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,9 +88,9 @@ public:
     // Selectors
 
         //- Read file and return surface
-        static autoPtr<MeshedSurface<Face> > New(const fileName& name)
+        static autoPtr<MeshedSurface<Face>> New(const fileName& name)
         {
-            return autoPtr<MeshedSurface<Face> >
+            return autoPtr<MeshedSurface<Face>>
             (
                 new TRIsurfaceFormat<Face>(name)
             );
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
index 01c47373a1..473201503e 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,9 +81,9 @@ public:
     // Selectors
 
         //- Read file and return surface
-        static autoPtr<MeshedSurface<Face> > New(const fileName& name)
+        static autoPtr<MeshedSurface<Face>> New(const fileName& name)
         {
-            return autoPtr<MeshedSurface<Face> >
+            return autoPtr<MeshedSurface<Face>>
             (
                 new VTKsurfaceFormat<Face>(name)
             );
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.H
index 833072ad07..d79893cc0b 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.H
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,9 +99,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<scalar> > clone() const
+        virtual tmp<fvPatchField<scalar>> clone() const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new energyJumpFvPatchScalarField(*this)
             );
@@ -115,12 +115,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<scalar> > clone
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new energyJumpFvPatchScalarField(*this, iF)
             );
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.H
index e000c6b200..517c29c130 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.H
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,9 +99,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<scalar> > clone() const
+        virtual tmp<fvPatchField<scalar>> clone() const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new energyJumpAMIFvPatchScalarField(*this)
             );
@@ -115,12 +115,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<scalar> > clone
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<scalar> >
+            return tmp<fvPatchField<scalar>>
             (
                 new energyJumpAMIFvPatchScalarField(*this, iF)
             );
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
index 9a2b4a56fa..f08b87393b 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,7 +147,7 @@ public:
                 ) = 0;
 
                 //- Return reaction rate of the speciei in reactioni
-                virtual tmp<DimensionedField<scalar, volMesh> > calculateRR
+                virtual tmp<DimensionedField<scalar, volMesh>> calculateRR
                 (
                     const label reactioni,
                     const label speciei
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index aea9440f77..92f1db6b87 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -629,7 +629,7 @@ Foam::label Foam::chemistryModel<CompType, ThermoType>::nEqns() const
 
 
 template<class CompType, class ThermoType>
-Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::chemistryModel<CompType, ThermoType>::calculateRR
 (
     const label reactionI,
@@ -653,7 +653,7 @@ Foam::chemistryModel<CompType, ThermoType>::calculateRR
         this->thermo().rho()
     );
 
-    tmp<DimensionedField<scalar, volMesh> > tRR
+    tmp<DimensionedField<scalar, volMesh>> tRR
     (
         new DimensionedField<scalar, volMesh>
         (
@@ -850,7 +850,7 @@ Foam::scalar Foam::chemistryModel<CompType, ThermoType>::solve
     // Don't allow the time-step to change more than a factor of 2
     return min
     (
-        this->solve<UniformField<scalar> >(UniformField<scalar>(deltaT)),
+        this->solve<UniformField<scalar>>(UniformField<scalar>(deltaT)),
         2*deltaT
     );
 }
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
index dfcea6c611..f2600319fe 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ protected:
         PtrList<volScalarField>& Y_;
 
         //- Reactions
-        const PtrList<Reaction<ThermoType> >& reactions_;
+        const PtrList<Reaction<ThermoType>>& reactions_;
 
         //- Thermodynamic data of the species
         const PtrList<ThermoType>& specieThermo_;
@@ -101,14 +101,14 @@ protected:
         scalar Treact_;
 
         //- List of reaction rate per specie [kg/m3/s]
-        PtrList<DimensionedField<scalar, volMesh> > RR_;
+        PtrList<DimensionedField<scalar, volMesh>> RR_;
 
 
     // Protected Member Functions
 
         //- Write access to chemical source terms
         //  (e.g. for multi-chemistry model)
-        inline PtrList<DimensionedField<scalar, volMesh> >& RR();
+        inline PtrList<DimensionedField<scalar, volMesh>>& RR();
 
 
 public:
@@ -130,7 +130,7 @@ public:
     // Member Functions
 
         //- The reactions
-        inline const PtrList<Reaction<ThermoType> >& reactions() const;
+        inline const PtrList<Reaction<ThermoType>>& reactions() const;
 
         //- Thermodynamic data of the species
         inline const PtrList<ThermoType>& specieThermo() const;
@@ -208,7 +208,7 @@ public:
             );
 
             //- Return reaction rate of the speciei in reactionI
-            virtual tmp<DimensionedField<scalar, volMesh> > calculateRR
+            virtual tmp<DimensionedField<scalar, volMesh>> calculateRR
             (
                 const label reactionI,
                 const label speciei
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModelI.H b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModelI.H
index 0779bcb30f..44d813c64d 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModelI.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CompType, class ThermoType>
-inline Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >&
+inline Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>&
 Foam::chemistryModel<CompType, ThermoType>::RR()
 {
     return RR_;
@@ -37,7 +37,7 @@ Foam::chemistryModel<CompType, ThermoType>::RR()
 
 
 template<class CompType, class ThermoType>
-inline const Foam::PtrList<Foam::Reaction<ThermoType> >&
+inline const Foam::PtrList<Foam::Reaction<ThermoType>>&
 Foam::chemistryModel<CompType, ThermoType>::reactions() const
 {
     return reactions_;
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
index 272b78b4b3..0bb9d518db 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ License
 
 #define makeChemistrySolverType(SS, Comp, Thermo)                             \
                                                                               \
-    typedef SS<chemistryModel<Comp, Thermo> > SS##Comp##Thermo;               \
+    typedef SS<chemistryModel<Comp, Thermo>> SS##Comp##Thermo;               \
                                                                               \
     defineTemplateTypeNameAndDebugWithName                                    \
     (                                                                         \
diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
index d3f2fc1aa9..e57be1b68f 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,7 +99,7 @@ void Foam::laminarFlameSpeedModels::RaviPetersen::checkPointsMonotonicity
 void Foam::laminarFlameSpeedModels::RaviPetersen::checkCoefficientArrayShape
 (
     const word& name,
-    const List<List<List<scalar> > >& x
+    const List<List<List<scalar>>>& x
 ) const
 {
     bool ok = true;
diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.H b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.H
index 92f1b93871..7cf2969449 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.H
+++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,10 +74,10 @@ class RaviPetersen
         List<scalar> EqRPoints_;
 
         //- Correlation alpha coefficients
-        List<List<List<scalar> > > alpha_;
+        List<List<List<scalar>>> alpha_;
 
         //- Correlation beta coefficients
-        List<List<List<scalar> > > beta_;
+        List<List<List<scalar>>> beta_;
 
         //- Reference temperature
         scalar TRef_;
@@ -96,7 +96,7 @@ class RaviPetersen
         void checkCoefficientArrayShape
         (
             const word& name,
-            const List<List<List<scalar> > >& x
+            const List<List<List<scalar>>>& x
         ) const;
 
         //- Find and interpolate a value in the data point arrays
diff --git a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
index 68c7422580..be11a729ee 100644
--- a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
+++ b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -276,7 +276,7 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::P1::Rp() const
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::radiation::P1::Ru() const
 {
     const DimensionedField<scalar, volMesh>& G =
diff --git a/src/thermophysicalModels/radiation/radiationModels/P1/P1.H b/src/thermophysicalModels/radiation/radiationModels/P1/P1.H
index 9a060f7017..f25467d5a9 100644
--- a/src/thermophysicalModels/radiation/radiationModels/P1/P1.H
+++ b/src/thermophysicalModels/radiation/radiationModels/P1/P1.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ public:
             virtual tmp<volScalarField> Rp() const;
 
             //- Source term component (constant)
-            virtual tmp<DimensionedField<scalar, volMesh> > Ru() const;
+            virtual tmp<DimensionedField<scalar, volMesh>> Ru() const;
 };
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
index fc5f9389b8..4b07238462 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ using namespace Foam::constant;
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::List<Foam::Tuple2<Foam::scalar, Foam::scalar> >
+const Foam::List<Foam::Tuple2<Foam::scalar, Foam::scalar>>
 Foam::radiation::blackBodyEmission::emissivePowerTable
 (
     IStringStream
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.H
index a619139b8d..d7f175fc5c 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.H
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ class blackBodyEmission
 public:
 
     //- Static table of black body emissive power
-    static const List<Tuple2<scalar, scalar> > emissivePowerTable;
+    static const List<Tuple2<scalar, scalar>> emissivePowerTable;
 
 
 private:
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
index 61878d35e8..20eca869b7 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -489,7 +489,7 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::fvDOM::Rp() const
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::radiation::fvDOM::Ru() const
 {
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
index dd8bb8c1db..546fa51195 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ class fvDOM
         scalar maxIter_;
 
         //- List of cached fvMatrices for rays
-        List<PtrList<fvScalarMatrix> >fvRayDiv_;
+        List<PtrList<fvScalarMatrix>>fvRayDiv_;
 
         //- Cache convection div matrix
         bool cacheDiv_;
@@ -200,7 +200,7 @@ public:
             virtual tmp<volScalarField> Rp() const;
 
             //- Source term component (constant)
-            virtual tmp<DimensionedField<scalar, volMesh> > Ru() const;
+            virtual tmp<DimensionedField<scalar, volMesh>> Ru() const;
 
 
         // Access
diff --git a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C
index c48ca46fc4..e89127328a 100644
--- a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C
+++ b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,10 +106,10 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::noRadiation::Rp() const
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::radiation::noRadiation::Ru() const
 {
-    return tmp<DimensionedField<scalar, volMesh> >
+    return tmp<DimensionedField<scalar, volMesh>>
     (
         new DimensionedField<scalar, volMesh>
         (
diff --git a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H
index 75ab459d6b..dde1edfe3f 100644
--- a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H
+++ b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ public:
             tmp<volScalarField> Rp() const;
 
             //- Source term component (constant)
-            tmp<DimensionedField<scalar, volMesh> > Ru() const;
+            tmp<DimensionedField<scalar, volMesh>> Ru() const;
 };
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C
index 212c67b759..dd5b0268db 100644
--- a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C
+++ b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,10 +107,10 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::opaqueSolid::Rp() const
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::radiation::opaqueSolid::Ru() const
 {
-    return tmp<DimensionedField<scalar, volMesh> >
+    return tmp<DimensionedField<scalar, volMesh>>
     (
         new DimensionedField<scalar, volMesh>
         (
diff --git a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H
index f2f0ea8934..7fdc3b0bb5 100644
--- a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H
+++ b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ public:
             tmp<volScalarField> Rp() const;
 
             //- Source term component (constant)
-            tmp<DimensionedField<scalar, volMesh> > Ru() const;
+            tmp<DimensionedField<scalar, volMesh>> Ru() const;
 };
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
index 08b797eb2a..5fcacdbd09 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -222,7 +222,7 @@ public:
             virtual tmp<volScalarField> Rp() const = 0;
 
             //- Source term component (constant)
-            virtual tmp<DimensionedField<scalar, volMesh> > Ru() const = 0;
+            virtual tmp<DimensionedField<scalar, volMesh>> Ru() const = 0;
 
             //- Energy source term
             virtual tmp<fvScalarMatrix> Sh(fluidThermo& thermo) const;
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index 286218ee24..56dd573370 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -706,10 +706,10 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::viewFactor::Rp() const
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::radiation::viewFactor::Ru() const
 {
-    return tmp<DimensionedField<scalar, volMesh> >
+    return tmp<DimensionedField<scalar, volMesh>>
     (
         new DimensionedField<scalar, volMesh>
         (
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H
index dc6c612516..012f94036e 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,7 +162,7 @@ public:
             virtual tmp<volScalarField> Rp() const;
 
             //- Source term component (constant)
-            virtual tmp<DimensionedField<scalar, volMesh> > Ru() const;
+            virtual tmp<DimensionedField<scalar, volMesh>> Ru() const;
 
 
     // Access
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
index b5f74bfd70..72864d5de7 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ private:
         FixedList<label, nSpecies_> specieIndex_;
 
         //- Look-up table of species related to ft
-        mutable autoPtr<interpolationLookUpTable<scalar> > lookUpTablePtr_;
+        mutable autoPtr<interpolationLookUpTable<scalar>> lookUpTablePtr_;
 
         //- SLG thermo package
         const fluidThermo& thermo_;
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H
index 09a6df1c99..8265e3b270 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ private:
         const basicSpecieMixture& mixture_;
 
         //- List of solid species data
-        List<FixedList<scalar, 2> > solidData_;
+        List<FixedList<scalar, 2>> solidData_;
 
 
     // Private member functions
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
index 444fd6c649..6e60dece1b 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::checkThermo
     const fluidThermo& thermo
 )
 {
-    if (isA<singleStepReactingMixture<ThermoType> >(thermo))
+    if (isA<singleStepReactingMixture<ThermoType>>(thermo))
     {
         return dynamic_cast<const singleStepReactingMixture<ThermoType>& >
         (
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
index 54ac871cf8..22c5f63f0b 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class ThermoType>
-Foam::autoPtr<Foam::chemistryReader<ThermoType> >
+Foam::autoPtr<Foam::chemistryReader<ThermoType>>
 Foam::chemistryReader<ThermoType>::New
 (
     const dictionary& thermoDict,
@@ -57,7 +57,7 @@ Foam::chemistryReader<ThermoType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<chemistryReader<ThermoType> >
+    return autoPtr<chemistryReader<ThermoType>>
     (
         cstrIter()(thermoDict, species)
     );
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
index 13313b9772..0852fb578c 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,7 +141,7 @@ public:
 
 #define makeChemistryReaderType(Reader, Thermo)                               \
     defineNamedTemplateTypeNameAndDebug(Reader<Thermo>, 0);                   \
-    chemistryReader<Thermo>::adddictionaryConstructorToTable<Reader<Thermo> > \
+    chemistryReader<Thermo>::adddictionaryConstructorToTable<Reader<Thermo>> \
         add##Reader##Thermo##ConstructorToTable_
 
 
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index 1c8af0b123..e44b04ab87 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -547,7 +547,7 @@ bool finishReaction = false;
 
         currentSpecieComposition.setSize(nSpecieElements);
 
-        HashTable<List<specieElement> >::iterator specieCompositionIter
+        HashTable<List<specieElement>>::iterator specieCompositionIter
         (
             specieComposition_.find(currentSpecieName)
         );
@@ -631,7 +631,7 @@ bool finishReaction = false;
             currentSpecieName,
             new gasHThermoPhysics
             (
-                janafThermo<perfectGas<specie> >
+                janafThermo<perfectGas<specie>>
                 (
                     specie
                     (
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
index 74ee5512da..916c8c06f8 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -203,7 +203,7 @@ private:
         HashPtrTable<gasHThermoPhysics> speciesThermo_;
 
         //- Table of species composition
-        HashTable<List<specieElement> > specieComposition_;
+        HashTable<List<specieElement>> specieComposition_;
 
         //- List of the reactions
         ReactionList<gasHThermoPhysics> reactions_;
@@ -382,7 +382,7 @@ public:
         }
 
         //- Table of species composition
-        const HashTable<List<specieElement> >& specieComposition() const
+        const HashTable<List<specieElement>>& specieComposition() const
         {
             return specieComposition_;
         }
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.C
index 595487e2e1..1f726fcdd6 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Foam::reactingMixture<ThermoType>::reactingMixture
 )
 :
     speciesTable(),
-    autoPtr<chemistryReader<ThermoType> >
+    autoPtr<chemistryReader<ThermoType>>
     (
         chemistryReader<ThermoType>::New(thermoDict, *this)
     ),
@@ -45,16 +45,16 @@ Foam::reactingMixture<ThermoType>::reactingMixture
     (
         thermoDict,
         *this,
-        autoPtr<chemistryReader<ThermoType> >::operator()().speciesThermo(),
+        autoPtr<chemistryReader<ThermoType>>::operator()().speciesThermo(),
         mesh,
         phaseName
     ),
-    PtrList<Reaction<ThermoType> >
+    PtrList<Reaction<ThermoType>>
     (
-        autoPtr<chemistryReader<ThermoType> >::operator()().reactions()
+        autoPtr<chemistryReader<ThermoType>>::operator()().reactions()
     )
 {
-    autoPtr<chemistryReader<ThermoType> >::clear();
+    autoPtr<chemistryReader<ThermoType>>::clear();
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
index 944828b627..51d6c7adc4 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,9 +52,9 @@ template<class ThermoType>
 class reactingMixture
 :
     public speciesTable,
-    public autoPtr<chemistryReader<ThermoType> >,
+    public autoPtr<chemistryReader<ThermoType>>,
     public multiComponentMixture<ThermoType>,
-    public PtrList<Reaction<ThermoType> >
+    public PtrList<Reaction<ThermoType>>
 {
     // Private Member Functions
 
@@ -89,17 +89,17 @@ public:
 
         label size() const
         {
-            return PtrList<Reaction<ThermoType> >::size();
+            return PtrList<Reaction<ThermoType>>::size();
         }
 
         Reaction<ThermoType>& operator [] (const label i)
         {
-            return PtrList<Reaction<ThermoType> >::operator[](i);
+            return PtrList<Reaction<ThermoType>>::operator[](i);
         }
 
         const Reaction<ThermoType>& operator [] (const label i) const
         {
-            return PtrList<Reaction<ThermoType> >::operator[](i);
+            return PtrList<Reaction<ThermoType>>::operator[](i);
         }
 };
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
index f090b17b5e..3dea24f248 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -237,7 +237,7 @@ Foam::singleStepReactingMixture<ThermoType>::singleStepReactingMixture
 
         calculateMaxProducts();
 
-        autoPtr<chemistryReader<ThermoType> >::clear();
+        autoPtr<chemistryReader<ThermoType>>::clear();
     }
     else
     {
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
index fb397d9b9d..8d6899d495 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ Foam::basicSolidChemistryModel::RR(const label i)
 }
 
 
-Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::basicSolidChemistryModel::calculateRR
 (
     const label reactionI,
@@ -86,7 +86,7 @@ Foam::basicSolidChemistryModel::calculateRR
 {
     NotImplemented;
 
-    return dynamic_cast<tmp<DimensionedField<scalar, volMesh> >&>
+    return dynamic_cast<tmp<DimensionedField<scalar, volMesh>>&>
     (
         const_cast<DimensionedField<scalar, volMesh>& >
         (
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H
index 7ee840c441..0cb1ee1444 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,10 +120,10 @@ public:
         inline const solidReactionThermo& solidThermo() const;
 
         //- Return total gases mass source term [kg/m3/s]
-        virtual tmp<DimensionedField<scalar, volMesh> > RRg() const = 0;
+        virtual tmp<DimensionedField<scalar, volMesh>> RRg() const = 0;
 
         //- Return total solids mass source term [kg/m3/s]
-        virtual tmp<DimensionedField<scalar, volMesh> > RRs() const = 0;
+        virtual tmp<DimensionedField<scalar, volMesh>> RRs() const = 0;
 
         //- Return chemical source terms for solids [kg/m3/s]
         virtual const DimensionedField<scalar, volMesh>& RRs
@@ -138,7 +138,7 @@ public:
         ) const = 0;
 
         //- Returns the reaction rate of the speciei in reactionI
-        virtual tmp<DimensionedField<scalar, volMesh> > calculateRR
+        virtual tmp<DimensionedField<scalar, volMesh>> calculateRR
         (
             const label reactionI,
             const label speciei
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
index 26dd830152..dcbf784912 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,13 +79,13 @@ protected:
         label nSpecie_;
 
         //- List of reaction rate per gas [kg/m3/s]
-        PtrList<DimensionedField<scalar, volMesh> > RRg_;
+        PtrList<DimensionedField<scalar, volMesh>> RRg_;
 
 
     // Protected Member Functions
 
         //- Write access to source terms for gases
-        inline PtrList<DimensionedField<scalar, volMesh> >& RRg();
+        inline PtrList<DimensionedField<scalar, volMesh>>& RRg();
 
 
 private:
@@ -186,7 +186,7 @@ public:
             ) const;
 
             //- Return total gas source term
-            inline tmp<DimensionedField<scalar, volMesh> > RRg() const;
+            inline tmp<DimensionedField<scalar, volMesh>> RRg() const;
 
             //- Return sensible enthalpy for gas i [J/Kg]
             virtual tmp<volScalarField> gasHs
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H
index b2d8b16e86..d045a3f894 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CompType, class SolidThermo, class GasThermo>
-inline Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >&
+inline Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>&
 Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::RRg()
 {
     return RRg_;
@@ -75,11 +75,11 @@ Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::RRg
 
 
 template<class CompType, class SolidThermo, class GasThermo>
-inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::
 RRg() const
 {
-    tmp<DimensionedField<scalar, volMesh> > tRRg
+    tmp<DimensionedField<scalar, volMesh>> tRRg
     (
         new DimensionedField<scalar, volMesh>
         (
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
index 17bde2bfbb..db38d9195c 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ protected:
         PtrList<volScalarField>& Ys_;
 
         //- Reactions
-        const PtrList<Reaction<SolidThermo> >& reactions_;
+        const PtrList<Reaction<SolidThermo>>& reactions_;
 
         //- Thermodynamic data of solids
         const PtrList<SolidThermo>& solidThermo_;
@@ -90,7 +90,7 @@ protected:
         label nReaction_;
 
         //- List of reaction rate per solid [kg/m3/s]
-        PtrList<DimensionedField<scalar, volMesh> > RRs_;
+        PtrList<DimensionedField<scalar, volMesh>> RRs_;
 
         //- List of active reacting cells
         List<bool> reactingCells_;
@@ -99,7 +99,7 @@ protected:
     // Protected Member Functions
 
         //- Write access to source terms for solids
-        inline PtrList<DimensionedField<scalar, volMesh> >& RRs();
+        inline PtrList<DimensionedField<scalar, volMesh>>& RRs();
 
         //- Set reacting status of cell, cellI
         void setCellReacting(const label cellI, const bool active);
@@ -124,7 +124,7 @@ public:
     // Member Functions
 
         //- The reactions
-        inline const PtrList<Reaction<SolidThermo> >& reactions() const;
+        inline const PtrList<Reaction<SolidThermo>>& reactions() const;
 
         //- The number of reactions
         inline label nReaction() const;
@@ -185,7 +185,7 @@ public:
             ) const;
 
             //- Return total solid source term
-            inline tmp<DimensionedField<scalar, volMesh> > RRs() const;
+            inline tmp<DimensionedField<scalar, volMesh>> RRs() const;
 
             //- Solve the reaction system for the given time step
             //  and return the characteristic time
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
index f2d0dad79a..6223a85086 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,14 +28,14 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CompType, class SolidThermo>
-inline Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >&
+inline Foam::PtrList<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>&
 Foam::solidChemistryModel<CompType, SolidThermo>::RRs()
 {
     return RRs_;
 }
 
 template<class CompType, class SolidThermo>
-inline const Foam::PtrList<Foam::Reaction<SolidThermo> >&
+inline const Foam::PtrList<Foam::Reaction<SolidThermo>>&
 Foam::solidChemistryModel<CompType, SolidThermo>::reactions() const
 {
     return reactions_;
@@ -63,10 +63,10 @@ Foam::solidChemistryModel<CompType, SolidThermo>::RRs
 
 
 template<class CompType, class SolidThermo>
-inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::solidChemistryModel<CompType, SolidThermo>::RRs() const
 {
-    tmp<DimensionedField<scalar, volMesh> > tRRs
+    tmp<DimensionedField<scalar, volMesh>> tRRs
     (
         new DimensionedField<scalar, volMesh>
         (
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
index 865b41435d..f638a865ef 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ namespace Foam
 
 #define makeSolidChemistrySolverType(SS, Schem, Comp, SThermo, GThermo)       \
                                                                               \
-    typedef SS<Schem<Comp, SThermo, GThermo> >                                \
+    typedef SS<Schem<Comp, SThermo, GThermo>>                                \
         SS##Schem##Comp##SThermo##GThermo;                                    \
                                                                               \
     defineTemplateTypeNameAndDebugWithName                                    \
diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
index cc9eb6a7b7..99838ba87c 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,21 +139,21 @@ public:
 
 
         //- Construct and return a clone
-        virtual autoPtr<Reaction<ReactionThermo> > clone() const
+        virtual autoPtr<Reaction<ReactionThermo>> clone() const
         {
-            return autoPtr<Reaction<ReactionThermo> >
+            return autoPtr<Reaction<ReactionThermo>>
             (
                 new solidReaction<ReactionThermo>(*this)
             );
         }
 
         //- Construct and return a clone with new speciesTable
-        virtual autoPtr<Reaction<ReactionThermo> > clone
+        virtual autoPtr<Reaction<ReactionThermo>> clone
         (
             const speciesTable& species
         ) const
         {
-            return autoPtr<Reaction<ReactionThermo> >
+            return autoPtr<Reaction<ReactionThermo>>
             (
                 new solidReaction<ReactionThermo>(*this, species)
             );
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
index 5c66f0406c..4ec0ae1f7e 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,13 +50,13 @@ inline Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
 
 
 template<class Thermo>
-inline Foam::autoPtr<Foam::constAnIsoSolidTransport<Thermo> >
+inline Foam::autoPtr<Foam::constAnIsoSolidTransport<Thermo>>
 Foam::constAnIsoSolidTransport<Thermo>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<constAnIsoSolidTransport<Thermo> >
+    return autoPtr<constAnIsoSolidTransport<Thermo>>
     (
         new constAnIsoSolidTransport<Thermo>(dict)
     );
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
index b7a2181491..de1d1cb277 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,13 +50,13 @@ inline Foam::constIsoSolidTransport<thermo>::constIsoSolidTransport
 
 
 template<class Thermo>
-inline Foam::autoPtr<Foam::constIsoSolidTransport<Thermo> >
+inline Foam::autoPtr<Foam::constIsoSolidTransport<Thermo>>
 Foam::constIsoSolidTransport<Thermo>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<constIsoSolidTransport<Thermo> >
+    return autoPtr<constIsoSolidTransport<Thermo>>
     (
         new constIsoSolidTransport<Thermo>(dict)
     );
diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
index 4b2c6ff5b4..8d11b207eb 100644
--- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,13 +56,13 @@ inline Foam::exponentialSolidTransport<Thermo>::exponentialSolidTransport
 
 
 template<class Thermo>
-inline Foam::autoPtr<Foam::exponentialSolidTransport<Thermo> >
+inline Foam::autoPtr<Foam::exponentialSolidTransport<Thermo>>
 Foam::exponentialSolidTransport<Thermo>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<exponentialSolidTransport<Thermo> >
+    return autoPtr<exponentialSolidTransport<Thermo>>
     (
         new exponentialSolidTransport<Thermo>(dict)
     );
diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
index 76f55d57a2..ad3a0fb2bf 100644
--- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,10 +66,10 @@ polynomialSolidTransport
 
 
 template<class Thermo, int PolySize>
-inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize> >
+inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize>>
 Foam::polynomialSolidTransport<Thermo, PolySize>::clone() const
 {
-    return autoPtr<polynomialSolidTransport<Thermo, PolySize> >
+    return autoPtr<polynomialSolidTransport<Thermo, PolySize>>
     (
         new polynomialSolidTransport<Thermo, PolySize>(*this)
     );
@@ -77,10 +77,10 @@ Foam::polynomialSolidTransport<Thermo, PolySize>::clone() const
 
 
 template<class Thermo, int PolySize>
-inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize> >
+inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize>>
 Foam::polynomialSolidTransport<Thermo, PolySize>::New(Istream& is)
 {
-    return autoPtr<polynomialSolidTransport<Thermo, PolySize> >
+    return autoPtr<polynomialSolidTransport<Thermo, PolySize>>
     (
         new polynomialSolidTransport<Thermo, PolySize>(is)
     );
@@ -88,10 +88,10 @@ Foam::polynomialSolidTransport<Thermo, PolySize>::New(Istream& is)
 
 
 template<class Thermo, int PolySize>
-inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize> >
+inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize>>
 Foam::polynomialSolidTransport<Thermo, PolySize>::New(const dictionary& dict)
 {
-    return autoPtr<polynomialSolidTransport<Thermo, PolySize> >
+    return autoPtr<polynomialSolidTransport<Thermo, PolySize>>
     (
         new polynomialSolidTransport<Thermo, PolySize>(dict)
     );
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
index 4183d00e12..573d2225c6 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,10 +69,10 @@ inline Foam::Boussinesq<Specie>::Boussinesq
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::Boussinesq<Specie> >
+inline Foam::autoPtr<Foam::Boussinesq<Specie>>
 Foam::Boussinesq<Specie>::clone() const
 {
-    return autoPtr<Boussinesq<Specie> >
+    return autoPtr<Boussinesq<Specie>>
     (
         new Boussinesq<Specie>(*this)
     );
@@ -80,13 +80,13 @@ Foam::Boussinesq<Specie>::clone() const
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::Boussinesq<Specie> >
+inline Foam::autoPtr<Foam::Boussinesq<Specie>>
 Foam::Boussinesq<Specie>::New
 (
     Istream& is
 )
 {
-    return autoPtr<Boussinesq<Specie> >
+    return autoPtr<Boussinesq<Specie>>
     (
         new Boussinesq<Specie>(is)
     );
@@ -94,13 +94,13 @@ Foam::Boussinesq<Specie>::New
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::Boussinesq<Specie> >
+inline Foam::autoPtr<Foam::Boussinesq<Specie>>
 Foam::Boussinesq<Specie>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<Boussinesq<Specie> >
+    return autoPtr<Boussinesq<Specie>>
     (
         new Boussinesq<Specie>(dict)
     );
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
index 6e5f131ab0..c69829d9a6 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
@@ -67,10 +67,10 @@ inline Foam::PengRobinsonGas<Specie>::PengRobinsonGas
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::PengRobinsonGas <Specie> >
+inline Foam::autoPtr<Foam::PengRobinsonGas <Specie>>
 Foam::PengRobinsonGas<Specie>::clone() const
 {
-    return autoPtr<PengRobinsonGas<Specie> >
+    return autoPtr<PengRobinsonGas<Specie>>
     (
         new PengRobinsonGas<Specie>(*this)
     );
@@ -78,24 +78,24 @@ Foam::PengRobinsonGas<Specie>::clone() const
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::PengRobinsonGas<Specie> >
+inline Foam::autoPtr<Foam::PengRobinsonGas<Specie>>
 Foam::PengRobinsonGas<Specie>::New
 (
     Istream& is
 )
 {
-    return autoPtr<PengRobinsonGas<Specie> >(new PengRobinsonGas<Specie>(is));
+    return autoPtr<PengRobinsonGas<Specie>>(new PengRobinsonGas<Specie>(is));
 }
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::PengRobinsonGas<Specie> >
+inline Foam::autoPtr<Foam::PengRobinsonGas<Specie>>
 Foam::PengRobinsonGas<Specie>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<PengRobinsonGas<Specie> >
+    return autoPtr<PengRobinsonGas<Specie>>
     (
         new PengRobinsonGas<Specie>(dict)
     );
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
index e92266ed16..a2f02cdd95 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,10 +63,10 @@ inline Foam::adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::adiabaticPerfectFluid<Specie> >
+inline Foam::autoPtr<Foam::adiabaticPerfectFluid<Specie>>
 Foam::adiabaticPerfectFluid<Specie>::clone() const
 {
-    return autoPtr<adiabaticPerfectFluid<Specie> >
+    return autoPtr<adiabaticPerfectFluid<Specie>>
     (
         new adiabaticPerfectFluid<Specie>(*this)
     );
@@ -74,10 +74,10 @@ Foam::adiabaticPerfectFluid<Specie>::clone() const
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::adiabaticPerfectFluid<Specie> >
+inline Foam::autoPtr<Foam::adiabaticPerfectFluid<Specie>>
 Foam::adiabaticPerfectFluid<Specie>::New(Istream& is)
 {
-    return autoPtr<adiabaticPerfectFluid<Specie> >
+    return autoPtr<adiabaticPerfectFluid<Specie>>
     (
         new adiabaticPerfectFluid<Specie>(is)
     );
@@ -85,13 +85,13 @@ Foam::adiabaticPerfectFluid<Specie>::New(Istream& is)
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::adiabaticPerfectFluid<Specie> >
+inline Foam::autoPtr<Foam::adiabaticPerfectFluid<Specie>>
 Foam::adiabaticPerfectFluid<Specie>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<adiabaticPerfectFluid<Specie> >
+    return autoPtr<adiabaticPerfectFluid<Specie>>
     (
         new adiabaticPerfectFluid<Specie>(dict)
     );
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
index 2d30033b46..d419397d2a 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,10 +65,10 @@ inline Foam::icoPolynomial<Specie, PolySize>::icoPolynomial
 
 
 template<class Specie, int PolySize>
-inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize> >
+inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize>>
 Foam::icoPolynomial<Specie, PolySize>::clone() const
 {
-    return autoPtr<icoPolynomial<Specie, PolySize> >
+    return autoPtr<icoPolynomial<Specie, PolySize>>
     (
         new icoPolynomial<Specie, PolySize>(*this)
     );
@@ -76,10 +76,10 @@ Foam::icoPolynomial<Specie, PolySize>::clone() const
 
 
 template<class Specie, int PolySize>
-inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize> >
+inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize>>
 Foam::icoPolynomial<Specie, PolySize>::New(Istream& is)
 {
-    return autoPtr<icoPolynomial<Specie, PolySize> >
+    return autoPtr<icoPolynomial<Specie, PolySize>>
     (
         new icoPolynomial<Specie, PolySize>(is)
     );
@@ -87,10 +87,10 @@ Foam::icoPolynomial<Specie, PolySize>::New(Istream& is)
 
 
 template<class Specie, int PolySize>
-inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize> >
+inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize>>
 Foam::icoPolynomial<Specie, PolySize>::New(const dictionary& dict)
 {
-    return autoPtr<icoPolynomial<Specie, PolySize> >
+    return autoPtr<icoPolynomial<Specie, PolySize>>
     (
         new icoPolynomial<Specie, PolySize>(dict)
     );
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
index e08b1d9208..9ef59fd40b 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,10 +63,10 @@ inline Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::incompressiblePerfectGas<Specie> >
+inline Foam::autoPtr<Foam::incompressiblePerfectGas<Specie>>
 Foam::incompressiblePerfectGas<Specie>::clone() const
 {
-    return autoPtr<incompressiblePerfectGas<Specie> >
+    return autoPtr<incompressiblePerfectGas<Specie>>
     (
         new incompressiblePerfectGas<Specie>(*this)
     );
@@ -74,13 +74,13 @@ Foam::incompressiblePerfectGas<Specie>::clone() const
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::incompressiblePerfectGas<Specie> >
+inline Foam::autoPtr<Foam::incompressiblePerfectGas<Specie>>
 Foam::incompressiblePerfectGas<Specie>::New
 (
     Istream& is
 )
 {
-    return autoPtr<incompressiblePerfectGas<Specie> >
+    return autoPtr<incompressiblePerfectGas<Specie>>
     (
         new incompressiblePerfectGas<Specie>(is)
     );
@@ -88,13 +88,13 @@ Foam::incompressiblePerfectGas<Specie>::New
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::incompressiblePerfectGas<Specie> >
+inline Foam::autoPtr<Foam::incompressiblePerfectGas<Specie>>
 Foam::incompressiblePerfectGas<Specie>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<incompressiblePerfectGas<Specie> >
+    return autoPtr<incompressiblePerfectGas<Specie>>
     (
         new incompressiblePerfectGas<Specie>(dict)
     );
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
index 3972e0e25b..225957173e 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,29 +57,29 @@ inline Foam::linear<Specie>::linear
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::linear<Specie> >
+inline Foam::autoPtr<Foam::linear<Specie>>
 Foam::linear<Specie>::clone() const
 {
-    return autoPtr<linear<Specie> >(new linear<Specie>(*this));
+    return autoPtr<linear<Specie>>(new linear<Specie>(*this));
 }
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::linear<Specie> >
+inline Foam::autoPtr<Foam::linear<Specie>>
 Foam::linear<Specie>::New(Istream& is)
 {
-    return autoPtr<linear<Specie> >(new linear<Specie>(is));
+    return autoPtr<linear<Specie>>(new linear<Specie>(is));
 }
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::linear<Specie> >
+inline Foam::autoPtr<Foam::linear<Specie>>
 Foam::linear<Specie>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<linear<Specie> >(new linear<Specie>(dict));
+    return autoPtr<linear<Specie>>(new linear<Specie>(dict));
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
index d30416c014..8d988eb7a6 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,29 +58,29 @@ inline Foam::perfectFluid<Specie>::perfectFluid
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::perfectFluid<Specie> >
+inline Foam::autoPtr<Foam::perfectFluid<Specie>>
 Foam::perfectFluid<Specie>::clone() const
 {
-    return autoPtr<perfectFluid<Specie> >(new perfectFluid<Specie>(*this));
+    return autoPtr<perfectFluid<Specie>>(new perfectFluid<Specie>(*this));
 }
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::perfectFluid<Specie> >
+inline Foam::autoPtr<Foam::perfectFluid<Specie>>
 Foam::perfectFluid<Specie>::New(Istream& is)
 {
-    return autoPtr<perfectFluid<Specie> >(new perfectFluid<Specie>(is));
+    return autoPtr<perfectFluid<Specie>>(new perfectFluid<Specie>(is));
 }
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::perfectFluid<Specie> >
+inline Foam::autoPtr<Foam::perfectFluid<Specie>>
 Foam::perfectFluid<Specie>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<perfectFluid<Specie> >(new perfectFluid<Specie>(dict));
+    return autoPtr<perfectFluid<Specie>>(new perfectFluid<Specie>(dict));
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
index fde836224e..bfe0301ce7 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,28 +48,28 @@ inline Foam::perfectGas<Specie>::perfectGas
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::perfectGas<Specie> >
+inline Foam::autoPtr<Foam::perfectGas<Specie>>
 Foam::perfectGas<Specie>::clone() const
 {
-    return autoPtr<perfectGas<Specie> >(new perfectGas<Specie>(*this));
+    return autoPtr<perfectGas<Specie>>(new perfectGas<Specie>(*this));
 }
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::perfectGas<Specie> >
+inline Foam::autoPtr<Foam::perfectGas<Specie>>
 Foam::perfectGas<Specie>::New(Istream& is)
 {
-    return autoPtr<perfectGas<Specie> >(new perfectGas<Specie>(is));
+    return autoPtr<perfectGas<Specie>>(new perfectGas<Specie>(is));
 }
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::perfectGas<Specie> > Foam::perfectGas<Specie>::New
+inline Foam::autoPtr<Foam::perfectGas<Specie>> Foam::perfectGas<Specie>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<perfectGas<Specie> >(new perfectGas<Specie>(dict));
+    return autoPtr<perfectGas<Specie>>(new perfectGas<Specie>(dict));
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
index 7f415e9b3c..600b668794 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,18 +54,18 @@ inline Foam::rhoConst<Specie>::rhoConst
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::rhoConst<Specie> >
+inline Foam::autoPtr<Foam::rhoConst<Specie>>
 Foam::rhoConst<Specie>::clone() const
 {
-    return autoPtr<rhoConst<Specie> >(new rhoConst<Specie>(*this));
+    return autoPtr<rhoConst<Specie>>(new rhoConst<Specie>(*this));
 }
 
 
 template<class Specie>
-inline Foam::autoPtr<Foam::rhoConst<Specie> >
+inline Foam::autoPtr<Foam::rhoConst<Specie>>
 Foam::rhoConst<Specie>::New(Istream& is)
 {
-    return autoPtr<rhoConst<Specie> >(new rhoConst<Specie>(is));
+    return autoPtr<rhoConst<Specie>>(new rhoConst<Specie>(is));
 }
 
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
index 9ab0ec7b73..a01f444740 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,9 +120,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<Reaction<ReactionThermo> > clone() const
+        virtual autoPtr<Reaction<ReactionThermo>> clone() const
         {
-            return autoPtr<Reaction<ReactionThermo> >
+            return autoPtr<Reaction<ReactionThermo>>
             (
                 new IrreversibleReaction
                 <
@@ -134,12 +134,12 @@ public:
         }
 
         //- Construct and return a clone with new speciesTable
-        virtual autoPtr<Reaction<ReactionThermo> > clone
+        virtual autoPtr<Reaction<ReactionThermo>> clone
         (
             const speciesTable& species
         ) const
         {
-            return autoPtr<Reaction<ReactionThermo> >
+            return autoPtr<Reaction<ReactionThermo>>
             (
                 new IrreversibleReaction
                 <
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
index 43a1a43be4..5188552e9f 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,9 +114,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<ReactionType<ReactionThermo> > clone() const
+        virtual autoPtr<ReactionType<ReactionThermo>> clone() const
         {
-            return autoPtr<ReactionType<ReactionThermo> >
+            return autoPtr<ReactionType<ReactionThermo>>
             (
                 new NonEquilibriumReversibleReaction
                     <ReactionType, ReactionThermo, ReactionRate>(*this)
@@ -124,12 +124,12 @@ public:
         }
 
         //- Construct and return a clone with new speciesTable
-        virtual autoPtr<ReactionType<ReactionThermo> > clone
+        virtual autoPtr<ReactionType<ReactionThermo>> clone
         (
             const speciesTable& species
         ) const
         {
-            return autoPtr<ReactionType<ReactionThermo> >
+            return autoPtr<ReactionType<ReactionThermo>>
             (
                 new NonEquilibriumReversibleReaction
                     <ReactionType, ReactionThermo, ReactionRate>
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index 2de276bf3c..8dff4ef938 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -355,7 +355,7 @@ Foam::Reaction<ReactionThermo>::Reaction
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<class ReactionThermo>
-Foam::autoPtr<Foam::Reaction<ReactionThermo> >
+Foam::autoPtr<Foam::Reaction<ReactionThermo>>
 Foam::Reaction<ReactionThermo>::New
 (
     const speciesTable& species,
@@ -391,7 +391,7 @@ Foam::Reaction<ReactionThermo>::New
             << exit(FatalIOError);
     }
 
-    return autoPtr<Reaction<ReactionThermo> >
+    return autoPtr<Reaction<ReactionThermo>>
     (
         cstrIter()(species, thermoDatabase, is)
     );
@@ -399,7 +399,7 @@ Foam::Reaction<ReactionThermo>::New
 
 
 template<class ReactionThermo>
-Foam::autoPtr<Foam::Reaction<ReactionThermo> >
+Foam::autoPtr<Foam::Reaction<ReactionThermo>>
 Foam::Reaction<ReactionThermo>::New
 (
     const speciesTable& species,
@@ -422,7 +422,7 @@ Foam::Reaction<ReactionThermo>::New
             << exit(FatalError);
     }
 
-    return autoPtr<Reaction<ReactionThermo> >
+    return autoPtr<Reaction<ReactionThermo>>
     (
         cstrIter()(species, thermoDatabase, dict)
     );
@@ -497,7 +497,7 @@ const Foam::List<typename Foam::Reaction<ReactionThermo>::specieCoeffs>&
 Foam::Reaction<ReactionThermo>::glhs() const
 {
     NotImplemented;
-    return NullObjectRef<List<specieCoeffs> >();
+    return NullObjectRef<List<specieCoeffs>>();
 }
 
 
@@ -506,7 +506,7 @@ const Foam::List<typename Foam::Reaction<ReactionThermo>::specieCoeffs>&
 Foam::Reaction<ReactionThermo>::grhs() const
 {
     NotImplemented;
-    return NullObjectRef<List<specieCoeffs> >();
+    return NullObjectRef<List<specieCoeffs>>();
 }
 
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
index 8ba7d40d8a..dbe7cada7c 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -252,21 +252,21 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<Reaction<ReactionThermo> > clone() const //
+        virtual autoPtr<Reaction<ReactionThermo>> clone() const //
         {
-            return autoPtr<Reaction<ReactionThermo> >
+            return autoPtr<Reaction<ReactionThermo>>
             (
                 new Reaction<ReactionThermo>(*this)
             );
         }
 
         //- Construct and return a clone with new speciesTable
-        virtual autoPtr<Reaction<ReactionThermo> > clone
+        virtual autoPtr<Reaction<ReactionThermo>> clone
         (
             const speciesTable& species
         ) const
         {
-            return autoPtr<Reaction<ReactionThermo> >
+            return autoPtr<Reaction<ReactionThermo>>
             (
                 new Reaction<ReactionThermo>(*this, species)
             );
@@ -276,7 +276,7 @@ public:
     // Selectors
 
         //- Return a pointer to new patchField created on freestore from input
-        static autoPtr<Reaction<ReactionThermo> > New
+        static autoPtr<Reaction<ReactionThermo>> New
         (
             const speciesTable& species,
             const HashPtrTable<ReactionThermo>& thermoDatabase,
@@ -284,7 +284,7 @@ public:
         );
 
         //- Return a pointer to new patchField created on freestore from dict
-        static autoPtr<Reaction<ReactionThermo> > New
+        static autoPtr<Reaction<ReactionThermo>> New
         (
             const speciesTable& species,
             const HashPtrTable<ReactionThermo>& thermoDatabase,
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
index e616e1847b..ca0334107d 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Foam::ReactionList<ThermoType>::ReactionList
     const HashPtrTable<ThermoType>& thermoDb
 )
 :
-    SLPtrList<Reaction<ThermoType> >(),
+    SLPtrList<Reaction<ThermoType>>(),
     species_(species),
     thermoDb_(thermoDb),
     dict_(dictionary::null)
@@ -51,7 +51,7 @@ Foam::ReactionList<ThermoType>::ReactionList
     const dictionary& dict
 )
 :
-    SLPtrList<Reaction<ThermoType> >(),
+    SLPtrList<Reaction<ThermoType>>(),
     species_(species),
     thermoDb_(thermoDb),
     dict_(dict)
@@ -68,7 +68,7 @@ Foam::ReactionList<ThermoType>::ReactionList
     const fileName& fName
 )
 :
-    SLPtrList<Reaction<ThermoType> >
+    SLPtrList<Reaction<ThermoType>>
     (
         dictionary(IFstream(fName)()).lookup("reactions"),
         Reaction<ThermoType>::iNew(species, thermoDb)
@@ -82,7 +82,7 @@ Foam::ReactionList<ThermoType>::ReactionList
 template<class ThermoType>
 Foam::ReactionList<ThermoType>::ReactionList(const ReactionList& reactions)
 :
-    SLPtrList<Reaction<ThermoType> >(reactions),
+    SLPtrList<Reaction<ThermoType>>(reactions),
     species_(reactions.species_),
     thermoDb_(reactions.thermoDb_),
     dict_(reactions.dict_)
@@ -128,7 +128,7 @@ void Foam::ReactionList<ThermoType>::write(Ostream& os) const
     os  << "reactions" << nl;
     os  << token::BEGIN_BLOCK << incrIndent << nl;
 
-    forAllConstIter(typename SLPtrList<Reaction<ThermoType> >, *this, iter)
+    forAllConstIter(typename SLPtrList<Reaction<ThermoType>>, *this, iter)
     {
         const Reaction<ThermoType>& r = iter();
         os  << indent << r.name() << nl
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
index 875a0fd466..483e05bf4e 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ namespace Foam
 template<class ThermoType>
 class ReactionList
 :
-    public SLPtrList<Reaction<ThermoType> >
+    public SLPtrList<Reaction<ThermoType>>
 {
     // Private data
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
index b0e16bdcca..36b7421c8a 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,9 +120,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<ReactionType<ReactionThermo> > clone() const
+        virtual autoPtr<ReactionType<ReactionThermo>> clone() const
         {
-            return autoPtr<ReactionType<ReactionThermo> >
+            return autoPtr<ReactionType<ReactionThermo>>
             (
                 new ReversibleReaction
                 <
@@ -134,12 +134,12 @@ public:
         }
 
         //- Construct and return a clone with new speciesTable
-        virtual autoPtr<ReactionType<ReactionThermo> > clone
+        virtual autoPtr<ReactionType<ReactionThermo>> clone
         (
             const speciesTable& species
         ) const
         {
-            return autoPtr<ReactionType<ReactionThermo> >
+            return autoPtr<ReactionType<ReactionThermo>>
             (
                 new ReversibleReaction
                 <ReactionType, ReactionThermo, ReactionRate>
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index 66a9ab3655..59c25bcf4b 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 {
     if (dict.found("coeffs"))
     {
-        List<Tuple2<word, scalar> > coeffs(dict.lookup("coeffs"));
+        List<Tuple2<word, scalar>> coeffs(dict.lookup("coeffs"));
         if (coeffs.size() != species_.size())
         {
             FatalErrorInFunction
@@ -151,7 +151,7 @@ inline Foam::scalar Foam::thirdBodyEfficiencies::M(const scalarList& c) const
 
 inline void Foam::thirdBodyEfficiencies::write(Ostream& os) const
 {
-    List<Tuple2<word, scalar> > coeffs(species_.size());
+    List<Tuple2<word, scalar>> coeffs(species_.size());
     forAll(coeffs, i)
     {
         coeffs[i].first() = species_[i];
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
index 87a7e80cb9..f16ca49759 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,10 +55,10 @@ inline Foam::eConstThermo<EquationOfState>::eConstThermo
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::eConstThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::eConstThermo<EquationOfState>>
 Foam::eConstThermo<EquationOfState>::clone() const
 {
-    return autoPtr<eConstThermo<EquationOfState> >
+    return autoPtr<eConstThermo<EquationOfState>>
     (
         new eConstThermo<EquationOfState>(*this)
     );
@@ -66,10 +66,10 @@ Foam::eConstThermo<EquationOfState>::clone() const
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::eConstThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::eConstThermo<EquationOfState>>
 Foam::eConstThermo<EquationOfState>::New(Istream& is)
 {
-    return autoPtr<eConstThermo<EquationOfState> >
+    return autoPtr<eConstThermo<EquationOfState>>
     (
         new eConstThermo<EquationOfState>(is)
     );
@@ -77,10 +77,10 @@ Foam::eConstThermo<EquationOfState>::New(Istream& is)
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::eConstThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::eConstThermo<EquationOfState>>
 Foam::eConstThermo<EquationOfState>::New(const dictionary& dict)
 {
-    return autoPtr<eConstThermo<EquationOfState> >
+    return autoPtr<eConstThermo<EquationOfState>>
     (
         new eConstThermo<EquationOfState>(dict)
     );
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
index bb272ce9c6..7ca5b48044 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,10 +55,10 @@ inline Foam::hConstThermo<EquationOfState>::hConstThermo
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::hConstThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::hConstThermo<EquationOfState>>
 Foam::hConstThermo<EquationOfState>::clone() const
 {
-    return autoPtr<hConstThermo<EquationOfState> >
+    return autoPtr<hConstThermo<EquationOfState>>
     (
         new hConstThermo<EquationOfState>(*this)
     );
@@ -66,10 +66,10 @@ Foam::hConstThermo<EquationOfState>::clone() const
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::hConstThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::hConstThermo<EquationOfState>>
 Foam::hConstThermo<EquationOfState>::New(Istream& is)
 {
-    return autoPtr<hConstThermo<EquationOfState> >
+    return autoPtr<hConstThermo<EquationOfState>>
     (
         new hConstThermo<EquationOfState>(is)
     );
@@ -77,10 +77,10 @@ Foam::hConstThermo<EquationOfState>::New(Istream& is)
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::hConstThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::hConstThermo<EquationOfState>>
 Foam::hConstThermo<EquationOfState>::New(const dictionary& dict)
 {
-    return autoPtr<hConstThermo<EquationOfState> >
+    return autoPtr<hConstThermo<EquationOfState>>
     (
         new hConstThermo<EquationOfState>(dict)
     );
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
index e46dbf7398..8f4094d975 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,10 +80,10 @@ inline Foam::hPowerThermo<EquationOfState>::hPowerThermo
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::hPowerThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::hPowerThermo<EquationOfState>>
 Foam::hPowerThermo<EquationOfState>::clone() const
 {
-    return autoPtr<hPowerThermo<EquationOfState> >
+    return autoPtr<hPowerThermo<EquationOfState>>
     (
         new hPowerThermo<EquationOfState>(*this)
     );
@@ -91,10 +91,10 @@ Foam::hPowerThermo<EquationOfState>::clone() const
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::hPowerThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::hPowerThermo<EquationOfState>>
 Foam::hPowerThermo<EquationOfState>::New(Istream& is)
 {
-    return autoPtr<hPowerThermo<EquationOfState> >
+    return autoPtr<hPowerThermo<EquationOfState>>
     (
         new hPowerThermo<EquationOfState>(is)
     );
@@ -102,10 +102,10 @@ Foam::hPowerThermo<EquationOfState>::New(Istream& is)
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::hPowerThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::hPowerThermo<EquationOfState>>
 Foam::hPowerThermo<EquationOfState>::New(const dictionary& dict)
 {
-    return autoPtr<hPowerThermo<EquationOfState> >
+    return autoPtr<hPowerThermo<EquationOfState>>
     (
         new hPowerThermo<EquationOfState>(dict)
     );
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
index c6a699540e..b25d5f0f73 100644
--- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,10 +61,10 @@ inline Foam::hRefConstThermo<EquationOfState>::hRefConstThermo
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState>>
 Foam::hRefConstThermo<EquationOfState>::clone() const
 {
-    return autoPtr<hRefConstThermo<EquationOfState> >
+    return autoPtr<hRefConstThermo<EquationOfState>>
     (
         new hRefConstThermo<EquationOfState>(*this)
     );
@@ -72,10 +72,10 @@ Foam::hRefConstThermo<EquationOfState>::clone() const
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState>>
 Foam::hRefConstThermo<EquationOfState>::New(Istream& is)
 {
-    return autoPtr<hRefConstThermo<EquationOfState> >
+    return autoPtr<hRefConstThermo<EquationOfState>>
     (
         new hRefConstThermo<EquationOfState>(is)
     );
@@ -83,10 +83,10 @@ Foam::hRefConstThermo<EquationOfState>::New(Istream& is)
 
 
 template<class EquationOfState>
-inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState> >
+inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState>>
 Foam::hRefConstThermo<EquationOfState>::New(const dictionary& dict)
 {
-    return autoPtr<hRefConstThermo<EquationOfState> >
+    return autoPtr<hRefConstThermo<EquationOfState>>
     (
         new hRefConstThermo<EquationOfState>(dict)
     );
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermo.H b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
index 53336e0479..e96b525896 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermo.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ template<class Thermo, template<class> class Type>
 class thermo
 :
     public Thermo,
-    public Type<thermo<Thermo, Type> >
+    public Type<thermo<Thermo, Type>>
 {
     // Private data
 
@@ -151,7 +151,7 @@ public:
         {
             return
                   Thermo::typeName() + ','
-                + Type<thermo<Thermo, Type> >::typeName();
+                + Type<thermo<Thermo, Type>>::typeName();
         }
 
         // Fundamental properties
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
index 9b8eb30777..44197fd18f 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ template<class Thermo, template<class> class Type>
 inline Foam::word
 Foam::species::thermo<Thermo, Type>::heName()
 {
-    return Type<thermo<Thermo, Type> >::name();
+    return Type<thermo<Thermo, Type>>::name();
 }
 
 
@@ -101,7 +101,7 @@ template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::he(const scalar p, const scalar T) const
 {
-    return Type<thermo<Thermo, Type> >::he(*this, p, T);
+    return Type<thermo<Thermo, Type>>::he(*this, p, T);
 }
 
 
@@ -117,7 +117,7 @@ template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::cpv(const scalar p, const scalar T) const
 {
-    return Type<thermo<Thermo, Type> >::cpv(*this, p, T);
+    return Type<thermo<Thermo, Type>>::cpv(*this, p, T);
 }
 
 
@@ -138,7 +138,7 @@ Foam::species::thermo<Thermo, Type>::cpBycpv
     const scalar T
 ) const
 {
-    return Type<thermo<Thermo, Type> >::cpBycpv(*this, p, T);
+    return Type<thermo<Thermo, Type>>::cpBycpv(*this, p, T);
 }
 
 
@@ -202,7 +202,7 @@ template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::HE(const scalar p, const scalar T) const
 {
-    return Type<thermo<Thermo, Type> >::HE(*this, p, T);
+    return Type<thermo<Thermo, Type>>::HE(*this, p, T);
 }
 
 
@@ -362,7 +362,7 @@ inline Foam::scalar Foam::species::thermo<Thermo, Type>::THE
     const scalar T0
 ) const
 {
-    return Type<thermo<Thermo, Type> >::THE(*this, he, p, T0);
+    return Type<thermo<Thermo, Type>>::THE(*this, he, p, T0);
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H
index 2a73a4a187..6c597b87d5 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransportI.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,10 +53,10 @@ inline Foam::constTransport<Thermo>::constTransport
 
 
 template<class Thermo>
-inline Foam::autoPtr<Foam::constTransport<Thermo> >
+inline Foam::autoPtr<Foam::constTransport<Thermo>>
 Foam::constTransport<Thermo>::clone() const
 {
-    return autoPtr<constTransport<Thermo> >
+    return autoPtr<constTransport<Thermo>>
     (
         new constTransport<Thermo>(*this)
     );
@@ -64,13 +64,13 @@ Foam::constTransport<Thermo>::clone() const
 
 
 template<class Thermo>
-inline Foam::autoPtr<Foam::constTransport<Thermo> >
+inline Foam::autoPtr<Foam::constTransport<Thermo>>
 Foam::constTransport<Thermo>::New
 (
     Istream& is
 )
 {
-    return autoPtr<constTransport<Thermo> >
+    return autoPtr<constTransport<Thermo>>
     (
         new constTransport<Thermo>(is)
     );
@@ -78,13 +78,13 @@ Foam::constTransport<Thermo>::New
 
 
 template<class Thermo>
-inline Foam::autoPtr<Foam::constTransport<Thermo> >
+inline Foam::autoPtr<Foam::constTransport<Thermo>>
 Foam::constTransport<Thermo>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<constTransport<Thermo> >
+    return autoPtr<constTransport<Thermo>>
     (
         new constTransport<Thermo>(dict)
     );
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
index 9a5ad80d5e..f51065dfae 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,10 +67,10 @@ inline Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport
 
 
 template<class Thermo, int PolySize>
-inline Foam::autoPtr<Foam::polynomialTransport<Thermo, PolySize> >
+inline Foam::autoPtr<Foam::polynomialTransport<Thermo, PolySize>>
 Foam::polynomialTransport<Thermo, PolySize>::clone() const
 {
-    return autoPtr<polynomialTransport<Thermo, PolySize> >
+    return autoPtr<polynomialTransport<Thermo, PolySize>>
     (
         new polynomialTransport<Thermo, PolySize>(*this)
     );
@@ -78,10 +78,10 @@ Foam::polynomialTransport<Thermo, PolySize>::clone() const
 
 
 template<class Thermo, int PolySize>
-inline Foam::autoPtr<Foam::polynomialTransport<Thermo, PolySize> >
+inline Foam::autoPtr<Foam::polynomialTransport<Thermo, PolySize>>
 Foam::polynomialTransport<Thermo, PolySize>::New(Istream& is)
 {
-    return autoPtr<polynomialTransport<Thermo, PolySize> >
+    return autoPtr<polynomialTransport<Thermo, PolySize>>
     (
         new polynomialTransport<Thermo, PolySize>(is)
     );
@@ -89,10 +89,10 @@ Foam::polynomialTransport<Thermo, PolySize>::New(Istream& is)
 
 
 template<class Thermo, int PolySize>
-inline Foam::autoPtr<Foam::polynomialTransport<Thermo, PolySize> >
+inline Foam::autoPtr<Foam::polynomialTransport<Thermo, PolySize>>
 Foam::polynomialTransport<Thermo, PolySize>::New(const dictionary& dict)
 {
-    return autoPtr<polynomialTransport<Thermo, PolySize> >
+    return autoPtr<polynomialTransport<Thermo, PolySize>>
     (
         new polynomialTransport<Thermo, PolySize>(dict)
     );
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
index 01668dda17..13ba0df2c5 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,10 +88,10 @@ inline Foam::sutherlandTransport<Thermo>::sutherlandTransport
 
 
 template<class Thermo>
-inline Foam::autoPtr<Foam::sutherlandTransport<Thermo> >
+inline Foam::autoPtr<Foam::sutherlandTransport<Thermo>>
 Foam::sutherlandTransport<Thermo>::clone() const
 {
-    return autoPtr<sutherlandTransport<Thermo> >
+    return autoPtr<sutherlandTransport<Thermo>>
     (
         new sutherlandTransport<Thermo>(*this)
     );
@@ -99,13 +99,13 @@ Foam::sutherlandTransport<Thermo>::clone() const
 
 
 template<class Thermo>
-inline Foam::autoPtr<Foam::sutherlandTransport<Thermo> >
+inline Foam::autoPtr<Foam::sutherlandTransport<Thermo>>
 Foam::sutherlandTransport<Thermo>::New
 (
     Istream& is
 )
 {
-    return autoPtr<sutherlandTransport<Thermo> >
+    return autoPtr<sutherlandTransport<Thermo>>
     (
         new sutherlandTransport<Thermo>(is)
     );
@@ -113,13 +113,13 @@ Foam::sutherlandTransport<Thermo>::New
 
 
 template<class Thermo>
-inline Foam::autoPtr<Foam::sutherlandTransport<Thermo> >
+inline Foam::autoPtr<Foam::sutherlandTransport<Thermo>>
 Foam::sutherlandTransport<Thermo>::New
 (
     const dictionary& dict
 )
 {
-    return autoPtr<sutherlandTransport<Thermo> >
+    return autoPtr<sutherlandTransport<Thermo>>
     (
         new sutherlandTransport<Thermo>(dict)
     );
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
index ae92f01ae6..64c766bf7b 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ class temperatureDependentAlphaContactAngleFvPatchScalarField
         word TName_;
 
         //- Equilibrium contact angle table
-        autoPtr<DataEntry<scalar> > theta0_;
+        autoPtr<DataEntry<scalar>> theta0_;
 
 
 public:
diff --git a/src/triSurface/triSurface/interfaces/VTK/readVTK.C b/src/triSurface/triSurface/interfaces/VTK/readVTK.C
index a5ffc2e247..f4f026979c 100644
--- a/src/triSurface/triSurface/interfaces/VTK/readVTK.C
+++ b/src/triSurface/triSurface/interfaces/VTK/readVTK.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ bool Foam::triSurface::readVTK(const fileName& fName)
     (
         tris.xfer(),
         patches,
-        xferCopy<List<point> >(surf.points())
+        xferCopy<List<point>>(surf.points())
     );
 
     return true;
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index 5bb5139aac..1a834edad8 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -632,9 +632,9 @@ Foam::triSurface::triSurface
 
 Foam::triSurface::triSurface
 (
-    const Xfer<List<labelledTri> >& triangles,
+    const Xfer<List<labelledTri>>& triangles,
     const geometricSurfacePatchList& patches,
-    const Xfer<List<point> >& points
+    const Xfer<List<point>>& points
 )
 :
     ParentType(triangles, points),
diff --git a/src/triSurface/triSurface/triSurface.H b/src/triSurface/triSurface/triSurface.H
index a1bc216867..89d5461d21 100644
--- a/src/triSurface/triSurface/triSurface.H
+++ b/src/triSurface/triSurface/triSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -265,9 +265,9 @@ public:
         //- Construct from triangles, patches, points.
         triSurface
         (
-            const Xfer<List<labelledTri> >&,
+            const Xfer<List<labelledTri>>&,
             const geometricSurfacePatchList&,
-            const Xfer<List<point> >&
+            const Xfer<List<point>>&
         );
 
         //- Construct from triangles, points. Set patchnames to default.
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C
index e463562db3..fc7a3fbabc 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     // Frequency of the rotation [rad/s]
     const vector rotOmega(0.4, 0.7, 0.5);
 
-    List<Tuple2<scalar,  Vector2D<vector> > > timeValues(nTimes);
+    List<Tuple2<scalar,  Vector2D<vector>>> timeValues(nTimes);
 
     forAll(timeValues, i)
     {

From f19f48132e1418bd3031a7b3d056b70e761ad029 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 11 Jan 2016 13:00:56 +0000
Subject: [PATCH 096/447] Consistently indent continuation backslashes in macro
 definitions

---
 .../InterfaceCompositionModel.H               |    8 +-
 bin/tools/foamListSourceFiles                 |   54 +-
 .../containers/Lists/PackedList/PackedList.C  |   18 +-
 src/OpenFOAM/db/IOstreams/token/token.H       |    6 +-
 src/OpenFOAM/db/error/StaticAssert.H          |    8 +-
 .../construction/addToRunTimeSelectionTable.H |   72 +-
 .../construction/runTimeSelectionTables.H     |  500 +++---
 .../addToGlobalFunctionSelectionTable.H       |    8 +-
 .../globalFunctionSelectionTables.H           |  146 +-
 .../addToMemberFunctionSelectionTable.H       |   90 +-
 .../memberFunctionSelectionTables.H           |  254 +--
 .../addToStaticMemberFunctionSelectionTable.H |   12 +-
 .../staticMemberFunctionSelectionTables.H     |  142 +-
 src/OpenFOAM/db/typeInfo/className.H          |   76 +-
 src/OpenFOAM/db/typeInfo/typeInfo.H           |    8 +-
 .../dimensionedScalar/dimensionedScalar.C     |   64 +-
 .../dimensionedType/dimensionedType.C         |   96 +-
 .../dimensionedType/dimensionedType.H         |   40 +-
 .../DimensionedField/DimensionedField.C       |   64 +-
 .../DimensionedFieldFunctions.C               |  596 +++----
 .../DimensionedFieldFunctions.H               |  214 +--
 .../DimensionedFieldFunctionsM.C              | 1236 +++++++-------
 .../DimensionedFieldFunctionsM.H              |  388 ++---
 .../DimensionedScalarField.C                  |  134 +-
 .../DimensionedScalarField.H                  |    6 +-
 .../FieldFields/FieldField/FieldField.C       |   56 +-
 .../FieldField/FieldFieldFunctions.C          |   84 +-
 .../FieldField/FieldFieldFunctions.H          |   46 +-
 .../FieldField/FieldFieldFunctionsM.C         |  852 +++++-----
 .../FieldField/FieldFieldFunctionsM.H         |  404 ++---
 .../scalarFieldField/scalarFieldField.C       |   90 +-
 .../scalarFieldField/scalarFieldField.H       |   16 +-
 src/OpenFOAM/fields/Fields/Field/Field.C      |   38 +-
 .../fields/Fields/Field/FieldFunctions.C      |  292 ++--
 .../fields/Fields/Field/FieldFunctions.H      |  122 +-
 .../fields/Fields/Field/FieldFunctionsM.C     |  658 ++++----
 .../fields/Fields/Field/FieldFunctionsM.H     |  356 ++--
 src/OpenFOAM/fields/Fields/Field/FieldM.H     |  422 ++---
 .../fields/Fields/scalarField/scalarField.C   |   38 +-
 .../GeometricField/GeometricField.C           |   64 +-
 .../GeometricField/GeometricFieldFunctions.C  |  820 ++++-----
 .../GeometricField/GeometricFieldFunctions.H  |  468 +++---
 .../GeometricField/GeometricFieldFunctionsM.C | 1482 ++++++++---------
 .../GeometricField/GeometricFieldFunctionsM.H |  388 ++---
 .../GeometricScalarField.C                    |  164 +-
 .../GeometricScalarField.H                    |    6 +-
 .../pointPatchField/pointPatchField.H         |  118 +-
 .../pointPatchFieldFunctions.H                |  198 +--
 .../pointPatchField/pointPatchFields.C        |   20 +-
 .../global/constants/dimensionedConstants.H   |  174 +-
 src/OpenFOAM/global/debug/defineDebugSwitch.H |   74 +-
 .../tableReaders/tableReaders.C               |    4 +-
 .../tableReaders/tableReaders.H               |   40 +-
 .../matrices/LduMatrix/LduMatrix/LduMatrix.H  |  206 +--
 .../LduMatrix/LduMatrix/SolverPerformance.H   |   30 +-
 .../Preconditioners/lduPreconditioners.C      |   22 +-
 .../LduMatrix/Smoothers/lduSmoothers.C        |    8 +-
 .../matrices/LduMatrix/Solvers/lduSolvers.C   |   34 +-
 .../functions/DataEntry/DataEntry/DataEntry.H |   26 +-
 .../primitives/hashes/Hasher/Hasher.C         |   34 +-
 src/OpenFOAM/primitives/hashes/SHA1/SHA1.C    |   14 +-
 src/OpenFOAM/primitives/ops/ops.H             |  160 +-
 .../makeTurbulenceModel.H                     |    8 +-
 src/fileFormats/sampledSetWriters/writers.C   |    4 +-
 src/fileFormats/sampledSetWriters/writers.H   |   40 +-
 .../cfdTools/general/fvOptions/makeFvOption.H |   22 +-
 .../fvPatchFields/fvPatchField/fvPatchField.H |  176 +-
 .../fvsPatchField/fvsPatchField.H             |   86 +-
 .../fvsPatchField/fvsPatchFields.C            |   20 +-
 .../convectionScheme/convectionScheme.H       |    4 +-
 .../convectionScheme/convectionSchemes.C      |   24 +-
 .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H    |    2 +-
 .../ddtSchemes/ddtScheme/ddtScheme.H          |    2 +-
 .../divSchemes/divScheme/divScheme.H          |    2 +-
 .../LeastSquaresGrad/LeastSquaresGrad.H       |    2 +-
 .../gradSchemes/gradScheme/gradScheme.H       |    2 +-
 .../gaussLaplacianScheme.H                    |   30 +-
 .../gaussLaplacianSchemes.C                   |  146 +-
 .../laplacianScheme/laplacianScheme.H         |    2 +-
 .../laplacianScheme/laplacianSchemes.C        |   10 +-
 .../CentredFitSnGrad/CentredFitSnGradScheme.H |    2 +-
 .../snGradSchemes/snGradScheme/snGradScheme.H |    2 +-
 .../interpolation/interpolation.H             |    2 +-
 .../LimitedScheme/LimitedScheme.H             |  136 +-
 .../limitedSchemes/PhiScheme/PhiScheme.H      |    6 +-
 .../limitedSurfaceInterpolationScheme.H       |    8 +-
 .../limitedSurfaceInterpolationSchemes.C      |   36 +-
 .../multivariateScheme/multivariateScheme.H   |    2 +-
 .../multivariateSurfaceInterpolationScheme.H  |    2 +-
 .../CentredFitScheme/CentredFitScheme.H       |   58 +-
 .../PureUpwindFitScheme/PureUpwindFitScheme.H |   68 +-
 .../schemes/UpwindFitScheme/UpwindFitScheme.H |   58 +-
 .../surfaceInterpolationScheme.H              |    4 +-
 .../surfaceInterpolationSchemes.C             |   28 +-
 .../BinaryCollisionModel.H                    |   36 +-
 .../InflowBoundaryModel/InflowBoundaryModel.H |   28 +-
 .../WallInteractionModel.H                    |   28 +-
 .../basic/particle/particleMacros.H           |   28 +-
 .../makeCoalParcelSurfaceReactionModels.H     |   20 +-
 .../IntegrationScheme/IntegrationScheme.H     |   26 +-
 .../include/makeMPPICParcelDampingModels.H    |   10 +-
 .../include/makeMPPICParcelIsotropyModels.H   |   10 +-
 .../include/makeMPPICParcelPackingModels.H    |   12 +-
 .../include/makeParcelCloudFunctionObjects.H  |   20 +-
 .../include/makeParcelCollisionModels.H       |   22 +-
 .../include/makeParcelDispersionModels.H      |    6 +-
 .../parcels/include/makeParcelForces.H        |   30 +-
 .../include/makeParcelHeatTransferModels.H    |   10 +-
 .../include/makeParcelInjectionModels.H       |   26 +-
 .../makeParcelPatchInteractionModels.H        |   16 +-
 .../makeParcelStochasticCollisionModels.H     |    6 +-
 .../include/makeParcelSurfaceFilmModels.H     |    6 +-
 ...eactingMultiphaseParcelCompositionModels.H |    8 +-
 ...ngMultiphaseParcelDevolatilisationModels.H |   18 +-
 ...eReactingMultiphaseParcelInjectionModels.H |   22 +-
 ...ultiphaseParcelStochasticCollisionModels.H |    8 +-
 ...ingMultiphaseParcelSurfaceReactionModels.H |    6 +-
 .../makeReactingParcelCompositionModels.H     |    8 +-
 .../makeReactingParcelInjectionModels.H       |   22 +-
 .../makeReactingParcelPhaseChangeModels.H     |   10 +-
 .../makeReactingParcelSurfaceFilmModels.H     |    8 +-
 .../parcels/include/makeThermoParcelForces.H  |   24 +-
 .../makeThermoParcelSurfaceFilmModels.H       |   10 +-
 .../CloudFunctionObject/CloudFunctionObject.H |    2 +-
 .../CollisionModel/CollisionModel.H           |   44 +-
 .../PairModel/PairModel/PairModel.H           |   32 +-
 .../WallModel/WallModel/WallModel.H           |   32 +-
 .../DispersionModel/DispersionModel.H         |   40 +-
 .../InjectionModel/InjectionModel.H           |   46 +-
 .../ParticleForce/ParticleForce.H             |    2 +-
 .../PatchInteractionModel.H                   |   46 +-
 .../StochasticCollisionModel.H                |   14 +-
 .../SurfaceFilmModel/SurfaceFilmModel.H       |    2 +-
 .../DampingModels/DampingModel/DampingModel.H |    2 +-
 .../IsotropyModel/IsotropyModel.H             |    2 +-
 .../PackingModels/PackingModel/PackingModel.H |    2 +-
 .../CompositionModel/CompositionModel.H       |   44 +-
 .../PhaseChangeModel/PhaseChangeModel.H       |   44 +-
 .../DevolatilisationModel.H                   |   52 +-
 .../SurfaceReactionModel.H                    |   52 +-
 .../HeatTransferModel/HeatTransferModel.H     |   44 +-
 .../makeSprayParcelAtomizationModels.H        |   10 +-
 .../include/makeSprayParcelBreakupModels.H    |   18 +-
 .../include/makeSprayParcelInjectionModels.H  |   24 +-
 ...makeSprayParcelStochasticCollisionModels.H |   10 +-
 .../AtomizationModel/AtomizationModel.H       |   46 +-
 .../BreakupModel/BreakupModel/BreakupModel.H  |   46 +-
 .../makeParcelTurbulenceDispersionModels.H    |   22 +-
 .../makeThermoParcelTurbulenceForces.H        |    4 +-
 .../AMIMethod/AMIMethod/AMIMethod.H           |   30 +-
 .../writers/makeSurfaceWriterMethods.H        |   62 +-
 src/surfMesh/MeshedSurface/MeshedSurfaces.C   |   18 +-
 .../MeshedSurfaceProxyCore.C                  |   16 +-
 .../UnsortedMeshedSurfaces.C                  |   18 +-
 .../basic/fluidThermo/makeThermo.H            |  130 +-
 .../chemistryModel/makeChemistryModel.H       |   18 +-
 .../makeChemistrySolverTypes.H                |   78 +-
 .../radiationModel/radiationModel.H           |   28 +-
 .../sootModel/sootModel/makeSootTypes.H       |   48 +-
 .../chemistryReader/chemistryReader.H         |   20 +-
 .../makeSolidChemistryModel.H                 |   44 +-
 .../makeSolidChemistrySolverType.H            |   74 +-
 .../reaction/reactions/makeSolidReaction.H    |   74 +-
 .../makeReactingSolidThermo.H                 |  108 +-
 .../solidThermo/solidThermo/makeSolidThermo.H |  226 +--
 .../icoPolynomial/icoPolynomial.H             |   14 +-
 .../specie/reaction/reactions/makeReaction.H  |  172 +-
 167 files changed, 7803 insertions(+), 7803 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
index e10e3bb68b..c0a77f3b36 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
@@ -150,10 +150,10 @@ public:
 // Instantiation for multi-component-multi-component pairs
 #define makeInterfaceCompositionType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
                                                                                \
-    typedef Thermo<Comp, SpecieMixture<Mix<Phys>>>                           \
+    typedef Thermo<Comp, SpecieMixture<Mix<Phys>>>                             \
         Type##Thermo##Comp##Mix##Phys;                                         \
                                                                                \
-    typedef OtherThermo<OtherComp, OtherMix<OtherPhys>>                       \
+    typedef OtherThermo<OtherComp, OtherMix<OtherPhys>>                        \
         Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys;              \
                                                                                \
     addInterfaceCompositionToRunTimeSelectionTable                             \
@@ -166,10 +166,10 @@ public:
 // Instantiation for multi-component-single-component pairs
 #define makeSpecieInterfaceCompositionType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
                                                                                \
-    typedef Thermo<Comp, SpecieMixture<Mix<Phys>>>                           \
+    typedef Thermo<Comp, SpecieMixture<Mix<Phys>>>                             \
         Type##Thermo##Comp##Mix##Phys;                                         \
                                                                                \
-    typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys>>>       \
+    typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys>>>         \
         Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys;              \
                                                                                \
     addInterfaceCompositionToRunTimeSelectionTable                             \
diff --git a/bin/tools/foamListSourceFiles b/bin/tools/foamListSourceFiles
index 5fb1b3f893..857eba3161 100755
--- a/bin/tools/foamListSourceFiles
+++ b/bin/tools/foamListSourceFiles
@@ -58,33 +58,33 @@ packDir=$(echo "$1" | sed -e 's@//*@/@g' -e 's@/$@@')
 # - exclude Doxygen documentation etc
 #
 
-find -H $packDir                                                              \
-    ! -type d                                                                 \
-   \( -type f -o -type l \)                                                   \
-    ! -name "*~"                                                              \
- -a ! -name ".*~"                                                             \
- -a ! -name "*.orig"                                                          \
- -a ! -name "*.dep"                                                           \
- -a ! -name "*.o"                                                             \
- -a ! -name "*.so"                                                            \
- -a ! -name "*.a"                                                             \
- -a ! -name "*.tar"                                                           \
- -a ! -name "*.tar.gz"                                                        \
- -a ! -name "*.tgz"                                                           \
- -a ! -name "*.tar.bz2"                                                       \
- -a ! -name "*.tbz"                                                           \
- -a ! -name "core"                                                            \
- -a ! -name "core.[1-9]*"                                                     \
- -a ! -name "libccmio*"                                                       \
-| sed                                                                         \
- -e '\@/\.git/@d'                                                             \
- -e '\@/\.tags/@d'                                                            \
- -e '\@/platforms/@d'                                                         \
- -e '\@/t/@d'                                                                 \
- -e '\@/Make[.A-Za-z]*/[^/]*/@d'                                              \
- -e '\@/[Dd]oxygen/html/@d'                                                   \
- -e '\@/download/@d'                                                          \
- -e '\@/libccmio-.*/@d'                                                       \
+find -H $packDir                                                               \
+    ! -type d                                                                  \
+   \( -type f -o -type l \)                                                    \
+    ! -name "*~"                                                               \
+ -a ! -name ".*~"                                                              \
+ -a ! -name "*.orig"                                                           \
+ -a ! -name "*.dep"                                                            \
+ -a ! -name "*.o"                                                              \
+ -a ! -name "*.so"                                                             \
+ -a ! -name "*.a"                                                              \
+ -a ! -name "*.tar"                                                            \
+ -a ! -name "*.tar.gz"                                                         \
+ -a ! -name "*.tgz"                                                            \
+ -a ! -name "*.tar.bz2"                                                        \
+ -a ! -name "*.tbz"                                                            \
+ -a ! -name "core"                                                             \
+ -a ! -name "core.[1-9]*"                                                      \
+ -a ! -name "libccmio*"                                                        \
+| sed                                                                          \
+ -e '\@/\.git/@d'                                                              \
+ -e '\@/\.tags/@d'                                                             \
+ -e '\@/platforms/@d'                                                          \
+ -e '\@/t/@d'                                                                  \
+ -e '\@/Make[.A-Za-z]*/[^/]*/@d'                                               \
+ -e '\@/[Dd]oxygen/html/@d'                                                    \
+ -e '\@/download/@d'                                                           \
+ -e '\@/libccmio-.*/@d'                                                        \
  -e '\@\./debian/@d'
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index a33a3bac16..2362b70c3b 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -31,18 +31,18 @@ License
 
 #if (UINT_MAX == 0xFFFFFFFF)
 // 32-bit counting, Hamming weight method
-#   define COUNT_PACKEDBITS(sum, x)                                           \
-{                                                                             \
-    x -= (x >> 1) & 0x55555555;                                               \
-    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);                           \
-    sum += (((x + (x >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24;                \
+#   define COUNT_PACKEDBITS(sum, x)                                            \
+{                                                                              \
+    x -= (x >> 1) & 0x55555555;                                                \
+    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);                            \
+    sum += (((x + (x >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24;                 \
 }
 #elif (UINT_MAX == 0xFFFFFFFFFFFFFFFF)
 // 64-bit counting, Hamming weight method
-#   define COUNT_PACKEDBITS(sum, x)                                           \
-{                                                                             \
-    x -= (x >> 1) & 0x5555555555555555;                                       \
-    x = (x & 0x3333333333333333) + ((x >> 2) & 0x3333333333333333);           \
+#   define COUNT_PACKEDBITS(sum, x)                                            \
+{                                                                              \
+    x -= (x >> 1) & 0x5555555555555555;                                        \
+    x = (x & 0x3333333333333333) + ((x >> 2) & 0x3333333333333333);            \
     sum += (((x + (x >> 4)) & 0x0F0F0F0F0F0F0F0F) * 0x0101010101010101) >> 56;\
 }
 #else
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 7b7eeee54c..23a04d1d30 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -440,11 +440,11 @@ ostream& operator<<(ostream&, const InfoProxy<token>&);
 template<>
 Ostream& operator<<(Ostream& os, const InfoProxy<token>& ip);
 
-#define defineCompoundTypeName(Type, Name)                                    \
+#define defineCompoundTypeName(Type, Name)                                     \
     defineTemplateTypeNameAndDebugWithName(token::Compound<Type>, #Type, 0);
 
-#define addCompoundToRunTimeSelectionTable(Type, Name)                        \
-    token::compound::addIstreamConstructorToTable<token::Compound<Type>>     \
+#define addCompoundToRunTimeSelectionTable(Type, Name)                         \
+    token::compound::addIstreamConstructorToTable<token::Compound<Type>>       \
         add##Name##IstreamConstructorToTable_;
 
 
diff --git a/src/OpenFOAM/db/error/StaticAssert.H b/src/OpenFOAM/db/error/StaticAssert.H
index 4e139b120a..daf2522de5 100644
--- a/src/OpenFOAM/db/error/StaticAssert.H
+++ b/src/OpenFOAM/db/error/StaticAssert.H
@@ -74,10 +74,10 @@ class StaticAssertionTest {};
 // ~~~~~~~~~~~~~
 
 //- Assert that some test is true at compile-time
-#define StaticAssert(Test)                                                   \
-    typedef ::Foam::StaticAssertionTest                                      \
-    <                                                                        \
-        sizeof( ::Foam::StaticAssertionFailed<((Test) ? true : false)>)      \
+#define StaticAssert(Test)                                                     \
+    typedef ::Foam::StaticAssertionTest                                        \
+    <                                                                          \
+        sizeof( ::Foam::StaticAssertionFailed<((Test) ? true : false)>)        \
     > StaticAssertMacro(StaticAssertionTest, __LINE__)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H
index 062ff5e853..2c23754e8a 100644
--- a/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H
@@ -34,39 +34,39 @@ Description
 
 // add to hash-table of functions with typename as the key
 #define addToRunTimeSelectionTable\
-(baseType,thisType,argNames)                                                  \
-                                                                              \
-    /* Add the thisType constructor function to the table */                  \
-    baseType::add##argNames##ConstructorToTable<thisType>                     \
+(baseType,thisType,argNames)                                                   \
+                                                                               \
+    /* Add the thisType constructor function to the table */                   \
+    baseType::add##argNames##ConstructorToTable<thisType>                      \
         add##thisType##argNames##ConstructorTo##baseType##Table_
 
 
 // add to hash-table of functions with 'lookup' as the key
 #define addNamedToRunTimeSelectionTable\
-(baseType,thisType,argNames,lookup)                                           \
-                                                                              \
-    /* Add the thisType constructor function to the table, find by lookup */  \
-    baseType::add##argNames##ConstructorToTable<thisType>                     \
-        add_##lookup##_##thisType##argNames##ConstructorTo##baseType##Table_  \
+(baseType,thisType,argNames,lookup)                                            \
+                                                                               \
+    /* Add the thisType constructor function to the table, find by lookup */   \
+    baseType::add##argNames##ConstructorToTable<thisType>                      \
+        add_##lookup##_##thisType##argNames##ConstructorTo##baseType##Table_   \
         (#lookup)
 
 
 // add to hash-table of functions with typename as the key
 #define addRemovableToRunTimeSelectionTable\
-(baseType,thisType,argNames)                                                  \
-                                                                              \
-    /* Add the thisType constructor function to the table */                  \
-    baseType::addRemovable##argNames##ConstructorToTable<thisType>            \
+(baseType,thisType,argNames)                                                   \
+                                                                               \
+    /* Add the thisType constructor function to the table */                   \
+    baseType::addRemovable##argNames##ConstructorToTable<thisType>             \
         addRemovable##thisType##argNames##ConstructorTo##baseType##Table_
 
 
 // add to hash-table of functions with 'lookup' as the key
 #define addRemovableNamedToRunTimeSelectionTable\
-(baseType,thisType,argNames,lookup)                                           \
-                                                                              \
-    /* Add the thisType constructor function to the table, find by lookup */  \
-    baseType::addRemovable##argNames##ConstructorToTable<thisType>            \
-        addRemovable_##lookup##_##thisType##argNames##ConstructorTo           \
+(baseType,thisType,argNames,lookup)                                            \
+                                                                               \
+    /* Add the thisType constructor function to the table, find by lookup */   \
+    baseType::addRemovable##argNames##ConstructorToTable<thisType>             \
+        addRemovable_##lookup##_##thisType##argNames##ConstructorTo            \
         ##baseType##Table_(#lookup)
 
 
@@ -76,21 +76,21 @@ Description
 // add to hash-table of functions with typename as the key
 // use when baseType doesn't need a template argument (eg, is a typedef)
 #define addTemplateToRunTimeSelectionTable\
-(baseType,thisType,Targ,argNames)                                             \
-                                                                              \
-    /* Add the thisType constructor function to the table */                  \
-    baseType::add##argNames##ConstructorToTable<thisType<Targ>>               \
+(baseType,thisType,Targ,argNames)                                              \
+                                                                               \
+    /* Add the thisType constructor function to the table */                   \
+    baseType::add##argNames##ConstructorToTable<thisType<Targ>>                \
         add##thisType##Targ##argNames##ConstructorTo##baseType##Table_
 
 
 // add to hash-table of functions with 'lookup' as the key
 // use when baseType doesn't need a template argument (eg, is a typedef)
 #define addNamedTemplateToRunTimeSelectionTable\
-(baseType,thisType,Targ,argNames,lookup)                                      \
-                                                                              \
-    /* Add the thisType constructor function to the table, find by lookup */  \
-    baseType::add##argNames##ConstructorToTable<thisType<Targ>>               \
-        add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType    \
+(baseType,thisType,Targ,argNames,lookup)                                       \
+                                                                               \
+    /* Add the thisType constructor function to the table, find by lookup */   \
+    baseType::add##argNames##ConstructorToTable<thisType<Targ>>                \
+        add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType     \
         ##Table_(#lookup)
 
 
@@ -100,21 +100,21 @@ Description
 // add to hash-table of functions with typename as the key
 // use when baseType requires the Targ template argument as well
 #define addTemplatedToRunTimeSelectionTable\
-(baseType,thisType,Targ,argNames)                                             \
-                                                                              \
-    /* Add the thisType constructor function to the table */                  \
-    baseType<Targ>::add##argNames##ConstructorToTable<thisType<Targ>>         \
+(baseType,thisType,Targ,argNames)                                              \
+                                                                               \
+    /* Add the thisType constructor function to the table */                   \
+    baseType<Targ>::add##argNames##ConstructorToTable<thisType<Targ>>          \
         add##thisType##Targ##argNames##ConstructorTo##baseType##Targ##Table_
 
 
 // add to hash-table of functions with 'lookup' as the key
 // use when baseType requires the Targ template argument as well
 #define addNamedTemplatedToRunTimeSelectionTable\
-(baseType,thisType,Targ,argNames,lookup)                                      \
-                                                                              \
-    /* Add the thisType constructor function to the table, find by lookup */  \
-    baseType<Targ>::add##argNames##ConstructorToTable<thisType<Targ>>         \
-        add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType##  \
+(baseType,thisType,Targ,argNames,lookup)                                       \
+                                                                               \
+    /* Add the thisType constructor function to the table, find by lookup */   \
+    baseType<Targ>::add##argNames##ConstructorToTable<thisType<Targ>>          \
+        add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType##   \
         Targ##Table_(#lookup)
 
 
diff --git a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
index ad692a3276..9ec26a4426 100644
--- a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
@@ -47,89 +47,89 @@ Description
 // ~~~~~~~~~~~~~
 // declare a run-time selection:
 #define declareRunTimeSelectionTable\
-(autoPtr,baseType,argNames,argList,parList)                                   \
-                                                                              \
-    /* Construct from argList function pointer type */                        \
-    typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList;             \
-                                                                              \
-    /* Construct from argList function table type */                          \
-    typedef HashTable<argNames##ConstructorPtr, word, string::hash>           \
-        argNames##ConstructorTable;                                           \
-                                                                              \
-    /* Construct from argList function pointer table pointer */               \
-    static argNames##ConstructorTable* argNames##ConstructorTablePtr_;        \
-                                                                              \
-    /* Table constructor called from the table add function */                \
-    static void construct##argNames##ConstructorTables();                     \
-                                                                              \
-    /* Table destructor called from the table add function destructor */      \
-    static void destroy##argNames##ConstructorTables();                       \
-                                                                              \
-    /* Class to add constructor from argList to table */                      \
-    template<class baseType##Type>                                            \
-    class add##argNames##ConstructorToTable                                   \
-    {                                                                         \
-    public:                                                                   \
-                                                                              \
-        static autoPtr<baseType> New argList                                  \
-        {                                                                     \
-            return autoPtr<baseType>(new baseType##Type parList);             \
-        }                                                                     \
-                                                                              \
-        add##argNames##ConstructorToTable                                     \
-        (                                                                     \
-            const word& lookup = baseType##Type::typeName                     \
-        )                                                                     \
-        {                                                                     \
-            construct##argNames##ConstructorTables();                         \
-            if (!argNames##ConstructorTablePtr_->insert(lookup, New))         \
-            {                                                                 \
-                std::cerr<< "Duplicate entry " << lookup                      \
-                    << " in runtime selection table " << #baseType            \
-                    << std::endl;                                             \
-                error::safePrintStack(std::cerr);                             \
-            }                                                                 \
-        }                                                                     \
-                                                                              \
-        ~add##argNames##ConstructorToTable()                                  \
-        {                                                                     \
-            destroy##argNames##ConstructorTables();                           \
-        }                                                                     \
-    };                                                                        \
-                                                                              \
-    /* Class to add constructor from argList to table */                      \
-    /* Remove only the entry (not the table) upon destruction */              \
-    template<class baseType##Type>                                            \
-    class addRemovable##argNames##ConstructorToTable                          \
-    {                                                                         \
-        /* retain lookup name for later removal */                            \
-        const word& lookup_;                                                  \
-                                                                              \
-    public:                                                                   \
-                                                                              \
-        static autoPtr<baseType> New argList                                  \
-        {                                                                     \
-            return autoPtr<baseType>(new baseType##Type parList);             \
-        }                                                                     \
-                                                                              \
-        addRemovable##argNames##ConstructorToTable                            \
-        (                                                                     \
-            const word& lookup = baseType##Type::typeName                     \
-        )                                                                     \
-        :                                                                     \
-            lookup_(lookup)                                                   \
-        {                                                                     \
-            construct##argNames##ConstructorTables();                         \
-            argNames##ConstructorTablePtr_->set(lookup, New);                 \
-        }                                                                     \
-                                                                              \
-        ~addRemovable##argNames##ConstructorToTable()                         \
-        {                                                                     \
-            if (argNames##ConstructorTablePtr_)                               \
-            {                                                                 \
-                argNames##ConstructorTablePtr_->erase(lookup_);               \
-            }                                                                 \
-        }                                                                     \
+(autoPtr,baseType,argNames,argList,parList)                                    \
+                                                                               \
+    /* Construct from argList function pointer type */                         \
+    typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList;              \
+                                                                               \
+    /* Construct from argList function table type */                           \
+    typedef HashTable<argNames##ConstructorPtr, word, string::hash>            \
+        argNames##ConstructorTable;                                            \
+                                                                               \
+    /* Construct from argList function pointer table pointer */                \
+    static argNames##ConstructorTable* argNames##ConstructorTablePtr_;         \
+                                                                               \
+    /* Table constructor called from the table add function */                 \
+    static void construct##argNames##ConstructorTables();                      \
+                                                                               \
+    /* Table destructor called from the table add function destructor */       \
+    static void destroy##argNames##ConstructorTables();                        \
+                                                                               \
+    /* Class to add constructor from argList to table */                       \
+    template<class baseType##Type>                                             \
+    class add##argNames##ConstructorToTable                                    \
+    {                                                                          \
+    public:                                                                    \
+                                                                               \
+        static autoPtr<baseType> New argList                                   \
+        {                                                                      \
+            return autoPtr<baseType>(new baseType##Type parList);              \
+        }                                                                      \
+                                                                               \
+        add##argNames##ConstructorToTable                                      \
+        (                                                                      \
+            const word& lookup = baseType##Type::typeName                      \
+        )                                                                      \
+        {                                                                      \
+            construct##argNames##ConstructorTables();                          \
+            if (!argNames##ConstructorTablePtr_->insert(lookup, New))          \
+            {                                                                  \
+                std::cerr<< "Duplicate entry " << lookup                       \
+                    << " in runtime selection table " << #baseType             \
+                    << std::endl;                                              \
+                error::safePrintStack(std::cerr);                              \
+            }                                                                  \
+        }                                                                      \
+                                                                               \
+        ~add##argNames##ConstructorToTable()                                   \
+        {                                                                      \
+            destroy##argNames##ConstructorTables();                            \
+        }                                                                      \
+    };                                                                         \
+                                                                               \
+    /* Class to add constructor from argList to table */                       \
+    /* Remove only the entry (not the table) upon destruction */               \
+    template<class baseType##Type>                                             \
+    class addRemovable##argNames##ConstructorToTable                           \
+    {                                                                          \
+        /* retain lookup name for later removal */                             \
+        const word& lookup_;                                                   \
+                                                                               \
+    public:                                                                    \
+                                                                               \
+        static autoPtr<baseType> New argList                                   \
+        {                                                                      \
+            return autoPtr<baseType>(new baseType##Type parList);              \
+        }                                                                      \
+                                                                               \
+        addRemovable##argNames##ConstructorToTable                             \
+        (                                                                      \
+            const word& lookup = baseType##Type::typeName                      \
+        )                                                                      \
+        :                                                                      \
+            lookup_(lookup)                                                    \
+        {                                                                      \
+            construct##argNames##ConstructorTables();                          \
+            argNames##ConstructorTablePtr_->set(lookup, New);                  \
+        }                                                                      \
+                                                                               \
+        ~addRemovable##argNames##ConstructorToTable()                          \
+        {                                                                      \
+            if (argNames##ConstructorTablePtr_)                                \
+            {                                                                  \
+                argNames##ConstructorTablePtr_->erase(lookup_);                \
+            }                                                                  \
+        }                                                                      \
     };
 
 
@@ -138,151 +138,151 @@ Description
 // ~~~~~~~~~~~~~
 // declare a run-time selection for derived classes:
 #define declareRunTimeNewSelectionTable\
-(autoPtr,baseType,argNames,argList,parList)                                   \
-                                                                              \
-    /* Construct from argList function pointer type */                        \
-    typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList;             \
-                                                                              \
-    /* Construct from argList function table type */                          \
-    typedef HashTable<argNames##ConstructorPtr, word, string::hash>           \
-        argNames##ConstructorTable;                                           \
-                                                                              \
-    /* Construct from argList function pointer table pointer */               \
-    static argNames##ConstructorTable* argNames##ConstructorTablePtr_;        \
-                                                                              \
-    /* Table constructor called from the table add function */                \
-    static void construct##argNames##ConstructorTables();                     \
-                                                                              \
-    /* Table destructor called from the table add function destructor */      \
-    static void destroy##argNames##ConstructorTables();                       \
-                                                                              \
-    /* Class to add constructor from argList to table */                      \
-    template<class baseType##Type>                                            \
-    class add##argNames##ConstructorToTable                                   \
-    {                                                                         \
-    public:                                                                   \
-                                                                              \
-        static autoPtr<baseType> New##baseType argList                        \
-        {                                                                     \
-            return autoPtr<baseType>(baseType##Type::New parList.ptr());      \
-        }                                                                     \
-                                                                              \
-        add##argNames##ConstructorToTable                                     \
-        (                                                                     \
-            const word& lookup = baseType##Type::typeName                     \
-        )                                                                     \
-        {                                                                     \
-            construct##argNames##ConstructorTables();                         \
-            if                                                                \
-            (                                                                 \
-               !argNames##ConstructorTablePtr_->insert                        \
-                (                                                             \
-                    lookup,                                                   \
-                    New##baseType                                             \
-                )                                                             \
-            )                                                                 \
-            {                                                                 \
-                std::cerr<< "Duplicate entry " << lookup                      \
-                    << " in runtime selection table " << #baseType            \
-                    << std::endl;                                             \
-                error::safePrintStack(std::cerr);                             \
-            }                                                                 \
-        }                                                                     \
-                                                                              \
-        ~add##argNames##ConstructorToTable()                                  \
-        {                                                                     \
-            destroy##argNames##ConstructorTables();                           \
-        }                                                                     \
-    };                                                                        \
-                                                                              \
-    /* Class to add constructor from argList to table */                      \
-    template<class baseType##Type>                                            \
-    class addRemovable##argNames##ConstructorToTable                          \
-    {                                                                         \
-        /* retain lookup name for later removal */                            \
-        const word& lookup_;                                                  \
-                                                                              \
-    public:                                                                   \
-                                                                              \
-        static autoPtr<baseType> New##baseType argList                        \
-        {                                                                     \
-            return autoPtr<baseType>(baseType##Type::New parList.ptr());      \
-        }                                                                     \
-                                                                              \
-        addRemovable##argNames##ConstructorToTable                            \
-        (                                                                     \
-            const word& lookup = baseType##Type::typeName                     \
-        )                                                                     \
-        :                                                                     \
-            lookup_(lookup)                                                   \
-        {                                                                     \
-            construct##argNames##ConstructorTables();                         \
-            argNames##ConstructorTablePtr_->set                               \
-            (                                                                 \
-                lookup,                                                       \
-                New##baseType                                                 \
-            );                                                                \
-        }                                                                     \
-                                                                              \
-        ~addRemovable##argNames##ConstructorToTable()                         \
-        {                                                                     \
-            if (argNames##ConstructorTablePtr_)                               \
-            {                                                                 \
-                argNames##ConstructorTablePtr_->erase(lookup_);               \
-            }                                                                 \
-        }                                                                     \
+(autoPtr,baseType,argNames,argList,parList)                                    \
+                                                                               \
+    /* Construct from argList function pointer type */                         \
+    typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList;              \
+                                                                               \
+    /* Construct from argList function table type */                           \
+    typedef HashTable<argNames##ConstructorPtr, word, string::hash>            \
+        argNames##ConstructorTable;                                            \
+                                                                               \
+    /* Construct from argList function pointer table pointer */                \
+    static argNames##ConstructorTable* argNames##ConstructorTablePtr_;         \
+                                                                               \
+    /* Table constructor called from the table add function */                 \
+    static void construct##argNames##ConstructorTables();                      \
+                                                                               \
+    /* Table destructor called from the table add function destructor */       \
+    static void destroy##argNames##ConstructorTables();                        \
+                                                                               \
+    /* Class to add constructor from argList to table */                       \
+    template<class baseType##Type>                                             \
+    class add##argNames##ConstructorToTable                                    \
+    {                                                                          \
+    public:                                                                    \
+                                                                               \
+        static autoPtr<baseType> New##baseType argList                         \
+        {                                                                      \
+            return autoPtr<baseType>(baseType##Type::New parList.ptr());       \
+        }                                                                      \
+                                                                               \
+        add##argNames##ConstructorToTable                                      \
+        (                                                                      \
+            const word& lookup = baseType##Type::typeName                      \
+        )                                                                      \
+        {                                                                      \
+            construct##argNames##ConstructorTables();                          \
+            if                                                                 \
+            (                                                                  \
+               !argNames##ConstructorTablePtr_->insert                         \
+                (                                                              \
+                    lookup,                                                    \
+                    New##baseType                                              \
+                )                                                              \
+            )                                                                  \
+            {                                                                  \
+                std::cerr<< "Duplicate entry " << lookup                       \
+                    << " in runtime selection table " << #baseType             \
+                    << std::endl;                                              \
+                error::safePrintStack(std::cerr);                              \
+            }                                                                  \
+        }                                                                      \
+                                                                               \
+        ~add##argNames##ConstructorToTable()                                   \
+        {                                                                      \
+            destroy##argNames##ConstructorTables();                            \
+        }                                                                      \
+    };                                                                         \
+                                                                               \
+    /* Class to add constructor from argList to table */                       \
+    template<class baseType##Type>                                             \
+    class addRemovable##argNames##ConstructorToTable                           \
+    {                                                                          \
+        /* retain lookup name for later removal */                             \
+        const word& lookup_;                                                   \
+                                                                               \
+    public:                                                                    \
+                                                                               \
+        static autoPtr<baseType> New##baseType argList                         \
+        {                                                                      \
+            return autoPtr<baseType>(baseType##Type::New parList.ptr());       \
+        }                                                                      \
+                                                                               \
+        addRemovable##argNames##ConstructorToTable                             \
+        (                                                                      \
+            const word& lookup = baseType##Type::typeName                      \
+        )                                                                      \
+        :                                                                      \
+            lookup_(lookup)                                                    \
+        {                                                                      \
+            construct##argNames##ConstructorTables();                          \
+            argNames##ConstructorTablePtr_->set                                \
+            (                                                                  \
+                lookup,                                                        \
+                New##baseType                                                  \
+            );                                                                 \
+        }                                                                      \
+                                                                               \
+        ~addRemovable##argNames##ConstructorToTable()                          \
+        {                                                                      \
+            if (argNames##ConstructorTablePtr_)                                \
+            {                                                                  \
+                argNames##ConstructorTablePtr_->erase(lookup_);                \
+            }                                                                  \
+        }                                                                      \
     };
 
 
 // internal use:
 // constructor aid
 #define defineRunTimeSelectionTableConstructor\
-(baseType,argNames)                                                           \
-                                                                              \
-    /* Table constructor called from the table add function */                \
-    void baseType::construct##argNames##ConstructorTables()                   \
-    {                                                                         \
-        static bool constructed = false;                                      \
-        if (!constructed)                                                     \
-        {                                                                     \
-            constructed = true;                                               \
-            baseType::argNames##ConstructorTablePtr_                          \
-                = new baseType::argNames##ConstructorTable;                   \
-        }                                                                     \
+(baseType,argNames)                                                            \
+                                                                               \
+    /* Table constructor called from the table add function */                 \
+    void baseType::construct##argNames##ConstructorTables()                    \
+    {                                                                          \
+        static bool constructed = false;                                       \
+        if (!constructed)                                                      \
+        {                                                                      \
+            constructed = true;                                                \
+            baseType::argNames##ConstructorTablePtr_                           \
+                = new baseType::argNames##ConstructorTable;                    \
+        }                                                                      \
     }
 
 
 // internal use:
 // destructor aid
 #define defineRunTimeSelectionTableDestructor\
-(baseType,argNames)                                                           \
-                                                                              \
-    /* Table destructor called from the table add function destructor */      \
-    void baseType::destroy##argNames##ConstructorTables()                     \
-    {                                                                         \
-        if (baseType::argNames##ConstructorTablePtr_)                         \
-        {                                                                     \
-            delete baseType::argNames##ConstructorTablePtr_;                  \
-            baseType::argNames##ConstructorTablePtr_ = NULL;                  \
-        }                                                                     \
+(baseType,argNames)                                                            \
+                                                                               \
+    /* Table destructor called from the table add function destructor */       \
+    void baseType::destroy##argNames##ConstructorTables()                      \
+    {                                                                          \
+        if (baseType::argNames##ConstructorTablePtr_)                          \
+        {                                                                      \
+            delete baseType::argNames##ConstructorTablePtr_;                   \
+            baseType::argNames##ConstructorTablePtr_ = NULL;                   \
+        }                                                                      \
     }
 
 
 // internal use:
 // create pointer to hash-table of functions
 #define defineRunTimeSelectionTablePtr\
-(baseType,argNames)                                                           \
-                                                                              \
-    /* Define the constructor function table */                               \
-    baseType::argNames##ConstructorTable*                                     \
+(baseType,argNames)                                                            \
+                                                                               \
+    /* Define the constructor function table */                                \
+    baseType::argNames##ConstructorTable*                                      \
         baseType::argNames##ConstructorTablePtr_ = NULL
 
 
 // not much in use:
-#define defineTemplateRunTimeSelectionTablePtr(baseType,argNames)             \
-                                                                              \
-    /* Define the constructor function table */                               \
-    typename baseType::argNames##ConstructorTable*                            \
+#define defineTemplateRunTimeSelectionTablePtr(baseType,argNames)              \
+                                                                               \
+    /* Define the constructor function table */                                \
+    typename baseType::argNames##ConstructorTable*                             \
         baseType::argNames##ConstructorTablePtr_ = NULL
 
 
@@ -293,10 +293,10 @@ Description
 // ~~~~~~~~~~~~~
 // define run-time selection table
 #define defineRunTimeSelectionTable\
-(baseType,argNames)                                                           \
-                                                                              \
-    defineRunTimeSelectionTablePtr(baseType,argNames);                        \
-    defineRunTimeSelectionTableConstructor(baseType,argNames);                \
+(baseType,argNames)                                                            \
+                                                                               \
+    defineRunTimeSelectionTablePtr(baseType,argNames);                         \
+    defineRunTimeSelectionTableConstructor(baseType,argNames);                 \
     defineRunTimeSelectionTableDestructor(baseType,argNames)
 
 
@@ -305,13 +305,13 @@ Description
 // define run-time selection table for template classes
 // use when baseType doesn't need a template argument (eg, is a typedef)
 #define defineTemplateRunTimeSelectionTable\
-(baseType,argNames)                                                           \
-                                                                              \
-    template<>                                                                \
-    defineRunTimeSelectionTablePtr(baseType,argNames);                        \
-    template<>                                                                \
-    defineRunTimeSelectionTableConstructor(baseType,argNames);                \
-    template<>                                                                \
+(baseType,argNames)                                                            \
+                                                                               \
+    template<>                                                                 \
+    defineRunTimeSelectionTablePtr(baseType,argNames);                         \
+    template<>                                                                 \
+    defineRunTimeSelectionTableConstructor(baseType,argNames);                 \
+    template<>                                                                 \
     defineRunTimeSelectionTableDestructor(baseType,argNames)
 
 
@@ -322,18 +322,18 @@ Description
 // constructor aid
 // use when baseType requires the Targ template argument
 #define defineTemplatedRunTimeSelectionTableConstructor\
-(baseType,argNames,Targ)                                                      \
-                                                                              \
-    /* Table constructor called from the table add function */                \
-    void baseType<Targ>::construct##argNames##ConstructorTables()             \
-    {                                                                         \
-        static bool constructed = false;                                      \
-        if (!constructed)                                                     \
-        {                                                                     \
-            constructed = true;                                               \
-            baseType<Targ>::argNames##ConstructorTablePtr_                    \
-                = new baseType<Targ>::argNames##ConstructorTable;             \
-        }                                                                     \
+(baseType,argNames,Targ)                                                       \
+                                                                               \
+    /* Table constructor called from the table add function */                 \
+    void baseType<Targ>::construct##argNames##ConstructorTables()              \
+    {                                                                          \
+        static bool constructed = false;                                       \
+        if (!constructed)                                                      \
+        {                                                                      \
+            constructed = true;                                                \
+            baseType<Targ>::argNames##ConstructorTablePtr_                     \
+                = new baseType<Targ>::argNames##ConstructorTable;              \
+        }                                                                      \
     }
 
 
@@ -341,16 +341,16 @@ Description
 // destructor aid
 // use when baseType requires the Targ template argument
 #define defineTemplatedRunTimeSelectionTableDestructor\
-(baseType,argNames,Targ)                                                      \
-                                                                              \
-    /* Table destructor called from the table add function destructor */      \
-    void baseType<Targ>::destroy##argNames##ConstructorTables()               \
-    {                                                                         \
-        if (baseType<Targ>::argNames##ConstructorTablePtr_)                   \
-        {                                                                     \
-            delete baseType<Targ>::argNames##ConstructorTablePtr_;            \
-            baseType<Targ>::argNames##ConstructorTablePtr_ = NULL;            \
-        }                                                                     \
+(baseType,argNames,Targ)                                                       \
+                                                                               \
+    /* Table destructor called from the table add function destructor */       \
+    void baseType<Targ>::destroy##argNames##ConstructorTables()                \
+    {                                                                          \
+        if (baseType<Targ>::argNames##ConstructorTablePtr_)                    \
+        {                                                                      \
+            delete baseType<Targ>::argNames##ConstructorTablePtr_;             \
+            baseType<Targ>::argNames##ConstructorTablePtr_ = NULL;             \
+        }                                                                      \
     }
 
 
@@ -358,10 +358,10 @@ Description
 // create pointer to hash-table of functions
 // use when baseType requires the Targ template argument
 #define defineTemplatedRunTimeSelectionTablePtr\
-(baseType,argNames,Targ)                                                      \
-                                                                              \
-    /* Define the constructor function table */                               \
-    baseType<Targ>::argNames##ConstructorTable*                               \
+(baseType,argNames,Targ)                                                       \
+                                                                               \
+    /* Define the constructor function table */                                \
+    baseType<Targ>::argNames##ConstructorTable*                                \
         baseType<Targ>::argNames##ConstructorTablePtr_ = NULL
 
 
@@ -370,13 +370,13 @@ Description
 // define run-time selection table for template classes
 // use when baseType requires the Targ template argument
 #define defineTemplatedRunTimeSelectionTable\
-(baseType,argNames,Targ)                                                      \
-                                                                              \
-    template<>                                                                \
-    defineTemplatedRunTimeSelectionTablePtr(baseType,argNames,Targ);          \
-    template<>                                                                \
-    defineTemplatedRunTimeSelectionTableConstructor(baseType,argNames,Targ);  \
-    template<>                                                                \
+(baseType,argNames,Targ)                                                       \
+                                                                               \
+    template<>                                                                 \
+    defineTemplatedRunTimeSelectionTablePtr(baseType,argNames,Targ);           \
+    template<>                                                                 \
+    defineTemplatedRunTimeSelectionTableConstructor(baseType,argNames,Targ);   \
+    template<>                                                                 \
     defineTemplatedRunTimeSelectionTableDestructor(baseType,argNames,Targ)
 
 
diff --git a/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
index 502fb20eef..32894a9c7b 100644
--- a/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
@@ -36,10 +36,10 @@ Description
 
 // add to hash-table of functions with 'lookup' as the key
 #define addNamedToGlobalFunctionSelectionTable\
-(memberFunction,argNames,lookup,functionPtr)                                  \
-                                                                              \
-    /* Add to the table, find by lookup name */                               \
-    add##memberFunction##argNames##GlobalMemberFunctionToTable                \
+(memberFunction,argNames,lookup,functionPtr)                                   \
+                                                                               \
+    /* Add to the table, find by lookup name */                                \
+    add##memberFunction##argNames##GlobalMemberFunctionToTable                 \
     add_##lookup##_##memberFunction##argNames##GlobalMemberFunctionTo##Table_ \
     (#lookup, functionPtr)
 
diff --git a/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
index 64a8d639c3..41f8ef7d6d 100644
--- a/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
@@ -40,87 +40,87 @@ Description
 // ~~~~~~~~~~~~~
 // declare a run-time selection:
 #define declareGlobalFunctionSelectionTable\
-(returnType,memberFunction,argNames,argList,parList)                          \
-                                                                              \
-    /* Construct from argList function pointer type */                        \
+(returnType,memberFunction,argNames,argList,parList)                           \
+                                                                               \
+    /* Construct from argList function pointer type */                         \
     typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList; \
-                                                                              \
-    /* Construct from argList function table type */                          \
-    typedef HashTable                                                         \
-        <memberFunction##argNames##MemberFunctionPtr, word, string::hash>     \
-        memberFunction##argNames##MemberFunctionTable;                        \
-                                                                              \
-    /* Construct from argList function pointer table pointer */               \
-    extern memberFunction##argNames##MemberFunctionTable*                     \
-        memberFunction##argNames##MemberFunctionTablePtr_;                    \
-                                                                              \
-    /* Table memberFunction called from the table add function */             \
-    void construct##memberFunction##argNames##MemberFunctionTables();         \
-                                                                              \
-    /* Table destructor called from the table add function destructor */      \
-    void destroy##memberFunction##argNames##MemberFunctionTables();           \
-                                                                              \
-    /* Class to add constructor from argList to table */                      \
-    class add##memberFunction##argNames##GlobalMemberFunctionToTable          \
-    {                                                                         \
-    public:                                                                   \
-                                                                              \
-        add##memberFunction##argNames##GlobalMemberFunctionToTable            \
-        (                                                                     \
-            const word& lookup,                                               \
-            memberFunction##argNames##MemberFunctionPtr function              \
-        )                                                                     \
-        {                                                                     \
-            construct##memberFunction##argNames##MemberFunctionTables();      \
-            memberFunction##argNames##MemberFunctionTablePtr_->insert         \
-            (                                                                 \
-                lookup,                                                       \
-                function                                                      \
-            );                                                                \
-        }                                                                     \
-                                                                              \
-        ~add##memberFunction##argNames##GlobalMemberFunctionToTable()         \
-        {                                                                     \
-            destroy##memberFunction##argNames##MemberFunctionTables();        \
-        }                                                                     \
+                                                                               \
+    /* Construct from argList function table type */                           \
+    typedef HashTable                                                          \
+        <memberFunction##argNames##MemberFunctionPtr, word, string::hash>      \
+        memberFunction##argNames##MemberFunctionTable;                         \
+                                                                               \
+    /* Construct from argList function pointer table pointer */                \
+    extern memberFunction##argNames##MemberFunctionTable*                      \
+        memberFunction##argNames##MemberFunctionTablePtr_;                     \
+                                                                               \
+    /* Table memberFunction called from the table add function */              \
+    void construct##memberFunction##argNames##MemberFunctionTables();          \
+                                                                               \
+    /* Table destructor called from the table add function destructor */       \
+    void destroy##memberFunction##argNames##MemberFunctionTables();            \
+                                                                               \
+    /* Class to add constructor from argList to table */                       \
+    class add##memberFunction##argNames##GlobalMemberFunctionToTable           \
+    {                                                                          \
+    public:                                                                    \
+                                                                               \
+        add##memberFunction##argNames##GlobalMemberFunctionToTable             \
+        (                                                                      \
+            const word& lookup,                                                \
+            memberFunction##argNames##MemberFunctionPtr function               \
+        )                                                                      \
+        {                                                                      \
+            construct##memberFunction##argNames##MemberFunctionTables();       \
+            memberFunction##argNames##MemberFunctionTablePtr_->insert          \
+            (                                                                  \
+                lookup,                                                        \
+                function                                                       \
+            );                                                                 \
+        }                                                                      \
+                                                                               \
+        ~add##memberFunction##argNames##GlobalMemberFunctionToTable()          \
+        {                                                                      \
+            destroy##memberFunction##argNames##MemberFunctionTables();         \
+        }                                                                      \
     }
 
 
 // internal use:
 // constructor/destructor aid
 #define defineGlobalFunctionSelectionTableConstructDestruct\
-(memberFunction,argNames)                                                     \
-                                                                              \
-    /* Table constructor called from the table add function */                \
-    void construct##memberFunction##argNames##MemberFunctionTables()          \
-    {                                                                         \
-        static bool constructed = false;                                      \
-        if (!constructed)                                                     \
-        {                                                                     \
-            constructed = true;                                               \
-            memberFunction##argNames##MemberFunctionTablePtr_                 \
-                = new memberFunction##argNames##MemberFunctionTable;          \
-        }                                                                     \
-    }                                                                         \
-                                                                              \
-    /* Table destructor called from the table add function destructor */      \
-    void destroy##memberFunction##argNames##MemberFunctionTables()            \
-    {                                                                         \
-        if (memberFunction##argNames##MemberFunctionTablePtr_)                \
-        {                                                                     \
-            delete memberFunction##argNames##MemberFunctionTablePtr_;         \
-            memberFunction##argNames##MemberFunctionTablePtr_ = NULL;         \
-        }                                                                     \
+(memberFunction,argNames)                                                      \
+                                                                               \
+    /* Table constructor called from the table add function */                 \
+    void construct##memberFunction##argNames##MemberFunctionTables()           \
+    {                                                                          \
+        static bool constructed = false;                                       \
+        if (!constructed)                                                      \
+        {                                                                      \
+            constructed = true;                                                \
+            memberFunction##argNames##MemberFunctionTablePtr_                  \
+                = new memberFunction##argNames##MemberFunctionTable;           \
+        }                                                                      \
+    }                                                                          \
+                                                                               \
+    /* Table destructor called from the table add function destructor */       \
+    void destroy##memberFunction##argNames##MemberFunctionTables()             \
+    {                                                                          \
+        if (memberFunction##argNames##MemberFunctionTablePtr_)                 \
+        {                                                                      \
+            delete memberFunction##argNames##MemberFunctionTablePtr_;          \
+            memberFunction##argNames##MemberFunctionTablePtr_ = NULL;          \
+        }                                                                      \
     }
 
 
 // internal use:
 // create pointer to hash-table of functions
 #define defineGlobalFunctionSelectionTablePtr\
-(memberFunction,argNames)                                                     \
-                                                                              \
-    /* Define the memberFunction table */                                     \
-    memberFunction##argNames##MemberFunctionTable*                            \
+(memberFunction,argNames)                                                      \
+                                                                               \
+    /* Define the memberFunction table */                                      \
+    memberFunction##argNames##MemberFunctionTable*                             \
         memberFunction##argNames##MemberFunctionTablePtr_ = NULL
 
 
@@ -130,11 +130,11 @@ Description
 // ~~~~~~~~~~~~~
 // define run-time selection table
 #define defineGlobalFunctionSelectionTable\
-(memberFunction,argNames)                                                     \
-                                                                              \
-    defineGlobalFunctionSelectionTablePtr                                     \
-        (memberFunction,argNames);                                            \
-    defineGlobalFunctionSelectionTableConstructDestruct                       \
+(memberFunction,argNames)                                                      \
+                                                                               \
+    defineGlobalFunctionSelectionTablePtr                                      \
+        (memberFunction,argNames);                                             \
+    defineGlobalFunctionSelectionTableConstructDestruct                        \
         (memberFunction,argNames)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H
index a8ddcb9145..69aa8c46dc 100644
--- a/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H
@@ -37,21 +37,21 @@ Description
 
 // add to hash-table of functions with typename as the key
 #define addToMemberFunctionSelectionTable\
-(baseType,thisType,memberFunction,argNames)                                   \
-                                                                              \
-    /* Add the thisType memberFunction to the table */                        \
-    baseType::add##memberFunction##argNames##MemberFunctionToTable<thisType>  \
+(baseType,thisType,memberFunction,argNames)                                    \
+                                                                               \
+    /* Add the thisType memberFunction to the table */                         \
+    baseType::add##memberFunction##argNames##MemberFunctionToTable<thisType>   \
     add##thisType##memberFunction##argNames##MemberFunctionTo##baseType##Table_
 
 
 
 // add to hash-table of functions with 'lookup' as the key
 #define addNamedToMemberFunctionSelectionTable\
-(baseType,thisType,memberFunction,argNames,lookup)                            \
-                                                                              \
-    /* Add the thisType memberFunction to the table, find by lookup name */   \
-    baseType::add##memberFunction##argNames##MemberFunctionToTable<thisType>  \
-    add_##lookup##_##thisType##memberFunction##argNames##MemberFunctionTo##   \
+(baseType,thisType,memberFunction,argNames,lookup)                             \
+                                                                               \
+    /* Add the thisType memberFunction to the table, find by lookup name */    \
+    baseType::add##memberFunction##argNames##MemberFunctionToTable<thisType>   \
+    add_##lookup##_##thisType##memberFunction##argNames##MemberFunctionTo##    \
     baseType##Table_(#lookup)
 
 
@@ -61,44 +61,44 @@ Description
 // add to hash-table of functions with typename as the key
 // use when baseType doesn't need a template argument (eg, is a typedef)
 #define addTemplateToMemberFunctionSelectionTable\
-(baseType,thisType,Targ,memberFunction,argNames)                              \
-                                                                              \
-    /* Add the thisType memberFunction to the table */                        \
-    baseType::add##memberFunction##argNames##                                 \
-    MemberFunctionToTable<thisType<Targ>>                                    \
-    add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##         \
+(baseType,thisType,Targ,memberFunction,argNames)                               \
+                                                                               \
+    /* Add the thisType memberFunction to the table */                         \
+    baseType::add##memberFunction##argNames##                                  \
+    MemberFunctionToTable<thisType<Targ>>                                      \
+    add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##          \
     baseType##Table_
 
 
 // add to hash-table of functions with 'lookup' as the key
 // use when baseType doesn't need a template argument (eg, is a typedef)
 #define addNamedTemplateToMemberFunctionSelectionTable\
-(baseType,thisType,Targ,memberFunction,argNames,lookup)                       \
-                                                                              \
-    /* Add the thisType memberFunction to the table, find by lookup name */   \
-    baseType::add##memberFunction##argNames##                                 \
-    MemberFunctionToTable<thisType<Targ>>                                    \
-    add_##lookup##_##thisType##Targ##memberFunction##argNames##               \
+(baseType,thisType,Targ,memberFunction,argNames,lookup)                        \
+                                                                               \
+    /* Add the thisType memberFunction to the table, find by lookup name */    \
+    baseType::add##memberFunction##argNames##                                  \
+    MemberFunctionToTable<thisType<Targ>>                                      \
+    add_##lookup##_##thisType##Targ##memberFunction##argNames##                \
     MemberFunctionTo##baseType##Table_(#lookup)
 
 // use when baseType requires the Targ template argument as well
 #define addTemplatedToMemberFunctionSelectionTable\
-(baseType,thisType,Targ,memberFunction,argNames)                              \
-                                                                              \
-    /* Add the thisType memberFunction to the table */                        \
-    baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ>>                                    \
-    add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##         \
+(baseType,thisType,Targ,memberFunction,argNames)                               \
+                                                                               \
+    /* Add the thisType memberFunction to the table */                         \
+    baseType<Targ>::add##memberFunction##argNames##                            \
+    MemberFunctionToTable<thisType<Targ>>                                      \
+    add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##          \
     baseType##Targ##Table_
 
 // use when baseType requires the Targ template argument as well
 #define addNamedTemplatedToMemberFunctionSelectionTable\
-(baseType,thisType,Targ,memberFunction,argNames,lookup)                       \
-                                                                              \
-    /* Add the thisType memberFunction to the table, find by lookup name */   \
-    baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ>>                                    \
-    add_##lookup##_##thisType##Targ##memberFunction##argNames##               \
+(baseType,thisType,Targ,memberFunction,argNames,lookup)                        \
+                                                                               \
+    /* Add the thisType memberFunction to the table, find by lookup name */    \
+    baseType<Targ>::add##memberFunction##argNames##                            \
+    MemberFunctionToTable<thisType<Targ>>                                      \
+    add_##lookup##_##thisType##Targ##memberFunction##argNames##                \
     MemberFunctionTo##baseType##Targ##Table_(#lookup)
 
 
@@ -108,24 +108,24 @@ Description
 // add to hash-table of functions with typename as the key
 // use when baseType requires the Targ template argument as well
 #define addTemplatedToMemberFunctionSelectionTable\
-(baseType,thisType,Targ,memberFunction,argNames)                              \
-                                                                              \
-    /* Add the thisType memberFunction to the table */                        \
-    baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ>>                                    \
-    add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##         \
+(baseType,thisType,Targ,memberFunction,argNames)                               \
+                                                                               \
+    /* Add the thisType memberFunction to the table */                         \
+    baseType<Targ>::add##memberFunction##argNames##                            \
+    MemberFunctionToTable<thisType<Targ>>                                      \
+    add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##          \
     baseType##Targ##Table_
 
 
 // add to hash-table of functions with 'lookup' as the key
 // use when baseType requires the Targ template argument as well
 #define addNamedTemplatedToMemberFunctionSelectionTable\
-(baseType,thisType,Targ,memberFunction,argNames,lookup)                       \
-                                                                              \
-    /* Add the thisType memberFunction to the table, find by lookup name */   \
-    baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ>>                                    \
-    add_##lookup##_##thisType##Targ##memberFunction##argNames##               \
+(baseType,thisType,Targ,memberFunction,argNames,lookup)                        \
+                                                                               \
+    /* Add the thisType memberFunction to the table, find by lookup name */    \
+    baseType<Targ>::add##memberFunction##argNames##                            \
+    MemberFunctionToTable<thisType<Targ>>                                      \
+    add_##lookup##_##thisType##Targ##memberFunction##argNames##                \
     MemberFunctionTo##baseType##Targ##Table_(#lookup)
 
 
diff --git a/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
index 44ac58773e..6f3e6ee220 100644
--- a/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
@@ -43,102 +43,102 @@ Description
 // ~~~~~~~~~~~~~
 // declare a run-time selection:
 #define declareMemberFunctionSelectionTable\
-(returnType,baseType,memberFunction,argNames,argList,parList)                 \
-                                                                              \
-    /* Construct from argList function pointer type */                        \
+(returnType,baseType,memberFunction,argNames,argList,parList)                  \
+                                                                               \
+    /* Construct from argList function pointer type */                         \
     typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList; \
-                                                                              \
-    /* Construct from argList function table type */                          \
-    typedef HashTable                                                         \
-        <memberFunction##argNames##MemberFunctionPtr, word, string::hash>     \
-        memberFunction##argNames##MemberFunctionTable;                        \
-                                                                              \
-    /* Construct from argList function pointer table pointer */               \
-    static memberFunction##argNames##MemberFunctionTable*                     \
-        memberFunction##argNames##MemberFunctionTablePtr_;                    \
-                                                                              \
-    /* Class to add constructor from argList to table */                      \
-    template<class baseType##Type>                                            \
-    class add##memberFunction##argNames##MemberFunctionToTable                \
-    {                                                                         \
-    public:                                                                   \
-                                                                              \
-        add##memberFunction##argNames##MemberFunctionToTable                  \
-        (                                                                     \
-            const word& lookup = baseType##Type::typeName                     \
-        )                                                                     \
-        {                                                                     \
-            construct##memberFunction##argNames##MemberFunctionTables();      \
-            memberFunction##argNames##MemberFunctionTablePtr_->insert         \
-            (                                                                 \
-                lookup,                                                       \
-                baseType##Type::memberFunction                                \
-            );                                                                \
-        }                                                                     \
-                                                                              \
-        ~add##memberFunction##argNames##MemberFunctionToTable()               \
-        {                                                                     \
-            destroy##memberFunction##argNames##MemberFunctionTables();        \
-        }                                                                     \
-    };                                                                        \
-                                                                              \
-    /* Table memberFunction called from the table add function */             \
-    static void construct##memberFunction##argNames##MemberFunctionTables();  \
-                                                                              \
-    /* Table destructor called from the table add function destructor */      \
+                                                                               \
+    /* Construct from argList function table type */                           \
+    typedef HashTable                                                          \
+        <memberFunction##argNames##MemberFunctionPtr, word, string::hash>      \
+        memberFunction##argNames##MemberFunctionTable;                         \
+                                                                               \
+    /* Construct from argList function pointer table pointer */                \
+    static memberFunction##argNames##MemberFunctionTable*                      \
+        memberFunction##argNames##MemberFunctionTablePtr_;                     \
+                                                                               \
+    /* Class to add constructor from argList to table */                       \
+    template<class baseType##Type>                                             \
+    class add##memberFunction##argNames##MemberFunctionToTable                 \
+    {                                                                          \
+    public:                                                                    \
+                                                                               \
+        add##memberFunction##argNames##MemberFunctionToTable                   \
+        (                                                                      \
+            const word& lookup = baseType##Type::typeName                      \
+        )                                                                      \
+        {                                                                      \
+            construct##memberFunction##argNames##MemberFunctionTables();       \
+            memberFunction##argNames##MemberFunctionTablePtr_->insert          \
+            (                                                                  \
+                lookup,                                                        \
+                baseType##Type::memberFunction                                 \
+            );                                                                 \
+        }                                                                      \
+                                                                               \
+        ~add##memberFunction##argNames##MemberFunctionToTable()                \
+        {                                                                      \
+            destroy##memberFunction##argNames##MemberFunctionTables();         \
+        }                                                                      \
+    };                                                                         \
+                                                                               \
+    /* Table memberFunction called from the table add function */              \
+    static void construct##memberFunction##argNames##MemberFunctionTables();   \
+                                                                               \
+    /* Table destructor called from the table add function destructor */       \
     static void destroy##memberFunction##argNames##MemberFunctionTables()
 
 
 // internal use:
 // constructor aid
 #define defineMemberFunctionSelectionTableMemberFunction\
-(baseType,memberFunction,argNames)                                            \
-                                                                              \
-    /* Table memberFunction called from the table add function */             \
+(baseType,memberFunction,argNames)                                             \
+                                                                               \
+    /* Table memberFunction called from the table add function */              \
     void baseType::construct##memberFunction##argNames##MemberFunctionTables()\
-    {                                                                         \
-        static bool constructed = false;                                      \
-        if (!constructed)                                                     \
-        {                                                                     \
-            constructed = true;                                               \
-            baseType::memberFunction##argNames##MemberFunctionTablePtr_       \
+    {                                                                          \
+        static bool constructed = false;                                       \
+        if (!constructed)                                                      \
+        {                                                                      \
+            constructed = true;                                                \
+            baseType::memberFunction##argNames##MemberFunctionTablePtr_        \
                 = new baseType::memberFunction##argNames##MemberFunctionTable;\
-        }                                                                     \
+        }                                                                      \
     }
 
 
 // internal use:
 // destructor aid
 #define defineMemberFunctionSelectionTableDestructor\
-(baseType,memberFunction,argNames)                                            \
-                                                                              \
-    /* Table destructor called from the table add function destructor */      \
-    void baseType::destroy##memberFunction##argNames##MemberFunctionTables()  \
-    {                                                                         \
-        if (baseType::memberFunction##argNames##MemberFunctionTablePtr_)      \
-        {                                                                     \
+(baseType,memberFunction,argNames)                                             \
+                                                                               \
+    /* Table destructor called from the table add function destructor */       \
+    void baseType::destroy##memberFunction##argNames##MemberFunctionTables()   \
+    {                                                                          \
+        if (baseType::memberFunction##argNames##MemberFunctionTablePtr_)       \
+        {                                                                      \
             delete baseType::memberFunction##argNames##MemberFunctionTablePtr_;\
             baseType::memberFunction##argNames##MemberFunctionTablePtr_ = NULL;\
-        }                                                                     \
+        }                                                                      \
     }
 
 
 // internal use:
 // create pointer to hash-table of functions
 #define defineMemberFunctionSelectionTablePtr\
-(baseType,memberFunction,argNames)                                            \
-                                                                              \
-    /* Define the memberFunction table */                                     \
-    baseType::memberFunction##argNames##MemberFunctionTable*                  \
+(baseType,memberFunction,argNames)                                             \
+                                                                               \
+    /* Define the memberFunction table */                                      \
+    baseType::memberFunction##argNames##MemberFunctionTable*                   \
         baseType::memberFunction##argNames##MemberFunctionTablePtr_ = NULL
 
 
 // not much in use:
 #define defineTemplateMemberFunctionSelectionTablePtr\
-(baseType,memberFunction,argNames)                                            \
-                                                                              \
-    /* Define the memberFunction table */                                     \
-    typename baseType::memberFunction##argNames##MemberFunctionTable*         \
+(baseType,memberFunction,argNames)                                             \
+                                                                               \
+    /* Define the memberFunction table */                                      \
+    typename baseType::memberFunction##argNames##MemberFunctionTable*          \
         baseType::memberFunction##argNames##MemberFunctionTablePtr_ = NULL
 
 
@@ -148,13 +148,13 @@ Description
 // ~~~~~~~~~~~~~
 // define run-time selection table
 #define defineMemberFunctionSelectionTable\
-(baseType,memberFunction,argNames)                                            \
-                                                                              \
-    defineMemberFunctionSelectionTablePtr                                     \
-        (baseType,memberFunction,argNames);                                   \
-    defineMemberFunctionSelectionTableMemberFunction                          \
-        (baseType,memberFunction,argNames)                                    \
-    defineMemberFunctionSelectionTableDestructor                              \
+(baseType,memberFunction,argNames)                                             \
+                                                                               \
+    defineMemberFunctionSelectionTablePtr                                      \
+        (baseType,memberFunction,argNames);                                    \
+    defineMemberFunctionSelectionTableMemberFunction                           \
+        (baseType,memberFunction,argNames)                                     \
+    defineMemberFunctionSelectionTableDestructor                               \
         (baseType,memberFunction,argNames)
 
 
@@ -163,16 +163,16 @@ Description
 // define run-time selection table for template classes
 // use when baseType doesn't need a template argument (eg, is a typedef)
 #define defineTemplateMemberFunctionSelectionTable\
-(baseType,memberFunction,argNames)                                            \
-                                                                              \
-    template<>                                                                \
-    defineMemberFunctionSelectionTablePtr                                     \
-        (baseType,memberFunction,argNames);                                   \
-    template<>                                                                \
-    defineMemberFunctionSelectionTableMemberFunction                          \
-        (baseType,memberFunction,argNames)                                    \
-    template<>                                                                \
-    defineMemberFunctionSelectionTableDestructor                              \
+(baseType,memberFunction,argNames)                                             \
+                                                                               \
+    template<>                                                                 \
+    defineMemberFunctionSelectionTablePtr                                      \
+        (baseType,memberFunction,argNames);                                    \
+    template<>                                                                 \
+    defineMemberFunctionSelectionTableMemberFunction                           \
+        (baseType,memberFunction,argNames)                                     \
+    template<>                                                                 \
+    defineMemberFunctionSelectionTableDestructor                               \
         (baseType,memberFunction,argNames)
 
 
@@ -182,20 +182,20 @@ Description
 // constructor aid
 // use when baseType requires the Targ template argument
 #define defineTemplatedMemberFunctionSelectionTableMemberFunction\
-(baseType,memberFunction,argNames,Targ)                                       \
-                                                                              \
-    /* Table memberFunction called from the table add function */             \
-    void baseType<Targ>::construct##memberFunction##argNames##                \
-    MemberFunctionTables()                                                    \
-    {                                                                         \
-        static bool constructed = false;                                      \
-        if (!constructed)                                                     \
-        {                                                                     \
-            constructed = true;                                               \
+(baseType,memberFunction,argNames,Targ)                                        \
+                                                                               \
+    /* Table memberFunction called from the table add function */              \
+    void baseType<Targ>::construct##memberFunction##argNames##                 \
+    MemberFunctionTables()                                                     \
+    {                                                                          \
+        static bool constructed = false;                                       \
+        if (!constructed)                                                      \
+        {                                                                      \
+            constructed = true;                                                \
             baseType<Targ>::memberFunction##argNames##MemberFunctionTablePtr_ \
-                = new baseType<Targ>::memberFunction##argNames##              \
-                  MemberFunctionTable;                                        \
-        }                                                                     \
+                = new baseType<Targ>::memberFunction##argNames##               \
+                  MemberFunctionTable;                                         \
+        }                                                                      \
     }
 
 
@@ -203,22 +203,22 @@ Description
 // destructor aid
 // use when baseType requires the Targ template argument
 #define defineTemplatedMemberFunctionSelectionTableDestructor\
-(baseType,memberFunction,argNames,Targ)                                       \
-                                                                              \
-    /* Table destructor called from the table add function destructor */      \
-    void baseType<Targ>::destroy##memberFunction##argNames##                  \
-    MemberFunctionTables()                                                    \
-    {                                                                         \
-        if                                                                    \
-        (                                                                     \
+(baseType,memberFunction,argNames,Targ)                                        \
+                                                                               \
+    /* Table destructor called from the table add function destructor */       \
+    void baseType<Targ>::destroy##memberFunction##argNames##                   \
+    MemberFunctionTables()                                                     \
+    {                                                                          \
+        if                                                                     \
+        (                                                                      \
             baseType<Targ>::memberFunction##argNames##MemberFunctionTablePtr_ \
-        )                                                                     \
-        {                                                                     \
-            delete baseType<Targ>::memberFunction##argNames##                 \
-                MemberFunctionTablePtr_;                                      \
-            baseType<Targ>::memberFunction##argNames##                        \
-                MemberFunctionTablePtr_ = NULL;                               \
-        }                                                                     \
+        )                                                                      \
+        {                                                                      \
+            delete baseType<Targ>::memberFunction##argNames##                  \
+                MemberFunctionTablePtr_;                                       \
+            baseType<Targ>::memberFunction##argNames##                         \
+                MemberFunctionTablePtr_ = NULL;                                \
+        }                                                                      \
     }
 
 
@@ -226,10 +226,10 @@ Description
 // create pointer to hash-table of functions
 // use when baseType requires the Targ template argument
 #define defineTemplatedMemberFunctionSelectionTablePtr\
-(baseType,memberFunction,argNames,Targ)                                       \
-                                                                              \
-    /* Define the memberFunction table */                                     \
-    baseType<Targ>::memberFunction##argNames##MemberFunctionTable*            \
+(baseType,memberFunction,argNames,Targ)                                        \
+                                                                               \
+    /* Define the memberFunction table */                                      \
+    baseType<Targ>::memberFunction##argNames##MemberFunctionTable*             \
         baseType<Targ>::memberFunction##argNames##MemberFunctionTablePtr_ = NULL
 
 
@@ -238,16 +238,16 @@ Description
 // define run-time selection table for template classes
 // use when baseType requires the Targ template argument
 #define defineTemplatedMemberFunctionSelectionTable\
-(baseType,memberFunction,argNames,Targ)                                       \
-                                                                              \
-    template<>                                                                \
-    defineTemplatedMemberFunctionSelectionTablePtr                            \
-        (baseType,memberFunction,argNames,Targ);                              \
-    template<>                                                                \
-    defineTemplatedMemberFunctionSelectionTableMemberFunction                 \
-        (baseType,memberFunction,argNames,Targ)                               \
-    template<>                                                                \
-    defineTemplatedMemberFunctionSelectionTableDestructor                     \
+(baseType,memberFunction,argNames,Targ)                                        \
+                                                                               \
+    template<>                                                                 \
+    defineTemplatedMemberFunctionSelectionTablePtr                             \
+        (baseType,memberFunction,argNames,Targ);                               \
+    template<>                                                                 \
+    defineTemplatedMemberFunctionSelectionTableMemberFunction                  \
+        (baseType,memberFunction,argNames,Targ)                                \
+    template<>                                                                 \
+    defineTemplatedMemberFunctionSelectionTableDestructor                      \
         (baseType,memberFunction,argNames,Targ)
 
 
diff --git a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
index 7d30af8df9..2652f40db3 100644
--- a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
@@ -37,12 +37,12 @@ Description
 
 // add to hash-table of functions with 'lookup' as the key
 #define addNamedToStaticMemberFunctionSelectionTable\
-(baseType,thisType,memberFunction,argNames,lookup,functionPtr)                \
-                                                                              \
-    /* Add the thisType memberFunction to the table, find by lookup name */   \
-    baseType::add##memberFunction##argNames##                                 \
-    StaticMemberFunctionToTable<thisType>                                     \
-    add_##lookup##_##thisType##memberFunction##argNames##                     \
+(baseType,thisType,memberFunction,argNames,lookup,functionPtr)                 \
+                                                                               \
+    /* Add the thisType memberFunction to the table, find by lookup name */    \
+    baseType::add##memberFunction##argNames##                                  \
+    StaticMemberFunctionToTable<thisType>                                      \
+    add_##lookup##_##thisType##memberFunction##argNames##                      \
     StaticMemberFunctionTo##baseType##Table_(#lookup, functionPtr)
 
 
diff --git a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
index 51de6fca43..347a537cc9 100644
--- a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
@@ -40,88 +40,88 @@ Description
 // ~~~~~~~~~~~~~
 // declare a run-time selection:
 #define declareStaticMemberFunctionSelectionTable\
-(returnType,baseType,memberFunction,argNames,argList,parList)                 \
-                                                                              \
-    /* Construct from argList function pointer type */                        \
+(returnType,baseType,memberFunction,argNames,argList,parList)                  \
+                                                                               \
+    /* Construct from argList function pointer type */                         \
     typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList; \
-                                                                              \
-    /* Construct from argList function table type */                          \
-    typedef HashTable                                                         \
-        <memberFunction##argNames##MemberFunctionPtr, word, string::hash>     \
-        memberFunction##argNames##MemberFunctionTable;                        \
-                                                                              \
-    /* Construct from argList function pointer table pointer */               \
-    static memberFunction##argNames##MemberFunctionTable*                     \
-        memberFunction##argNames##MemberFunctionTablePtr_;                    \
-                                                                              \
-    /* Table memberFunction called from the table add function */             \
-    static void construct##memberFunction##argNames##MemberFunctionTables();  \
-                                                                              \
-    /* Table destructor called from the table add function destructor */      \
-    static void destroy##memberFunction##argNames##MemberFunctionTables();    \
-                                                                              \
-    /* Class to add constructor from argList to table */                      \
-    template<class baseType##Type>                                            \
-    class add##memberFunction##argNames##StaticMemberFunctionToTable          \
-    {                                                                         \
-    public:                                                                   \
-                                                                              \
-        add##memberFunction##argNames##StaticMemberFunctionToTable            \
-        (                                                                     \
-            const word& lookup,                                               \
-            memberFunction##argNames##MemberFunctionPtr function              \
-        )                                                                     \
-        {                                                                     \
-            construct##memberFunction##argNames##MemberFunctionTables();      \
-            memberFunction##argNames##MemberFunctionTablePtr_->insert         \
-            (                                                                 \
-                lookup,                                                       \
-                function                                                      \
-            );                                                                \
-        }                                                                     \
-                                                                              \
-        ~add##memberFunction##argNames##StaticMemberFunctionToTable()         \
-        {                                                                     \
-            destroy##memberFunction##argNames##MemberFunctionTables();        \
-        }                                                                     \
+                                                                               \
+    /* Construct from argList function table type */                           \
+    typedef HashTable                                                          \
+        <memberFunction##argNames##MemberFunctionPtr, word, string::hash>      \
+        memberFunction##argNames##MemberFunctionTable;                         \
+                                                                               \
+    /* Construct from argList function pointer table pointer */                \
+    static memberFunction##argNames##MemberFunctionTable*                      \
+        memberFunction##argNames##MemberFunctionTablePtr_;                     \
+                                                                               \
+    /* Table memberFunction called from the table add function */              \
+    static void construct##memberFunction##argNames##MemberFunctionTables();   \
+                                                                               \
+    /* Table destructor called from the table add function destructor */       \
+    static void destroy##memberFunction##argNames##MemberFunctionTables();     \
+                                                                               \
+    /* Class to add constructor from argList to table */                       \
+    template<class baseType##Type>                                             \
+    class add##memberFunction##argNames##StaticMemberFunctionToTable           \
+    {                                                                          \
+    public:                                                                    \
+                                                                               \
+        add##memberFunction##argNames##StaticMemberFunctionToTable             \
+        (                                                                      \
+            const word& lookup,                                                \
+            memberFunction##argNames##MemberFunctionPtr function               \
+        )                                                                      \
+        {                                                                      \
+            construct##memberFunction##argNames##MemberFunctionTables();       \
+            memberFunction##argNames##MemberFunctionTablePtr_->insert          \
+            (                                                                  \
+                lookup,                                                        \
+                function                                                       \
+            );                                                                 \
+        }                                                                      \
+                                                                               \
+        ~add##memberFunction##argNames##StaticMemberFunctionToTable()          \
+        {                                                                      \
+            destroy##memberFunction##argNames##MemberFunctionTables();         \
+        }                                                                      \
     }
 
 
 // internal use:
 // constructor/destructor aid
 #define defineStaticMemberFunctionSelectionTableConstructDestruct\
-(baseType,memberFunction,argNames)                                            \
-                                                                              \
-    /* Table constructor called from the table add function constructor */    \
+(baseType,memberFunction,argNames)                                             \
+                                                                               \
+    /* Table constructor called from the table add function constructor */     \
     void baseType::construct##memberFunction##argNames##MemberFunctionTables()\
-    {                                                                         \
-        static bool constructed = false;                                      \
-        if (!constructed)                                                     \
-        {                                                                     \
-            constructed = true;                                               \
-            baseType::memberFunction##argNames##MemberFunctionTablePtr_       \
+    {                                                                          \
+        static bool constructed = false;                                       \
+        if (!constructed)                                                      \
+        {                                                                      \
+            constructed = true;                                                \
+            baseType::memberFunction##argNames##MemberFunctionTablePtr_        \
                 = new baseType::memberFunction##argNames##MemberFunctionTable;\
-        }                                                                     \
-    };                                                                        \
-                                                                              \
-    /* Table destructor called from the table add function destructor */      \
-    void baseType::destroy##memberFunction##argNames##MemberFunctionTables()  \
-    {                                                                         \
-        if (baseType::memberFunction##argNames##MemberFunctionTablePtr_)      \
-        {                                                                     \
+        }                                                                      \
+    };                                                                         \
+                                                                               \
+    /* Table destructor called from the table add function destructor */       \
+    void baseType::destroy##memberFunction##argNames##MemberFunctionTables()   \
+    {                                                                          \
+        if (baseType::memberFunction##argNames##MemberFunctionTablePtr_)       \
+        {                                                                      \
             delete baseType::memberFunction##argNames##MemberFunctionTablePtr_;\
             baseType::memberFunction##argNames##MemberFunctionTablePtr_ = NULL;\
-        }                                                                     \
+        }                                                                      \
     }
 
 
 // internal use:
 // create pointer to hash-table of functions
 #define defineStaticMemberFunctionSelectionTablePtr\
-(baseType,memberFunction,argNames)                                            \
-                                                                              \
-    /* Define the memberFunction table */                                     \
-    baseType::memberFunction##argNames##MemberFunctionTable*                  \
+(baseType,memberFunction,argNames)                                             \
+                                                                               \
+    /* Define the memberFunction table */                                      \
+    baseType::memberFunction##argNames##MemberFunctionTable*                   \
         baseType::memberFunction##argNames##MemberFunctionTablePtr_ = NULL
 
 
@@ -131,12 +131,12 @@ Description
 // ~~~~~~~~~~~~~
 // define run-time selection table
 #define defineStaticMemberFunctionSelectionTable\
-(baseType,memberFunction,argNames)                                            \
-                                                                              \
-    defineStaticMemberFunctionSelectionTablePtr                               \
-        (baseType,memberFunction,argNames);                                   \
-    defineStaticMemberFunctionSelectionTableConstructDestruct                 \
-        (baseType,memberFunction,argNames)                                    \
+(baseType,memberFunction,argNames)                                             \
+                                                                               \
+    defineStaticMemberFunctionSelectionTablePtr                                \
+        (baseType,memberFunction,argNames);                                    \
+    defineStaticMemberFunctionSelectionTableConstructDestruct                  \
+        (baseType,memberFunction,argNames)                                     \
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/typeInfo/className.H b/src/OpenFOAM/db/typeInfo/className.H
index e70e3c85dd..b96b1c7a14 100644
--- a/src/OpenFOAM/db/typeInfo/className.H
+++ b/src/OpenFOAM/db/typeInfo/className.H
@@ -39,24 +39,24 @@ Description
 
 //- Add typeName information from argument \a TypeNameString to a class.
 //  Without debug information
-#define ClassNameNoDebug(TypeNameString)                                      \
-    static const char* typeName_() { return TypeNameString; }                 \
+#define ClassNameNoDebug(TypeNameString)                                       \
+    static const char* typeName_() { return TypeNameString; }                  \
     static const ::Foam::word typeName
 
 //- Add typeName information from argument \a TypeNameString to a namespace.
 //  Without debug information.
-#define NamespaceNameNoDebug(TypeNameString)                                  \
-    inline const char* typeName_() { return TypeNameString; }                 \
+#define NamespaceNameNoDebug(TypeNameString)                                   \
+    inline const char* typeName_() { return TypeNameString; }                  \
     extern const ::Foam::word typeName
 
 //- Add typeName information from argument \a TemplateNameString to a
 //  template class.  Without debug information.
-#define TemplateNameNoDebug(TemplateNameString)                               \
-class TemplateNameString##Name                                                \
-{                                                                             \
-public:                                                                       \
-    TemplateNameString##Name() {}                                             \
-    ClassNameNoDebug(#TemplateNameString);                                    \
+#define TemplateNameNoDebug(TemplateNameString)                                \
+class TemplateNameString##Name                                                 \
+{                                                                              \
+public:                                                                        \
+    TemplateNameString##Name() {}                                              \
+    ClassNameNoDebug(#TemplateNameString);                                     \
 }
 
 
@@ -66,24 +66,24 @@ public:                                                                       \
 
 //- Add typeName information from argument \a TypeNameString to a class.
 //  Also declares debug information.
-#define ClassName(TypeNameString)                                             \
-    ClassNameNoDebug(TypeNameString);                                         \
+#define ClassName(TypeNameString)                                              \
+    ClassNameNoDebug(TypeNameString);                                          \
     static int debug
 
 //- Add typeName information from argument \a TypeNameString to a namespace.
 //  Also declares debug information.
-#define NamespaceName(TypeNameString)                                         \
-    NamespaceNameNoDebug(TypeNameString);                                     \
+#define NamespaceName(TypeNameString)                                          \
+    NamespaceNameNoDebug(TypeNameString);                                      \
     extern int debug
 
 //- Add typeName information from argument \a TypeNameString to a
 //  template class.  Also declares debug information.
-#define TemplateName(TemplateNameString)                                      \
-class TemplateNameString##Name                                                \
-{                                                                             \
-public:                                                                       \
-    TemplateNameString##Name() {}                                             \
-    ClassName(#TemplateNameString);                                           \
+#define TemplateName(TemplateNameString)                                       \
+class TemplateNameString##Name                                                 \
+{                                                                              \
+public:                                                                        \
+    TemplateNameString##Name() {}                                              \
+    ClassName(#TemplateNameString);                                            \
 }
 
 
@@ -92,28 +92,28 @@ public:                                                                       \
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 //- Define the typeName, with alternative lookup as \a Name
-#define defineTypeNameWithName(Type, Name)                                    \
+#define defineTypeNameWithName(Type, Name)                                     \
     const ::Foam::word Type::typeName(Name)
 
 //- Define the typeName
-#define defineTypeName(Type)                                                  \
+#define defineTypeName(Type)                                                   \
     defineTypeNameWithName(Type, Type::typeName_())
 
 //- Define the typeName as \a Name for template classes
-# define defineTemplateTypeNameWithName(Type, Name)                           \
-    template<>                                                                \
+# define defineTemplateTypeNameWithName(Type, Name)                            \
+    template<>                                                                 \
     defineTypeNameWithName(Type, Name)
 //- Define the typeName as \a Name for template sub-classes
-# define defineTemplate2TypeNameWithName(Type, Name)                          \
-    template<>                                                                \
+# define defineTemplate2TypeNameWithName(Type, Name)                           \
+    template<>                                                                 \
     defineTypeNameWithName(Type, Name)
 
 //- Define the typeName for template classes, useful with typedefs
-#define defineTemplateTypeName(Type)                                          \
+#define defineTemplateTypeName(Type)                                           \
     defineTemplateTypeNameWithName(Type, #Type)
 
 //- Define the typeName directly for template classes
-#define defineNamedTemplateTypeName(Type)                                     \
+#define defineNamedTemplateTypeName(Type)                                      \
     defineTemplateTypeNameWithName(Type, Type::typeName_())
 
 
@@ -122,35 +122,35 @@ public:                                                                       \
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 //- Define the typeName and debug information
-#define defineTypeNameAndDebug(Type, DebugSwitch)                             \
-    defineTypeName(Type);                                                     \
+#define defineTypeNameAndDebug(Type, DebugSwitch)                              \
+    defineTypeName(Type);                                                      \
     defineDebugSwitch(Type, DebugSwitch)
 
 //- Define the typeName and debug information, lookup as \a Name
-#define defineTemplateTypeNameAndDebugWithName(Type, Name, DebugSwitch)       \
-    defineTemplateTypeNameWithName(Type, Name);                               \
+#define defineTemplateTypeNameAndDebugWithName(Type, Name, DebugSwitch)        \
+    defineTemplateTypeNameWithName(Type, Name);                                \
     defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch)
 
 //- Define the typeName and debug information for templates, useful
 //  with typedefs
-#define defineTemplateTypeNameAndDebug(Type, DebugSwitch)                     \
+#define defineTemplateTypeNameAndDebug(Type, DebugSwitch)                      \
     defineTemplateTypeNameAndDebugWithName(Type, #Type, DebugSwitch)
 
 //- Define the typeName and debug information for templates
-#define defineNamedTemplateTypeNameAndDebug(Type, DebugSwitch)                \
-    defineNamedTemplateTypeName(Type);                                        \
+#define defineNamedTemplateTypeNameAndDebug(Type, DebugSwitch)                 \
+    defineNamedTemplateTypeName(Type);                                         \
     defineNamedTemplateDebugSwitch(Type, DebugSwitch)
 
 // for templated sub-classes
 
 //- Define the typeName and debug information, lookup as \a Name
-#define defineTemplate2TypeNameAndDebugWithName(Type, Name, DebugSwitch)      \
-    defineTemplate2TypeNameWithName(Type, Name);                              \
+#define defineTemplate2TypeNameAndDebugWithName(Type, Name, DebugSwitch)       \
+    defineTemplate2TypeNameWithName(Type, Name);                               \
     defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch)
 
 //- Define the typeName and debug information for templates, useful
 //  with typedefs
-#define defineTemplate2TypeNameAndDebug(Type, DebugSwitch)                    \
+#define defineTemplate2TypeNameAndDebug(Type, DebugSwitch)                     \
     defineTemplate2TypeNameAndDebugWithName(Type, #Type, DebugSwitch)
 
 
diff --git a/src/OpenFOAM/db/typeInfo/typeInfo.H b/src/OpenFOAM/db/typeInfo/typeInfo.H
index bd437b4d79..a31934522c 100644
--- a/src/OpenFOAM/db/typeInfo/typeInfo.H
+++ b/src/OpenFOAM/db/typeInfo/typeInfo.H
@@ -62,13 +62,13 @@ Description
 // declarations (for use in header files)
 
 //- Declare a ClassNameNoDebug() with extra virtual type info
-#define TypeNameNoDebug(TypeNameString)                                       \
-    ClassNameNoDebug(TypeNameString);                                         \
+#define TypeNameNoDebug(TypeNameString)                                        \
+    ClassNameNoDebug(TypeNameString);                                          \
     virtual const word& type() const { return typeName; }
 
 //- Declare a ClassName() with extra virtual type info
-#define TypeName(TypeNameString)                                              \
-    ClassName(TypeNameString);                                                \
+#define TypeName(TypeNameString)                                               \
+    ClassName(TypeNameString);                                                 \
     virtual const word& type() const { return typeName; }
 
 
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
index 57d9e6c450..d306402fb5 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
@@ -231,22 +231,22 @@ dimensionedScalar negPart(const dimensionedScalar& ds)
 }
 
 
-#define transFunc(func)                                                    \
-dimensionedScalar func(const dimensionedScalar& ds)                        \
-{                                                                          \
-    if (!ds.dimensions().dimensionless())                                  \
-    {                                                                      \
-        FatalErrorInFunction                                               \
-            << "ds not dimensionless"                                      \
-            << abort(FatalError);                                          \
-    }                                                                      \
-                                                                           \
-    return dimensionedScalar                                               \
-    (                                                                      \
-        #func "(" + ds.name() + ')',                                       \
-        dimless,                                                           \
-        ::func(ds.value())                                                 \
-    );                                                                     \
+#define transFunc(func)                                                        \
+dimensionedScalar func(const dimensionedScalar& ds)                            \
+{                                                                              \
+    if (!ds.dimensions().dimensionless())                                      \
+    {                                                                          \
+        FatalErrorInFunction                                                   \
+            << "ds not dimensionless"                                          \
+            << abort(FatalError);                                              \
+    }                                                                          \
+                                                                               \
+    return dimensionedScalar                                                   \
+    (                                                                          \
+        #func "(" + ds.name() + ')',                                           \
+        dimless,                                                               \
+        ::func(ds.value())                                                     \
+    );                                                                         \
 }
 
 transFunc(exp)
@@ -275,22 +275,22 @@ transFunc(y1)
 #undef transFunc
 
 
-#define transFunc(func)                                                    \
-dimensionedScalar func(const int n, const dimensionedScalar& ds)           \
-{                                                                          \
-    if (!ds.dimensions().dimensionless())                                  \
-    {                                                                      \
-        FatalErrorInFunction                                               \
-            << "ds not dimensionless"                                      \
-            << abort(FatalError);                                          \
-    }                                                                      \
-                                                                           \
-    return dimensionedScalar                                               \
-    (                                                                      \
-        #func "(" + name(n) + ',' + ds.name() + ')',                       \
-        dimless,                                                           \
-        ::func(n, ds.value())                                              \
-    );                                                                     \
+#define transFunc(func)                                                        \
+dimensionedScalar func(const int n, const dimensionedScalar& ds)               \
+{                                                                              \
+    if (!ds.dimensions().dimensionless())                                      \
+    {                                                                          \
+        FatalErrorInFunction                                                   \
+            << "ds not dimensionless"                                          \
+            << abort(FatalError);                                              \
+    }                                                                          \
+                                                                               \
+    return dimensionedScalar                                                   \
+    (                                                                          \
+        #func "(" + name(n) + ',' + ds.name() + ')',                           \
+        dimless,                                                               \
+        ::func(n, ds.value())                                                  \
+    );                                                                         \
 }
 
 transFunc(jn)
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 03ee76d7c9..bed9ed67af 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -732,54 +732,54 @@ Foam::dimensioned<Type> Foam::operator/
 // Products
 // ~~~~~~~~
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                 \
-                                                                              \
-template<class Type1, class Type2>                                            \
-Foam::dimensioned<typename Foam::product<Type1, Type2>::type>                 \
-Foam::operator op                                                             \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const dimensioned<Type2>& dt2                                             \
-)                                                                             \
-{                                                                             \
-    return dimensioned<typename product<Type1, Type2>::type>                  \
-    (                                                                         \
-        '(' + dt1.name() + #op + dt2.name() + ')',                            \
-        dt1.dimensions() op dt2.dimensions(),                                 \
-        dt1.value() op dt2.value()                                            \
-    );                                                                        \
-}                                                                             \
-                                                                              \
-template<class Type, class Form, class Cmpt, int nCmpt>                       \
-Foam::dimensioned<typename Foam::product<Type, Form>::type>                   \
-Foam::operator op                                                             \
-(                                                                             \
-    const dimensioned<Type>& dt1,                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& t2                                    \
-)                                                                             \
-{                                                                             \
-    return dimensioned<typename product<Type, Form>::type>                    \
-    (                                                                         \
-        '(' + dt1.name() + #op + name(t2) + ')',                              \
-        dt1.dimensions(),                                                     \
-        dt1.value() op static_cast<const Form&>(t2)                           \
-    );                                                                        \
-}                                                                             \
-                                                                              \
-template<class Type, class Form, class Cmpt, int nCmpt>                       \
-Foam::dimensioned<typename Foam::product<Form, Type>::type>                   \
-Foam::operator op                                                             \
-(                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& t1,                                   \
-    const dimensioned<Type>& dt2                                              \
-)                                                                             \
-{                                                                             \
-    return dimensioned<typename product<Form, Type>::type>                    \
-    (                                                                         \
-        '(' + name(t1) + #op + dt2.name() + ')',                              \
-        dt2.dimensions(),                                                     \
-        static_cast<const Form&>(t1) op dt2.value()                           \
-    );                                                                        \
+#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+                                                                               \
+template<class Type1, class Type2>                                             \
+Foam::dimensioned<typename Foam::product<Type1, Type2>::type>                  \
+Foam::operator op                                                              \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    return dimensioned<typename product<Type1, Type2>::type>                   \
+    (                                                                          \
+        '(' + dt1.name() + #op + dt2.name() + ')',                             \
+        dt1.dimensions() op dt2.dimensions(),                                  \
+        dt1.value() op dt2.value()                                             \
+    );                                                                         \
+}                                                                              \
+                                                                               \
+template<class Type, class Form, class Cmpt, int nCmpt>                        \
+Foam::dimensioned<typename Foam::product<Type, Form>::type>                    \
+Foam::operator op                                                              \
+(                                                                              \
+    const dimensioned<Type>& dt1,                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>& t2                                     \
+)                                                                              \
+{                                                                              \
+    return dimensioned<typename product<Type, Form>::type>                     \
+    (                                                                          \
+        '(' + dt1.name() + #op + name(t2) + ')',                               \
+        dt1.dimensions(),                                                      \
+        dt1.value() op static_cast<const Form&>(t2)                            \
+    );                                                                         \
+}                                                                              \
+                                                                               \
+template<class Type, class Form, class Cmpt, int nCmpt>                        \
+Foam::dimensioned<typename Foam::product<Form, Type>::type>                    \
+Foam::operator op                                                              \
+(                                                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>& t1,                                    \
+    const dimensioned<Type>& dt2                                               \
+)                                                                              \
+{                                                                              \
+    return dimensioned<typename product<Form, Type>::type>                     \
+    (                                                                          \
+        '(' + name(t1) + #op + dt2.name() + ')',                               \
+        dt2.dimensions(),                                                      \
+        static_cast<const Form&>(t1) op dt2.value()                            \
+    );                                                                         \
 }
 
 
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 40baca77f6..623fbd5034 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -303,26 +303,26 @@ dimensioned<Type> operator/
 // Products
 // ~~~~~~~~
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                 \
-                                                                              \
-template<class Type1, class Type2>                                            \
-dimensioned<typename product<Type1, Type2>::type>                             \
-operator op(const dimensioned<Type1>&, const dimensioned<Type2>&);            \
-                                                                              \
-template<class Type, class Form, class Cmpt, int nCmpt>                       \
-dimensioned<typename product<Type, Form>::type>                               \
-operator op                                                                   \
-(                                                                             \
-    const dimensioned<Type>&,                                                 \
-    const VectorSpace<Form,Cmpt,nCmpt>&                                       \
-);                                                                            \
-                                                                              \
-template<class Type, class Form, class Cmpt, int nCmpt>                       \
-dimensioned<typename product<Form, Type>::type>                               \
-operator op                                                                   \
-(                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>&,                                      \
-    const dimensioned<Type>&                                                  \
+#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+                                                                               \
+template<class Type1, class Type2>                                             \
+dimensioned<typename product<Type1, Type2>::type>                              \
+operator op(const dimensioned<Type1>&, const dimensioned<Type2>&);             \
+                                                                               \
+template<class Type, class Form, class Cmpt, int nCmpt>                        \
+dimensioned<typename product<Type, Form>::type>                                \
+operator op                                                                    \
+(                                                                              \
+    const dimensioned<Type>&,                                                  \
+    const VectorSpace<Form,Cmpt,nCmpt>&                                        \
+);                                                                             \
+                                                                               \
+template<class Type, class Form, class Cmpt, int nCmpt>                        \
+dimensioned<typename product<Form, Type>::type>                                \
+operator op                                                                    \
+(                                                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>&,                                       \
+    const dimensioned<Type>&                                                   \
 );
 
 PRODUCT_OPERATOR(outerProduct, *, outer)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index cd49f12880..27c2948c2f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -476,38 +476,38 @@ void DimensionedField<Type, GeoMesh>::operator=
 }
 
 
-#define COMPUTED_ASSIGNMENT(TYPE, op)                                         \
-                                                                              \
-template<class Type, class GeoMesh>                                           \
-void DimensionedField<Type, GeoMesh>::operator op                             \
-(                                                                             \
-    const DimensionedField<TYPE, GeoMesh>& df                                 \
-)                                                                             \
-{                                                                             \
-    checkField(*this, df, #op);                                               \
-                                                                              \
-    dimensions_ op df.dimensions();                                           \
-    Field<Type>::operator op(df);                                             \
-}                                                                             \
-                                                                              \
-template<class Type, class GeoMesh>                                           \
-void DimensionedField<Type, GeoMesh>::operator op                             \
-(                                                                             \
-    const tmp<DimensionedField<TYPE, GeoMesh>>& tdf                          \
-)                                                                             \
-{                                                                             \
-    operator op(tdf());                                                       \
-    tdf.clear();                                                              \
-}                                                                             \
-                                                                              \
-template<class Type, class GeoMesh>                                           \
-void DimensionedField<Type, GeoMesh>::operator op                             \
-(                                                                             \
-    const dimensioned<TYPE>& dt                                               \
-)                                                                             \
-{                                                                             \
-    dimensions_ op dt.dimensions();                                           \
-    Field<Type>::operator op(dt.value());                                     \
+#define COMPUTED_ASSIGNMENT(TYPE, op)                                          \
+                                                                               \
+template<class Type, class GeoMesh>                                            \
+void DimensionedField<Type, GeoMesh>::operator op                              \
+(                                                                              \
+    const DimensionedField<TYPE, GeoMesh>& df                                  \
+)                                                                              \
+{                                                                              \
+    checkField(*this, df, #op);                                                \
+                                                                               \
+    dimensions_ op df.dimensions();                                            \
+    Field<Type>::operator op(df);                                              \
+}                                                                              \
+                                                                               \
+template<class Type, class GeoMesh>                                            \
+void DimensionedField<Type, GeoMesh>::operator op                              \
+(                                                                              \
+    const tmp<DimensionedField<TYPE, GeoMesh>>& tdf                            \
+)                                                                              \
+{                                                                              \
+    operator op(tdf());                                                        \
+    tdf.clear();                                                               \
+}                                                                              \
+                                                                               \
+template<class Type, class GeoMesh>                                            \
+void DimensionedField<Type, GeoMesh>::operator op                              \
+(                                                                              \
+    const dimensioned<TYPE>& dt                                                \
+)                                                                              \
+{                                                                              \
+    dimensions_ op dt.dimensions();                                            \
+    Field<Type>::operator op(dt.value());                                      \
 }
 
 COMPUTED_ASSIGNMENT(Type, +=)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
index cc070b715c..678d42875f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
@@ -301,31 +301,31 @@ cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
     return CmptAv;
 }
 
-#define UNARY_REDUCTION_FUNCTION(returnType, func, dfunc)                     \
-                                                                              \
-template<class Type, class GeoMesh>                                           \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const DimensionedField<Type, GeoMesh>& df                                 \
-)                                                                             \
-{                                                                             \
-    return dimensioned<Type>                                                  \
-    (                                                                         \
-        #func "(" + df.name() + ')',                                          \
-        df.dimensions(),                                                      \
-        dfunc(df.field())                                                     \
-    );                                                                        \
-}                                                                             \
-                                                                              \
-template<class Type, class GeoMesh>                                           \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
-)                                                                             \
-{                                                                             \
-    dimensioned<returnType> res = func(tdf1());                               \
-    tdf1.clear();                                                             \
-    return res;                                                               \
+#define UNARY_REDUCTION_FUNCTION(returnType, func, dfunc)                      \
+                                                                               \
+template<class Type, class GeoMesh>                                            \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const DimensionedField<Type, GeoMesh>& df                                  \
+)                                                                              \
+{                                                                              \
+    return dimensioned<Type>                                                   \
+    (                                                                          \
+        #func "(" + df.name() + ')',                                           \
+        df.dimensions(),                                                       \
+        dfunc(df.field())                                                      \
+    );                                                                         \
+}                                                                              \
+                                                                               \
+template<class Type, class GeoMesh>                                            \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
+)                                                                              \
+{                                                                              \
+    dimensioned<returnType> res = func(tdf1());                                \
+    tdf1.clear();                                                              \
+    return res;                                                                \
 }
 
 UNARY_REDUCTION_FUNCTION(Type, max, gMax)
@@ -364,279 +364,279 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                 \
-                                                                              \
-template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
-operator op                                                                   \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<DimensionedField<productType, GeoMesh>> tRes                         \
-    (                                                                         \
-        new DimensionedField<productType, GeoMesh>                            \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + df1.name() + #op + df2.name() + ')',                    \
-                df1.instance(),                                               \
-                df1.db()                                                      \
-            ),                                                                \
-            df1.mesh(),                                                       \
-            df1.dimensions() op df2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::opFunc(tRes().field(), df1.field(), df2.field());                   \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
-operator op                                                                   \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-                                                                              \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
-                                                                              \
-    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
-        reuseTmpDimensionedField<productType, Type2, GeoMesh>::New            \
-        (                                                                     \
-            tdf2,                                                             \
-            '(' + df1.name() + #op + df2.name() + ')',                        \
-            df1.dimensions() op df2.dimensions()                              \
-        );                                                                    \
-                                                                              \
-    Foam::opFunc(tRes().field(), df1.field(), df2.field());                   \
-                                                                              \
-    reuseTmpDimensionedField<productType, Type2, GeoMesh>::clear(tdf2);       \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
-operator op                                                                   \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
-                                                                              \
-    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
-        reuseTmpDimensionedField<productType, Type1, GeoMesh>::New            \
-        (                                                                     \
-            tdf1,                                                             \
-            '(' + df1.name() + #op + df2.name() + ')',                        \
-            df1.dimensions() op df2.dimensions()                              \
-        );                                                                    \
-                                                                              \
-    Foam::opFunc(tRes().field(), df1.field(), df2.field());                   \
-                                                                              \
-    reuseTmpDimensionedField<productType, Type1, GeoMesh>::clear(tdf1);       \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
-operator op                                                                   \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
-                                                                              \
-    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
-        reuseTmpTmpDimensionedField                                           \
-        <productType, Type1, Type1, Type2, GeoMesh>::New                      \
-        (                                                                     \
-            tdf1,                                                             \
-            tdf2,                                                             \
-            '(' + df1.name() + #op + df2.name() + ')',                        \
-            df1.dimensions() op df2.dimensions()                              \
-        );                                                                    \
-                                                                              \
-    Foam::opFunc(tRes().field(), df1.field(), df2.field());                   \
-                                                                              \
-    reuseTmpTmpDimensionedField                                               \
-        <productType, Type1, Type1, Type2, GeoMesh>::clear(tdf1, tdf2);       \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const DimensionedField<Type, GeoMesh>& df1,                               \
-    const dimensioned<Form>& dvs                                              \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type, Form>::type productType;                   \
-                                                                              \
-    tmp<DimensionedField<productType, GeoMesh>> tRes                         \
-    (                                                                         \
-        new DimensionedField<productType, GeoMesh>                            \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + df1.name() + #op + dvs.name() + ')',                    \
-                df1.instance(),                                               \
-                df1.db()                                                      \
-            ),                                                                \
-            df1.mesh(),                                                       \
-            df1.dimensions() op dvs.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::opFunc(tRes().field(), df1.field(), dvs.value());                   \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const DimensionedField<Type, GeoMesh>& df1,                               \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-)                                                                             \
-{                                                                             \
-    return df1 op dimensioned<Form>(static_cast<const Form&>(vs));            \
-}                                                                             \
-                                                                              \
-                                                                              \
-template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
-    const dimensioned<Form>& dvs                                              \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type, Form>::type productType;                   \
-                                                                              \
-    const DimensionedField<Type, GeoMesh>& df1 = tdf1();                      \
-                                                                              \
-    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
-        reuseTmpDimensionedField<productType, Type, GeoMesh>::New             \
-        (                                                                     \
-            tdf1,                                                             \
-            '(' + df1.name() + #op + dvs.name() + ')',                        \
-            df1.dimensions() op dvs.dimensions()                              \
-        );                                                                    \
-                                                                              \
-    Foam::opFunc(tRes().field(), df1.field(), dvs.value());                   \
-                                                                              \
-    reuseTmpDimensionedField<productType, Type, GeoMesh>::clear(tdf1);        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-)                                                                             \
-{                                                                             \
-    return tdf1 op dimensioned<Form>(static_cast<const Form&>(vs));           \
-}                                                                             \
-                                                                              \
-                                                                              \
-template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const dimensioned<Form>& dvs,                                             \
-    const DimensionedField<Type, GeoMesh>& df1                                \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Form, Type>::type productType;                   \
-    tmp<DimensionedField<productType, GeoMesh>> tRes                         \
-    (                                                                         \
-        new DimensionedField<productType, GeoMesh>                            \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + dvs.name() + #op + df1.name() + ')',                    \
-                df1.instance(),                                               \
-                df1.db()                                                      \
-            ),                                                                \
-            df1.mesh(),                                                       \
-            dvs.dimensions() op df1.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::opFunc(tRes().field(), dvs.value(), df1.field());                   \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const DimensionedField<Type, GeoMesh>& df1                                \
-)                                                                             \
-{                                                                             \
-    return dimensioned<Form>(static_cast<const Form&>(vs)) op df1;            \
-}                                                                             \
-                                                                              \
-template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const dimensioned<Form>& dvs,                                             \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Form, Type>::type productType;                   \
-                                                                              \
-    const DimensionedField<Type, GeoMesh>& df1 = tdf1();                      \
-                                                                              \
-    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
-        reuseTmpDimensionedField<productType, Type, GeoMesh>::New             \
-        (                                                                     \
-            tdf1,                                                             \
-            '(' + dvs.name() + #op + df1.name() + ')',                        \
-            dvs.dimensions() op df1.dimensions()                              \
-        );                                                                    \
-                                                                              \
-    Foam::opFunc(tRes().field(), dvs.value(), df1.field());                   \
-                                                                              \
-    reuseTmpDimensionedField<productType, Type, GeoMesh>::clear(tdf1);        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
-)                                                                             \
-{                                                                             \
-    return dimensioned<Form>(static_cast<const Form&>(vs)) op tdf1;           \
+#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+                                                                               \
+template<class Type1, class Type2, class GeoMesh>                              \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
+operator op                                                                    \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+    tmp<DimensionedField<productType, GeoMesh>> tRes                           \
+    (                                                                          \
+        new DimensionedField<productType, GeoMesh>                             \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + df1.name() + #op + df2.name() + ')',                     \
+                df1.instance(),                                                \
+                df1.db()                                                       \
+            ),                                                                 \
+            df1.mesh(),                                                        \
+            df1.dimensions() op df2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::opFunc(tRes().field(), df1.field(), df2.field());                    \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Type1, class Type2, class GeoMesh>                              \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
+operator op                                                                    \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+                                                                               \
+    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+                                                                               \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                         \
+        reuseTmpDimensionedField<productType, Type2, GeoMesh>::New             \
+        (                                                                      \
+            tdf2,                                                              \
+            '(' + df1.name() + #op + df2.name() + ')',                         \
+            df1.dimensions() op df2.dimensions()                               \
+        );                                                                     \
+                                                                               \
+    Foam::opFunc(tRes().field(), df1.field(), df2.field());                    \
+                                                                               \
+    reuseTmpDimensionedField<productType, Type2, GeoMesh>::clear(tdf2);        \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Type1, class Type2, class GeoMesh>                              \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
+operator op                                                                    \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+                                                                               \
+    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+                                                                               \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                         \
+        reuseTmpDimensionedField<productType, Type1, GeoMesh>::New             \
+        (                                                                      \
+            tdf1,                                                              \
+            '(' + df1.name() + #op + df2.name() + ')',                         \
+            df1.dimensions() op df2.dimensions()                               \
+        );                                                                     \
+                                                                               \
+    Foam::opFunc(tRes().field(), df1.field(), df2.field());                    \
+                                                                               \
+    reuseTmpDimensionedField<productType, Type1, GeoMesh>::clear(tdf1);        \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Type1, class Type2, class GeoMesh>                              \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
+operator op                                                                    \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+                                                                               \
+    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+                                                                               \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                         \
+        reuseTmpTmpDimensionedField                                            \
+        <productType, Type1, Type1, Type2, GeoMesh>::New                       \
+        (                                                                      \
+            tdf1,                                                              \
+            tdf2,                                                              \
+            '(' + df1.name() + #op + df2.name() + ')',                         \
+            df1.dimensions() op df2.dimensions()                               \
+        );                                                                     \
+                                                                               \
+    Foam::opFunc(tRes().field(), df1.field(), df2.field());                    \
+                                                                               \
+    reuseTmpTmpDimensionedField                                                \
+        <productType, Type1, Type1, Type2, GeoMesh>::clear(tdf1, tdf2);        \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Form, class Type, class GeoMesh>                                \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const DimensionedField<Type, GeoMesh>& df1,                                \
+    const dimensioned<Form>& dvs                                               \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type, Form>::type productType;                    \
+                                                                               \
+    tmp<DimensionedField<productType, GeoMesh>> tRes                           \
+    (                                                                          \
+        new DimensionedField<productType, GeoMesh>                             \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + df1.name() + #op + dvs.name() + ')',                     \
+                df1.instance(),                                                \
+                df1.db()                                                       \
+            ),                                                                 \
+            df1.mesh(),                                                        \
+            df1.dimensions() op dvs.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::opFunc(tRes().field(), df1.field(), dvs.value());                    \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const DimensionedField<Type, GeoMesh>& df1,                                \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+)                                                                              \
+{                                                                              \
+    return df1 op dimensioned<Form>(static_cast<const Form&>(vs));             \
+}                                                                              \
+                                                                               \
+                                                                               \
+template<class Form, class Type, class GeoMesh>                                \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                          \
+    const dimensioned<Form>& dvs                                               \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type, Form>::type productType;                    \
+                                                                               \
+    const DimensionedField<Type, GeoMesh>& df1 = tdf1();                       \
+                                                                               \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                         \
+        reuseTmpDimensionedField<productType, Type, GeoMesh>::New              \
+        (                                                                      \
+            tdf1,                                                              \
+            '(' + df1.name() + #op + dvs.name() + ')',                         \
+            df1.dimensions() op dvs.dimensions()                               \
+        );                                                                     \
+                                                                               \
+    Foam::opFunc(tRes().field(), df1.field(), dvs.value());                    \
+                                                                               \
+    reuseTmpDimensionedField<productType, Type, GeoMesh>::clear(tdf1);         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                          \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+)                                                                              \
+{                                                                              \
+    return tdf1 op dimensioned<Form>(static_cast<const Form&>(vs));            \
+}                                                                              \
+                                                                               \
+                                                                               \
+template<class Form, class Type, class GeoMesh>                                \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const dimensioned<Form>& dvs,                                              \
+    const DimensionedField<Type, GeoMesh>& df1                                 \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Form, Type>::type productType;                    \
+    tmp<DimensionedField<productType, GeoMesh>> tRes                           \
+    (                                                                          \
+        new DimensionedField<productType, GeoMesh>                             \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + dvs.name() + #op + df1.name() + ')',                     \
+                df1.instance(),                                                \
+                df1.db()                                                       \
+            ),                                                                 \
+            df1.mesh(),                                                        \
+            dvs.dimensions() op df1.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::opFunc(tRes().field(), dvs.value(), df1.field());                    \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
+    const DimensionedField<Type, GeoMesh>& df1                                 \
+)                                                                              \
+{                                                                              \
+    return dimensioned<Form>(static_cast<const Form&>(vs)) op df1;             \
+}                                                                              \
+                                                                               \
+template<class Form, class Type, class GeoMesh>                                \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const dimensioned<Form>& dvs,                                              \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Form, Type>::type productType;                    \
+                                                                               \
+    const DimensionedField<Type, GeoMesh>& df1 = tdf1();                       \
+                                                                               \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                         \
+        reuseTmpDimensionedField<productType, Type, GeoMesh>::New              \
+        (                                                                      \
+            tdf1,                                                              \
+            '(' + dvs.name() + #op + df1.name() + ')',                         \
+            dvs.dimensions() op df1.dimensions()                               \
+        );                                                                     \
+                                                                               \
+    Foam::opFunc(tRes().field(), dvs.value(), df1.field());                    \
+                                                                               \
+    reuseTmpDimensionedField<productType, Type, GeoMesh>::clear(tdf1);         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
+)                                                                              \
+{                                                                              \
+    return dimensioned<Form>(static_cast<const Form&>(vs)) op tdf1;            \
 }
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
index 09deae37e9..6501bcf51f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
@@ -100,17 +100,17 @@ tmp
 cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
 
 
-#define UNARY_REDUCTION_FUNCTION(returnType, func, dfunc)                     \
-                                                                              \
-template<class Type, class GeoMesh>                                           \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const DimensionedField<Type, GeoMesh>& df                                 \
-);                                                                            \
-template<class Type, class GeoMesh>                                           \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
+#define UNARY_REDUCTION_FUNCTION(returnType, func, dfunc)                      \
+                                                                               \
+template<class Type, class GeoMesh>                                            \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const DimensionedField<Type, GeoMesh>& df                                  \
+);                                                                             \
+template<class Type, class GeoMesh>                                            \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
 );
 
 UNARY_REDUCTION_FUNCTION(Type, max, gMax)
@@ -149,102 +149,102 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                 \
-                                                                              \
-template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
-operator op                                                                   \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-);                                                                            \
-                                                                              \
-template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
-operator op                                                                   \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-);                                                                            \
-                                                                              \
-template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
-operator op                                                                   \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-);                                                                            \
-                                                                              \
-template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
-operator op                                                                   \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-);                                                                            \
-                                                                              \
-template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const DimensionedField<Type, GeoMesh>& df1,                               \
-    const dimensioned<Form>& dvs                                              \
-);                                                                            \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const DimensionedField<Type, GeoMesh>& df1,                               \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-);                                                                            \
-                                                                              \
-template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
-    const dimensioned<Form>& dvs                                              \
-);                                                                            \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-);                                                                            \
-                                                                              \
-template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const dimensioned<Form>& dvs,                                             \
-    const DimensionedField<Type, GeoMesh>& df1                                \
-);                                                                            \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const DimensionedField<Type, GeoMesh>& df1                                \
-);                                                                            \
-                                                                              \
-template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const dimensioned<Form>& dvs,                                             \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
-);                                                                            \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
-operator op                                                                   \
-(                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
+#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+                                                                               \
+template<class Type1, class Type2, class GeoMesh>                              \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
+operator op                                                                    \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+);                                                                             \
+                                                                               \
+template<class Type1, class Type2, class GeoMesh>                              \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
+operator op                                                                    \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+);                                                                             \
+                                                                               \
+template<class Type1, class Type2, class GeoMesh>                              \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
+operator op                                                                    \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+);                                                                             \
+                                                                               \
+template<class Type1, class Type2, class GeoMesh>                              \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
+operator op                                                                    \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+);                                                                             \
+                                                                               \
+template<class Form, class Type, class GeoMesh>                                \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const DimensionedField<Type, GeoMesh>& df1,                                \
+    const dimensioned<Form>& dvs                                               \
+);                                                                             \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const DimensionedField<Type, GeoMesh>& df1,                                \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+);                                                                             \
+                                                                               \
+template<class Form, class Type, class GeoMesh>                                \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                          \
+    const dimensioned<Form>& dvs                                               \
+);                                                                             \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                          \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+);                                                                             \
+                                                                               \
+template<class Form, class Type, class GeoMesh>                                \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const dimensioned<Form>& dvs,                                              \
+    const DimensionedField<Type, GeoMesh>& df1                                 \
+);                                                                             \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
+    const DimensionedField<Type, GeoMesh>& df1                                 \
+);                                                                             \
+                                                                               \
+template<class Form, class Type, class GeoMesh>                                \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const dimensioned<Form>& dvs,                                              \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
+);                                                                             \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
+operator op                                                                    \
+(                                                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
 );
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
index bd33ca2c60..4fe75afd3f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
@@ -27,662 +27,662 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                        \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1                               \
-)                                                                             \
-{                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        new DimensionedField<ReturnType, GeoMesh>                             \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                #Func "(" + df1.name() + ')',                                 \
-                df1.instance(),                                               \
-                df1.db()                                                      \
-            ),                                                                \
-            df1.mesh(),                                                       \
-            Dfunc(df1.dimensions())                                           \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Func(tRes().field(), df1.field());                                        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
-        (                                                                     \
-            tdf1,                                                             \
-            #Func "(" + df1.name() + ')',                                     \
-            Dfunc(df1.dimensions())                                           \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Func(tRes().field(), df1.field());                                        \
-                                                                              \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);        \
-                                                                              \
-    return tRes;                                                              \
+#define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                         \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1                                \
+)                                                                              \
+{                                                                              \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        new DimensionedField<ReturnType, GeoMesh>                              \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #Func "(" + df1.name() + ')',                                  \
+                df1.instance(),                                                \
+                df1.db()                                                       \
+            ),                                                                 \
+            df1.mesh(),                                                        \
+            Dfunc(df1.dimensions())                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Func(tRes().field(), df1.field());                                         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                          \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
+        (                                                                      \
+            tdf1,                                                              \
+            #Func "(" + df1.name() + ')',                                      \
+            Dfunc(df1.dimensions())                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Func(tRes().field(), df1.field());                                         \
+                                                                               \
+    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+                                                                               \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc, Dfunc)                  \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1                               \
-)                                                                             \
-{                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        new DimensionedField<ReturnType, GeoMesh>                             \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                #Op + df1.name(),                                             \
-                df1.instance(),                                               \
-                df1.db()                                                      \
-            ),                                                                \
-            df1.mesh(),                                                       \
-            Dfunc(df1.dimensions())                                           \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes().field(), df1.field());                                \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
-        (                                                                     \
-            tdf1,                                                             \
-            #Op + df1.name(),                                                 \
-            Dfunc(df1.dimensions())                                           \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes().field(), df1.field());                                \
-                                                                              \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);        \
-                                                                              \
-    return tRes;                                                              \
+#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc, Dfunc)                   \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1                                \
+)                                                                              \
+{                                                                              \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        new DimensionedField<ReturnType, GeoMesh>                              \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #Op + df1.name(),                                              \
+                df1.instance(),                                                \
+                df1.db()                                                       \
+            ),                                                                 \
+            df1.mesh(),                                                        \
+            Dfunc(df1.dimensions())                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes().field(), df1.field());                                 \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                          \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
+        (                                                                      \
+            tdf1,                                                              \
+            #Op + df1.name(),                                                  \
+            Dfunc(df1.dimensions())                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes().field(), df1.field());                                 \
+                                                                               \
+    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+                                                                               \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-)                                                                             \
-{                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        new DimensionedField<ReturnType, GeoMesh>                             \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                #Func "(" + df1.name() + ',' + df2.name() + ')',              \
-                df1.instance(),                                               \
-                df1.db()                                                      \
-            ),                                                                \
-            df1.mesh(),                                                       \
-            Func(df1.dimensions(), df2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Func(tRes().field(), df1.field(), df2.field());                           \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
-        (                                                                     \
-            tdf2,                                                             \
-            #Func "(" + df1.name() + ',' + df2.name() + ')',                  \
-            Func(df1.dimensions(), df2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Func(tRes().field(), df1.field(), df2.field());                           \
-                                                                              \
-    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
-        (                                                                     \
-            tdf1,                                                             \
-            #Func "(" + df1.name() + ',' + df2.name() + ')',                  \
-            Func(df1.dimensions(), df2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Func(tRes().field(), df1.field(), df2.field());                           \
-                                                                              \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpTmpDimensionedField                                           \
-            <ReturnType, Type1, Type1, Type2, GeoMesh>::New                   \
-        (                                                                     \
-            tdf1,                                                             \
-            tdf2,                                                             \
-            #Func "(" + df1.name() + ',' + df2.name() + ')',                  \
-            Func(df1.dimensions(), df2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Func(tRes().field(), df1.field(), df2.field());                           \
-                                                                              \
-    reuseTmpTmpDimensionedField<ReturnType, Type1, Type1, Type2, GeoMesh>     \
-    ::clear(tdf1, tdf2);                                                      \
-                                                                              \
-    return tRes;                                                              \
+#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+)                                                                              \
+{                                                                              \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        new DimensionedField<ReturnType, GeoMesh>                              \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #Func "(" + df1.name() + ',' + df2.name() + ')',               \
+                df1.instance(),                                                \
+                df1.db()                                                       \
+            ),                                                                 \
+            df1.mesh(),                                                        \
+            Func(df1.dimensions(), df2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Func(tRes().field(), df1.field(), df2.field());                            \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
+        (                                                                      \
+            tdf2,                                                              \
+            #Func "(" + df1.name() + ',' + df2.name() + ')',                   \
+            Func(df1.dimensions(), df2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Func(tRes().field(), df1.field(), df2.field());                            \
+                                                                               \
+    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
+        (                                                                      \
+            tdf1,                                                              \
+            #Func "(" + df1.name() + ',' + df2.name() + ')',                   \
+            Func(df1.dimensions(), df2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Func(tRes().field(), df1.field(), df2.field());                            \
+                                                                               \
+    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpTmpDimensionedField                                            \
+            <ReturnType, Type1, Type1, Type2, GeoMesh>::New                    \
+        (                                                                      \
+            tdf1,                                                              \
+            tdf2,                                                              \
+            #Func "(" + df1.name() + ',' + df2.name() + ')',                   \
+            Func(df1.dimensions(), df2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Func(tRes().field(), df1.field(), df2.field());                            \
+                                                                               \
+    reuseTmpTmpDimensionedField<ReturnType, Type1, Type1, Type2, GeoMesh>      \
+    ::clear(tdf1, tdf2);                                                       \
+                                                                               \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-)                                                                             \
-{                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        new DimensionedField<ReturnType, GeoMesh>                             \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                #Func "(" + dt1.name() + ',' + df2.name() + ')',              \
-                df2.instance(),                                               \
-                df2.db()                                                      \
-            ),                                                                \
-            df2.mesh(),                                                       \
-            Func(dt1.dimensions(), df2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Func(tRes().field(), dt1.value(), df2.field());                           \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-)                                                                             \
-{                                                                             \
-    return Func(dimensioned<Type1>(t1), df2);                                 \
-}                                                                             \
-                                                                              \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
-        (                                                                     \
-            tdf2,                                                             \
-            #Func "(" + dt1.name() + ',' + df2.name() + ')',                  \
-            Func(dt1.dimensions(), df2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Func(tRes().field(), dt1.value(), df2.field());                           \
-                                                                              \
-    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-)                                                                             \
-{                                                                             \
-    return Func(dimensioned<Type2>(t1), tdf2);                                \
+#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+)                                                                              \
+{                                                                              \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        new DimensionedField<ReturnType, GeoMesh>                              \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #Func "(" + dt1.name() + ',' + df2.name() + ')',               \
+                df2.instance(),                                                \
+                df2.db()                                                       \
+            ),                                                                 \
+            df2.mesh(),                                                        \
+            Func(dt1.dimensions(), df2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Func(tRes().field(), dt1.value(), df2.field());                            \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+)                                                                              \
+{                                                                              \
+    return Func(dimensioned<Type1>(t1), df2);                                  \
+}                                                                              \
+                                                                               \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
+        (                                                                      \
+            tdf2,                                                              \
+            #Func "(" + dt1.name() + ',' + df2.name() + ')',                   \
+            Func(dt1.dimensions(), df2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Func(tRes().field(), dt1.value(), df2.field());                            \
+                                                                               \
+    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+)                                                                              \
+{                                                                              \
+    return Func(dimensioned<Type2>(t1), tdf2);                                 \
 }
 
 
-#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const dimensioned<Type2>& dt2                                             \
-)                                                                             \
-{                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        new DimensionedField<ReturnType, GeoMesh>                             \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                #Func "(" + df1.name() + ',' + dt2.name() + ')',              \
-                df1.instance(),                                               \
-                df1.db()                                                      \
-            ),                                                                \
-            df1.mesh(),                                                       \
-            Func(df1.dimensions(), dt2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Func(tRes().field(), df1.field(), dt2.value());                           \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const Type2& t2                                                           \
-)                                                                             \
-{                                                                             \
-    return Func(df1, dimensioned<Type2>(t2));                                 \
-}                                                                             \
-                                                                              \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const dimensioned<Type2>& dt2                                             \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
-        (                                                                     \
-            tdf1,                                                             \
-            #Func "(" + df1.name() + ',' + dt2.name() + ')',                  \
-            Func(df1.dimensions(), dt2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Func(tRes().field(), df1.field(), dt2.value());                           \
-                                                                              \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const Type2& t2                                                           \
-)                                                                             \
-{                                                                             \
-    return Func(tdf1, dimensioned<Type2>(t2));                                \
+#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        new DimensionedField<ReturnType, GeoMesh>                              \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #Func "(" + df1.name() + ',' + dt2.name() + ')',               \
+                df1.instance(),                                                \
+                df1.db()                                                       \
+            ),                                                                 \
+            df1.mesh(),                                                        \
+            Func(df1.dimensions(), dt2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Func(tRes().field(), df1.field(), dt2.value());                            \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const Type2& t2                                                            \
+)                                                                              \
+{                                                                              \
+    return Func(df1, dimensioned<Type2>(t2));                                  \
+}                                                                              \
+                                                                               \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
+        (                                                                      \
+            tdf1,                                                              \
+            #Func "(" + df1.name() + ',' + dt2.name() + ')',                   \
+            Func(df1.dimensions(), dt2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Func(tRes().field(), df1.field(), dt2.value());                            \
+                                                                               \
+    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const Type2& t2                                                            \
+)                                                                              \
+{                                                                              \
+    return Func(tdf1, dimensioned<Type2>(t2));                                 \
 }
 
 
-#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                  \
-    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                   \
+#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                   \
+    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                    \
     BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-)                                                                             \
-{                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        new DimensionedField<ReturnType, GeoMesh>                             \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + df1.name() + OpName + df2.name() + ')',                 \
-                df1.instance(),                                               \
-                df1.db()                                                      \
-            ),                                                                \
-            df1.mesh(),                                                       \
-            df1.dimensions() Op df2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                   \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
-        (                                                                     \
-            tdf2,                                                             \
-            '(' + df1.name() + OpName + df2.name() + ')',                     \
-            df1.dimensions() Op df2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                   \
-                                                                              \
-    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
-        (                                                                     \
-            tdf1,                                                             \
-            '(' + df1.name() + OpName + df2.name() + ')',                     \
-            df1.dimensions() Op df2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                   \
-                                                                              \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpTmpDimensionedField                                           \
-            <ReturnType, Type1, Type1, Type2, GeoMesh>::New                   \
-        (                                                                     \
-            tdf1,                                                             \
-            tdf2,                                                             \
-            '(' + df1.name() + OpName + df2.name() + ')',                     \
-            df1.dimensions() Op df2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                   \
-                                                                              \
-    reuseTmpTmpDimensionedField<ReturnType, Type1, Type1, Type2, GeoMesh>::   \
-        clear(tdf1, tdf2);                                                    \
-                                                                              \
-    return tRes;                                                              \
+#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+)                                                                              \
+{                                                                              \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        new DimensionedField<ReturnType, GeoMesh>                              \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + df1.name() + OpName + df2.name() + ')',                  \
+                df1.instance(),                                                \
+                df1.db()                                                       \
+            ),                                                                 \
+            df1.mesh(),                                                        \
+            df1.dimensions() Op df2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                    \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
+        (                                                                      \
+            tdf2,                                                              \
+            '(' + df1.name() + OpName + df2.name() + ')',                      \
+            df1.dimensions() Op df2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                    \
+                                                                               \
+    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
+        (                                                                      \
+            tdf1,                                                              \
+            '(' + df1.name() + OpName + df2.name() + ')',                      \
+            df1.dimensions() Op df2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                    \
+                                                                               \
+    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpTmpDimensionedField                                            \
+            <ReturnType, Type1, Type1, Type2, GeoMesh>::New                    \
+        (                                                                      \
+            tdf1,                                                              \
+            tdf2,                                                              \
+            '(' + df1.name() + OpName + df2.name() + ')',                      \
+            df1.dimensions() Op df2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                    \
+                                                                               \
+    reuseTmpTmpDimensionedField<ReturnType, Type1, Type1, Type2, GeoMesh>::    \
+        clear(tdf1, tdf2);                                                     \
+                                                                               \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-)                                                                             \
-{                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        new DimensionedField<ReturnType, GeoMesh>                             \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + dt1.name() + OpName + df2.name() + ')',                 \
-                df2.instance(),                                               \
-                df2.db()                                                      \
-            ),                                                                \
-            df2.mesh(),                                                       \
-            dt1.dimensions() Op df2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes().field(), dt1.value(), df2.field());                   \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-)                                                                             \
-{                                                                             \
-    return dimensioned<Type1>(t1) Op df2;                                     \
-}                                                                             \
-                                                                              \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
-        (                                                                     \
-            tdf2,                                                             \
-            '(' + dt1.name() + OpName + df2.name() + ')',                     \
-            dt1.dimensions() Op df2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes().field(), dt1.value(), tdf2().field());                \
-                                                                              \
-    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-)                                                                             \
-{                                                                             \
-    return dimensioned<Type1>(t1) Op tdf2;                                    \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+)                                                                              \
+{                                                                              \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        new DimensionedField<ReturnType, GeoMesh>                              \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + dt1.name() + OpName + df2.name() + ')',                  \
+                df2.instance(),                                                \
+                df2.db()                                                       \
+            ),                                                                 \
+            df2.mesh(),                                                        \
+            dt1.dimensions() Op df2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes().field(), dt1.value(), df2.field());                    \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+)                                                                              \
+{                                                                              \
+    return dimensioned<Type1>(t1) Op df2;                                      \
+}                                                                              \
+                                                                               \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
+        (                                                                      \
+            tdf2,                                                              \
+            '(' + dt1.name() + OpName + df2.name() + ')',                      \
+            dt1.dimensions() Op df2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes().field(), dt1.value(), tdf2().field());                 \
+                                                                               \
+    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+)                                                                              \
+{                                                                              \
+    return dimensioned<Type1>(t1) Op tdf2;                                     \
 }
 
 
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const dimensioned<Type2>& dt2                                             \
-)                                                                             \
-{                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        new DimensionedField<ReturnType, GeoMesh>                             \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + df1.name() + OpName + dt2.name() + ')',                 \
-                df1.instance(),                                               \
-                df1.db()                                                      \
-            ),                                                                \
-            df1.mesh(),                                                       \
-            df1.dimensions() Op dt2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes().field(), df1.field(), dt2.value());                   \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const Type2& t2                                                           \
-)                                                                             \
-{                                                                             \
-    return df1 Op dimensioned<Type2>(t2);                                     \
-}                                                                             \
-                                                                              \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const dimensioned<Type2>& dt2                                             \
-)                                                                             \
-{                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
-                                                                              \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
-    (                                                                         \
-        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
-        (                                                                     \
-            tdf1,                                                             \
-            '(' + df1.name() + OpName + dt2.name() + ')',                     \
-            df1.dimensions() Op dt2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes().field(), tdf1().field(), dt2.value());                \
-                                                                              \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const Type2& t2                                                           \
-)                                                                             \
-{                                                                             \
-    return tdf1 Op dimensioned<Type2>(t2);                                    \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        new DimensionedField<ReturnType, GeoMesh>                              \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + df1.name() + OpName + dt2.name() + ')',                  \
+                df1.instance(),                                                \
+                df1.db()                                                       \
+            ),                                                                 \
+            df1.mesh(),                                                        \
+            df1.dimensions() Op dt2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes().field(), df1.field(), dt2.value());                    \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const Type2& t2                                                            \
+)                                                                              \
+{                                                                              \
+    return df1 Op dimensioned<Type2>(t2);                                      \
+}                                                                              \
+                                                                               \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+                                                                               \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                            \
+    (                                                                          \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
+        (                                                                      \
+            tdf1,                                                              \
+            '(' + df1.name() + OpName + dt2.name() + ')',                      \
+            df1.dimensions() Op dt2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes().field(), tdf1().field(), dt2.value());                 \
+                                                                               \
+    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const Type2& t2                                                            \
+)                                                                              \
+{                                                                              \
+    return tdf1 Op dimensioned<Type2>(t2);                                     \
 }
 
-#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)    \
-    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)     \
+#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)     \
+    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)      \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)
 
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
index 1ed114443c..444192f399 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
@@ -25,239 +25,239 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                        \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df                                \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
+#define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                         \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                          \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_OPERATOR(ReturnType, Type1, Op, opFunc, Dfunc)                  \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1                               \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
+#define UNARY_OPERATOR(ReturnType, Type1, Op, opFunc, Dfunc)                   \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1                                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                          \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
+#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
+#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
 );
 
 
-#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const dimensioned<Type2>& dt2                                             \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const Type2& t2                                                           \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const dimensioned<Type2>& dt2                                             \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf2,                       \
-    const Type2& t2                                                           \
+#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const Type2& t2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf2,                         \
+    const Type2& t2                                                            \
 );
 
 
-#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                  \
-    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                   \
+#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                   \
+    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                    \
     BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
+#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const DimensionedField<Type2, GeoMesh>& df2                               \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const DimensionedField<Type2, GeoMesh>& df2                                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
 );
 
 
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const dimensioned<Type2>& dt2                                             \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const Type2& t2                                                           \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const dimensioned<Type2>& dt2                                             \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
-(                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
-    const Type2& t2                                                           \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const Type2& t2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const Type2& t2                                                            \
 );
 
 
-#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)    \
-    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)     \
+#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)     \
+    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)      \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)
 
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
index 5426d79c53..238f230daa 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
@@ -667,73 +667,73 @@ UNARY_FUNCTION(scalar, scalar, y1, trans)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BesselFunc(func)                                                    \
-                                                                            \
-template<class GeoMesh>                                                     \
-tmp<DimensionedField<scalar, GeoMesh>> func                                \
-(                                                                           \
-    const int n,                                                            \
-    const DimensionedField<scalar, GeoMesh>& dsf                            \
-)                                                                           \
-{                                                                           \
-    if (!dsf.dimensions().dimensionless())                                  \
-    {                                                                       \
-        FatalErrorInFunction                                                \
-            << "dsf not dimensionless"                                      \
-            << abort(FatalError);                                           \
-    }                                                                       \
-                                                                            \
-    tmp<DimensionedField<scalar, GeoMesh>> tFunc                           \
-    (                                                                       \
-        new DimensionedField<scalar, GeoMesh>                               \
-        (                                                                   \
-            IOobject                                                        \
-            (                                                               \
-                #func "(" + name(n) + ',' + dsf.name() + ')',               \
-                dsf.instance(),                                             \
-                dsf.db()                                                    \
-            ),                                                              \
-            dsf.mesh(),                                                     \
-            dimless                                                         \
-        )                                                                   \
-    );                                                                      \
-                                                                            \
-    func(tFunc().field(), n, dsf.field());                                  \
-                                                                            \
-    return tFunc;                                                           \
-}                                                                           \
-                                                                            \
-template<class GeoMesh>                                                     \
-tmp<DimensionedField<scalar, GeoMesh>> func                                \
-(                                                                           \
-    const int n,                                                            \
-    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf                     \
-)                                                                           \
-{                                                                           \
-    const DimensionedField<scalar, GeoMesh>& dsf = tdsf();                  \
-                                                                            \
-    if (!dsf.dimensions().dimensionless())                                  \
-    {                                                                       \
-        FatalErrorInFunction                                                \
-            << " : dsf not dimensionless"                                   \
-            << abort(FatalError);                                           \
-    }                                                                       \
-                                                                            \
-    tmp<DimensionedField<scalar, GeoMesh>> tFunc                           \
-    (                                                                       \
-        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New              \
-        (                                                                   \
-            tdsf,                                                           \
-            #func "(" + name(n) + ',' + dsf.name() + ')',                   \
-            dimless                                                         \
-        )                                                                   \
-    );                                                                      \
-                                                                            \
-    func(tFunc().field(), n, dsf.field());                                  \
-                                                                            \
-    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);         \
-                                                                            \
-    return tFunc;                                                           \
+#define BesselFunc(func)                                                       \
+                                                                               \
+template<class GeoMesh>                                                        \
+tmp<DimensionedField<scalar, GeoMesh>> func                                    \
+(                                                                              \
+    const int n,                                                               \
+    const DimensionedField<scalar, GeoMesh>& dsf                               \
+)                                                                              \
+{                                                                              \
+    if (!dsf.dimensions().dimensionless())                                     \
+    {                                                                          \
+        FatalErrorInFunction                                                   \
+            << "dsf not dimensionless"                                         \
+            << abort(FatalError);                                              \
+    }                                                                          \
+                                                                               \
+    tmp<DimensionedField<scalar, GeoMesh>> tFunc                               \
+    (                                                                          \
+        new DimensionedField<scalar, GeoMesh>                                  \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #func "(" + name(n) + ',' + dsf.name() + ')',                  \
+                dsf.instance(),                                                \
+                dsf.db()                                                       \
+            ),                                                                 \
+            dsf.mesh(),                                                        \
+            dimless                                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    func(tFunc().field(), n, dsf.field());                                     \
+                                                                               \
+    return tFunc;                                                              \
+}                                                                              \
+                                                                               \
+template<class GeoMesh>                                                        \
+tmp<DimensionedField<scalar, GeoMesh>> func                                    \
+(                                                                              \
+    const int n,                                                               \
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf                         \
+)                                                                              \
+{                                                                              \
+    const DimensionedField<scalar, GeoMesh>& dsf = tdsf();                     \
+                                                                               \
+    if (!dsf.dimensions().dimensionless())                                     \
+    {                                                                          \
+        FatalErrorInFunction                                                   \
+            << " : dsf not dimensionless"                                      \
+            << abort(FatalError);                                              \
+    }                                                                          \
+                                                                               \
+    tmp<DimensionedField<scalar, GeoMesh>> tFunc                               \
+    (                                                                          \
+        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New                 \
+        (                                                                      \
+            tdsf,                                                              \
+            #func "(" + name(n) + ',' + dsf.name() + ')',                      \
+            dimless                                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    func(tFunc().field(), n, dsf.field());                                     \
+                                                                               \
+    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);            \
+                                                                               \
+    return tFunc;                                                              \
 }
 
 BesselFunc(jn)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
index 1120223176..efd3b9c231 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
@@ -124,17 +124,17 @@ UNARY_FUNCTION(scalar, scalar, y1, trans)
 #define BesselFunc(func)                                                       \
                                                                                \
 template<class GeoMesh>                                                        \
-tmp<DimensionedField<scalar, GeoMesh>> func                                   \
+tmp<DimensionedField<scalar, GeoMesh>> func                                    \
 (                                                                              \
     const int n,                                                               \
     const DimensionedField<scalar, GeoMesh>&                                   \
 );                                                                             \
                                                                                \
 template<class GeoMesh>                                                        \
-tmp<DimensionedField<scalar, GeoMesh>> func                                   \
+tmp<DimensionedField<scalar, GeoMesh>> func                                    \
 (                                                                              \
     const int n,                                                               \
-    const tmp<DimensionedField<scalar, GeoMesh>>&                             \
+    const tmp<DimensionedField<scalar, GeoMesh>>&                              \
 );
 
 BesselFunc(jn)
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index c15243f392..21fc405c8b 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -326,34 +326,34 @@ void FieldField<Field, Type>::operator=(const Type& t)
 }
 
 
-#define COMPUTED_ASSIGNMENT(TYPE, op)                                         \
-                                                                              \
-template<template<class> class Field, class Type>                             \
-void FieldField<Field, Type>::operator op(const FieldField<Field, TYPE>& f)   \
-{                                                                             \
-    forAll(*this, i)                                                          \
-    {                                                                         \
-        this->operator[](i) op f[i];                                          \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-template<template<class> class Field, class Type>                             \
-void FieldField<Field, Type>::operator op                                     \
-(                                                                             \
-    const tmp<FieldField<Field, TYPE>>& tf                                   \
-)                                                                             \
-{                                                                             \
-    operator op(tf());                                                        \
-    tf.clear();                                                               \
-}                                                                             \
-                                                                              \
-template<template<class> class Field, class Type>                             \
-void FieldField<Field, Type>::operator op(const TYPE& t)                      \
-{                                                                             \
-    forAll(*this, i)                                                          \
-    {                                                                         \
-        this->operator[](i) op t;                                             \
-    }                                                                         \
+#define COMPUTED_ASSIGNMENT(TYPE, op)                                          \
+                                                                               \
+template<template<class> class Field, class Type>                              \
+void FieldField<Field, Type>::operator op(const FieldField<Field, TYPE>& f)    \
+{                                                                              \
+    forAll(*this, i)                                                           \
+    {                                                                          \
+        this->operator[](i) op f[i];                                           \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+template<template<class> class Field, class Type>                              \
+void FieldField<Field, Type>::operator op                                      \
+(                                                                              \
+    const tmp<FieldField<Field, TYPE>>& tf                                     \
+)                                                                              \
+{                                                                              \
+    operator op(tf());                                                         \
+    tf.clear();                                                                \
+}                                                                              \
+                                                                               \
+template<template<class> class Field, class Type>                              \
+void FieldField<Field, Type>::operator op(const TYPE& t)                       \
+{                                                                              \
+    forAll(*this, i)                                                           \
+    {                                                                          \
+        this->operator[](i) op t;                                              \
+    }                                                                          \
 }
 
 COMPUTED_ASSIGNMENT(Type, +=)
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index 3c5b726de6..02219f4243 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -397,14 +397,14 @@ tmp<FieldField<Field, Type>> cmptMag
 }
 
 
-#define TMP_UNARY_FUNCTION(returnType, func)                                  \
-                                                                              \
-template<template<class> class Field, class Type>                             \
-returnType func(const tmp<FieldField<Field, Type>>& tf1)                     \
-{                                                                             \
-    returnType res = func(tf1());                                             \
-    tf1.clear();                                                              \
-    return res;                                                               \
+#define TMP_UNARY_FUNCTION(returnType, func)                                   \
+                                                                               \
+template<template<class> class Field, class Type>                              \
+returnType func(const tmp<FieldField<Field, Type>>& tf1)                       \
+{                                                                              \
+    returnType res = func(tf1());                                              \
+    tf1.clear();                                                               \
+    return res;                                                                \
 }
 
 template<template<class> class Field, class Type>
@@ -548,15 +548,15 @@ TMP_UNARY_FUNCTION(Type, average)
 
 #include "PstreamReduceOps.H"
 
-#define G_UNARY_FUNCTION(returnType, gFunc, func, rFunc)                      \
-                                                                              \
-template<template<class> class Field, class Type>                             \
-returnType gFunc(const FieldField<Field, Type>& f)                            \
-{                                                                             \
-    returnType res = func(f);                                                 \
-    reduce(res, rFunc##Op<Type>());                                           \
-    return res;                                                               \
-}                                                                             \
+#define G_UNARY_FUNCTION(returnType, gFunc, func, rFunc)                       \
+                                                                               \
+template<template<class> class Field, class Type>                              \
+returnType gFunc(const FieldField<Field, Type>& f)                             \
+{                                                                              \
+    returnType res = func(f);                                                  \
+    reduce(res, rFunc##Op<Type>());                                            \
+    return res;                                                                \
+}                                                                              \
 TMP_UNARY_FUNCTION(returnType, gFunc)
 
 G_UNARY_FUNCTION(Type, gMax, max, max)
@@ -655,7 +655,7 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
@@ -663,7 +663,7 @@ operator op                                                                    \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType>> tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                  \
     (                                                                          \
         FieldField<Field1, productType>::NewCalculatedType(f1)                 \
     );                                                                         \
@@ -672,15 +672,15 @@ operator op                                                                    \
 }                                                                              \
                                                                                \
 template<template<class> class Field, class Type1, class Type2>                \
-tmp<FieldField<Field, typename product<Type1, Type2>::type>>                  \
+tmp<FieldField<Field, typename product<Type1, Type2>::type>>                   \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
-    const tmp<FieldField<Field, Type2>>& tf2                                  \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field, productType>> tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                   \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type2>::New(tf2)                \
     );                                                                         \
@@ -696,15 +696,15 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field, typename product<Type1, Type2>::type>>                  \
+tmp<FieldField<Field, typename product<Type1, Type2>::type>>                   \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
-    const tmp<FieldField<Field2, Type2>>& tf2                                 \
+    const tmp<FieldField<Field2, Type2>>& tf2                                  \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType>> tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                  \
     (                                                                          \
         FieldField<Field1, productType>::NewCalculatedType(f1)                 \
     );                                                                         \
@@ -720,15 +720,15 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1>>& tf1,                                \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                 \
     const FieldField<Field2, Type2>& f2                                        \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType>> tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                  \
     (                                                                          \
         reuseTmpFieldField<Field1, productType, Type1>::New(tf1)               \
     );                                                                         \
@@ -744,15 +744,15 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1>>& tf1,                                \
-    const tmp<FieldField<Field2, Type2>>& tf2                                 \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                 \
+    const tmp<FieldField<Field2, Type2>>& tf2                                  \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType>> tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                  \
     (                                                                          \
         reuseTmpTmpFieldField<Field1, productType, Type1, Type1, Type2>::New   \
         (tf1, tf2)                                                             \
@@ -780,7 +780,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                     \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type>& f1,                                         \
@@ -788,7 +788,7 @@ operator op                                                                    \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type, Form>::type productType;                    \
-    tmp<FieldField<Field, productType>> tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                   \
     (                                                                          \
         FieldField<Field, productType>::NewCalculatedType(f1)                  \
     );                                                                         \
@@ -798,15 +798,15 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                     \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field, Type>>& tf1,                                  \
+    const tmp<FieldField<Field, Type>>& tf1,                                   \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type, Form>::type productType;                    \
-    tmp<FieldField<Field, productType>> tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                   \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
     );                                                                         \
@@ -832,7 +832,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                     \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
@@ -840,7 +840,7 @@ operator op                                                                    \
 )                                                                              \
 {                                                                              \
     typedef typename product<Form, Type>::type productType;                    \
-    tmp<FieldField<Field, productType>> tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                   \
     (                                                                          \
         FieldField<Field, productType>::NewCalculatedType(f1)                  \
     );                                                                         \
@@ -850,15 +850,15 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                     \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const tmp<FieldField<Field, Type>>& tf1                                   \
+    const tmp<FieldField<Field, Type>>& tf1                                    \
 )                                                                              \
 {                                                                              \
     typedef typename product<Form, Type>::type productType;                    \
-    tmp<FieldField<Field, productType>> tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                   \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
     );                                                                         \
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
index 5860c6e4ed..0800ab9869 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
@@ -185,9 +185,9 @@ tmp<FieldField<Field, Type>> cmptMag
 );
 
 
-#define TMP_UNARY_FUNCTION(returnType, func)                                  \
-                                                                              \
-template<template<class> class Field, class Type>                             \
+#define TMP_UNARY_FUNCTION(returnType, func)                                   \
+                                                                               \
+template<template<class> class Field, class Type>                              \
 returnType func(const tmp<FieldField<Field, Type>>& tf1);
 
 template<template<class> class Field, class Type>
@@ -216,10 +216,10 @@ Type average(const FieldField<Field, Type>& f);
 TMP_UNARY_FUNCTION(Type, average)
 
 
-#define G_UNARY_FUNCTION(returnType, gFunc, func, rFunc)                      \
-                                                                              \
-template<template<class> class Field, class Type>                             \
-returnType gFunc(const FieldField<Field, Type>& f);                           \
+#define G_UNARY_FUNCTION(returnType, gFunc, func, rFunc)                       \
+                                                                               \
+template<template<class> class Field, class Type>                              \
+returnType gFunc(const FieldField<Field, Type>& f);                            \
 TMP_UNARY_FUNCTION(returnType, gFunc)
 
 G_UNARY_FUNCTION(Type, gMax, max, max)
@@ -288,7 +288,7 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
@@ -296,11 +296,11 @@ operator op                                                                    \
 );                                                                             \
                                                                                \
 template<template<class> class Field, class Type1, class Type2>                \
-tmp<FieldField<Field, typename product<Type1, Type2>::type>>                  \
+tmp<FieldField<Field, typename product<Type1, Type2>::type>>                   \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
-    const tmp<FieldField<Field, Type2>>& tf2                                  \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -310,11 +310,11 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
-    const tmp<FieldField<Field2, Type2>>& tf2                                 \
+    const tmp<FieldField<Field2, Type2>>& tf2                                  \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -324,10 +324,10 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1>>& tf1,                                \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                 \
     const FieldField<Field2, Type2>& f2                                        \
 );                                                                             \
                                                                                \
@@ -338,11 +338,11 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1>>& tf1,                                \
-    const tmp<FieldField<Field2, Type2>>& tf2                                 \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                 \
+    const tmp<FieldField<Field2, Type2>>& tf2                                  \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -356,7 +356,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                     \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type>& f1,                                         \
@@ -365,10 +365,10 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                     \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field, Type>>& tf1,                                  \
+    const tmp<FieldField<Field, Type>>& tf1,                                   \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 );                                                                             \
                                                                                \
@@ -383,7 +383,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                     \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
@@ -392,11 +392,11 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                     \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const tmp<FieldField<Field, Type>>& tf1                                   \
+    const tmp<FieldField<Field, Type>>& tf1                                    \
 );
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
index e309733770..03df3f8b9e 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
@@ -28,469 +28,469 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_FUNCTION(ReturnType, Type, Func)                                \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    FieldField<Field, ReturnType>& res,                                       \
-    const FieldField<Field, Type>& f                                          \
-)                                                                             \
-{                                                                             \
-    forAll(res, i)                                                            \
-    {                                                                         \
-        Func(res[i], f[i]);                                                   \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const FieldField<Field, Type>& f                                          \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        FieldField<Field, ReturnType>::NewCalculatedType(f)                   \
-    );                                                                        \
-    Func(tRes(), f);                                                          \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const tmp<FieldField<Field, Type>>& tf                                   \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpFieldField<Field, Type, Type>::New(tf)                        \
-    );                                                                        \
-    Func(tRes(), tf());                                                       \
-    reuseTmpFieldField<Field, Type, Type>::clear(tf);                         \
-    return tRes;                                                              \
+#define UNARY_FUNCTION(ReturnType, Type, Func)                                 \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& res,                                        \
+    const FieldField<Field, Type>& f                                           \
+)                                                                              \
+{                                                                              \
+    forAll(res, i)                                                             \
+    {                                                                          \
+        Func(res[i], f[i]);                                                    \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type>& f                                           \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        FieldField<Field, ReturnType>::NewCalculatedType(f)                    \
+    );                                                                         \
+    Func(tRes(), f);                                                           \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type>>& tf                                     \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpFieldField<Field, Type, Type>::New(tf)                         \
+    );                                                                         \
+    Func(tRes(), tf());                                                        \
+    reuseTmpFieldField<Field, Type, Type>::clear(tf);                          \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_OPERATOR(ReturnType, Type, Op, OpFunc)                          \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    FieldField<Field, ReturnType>& res,                                       \
-    const FieldField<Field, Type>& f                                          \
-)                                                                             \
-{                                                                             \
-    forAll(res, i)                                                            \
-    {                                                                         \
-        OpFunc(res[i], f[i]);                                                 \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const FieldField<Field, Type>& f                                          \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        FieldField<Field, Type>::NewCalculatedType(f)                         \
-    );                                                                        \
-    OpFunc(tRes(), f);                                                        \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const tmp<FieldField<Field, Type>>& tf                                   \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpFieldField<Field, Type, Type>::New(tf)                        \
-    );                                                                        \
-    OpFunc(tRes(), tf());                                                     \
-    reuseTmpFieldField<Field, Type, Type>::clear(tf);                         \
-    return tRes;                                                              \
+#define UNARY_OPERATOR(ReturnType, Type, Op, OpFunc)                           \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    FieldField<Field, ReturnType>& res,                                        \
+    const FieldField<Field, Type>& f                                           \
+)                                                                              \
+{                                                                              \
+    forAll(res, i)                                                             \
+    {                                                                          \
+        OpFunc(res[i], f[i]);                                                  \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const FieldField<Field, Type>& f                                           \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        FieldField<Field, Type>::NewCalculatedType(f)                          \
+    );                                                                         \
+    OpFunc(tRes(), f);                                                         \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const tmp<FieldField<Field, Type>>& tf                                     \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpFieldField<Field, Type, Type>::New(tf)                         \
+    );                                                                         \
+    OpFunc(tRes(), tf());                                                      \
+    reuseTmpFieldField<Field, Type, Type>::clear(tf);                          \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const FieldField<Field, Type1>& f1,                                       \
-    const FieldField<Field, Type2>& f2                                        \
-)                                                                             \
-{                                                                             \
-    forAll(f, i)                                                              \
-    {                                                                         \
-        Func(f[i], f1[i], f2[i]);                                             \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const FieldField<Field, Type2>& f2                                        \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        FieldField<Field, Type1>::NewCalculatedType(f1)                       \
-    );                                                                        \
-    Func(tRes(), f1, f2);                                                     \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2>>& tf2                                 \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
-    );                                                                        \
-    Func(tRes(), f1, tf2());                                                  \
-    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                 \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const FieldField<Field, Type2>& f2                                        \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
-    );                                                                        \
-    Func(tRes(), tf1(), f2);                                                  \
-    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                 \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const tmp<FieldField<Field, Type2>>& tf2                                 \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::       \
-            New(tf1, tf2)                                                     \
-    );                                                                        \
-    Func(tRes(), tf1(), tf2());                                               \
-    reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::           \
-        clear(tf1, tf2);                                                      \
-    return tRes;                                                              \
+#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2                                         \
+)                                                                              \
+{                                                                              \
+    forAll(f, i)                                                               \
+    {                                                                          \
+        Func(f[i], f1[i], f2[i]);                                              \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2                                         \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        FieldField<Field, Type1>::NewCalculatedType(f1)                        \
+    );                                                                         \
+    Func(tRes(), f1, f2);                                                      \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
+    );                                                                         \
+    Func(tRes(), f1, tf2());                                                   \
+    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const FieldField<Field, Type2>& f2                                         \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
+    );                                                                         \
+    Func(tRes(), tf1(), f2);                                                   \
+    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::        \
+            New(tf1, tf2)                                                      \
+    );                                                                         \
+    Func(tRes(), tf1(), tf2());                                                \
+    reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::            \
+        clear(tf1, tf2);                                                       \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const FieldField<Field, Type1>& f1,                                       \
-    const Type2& s                                                            \
-)                                                                             \
-{                                                                             \
-    forAll(f, i)                                                              \
-    {                                                                         \
-        Func(f[i], f1[i], s);                                                 \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const Type2& s                                                            \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        FieldField<Field, Type1>::NewCalculatedType(f1)                       \
-    );                                                                        \
-    Func(tRes(), f1, s);                                                      \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const Type2& s                                                            \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
-    );                                                                        \
-    Func(tRes(), tf1(), s);                                                   \
-    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                 \
-    return tRes;                                                              \
+#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const FieldField<Field, Type1>& f1,                                        \
+    const Type2& s                                                             \
+)                                                                              \
+{                                                                              \
+    forAll(f, i)                                                               \
+    {                                                                          \
+        Func(f[i], f1[i], s);                                                  \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const Type2& s                                                             \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        FieldField<Field, Type1>::NewCalculatedType(f1)                        \
+    );                                                                         \
+    Func(tRes(), f1, s);                                                       \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const Type2& s                                                             \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
+    );                                                                         \
+    Func(tRes(), tf1(), s);                                                    \
+    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
+    return tRes;                                                               \
 }
 
 
-#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const Type1& s,                                                           \
-    const FieldField<Field, Type2>& f2                                        \
-)                                                                             \
-{                                                                             \
-    forAll(f, i)                                                              \
-    {                                                                         \
-        Func(f[i], s, f2[i]);                                                 \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const Type1& s,                                                           \
-    const FieldField<Field, Type2>& f2                                        \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        FieldField<Field, Type2>::NewCalculatedType(f2)                       \
-    );                                                                        \
-    Func(tRes(), s, f2);                                                      \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const Type1& s,                                                           \
-    const tmp<FieldField<Field, Type2>>& tf2                                 \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
-    );                                                                        \
-    Func(tRes(), s, tf2());                                                   \
-    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                 \
-    return tRes;                                                              \
+#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const Type1& s,                                                            \
+    const FieldField<Field, Type2>& f2                                         \
+)                                                                              \
+{                                                                              \
+    forAll(f, i)                                                               \
+    {                                                                          \
+        Func(f[i], s, f2[i]);                                                  \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const Type1& s,                                                            \
+    const FieldField<Field, Type2>& f2                                         \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        FieldField<Field, Type2>::NewCalculatedType(f2)                        \
+    );                                                                         \
+    Func(tRes(), s, f2);                                                       \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const Type1& s,                                                            \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
+    );                                                                         \
+    Func(tRes(), s, tf2());                                                    \
+    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
+    return tRes;                                                               \
 }
 
 
-#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                  \
-    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                   \
+#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                   \
+    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                    \
     BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)                 \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const FieldField<Field, Type1>& f1,                                       \
-    const FieldField<Field, Type2>& f2                                        \
-)                                                                             \
-{                                                                             \
-    forAll(f, i)                                                              \
-    {                                                                         \
-        OpFunc(f[i], f1[i], f2[i]);                                           \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const FieldField<Field, Type2>& f2                                        \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        FieldField<Field, ReturnType>::NewCalculatedType(f1)                  \
-    );                                                                        \
-    OpFunc(tRes(), f1, f2);                                                   \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2>>& tf2                                 \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
-    );                                                                        \
-    OpFunc(tRes(), f1, tf2());                                                \
-    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                 \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const FieldField<Field, Type2>& f2                                        \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
-    );                                                                        \
-    OpFunc(tRes(), tf1(), f2);                                                \
-    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                 \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const tmp<FieldField<Field, Type2>>& tf2                                 \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::       \
-            New(tf1, tf2)                                                     \
-    );                                                                        \
-    OpFunc(tRes(), tf1(), tf2());                                             \
-    reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::           \
-        clear(tf1, tf2);                                                      \
-    return tRes;                                                              \
+#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)                  \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2                                         \
+)                                                                              \
+{                                                                              \
+    forAll(f, i)                                                               \
+    {                                                                          \
+        OpFunc(f[i], f1[i], f2[i]);                                            \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2                                         \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        FieldField<Field, ReturnType>::NewCalculatedType(f1)                   \
+    );                                                                         \
+    OpFunc(tRes(), f1, f2);                                                    \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
+    );                                                                         \
+    OpFunc(tRes(), f1, tf2());                                                 \
+    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const FieldField<Field, Type2>& f2                                         \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
+    );                                                                         \
+    OpFunc(tRes(), tf1(), f2);                                                 \
+    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::        \
+            New(tf1, tf2)                                                      \
+    );                                                                         \
+    OpFunc(tRes(), tf1(), tf2());                                              \
+    reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::            \
+        clear(tf1, tf2);                                                       \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const Type1& s,                                                           \
-    const FieldField<Field, Type2>& f2                                        \
-)                                                                             \
-{                                                                             \
-    forAll(f, i)                                                              \
-    {                                                                         \
-        OpFunc(f[i], s, f2[i]);                                               \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const Type1& s,                                                           \
-    const FieldField<Field, Type2>& f2                                        \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        FieldField<Field, Type2>::NewCalculatedType(f2)                       \
-    );                                                                        \
-    OpFunc(tRes(), s, f2);                                                    \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const Type1& s,                                                           \
-    const tmp<FieldField<Field, Type2>>& tf2                                 \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
-    );                                                                        \
-    OpFunc(tRes(), s, tf2());                                                 \
-    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                 \
-    return tRes;                                                              \
+#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const Type1& s,                                                            \
+    const FieldField<Field, Type2>& f2                                         \
+)                                                                              \
+{                                                                              \
+    forAll(f, i)                                                               \
+    {                                                                          \
+        OpFunc(f[i], s, f2[i]);                                                \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const Type1& s,                                                            \
+    const FieldField<Field, Type2>& f2                                         \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        FieldField<Field, Type2>::NewCalculatedType(f2)                        \
+    );                                                                         \
+    OpFunc(tRes(), s, f2);                                                     \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const Type1& s,                                                            \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
+    );                                                                         \
+    OpFunc(tRes(), s, tf2());                                                  \
+    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
+    return tRes;                                                               \
 }
 
 
-#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const FieldField<Field, Type1>& f1,                                       \
-    const Type2& s                                                            \
-)                                                                             \
-{                                                                             \
-    forAll(f, i)                                                              \
-    {                                                                         \
-        OpFunc(f[i], f1[i], s);                                               \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const Type2& s                                                            \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        FieldField<Field, Type1>::NewCalculatedType(f1)                       \
-    );                                                                        \
-    OpFunc(tRes(), f1, s);                                                    \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const Type2& s                                                            \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, ReturnType>> tRes                                  \
-    (                                                                         \
-        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
-    );                                                                        \
-    OpFunc(tRes(), tf1(), s);                                                 \
-    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                 \
-    return tRes;                                                              \
+#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const FieldField<Field, Type1>& f1,                                        \
+    const Type2& s                                                             \
+)                                                                              \
+{                                                                              \
+    forAll(f, i)                                                               \
+    {                                                                          \
+        OpFunc(f[i], f1[i], s);                                                \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const Type2& s                                                             \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        FieldField<Field, Type1>::NewCalculatedType(f1)                        \
+    );                                                                         \
+    OpFunc(tRes(), f1, s);                                                     \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const Type2& s                                                             \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tRes                                    \
+    (                                                                          \
+        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
+    );                                                                         \
+    OpFunc(tRes(), tf1(), s);                                                  \
+    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
+    return tRes;                                                               \
 }
 
 
-#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)            \
-    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)             \
+#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)             \
+    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)              \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
index 6cc3ad76ab..d00ff6603c 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
@@ -30,245 +30,245 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_FUNCTION(ReturnType, Type1, Func)                               \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    FieldField<Field, ReturnType>& res,                                       \
-    const FieldField<Field, Type1>& f                                         \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const FieldField<Field, Type1>& f                                         \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> Func                                      \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf                                  \
+#define UNARY_FUNCTION(ReturnType, Type1, Func)                                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& res,                                        \
+    const FieldField<Field, Type1>& f                                          \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f                                          \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf                                    \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc)                         \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    FieldField<Field, ReturnType>& res,                                       \
-    const FieldField<Field, Type1>& f                                         \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const FieldField<Field, Type1>& f                                         \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf                                  \
+#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc)                          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    FieldField<Field, ReturnType>& res,                                        \
+    const FieldField<Field, Type1>& f                                          \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const FieldField<Field, Type1>& f                                          \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf                                    \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
-                                                                              \
-TEMPLATE                                                                      \
-void func                                                                     \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const FieldField<Field, Type1>& f1,                                       \
-    const FieldField<Field, Type2>& f2                                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> func                                      \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const FieldField<Field, Type2>& f2                                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> func                                      \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2>>& tf2                                 \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> func                                      \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const FieldField<Field, Type2>& f2                                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> func                                      \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const tmp<FieldField<Field, Type2>>& tf2                                 \
+#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
+                                                                               \
+TEMPLATE                                                                       \
+void func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const FieldField<Field, Type2>& f2                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-void func                                                                     \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const Type1& s1,                                                          \
-    const FieldField<Field, Type2>& f2                                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> func                                      \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const FieldField<Field, Type1>& f2                                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> func                                      \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const tmp<FieldField<Field, Type1>>& tf2                                 \
+#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const Type1& s1,                                                           \
+    const FieldField<Field, Type2>& f2                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> func                                        \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const FieldField<Field, Type1>& f2                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> func                                        \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const tmp<FieldField<Field, Type1>>& tf2                                   \
 );
 
 
-#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-void func                                                                     \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const FieldField<Field, Type1>& f1,                                       \
-    const Type2& s                                                            \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> func                                      \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const Type2& s                                                            \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> func                                      \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const Type2& s                                                            \
+#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const FieldField<Field, Type1>& f1,                                        \
+    const Type2& s                                                             \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const Type2& s                                                             \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const Type2& s                                                             \
 );
 
 
-#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                  \
-    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                   \
+#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                   \
+    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                    \
     BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)                 \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const FieldField<Field, Type1>& f1,                                       \
-    const FieldField<Field, Type2>& f2                                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const FieldField<Field, Type2>& f2                                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2>>& tf2                                 \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const FieldField<Field, Type2>& f2                                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const tmp<FieldField<Field, Type2>>& tf2                                 \
+#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)                  \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const FieldField<Field, Type2>& f2                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const Type1& s1,                                                          \
-    const FieldField<Field, Type2>& f2                                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const FieldField<Field, Type2>& f2                                        \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const tmp<FieldField<Field, Type2>>& tf2                                 \
+#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const Type1& s1,                                                           \
+    const FieldField<Field, Type2>& f2                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const FieldField<Field, Type2>& f2                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const tmp<FieldField<Field, Type2>>& tf2                                   \
 );
 
 
-#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    FieldField<Field, ReturnType>& f,                                         \
-    const FieldField<Field, Type1>& f1,                                       \
-    const Type2& s2                                                           \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const FieldField<Field, Type1>& f1,                                       \
-    const Type2& s2                                                           \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType>> operator Op                               \
-(                                                                             \
-    const tmp<FieldField<Field, Type1>>& tf1,                                \
-    const Type2& s2                                                           \
+#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    FieldField<Field, ReturnType>& f,                                          \
+    const FieldField<Field, Type1>& f1,                                        \
+    const Type2& s2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const Type2& s2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> operator Op                                 \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const Type2& s2                                                            \
 );
 
 
-#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)            \
-    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)             \
+#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)             \
+    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)              \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)
 
 
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
index 43e52ab90f..ab97ba0020 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
@@ -135,51 +135,51 @@ UNARY_FUNCTION(scalar, scalar, y0)
 UNARY_FUNCTION(scalar, scalar, y1)
 
 
-#define BesselFunc(func)                                                      \
-                                                                              \
-template<template<class> class Field>                                         \
-void func                                                                     \
-(                                                                             \
-    FieldField<Field, scalar>& res,                                           \
-    const int n,                                                              \
-    const FieldField<Field, scalar>& sf                                       \
-)                                                                             \
-{                                                                             \
-    forAll(res, i)                                                            \
-    {                                                                         \
-        func(res[i], n, sf[i]);                                               \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-template<template<class> class Field>                                         \
-tmp<FieldField<Field, scalar>> func                                          \
-(                                                                             \
-    const int n,                                                              \
-    const FieldField<Field, scalar>& sf                                       \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, scalar>> tRes                                      \
-    (                                                                         \
-        FieldField<Field, scalar>::NewCalculatedType(sf)                      \
-    );                                                                        \
-    func(tRes(), n, sf);                                                      \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<template<class> class Field>                                         \
-tmp<FieldField<Field, scalar>> func                                          \
-(                                                                             \
-    const int n,                                                              \
-    const tmp<FieldField<Field, scalar>>& tsf                                \
-)                                                                             \
-{                                                                             \
-    tmp<FieldField<Field, scalar>> tRes                                      \
-    (                                                                         \
-        reuseTmpFieldField<Field, scalar, scalar>::New(tsf)                   \
-    );                                                                        \
-    func(tRes(), n, tsf());                                                   \
-    reuseTmpFieldField<Field, scalar, scalar>::clear(tsf);                    \
-    return tRes;                                                              \
+#define BesselFunc(func)                                                       \
+                                                                               \
+template<template<class> class Field>                                          \
+void func                                                                      \
+(                                                                              \
+    FieldField<Field, scalar>& res,                                            \
+    const int n,                                                               \
+    const FieldField<Field, scalar>& sf                                        \
+)                                                                              \
+{                                                                              \
+    forAll(res, i)                                                             \
+    {                                                                          \
+        func(res[i], n, sf[i]);                                                \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+template<template<class> class Field>                                          \
+tmp<FieldField<Field, scalar>> func                                            \
+(                                                                              \
+    const int n,                                                               \
+    const FieldField<Field, scalar>& sf                                        \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, scalar>> tRes                                        \
+    (                                                                          \
+        FieldField<Field, scalar>::NewCalculatedType(sf)                       \
+    );                                                                         \
+    func(tRes(), n, sf);                                                       \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<template<class> class Field>                                          \
+tmp<FieldField<Field, scalar>> func                                            \
+(                                                                              \
+    const int n,                                                               \
+    const tmp<FieldField<Field, scalar>>& tsf                                  \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, scalar>> tRes                                        \
+    (                                                                          \
+        reuseTmpFieldField<Field, scalar, scalar>::New(tsf)                    \
+    );                                                                         \
+    func(tRes(), n, tsf());                                                    \
+    reuseTmpFieldField<Field, scalar, scalar>::clear(tsf);                     \
+    return tRes;                                                               \
 }
 
 BesselFunc(jn)
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
index 3a214a3ee4..208a719074 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
@@ -128,14 +128,14 @@ UNARY_FUNCTION(scalar, scalar, y0)
 UNARY_FUNCTION(scalar, scalar, y1)
 
 
-#define BesselFunc(func)                                                      \
-void func                                                                     \
-(                                                                             \
-    FieldField<Field, scalar>& Res,                                           \
-    const int n,                                                              \
-    const FieldField<Field, scalar>& sf                                       \
-);                                                                            \
-tmp<scalarField> func(const int n, const FieldField<Field, scalar>&);         \
+#define BesselFunc(func)                                                       \
+void func                                                                      \
+(                                                                              \
+    FieldField<Field, scalar>& Res,                                            \
+    const int n,                                                               \
+    const FieldField<Field, scalar>& sf                                        \
+);                                                                             \
+tmp<scalarField> func(const int n, const FieldField<Field, scalar>&);          \
 tmp<scalarField> func(const int n, const tmp<FieldField<Field, scalar>>&);
 
 BesselFunc(jn)
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 5d66bdb349..73dbc688c1 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -712,25 +712,25 @@ void Foam::Field<Type>::operator=(const VectorSpace<Form,Cmpt,nCmpt>& vs)
 }
 
 
-#define COMPUTED_ASSIGNMENT(TYPE, op)                                         \
-                                                                              \
-template<class Type>                                                          \
-void Foam::Field<Type>::operator op(const UList<TYPE>& f)                     \
-{                                                                             \
-    TFOR_ALL_F_OP_F(Type, *this, op, TYPE, f)                                 \
-}                                                                             \
-                                                                              \
-template<class Type>                                                          \
-void Foam::Field<Type>::operator op(const tmp<Field<TYPE>>& tf)              \
-{                                                                             \
-    operator op(tf());                                                        \
-    tf.clear();                                                               \
-}                                                                             \
-                                                                              \
-template<class Type>                                                          \
-void Foam::Field<Type>::operator op(const TYPE& t)                            \
-{                                                                             \
-    TFOR_ALL_F_OP_S(Type, *this, op, TYPE, t)                                 \
+#define COMPUTED_ASSIGNMENT(TYPE, op)                                          \
+                                                                               \
+template<class Type>                                                           \
+void Foam::Field<Type>::operator op(const UList<TYPE>& f)                      \
+{                                                                              \
+    TFOR_ALL_F_OP_F(Type, *this, op, TYPE, f)                                  \
+}                                                                              \
+                                                                               \
+template<class Type>                                                           \
+void Foam::Field<Type>::operator op(const tmp<Field<TYPE>>& tf)                \
+{                                                                              \
+    operator op(tf());                                                         \
+    tf.clear();                                                                \
+}                                                                              \
+                                                                               \
+template<class Type>                                                           \
+void Foam::Field<Type>::operator op(const TYPE& t)                             \
+{                                                                              \
+    TFOR_ALL_F_OP_S(Type, *this, op, TYPE, t)                                  \
 }
 
 COMPUTED_ASSIGNMENT(Type, +=)
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index e8703cd1b8..c581ba2362 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -297,14 +297,14 @@ tmp<Field<Type>> cmptMag(const tmp<Field<Type>>& tf)
 }
 
 
-#define TMP_UNARY_FUNCTION(ReturnType, Func)                                  \
-                                                                              \
-template<class Type>                                                          \
-ReturnType Func(const tmp<Field<Type>>& tf1)                                 \
-{                                                                             \
-    ReturnType res = Func(tf1());                                             \
-    tf1.clear();                                                              \
-    return res;                                                               \
+#define TMP_UNARY_FUNCTION(ReturnType, Func)                                   \
+                                                                               \
+template<class Type>                                                           \
+ReturnType Func(const tmp<Field<Type>>& tf1)                                   \
+{                                                                              \
+    ReturnType res = Func(tf1());                                              \
+    tf1.clear();                                                               \
+    return res;                                                                \
 }
 
 template<class Type>
@@ -527,15 +527,15 @@ Type average(const UList<Type>& f)
 TMP_UNARY_FUNCTION(Type, average)
 
 
-#define G_UNARY_FUNCTION(ReturnType, gFunc, Func, rFunc)                      \
-                                                                              \
-template<class Type>                                                          \
-ReturnType gFunc(const UList<Type>& f, const label comm)                      \
-{                                                                             \
-    ReturnType res = Func(f);                                                 \
-    reduce(res, rFunc##Op<Type>(), Pstream::msgType(), comm);                 \
-    return res;                                                               \
-}                                                                             \
+#define G_UNARY_FUNCTION(ReturnType, gFunc, Func, rFunc)                       \
+                                                                               \
+template<class Type>                                                           \
+ReturnType gFunc(const UList<Type>& f, const label comm)                       \
+{                                                                              \
+    ReturnType res = Func(f);                                                  \
+    reduce(res, rFunc##Op<Type>(), Pstream::msgType(), comm);                  \
+    return res;                                                                \
+}                                                                              \
 TMP_UNARY_FUNCTION(ReturnType, gFunc)
 
 G_UNARY_FUNCTION(Type, gMax, max, max)
@@ -633,137 +633,137 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, divide)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define PRODUCT_OPERATOR(product, Op, OpFunc)                                 \
-                                                                              \
-template<class Type1, class Type2>                                            \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<typename product<Type1, Type2>::type>& res,                         \
-    const UList<Type1>& f1,                                                   \
-    const UList<Type2>& f2                                                    \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-    TFOR_ALL_F_OP_F_OP_F(productType, res, =, Type1, f1, Op, Type2, f2)       \
-}                                                                             \
-                                                                              \
-template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type>>                             \
-operator Op(const UList<Type1>& f1, const UList<Type2>& f2)                   \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));         \
-    OpFunc(tRes(), f1, f2);                                                   \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type>>                             \
-operator Op(const UList<Type1>& f1, const tmp<Field<Type2>>& tf2)            \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType>> tRes = reuseTmp<productType, Type2>::New(tf2);   \
-    OpFunc(tRes(), f1, tf2());                                                \
-    reuseTmp<productType, Type2>::clear(tf2);                                 \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type>>                             \
-operator Op(const tmp<Field<Type1>>& tf1, const UList<Type2>& f2)            \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType>> tRes = reuseTmp<productType, Type1>::New(tf1);   \
-    OpFunc(tRes(), tf1(), f2);                                                \
-    reuseTmp<productType, Type1>::clear(tf1);                                 \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type>>                             \
-operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2)     \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType>> tRes =                                           \
-        reuseTmpTmp<productType, Type1, Type1, Type2>::New(tf1, tf2);         \
-    OpFunc(tRes(), tf1(), tf2());                                             \
-    reuseTmpTmp<productType, Type1, Type1, Type2>::clear(tf1, tf2);           \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Type, class Form, class Cmpt, int nCmpt>                       \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<typename product<Type, Form>::type>& res,                           \
-    const UList<Type>& f1,                                                    \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type, Form>::type productType;                   \
-    TFOR_ALL_F_OP_F_OP_S                                                      \
+#define PRODUCT_OPERATOR(product, Op, OpFunc)                                  \
+                                                                               \
+template<class Type1, class Type2>                                             \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<typename product<Type1, Type2>::type>& res,                          \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+    TFOR_ALL_F_OP_F_OP_F(productType, res, =, Type1, f1, Op, Type2, f2)        \
+}                                                                              \
+                                                                               \
+template<class Type1, class Type2>                                             \
+tmp<Field<typename product<Type1, Type2>::type>>                               \
+operator Op(const UList<Type1>& f1, const UList<Type2>& f2)                    \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));           \
+    OpFunc(tRes(), f1, f2);                                                    \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Type1, class Type2>                                             \
+tmp<Field<typename product<Type1, Type2>::type>>                               \
+operator Op(const UList<Type1>& f1, const tmp<Field<Type2>>& tf2)              \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type2>::New(tf2);     \
+    OpFunc(tRes(), f1, tf2());                                                 \
+    reuseTmp<productType, Type2>::clear(tf2);                                  \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Type1, class Type2>                                             \
+tmp<Field<typename product<Type1, Type2>::type>>                               \
+operator Op(const tmp<Field<Type1>>& tf1, const UList<Type2>& f2)              \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type1>::New(tf1);     \
+    OpFunc(tRes(), tf1(), f2);                                                 \
+    reuseTmp<productType, Type1>::clear(tf1);                                  \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Type1, class Type2>                                             \
+tmp<Field<typename product<Type1, Type2>::type>>                               \
+operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2)        \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+    tmp<Field<productType>> tRes =                                             \
+        reuseTmpTmp<productType, Type1, Type1, Type2>::New(tf1, tf2);          \
+    OpFunc(tRes(), tf1(), tf2());                                              \
+    reuseTmpTmp<productType, Type1, Type1, Type2>::clear(tf1, tf2);            \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Type, class Form, class Cmpt, int nCmpt>                        \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<typename product<Type, Form>::type>& res,                            \
+    const UList<Type>& f1,                                                     \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type, Form>::type productType;                    \
+    TFOR_ALL_F_OP_F_OP_S                                                       \
         (productType, res, =,Type, f1, Op, Form, static_cast<const Form&>(vs))\
-}                                                                             \
-                                                                              \
-template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type>>                               \
-operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs)    \
-{                                                                             \
-    typedef typename product<Type, Form>::type productType;                   \
-    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));         \
-    OpFunc(tRes(), f1, static_cast<const Form&>(vs));                         \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type>>                               \
-operator Op                                                                   \
-(                                                                             \
-    const tmp<Field<Type>>& tf1,                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type, Form>::type productType;                   \
-    tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);    \
-    OpFunc(tRes(), tf1(), static_cast<const Form&>(vs));                      \
-    reuseTmp<productType, Type>::clear(tf1);                                  \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type>                       \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<typename product<Form, Type>::type>& res,                           \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const UList<Type>& f1                                                     \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Form, Type>::type productType;                   \
-    TFOR_ALL_F_OP_S_OP_F                                                      \
+}                                                                              \
+                                                                               \
+template<class Type, class Form, class Cmpt, int nCmpt>                        \
+tmp<Field<typename product<Type, Form>::type>>                                 \
+operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs)     \
+{                                                                              \
+    typedef typename product<Type, Form>::type productType;                    \
+    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));           \
+    OpFunc(tRes(), f1, static_cast<const Form&>(vs));                          \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Type, class Form, class Cmpt, int nCmpt>                        \
+tmp<Field<typename product<Type, Form>::type>>                                 \
+operator Op                                                                    \
+(                                                                              \
+    const tmp<Field<Type>>& tf1,                                               \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type, Form>::type productType;                    \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);      \
+    OpFunc(tRes(), tf1(), static_cast<const Form&>(vs));                       \
+    reuseTmp<productType, Type>::clear(tf1);                                   \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type>                        \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<typename product<Form, Type>::type>& res,                            \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
+    const UList<Type>& f1                                                      \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Form, Type>::type productType;                    \
+    TFOR_ALL_F_OP_S_OP_F                                                       \
         (productType, res, =,Form,static_cast<const Form&>(vs), Op, Type, f1) \
-}                                                                             \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type>>                               \
-operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1)    \
-{                                                                             \
-    typedef typename product<Form, Type>::type productType;                   \
-    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));         \
-    OpFunc(tRes(), static_cast<const Form&>(vs), f1);                         \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type>>                               \
-operator Op                                                                   \
-(                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs, const tmp<Field<Type>>& tf1      \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Form, Type>::type productType;                   \
-    tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);    \
-    OpFunc(tRes(), static_cast<const Form&>(vs), tf1());                      \
-    reuseTmp<productType, Type>::clear(tf1);                                  \
-    return tRes;                                                              \
+}                                                                              \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type>                        \
+tmp<Field<typename product<Form, Type>::type>>                                 \
+operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1)     \
+{                                                                              \
+    typedef typename product<Form, Type>::type productType;                    \
+    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));           \
+    OpFunc(tRes(), static_cast<const Form&>(vs), f1);                          \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type>                        \
+tmp<Field<typename product<Form, Type>::type>>                                 \
+operator Op                                                                    \
+(                                                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs, const tmp<Field<Type>>& tf1        \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Form, Type>::type productType;                    \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);      \
+    OpFunc(tRes(), static_cast<const Form&>(vs), tf1());                       \
+    reuseTmp<productType, Type>::clear(tf1);                                   \
+    return tRes;                                                               \
 }
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
index 682139da60..56c422a5fd 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
@@ -151,9 +151,9 @@ tmp<Field<Type>> cmptMag(const UList<Type>& f);
 template<class Type>
 tmp<Field<Type>> cmptMag(const tmp<Field<Type>>& tf);
 
-#define TMP_UNARY_FUNCTION(ReturnType, Func)                                  \
-                                                                              \
-template<class Type>                                                          \
+#define TMP_UNARY_FUNCTION(ReturnType, Func)                                   \
+                                                                               \
+template<class Type>                                                           \
 ReturnType Func(const tmp<Field<Type>>& tf1);
 
 template<class Type>
@@ -209,9 +209,9 @@ Type average(const UList<Type>& f);
 TMP_UNARY_FUNCTION(Type, average)
 
 
-#define G_UNARY_FUNCTION(ReturnType, gFunc, Func, rFunc)                      \
-                                                                              \
-template<class Type>                                                          \
+#define G_UNARY_FUNCTION(ReturnType, gFunc, Func, rFunc)                       \
+                                                                               \
+template<class Type>                                                           \
 ReturnType gFunc(const UList<Type>& f, const label comm = UPstream::worldComm);\
 TMP_UNARY_FUNCTION(ReturnType, gFunc)
 
@@ -281,62 +281,62 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, divide)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define PRODUCT_OPERATOR(product, Op, OpFunc)                                 \
-                                                                              \
-template<class Type1, class Type2>                                            \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<typename product<Type1, Type2>::type>& res,                         \
-    const UList<Type1>& f1,                                                   \
-    const UList<Type2>& f2                                                    \
-);                                                                            \
-                                                                              \
-template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type>>                             \
-operator Op(const UList<Type1>& f1, const UList<Type2>& f2);                  \
-                                                                              \
-template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type>>                             \
-operator Op(const UList<Type1>& f1, const tmp<Field<Type2>>& tf2);           \
-                                                                              \
-template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type>>                             \
-operator Op(const tmp<Field<Type1>>& tf1, const UList<Type2>& f2);           \
-                                                                              \
-template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type>>                             \
-operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2);    \
-                                                                              \
-template<class Type, class Form, class Cmpt, int nCmpt>                       \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<typename product<Type, Form>::type>& res,                           \
-    const UList<Type>& f1,                                                    \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-);                                                                            \
-                                                                              \
-template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type>>                               \
-operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs);   \
-                                                                              \
-template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type>>                               \
+#define PRODUCT_OPERATOR(product, Op, OpFunc)                                  \
+                                                                               \
+template<class Type1, class Type2>                                             \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<typename product<Type1, Type2>::type>& res,                          \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+template<class Type1, class Type2>                                             \
+tmp<Field<typename product<Type1, Type2>::type>>                               \
+operator Op(const UList<Type1>& f1, const UList<Type2>& f2);                   \
+                                                                               \
+template<class Type1, class Type2>                                             \
+tmp<Field<typename product<Type1, Type2>::type>>                               \
+operator Op(const UList<Type1>& f1, const tmp<Field<Type2>>& tf2);             \
+                                                                               \
+template<class Type1, class Type2>                                             \
+tmp<Field<typename product<Type1, Type2>::type>>                               \
+operator Op(const tmp<Field<Type1>>& tf1, const UList<Type2>& f2);             \
+                                                                               \
+template<class Type1, class Type2>                                             \
+tmp<Field<typename product<Type1, Type2>::type>>                               \
+operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2);       \
+                                                                               \
+template<class Type, class Form, class Cmpt, int nCmpt>                        \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<typename product<Type, Form>::type>& res,                            \
+    const UList<Type>& f1,                                                     \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+);                                                                             \
+                                                                               \
+template<class Type, class Form, class Cmpt, int nCmpt>                        \
+tmp<Field<typename product<Type, Form>::type>>                                 \
+operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs);    \
+                                                                               \
+template<class Type, class Form, class Cmpt, int nCmpt>                        \
+tmp<Field<typename product<Type, Form>::type>>                                 \
 operator Op(const tmp<Field<Type>>&tf1,const VectorSpace<Form,Cmpt,nCmpt>&vs);\
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type>                       \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<typename product<Form, Type>::type>& res,                           \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const UList<Type>& f1                                                     \
-);                                                                            \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type>>                               \
-operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1);   \
-                                                                              \
-template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type>>                               \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type>                        \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<typename product<Form, Type>::type>& res,                            \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
+    const UList<Type>& f1                                                      \
+);                                                                             \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type>                        \
+tmp<Field<typename product<Form, Type>::type>>                                 \
+operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1);    \
+                                                                               \
+template<class Form, class Cmpt, int nCmpt, class Type>                        \
+tmp<Field<typename product<Form, Type>::type>>                                 \
 operator Op(const VectorSpace<Form,Cmpt,nCmpt>&vs,const tmp<Field<Type>>&tf1);
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
index 1a2840a786..e9b20528f3 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
@@ -28,372 +28,372 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_FUNCTION(ReturnType, Type, Func)                                \
-                                                                              \
-TEMPLATE                                                                      \
-void Func(Field<ReturnType>& res, const UList<Type>& f)                       \
-{                                                                             \
-    TFOR_ALL_F_OP_FUNC_F(ReturnType, res, =, ::Foam::Func, Type, f)           \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func(const UList<Type>& f)                            \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f.size()));            \
-    Func(tRes(), f);                                                          \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func(const tmp<Field<Type>>& tf)                     \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);       \
-    Func(tRes(), tf());                                                       \
-    reuseTmp<ReturnType, Type>::clear(tf);                                    \
-    return tRes;                                                              \
+#define UNARY_FUNCTION(ReturnType, Type, Func)                                 \
+                                                                               \
+TEMPLATE                                                                       \
+void Func(Field<ReturnType>& res, const UList<Type>& f)                        \
+{                                                                              \
+    TFOR_ALL_F_OP_FUNC_F(ReturnType, res, =, ::Foam::Func, Type, f)            \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func(const UList<Type>& f)                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f.size()));              \
+    Func(tRes(), f);                                                           \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func(const tmp<Field<Type>>& tf)                        \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);         \
+    Func(tRes(), tf());                                                        \
+    reuseTmp<ReturnType, Type>::clear(tf);                                     \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_OPERATOR(ReturnType, Type, Op, OpFunc)                          \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc(Field<ReturnType>& res, const UList<Type>& f)                     \
-{                                                                             \
-    TFOR_ALL_F_OP_OP_F(ReturnType, res, =, Op, Type, f)                       \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op(const UList<Type>& f)                     \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f.size()));            \
-    OpFunc(tRes(), f);                                                        \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op(const tmp<Field<Type>>& tf)              \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);       \
-    OpFunc(tRes(), tf());                                                     \
-    reuseTmp<ReturnType, Type>::clear(tf);                                    \
-    return tRes;                                                              \
+#define UNARY_OPERATOR(ReturnType, Type, Op, OpFunc)                           \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc(Field<ReturnType>& res, const UList<Type>& f)                      \
+{                                                                              \
+    TFOR_ALL_F_OP_OP_F(ReturnType, res, =, Op, Type, f)                        \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op(const UList<Type>& f)                       \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f.size()));              \
+    OpFunc(tRes(), f);                                                         \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op(const tmp<Field<Type>>& tf)                 \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);         \
+    OpFunc(tRes(), tf());                                                      \
+    reuseTmp<ReturnType, Type>::clear(tf);                                     \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    Field<ReturnType>& res,                                                   \
-    const UList<Type1>& f1,                                                   \
-    const UList<Type2>& f2                                                    \
-)                                                                             \
-{                                                                             \
-    TFOR_ALL_F_OP_FUNC_F_F                                                    \
-    (                                                                         \
-        ReturnType, res, =, ::Foam::Func, Type1, f1, Type2, f2                \
-    )                                                                         \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const UList<Type2>& f2                                                    \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
-    Func(tRes(), f1, f2);                                                     \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2>>& tf2                                             \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
-    Func(tRes(), f1, tf2());                                                  \
-    reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const UList<Type2>& f2                                                    \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
-    Func(tRes(), tf1(), f2);                                                  \
-    reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const tmp<Field<Type2>>& tf2                                             \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes =                                            \
-        reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);          \
-    Func(tRes(), tf1(), tf2());                                               \
-    reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);            \
-    return tRes;                                                              \
+#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& res,                                                    \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+)                                                                              \
+{                                                                              \
+    TFOR_ALL_F_OP_FUNC_F_F                                                     \
+    (                                                                          \
+        ReturnType, res, =, ::Foam::Func, Type1, f1, Type2, f2                 \
+    )                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));             \
+    Func(tRes(), f1, f2);                                                      \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const tmp<Field<Type2>>& tf2                                               \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
+    Func(tRes(), f1, tf2());                                                   \
+    reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const UList<Type2>& f2                                                     \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
+    Func(tRes(), tf1(), f2);                                                   \
+    reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const tmp<Field<Type2>>& tf2                                               \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes =                                              \
+        reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);           \
+    Func(tRes(), tf1(), tf2());                                                \
+    reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);             \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    Field<ReturnType>& res,                                                   \
-    const Type1& s1,                                                          \
-    const UList<Type2>& f2                                                    \
-)                                                                             \
-{                                                                             \
-    TFOR_ALL_F_OP_FUNC_S_F                                                    \
-    (                                                                         \
-        ReturnType, res, =, ::Foam::Func, Type1, s1, Type2, f2                \
-    )                                                                         \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const UList<Type2>& f2                                                    \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f2.size()));           \
-    Func(tRes(), s1, f2);                                                     \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const tmp<Field<Type2>>& tf2                                             \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
-    Func(tRes(), s1, tf2());                                                  \
-    reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
-    return tRes;                                                              \
+#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& res,                                                    \
+    const Type1& s1,                                                           \
+    const UList<Type2>& f2                                                     \
+)                                                                              \
+{                                                                              \
+    TFOR_ALL_F_OP_FUNC_S_F                                                     \
+    (                                                                          \
+        ReturnType, res, =, ::Foam::Func, Type1, s1, Type2, f2                 \
+    )                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const UList<Type2>& f2                                                     \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f2.size()));             \
+    Func(tRes(), s1, f2);                                                      \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const tmp<Field<Type2>>& tf2                                               \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
+    Func(tRes(), s1, tf2());                                                   \
+    reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
+    return tRes;                                                               \
 }
 
 
-#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    Field<ReturnType>& res,                                                   \
-    const UList<Type1>& f1,                                                   \
-    const Type2& s2                                                           \
-)                                                                             \
-{                                                                             \
-    TFOR_ALL_F_OP_FUNC_F_S                                                    \
-    (                                                                         \
-        ReturnType, res, =, ::Foam::Func, Type1, f1, Type2, s2                \
-    )                                                                         \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const Type2& s2                                                           \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
-    Func(tRes(), f1, s2);                                                     \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const Type2& s2                                                           \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
-    Func(tRes(), tf1(), s2);                                                  \
-    reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
-    return tRes;                                                              \
+#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& res,                                                    \
+    const UList<Type1>& f1,                                                    \
+    const Type2& s2                                                            \
+)                                                                              \
+{                                                                              \
+    TFOR_ALL_F_OP_FUNC_F_S                                                     \
+    (                                                                          \
+        ReturnType, res, =, ::Foam::Func, Type1, f1, Type2, s2                 \
+    )                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const Type2& s2                                                            \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));             \
+    Func(tRes(), f1, s2);                                                      \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const Type2& s2                                                            \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
+    Func(tRes(), tf1(), s2);                                                   \
+    reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
+    return tRes;                                                               \
 }
 
 
-#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                  \
-    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                   \
+#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                   \
+    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                    \
     BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)                 \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<ReturnType>& res,                                                   \
-    const UList<Type1>& f1,                                                   \
-    const UList<Type2>& f2                                                    \
-)                                                                             \
-{                                                                             \
-    TFOR_ALL_F_OP_F_OP_F(ReturnType, res, =, Type1, f1, Op, Type2, f2)        \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const UList<Type2>& f2                                                    \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
-    OpFunc(tRes(), f1, f2);                                                   \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2>>& tf2                                             \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
-    OpFunc(tRes(), f1, tf2());                                                \
-    reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const UList<Type2>& f2                                                    \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
-    OpFunc(tRes(), tf1(), f2);                                                \
-    reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const tmp<Field<Type2>>& tf2                                             \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes =                                            \
-        reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);          \
-    OpFunc(tRes(), tf1(), tf2());                                             \
-    reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);            \
-    return tRes;                                                              \
+#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)                  \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<ReturnType>& res,                                                    \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+)                                                                              \
+{                                                                              \
+    TFOR_ALL_F_OP_F_OP_F(ReturnType, res, =, Type1, f1, Op, Type2, f2)         \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));             \
+    OpFunc(tRes(), f1, f2);                                                    \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const tmp<Field<Type2>>& tf2                                               \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
+    OpFunc(tRes(), f1, tf2());                                                 \
+    reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const UList<Type2>& f2                                                     \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
+    OpFunc(tRes(), tf1(), f2);                                                 \
+    reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const tmp<Field<Type2>>& tf2                                               \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes =                                              \
+        reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);           \
+    OpFunc(tRes(), tf1(), tf2());                                              \
+    reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);             \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<ReturnType>& res,                                                   \
-    const Type1& s1,                                                          \
-    const UList<Type2>& f2                                                    \
-)                                                                             \
-{                                                                             \
-    TFOR_ALL_F_OP_S_OP_F(ReturnType, res, =, Type1, s1, Op, Type2, f2)        \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const UList<Type2>& f2                                                    \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f2.size()));           \
-    OpFunc(tRes(), s1, f2);                                                   \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const tmp<Field<Type2>>& tf2                                             \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
-    OpFunc(tRes(), s1, tf2());                                                \
-    reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
-    return tRes;                                                              \
+#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<ReturnType>& res,                                                    \
+    const Type1& s1,                                                           \
+    const UList<Type2>& f2                                                     \
+)                                                                              \
+{                                                                              \
+    TFOR_ALL_F_OP_S_OP_F(ReturnType, res, =, Type1, s1, Op, Type2, f2)         \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const UList<Type2>& f2                                                     \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f2.size()));             \
+    OpFunc(tRes(), s1, f2);                                                    \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const tmp<Field<Type2>>& tf2                                               \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
+    OpFunc(tRes(), s1, tf2());                                                 \
+    reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
+    return tRes;                                                               \
 }
 
 
-#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<ReturnType>& res,                                                   \
-    const UList<Type1>& f1,                                                   \
-    const Type2& s2                                                           \
-)                                                                             \
-{                                                                             \
-    TFOR_ALL_F_OP_F_OP_S(ReturnType, res, =, Type1, f1, Op, Type2, s2)        \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const Type2& s2                                                           \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
-    OpFunc(tRes(), f1, s2);                                                   \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const Type2& s2                                                           \
-)                                                                             \
-{                                                                             \
-    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
-    OpFunc(tRes(), tf1(), s2);                                                \
-    reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
-    return tRes;                                                              \
+#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<ReturnType>& res,                                                    \
+    const UList<Type1>& f1,                                                    \
+    const Type2& s2                                                            \
+)                                                                              \
+{                                                                              \
+    TFOR_ALL_F_OP_F_OP_S(ReturnType, res, =, Type1, f1, Op, Type2, s2)         \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const Type2& s2                                                            \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));             \
+    OpFunc(tRes(), f1, s2);                                                    \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const Type2& s2                                                            \
+)                                                                              \
+{                                                                              \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
+    OpFunc(tRes(), tf1(), s2);                                                 \
+    reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
+    return tRes;                                                               \
 }
 
 
-#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)            \
-    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)             \
+#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)             \
+    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)              \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
index 4d0993e767..89fdfa4067 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
@@ -30,221 +30,221 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_FUNCTION(ReturnType, Type1, Func)                               \
-                                                                              \
-TEMPLATE                                                                      \
-void Func(Field<ReturnType>& res, const UList<Type1>& f);                     \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func(const UList<Type1>& f);                          \
-TEMPLATE                                                                      \
+#define UNARY_FUNCTION(ReturnType, Type1, Func)                                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func(Field<ReturnType>& res, const UList<Type1>& f);                      \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func(const UList<Type1>& f);                            \
+TEMPLATE                                                                       \
 tmp<Field<ReturnType>> Func(const tmp<Field<Type1>>& tf);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc)                         \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc(Field<ReturnType>& res, const UList<Type1>& f);                   \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op(const UList<Type1>& f);                   \
-TEMPLATE                                                                      \
+#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc)                          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc(Field<ReturnType>& res, const UList<Type1>& f);                    \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op(const UList<Type1>& f);                     \
+TEMPLATE                                                                       \
 tmp<Field<ReturnType>> operator Op(const tmp<Field<Type1>>& tf);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    Field<ReturnType>& f,                                                     \
-    const UList<Type1>& f1,                                                   \
-    const UList<Type2>& f2                                                    \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const UList<Type2>& f2                                                    \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2>>& tf2                                             \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const UList<Type2>& f2                                                    \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const tmp<Field<Type2>>& tf2                                             \
+#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& f,                                                      \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const tmp<Field<Type2>>& tf2                                               \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const tmp<Field<Type2>>& tf2                                               \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    Field<ReturnType>& f,                                                     \
-    const Type1& s1,                                                          \
-    const UList<Type2>& f2                                                    \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const UList<Type2>& f2                                                    \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const tmp<Field<Type2>>& tf2                                             \
+#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& f,                                                      \
+    const Type1& s1,                                                           \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const tmp<Field<Type2>>& tf2                                               \
 );
 
 
-#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    Field<ReturnType>& f,                                                     \
-    const UList<Type1>& f1,                                                   \
-    const Type2& s2                                                           \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const Type2& s2                                                           \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> Func                                                  \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const Type2& s2                                                           \
+#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& f,                                                      \
+    const UList<Type1>& f1,                                                    \
+    const Type2& s2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const Type2& s2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const Type2& s2                                                            \
 );
 
 
-#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                  \
-    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                   \
+#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                   \
+    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                    \
     BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)                 \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<ReturnType>& f,                                                     \
-    const UList<Type1>& f1,                                                   \
-    const UList<Type2>& f2                                                    \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const UList<Type2>& f2                                                    \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2>>& tf2                                             \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const UList<Type2>& f2                                                    \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const tmp<Field<Type2>>& tf2                                             \
+#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)                  \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<ReturnType>& f,                                                      \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const tmp<Field<Type2>>& tf2                                               \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const tmp<Field<Type2>>& tf2                                               \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<ReturnType>& f,                                                     \
-    const Type1& s1,                                                          \
-    const UList<Type2>& f2                                                    \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const UList<Type2>& f2                                                    \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const Type1& s1,                                                          \
-    const tmp<Field<Type2>>& tf2                                             \
+#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<ReturnType>& f,                                                      \
+    const Type1& s1,                                                           \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const tmp<Field<Type2>>& tf2                                               \
 );
 
 
-#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    Field<ReturnType>& f,                                                     \
-    const UList<Type1>& f1,                                                   \
-    const Type2& s2                                                           \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const UList<Type1>& f1,                                                   \
-    const Type2& s2                                                           \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<Field<ReturnType>> operator Op                                           \
-(                                                                             \
-    const tmp<Field<Type1>>& tf1,                                            \
-    const Type2& s2                                                           \
+#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<ReturnType>& f,                                                      \
+    const UList<Type1>& f1,                                                    \
+    const Type2& s2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const Type2& s2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const Type2& s2                                                            \
 );
 
 
-#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)            \
-    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)             \
+#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpFunc)             \
+    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)              \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldM.H b/src/OpenFOAM/fields/Fields/Field/FieldM.H
index ff3861d4e7..dc542bdb75 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldM.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldM.H
@@ -109,250 +109,250 @@ void checkFields
 
 // member function : this f1 OP fUNC f2
 
-#define TFOR_ALL_F_OP_FUNC_F(typeF1, f1, OP, FUNC, typeF2, f2)              \
-                                                                            \
-    /* check the two fields have same Field<Type> mesh */                   \
-    checkFields(f1, f2, "f1 " #OP " " #FUNC "(f2)");                        \
-                                                                            \
-    /* set access to f1, f2 and f3 at end of each field */                  \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-                                                                            \
-    /* loop through fields performing f1 OP1 f2 OP2 f3 */                   \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i) OP FUNC(List_ELEM(f2, f2P, i));               \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_F_OP_FUNC_F(typeF1, f1, OP, FUNC, typeF2, f2)                 \
+                                                                               \
+    /* check the two fields have same Field<Type> mesh */                      \
+    checkFields(f1, f2, "f1 " #OP " " #FUNC "(f2)");                           \
+                                                                               \
+    /* set access to f1, f2 and f3 at end of each field */                     \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+                                                                               \
+    /* loop through fields performing f1 OP1 f2 OP2 f3 */                      \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i) OP FUNC(List_ELEM(f2, f2P, i));                  \
+    List_END_FOR_ALL                                                           \
 
 
-#define TFOR_ALL_F_OP_F_FUNC(typeF1, f1, OP, typeF2, f2, FUNC)              \
-                                                                            \
-    /* check the two fields have same Field<Type> mesh */                   \
-    checkFields(f1, f2, "f1 " #OP " f2" #FUNC);                             \
-                                                                            \
-    /* set access to f1, f2 and f3 at end of each field */                  \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-                                                                            \
-    /* loop through fields performing f1 OP1 f2 OP2 f3 */                   \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i) OP List_ELEM(f2, f2P, i).FUNC();              \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_F_OP_F_FUNC(typeF1, f1, OP, typeF2, f2, FUNC)                 \
+                                                                               \
+    /* check the two fields have same Field<Type> mesh */                      \
+    checkFields(f1, f2, "f1 " #OP " f2" #FUNC);                                \
+                                                                               \
+    /* set access to f1, f2 and f3 at end of each field */                     \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+                                                                               \
+    /* loop through fields performing f1 OP1 f2 OP2 f3 */                      \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i) OP List_ELEM(f2, f2P, i).FUNC();                 \
+    List_END_FOR_ALL                                                           \
 
 
 // member function : this field f1 OP fUNC f2, f3
 
 #define TFOR_ALL_F_OP_FUNC_F_F(typeF1, f1, OP, FUNC, typeF2, f2, typeF3, f3)\
-                                                                            \
-    /* check the three fields have same Field<Type> mesh */                 \
-    checkFields(f1, f2, f3, "f1 " #OP " " #FUNC "(f2, f3)");                \
-                                                                            \
-    /* set access to f1, f2 and f3 at end of each field */                  \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-    List_CONST_ACCESS(typeF3, f3, f3P);                                     \
-                                                                            \
-    /* loop through fields performing f1 OP1 f2 OP2 f3 */                   \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i)                                               \
-        OP FUNC(List_ELEM(f2, f2P, i), List_ELEM(f3, f3P, i));              \
-    List_END_FOR_ALL                                                        \
+                                                                               \
+    /* check the three fields have same Field<Type> mesh */                    \
+    checkFields(f1, f2, f3, "f1 " #OP " " #FUNC "(f2, f3)");                   \
+                                                                               \
+    /* set access to f1, f2 and f3 at end of each field */                     \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+    List_CONST_ACCESS(typeF3, f3, f3P);                                        \
+                                                                               \
+    /* loop through fields performing f1 OP1 f2 OP2 f3 */                      \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i)                                                  \
+        OP FUNC(List_ELEM(f2, f2P, i), List_ELEM(f3, f3P, i));                 \
+    List_END_FOR_ALL                                                           \
 
 
 // member function : this field f1 OP fUNC f2, f3
 
-#define TFOR_ALL_S_OP_FUNC_F_F(typeS, s, OP, FUNC, typeF1, f1, typeF2, f2)  \
-                                                                            \
-    /* check the two fields have same Field<Type> mesh */                   \
-    checkFields(f1, f2, "s " #OP " " #FUNC "(f1, f2)");                     \
-                                                                            \
-    /* set access to f1 and f2 at end of each field */                      \
-    List_CONST_ACCESS(typeF1, f1, f1P);                                     \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-                                                                            \
-    /* loop through fields performing s OP FUNC(f1, f2) */                  \
-    List_FOR_ALL(f1, i)                                                     \
-        (s) OP FUNC(List_ELEM(f1, f1P, i), List_ELEM(f2, f2P, i));          \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_S_OP_FUNC_F_F(typeS, s, OP, FUNC, typeF1, f1, typeF2, f2)     \
+                                                                               \
+    /* check the two fields have same Field<Type> mesh */                      \
+    checkFields(f1, f2, "s " #OP " " #FUNC "(f1, f2)");                        \
+                                                                               \
+    /* set access to f1 and f2 at end of each field */                         \
+    List_CONST_ACCESS(typeF1, f1, f1P);                                        \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+                                                                               \
+    /* loop through fields performing s OP FUNC(f1, f2) */                     \
+    List_FOR_ALL(f1, i)                                                        \
+        (s) OP FUNC(List_ELEM(f1, f1P, i), List_ELEM(f2, f2P, i));             \
+    List_END_FOR_ALL                                                           \
 
 
 // member function : this f1 OP fUNC f2, s
 
-#define TFOR_ALL_F_OP_FUNC_F_S(typeF1, f1, OP, FUNC, typeF2, f2, typeS, s)  \
-                                                                            \
-    /* check the two fields have same Field<Type> mesh */                   \
-    checkFields(f1, f2, "f1 " #OP " " #FUNC "(f2, s)");                     \
-                                                                            \
-    /* set access to f1, f2 and f3 at end of each field */                  \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-                                                                            \
-    /* loop through fields performing f1 OP1 f2 OP2 f3 */                   \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i) OP FUNC(List_ELEM(f2, f2P, i), (s));          \
+#define TFOR_ALL_F_OP_FUNC_F_S(typeF1, f1, OP, FUNC, typeF2, f2, typeS, s)     \
+                                                                               \
+    /* check the two fields have same Field<Type> mesh */                      \
+    checkFields(f1, f2, "f1 " #OP " " #FUNC "(f2, s)");                        \
+                                                                               \
+    /* set access to f1, f2 and f3 at end of each field */                     \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+                                                                               \
+    /* loop through fields performing f1 OP1 f2 OP2 f3 */                      \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i) OP FUNC(List_ELEM(f2, f2P, i), (s));             \
     List_END_FOR_ALL
 
 
 // member function : s1 OP fUNC f, s2
 
-#define TFOR_ALL_S_OP_FUNC_F_S(typeS1, s1, OP, FUNC, typeF, f, typeS2, s2)  \
-                                                                            \
-    /* set access to f at end of field */                                   \
-    List_CONST_ACCESS(typeF, f, fP);                                        \
-                                                                            \
-    /* loop through fields performing f1 OP1 f2 OP2 f3 */                   \
-    List_FOR_ALL(f, i)                                                      \
-        (s1) OP FUNC(List_ELEM(f, fP, i), (s2));                            \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_S_OP_FUNC_F_S(typeS1, s1, OP, FUNC, typeF, f, typeS2, s2)     \
+                                                                               \
+    /* set access to f at end of field */                                      \
+    List_CONST_ACCESS(typeF, f, fP);                                           \
+                                                                               \
+    /* loop through fields performing f1 OP1 f2 OP2 f3 */                      \
+    List_FOR_ALL(f, i)                                                         \
+        (s1) OP FUNC(List_ELEM(f, fP, i), (s2));                               \
+    List_END_FOR_ALL                                                           \
 
 
 // member function : this f1 OP fUNC s, f2
 
-#define TFOR_ALL_F_OP_FUNC_S_F(typeF1, f1, OP, FUNC, typeS, s, typeF2, f2)  \
-                                                                            \
-    /* check the two fields have same Field<Type> mesh */                   \
-    checkFields(f1, f2, "f1 " #OP " " #FUNC "(s, f2)");                     \
-                                                                            \
-    /* set access to f1, f2 and f3 at end of each field */                  \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-                                                                            \
-    /* loop through fields performing f1 OP1 f2 OP2 f3 */                   \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i) OP FUNC((s), List_ELEM(f2, f2P, i));          \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_F_OP_FUNC_S_F(typeF1, f1, OP, FUNC, typeS, s, typeF2, f2)     \
+                                                                               \
+    /* check the two fields have same Field<Type> mesh */                      \
+    checkFields(f1, f2, "f1 " #OP " " #FUNC "(s, f2)");                        \
+                                                                               \
+    /* set access to f1, f2 and f3 at end of each field */                     \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+                                                                               \
+    /* loop through fields performing f1 OP1 f2 OP2 f3 */                      \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i) OP FUNC((s), List_ELEM(f2, f2P, i));             \
+    List_END_FOR_ALL                                                           \
 
 
 // member function : this f1 OP fUNC s, f2
 
 #define TFOR_ALL_F_OP_FUNC_S_S(typeF1, f1, OP, FUNC, typeS1, s1, typeS2, s2)\
-                                                                            \
-    /* set access to f1 at end of field */                                  \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-                                                                            \
-    /* loop through fields performing f1 OP1 FUNC(s1, s2) */                \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i) OP FUNC((s1), (s2));                          \
-    List_END_FOR_ALL                                                        \
+                                                                               \
+    /* set access to f1 at end of field */                                     \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+                                                                               \
+    /* loop through fields performing f1 OP1 FUNC(s1, s2) */                   \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i) OP FUNC((s1), (s2));                             \
+    List_END_FOR_ALL                                                           \
 
 
 // member function : this f1 OP1 f2 OP2 FUNC s
 
-#define TFOR_ALL_F_OP_F_FUNC_S(typeF1, f1, OP, typeF2, f2, FUNC, typeS, s)  \
-                                                                            \
-    /* check the two fields have same Field<Type> mesh */                   \
-    checkFields(f1, f2, "f1 " #OP " f2 " #FUNC "(s)");                      \
-                                                                            \
-    /* set access to f1, f2 and f3 at end of each field */                  \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-                                                                            \
-    /* loop through fields performing f1 OP1 f2 OP2 f3 */                   \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i) OP List_ELEM(f2, f2P, i) FUNC((s));           \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_F_OP_F_FUNC_S(typeF1, f1, OP, typeF2, f2, FUNC, typeS, s)     \
+                                                                               \
+    /* check the two fields have same Field<Type> mesh */                      \
+    checkFields(f1, f2, "f1 " #OP " f2 " #FUNC "(s)");                         \
+                                                                               \
+    /* set access to f1, f2 and f3 at end of each field */                     \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+                                                                               \
+    /* loop through fields performing f1 OP1 f2 OP2 f3 */                      \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i) OP List_ELEM(f2, f2P, i) FUNC((s));              \
+    List_END_FOR_ALL                                                           \
 
 
 // define high performance macro functions for Field<Type> operations
 
 // member operator : this field f1 OP1 f2 OP2 f3
 
-#define TFOR_ALL_F_OP_F_OP_F(typeF1, f1, OP1, typeF2, f2, OP2, typeF3, f3)  \
-                                                                            \
-    /* check the three fields have same Field<Type> mesh */                 \
-    checkFields(f1, f2, f3, "f1 " #OP1 " f2 " #OP2 " f3");                  \
-                                                                            \
-    /* set access to f1, f2 and f3 at end of each field */                  \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-    List_CONST_ACCESS(typeF3, f3, f3P);                                     \
-                                                                            \
-    /* loop through fields performing f1 OP1 f2 OP2 f3 */                   \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i) OP1 List_ELEM(f2, f2P, i)                     \
-                              OP2 List_ELEM(f3, f3P, i);                    \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_F_OP_F_OP_F(typeF1, f1, OP1, typeF2, f2, OP2, typeF3, f3)     \
+                                                                               \
+    /* check the three fields have same Field<Type> mesh */                    \
+    checkFields(f1, f2, f3, "f1 " #OP1 " f2 " #OP2 " f3");                     \
+                                                                               \
+    /* set access to f1, f2 and f3 at end of each field */                     \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+    List_CONST_ACCESS(typeF3, f3, f3P);                                        \
+                                                                               \
+    /* loop through fields performing f1 OP1 f2 OP2 f3 */                      \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i) OP1 List_ELEM(f2, f2P, i)                        \
+                              OP2 List_ELEM(f3, f3P, i);                       \
+    List_END_FOR_ALL                                                           \
 
 
 // member operator : this field f1 OP1 s OP2 f2
 
-#define TFOR_ALL_F_OP_S_OP_F(typeF1, f1, OP1, typeS, s, OP2, typeF2, f2)    \
-                                                                            \
-    /* check the two fields have same Field<Type> mesh */                   \
-    checkFields(f1, f2, "f1 " #OP1 " s " #OP2 " f2");                       \
-                                                                            \
-    /* set access to f1 and f2 at end of each field */                      \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-                                                                            \
-    /* loop through fields performing f1 OP1 s OP2 f2 */                    \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i) OP1 (s) OP2 List_ELEM(f2, f2P, i);            \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_F_OP_S_OP_F(typeF1, f1, OP1, typeS, s, OP2, typeF2, f2)       \
+                                                                               \
+    /* check the two fields have same Field<Type> mesh */                      \
+    checkFields(f1, f2, "f1 " #OP1 " s " #OP2 " f2");                          \
+                                                                               \
+    /* set access to f1 and f2 at end of each field */                         \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+                                                                               \
+    /* loop through fields performing f1 OP1 s OP2 f2 */                       \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i) OP1 (s) OP2 List_ELEM(f2, f2P, i);               \
+    List_END_FOR_ALL                                                           \
 
 
 // member operator : this field f1 OP1 f2 OP2 s
 
-#define TFOR_ALL_F_OP_F_OP_S(typeF1, f1, OP1, typeF2, f2, OP2, typeS, s)    \
-                                                                            \
-    /* check the two fields have same Field<Type> mesh */                   \
-    checkFields(f1, f2, "f1 " #OP1 " f2 " #OP2 " s");                       \
-                                                                            \
-    /* set access to f1 and f2 at end of each field */                      \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-                                                                            \
-    /* loop through fields performing f1 OP1 s OP2 f2 */                    \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i) OP1 List_ELEM(f2, f2P, i) OP2 (s);            \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_F_OP_F_OP_S(typeF1, f1, OP1, typeF2, f2, OP2, typeS, s)       \
+                                                                               \
+    /* check the two fields have same Field<Type> mesh */                      \
+    checkFields(f1, f2, "f1 " #OP1 " f2 " #OP2 " s");                          \
+                                                                               \
+    /* set access to f1 and f2 at end of each field */                         \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+                                                                               \
+    /* loop through fields performing f1 OP1 s OP2 f2 */                       \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i) OP1 List_ELEM(f2, f2P, i) OP2 (s);               \
+    List_END_FOR_ALL                                                           \
 
 
 // member operator : this field f1 OP f2
 
-#define TFOR_ALL_F_OP_F(typeF1, f1, OP, typeF2, f2)                         \
-                                                                            \
-    /* check the two fields have same Field<Type> mesh */                   \
-    checkFields(f1, f2, "f1 " #OP " f2");                                   \
-                                                                            \
-    /* set pointer to f1P at end of f1 and */                               \
-    /* f2.p at end of f2 */                                                 \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-                                                                            \
-    /* loop through fields performing f1 OP f2 */                           \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i) OP List_ELEM(f2, f2P, i);                     \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_F_OP_F(typeF1, f1, OP, typeF2, f2)                            \
+                                                                               \
+    /* check the two fields have same Field<Type> mesh */                      \
+    checkFields(f1, f2, "f1 " #OP " f2");                                      \
+                                                                               \
+    /* set pointer to f1P at end of f1 and */                                  \
+    /* f2.p at end of f2 */                                                    \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+                                                                               \
+    /* loop through fields performing f1 OP f2 */                              \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i) OP List_ELEM(f2, f2P, i);                        \
+    List_END_FOR_ALL                                                           \
 
 // member operator : this field f1 OP1 OP2 f2
 
-#define TFOR_ALL_F_OP_OP_F(typeF1, f1, OP1, OP2, typeF2, f2)                \
-                                                                            \
-    /* check the two fields have same Field<Type> mesh */                   \
-    checkFields(f1, f2, #OP1 " " #OP2 " f2");                               \
-                                                                            \
-    /* set pointer to f1P at end of f1 and */                               \
-    /* f2.p at end of f2 */                                                 \
-    List_ACCESS(typeF1, f1, f1P);                                           \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-                                                                            \
-    /* loop through fields performing f1 OP1 OP2 f2 */                      \
-    List_FOR_ALL(f1, i)                                                     \
-        List_ELEM(f1, f1P, i) OP1 OP2 List_ELEM(f2, f2P, i);                \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_F_OP_OP_F(typeF1, f1, OP1, OP2, typeF2, f2)                   \
+                                                                               \
+    /* check the two fields have same Field<Type> mesh */                      \
+    checkFields(f1, f2, #OP1 " " #OP2 " f2");                                  \
+                                                                               \
+    /* set pointer to f1P at end of f1 and */                                  \
+    /* f2.p at end of f2 */                                                    \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+                                                                               \
+    /* loop through fields performing f1 OP1 OP2 f2 */                         \
+    List_FOR_ALL(f1, i)                                                        \
+        List_ELEM(f1, f1P, i) OP1 OP2 List_ELEM(f2, f2P, i);                   \
+    List_END_FOR_ALL                                                           \
 
 
 // member operator : this field f OP s
 
-#define TFOR_ALL_F_OP_S(typeF, f, OP, typeS, s)                             \
-                                                                            \
-    /* set access to f at end of field */                                   \
-    List_ACCESS(typeF, f, fP);                                              \
-                                                                            \
-    /* loop through field performing f OP s */                              \
-    List_FOR_ALL(f, i)                                                      \
-        List_ELEM(f, fP, i) OP (s);                                         \
-    List_END_FOR_ALL                                                        \
+#define TFOR_ALL_F_OP_S(typeF, f, OP, typeS, s)                                \
+                                                                               \
+    /* set access to f at end of field */                                      \
+    List_ACCESS(typeF, f, fP);                                                 \
+                                                                               \
+    /* loop through field performing f OP s */                                 \
+    List_FOR_ALL(f, i)                                                         \
+        List_ELEM(f, fP, i) OP (s);                                            \
+    List_END_FOR_ALL                                                           \
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -360,41 +360,41 @@ void checkFields
 
 // friend operator function : s OP f, allocates storage for s
 
-#define TFOR_ALL_S_OP_F(typeS, s, OP, typeF, f)                             \
-                                                                            \
-    /* set access to f at end of field */                                   \
-    List_CONST_ACCESS(typeF, f, fP);                                        \
-                                                                            \
-    /* loop through field performing s OP f */                              \
-    List_FOR_ALL(f, i)                                                      \
-        (s) OP List_ELEM(f, fP, i);                                         \
+#define TFOR_ALL_S_OP_F(typeS, s, OP, typeF, f)                                \
+                                                                               \
+    /* set access to f at end of field */                                      \
+    List_CONST_ACCESS(typeF, f, fP);                                           \
+                                                                               \
+    /* loop through field performing s OP f */                                 \
+    List_FOR_ALL(f, i)                                                         \
+        (s) OP List_ELEM(f, fP, i);                                            \
     List_END_FOR_ALL
 
 
 // friend operator function : s OP1 f1 OP2 f2, allocates storage for s
 
-#define TFOR_ALL_S_OP_F_OP_F(typeS, s, OP1, typeF1, f1, OP2, typeF2, f2)    \
-                                                                            \
-    /* set access to f1 and f2 at end of each field */                      \
-    List_CONST_ACCESS(typeF1, f1, f1P);                                     \
-    List_CONST_ACCESS(typeF2, f2, f2P);                                     \
-                                                                            \
-    /* loop through field performing s OP f */                              \
-    List_FOR_ALL(f1, i)                                                     \
-        (s) OP1 List_ELEM(f1, f1P, i) OP2 List_ELEM(f2, f2P, i);            \
+#define TFOR_ALL_S_OP_F_OP_F(typeS, s, OP1, typeF1, f1, OP2, typeF2, f2)       \
+                                                                               \
+    /* set access to f1 and f2 at end of each field */                         \
+    List_CONST_ACCESS(typeF1, f1, f1P);                                        \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+                                                                               \
+    /* loop through field performing s OP f */                                 \
+    List_FOR_ALL(f1, i)                                                        \
+        (s) OP1 List_ELEM(f1, f1P, i) OP2 List_ELEM(f2, f2P, i);               \
     List_END_FOR_ALL
 
 
 // friend operator function : s OP FUNC(f), allocates storage for s
 
-#define TFOR_ALL_S_OP_FUNC_F(typeS, s, OP, FUNC, typeF, f)                  \
-                                                                            \
-    /* set access to f at end of field */                                   \
-    List_CONST_ACCESS(typeF, f, fP);                                        \
-                                                                            \
-    /* loop through field performing s OP f */                              \
-    List_FOR_ALL(f, i)                                                      \
-        (s) OP FUNC(List_ELEM(f, fP, i));                                   \
+#define TFOR_ALL_S_OP_FUNC_F(typeS, s, OP, FUNC, typeF, f)                     \
+                                                                               \
+    /* set access to f at end of field */                                      \
+    List_CONST_ACCESS(typeF, f, fP);                                           \
+                                                                               \
+    /* loop through field performing s OP f */                                 \
+    List_FOR_ALL(f, i)                                                         \
+        (s) OP FUNC(List_ELEM(f, fP, i));                                      \
     List_END_FOR_ALL
 
 
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
index e7400669af..75d7cc7c7a 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
@@ -164,25 +164,25 @@ UNARY_FUNCTION(scalar, scalar, atmToPa)
 UNARY_FUNCTION(scalar, scalar, paToAtm)
 
 
-#define BesselFunc(func)                                                      \
-void func(scalarField& res, const int n, const UList<scalar>& sf)             \
-{                                                                             \
-    TFOR_ALL_F_OP_FUNC_S_F(scalar, res, =, ::Foam::func, int, n, scalar, sf)  \
-}                                                                             \
-                                                                              \
-tmp<scalarField> func(const int n, const UList<scalar>& sf)                   \
-{                                                                             \
-    tmp<scalarField> tRes(new scalarField(sf.size()));                        \
-    func(tRes(), n, sf);                                                      \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-tmp<scalarField> func(const int n, const tmp<scalarField>& tsf)               \
-{                                                                             \
-    tmp<scalarField> tRes = reuseTmp<scalar, scalar>::New(tsf);               \
-    func(tRes(), n, tsf());                                                   \
-    reuseTmp<scalar, scalar>::clear(tsf);                                     \
-    return tRes;                                                              \
+#define BesselFunc(func)                                                       \
+void func(scalarField& res, const int n, const UList<scalar>& sf)              \
+{                                                                              \
+    TFOR_ALL_F_OP_FUNC_S_F(scalar, res, =, ::Foam::func, int, n, scalar, sf)   \
+}                                                                              \
+                                                                               \
+tmp<scalarField> func(const int n, const UList<scalar>& sf)                    \
+{                                                                              \
+    tmp<scalarField> tRes(new scalarField(sf.size()));                         \
+    func(tRes(), n, sf);                                                       \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+tmp<scalarField> func(const int n, const tmp<scalarField>& tsf)                \
+{                                                                              \
+    tmp<scalarField> tRes = reuseTmp<scalar, scalar>::New(tsf);                \
+    func(tRes(), n, tsf());                                                    \
+    reuseTmp<scalar, scalar>::clear(tsf);                                      \
+    return tRes;                                                               \
 }
 
 BesselFunc(jn)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 452e214997..c88a4ac483 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -1162,38 +1162,38 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator==
 }
 
 
-#define COMPUTED_ASSIGNMENT(TYPE, op)                                         \
-                                                                              \
-template<class Type, template<class> class PatchField, class GeoMesh>         \
-void Foam::GeometricField<Type, PatchField, GeoMesh>::operator op             \
-(                                                                             \
-    const GeometricField<TYPE, PatchField, GeoMesh>& gf                       \
-)                                                                             \
-{                                                                             \
-    checkField(*this, gf, #op);                                               \
-                                                                              \
-    dimensionedInternalField() op gf.dimensionedInternalField();              \
-    boundaryField() op gf.boundaryField();                                    \
-}                                                                             \
-                                                                              \
-template<class Type, template<class> class PatchField, class GeoMesh>         \
-void Foam::GeometricField<Type, PatchField, GeoMesh>::operator op             \
-(                                                                             \
-    const tmp<GeometricField<TYPE, PatchField, GeoMesh>>& tgf                \
-)                                                                             \
-{                                                                             \
-    operator op(tgf());                                                       \
-    tgf.clear();                                                              \
-}                                                                             \
-                                                                              \
-template<class Type, template<class> class PatchField, class GeoMesh>         \
-void Foam::GeometricField<Type, PatchField, GeoMesh>::operator op             \
-(                                                                             \
-    const dimensioned<TYPE>& dt                                               \
-)                                                                             \
-{                                                                             \
-    dimensionedInternalField() op dt;                                         \
-    boundaryField() op dt.value();                                            \
+#define COMPUTED_ASSIGNMENT(TYPE, op)                                          \
+                                                                               \
+template<class Type, template<class> class PatchField, class GeoMesh>          \
+void Foam::GeometricField<Type, PatchField, GeoMesh>::operator op              \
+(                                                                              \
+    const GeometricField<TYPE, PatchField, GeoMesh>& gf                        \
+)                                                                              \
+{                                                                              \
+    checkField(*this, gf, #op);                                                \
+                                                                               \
+    dimensionedInternalField() op gf.dimensionedInternalField();               \
+    boundaryField() op gf.boundaryField();                                     \
+}                                                                              \
+                                                                               \
+template<class Type, template<class> class PatchField, class GeoMesh>          \
+void Foam::GeometricField<Type, PatchField, GeoMesh>::operator op              \
+(                                                                              \
+    const tmp<GeometricField<TYPE, PatchField, GeoMesh>>& tgf                  \
+)                                                                              \
+{                                                                              \
+    operator op(tgf());                                                        \
+    tgf.clear();                                                               \
+}                                                                              \
+                                                                               \
+template<class Type, template<class> class PatchField, class GeoMesh>          \
+void Foam::GeometricField<Type, PatchField, GeoMesh>::operator op              \
+(                                                                              \
+    const dimensioned<TYPE>& dt                                                \
+)                                                                              \
+{                                                                              \
+    dimensionedInternalField() op dt;                                          \
+    boundaryField() op dt.value();                                             \
 }
 
 COMPUTED_ASSIGNMENT(Type, +=)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
index 9dbc5cfb0d..a315c3e3c8 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
@@ -475,31 +475,31 @@ cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
 }
 
 
-#define UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(returnType, func, gFunc)       \
-                                                                              \
-template<class Type, template<class> class PatchField, class GeoMesh>         \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf                       \
-)                                                                             \
-{                                                                             \
-    return dimensioned<Type>                                                  \
-    (                                                                         \
-        #func "(" + gf.name() + ')',                                          \
-        gf.dimensions(),                                                      \
-        Foam::func(gFunc(gf.internalField()), gFunc(gf.boundaryField()))      \
-    );                                                                        \
-}                                                                             \
-                                                                              \
-template<class Type, template<class> class PatchField, class GeoMesh>         \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
-)                                                                             \
-{                                                                             \
-    dimensioned<returnType> res = func(tgf1());                               \
-    tgf1.clear();                                                             \
-    return res;                                                               \
+#define UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(returnType, func, gFunc)        \
+                                                                               \
+template<class Type, template<class> class PatchField, class GeoMesh>          \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf                        \
+)                                                                              \
+{                                                                              \
+    return dimensioned<Type>                                                   \
+    (                                                                          \
+        #func "(" + gf.name() + ')',                                           \
+        gf.dimensions(),                                                       \
+        Foam::func(gFunc(gf.internalField()), gFunc(gf.boundaryField()))       \
+    );                                                                         \
+}                                                                              \
+                                                                               \
+template<class Type, template<class> class PatchField, class GeoMesh>          \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+)                                                                              \
+{                                                                              \
+    dimensioned<returnType> res = func(tgf1());                                \
+    tgf1.clear();                                                              \
+    return res;                                                                \
 }
 
 UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(Type, max, gMax)
@@ -508,31 +508,31 @@ UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(Type, min, gMin)
 #undef UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY
 
 
-#define UNARY_REDUCTION_FUNCTION(returnType, func, gFunc)                     \
-                                                                              \
-template<class Type, template<class> class PatchField, class GeoMesh>         \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf                       \
-)                                                                             \
-{                                                                             \
-    return dimensioned<Type>                                                  \
-    (                                                                         \
-        #func "(" + gf.name() + ')',                                          \
-        gf.dimensions(),                                                      \
-        gFunc(gf.internalField())                                             \
-    );                                                                        \
-}                                                                             \
-                                                                              \
-template<class Type, template<class> class PatchField, class GeoMesh>         \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
-)                                                                             \
-{                                                                             \
-    dimensioned<returnType> res = func(tgf1());                               \
-    tgf1.clear();                                                             \
-    return res;                                                               \
+#define UNARY_REDUCTION_FUNCTION(returnType, func, gFunc)                      \
+                                                                               \
+template<class Type, template<class> class PatchField, class GeoMesh>          \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf                        \
+)                                                                              \
+{                                                                              \
+    return dimensioned<Type>                                                   \
+    (                                                                          \
+        #func "(" + gf.name() + ')',                                           \
+        gf.dimensions(),                                                       \
+        gFunc(gf.internalField())                                              \
+    );                                                                         \
+}                                                                              \
+                                                                               \
+template<class Type, template<class> class PatchField, class GeoMesh>          \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+)                                                                              \
+{                                                                              \
+    dimensioned<returnType> res = func(tgf1());                                \
+    tgf1.clear();                                                              \
+    return res;                                                                \
 }
 
 UNARY_REDUCTION_FUNCTION(Type, sum, gSum)
@@ -569,380 +569,380 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                 \
-                                                                              \
-template                                                                      \
-<class Type1, class Type2, template<class> class PatchField, class GeoMesh>   \
-void opFunc                                                                   \
-(                                                                             \
-    GeometricField                                                            \
-    <typename product<Type1, Type2>::type, PatchField, GeoMesh>& gf,          \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
+#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+                                                                               \
+template                                                                       \
+<class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
+void opFunc                                                                    \
+(                                                                              \
+    GeometricField                                                             \
+    <typename product<Type1, Type2>::type, PatchField, GeoMesh>& gf,           \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
     Foam::opFunc(gf.internalField(), gf1.internalField(), gf2.internalField());\
     Foam::opFunc(gf.boundaryField(), gf1.boundaryField(), gf2.boundaryField());\
-}                                                                             \
-                                                                              \
-template                                                                      \
-<class Type1, class Type2, template<class> class PatchField, class GeoMesh>   \
-tmp                                                                           \
-<                                                                             \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
+tmp                                                                            \
+<                                                                              \
     GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh> \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes               \
-    (                                                                         \
-        new GeometricField<productType, PatchField, GeoMesh>                  \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + gf1.name() + #op + gf2.name() + ')',                    \
-                gf1.instance(),                                               \
-                gf1.db(),                                                     \
-                IOobject::NO_READ,                                            \
-                IOobject::NO_WRITE                                            \
-            ),                                                                \
-            gf1.mesh(),                                                       \
-            gf1.dimensions() op gf2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::opFunc(tRes(), gf1, gf2);                                           \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template                                                                      \
-<class Type1, class Type2, template<class> class PatchField, class GeoMesh>   \
-tmp                                                                           \
-<                                                                             \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes                 \
+    (                                                                          \
+        new GeometricField<productType, PatchField, GeoMesh>                   \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + gf1.name() + #op + gf2.name() + ')',                     \
+                gf1.instance(),                                                \
+                gf1.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gf1.mesh(),                                                        \
+            gf1.dimensions() op gf2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::opFunc(tRes(), gf1, gf2);                                            \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
+tmp                                                                            \
+<                                                                              \
     GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh> \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-                                                                              \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
-                                                                              \
-    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
-        reuseTmpGeometricField<productType, Type2, PatchField, GeoMesh>::New  \
-        (                                                                     \
-            tgf2,                                                             \
-            '(' + gf1.name() + #op + gf2.name() + ')',                        \
-            gf1.dimensions() op gf2.dimensions()                              \
-        );                                                                    \
-                                                                              \
-    Foam::opFunc(tRes(), gf1, gf2);                                           \
-                                                                              \
-    reuseTmpGeometricField<productType, Type2, PatchField, GeoMesh>           \
-    ::clear(tgf2);                                                            \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template                                                                      \
-<class Type1, class Type2, template<class> class PatchField, class GeoMesh>   \
-tmp                                                                           \
-<                                                                             \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+                                                                               \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+                                                                               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =               \
+        reuseTmpGeometricField<productType, Type2, PatchField, GeoMesh>::New   \
+        (                                                                      \
+            tgf2,                                                              \
+            '(' + gf1.name() + #op + gf2.name() + ')',                         \
+            gf1.dimensions() op gf2.dimensions()                               \
+        );                                                                     \
+                                                                               \
+    Foam::opFunc(tRes(), gf1, gf2);                                            \
+                                                                               \
+    reuseTmpGeometricField<productType, Type2, PatchField, GeoMesh>            \
+    ::clear(tgf2);                                                             \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
+tmp                                                                            \
+<                                                                              \
     GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh> \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
-                                                                              \
-    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
-        reuseTmpGeometricField<productType, Type1, PatchField, GeoMesh>::New  \
-        (                                                                     \
-            tgf1,                                                             \
-            '(' + gf1.name() + #op + gf2.name() + ')',                        \
-            gf1.dimensions() op gf2.dimensions()                              \
-        );                                                                    \
-                                                                              \
-    Foam::opFunc(tRes(), gf1, gf2);                                           \
-                                                                              \
-    reuseTmpGeometricField<productType, Type1, PatchField, GeoMesh>           \
-    ::clear(tgf1);                                                            \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template                                                                      \
-<class Type1, class Type2, template<class> class PatchField, class GeoMesh>   \
-tmp                                                                           \
-<                                                                             \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+                                                                               \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+                                                                               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =               \
+        reuseTmpGeometricField<productType, Type1, PatchField, GeoMesh>::New   \
+        (                                                                      \
+            tgf1,                                                              \
+            '(' + gf1.name() + #op + gf2.name() + ')',                         \
+            gf1.dimensions() op gf2.dimensions()                               \
+        );                                                                     \
+                                                                               \
+    Foam::opFunc(tRes(), gf1, gf2);                                            \
+                                                                               \
+    reuseTmpGeometricField<productType, Type1, PatchField, GeoMesh>            \
+    ::clear(tgf1);                                                             \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
+tmp                                                                            \
+<                                                                              \
     GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh> \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type1, Type2>::type productType;                 \
-                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
-                                                                              \
-    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
-        reuseTmpTmpGeometricField                                             \
-        <productType, Type1, Type1, Type2, PatchField, GeoMesh>::New          \
-        (                                                                     \
-            tgf1,                                                             \
-            tgf2,                                                             \
-            '(' + gf1.name() + #op + gf2.name() + ')',                        \
-            gf1.dimensions() op gf2.dimensions()                              \
-        );                                                                    \
-                                                                              \
-    Foam::opFunc(tRes(), gf1, gf2);                                           \
-                                                                              \
-    reuseTmpTmpGeometricField                                                 \
-        <productType, Type1, Type1, Type2, PatchField, GeoMesh>               \
-    ::clear(tgf1, tgf2);                                                      \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-void opFunc                                                                   \
-(                                                                             \
-    GeometricField                                                            \
-    <typename product<Type, Form>::type, PatchField, GeoMesh>& gf,            \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                     \
-    const dimensioned<Form>& dvs                                              \
-)                                                                             \
-{                                                                             \
-    Foam::opFunc(gf.internalField(), gf1.internalField(), dvs.value());       \
-    Foam::opFunc(gf.boundaryField(), gf1.boundaryField(), dvs.value());       \
-}                                                                             \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type1, Type2>::type productType;                  \
+                                                                               \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+                                                                               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =               \
+        reuseTmpTmpGeometricField                                              \
+        <productType, Type1, Type1, Type2, PatchField, GeoMesh>::New           \
+        (                                                                      \
+            tgf1,                                                              \
+            tgf2,                                                              \
+            '(' + gf1.name() + #op + gf2.name() + ')',                         \
+            gf1.dimensions() op gf2.dimensions()                               \
+        );                                                                     \
+                                                                               \
+    Foam::opFunc(tRes(), gf1, gf2);                                            \
+                                                                               \
+    reuseTmpTmpGeometricField                                                  \
+        <productType, Type1, Type1, Type2, PatchField, GeoMesh>                \
+    ::clear(tgf1, tgf2);                                                       \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
+void opFunc                                                                    \
+(                                                                              \
+    GeometricField                                                             \
+    <typename product<Type, Form>::type, PatchField, GeoMesh>& gf,             \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    const dimensioned<Form>& dvs                                               \
+)                                                                              \
+{                                                                              \
+    Foam::opFunc(gf.internalField(), gf1.internalField(), dvs.value());        \
+    Foam::opFunc(gf.boundaryField(), gf1.boundaryField(), dvs.value());        \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
 tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>> \
-operator op                                                                   \
-(                                                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                     \
-    const dimensioned<Form>& dvs                                              \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type, Form>::type productType;                   \
-                                                                              \
-    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes               \
-    (                                                                         \
-        new GeometricField<productType, PatchField, GeoMesh>                  \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + gf1.name() + #op + dvs.name() + ')',                    \
-                gf1.instance(),                                               \
-                gf1.db(),                                                     \
-                IOobject::NO_READ,                                            \
-                IOobject::NO_WRITE                                            \
-            ),                                                                \
-            gf1.mesh(),                                                       \
-            gf1.dimensions() op dvs.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::opFunc(tRes(), gf1, dvs);                                           \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template                                                                      \
-<                                                                             \
-    class Form,                                                               \
-    class Cmpt,                                                               \
-    int nCmpt,                                                                \
-    class Type, template<class> class PatchField,                             \
-    class GeoMesh                                                             \
->                                                                             \
+operator op                                                                    \
+(                                                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    const dimensioned<Form>& dvs                                               \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type, Form>::type productType;                    \
+                                                                               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes                 \
+    (                                                                          \
+        new GeometricField<productType, PatchField, GeoMesh>                   \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + gf1.name() + #op + dvs.name() + ')',                     \
+                gf1.instance(),                                                \
+                gf1.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gf1.mesh(),                                                        \
+            gf1.dimensions() op dvs.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::opFunc(tRes(), gf1, dvs);                                            \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<                                                                              \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    int nCmpt,                                                                 \
+    class Type, template<class> class PatchField,                              \
+    class GeoMesh                                                              \
+>                                                                              \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
-operator op                                                                   \
-(                                                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                     \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-)                                                                             \
-{                                                                             \
-    return gf1 op dimensioned<Form>(static_cast<const Form&>(vs));            \
-}                                                                             \
-                                                                              \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
+operator op                                                                    \
+(                                                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+)                                                                              \
+{                                                                              \
+    return gf1 op dimensioned<Form>(static_cast<const Form&>(vs));             \
+}                                                                              \
+                                                                               \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
 tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>> \
-operator op                                                                   \
-(                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
-    const dimensioned<Form>& dvs                                              \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Type, Form>::type productType;                   \
-                                                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1 = tgf1();            \
-                                                                              \
-    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
-        reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf1,                                                             \
-            '(' + gf1.name() + #op + dvs.name() + ')',                        \
-            gf1.dimensions() op dvs.dimensions()                              \
-        );                                                                    \
-                                                                              \
-    Foam::opFunc(tRes(), gf1, dvs);                                           \
-                                                                              \
-    reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>            \
-    ::clear(tgf1);                                                            \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template                                                                      \
-<                                                                             \
-    class Form,                                                               \
-    class Cmpt,                                                               \
-    int nCmpt,                                                                \
-    class Type, template<class> class PatchField,                             \
-    class GeoMesh                                                             \
->                                                                             \
+operator op                                                                    \
+(                                                                              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,                \
+    const dimensioned<Form>& dvs                                               \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Type, Form>::type productType;                    \
+                                                                               \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1 = tgf1();             \
+                                                                               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =               \
+        reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf1,                                                              \
+            '(' + gf1.name() + #op + dvs.name() + ')',                         \
+            gf1.dimensions() op dvs.dimensions()                               \
+        );                                                                     \
+                                                                               \
+    Foam::opFunc(tRes(), gf1, dvs);                                            \
+                                                                               \
+    reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>             \
+    ::clear(tgf1);                                                             \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<                                                                              \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    int nCmpt,                                                                 \
+    class Type, template<class> class PatchField,                              \
+    class GeoMesh                                                              \
+>                                                                              \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
-operator op                                                                   \
-(                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-)                                                                             \
-{                                                                             \
-    return tgf1 op dimensioned<Form>(static_cast<const Form&>(vs));           \
-}                                                                             \
-                                                                              \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-void opFunc                                                                   \
-(                                                                             \
-    GeometricField                                                            \
-    <typename product<Form, Type>::type, PatchField, GeoMesh>& gf,            \
-    const dimensioned<Form>& dvs,                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                      \
-)                                                                             \
-{                                                                             \
-    Foam::opFunc(gf.internalField(), dvs.value(), gf1.internalField());       \
-    Foam::opFunc(gf.boundaryField(), dvs.value(), gf1.boundaryField());       \
-}                                                                             \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
+operator op                                                                    \
+(                                                                              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,                \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+)                                                                              \
+{                                                                              \
+    return tgf1 op dimensioned<Form>(static_cast<const Form&>(vs));            \
+}                                                                              \
+                                                                               \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
+void opFunc                                                                    \
+(                                                                              \
+    GeometricField                                                             \
+    <typename product<Form, Type>::type, PatchField, GeoMesh>& gf,             \
+    const dimensioned<Form>& dvs,                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+)                                                                              \
+{                                                                              \
+    Foam::opFunc(gf.internalField(), dvs.value(), gf1.internalField());        \
+    Foam::opFunc(gf.boundaryField(), dvs.value(), gf1.boundaryField());        \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
-operator op                                                                   \
-(                                                                             \
-    const dimensioned<Form>& dvs,                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                      \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Form, Type>::type productType;                   \
-    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes               \
-    (                                                                         \
-        new GeometricField<productType, PatchField, GeoMesh>                  \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + dvs.name() + #op + gf1.name() + ')',                    \
-                gf1.instance(),                                               \
-                gf1.db(),                                                     \
-                IOobject::NO_READ,                                            \
-                IOobject::NO_WRITE                                            \
-            ),                                                                \
-            gf1.mesh(),                                                       \
-            dvs.dimensions() op gf1.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::opFunc(tRes(), dvs, gf1);                                           \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template                                                                      \
-<                                                                             \
-    class Form,                                                               \
-    class Cmpt,                                                               \
-    int nCmpt,                                                                \
-    class Type, template<class> class PatchField,                             \
-    class GeoMesh                                                             \
->                                                                             \
+operator op                                                                    \
+(                                                                              \
+    const dimensioned<Form>& dvs,                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Form, Type>::type productType;                    \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes                 \
+    (                                                                          \
+        new GeometricField<productType, PatchField, GeoMesh>                   \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + dvs.name() + #op + gf1.name() + ')',                     \
+                gf1.instance(),                                                \
+                gf1.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gf1.mesh(),                                                        \
+            dvs.dimensions() op gf1.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::opFunc(tRes(), dvs, gf1);                                            \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<                                                                              \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    int nCmpt,                                                                 \
+    class Type, template<class> class PatchField,                              \
+    class GeoMesh                                                              \
+>                                                                              \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
-operator op                                                                   \
-(                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                      \
-)                                                                             \
-{                                                                             \
-    return dimensioned<Form>(static_cast<const Form&>(vs)) op gf1;            \
-}                                                                             \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
+operator op                                                                    \
+(                                                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+)                                                                              \
+{                                                                              \
+    return dimensioned<Form>(static_cast<const Form&>(vs)) op gf1;             \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
-operator op                                                                   \
-(                                                                             \
-    const dimensioned<Form>& dvs,                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
-)                                                                             \
-{                                                                             \
-    typedef typename product<Form, Type>::type productType;                   \
-                                                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1 = tgf1();            \
-                                                                              \
-    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
-        reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf1,                                                             \
-            '(' + dvs.name() + #op + gf1.name() + ')',                        \
-            dvs.dimensions() op gf1.dimensions()                              \
-        );                                                                    \
-                                                                              \
-    Foam::opFunc(tRes(), dvs, gf1);                                           \
-                                                                              \
-    reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>            \
-    ::clear(tgf1);                                                            \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-template                                                                      \
-<                                                                             \
-    class Form,                                                               \
-    class Cmpt,                                                               \
-    int nCmpt,                                                                \
-    class Type, template<class> class PatchField,                             \
-    class GeoMesh                                                             \
->                                                                             \
+operator op                                                                    \
+(                                                                              \
+    const dimensioned<Form>& dvs,                                              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+)                                                                              \
+{                                                                              \
+    typedef typename product<Form, Type>::type productType;                    \
+                                                                               \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1 = tgf1();             \
+                                                                               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =               \
+        reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf1,                                                              \
+            '(' + dvs.name() + #op + gf1.name() + ')',                         \
+            dvs.dimensions() op gf1.dimensions()                               \
+        );                                                                     \
+                                                                               \
+    Foam::opFunc(tRes(), dvs, gf1);                                            \
+                                                                               \
+    reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>             \
+    ::clear(tgf1);                                                             \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+template                                                                       \
+<                                                                              \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    int nCmpt,                                                                 \
+    class Type, template<class> class PatchField,                              \
+    class GeoMesh                                                              \
+>                                                                              \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
-operator op                                                                   \
-(                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
-)                                                                             \
-{                                                                             \
-    return dimensioned<Form>(static_cast<const Form&>(vs)) op tgf1;           \
+operator op                                                                    \
+(                                                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+)                                                                              \
+{                                                                              \
+    return dimensioned<Form>(static_cast<const Form&>(vs)) op tgf1;            \
 }
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
index 6c7d7c3d9b..51205ba292 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
@@ -194,18 +194,18 @@ tmp
 cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf);
 
 
-#define UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(returnType, func, gFunc)       \
-                                                                              \
-template<class Type, template<class> class PatchField, class GeoMesh>         \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf                       \
-);                                                                            \
-                                                                              \
-template<class Type, template<class> class PatchField, class GeoMesh>         \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
+#define UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(returnType, func, gFunc)        \
+                                                                               \
+template<class Type, template<class> class PatchField, class GeoMesh>          \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf                        \
+);                                                                             \
+                                                                               \
+template<class Type, template<class> class PatchField, class GeoMesh>          \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
 );
 
 UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(Type, max, gMax)
@@ -214,18 +214,18 @@ UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(Type, min, gMin)
 #undef UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY
 
 
-#define UNARY_REDUCTION_FUNCTION(returnType, func, gFunc)                     \
-                                                                              \
-template<class Type, template<class> class PatchField, class GeoMesh>         \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf                       \
-);                                                                            \
-                                                                              \
-template<class Type, template<class> class PatchField, class GeoMesh>         \
-dimensioned<returnType> func                                                  \
-(                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
+#define UNARY_REDUCTION_FUNCTION(returnType, func, gFunc)                      \
+                                                                               \
+template<class Type, template<class> class PatchField, class GeoMesh>          \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf                        \
+);                                                                             \
+                                                                               \
+template<class Type, template<class> class PatchField, class GeoMesh>          \
+dimensioned<returnType> func                                                   \
+(                                                                              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
 );
 
 UNARY_REDUCTION_FUNCTION(Type, sum, gSum)
@@ -262,216 +262,216 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                 \
-                                                                              \
-template                                                                      \
-<class Type1, class Type2, template<class> class PatchField, class GeoMesh>   \
-void opFunc                                                                   \
-(                                                                             \
-    GeometricField                                                            \
-    <typename product<Type1, Type2>::type, PatchField, GeoMesh>& gf,          \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<class Type1, class Type2, template<class> class PatchField, class GeoMesh>   \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-        <typename product<Type1, Type2>::type, PatchField, GeoMesh>           \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<class Type1, class Type2, template<class> class PatchField, class GeoMesh>   \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-    <typename product<Type1, Type2>::type, PatchField, GeoMesh>               \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<class Type1, class Type2, template<class> class PatchField, class GeoMesh>   \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-    <typename product<Type1, Type2>::type, PatchField, GeoMesh>               \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<class Type1, class Type2, template<class> class PatchField, class GeoMesh>   \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-    <typename product<Type1, Type2>::type, PatchField, GeoMesh>               \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-void opFunc                                                                   \
-(                                                                             \
-    GeometricField                                                            \
-    <typename product<Type, Form>::type, PatchField, GeoMesh>& gf,            \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                     \
-    const dimensioned<Form>& dvs                                              \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-    <typename product<Type, Form>::type, PatchField, GeoMesh>                 \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                     \
-    const dimensioned<Form>& dvs                                              \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<                                                                             \
-    class Form,                                                               \
-    class Cmpt,                                                               \
-    int nCmpt,                                                                \
-    class Type, template<class> class PatchField,                             \
-    class GeoMesh                                                             \
->                                                                             \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-    <typename product<Form, Type>::type, PatchField, GeoMesh>                 \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                     \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-    <typename product<Type, Form>::type, PatchField, GeoMesh>                 \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
-    const dimensioned<Form>& dvs                                              \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<                                                                             \
-    class Form,                                                               \
-    class Cmpt,                                                               \
-    int nCmpt,                                                                \
-    class Type, template<class> class PatchField,                             \
-    class GeoMesh                                                             \
->                                                                             \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-    <typename product<Form, Type>::type, PatchField, GeoMesh>                 \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-void opFunc                                                                   \
-(                                                                             \
-    GeometricField                                                            \
-    <typename product<Form, Type>::type, PatchField, GeoMesh>& gf,            \
-    const dimensioned<Form>& dvs,                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                      \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-    <typename product<Form, Type>::type, PatchField, GeoMesh>                 \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const dimensioned<Form>& dvs,                                             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                      \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<                                                                             \
-    class Form,                                                               \
-    class Cmpt,                                                               \
-    int nCmpt,                                                                \
-    class Type, template<class> class PatchField,                             \
-    class GeoMesh                                                             \
->                                                                             \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-    <typename product<Form, Type>::type, PatchField, GeoMesh>                 \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                      \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-    <typename product<Form, Type>::type, PatchField, GeoMesh>                 \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const dimensioned<Form>& dvs,                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
-);                                                                            \
-                                                                              \
-template                                                                      \
-<                                                                             \
-    class Form,                                                               \
-    class Cmpt,                                                               \
-    int nCmpt,                                                                \
-    class Type, template<class> class PatchField,                             \
-    class GeoMesh                                                             \
->                                                                             \
-tmp                                                                           \
-<                                                                             \
-    GeometricField                                                            \
-    <typename product<Form, Type>::type, PatchField, GeoMesh>                 \
->                                                                             \
-operator op                                                                   \
-(                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
+#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+                                                                               \
+template                                                                       \
+<class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
+void opFunc                                                                    \
+(                                                                              \
+    GeometricField                                                             \
+    <typename product<Type1, Type2>::type, PatchField, GeoMesh>& gf,           \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+        <typename product<Type1, Type2>::type, PatchField, GeoMesh>            \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+    <typename product<Type1, Type2>::type, PatchField, GeoMesh>                \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+    <typename product<Type1, Type2>::type, PatchField, GeoMesh>                \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+    <typename product<Type1, Type2>::type, PatchField, GeoMesh>                \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
+void opFunc                                                                    \
+(                                                                              \
+    GeometricField                                                             \
+    <typename product<Type, Form>::type, PatchField, GeoMesh>& gf,             \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    const dimensioned<Form>& dvs                                               \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+    <typename product<Type, Form>::type, PatchField, GeoMesh>                  \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    const dimensioned<Form>& dvs                                               \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<                                                                              \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    int nCmpt,                                                                 \
+    class Type, template<class> class PatchField,                              \
+    class GeoMesh                                                              \
+>                                                                              \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+    <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+    <typename product<Type, Form>::type, PatchField, GeoMesh>                  \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,                \
+    const dimensioned<Form>& dvs                                               \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<                                                                              \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    int nCmpt,                                                                 \
+    class Type, template<class> class PatchField,                              \
+    class GeoMesh                                                              \
+>                                                                              \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+    <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,                \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
+void opFunc                                                                    \
+(                                                                              \
+    GeometricField                                                             \
+    <typename product<Form, Type>::type, PatchField, GeoMesh>& gf,             \
+    const dimensioned<Form>& dvs,                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+    <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const dimensioned<Form>& dvs,                                              \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<                                                                              \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    int nCmpt,                                                                 \
+    class Type, template<class> class PatchField,                              \
+    class GeoMesh                                                              \
+>                                                                              \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+    <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
+    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<class Form, class Type, template<class> class PatchField, class GeoMesh>      \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+    <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const dimensioned<Form>& dvs,                                              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+);                                                                             \
+                                                                               \
+template                                                                       \
+<                                                                              \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    int nCmpt,                                                                 \
+    class Type, template<class> class PatchField,                              \
+    class GeoMesh                                                              \
+>                                                                              \
+tmp                                                                            \
+<                                                                              \
+    GeometricField                                                             \
+    <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
+>                                                                              \
+operator op                                                                    \
+(                                                                              \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
 );
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
index ef97074ca4..01d84a1a62 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
@@ -32,787 +32,787 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                        \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                     \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1                     \
-)                                                                             \
-{                                                                             \
-    Foam::Func(res.internalField(), gf1.internalField());                     \
-    Foam::Func(res.boundaryField(), gf1.boundaryField());                     \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1                     \
-)                                                                             \
-{                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        new GeometricField<ReturnType, PatchField, GeoMesh>                   \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                #Func "(" + gf1.name() + ')',                                 \
-                gf1.instance(),                                               \
-                gf1.db(),                                                     \
-                IOobject::NO_READ,                                            \
-                IOobject::NO_WRITE                                            \
-            ),                                                                \
-            gf1.mesh(),                                                       \
-            Dfunc(gf1.dimensions())                                           \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::Func(tRes(), gf1);                                                  \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1              \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf1,                                                             \
-            #Func "(" + gf1.name() + ')',                                     \
-            Dfunc(gf1.dimensions())                                           \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::Func(tRes(), gf1);                                                  \
-                                                                              \
-    reuseTmpGeometricField                                                    \
-        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                \
-                                                                              \
-    return tRes;                                                              \
+#define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                         \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1                      \
+)                                                                              \
+{                                                                              \
+    Foam::Func(res.internalField(), gf1.internalField());                      \
+    Foam::Func(res.boundaryField(), gf1.boundaryField());                      \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1                      \
+)                                                                              \
+{                                                                              \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        new GeometricField<ReturnType, PatchField, GeoMesh>                    \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #Func "(" + gf1.name() + ')',                                  \
+                gf1.instance(),                                                \
+                gf1.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gf1.mesh(),                                                        \
+            Dfunc(gf1.dimensions())                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::Func(tRes(), gf1);                                                   \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1                \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf1,                                                              \
+            #Func "(" + gf1.name() + ')',                                      \
+            Dfunc(gf1.dimensions())                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::Func(tRes(), gf1);                                                   \
+                                                                               \
+    reuseTmpGeometricField                                                     \
+        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
+                                                                               \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc, Dfunc)                  \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                     \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1                     \
-)                                                                             \
-{                                                                             \
-    Foam::OpFunc(res.internalField(), gf1.internalField());                   \
-    Foam::OpFunc(res.boundaryField(), gf1.boundaryField());                   \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1                     \
-)                                                                             \
-{                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        new GeometricField<ReturnType, PatchField, GeoMesh>                   \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                #Op + gf1.name(),                                             \
-                gf1.instance(),                                               \
-                gf1.db(),                                                     \
-                IOobject::NO_READ,                                            \
-                IOobject::NO_WRITE                                            \
-            ),                                                                \
-            gf1.mesh(),                                                       \
-            Dfunc(gf1.dimensions())                                           \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes(), gf1);                                                \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1              \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf1,                                                             \
-            #Op + gf1.name(),                                                 \
-            Dfunc(gf1.dimensions())                                           \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes(), gf1);                                                \
-                                                                              \
-    reuseTmpGeometricField                                                    \
-        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                \
-                                                                              \
-    return tRes;                                                              \
+#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc, Dfunc)                   \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1                      \
+)                                                                              \
+{                                                                              \
+    Foam::OpFunc(res.internalField(), gf1.internalField());                    \
+    Foam::OpFunc(res.boundaryField(), gf1.boundaryField());                    \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1                      \
+)                                                                              \
+{                                                                              \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        new GeometricField<ReturnType, PatchField, GeoMesh>                    \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #Op + gf1.name(),                                              \
+                gf1.instance(),                                                \
+                gf1.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gf1.mesh(),                                                        \
+            Dfunc(gf1.dimensions())                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes(), gf1);                                                 \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1                \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf1,                                                              \
+            #Op + gf1.name(),                                                  \
+            Dfunc(gf1.dimensions())                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes(), gf1);                                                 \
+                                                                               \
+    reuseTmpGeometricField                                                     \
+        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
+                                                                               \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                     \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
+#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
     Foam::Func(res.internalField(), gf1.internalField(), gf2.internalField());\
     Foam::Func(res.boundaryField(), gf1.boundaryField(), gf2.boundaryField());\
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        new GeometricField<ReturnType, PatchField, GeoMesh>                   \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                #Func "(" + gf1.name() + ',' + gf2.name() + ')',              \
-                gf1.instance(),                                               \
-                gf1.db(),                                                     \
-                IOobject::NO_READ,                                            \
-                IOobject::NO_WRITE                                            \
-            ),                                                                \
-            gf1.mesh(),                                                       \
-            Func(gf1.dimensions(), gf2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::Func(tRes(), gf1, gf2);                                             \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf2,                                                             \
-            #Func "(" + gf1.name() + ',' + gf2.name() + ')',                  \
-            Func(gf1.dimensions(), gf2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::Func(tRes(), gf1, gf2);                                             \
-                                                                              \
-    reuseTmpGeometricField                                                    \
-        <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf1,                                                             \
-            #Func "(" + gf1.name() + ',' + gf2.name() + ')',                  \
-            Func(gf1.dimensions(), gf2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::Func(tRes(), gf1, gf2);                                             \
-                                                                              \
-    reuseTmpGeometricField                                                    \
-        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpTmpGeometricField                                             \
-            <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>            \
-        ::New                                                                 \
-        (                                                                     \
-            tgf1,                                                             \
-            tgf2,                                                             \
-            #Func "(" + gf1.name() + ',' + gf2.name() + ')',                  \
-            Func(gf1.dimensions(), gf2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::Func(tRes(), gf1, gf2);                                             \
-                                                                              \
-    reuseTmpTmpGeometricField                                                 \
-        <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>                \
-        ::clear(tgf1, tgf2);                                                  \
-                                                                              \
-    return tRes;                                                              \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        new GeometricField<ReturnType, PatchField, GeoMesh>                    \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #Func "(" + gf1.name() + ',' + gf2.name() + ')',               \
+                gf1.instance(),                                                \
+                gf1.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gf1.mesh(),                                                        \
+            Func(gf1.dimensions(), gf2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::Func(tRes(), gf1, gf2);                                              \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf2,                                                              \
+            #Func "(" + gf1.name() + ',' + gf2.name() + ')',                   \
+            Func(gf1.dimensions(), gf2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::Func(tRes(), gf1, gf2);                                              \
+                                                                               \
+    reuseTmpGeometricField                                                     \
+        <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                 \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf1,                                                              \
+            #Func "(" + gf1.name() + ',' + gf2.name() + ')',                   \
+            Func(gf1.dimensions(), gf2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::Func(tRes(), gf1, gf2);                                              \
+                                                                               \
+    reuseTmpGeometricField                                                     \
+        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpTmpGeometricField                                              \
+            <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>             \
+        ::New                                                                  \
+        (                                                                      \
+            tgf1,                                                              \
+            tgf2,                                                              \
+            #Func "(" + gf1.name() + ',' + gf2.name() + ')',                   \
+            Func(gf1.dimensions(), gf2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::Func(tRes(), gf1, gf2);                                              \
+                                                                               \
+    reuseTmpTmpGeometricField                                                  \
+        <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>                 \
+        ::clear(tgf1, tgf2);                                                   \
+                                                                               \
+    return tRes;                                                               \
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                     \
-    const dimensioned<Type1>& dt1,                                            \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    Foam::Func(res.internalField(), dt1.value(), gf2.internalField());        \
-    Foam::Func(res.boundaryField(), dt1.value(), gf2.boundaryField());        \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        new GeometricField<ReturnType, PatchField, GeoMesh>                   \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                #Func "(" + dt1.name() + ',' + gf2.name() + ')',              \
-                gf2.instance(),                                               \
-                gf2.db(),                                                     \
-                IOobject::NO_READ,                                            \
-                IOobject::NO_WRITE                                            \
-            ),                                                                \
-            gf2.mesh(),                                                       \
-            Func(dt1.dimensions(), gf2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::Func(tRes(), dt1, gf2);                                             \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    return Func(dimensioned<Type1>(t1), gf2);                                 \
-}                                                                             \
-                                                                              \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf2,                                                             \
-            #Func "(" + dt1.name() + gf2.name() + ',' + ')',                  \
-            Func(dt1.dimensions(), gf2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::Func(tRes(), dt1, gf2);                                             \
-                                                                              \
-    reuseTmpGeometricField                                                    \
-        <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-)                                                                             \
-{                                                                             \
-    return Func(dimensioned<Type1>(t1), tgf2);                                \
+#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
+    const dimensioned<Type1>& dt1,                                             \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    Foam::Func(res.internalField(), dt1.value(), gf2.internalField());         \
+    Foam::Func(res.boundaryField(), dt1.value(), gf2.boundaryField());         \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        new GeometricField<ReturnType, PatchField, GeoMesh>                    \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #Func "(" + dt1.name() + ',' + gf2.name() + ')',               \
+                gf2.instance(),                                                \
+                gf2.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gf2.mesh(),                                                        \
+            Func(dt1.dimensions(), gf2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::Func(tRes(), dt1, gf2);                                              \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    return Func(dimensioned<Type1>(t1), gf2);                                  \
+}                                                                              \
+                                                                               \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf2,                                                              \
+            #Func "(" + dt1.name() + gf2.name() + ',' + ')',                   \
+            Func(dt1.dimensions(), gf2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::Func(tRes(), dt1, gf2);                                              \
+                                                                               \
+    reuseTmpGeometricField                                                     \
+        <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                 \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+)                                                                              \
+{                                                                              \
+    return Func(dimensioned<Type1>(t1), tgf2);                                 \
 }
 
 
-#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-void Func                                                                     \
-(                                                                             \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                     \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const dimensioned<Type2>& dt2                                             \
-)                                                                             \
-{                                                                             \
-    Foam::Func(res.internalField(), gf1.internalField(), dt2.value());        \
-    Foam::Func(res.boundaryField(), gf1.boundaryField(), dt2.value());        \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const dimensioned<Type2>& dt2                                             \
-)                                                                             \
-{                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        new GeometricField<ReturnType, PatchField, GeoMesh>                   \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                #Func "(" + gf1.name() + ',' + dt2.name() + ')',              \
-                gf1.instance(),                                               \
-                gf1.db(),                                                     \
-                IOobject::NO_READ,                                            \
-                IOobject::NO_WRITE                                            \
-            ),                                                                \
-            gf1.mesh(),                                                       \
-            Func(gf1.dimensions(), dt2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::Func(tRes(), gf1, dt2);                                             \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const Type2& t2                                                           \
-)                                                                             \
-{                                                                             \
-    return Func(gf1, dimensioned<Type2>(t2));                                 \
-}                                                                             \
-                                                                              \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const dimensioned<Type2>& dt2                                             \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf1,                                                             \
-            #Func "(" + gf1.name() + ',' + dt2.name() + ')',                  \
-            Func(gf1.dimensions(), dt2.dimensions())                          \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::Func(tRes(), gf1, dt2);                                             \
-                                                                              \
-    reuseTmpGeometricField                                                    \
-        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const Type2& t2                                                           \
-)                                                                             \
-{                                                                             \
-    return Func(tgf1, dimensioned<Type2>(t2));                                \
+#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    Foam::Func(res.internalField(), gf1.internalField(), dt2.value());         \
+    Foam::Func(res.boundaryField(), gf1.boundaryField(), dt2.value());         \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        new GeometricField<ReturnType, PatchField, GeoMesh>                    \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #Func "(" + gf1.name() + ',' + dt2.name() + ')',               \
+                gf1.instance(),                                                \
+                gf1.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gf1.mesh(),                                                        \
+            Func(gf1.dimensions(), dt2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::Func(tRes(), gf1, dt2);                                              \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const Type2& t2                                                            \
+)                                                                              \
+{                                                                              \
+    return Func(gf1, dimensioned<Type2>(t2));                                  \
+}                                                                              \
+                                                                               \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf1,                                                              \
+            #Func "(" + gf1.name() + ',' + dt2.name() + ')',                   \
+            Func(gf1.dimensions(), dt2.dimensions())                           \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::Func(tRes(), gf1, dt2);                                              \
+                                                                               \
+    reuseTmpGeometricField                                                     \
+        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const Type2& t2                                                            \
+)                                                                              \
+{                                                                              \
+    return Func(tgf1, dimensioned<Type2>(t2));                                 \
 }
 
 
-#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                  \
-    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                   \
+#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                   \
+    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                    \
     BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                     \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    Foam::OpFunc                                                              \
-        (res.internalField(), gf1.internalField(), gf2.internalField());      \
-    Foam::OpFunc                                                              \
-        (res.boundaryField(), gf1.boundaryField(), gf2.boundaryField());      \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        new GeometricField<ReturnType, PatchField, GeoMesh>                   \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + gf1.name() + OpName + gf2.name() + ')',                 \
-                gf1.instance(),                                               \
-                gf1.db(),                                                     \
-                IOobject::NO_READ,                                            \
-                IOobject::NO_WRITE                                            \
-            ),                                                                \
-            gf1.mesh(),                                                       \
-            gf1.dimensions() Op gf2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes(), gf1, gf2);                                           \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf2,                                                             \
-            '(' + gf1.name() + OpName + gf2.name() + ')',                     \
-            gf1.dimensions() Op gf2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes(), gf1, gf2);                                           \
-                                                                              \
-    reuseTmpGeometricField                                                    \
-        <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf1,                                                             \
-            '(' + gf1.name() + OpName + gf2.name() + ')',                     \
-            gf1.dimensions() Op gf2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes(), gf1, gf2);                                           \
-                                                                              \
-    reuseTmpGeometricField                                                    \
-        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpTmpGeometricField                                             \
-            <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>::New       \
-        (                                                                     \
-            tgf1,                                                             \
-            tgf2,                                                             \
-            '(' + gf1.name() + OpName + gf2.name() + ')',                     \
-            gf1.dimensions() Op gf2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes(), gf1, gf2);                                           \
-                                                                              \
-    reuseTmpTmpGeometricField                                                 \
-        <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>                \
-        ::clear(tgf1, tgf2);                                                  \
-                                                                              \
-    return tRes;                                                              \
+#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    Foam::OpFunc                                                               \
+        (res.internalField(), gf1.internalField(), gf2.internalField());       \
+    Foam::OpFunc                                                               \
+        (res.boundaryField(), gf1.boundaryField(), gf2.boundaryField());       \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        new GeometricField<ReturnType, PatchField, GeoMesh>                    \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + gf1.name() + OpName + gf2.name() + ')',                  \
+                gf1.instance(),                                                \
+                gf1.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gf1.mesh(),                                                        \
+            gf1.dimensions() Op gf2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes(), gf1, gf2);                                            \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf2,                                                              \
+            '(' + gf1.name() + OpName + gf2.name() + ')',                      \
+            gf1.dimensions() Op gf2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes(), gf1, gf2);                                            \
+                                                                               \
+    reuseTmpGeometricField                                                     \
+        <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                 \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf1,                                                              \
+            '(' + gf1.name() + OpName + gf2.name() + ')',                      \
+            gf1.dimensions() Op gf2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes(), gf1, gf2);                                            \
+                                                                               \
+    reuseTmpGeometricField                                                     \
+        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpTmpGeometricField                                              \
+            <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>::New        \
+        (                                                                      \
+            tgf1,                                                              \
+            tgf2,                                                              \
+            '(' + gf1.name() + OpName + gf2.name() + ')',                      \
+            gf1.dimensions() Op gf2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes(), gf1, gf2);                                            \
+                                                                               \
+    reuseTmpTmpGeometricField                                                  \
+        <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>                 \
+        ::clear(tgf1, tgf2);                                                   \
+                                                                               \
+    return tRes;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                     \
-    const dimensioned<Type1>& dt1,                                            \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    Foam::OpFunc(res.internalField(), dt1.value(), gf2.internalField());      \
-    Foam::OpFunc(res.boundaryField(), dt1.value(), gf2.boundaryField());      \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        new GeometricField<ReturnType, PatchField, GeoMesh>                   \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + dt1.name() + OpName + gf2.name() + ')',                 \
-                gf2.instance(),                                               \
-                gf2.db(),                                                     \
-                IOobject::NO_READ,                                            \
-                IOobject::NO_WRITE                                            \
-            ),                                                                \
-            gf2.mesh(),                                                       \
-            dt1.dimensions() Op gf2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes(), dt1, gf2);                                           \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
-)                                                                             \
-{                                                                             \
-    return dimensioned<Type1>(t1) Op gf2;                                     \
-}                                                                             \
-                                                                              \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf2,                                                             \
-            '(' + dt1.name() + OpName + gf2.name() + ')',                     \
-            dt1.dimensions() Op gf2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes(), dt1, gf2);                                           \
-                                                                              \
-    reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>            \
-        ::clear(tgf2);                                                        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
-)                                                                             \
-{                                                                             \
-    return dimensioned<Type1>(t1) Op tgf2;                                    \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
+    const dimensioned<Type1>& dt1,                                             \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    Foam::OpFunc(res.internalField(), dt1.value(), gf2.internalField());       \
+    Foam::OpFunc(res.boundaryField(), dt1.value(), gf2.boundaryField());       \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        new GeometricField<ReturnType, PatchField, GeoMesh>                    \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + dt1.name() + OpName + gf2.name() + ')',                  \
+                gf2.instance(),                                                \
+                gf2.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gf2.mesh(),                                                        \
+            dt1.dimensions() Op gf2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes(), dt1, gf2);                                            \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+)                                                                              \
+{                                                                              \
+    return dimensioned<Type1>(t1) Op gf2;                                      \
+}                                                                              \
+                                                                               \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf2,                                                              \
+            '(' + dt1.name() + OpName + gf2.name() + ')',                      \
+            dt1.dimensions() Op gf2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes(), dt1, gf2);                                            \
+                                                                               \
+    reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>             \
+        ::clear(tgf2);                                                         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+)                                                                              \
+{                                                                              \
+    return dimensioned<Type1>(t1) Op tgf2;                                     \
 }
 
 
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
-                                                                              \
-TEMPLATE                                                                      \
-void OpFunc                                                                   \
-(                                                                             \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                     \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const dimensioned<Type2>& dt2                                             \
-)                                                                             \
-{                                                                             \
-    Foam::OpFunc(res.internalField(), gf1.internalField(), dt2.value());      \
-    Foam::OpFunc(res.boundaryField(), gf1.boundaryField(), dt2.value());      \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const dimensioned<Type2>& dt2                                             \
-)                                                                             \
-{                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        new GeometricField<ReturnType, PatchField, GeoMesh>                   \
-        (                                                                     \
-            IOobject                                                          \
-            (                                                                 \
-                '(' + gf1.name() + OpName + dt2.name() + ')',                 \
-                gf1.instance(),                                               \
-                gf1.db(),                                                     \
-                IOobject::NO_READ,                                            \
-                IOobject::NO_WRITE                                            \
-            ),                                                                \
-            gf1.mesh(),                                                       \
-            gf1.dimensions() Op dt2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes(), gf1, dt2);                                           \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const Type2& t2                                                           \
-)                                                                             \
-{                                                                             \
-    return gf1 Op dimensioned<Type2>(t2);                                     \
-}                                                                             \
-                                                                              \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const dimensioned<Type2>& dt2                                             \
-)                                                                             \
-{                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
-                                                                              \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
-    (                                                                         \
-        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
-        (                                                                     \
-            tgf1,                                                             \
-            '(' + gf1.name() + OpName + dt2.name() + ')',                     \
-            gf1.dimensions() Op dt2.dimensions()                              \
-        )                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::OpFunc(tRes(), gf1, dt2);                                           \
-                                                                              \
-    reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>            \
-        ::clear(tgf1);                                                        \
-                                                                              \
-    return tRes;                                                              \
-}                                                                             \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
-    const Type2& t2                                                           \
-)                                                                             \
-{                                                                             \
-    return tgf1 Op dimensioned<Type2>(t2);                                    \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    Foam::OpFunc(res.internalField(), gf1.internalField(), dt2.value());       \
+    Foam::OpFunc(res.boundaryField(), gf1.boundaryField(), dt2.value());       \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        new GeometricField<ReturnType, PatchField, GeoMesh>                    \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                '(' + gf1.name() + OpName + dt2.name() + ')',                  \
+                gf1.instance(),                                                \
+                gf1.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gf1.mesh(),                                                        \
+            gf1.dimensions() Op dt2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes(), gf1, dt2);                                            \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const Type2& t2                                                            \
+)                                                                              \
+{                                                                              \
+    return gf1 Op dimensioned<Type2>(t2);                                      \
+}                                                                              \
+                                                                               \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+                                                                               \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                  \
+    (                                                                          \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tgf1,                                                              \
+            '(' + gf1.name() + OpName + dt2.name() + ')',                      \
+            gf1.dimensions() Op dt2.dimensions()                               \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::OpFunc(tRes(), gf1, dt2);                                            \
+                                                                               \
+    reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>             \
+        ::clear(tgf1);                                                         \
+                                                                               \
+    return tRes;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const Type2& t2                                                            \
+)                                                                              \
+{                                                                              \
+    return tgf1 Op dimensioned<Type2>(t2);                                     \
 }
 
 
-#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)    \
-    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)     \
+#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)     \
+    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)      \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
index 725fefb727..3f0bbfdb64 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
@@ -25,239 +25,239 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                        \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& df                      \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1              \
+#define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                         \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& df                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1                \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_OPERATOR(ReturnType, Type1, Op, opFunc, Dfunc)                  \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1                     \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1              \
+#define UNARY_OPERATOR(ReturnType, Type1, Op, opFunc, Dfunc)                   \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& df1                      \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1                \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
+#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
+    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
+    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
+#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
 );
 
 
-#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const dimensioned<Type2>& dt2                                             \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const Type2& t2                                                           \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
-    const dimensioned<Type2>& dt2                                             \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf2,             \
-    const Type2& t2                                                           \
+#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
+    const Type2& t2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf2,               \
+    const Type2& t2                                                            \
 );
 
 
-#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                  \
-    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                   \
+#define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                   \
+    BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                    \
     BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)         \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
+#define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)          \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
+    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
+    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const Type1& t1,                                                           \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
 );
 
 
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const dimensioned<Type2>& dt2                                             \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const Type2& t2                                                           \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
-    const dimensioned<Type2>& dt2                                             \
-);                                                                            \
-                                                                              \
-TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
-(                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
-    const Type2& t2                                                           \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
+    const Type2& t2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
+    const Type2& t2                                                            \
 );
 
 
-#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)    \
-    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)     \
+#define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)     \
+    BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)      \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
index 67f4486f11..a5a0d9b5cf 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
@@ -791,88 +791,88 @@ UNARY_FUNCTION(scalar, scalar, y1, trans)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BesselFunc(func)                                                     \
-                                                                            \
-template<template<class> class PatchField, class GeoMesh>                   \
-void func                                                                   \
-(                                                                           \
-    GeometricField<scalar, PatchField, GeoMesh>& gsf,                       \
-    const int n,                                                            \
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf1                 \
-)                                                                           \
-{                                                                           \
-    func(gsf.internalField(), n, gsf1.internalField());                     \
-    func(gsf.boundaryField(), n, gsf1.boundaryField());                     \
-}                                                                           \
-                                                                            \
-template<template<class> class PatchField, class GeoMesh>                   \
-tmp<GeometricField<scalar, PatchField, GeoMesh>> func                      \
-(                                                                           \
-    const int n,                                                            \
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf                  \
-)                                                                           \
-{                                                                           \
-    if (!gsf.dimensions().dimensionless())                                  \
-    {                                                                       \
-        FatalErrorInFunction                                                \
-            << "gsf not dimensionless"                                      \
-            << abort(FatalError);                                           \
-    }                                                                       \
-                                                                            \
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tFunc                 \
-    (                                                                       \
-        new GeometricField<scalar, PatchField, GeoMesh>                     \
-        (                                                                   \
-            IOobject                                                        \
-            (                                                               \
-                #func "(" + gsf.name() + ')',                               \
-                gsf.instance(),                                             \
-                gsf.db(),                                                   \
-                IOobject::NO_READ,                                          \
-                IOobject::NO_WRITE                                          \
-            ),                                                              \
-            gsf.mesh(),                                                     \
-            dimless                                                         \
-        )                                                                   \
-    );                                                                      \
-                                                                            \
-    func(tFunc(), n, gsf);                                                  \
-                                                                            \
-    return tFunc;                                                           \
-}                                                                           \
-                                                                            \
-template<template<class> class PatchField, class GeoMesh>                   \
-tmp<GeometricField<scalar, PatchField, GeoMesh>> func                      \
-(                                                                           \
-    const int n,                                                            \
-    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf           \
-)                                                                           \
-{                                                                           \
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();        \
-                                                                            \
-    if (!gsf.dimensions().dimensionless())                                  \
-    {                                                                       \
-        FatalErrorInFunction                                                \
-            << " : gsf not dimensionless"                                   \
-            << abort(FatalError);                                           \
-    }                                                                       \
-                                                                            \
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tFunc                 \
-    (                                                                       \
-        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New    \
-        (                                                                   \
-            tgsf,                                                           \
-            #func "(" + gsf.name() + ')',                                   \
-            dimless                                                         \
-        )                                                                   \
-    );                                                                      \
-                                                                            \
-    func(tFunc(), n, gsf);                                                  \
-                                                                            \
-    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>             \
-    ::clear(tgsf);                                                          \
-                                                                            \
-    return tFunc;                                                           \
+#define BesselFunc(func)                                                       \
+                                                                               \
+template<template<class> class PatchField, class GeoMesh>                      \
+void func                                                                      \
+(                                                                              \
+    GeometricField<scalar, PatchField, GeoMesh>& gsf,                          \
+    const int n,                                                               \
+    const GeometricField<scalar, PatchField, GeoMesh>& gsf1                    \
+)                                                                              \
+{                                                                              \
+    func(gsf.internalField(), n, gsf1.internalField());                        \
+    func(gsf.boundaryField(), n, gsf1.boundaryField());                        \
+}                                                                              \
+                                                                               \
+template<template<class> class PatchField, class GeoMesh>                      \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                          \
+(                                                                              \
+    const int n,                                                               \
+    const GeometricField<scalar, PatchField, GeoMesh>& gsf                     \
+)                                                                              \
+{                                                                              \
+    if (!gsf.dimensions().dimensionless())                                     \
+    {                                                                          \
+        FatalErrorInFunction                                                   \
+            << "gsf not dimensionless"                                         \
+            << abort(FatalError);                                              \
+    }                                                                          \
+                                                                               \
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tFunc                     \
+    (                                                                          \
+        new GeometricField<scalar, PatchField, GeoMesh>                        \
+        (                                                                      \
+            IOobject                                                           \
+            (                                                                  \
+                #func "(" + gsf.name() + ')',                                  \
+                gsf.instance(),                                                \
+                gsf.db(),                                                      \
+                IOobject::NO_READ,                                             \
+                IOobject::NO_WRITE                                             \
+            ),                                                                 \
+            gsf.mesh(),                                                        \
+            dimless                                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    func(tFunc(), n, gsf);                                                     \
+                                                                               \
+    return tFunc;                                                              \
+}                                                                              \
+                                                                               \
+template<template<class> class PatchField, class GeoMesh>                      \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                          \
+(                                                                              \
+    const int n,                                                               \
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf               \
+)                                                                              \
+{                                                                              \
+    const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();           \
+                                                                               \
+    if (!gsf.dimensions().dimensionless())                                     \
+    {                                                                          \
+        FatalErrorInFunction                                                   \
+            << " : gsf not dimensionless"                                      \
+            << abort(FatalError);                                              \
+    }                                                                          \
+                                                                               \
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tFunc                     \
+    (                                                                          \
+        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New       \
+        (                                                                      \
+            tgsf,                                                              \
+            #func "(" + gsf.name() + ')',                                      \
+            dimless                                                            \
+        )                                                                      \
+    );                                                                         \
+                                                                               \
+    func(tFunc(), n, gsf);                                                     \
+                                                                               \
+    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>                \
+    ::clear(tgsf);                                                             \
+                                                                               \
+    return tFunc;                                                              \
 }
 
 BesselFunc(jn)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
index 5090e5491d..65ebaf9304 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
@@ -140,17 +140,17 @@ void func                                                                      \
 );                                                                             \
                                                                                \
 template<template<class> class PatchField, class GeoMesh>                      \
-tmp<GeometricField<scalar, PatchField, GeoMesh>> func                         \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                          \
 (                                                                              \
     const int n,                                                               \
     const GeometricField<scalar, PatchField, GeoMesh>&                         \
 );                                                                             \
                                                                                \
 template<template<class> class PatchField, class GeoMesh>                      \
-tmp<GeometricField<scalar, PatchField, GeoMesh>> func                         \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                          \
 (                                                                              \
     const int n,                                                               \
-    const tmp<GeometricField<scalar, PatchField, GeoMesh>>&                   \
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>&                    \
 );
 
 BesselFunc(jn)
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index 45b3efba95..d7ef103d16 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -528,82 +528,82 @@ const pointPatchField<Type>& operator+
 
 
 #define addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)      \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        PatchTypeField,                                                       \
-        typePatchTypeField,                                                   \
-        pointPatch                                                            \
-    );                                                                        \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        PatchTypeField,                                                       \
-        typePatchTypeField,                                                   \
-        patchMapper                                                           \
-    );                                                                        \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        PatchTypeField,                                                       \
-        typePatchTypeField,                                                   \
-        dictionary                                                            \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        PatchTypeField,                                                        \
+        typePatchTypeField,                                                    \
+        pointPatch                                                             \
+    );                                                                         \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        PatchTypeField,                                                        \
+        typePatchTypeField,                                                    \
+        patchMapper                                                            \
+    );                                                                         \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        PatchTypeField,                                                        \
+        typePatchTypeField,                                                    \
+        dictionary                                                             \
     );
 
 
 // for non-templated patch fields
-#define makePointPatchTypeField(PatchTypeField,typePatchTypeField)            \
-    defineTypeNameAndDebug(typePatchTypeField, 0);                            \
+#define makePointPatchTypeField(PatchTypeField,typePatchTypeField)             \
+    defineTypeNameAndDebug(typePatchTypeField, 0);                             \
     addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
 
 
 // for templated patch fields
-#define makeTemplatePointPatchTypeField(PatchTypeField, typePatchTypeField)   \
-    defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);               \
+#define makeTemplatePointPatchTypeField(PatchTypeField, typePatchTypeField)    \
+    defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);                \
     addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
 
 
-#define makePointPatchFields(type)                                            \
-    makeTemplatePointPatchTypeField                                           \
-    (                                                                         \
-        pointPatchScalarField,                                                \
-        type##PointPatchScalarField                                           \
-    );                                                                        \
-    makeTemplatePointPatchTypeField                                           \
-    (                                                                         \
-        pointPatchVectorField,                                                \
-        type##PointPatchVectorField                                           \
-    );                                                                        \
-    makeTemplatePointPatchTypeField                                           \
-    (                                                                         \
-        pointPatchSphericalTensorField,                                       \
-        type##PointPatchSphericalTensorField                                  \
-    );                                                                        \
-    makeTemplatePointPatchTypeField                                           \
-    (                                                                         \
-        pointPatchSymmTensorField,                                            \
-        type##PointPatchSymmTensorField                                       \
-    );                                                                        \
-    makeTemplatePointPatchTypeField                                           \
-    (                                                                         \
-        pointPatchTensorField,                                                \
-        type##PointPatchTensorField                                           \
+#define makePointPatchFields(type)                                             \
+    makeTemplatePointPatchTypeField                                            \
+    (                                                                          \
+        pointPatchScalarField,                                                 \
+        type##PointPatchScalarField                                            \
+    );                                                                         \
+    makeTemplatePointPatchTypeField                                            \
+    (                                                                          \
+        pointPatchVectorField,                                                 \
+        type##PointPatchVectorField                                            \
+    );                                                                         \
+    makeTemplatePointPatchTypeField                                            \
+    (                                                                          \
+        pointPatchSphericalTensorField,                                        \
+        type##PointPatchSphericalTensorField                                   \
+    );                                                                         \
+    makeTemplatePointPatchTypeField                                            \
+    (                                                                          \
+        pointPatchSymmTensorField,                                             \
+        type##PointPatchSymmTensorField                                        \
+    );                                                                         \
+    makeTemplatePointPatchTypeField                                            \
+    (                                                                          \
+        pointPatchTensorField,                                                 \
+        type##PointPatchTensorField                                            \
 );
 
 
-#define makePointPatchFieldsTypeName(type)                                    \
-    defineNamedTemplateTypeNameAndDebug(type##PointPatchScalarField, 0);      \
-    defineNamedTemplateTypeNameAndDebug(type##PointPatchVectorField, 0);      \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        type##PointPatchSphericalTensorField, 0                               \
-    );                                                                        \
-    defineNamedTemplateTypeNameAndDebug(type##PointPatchSymmTensorField, 0);  \
+#define makePointPatchFieldsTypeName(type)                                     \
+    defineNamedTemplateTypeNameAndDebug(type##PointPatchScalarField, 0);       \
+    defineNamedTemplateTypeNameAndDebug(type##PointPatchVectorField, 0);       \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        type##PointPatchSphericalTensorField, 0                                \
+    );                                                                         \
+    defineNamedTemplateTypeNameAndDebug(type##PointPatchSymmTensorField, 0);   \
     defineNamedTemplateTypeNameAndDebug(type##PointPatchTensorField, 0)
 
 
-#define makePointPatchFieldTypedefs(type)                                     \
-    typedef type##PointPatchField<scalar> type##PointPatchScalarField;        \
-    typedef type##PointPatchField<vector> type##PointPatchVectorField;        \
-    typedef type##PointPatchField<sphericalTensor>                            \
-        type##PointPatchSphericalTensorField;                                 \
+#define makePointPatchFieldTypedefs(type)                                      \
+    typedef type##PointPatchField<scalar> type##PointPatchScalarField;         \
+    typedef type##PointPatchField<vector> type##PointPatchVectorField;         \
+    typedef type##PointPatchField<sphericalTensor>                             \
+        type##PointPatchSphericalTensorField;                                  \
     typedef type##PointPatchField<symmTensor> type##PointPatchSymmTensorField;\
     typedef type##PointPatchField<tensor> type##PointPatchTensorField;
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H
index 9331774db2..5a6f0bb213 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H
@@ -101,24 +101,24 @@ inline void cmptMag
 {}
 
 
-#define BINARY_FUNCTION(func)                                                 \
-                                                                              \
-template<class Type>                                                          \
-inline void func                                                              \
-(                                                                             \
-    pointPatchField<Type>& f,                                                 \
-    const pointPatchField<Type>& f1,                                          \
-    const pointPatchField<Type>& f2                                           \
-)                                                                             \
-{}                                                                            \
-                                                                              \
-template<class Type>                                                          \
-inline void func                                                              \
-(                                                                             \
-    pointPatchField<Type>& f,                                                 \
-    const pointPatchField<Type>& f1,                                          \
-    const Type& s                                                             \
-)                                                                             \
+#define BINARY_FUNCTION(func)                                                  \
+                                                                               \
+template<class Type>                                                           \
+inline void func                                                               \
+(                                                                              \
+    pointPatchField<Type>& f,                                                  \
+    const pointPatchField<Type>& f1,                                           \
+    const pointPatchField<Type>& f2                                            \
+)                                                                              \
+{}                                                                             \
+                                                                               \
+template<class Type>                                                           \
+inline void func                                                               \
+(                                                                              \
+    pointPatchField<Type>& f,                                                  \
+    const pointPatchField<Type>& f1,                                           \
+    const Type& s                                                              \
+)                                                                              \
 {}
 
 BINARY_FUNCTION(max)
@@ -129,54 +129,54 @@ BINARY_FUNCTION(cmptDivide)
 
 /* * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * */
 
-#define UNARY_OPERATOR(op, opFunc)                                            \
-                                                                              \
-template<class Type>                                                          \
-inline void opFunc                                                            \
-(                                                                             \
-    pointPatchField<Type>& f,                                                 \
-    const pointPatchField<Type>& f1                                           \
-)                                                                             \
+#define UNARY_OPERATOR(op, opFunc)                                             \
+                                                                               \
+template<class Type>                                                           \
+inline void opFunc                                                             \
+(                                                                              \
+    pointPatchField<Type>& f,                                                  \
+    const pointPatchField<Type>& f1                                            \
+)                                                                              \
 {}
 
 UNARY_OPERATOR(-, negate)
 
-#define BINARY_OPERATOR(Type1, Type2, op, opFunc)                             \
-                                                                              \
-template<class Type>                                                          \
-inline void opFunc                                                            \
-(                                                                             \
-    pointPatchField<Type>& f,                                                 \
-    const pointPatchField<Type1>& f1,                                         \
-    const pointPatchField<Type2>& f2                                          \
-)                                                                             \
+#define BINARY_OPERATOR(Type1, Type2, op, opFunc)                              \
+                                                                               \
+template<class Type>                                                           \
+inline void opFunc                                                             \
+(                                                                              \
+    pointPatchField<Type>& f,                                                  \
+    const pointPatchField<Type1>& f1,                                          \
+    const pointPatchField<Type2>& f2                                           \
+)                                                                              \
 {}
 
 BINARY_OPERATOR(scalar, Type, *, multiply)
 BINARY_OPERATOR(Type, scalar, *, multiply)
 BINARY_OPERATOR(Type, scalar, /, divide)
 
-#define BINARY_TYPE_OPERATOR_SF(TYPE, op, opFunc)                             \
-                                                                              \
-template<class Type>                                                          \
-inline void opFunc                                                            \
-(                                                                             \
-    pointPatchField<Type>& f,                                                 \
-    const TYPE& s,                                                            \
-    const pointPatchField<Type>& f1                                           \
-)                                                                             \
+#define BINARY_TYPE_OPERATOR_SF(TYPE, op, opFunc)                              \
+                                                                               \
+template<class Type>                                                           \
+inline void opFunc                                                             \
+(                                                                              \
+    pointPatchField<Type>& f,                                                  \
+    const TYPE& s,                                                             \
+    const pointPatchField<Type>& f1                                            \
+)                                                                              \
 {}
 
 
-#define BINARY_TYPE_OPERATOR_FS(TYPE, op, opFunc)                             \
-                                                                              \
-template<class Type>                                                          \
-inline void opFunc                                                            \
-(                                                                             \
-    pointPatchField<Type>& f,                                                 \
-    const pointPatchField<Type>& f1,                                          \
-    const TYPE& s                                                             \
-)                                                                             \
+#define BINARY_TYPE_OPERATOR_FS(TYPE, op, opFunc)                              \
+                                                                               \
+template<class Type>                                                           \
+inline void opFunc                                                             \
+(                                                                              \
+    pointPatchField<Type>& f,                                                  \
+    const pointPatchField<Type>& f1,                                           \
+    const TYPE& s                                                              \
+)                                                                              \
 {}
 
 
@@ -185,52 +185,52 @@ BINARY_TYPE_OPERATOR_FS(scalar, *, multiply)
 BINARY_TYPE_OPERATOR_FS(scalar, /, divide)
 
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                 \
-                                                                              \
-template                                                                      \
-<                                                                             \
-    class Type1,                                                              \
-    class Type2                                                               \
->                                                                             \
-inline void opFunc                                                            \
-(                                                                             \
-    pointPatchField                                                           \
-    <typename product<Type1, Type2>::type>& f,                                \
-    const pointPatchField<Type1>& f1,                                         \
-    const pointPatchField<Type2>& f2                                          \
-)                                                                             \
-{}                                                                            \
-                                                                              \
-template                                                                      \
-<                                                                             \
-    class Type,                                                               \
-    class Form,                                                               \
-    class Cmpt,                                                               \
-    int nCmpt                                                                 \
->                                                                             \
-inline void opFunc                                                            \
-(                                                                             \
-    pointPatchField                                                           \
-    <typename product<Type, Form>::type>& f,                                  \
-    const pointPatchField<Type>& f1,                                          \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
-)                                                                             \
-{}                                                                            \
-                                                                              \
-template                                                                      \
-<                                                                             \
-    class Form,                                                               \
-    class Cmpt,                                                               \
-    int nCmpt,                                                                \
-    class Type                                                                \
->                                                                             \
-inline void opFunc                                                            \
-(                                                                             \
-    pointPatchField                                                           \
-    <typename product<Form, Type>::type>& f,                                  \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const pointPatchField<Type>& f1                                           \
-)                                                                             \
+#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+                                                                               \
+template                                                                       \
+<                                                                              \
+    class Type1,                                                               \
+    class Type2                                                                \
+>                                                                              \
+inline void opFunc                                                             \
+(                                                                              \
+    pointPatchField                                                            \
+    <typename product<Type1, Type2>::type>& f,                                 \
+    const pointPatchField<Type1>& f1,                                          \
+    const pointPatchField<Type2>& f2                                           \
+)                                                                              \
+{}                                                                             \
+                                                                               \
+template                                                                       \
+<                                                                              \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    int nCmpt                                                                  \
+>                                                                              \
+inline void opFunc                                                             \
+(                                                                              \
+    pointPatchField                                                            \
+    <typename product<Type, Form>::type>& f,                                   \
+    const pointPatchField<Type>& f1,                                           \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
+)                                                                              \
+{}                                                                             \
+                                                                               \
+template                                                                       \
+<                                                                              \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    int nCmpt,                                                                 \
+    class Type                                                                 \
+>                                                                              \
+inline void opFunc                                                             \
+(                                                                              \
+    pointPatchField                                                            \
+    <typename product<Form, Type>::type>& f,                                   \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
+    const pointPatchField<Type>& f1                                            \
+)                                                                              \
 {}
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C
index 7ed9f70e6d..d6eff92481 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C
@@ -32,16 +32,16 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-#define makePointPatchField(pointPatchTypeField)                              \
-                                                                              \
-defineNamedTemplateTypeNameAndDebug(pointPatchTypeField, 0);                  \
-template<>                                                                    \
-int pointPatchTypeField::disallowGenericPointPatchField                       \
-(                                                                             \
-    debug::debugSwitch("disallowGenericPointPatchField", 0)                   \
-);                                                                            \
-defineTemplateRunTimeSelectionTable(pointPatchTypeField, pointPatch);         \
-defineTemplateRunTimeSelectionTable(pointPatchTypeField, patchMapper);        \
+#define makePointPatchField(pointPatchTypeField)                               \
+                                                                               \
+defineNamedTemplateTypeNameAndDebug(pointPatchTypeField, 0);                   \
+template<>                                                                     \
+int pointPatchTypeField::disallowGenericPointPatchField                        \
+(                                                                              \
+    debug::debugSwitch("disallowGenericPointPatchField", 0)                    \
+);                                                                             \
+defineTemplateRunTimeSelectionTable(pointPatchTypeField, pointPatch);          \
+defineTemplateRunTimeSelectionTable(pointPatchTypeField, patchMapper);         \
 defineTemplateRunTimeSelectionTable(pointPatchTypeField, dictionary);
 
 makePointPatchField(pointPatchScalarField)
diff --git a/src/OpenFOAM/global/constants/dimensionedConstants.H b/src/OpenFOAM/global/constants/dimensionedConstants.H
index 188f755cac..f6d1e6c6f8 100644
--- a/src/OpenFOAM/global/constants/dimensionedConstants.H
+++ b/src/OpenFOAM/global/constants/dimensionedConstants.H
@@ -93,100 +93,100 @@ T dimensionedConstant
 
 
 //- Defined dimensioned constant , lookup as \a Name
-#define defineDimensionedConstant(Group,Switch,Tag,Name)                      \
-    const Foam::dimensionedScalar Switch;                                     \
-    class add##Tag##ToDimensionedConstant                                     \
-    :                                                                         \
-        public Foam::simpleRegIOobject                                        \
-    {                                                                         \
-    public:                                                                   \
-        add##Tag##ToDimensionedConstant(const char* name)                     \
-        :                                                                     \
-            Foam::simpleRegIOobject                                           \
-            (Foam::debug::addDimensionedConstantObject,name)                  \
-        {                                                                     \
-            Foam::dimensionedScalar ds                                        \
-            (                                                                 \
-                Foam::dimensionedConstant                                     \
-                (                                                             \
-                    Group,                                                    \
-                    Name                                                      \
-                )                                                             \
-            );                                                                \
+#define defineDimensionedConstant(Group,Switch,Tag,Name)                       \
+    const Foam::dimensionedScalar Switch;                                      \
+    class add##Tag##ToDimensionedConstant                                      \
+    :                                                                          \
+        public Foam::simpleRegIOobject                                         \
+    {                                                                          \
+    public:                                                                    \
+        add##Tag##ToDimensionedConstant(const char* name)                      \
+        :                                                                      \
+            Foam::simpleRegIOobject                                            \
+            (Foam::debug::addDimensionedConstantObject,name)                   \
+        {                                                                      \
+            Foam::dimensionedScalar ds                                         \
+            (                                                                  \
+                Foam::dimensionedConstant                                      \
+                (                                                              \
+                    Group,                                                     \
+                    Name                                                       \
+                )                                                              \
+            );                                                                 \
             Foam::dimensionedScalar& s = const_cast<Foam::dimensionedScalar&> \
-            (                                                                 \
-                Switch                                                        \
-            );                                                                \
-            s.dimensions().reset(ds.dimensions());                            \
-            s = ds;                                                           \
-        }                                                                     \
-        virtual ~add##Tag##ToDimensionedConstant()                            \
-        {}                                                                    \
-        virtual void readData(Foam::Istream& is)                              \
-        {                                                                     \
-            const_cast<Foam::dimensionedScalar&>(Switch) =                    \
-                Foam::dimensionedConstant                                     \
-                (                                                             \
-                    Group,                                                    \
-                    Name                                                      \
-                );                                                            \
-        }                                                                     \
-        virtual void writeData(Foam::Ostream& os) const                       \
-        {                                                                     \
-            os << Switch;                                                     \
-        }                                                                     \
-    };                                                                        \
+            (                                                                  \
+                Switch                                                         \
+            );                                                                 \
+            s.dimensions().reset(ds.dimensions());                             \
+            s = ds;                                                            \
+        }                                                                      \
+        virtual ~add##Tag##ToDimensionedConstant()                             \
+        {}                                                                     \
+        virtual void readData(Foam::Istream& is)                               \
+        {                                                                      \
+            const_cast<Foam::dimensionedScalar&>(Switch) =                     \
+                Foam::dimensionedConstant                                      \
+                (                                                              \
+                    Group,                                                     \
+                    Name                                                       \
+                );                                                             \
+        }                                                                      \
+        virtual void writeData(Foam::Ostream& os) const                        \
+        {                                                                      \
+            os << Switch;                                                      \
+        }                                                                      \
+    };                                                                         \
     add##Tag##ToDimensionedConstant add##Tag##ToDimensionedConstant_(Name)
 
 
 //- Defined dimensioned constant with default , lookup as \a Name
 #define defineDimensionedConstantWithDefault\
-(Group,Switch,DefaultExpr,Tag,Name)                                           \
-    const Foam::dimensionedScalar Switch;                                     \
-    class add##Tag##ToDimensionedConstantWithDefault                          \
-    :                                                                         \
-        public Foam::simpleRegIOobject                                        \
-    {                                                                         \
-    public:                                                                   \
-        add##Tag##ToDimensionedConstantWithDefault(const char* name)          \
-        :                                                                     \
-            Foam::simpleRegIOobject                                           \
-            (Foam::debug::addDimensionedConstantObject,name)                  \
-        {                                                                     \
-            Foam::dimensionedScalar ds                                        \
-            (                                                                 \
-                Foam::dimensionedConstant                                     \
-                (                                                             \
-                    Group,                                                    \
-                    Name,                                                     \
-                    Foam::dimensionedScalar(Name,DefaultExpr)                 \
-                )                                                             \
-            );                                                                \
+(Group,Switch,DefaultExpr,Tag,Name)                                            \
+    const Foam::dimensionedScalar Switch;                                      \
+    class add##Tag##ToDimensionedConstantWithDefault                           \
+    :                                                                          \
+        public Foam::simpleRegIOobject                                         \
+    {                                                                          \
+    public:                                                                    \
+        add##Tag##ToDimensionedConstantWithDefault(const char* name)           \
+        :                                                                      \
+            Foam::simpleRegIOobject                                            \
+            (Foam::debug::addDimensionedConstantObject,name)                   \
+        {                                                                      \
+            Foam::dimensionedScalar ds                                         \
+            (                                                                  \
+                Foam::dimensionedConstant                                      \
+                (                                                              \
+                    Group,                                                     \
+                    Name,                                                      \
+                    Foam::dimensionedScalar(Name,DefaultExpr)                  \
+                )                                                              \
+            );                                                                 \
             Foam::dimensionedScalar& s = const_cast<Foam::dimensionedScalar&> \
-            (                                                                 \
-                Switch                                                        \
-            );                                                                \
-            s.dimensions().reset(ds.dimensions());                            \
-            s = ds;                                                           \
-        }                                                                     \
-        virtual ~add##Tag##ToDimensionedConstantWithDefault()                 \
-        {}                                                                    \
-        virtual void readData(Foam::Istream& is)                              \
-        {                                                                     \
-            const_cast<Foam::dimensionedScalar&>(Switch) =                    \
-                Foam::dimensionedConstant                                     \
-                (                                                             \
-                    Group,                                                    \
-                    Name,                                                     \
-                    Foam::dimensionedScalar(Name,DefaultExpr)                 \
-                );                                                            \
-        }                                                                     \
-        virtual void writeData(Foam::Ostream& os) const                       \
-        {                                                                     \
-            os << Switch;                                                     \
-        }                                                                     \
-    };                                                                        \
-    add##Tag##ToDimensionedConstantWithDefault                                \
+            (                                                                  \
+                Switch                                                         \
+            );                                                                 \
+            s.dimensions().reset(ds.dimensions());                             \
+            s = ds;                                                            \
+        }                                                                      \
+        virtual ~add##Tag##ToDimensionedConstantWithDefault()                  \
+        {}                                                                     \
+        virtual void readData(Foam::Istream& is)                               \
+        {                                                                      \
+            const_cast<Foam::dimensionedScalar&>(Switch) =                     \
+                Foam::dimensionedConstant                                      \
+                (                                                              \
+                    Group,                                                     \
+                    Name,                                                      \
+                    Foam::dimensionedScalar(Name,DefaultExpr)                  \
+                );                                                             \
+        }                                                                      \
+        virtual void writeData(Foam::Ostream& os) const                        \
+        {                                                                      \
+            os << Switch;                                                      \
+        }                                                                      \
+    };                                                                         \
+    add##Tag##ToDimensionedConstantWithDefault                                 \
         add##Tag##ToDimensionedConstantWithDefault_(Name)
 
 
diff --git a/src/OpenFOAM/global/debug/defineDebugSwitch.H b/src/OpenFOAM/global/debug/defineDebugSwitch.H
index 54731a1b6e..85b60fb95b 100644
--- a/src/OpenFOAM/global/debug/defineDebugSwitch.H
+++ b/src/OpenFOAM/global/debug/defineDebugSwitch.H
@@ -74,64 +74,64 @@ public:
 
 } // End namespace Foam
 
-#define registerTemplateDebugSwitchWithName(Type,Name)                        \
-    template<>                                                                \
-    const Foam::RegisterDebugSwitch<Type>                                     \
+#define registerTemplateDebugSwitchWithName(Type,Name)                         \
+    template<>                                                                 \
+    const Foam::RegisterDebugSwitch<Type>                                      \
         Foam::RegisterDebugSwitch<Type>::registerDebugSwitch(Name)
 
 
 //- Define the debug information, lookup as \a Name
-#define registerDebugSwitchWithName(Type,Tag,Name)                            \
-    class add##Tag##ToDebug                                                   \
-    :                                                                         \
-        public ::Foam::simpleRegIOobject                                      \
-    {                                                                         \
-    public:                                                                   \
-        add##Tag##ToDebug(const char* name)                                   \
-        :                                                                     \
-            ::Foam::simpleRegIOobject(Foam::debug::addDebugObject, name)      \
-        {}                                                                    \
-        virtual ~add##Tag##ToDebug()                                          \
-        {}                                                                    \
-        virtual void readData(Foam::Istream& is)                              \
-        {                                                                     \
-            Type::debug = readLabel(is);                                      \
-        }                                                                     \
-        virtual void writeData(Foam::Ostream& os) const                       \
-        {                                                                     \
-            os << Type::debug;                                                \
-        }                                                                     \
-    };                                                                        \
+#define registerDebugSwitchWithName(Type,Tag,Name)                             \
+    class add##Tag##ToDebug                                                    \
+    :                                                                          \
+        public ::Foam::simpleRegIOobject                                       \
+    {                                                                          \
+    public:                                                                    \
+        add##Tag##ToDebug(const char* name)                                    \
+        :                                                                      \
+            ::Foam::simpleRegIOobject(Foam::debug::addDebugObject, name)       \
+        {}                                                                     \
+        virtual ~add##Tag##ToDebug()                                           \
+        {}                                                                     \
+        virtual void readData(Foam::Istream& is)                               \
+        {                                                                      \
+            Type::debug = readLabel(is);                                       \
+        }                                                                      \
+        virtual void writeData(Foam::Ostream& os) const                        \
+        {                                                                      \
+            os << Type::debug;                                                 \
+        }                                                                      \
+    };                                                                         \
     add##Tag##ToDebug add##Tag##ToDebug_(Name)
 
 
 //- Define the debug information, lookup as \a Name
-#define defineDebugSwitchWithName(Type, Name, DebugSwitch)                    \
+#define defineDebugSwitchWithName(Type, Name, DebugSwitch)                     \
     int Type::debug(::Foam::debug::debugSwitch(Name, DebugSwitch))
 
 //- Define the debug information
-#define defineDebugSwitch(Type, DebugSwitch)                                  \
-    defineDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch);          \
+#define defineDebugSwitch(Type, DebugSwitch)                                   \
+    defineDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch);           \
     registerDebugSwitchWithName(Type, Type, Type::typeName_())
 
 //- Define the debug information for templates, lookup as \a Name
-# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch)           \
-    template<>                                                                \
-    defineDebugSwitchWithName(Type, Name, DebugSwitch);                       \
+# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch)            \
+    template<>                                                                 \
+    defineDebugSwitchWithName(Type, Name, DebugSwitch);                        \
     registerTemplateDebugSwitchWithName(Type, Name)
 //- Define the debug information for templates sub-classes, lookup as \a Name
-# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch)          \
-    template<>                                                                \
-    defineDebugSwitchWithName(Type, Name, DebugSwitch);                       \
+# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch)           \
+    template<>                                                                 \
+    defineDebugSwitchWithName(Type, Name, DebugSwitch);                        \
     registerTemplateDebugSwitchWithName(Type, Name)
 
 //- Define the debug information for templates
 //  Useful with typedefs
-#define defineTemplateDebugSwitch(Type, DebugSwitch)                          \
+#define defineTemplateDebugSwitch(Type, DebugSwitch)                           \
     defineTemplateDebugSwitchWithName(Type, #Type, DebugSwitch)
 
 //- Define the debug information directly for templates
-#define defineNamedTemplateDebugSwitch(Type, DebugSwitch)                     \
+#define defineNamedTemplateDebugSwitch(Type, DebugSwitch)                      \
     defineTemplateDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch)
 
 
@@ -139,11 +139,11 @@ public:
 
 //- Define the debug information for templates
 //  Useful with typedefs
-#define defineTemplate2DebugSwitch(Type, DebugSwitch)                         \
+#define defineTemplate2DebugSwitch(Type, DebugSwitch)                          \
     defineTemplate2DebugSwitchWithName(Type, #Type, DebugSwitch)
 
 //- Define the debug information directly for templates
-#define defineNamedTemplate2DebugSwitch(Type, DebugSwitch)                    \
+#define defineNamedTemplate2DebugSwitch(Type, DebugSwitch)                     \
     defineTemplate2DebugSwitchWithName(Type, Type::typeName_(), DebugSwitch)
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C
index 7d7c8b3cd7..43a3ea05ef 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C
@@ -32,8 +32,8 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-#define defineTableReaderType(dataType)                                       \
-    defineNamedTemplateTypeNameAndDebug(tableReader<dataType >, 0);           \
+#define defineTableReaderType(dataType)                                        \
+    defineNamedTemplateTypeNameAndDebug(tableReader<dataType >, 0);            \
     defineTemplatedRunTimeSelectionTable(tableReader, dictionary, dataType);
 
 defineTableReaderType(scalar);
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H
index a2353fdd22..6ac5d98a61 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H
@@ -35,36 +35,36 @@ SourceFiles
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Only used internally
-#define makeTypeTableReadersTypeName(typeTableReader, dataType)               \
-                                                                              \
+#define makeTypeTableReadersTypeName(typeTableReader, dataType)                \
+                                                                               \
     defineNamedTemplateTypeNameAndDebug(typeTableReader<dataType>, 0)
 
 // Sometimes used externally
-#define makeTableReadersTypeName(typeTableReader)                             \
-                                                                              \
-    makeTypeTableReadersTypeName(typeTableReader, scalar);                    \
-    makeTypeTableReadersTypeName(typeTableReader, vector);                    \
-    makeTypeTableReadersTypeName(typeTableReader, sphericalTensor);           \
-    makeTypeTableReadersTypeName(typeTableReader, symmTensor);                \
+#define makeTableReadersTypeName(typeTableReader)                              \
+                                                                               \
+    makeTypeTableReadersTypeName(typeTableReader, scalar);                     \
+    makeTypeTableReadersTypeName(typeTableReader, vector);                     \
+    makeTypeTableReadersTypeName(typeTableReader, sphericalTensor);            \
+    makeTypeTableReadersTypeName(typeTableReader, symmTensor);                 \
     makeTypeTableReadersTypeName(typeTableReader, tensor)
 
 // Define type info for single dataType template instantiation (eg, vector)
-#define makeTableReaderType(typeTableReader, dataType)                        \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(typeTableReader<dataType>, 0);      \
-    addTemplatedToRunTimeSelectionTable                                       \
-    (                                                                         \
-        tableReader, typeTableReader, dataType, dictionary                    \
+#define makeTableReaderType(typeTableReader, dataType)                         \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(typeTableReader<dataType>, 0);         \
+    addTemplatedToRunTimeSelectionTable                                        \
+    (                                                                          \
+        tableReader, typeTableReader, dataType, dictionary                     \
     )
 
 
 // Define type info for scalar, vector etc. instantiations
-#define makeTableReaders(typeTableReader)                                     \
-                                                                              \
-    makeTableReaderType(typeTableReader, scalar);                             \
-    makeTableReaderType(typeTableReader, vector);                             \
-    makeTableReaderType(typeTableReader, sphericalTensor);                    \
-    makeTableReaderType(typeTableReader, symmTensor);                         \
+#define makeTableReaders(typeTableReader)                                      \
+                                                                               \
+    makeTableReaderType(typeTableReader, scalar);                              \
+    makeTableReaderType(typeTableReader, vector);                              \
+    makeTableReaderType(typeTableReader, sphericalTensor);                     \
+    makeTableReaderType(typeTableReader, symmTensor);                          \
     makeTableReaderType(typeTableReader, tensor)
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
index ef4d65de81..22b740c4de 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
@@ -664,130 +664,130 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeLduMatrix(Type, DType, LUType)                                    \
-                                                                              \
-typedef Foam::LduMatrix<Type, DType, LUType>                                  \
-    ldu##Type##DType##LUType##Matrix;                                         \
-                                                                              \
-defineNamedTemplateTypeNameAndDebug(ldu##Type##DType##LUType##Matrix, 0);     \
-                                                                              \
-                                                                              \
-typedef LduMatrix<Type, DType, LUType>::smoother                              \
-    ldu##Type##DType##LUType##Smoother;                                       \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    ldu##Type##DType##LUType##Smoother,                                       \
-    symMatrix                                                                 \
-);                                                                            \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    ldu##Type##DType##LUType##Smoother,                                       \
-    asymMatrix                                                                \
-);                                                                            \
-                                                                              \
-                                                                              \
-typedef LduMatrix<Type, DType, LUType>::preconditioner                        \
-    ldu##Type##DType##LUType##Preconditioner;                                 \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    ldu##Type##DType##LUType##Preconditioner,                                 \
-    symMatrix                                                                 \
-);                                                                            \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    ldu##Type##DType##LUType##Preconditioner,                                 \
-    asymMatrix                                                                \
-);                                                                            \
-                                                                              \
-                                                                              \
-typedef LduMatrix<Type, DType, LUType>::solver                                \
-    ldu##Type##DType##LUType##Solver;                                         \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    ldu##Type##DType##LUType##Solver,                                         \
-    symMatrix                                                                 \
-);                                                                            \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    ldu##Type##DType##LUType##Solver,                                         \
-    asymMatrix                                                                \
+#define makeLduMatrix(Type, DType, LUType)                                     \
+                                                                               \
+typedef Foam::LduMatrix<Type, DType, LUType>                                   \
+    ldu##Type##DType##LUType##Matrix;                                          \
+                                                                               \
+defineNamedTemplateTypeNameAndDebug(ldu##Type##DType##LUType##Matrix, 0);      \
+                                                                               \
+                                                                               \
+typedef LduMatrix<Type, DType, LUType>::smoother                               \
+    ldu##Type##DType##LUType##Smoother;                                        \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    ldu##Type##DType##LUType##Smoother,                                        \
+    symMatrix                                                                  \
+);                                                                             \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    ldu##Type##DType##LUType##Smoother,                                        \
+    asymMatrix                                                                 \
+);                                                                             \
+                                                                               \
+                                                                               \
+typedef LduMatrix<Type, DType, LUType>::preconditioner                         \
+    ldu##Type##DType##LUType##Preconditioner;                                  \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    ldu##Type##DType##LUType##Preconditioner,                                  \
+    symMatrix                                                                  \
+);                                                                             \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    ldu##Type##DType##LUType##Preconditioner,                                  \
+    asymMatrix                                                                 \
+);                                                                             \
+                                                                               \
+                                                                               \
+typedef LduMatrix<Type, DType, LUType>::solver                                 \
+    ldu##Type##DType##LUType##Solver;                                          \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    ldu##Type##DType##LUType##Solver,                                          \
+    symMatrix                                                                  \
+);                                                                             \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    ldu##Type##DType##LUType##Solver,                                          \
+    asymMatrix                                                                 \
 );
 
 
-#define makeLduPreconditioner(Precon, Type, DType, LUType)                    \
-                                                                              \
-typedef Precon<Type, DType, LUType>                                           \
-    Precon##Type##DType##LUType##Preconditioner;                              \
-defineNamedTemplateTypeNameAndDebug                                           \
-(                                                                             \
-    Precon##Type##DType##LUType##Preconditioner,                              \
-    0                                                                         \
+#define makeLduPreconditioner(Precon, Type, DType, LUType)                     \
+                                                                               \
+typedef Precon<Type, DType, LUType>                                            \
+    Precon##Type##DType##LUType##Preconditioner;                               \
+defineNamedTemplateTypeNameAndDebug                                            \
+(                                                                              \
+    Precon##Type##DType##LUType##Preconditioner,                               \
+    0                                                                          \
 );
 
-#define makeLduSymPreconditioner(Precon, Type, DType, LUType)                 \
-                                                                              \
-LduMatrix<Type, DType, LUType>::preconditioner::                              \
-addsymMatrixConstructorToTable<Precon##Type##DType##LUType##Preconditioner>   \
+#define makeLduSymPreconditioner(Precon, Type, DType, LUType)                  \
+                                                                               \
+LduMatrix<Type, DType, LUType>::preconditioner::                               \
+addsymMatrixConstructorToTable<Precon##Type##DType##LUType##Preconditioner>    \
 add##Precon##Type##DType##LUType##PreconditionerSymMatrixConstructorToTable_;
 
-#define makeLduAsymPreconditioner(Precon, Type, DType, LUType)                \
-                                                                              \
-LduMatrix<Type, DType, LUType>::preconditioner::                              \
-addasymMatrixConstructorToTable<Precon##Type##DType##LUType##Preconditioner>  \
+#define makeLduAsymPreconditioner(Precon, Type, DType, LUType)                 \
+                                                                               \
+LduMatrix<Type, DType, LUType>::preconditioner::                               \
+addasymMatrixConstructorToTable<Precon##Type##DType##LUType##Preconditioner>   \
 add##Precon##Type##DType##LUType##PreconditionerAsymMatrixConstructorToTable_;
 
 
-#define makeLduSmoother(Smoother, Type, DType, LUType)                        \
-                                                                              \
-typedef Smoother<Type, DType, LUType>                                         \
-    Smoother##Type##DType##LUType##Smoother;                                  \
-                                                                              \
-defineNamedTemplateTypeNameAndDebug                                           \
-(                                                                             \
-    Smoother##Type##DType##LUType##Smoother,                                  \
-    0                                                                         \
+#define makeLduSmoother(Smoother, Type, DType, LUType)                         \
+                                                                               \
+typedef Smoother<Type, DType, LUType>                                          \
+    Smoother##Type##DType##LUType##Smoother;                                   \
+                                                                               \
+defineNamedTemplateTypeNameAndDebug                                            \
+(                                                                              \
+    Smoother##Type##DType##LUType##Smoother,                                   \
+    0                                                                          \
 );
 
-#define makeLduSymSmoother(Smoother, Type, DType, LUType)                     \
-                                                                              \
-LduMatrix<Type, DType, LUType>::smoother::                                    \
-    addsymMatrixConstructorToTable<Smoother##Type##DType##LUType##Smoother>   \
+#define makeLduSymSmoother(Smoother, Type, DType, LUType)                      \
+                                                                               \
+LduMatrix<Type, DType, LUType>::smoother::                                     \
+    addsymMatrixConstructorToTable<Smoother##Type##DType##LUType##Smoother>    \
     add##Smoother##Type##DType##LUType##SymMatrixConstructorToTable_;
 
-#define makeLduAsymSmoother(Smoother, Type, DType, LUType)                    \
-                                                                              \
-LduMatrix<Type, DType, LUType>::smoother::                                    \
-    addasymMatrixConstructorToTable<Smoother##Type##DType##LUType##Smoother>  \
+#define makeLduAsymSmoother(Smoother, Type, DType, LUType)                     \
+                                                                               \
+LduMatrix<Type, DType, LUType>::smoother::                                     \
+    addasymMatrixConstructorToTable<Smoother##Type##DType##LUType##Smoother>   \
     add##Smoother##Type##DType##LUType##AsymMatrixConstructorToTable_;
 
 
-#define makeLduSolver(Solver, Type, DType, LUType)                            \
-                                                                              \
-typedef Solver<Type, DType, LUType>                                           \
-    Solver##Type##DType##LUType##Solver;                                      \
-                                                                              \
-defineNamedTemplateTypeNameAndDebug                                           \
-(                                                                             \
-    Solver##Type##DType##LUType##Solver,                                      \
-    0                                                                         \
+#define makeLduSolver(Solver, Type, DType, LUType)                             \
+                                                                               \
+typedef Solver<Type, DType, LUType>                                            \
+    Solver##Type##DType##LUType##Solver;                                       \
+                                                                               \
+defineNamedTemplateTypeNameAndDebug                                            \
+(                                                                              \
+    Solver##Type##DType##LUType##Solver,                                       \
+    0                                                                          \
 );
 
-#define makeLduSymSolver(Solver, Type, DType, LUType)                         \
-                                                                              \
-LduMatrix<Type, DType, LUType>::solver::                                      \
-    addsymMatrixConstructorToTable<Solver##Type##DType##LUType##Solver>       \
+#define makeLduSymSolver(Solver, Type, DType, LUType)                          \
+                                                                               \
+LduMatrix<Type, DType, LUType>::solver::                                       \
+    addsymMatrixConstructorToTable<Solver##Type##DType##LUType##Solver>        \
     add##Solver##Type##DType##LUType##SymMatrixConstructorToTable_;
 
-#define makeLduAsymSolver(Solver, Type, DType, LUType)                        \
-                                                                              \
-LduMatrix<Type, DType, LUType>::solver::                                      \
-    addasymMatrixConstructorToTable<Solver##Type##DType##LUType##Solver>      \
+#define makeLduAsymSolver(Solver, Type, DType, LUType)                         \
+                                                                               \
+LduMatrix<Type, DType, LUType>::solver::                                       \
+    addasymMatrixConstructorToTable<Solver##Type##DType##LUType##Solver>       \
     add##Solver##Type##DType##LUType##AsymMatrixConstructorToTable_;
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
index c24fc9c793..ddb48c2d88 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
@@ -271,21 +271,21 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#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);                        \
+#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);                         \
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C
index 95f1483658..6e7a334138 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C
@@ -28,17 +28,17 @@ License
 #include "TDILUPreconditioner.H"
 #include "fieldTypes.H"
 
-#define makeLduPreconditioners(Type, DType, LUType)                           \
-                                                                              \
-    makeLduPreconditioner(NoPreconditioner, Type, DType, LUType);             \
-    makeLduSymPreconditioner(NoPreconditioner, Type, DType, LUType);          \
-    makeLduAsymPreconditioner(NoPreconditioner, Type, DType, LUType);         \
-                                                                              \
-    makeLduPreconditioner(DiagonalPreconditioner, Type, DType, LUType);       \
-    makeLduSymPreconditioner(DiagonalPreconditioner, Type, DType, LUType);    \
-    makeLduAsymPreconditioner(DiagonalPreconditioner, Type, DType, LUType);   \
-                                                                              \
-    makeLduPreconditioner(TDILUPreconditioner, Type, DType, LUType);          \
+#define makeLduPreconditioners(Type, DType, LUType)                            \
+                                                                               \
+    makeLduPreconditioner(NoPreconditioner, Type, DType, LUType);              \
+    makeLduSymPreconditioner(NoPreconditioner, Type, DType, LUType);           \
+    makeLduAsymPreconditioner(NoPreconditioner, Type, DType, LUType);          \
+                                                                               \
+    makeLduPreconditioner(DiagonalPreconditioner, Type, DType, LUType);        \
+    makeLduSymPreconditioner(DiagonalPreconditioner, Type, DType, LUType);     \
+    makeLduAsymPreconditioner(DiagonalPreconditioner, Type, DType, LUType);    \
+                                                                               \
+    makeLduPreconditioner(TDILUPreconditioner, Type, DType, LUType);           \
     makeLduAsymPreconditioner(TDILUPreconditioner, Type, DType, LUType);
 
 namespace Foam
diff --git a/src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C b/src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C
index c40b0673f8..e830d7f6ca 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C
@@ -26,10 +26,10 @@ License
 #include "TGaussSeidelSmoother.H"
 #include "fieldTypes.H"
 
-#define makeLduSmoothers(Type, DType, LUType)                                 \
-                                                                              \
-    makeLduSmoother(TGaussSeidelSmoother, Type, DType, LUType);               \
-    makeLduSymSmoother(TGaussSeidelSmoother, Type, DType, LUType);            \
+#define makeLduSmoothers(Type, DType, LUType)                                  \
+                                                                               \
+    makeLduSmoother(TGaussSeidelSmoother, Type, DType, LUType);                \
+    makeLduSymSmoother(TGaussSeidelSmoother, Type, DType, LUType);             \
     makeLduAsymSmoother(TGaussSeidelSmoother, Type, DType, LUType);
 
 namespace Foam
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
index 6e36e525b8..df439fc59d 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
@@ -29,23 +29,23 @@ License
 #include "SmoothSolver.H"
 #include "fieldTypes.H"
 
-#define makeLduSolvers(Type, DType, LUType)                                   \
-                                                                              \
-    makeLduSolver(DiagonalSolver, Type, DType, LUType);                       \
-    makeLduSymSolver(DiagonalSolver, Type, DType, LUType);                    \
-    makeLduAsymSolver(DiagonalSolver, Type, DType, LUType);                   \
-                                                                              \
-    makeLduSolver(PCICG, Type, DType, LUType);                                \
-    makeLduSymSolver(PCICG, Type, DType, LUType);                             \
-                                                                              \
-    makeLduSolver(PBiCCCG, Type, DType, LUType);                              \
-    makeLduAsymSolver(PBiCCCG, Type, DType, LUType);                          \
-                                                                              \
-    makeLduSolver(PBiCICG, Type, DType, LUType);                              \
-    makeLduAsymSolver(PBiCICG, Type, DType, LUType);                          \
-                                                                              \
-    makeLduSolver(SmoothSolver, Type, DType, LUType);                         \
-    makeLduSymSolver(SmoothSolver, Type, DType, LUType);                      \
+#define makeLduSolvers(Type, DType, LUType)                                    \
+                                                                               \
+    makeLduSolver(DiagonalSolver, Type, DType, LUType);                        \
+    makeLduSymSolver(DiagonalSolver, Type, DType, LUType);                     \
+    makeLduAsymSolver(DiagonalSolver, Type, DType, LUType);                    \
+                                                                               \
+    makeLduSolver(PCICG, Type, DType, LUType);                                 \
+    makeLduSymSolver(PCICG, Type, DType, LUType);                              \
+                                                                               \
+    makeLduSolver(PBiCCCG, Type, DType, LUType);                               \
+    makeLduAsymSolver(PBiCCCG, Type, DType, LUType);                           \
+                                                                               \
+    makeLduSolver(PBiCICG, Type, DType, LUType);                               \
+    makeLduAsymSolver(PBiCICG, Type, DType, LUType);                           \
+                                                                               \
+    makeLduSolver(SmoothSolver, Type, DType, LUType);                          \
+    makeLduSymSolver(SmoothSolver, Type, DType, LUType);                       \
     makeLduAsymSolver(SmoothSolver, Type, DType, LUType);
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
index 7e3f6e4b91..4422d50f06 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
@@ -205,22 +205,22 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeDataEntry(Type)                                                   \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(DataEntry<Type>, 0);                  \
-                                                                              \
-    defineTemplateRunTimeSelectionTable                                       \
-    (                                                                         \
-        DataEntry<Type>,                                                      \
-        dictionary                                                            \
+#define makeDataEntry(Type)                                                    \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(DataEntry<Type>, 0);                   \
+                                                                               \
+    defineTemplateRunTimeSelectionTable                                        \
+    (                                                                          \
+        DataEntry<Type>,                                                       \
+        dictionary                                                             \
     );
 
 
-#define makeDataEntryType(SS, Type)                                           \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                         \
-                                                                              \
-    DataEntry<Type>::adddictionaryConstructorToTable<SS<Type>>               \
+#define makeDataEntryType(SS, Type)                                            \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                          \
+                                                                               \
+    DataEntry<Type>::adddictionaryConstructorToTable<SS<Type>>                 \
         add##SS##Type##ConstructorToTable_;
 
 
diff --git a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
index 685179d98f..349fdd943a 100644
--- a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
+++ b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
@@ -113,14 +113,14 @@ Description
 // rotates.
 // ----------------------------------------------------------------------------
 
-#define bitMixer(a, b, c)                                                     \
-    {                                                                         \
-        a -= c; a ^= bitRotateLeft(c, 4); c += b;                             \
-        b -= a; b ^= bitRotateLeft(a, 6); a += c;                             \
-        c -= b; c ^= bitRotateLeft(b, 8); b += a;                             \
-        a -= c; a ^= bitRotateLeft(c,16); c += b;                             \
-        b -= a; b ^= bitRotateLeft(a,19); a += c;                             \
-        c -= b; c ^= bitRotateLeft(b, 4); b += a;                             \
+#define bitMixer(a, b, c)                                                      \
+    {                                                                          \
+        a -= c; a ^= bitRotateLeft(c, 4); c += b;                              \
+        b -= a; b ^= bitRotateLeft(a, 6); a += c;                              \
+        c -= b; c ^= bitRotateLeft(b, 8); b += a;                              \
+        a -= c; a ^= bitRotateLeft(c,16); c += b;                              \
+        b -= a; b ^= bitRotateLeft(a,19); a += c;                              \
+        c -= b; c ^= bitRotateLeft(b, 4); b += a;                              \
     }
 
 
@@ -148,15 +148,15 @@ Description
 //  11  8 15 26 3 22 24
 // ----------------------------------------------------------------------------
 
-#define bitMixerFinal(a, b, c)                                                \
-    {                                                                         \
-        c ^= b; c -= bitRotateLeft(b, 14);                                    \
-        a ^= c; a -= bitRotateLeft(c, 11);                                    \
-        b ^= a; b -= bitRotateLeft(a, 25);                                    \
-        c ^= b; c -= bitRotateLeft(b, 16);                                    \
-        a ^= c; a -= bitRotateLeft(c, 4);                                     \
-        b ^= a; b -= bitRotateLeft(a, 14);                                    \
-        c ^= b; c -= bitRotateLeft(b, 24);                                    \
+#define bitMixerFinal(a, b, c)                                                 \
+    {                                                                          \
+        c ^= b; c -= bitRotateLeft(b, 14);                                     \
+        a ^= c; a -= bitRotateLeft(c, 11);                                     \
+        b ^= a; b -= bitRotateLeft(a, 25);                                     \
+        c ^= b; c -= bitRotateLeft(b, 16);                                     \
+        a ^= c; a -= bitRotateLeft(c, 4);                                      \
+        b ^= a; b -= bitRotateLeft(a, 14);                                     \
+        c ^= b; c -= bitRotateLeft(b, 24);                                     \
     }
 
 
diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
index f9caa9b586..cb32fcf676 100644
--- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
+++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
@@ -206,15 +206,15 @@ void Foam::SHA1::processBlock(const void *data, size_t len)
     // rotate left uint32_t by n bits
     #define rol_uint32(x, nbits)  (((x) << (nbits)) | ((x) >> (32 - (nbits))))
 
-    #define M(I) ( tm = x[I & 0x0F] ^ x[(I-14) & 0x0F]                        \
-               ^ x[(I-8) & 0x0F] ^ x[(I-3) & 0x0F]                            \
+    #define M(I) ( tm = x[I & 0x0F] ^ x[(I-14) & 0x0F]                         \
+               ^ x[(I-8) & 0x0F] ^ x[(I-3) & 0x0F]                             \
                , (x[I & 0x0F] = rol_uint32(tm, 1)) )
 
-    #define R(A,B,C,D,E,F,K,M)                                                \
-        do                                                                    \
-        {                                                                     \
-            E += rol_uint32(A, 5) + F(B, C, D) + K + M;                       \
-            B = rol_uint32(B, 30);                                            \
+    #define R(A,B,C,D,E,F,K,M)                                                 \
+        do                                                                     \
+        {                                                                      \
+            E += rol_uint32(A, 5) + F(B, C, D) + K + M;                        \
+            B = rol_uint32(B, 30);                                             \
         } while (0)
 
     while (words < endp)
diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H
index 24c72d24ec..cedeb733be 100644
--- a/src/OpenFOAM/primitives/ops/ops.H
+++ b/src/OpenFOAM/primitives/ops/ops.H
@@ -43,28 +43,28 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define EqOp(opName, op)                                                    \
-                                                                            \
-template<class T1, class T2>                                                \
-class opName##Op2                                                           \
-{                                                                           \
-public:                                                                     \
-                                                                            \
-    void operator()(T1& x, const T2& y) const                               \
-    {                                                                       \
-        op;                                                                 \
-    }                                                                       \
-};                                                                          \
-                                                                            \
-template<class T>                                                           \
-class opName##Op                                                            \
-{                                                                           \
-public:                                                                     \
-                                                                            \
-    void operator()(T& x, const T& y) const                                 \
-    {                                                                       \
-        op;                                                                 \
-    }                                                                       \
+#define EqOp(opName, op)                                                       \
+                                                                               \
+template<class T1, class T2>                                                   \
+class opName##Op2                                                              \
+{                                                                              \
+public:                                                                        \
+                                                                               \
+    void operator()(T1& x, const T2& y) const                                  \
+    {                                                                          \
+        op;                                                                    \
+    }                                                                          \
+};                                                                             \
+                                                                               \
+template<class T>                                                              \
+class opName##Op                                                               \
+{                                                                              \
+public:                                                                        \
+                                                                               \
+    void operator()(T& x, const T& y) const                                    \
+    {                                                                          \
+        op;                                                                    \
+    }                                                                          \
 };
 
 EqOp(eq, x = y)
@@ -96,67 +96,67 @@ EqOp(nopEq, (void)x)
 #define WARNRETURN
 #endif
 
-#define Op(opName, op)                                                        \
-                                                                              \
-    template<class T, class T1, class T2>                                     \
-    class opName##Op3                                                         \
-    {                                                                         \
-    public:                                                                   \
-                                                                              \
-        T operator()(const T1& x, const T2& y) const WARNRETURN               \
-        {                                                                     \
-            return op;                                                        \
-        }                                                                     \
-    };                                                                        \
-                                                                              \
-    template<class T1, class T2>                                              \
-    class opName##Op2                                                         \
-    {                                                                         \
-    public:                                                                   \
-                                                                              \
-        T1 operator()(const T1& x, const T2& y) const WARNRETURN              \
-        {                                                                     \
-            return op;                                                        \
-        }                                                                     \
-    };                                                                        \
-                                                                              \
-    template<class T>                                                         \
-    class opName##Op                                                          \
-    {                                                                         \
-    public:                                                                   \
-                                                                              \
-        T operator()(const T& x, const T& y) const WARNRETURN                 \
-        {                                                                     \
-            return op;                                                        \
-        }                                                                     \
+#define Op(opName, op)                                                         \
+                                                                               \
+    template<class T, class T1, class T2>                                      \
+    class opName##Op3                                                          \
+    {                                                                          \
+    public:                                                                    \
+                                                                               \
+        T operator()(const T1& x, const T2& y) const WARNRETURN                \
+        {                                                                      \
+            return op;                                                         \
+        }                                                                      \
+    };                                                                         \
+                                                                               \
+    template<class T1, class T2>                                               \
+    class opName##Op2                                                          \
+    {                                                                          \
+    public:                                                                    \
+                                                                               \
+        T1 operator()(const T1& x, const T2& y) const WARNRETURN               \
+        {                                                                      \
+            return op;                                                         \
+        }                                                                      \
+    };                                                                         \
+                                                                               \
+    template<class T>                                                          \
+    class opName##Op                                                           \
+    {                                                                          \
+    public:                                                                    \
+                                                                               \
+        T operator()(const T& x, const T& y) const WARNRETURN                  \
+        {                                                                      \
+            return op;                                                         \
+        }                                                                      \
     };
 
 
-#define weightedOp(opName, op)                                                \
-                                                                              \
-    template<class Type, class CombineOp>                                     \
-    class opName##WeightedOp                                                  \
-    {                                                                         \
-        const CombineOp& cop_;                                                \
-                                                                              \
-        public:                                                               \
-                                                                              \
-            opName##WeightedOp(const CombineOp& cop)                          \
-            :                                                                 \
-                cop_(cop)                                                     \
-            {}                                                                \
-                                                                              \
-            void operator()                                                   \
-            (                                                                 \
-                Type& x,                                                      \
-                const label index,                                            \
-                const Type& y,                                                \
-                const scalar weight                                           \
-            ) const                                                           \
-            {                                                                 \
-                cop_(x, op);                                                  \
-            }                                                                 \
-    };                                                                        \
+#define weightedOp(opName, op)                                                 \
+                                                                               \
+    template<class Type, class CombineOp>                                      \
+    class opName##WeightedOp                                                   \
+    {                                                                          \
+        const CombineOp& cop_;                                                 \
+                                                                               \
+        public:                                                                \
+                                                                               \
+            opName##WeightedOp(const CombineOp& cop)                           \
+            :                                                                  \
+                cop_(cop)                                                      \
+            {}                                                                 \
+                                                                               \
+            void operator()                                                    \
+            (                                                                  \
+                Type& x,                                                       \
+                const label index,                                             \
+                const Type& y,                                                 \
+                const scalar weight                                            \
+            ) const                                                            \
+            {                                                                  \
+                cop_(x, op);                                                   \
+            }                                                                  \
+    };                                                                         \
 
 
 Op(sum, x + y)
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
index 33d479fb93..7213aa5be5 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
@@ -44,7 +44,7 @@ License
             dictionary                                                         \
         );                                                                     \
                                                                                \
-        typedef TDModel<BaseModel<Transport>>                                 \
+        typedef TDModel<BaseModel<Transport>>                                  \
             Transport##BaseModel;                                              \
                                                                                \
                                                                                \
@@ -60,7 +60,7 @@ License
         );                                                                     \
                                                                                \
                                                                                \
-        typedef RASModel<EddyDiffusivity<Transport##BaseModel>>               \
+        typedef RASModel<EddyDiffusivity<Transport##BaseModel>>                \
             RAS##Transport##BaseModel;                                         \
                                                                                \
         defineNamedTemplateTypeNameAndDebug(RAS##Transport##BaseModel, 0);     \
@@ -76,7 +76,7 @@ License
         );                                                                     \
                                                                                \
                                                                                \
-        typedef LESModel<EddyDiffusivity<Transport##BaseModel>>               \
+        typedef LESModel<EddyDiffusivity<Transport##BaseModel>>                \
             LES##Transport##BaseModel;                                         \
                                                                                \
         defineNamedTemplateTypeNameAndDebug(LES##Transport##BaseModel, 0);     \
@@ -102,7 +102,7 @@ License
     {                                                                          \
         namespace SType##Models                                                \
         {                                                                      \
-            typedef Type<EddyDiffusivity<BaseModel>> Type##SType##BaseModel;  \
+            typedef Type<EddyDiffusivity<BaseModel>> Type##SType##BaseModel;   \
                                                                                \
             addToRunTimeSelectionTable                                         \
             (                                                                  \
diff --git a/src/fileFormats/sampledSetWriters/writers.C b/src/fileFormats/sampledSetWriters/writers.C
index 4bcc1b39b2..3ffe77bb45 100644
--- a/src/fileFormats/sampledSetWriters/writers.C
+++ b/src/fileFormats/sampledSetWriters/writers.C
@@ -32,8 +32,8 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-#define defineSetWriterType(dataType)                                         \
-    defineNamedTemplateTypeNameAndDebug(writer<dataType >, 0);                \
+#define defineSetWriterType(dataType)                                          \
+    defineNamedTemplateTypeNameAndDebug(writer<dataType >, 0);                 \
     defineTemplatedRunTimeSelectionTable(writer, word, dataType);
 
 defineSetWriterType(scalar);
diff --git a/src/fileFormats/sampledSetWriters/writers.H b/src/fileFormats/sampledSetWriters/writers.H
index 95665cbb64..19ca8be0ff 100644
--- a/src/fileFormats/sampledSetWriters/writers.H
+++ b/src/fileFormats/sampledSetWriters/writers.H
@@ -39,36 +39,36 @@ SourceFiles
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Only used internally
-#define makeTypeSetWritersTypeName(typeWriter, dataType)                      \
-                                                                              \
+#define makeTypeSetWritersTypeName(typeWriter, dataType)                       \
+                                                                               \
     defineNamedTemplateTypeNameAndDebug(typeWriter<dataType>, 0)
 
 // Sometimes used externally
-#define makeSetWritersTypeName(typeWriter)                                    \
-                                                                              \
-    makeTypeSetWritersTypeName(typeWriter, scalar);                           \
-    makeTypeSetWritersTypeName(typeWriter, vector);                           \
-    makeTypeSetWritersTypeName(typeWriter, sphericalTensor);                  \
-    makeTypeSetWritersTypeName(typeWriter, symmTensor);                       \
+#define makeSetWritersTypeName(typeWriter)                                     \
+                                                                               \
+    makeTypeSetWritersTypeName(typeWriter, scalar);                            \
+    makeTypeSetWritersTypeName(typeWriter, vector);                            \
+    makeTypeSetWritersTypeName(typeWriter, sphericalTensor);                   \
+    makeTypeSetWritersTypeName(typeWriter, symmTensor);                        \
     makeTypeSetWritersTypeName(typeWriter, tensor)
 
 // Define type info for single dataType template instantiation (eg, vector)
-#define makeSetWriterType(typeWriter, dataType)                               \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(typeWriter<dataType>, 0);           \
-    addTemplatedToRunTimeSelectionTable                                       \
-    (                                                                         \
-        writer, typeWriter, dataType, word                                    \
+#define makeSetWriterType(typeWriter, dataType)                                \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(typeWriter<dataType>, 0);              \
+    addTemplatedToRunTimeSelectionTable                                        \
+    (                                                                          \
+        writer, typeWriter, dataType, word                                     \
     )
 
 
 // Define type info for scalar, vector etc. instantiations
-#define makeSetWriters(typeWriter)                                            \
-                                                                              \
-    makeSetWriterType(typeWriter, scalar);                                    \
-    makeSetWriterType(typeWriter, vector);                                    \
-    makeSetWriterType(typeWriter, sphericalTensor);                           \
-    makeSetWriterType(typeWriter, symmTensor);                                \
+#define makeSetWriters(typeWriter)                                             \
+                                                                               \
+    makeSetWriterType(typeWriter, scalar);                                     \
+    makeSetWriterType(typeWriter, vector);                                     \
+    makeSetWriterType(typeWriter, sphericalTensor);                            \
+    makeSetWriterType(typeWriter, symmTensor);                                 \
     makeSetWriterType(typeWriter, tensor)
 
 
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/makeFvOption.H b/src/finiteVolume/cfdTools/general/fvOptions/makeFvOption.H
index 79ff887d0f..888225bb7b 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/makeFvOption.H
+++ b/src/finiteVolume/cfdTools/general/fvOptions/makeFvOption.H
@@ -31,17 +31,17 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeFvOption(Option, Type)                                            \
-                                                                              \
-    defineTemplateTypeNameAndDebugWithName                                    \
-    (                                                                         \
-        Foam::fv::Option<Foam::Type>,                                         \
-        #Type#Option,                                                         \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    Foam::fv::option::adddictionaryConstructorToTable                         \
-        <Foam::fv::Option<Foam::Type>>                                       \
+#define makeFvOption(Option, Type)                                             \
+                                                                               \
+    defineTemplateTypeNameAndDebugWithName                                     \
+    (                                                                          \
+        Foam::fv::Option<Foam::Type>,                                          \
+        #Type#Option,                                                          \
+        0                                                                      \
+    );                                                                         \
+                                                                               \
+    Foam::fv::option::adddictionaryConstructorToTable                          \
+        <Foam::fv::Option<Foam::Type>>                                         \
         add##Option##Type##dictionary##ConstructorTooptionTable_
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 1a5d47b3e8..c87a5b1ee0 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -571,123 +571,123 @@ public:
 #endif
 
 
-#define makeFvPatchField(fvPatchTypeField)                                    \
-                                                                              \
-defineNamedTemplateTypeNameAndDebug(fvPatchTypeField, 0);                     \
-template<>                                                                    \
-int fvPatchTypeField::disallowGenericFvPatchField                             \
-(                                                                             \
-    debug::debugSwitch("disallowGenericFvPatchField", 0)                      \
-);                                                                            \
-defineTemplateRunTimeSelectionTable(fvPatchTypeField, patch);                 \
-defineTemplateRunTimeSelectionTable(fvPatchTypeField, patchMapper);           \
+#define makeFvPatchField(fvPatchTypeField)                                     \
+                                                                               \
+defineNamedTemplateTypeNameAndDebug(fvPatchTypeField, 0);                      \
+template<>                                                                     \
+int fvPatchTypeField::disallowGenericFvPatchField                              \
+(                                                                              \
+    debug::debugSwitch("disallowGenericFvPatchField", 0)                       \
+);                                                                             \
+defineTemplateRunTimeSelectionTable(fvPatchTypeField, patch);                  \
+defineTemplateRunTimeSelectionTable(fvPatchTypeField, patchMapper);            \
 defineTemplateRunTimeSelectionTable(fvPatchTypeField, dictionary);
 
 
-#define addToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)   \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        PatchTypeField,                                                       \
-        typePatchTypeField,                                                   \
-        patch                                                                 \
-    );                                                                        \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        PatchTypeField,                                                       \
-        typePatchTypeField,                                                   \
-        patchMapper                                                           \
-    );                                                                        \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        PatchTypeField,                                                       \
-        typePatchTypeField,                                                   \
-        dictionary                                                            \
+#define addToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)    \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        PatchTypeField,                                                        \
+        typePatchTypeField,                                                    \
+        patch                                                                  \
+    );                                                                         \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        PatchTypeField,                                                        \
+        typePatchTypeField,                                                    \
+        patchMapper                                                            \
+    );                                                                         \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        PatchTypeField,                                                        \
+        typePatchTypeField,                                                    \
+        dictionary                                                             \
     );
 
 
 // use with caution
 #define addRemovableToPatchFieldRunTimeSelection\
-(PatchTypeField, typePatchTypeField)                                          \
-                                                                              \
-    addRemovableToRunTimeSelectionTable                                       \
-    (                                                                         \
-        PatchTypeField,                                                       \
-        typePatchTypeField,                                                   \
-        patch                                                                 \
-    );                                                                        \
-    addRemovableToRunTimeSelectionTable                                       \
-    (                                                                         \
-        PatchTypeField,                                                       \
-        typePatchTypeField,                                                   \
-        patchMapper                                                           \
-    );                                                                        \
-    addRemovableToRunTimeSelectionTable                                       \
-    (                                                                         \
-        PatchTypeField,                                                       \
-        typePatchTypeField,                                                   \
-        dictionary                                                            \
+(PatchTypeField, typePatchTypeField)                                           \
+                                                                               \
+    addRemovableToRunTimeSelectionTable                                        \
+    (                                                                          \
+        PatchTypeField,                                                        \
+        typePatchTypeField,                                                    \
+        patch                                                                  \
+    );                                                                         \
+    addRemovableToRunTimeSelectionTable                                        \
+    (                                                                          \
+        PatchTypeField,                                                        \
+        typePatchTypeField,                                                    \
+        patchMapper                                                            \
+    );                                                                         \
+    addRemovableToRunTimeSelectionTable                                        \
+    (                                                                          \
+        PatchTypeField,                                                        \
+        typePatchTypeField,                                                    \
+        dictionary                                                             \
     );
 
 
 // for non-templated patch fields
-#define makePatchTypeField(PatchTypeField, typePatchTypeField)                \
-    defineTypeNameAndDebug(typePatchTypeField, 0);                            \
+#define makePatchTypeField(PatchTypeField, typePatchTypeField)                 \
+    defineTypeNameAndDebug(typePatchTypeField, 0);                             \
     addToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
 
 // for non-templated patch fields - use with caution
-#define makeRemovablePatchTypeField(PatchTypeField, typePatchTypeField)       \
-    defineTypeNameAndDebug(typePatchTypeField, 0);                            \
+#define makeRemovablePatchTypeField(PatchTypeField, typePatchTypeField)        \
+    defineTypeNameAndDebug(typePatchTypeField, 0);                             \
     addRemovableToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
 
 
 // for templated patch fields
-#define makeTemplatePatchTypeField(PatchTypeField, typePatchTypeField)        \
-    defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);               \
+#define makeTemplatePatchTypeField(PatchTypeField, typePatchTypeField)         \
+    defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);                \
     addToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
 
 
-#define makePatchFields(type)                                                 \
-    makeTemplatePatchTypeField                                                \
-    (                                                                         \
-        fvPatchScalarField,                                                   \
-        type##FvPatchScalarField                                              \
-    );                                                                        \
-    makeTemplatePatchTypeField                                                \
-    (                                                                         \
-        fvPatchVectorField,                                                   \
-        type##FvPatchVectorField                                              \
-    );                                                                        \
-    makeTemplatePatchTypeField                                                \
-    (                                                                         \
-        fvPatchSphericalTensorField,                                          \
-        type##FvPatchSphericalTensorField                                     \
-    );                                                                        \
-    makeTemplatePatchTypeField                                                \
-    (                                                                         \
-        fvPatchSymmTensorField,                                               \
-        type##FvPatchSymmTensorField                                          \
-    );                                                                        \
-    makeTemplatePatchTypeField                                                \
-    (                                                                         \
-        fvPatchTensorField,                                                   \
-        type##FvPatchTensorField                                              \
+#define makePatchFields(type)                                                  \
+    makeTemplatePatchTypeField                                                 \
+    (                                                                          \
+        fvPatchScalarField,                                                    \
+        type##FvPatchScalarField                                               \
+    );                                                                         \
+    makeTemplatePatchTypeField                                                 \
+    (                                                                          \
+        fvPatchVectorField,                                                    \
+        type##FvPatchVectorField                                               \
+    );                                                                         \
+    makeTemplatePatchTypeField                                                 \
+    (                                                                          \
+        fvPatchSphericalTensorField,                                           \
+        type##FvPatchSphericalTensorField                                      \
+    );                                                                         \
+    makeTemplatePatchTypeField                                                 \
+    (                                                                          \
+        fvPatchSymmTensorField,                                                \
+        type##FvPatchSymmTensorField                                           \
+    );                                                                         \
+    makeTemplatePatchTypeField                                                 \
+    (                                                                          \
+        fvPatchTensorField,                                                    \
+        type##FvPatchTensorField                                               \
     );
 
 
-#define makePatchFieldsTypeName(type)                                         \
-    defineNamedTemplateTypeNameAndDebug(type##FvPatchScalarField, 0);         \
-    defineNamedTemplateTypeNameAndDebug(type##FvPatchVectorField, 0);         \
+#define makePatchFieldsTypeName(type)                                          \
+    defineNamedTemplateTypeNameAndDebug(type##FvPatchScalarField, 0);          \
+    defineNamedTemplateTypeNameAndDebug(type##FvPatchVectorField, 0);          \
     defineNamedTemplateTypeNameAndDebug(type##FvPatchSphericalTensorField, 0);\
-    defineNamedTemplateTypeNameAndDebug(type##FvPatchSymmTensorField, 0);     \
+    defineNamedTemplateTypeNameAndDebug(type##FvPatchSymmTensorField, 0);      \
     defineNamedTemplateTypeNameAndDebug(type##FvPatchTensorField, 0)
 
 
-#define makePatchTypeFieldTypedefs(type)                                      \
-    typedef type##FvPatchField<scalar> type##FvPatchScalarField;              \
-    typedef type##FvPatchField<vector> type##FvPatchVectorField;              \
-    typedef type##FvPatchField<sphericalTensor>                               \
-        type##FvPatchSphericalTensorField;                                    \
-    typedef type##FvPatchField<symmTensor> type##FvPatchSymmTensorField;      \
+#define makePatchTypeFieldTypedefs(type)                                       \
+    typedef type##FvPatchField<scalar> type##FvPatchScalarField;               \
+    typedef type##FvPatchField<vector> type##FvPatchVectorField;               \
+    typedef type##FvPatchField<sphericalTensor>                                \
+        type##FvPatchSphericalTensorField;                                     \
+    typedef type##FvPatchField<symmTensor> type##FvPatchSymmTensorField;       \
     typedef type##FvPatchField<tensor> type##FvPatchTensorField;
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 9a8019d7ca..0a41d83c1b 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -386,60 +386,60 @@ public:
 #endif
 
 
-#define makeFvsPatchTypeFieldTypeName(type)                                \
-                                                                           \
+#define makeFvsPatchTypeFieldTypeName(type)                                    \
+                                                                               \
 defineNamedTemplateTypeNameAndDebug(type, 0);
 
-#define makeFvsPatchFieldsTypeName(type)                                   \
-                                                                           \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchScalarField);                  \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchVectorField);                  \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchSphericalTensorField);         \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchSymmTensorField);              \
+#define makeFvsPatchFieldsTypeName(type)                                       \
+                                                                               \
+makeFvsPatchTypeFieldTypeName(type##FvsPatchScalarField);                      \
+makeFvsPatchTypeFieldTypeName(type##FvsPatchVectorField);                      \
+makeFvsPatchTypeFieldTypeName(type##FvsPatchSphericalTensorField);             \
+makeFvsPatchTypeFieldTypeName(type##FvsPatchSymmTensorField);                  \
 makeFvsPatchTypeFieldTypeName(type##FvsPatchTensorField);
 
-#define makeFvsPatchTypeField(PatchTypeField, typePatchTypeField)          \
-                                                                           \
-defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);                \
-                                                                           \
-addToRunTimeSelectionTable                                                 \
-(                                                                          \
-    PatchTypeField, typePatchTypeField, patch                              \
-);                                                                         \
-                                                                           \
-addToRunTimeSelectionTable                                                 \
-(                                                                          \
-    PatchTypeField,                                                        \
-    typePatchTypeField,                                                    \
-    patchMapper                                                            \
-);                                                                         \
-                                                                           \
-addToRunTimeSelectionTable                                                 \
-(                                                                          \
-    PatchTypeField, typePatchTypeField, dictionary                         \
+#define makeFvsPatchTypeField(PatchTypeField, typePatchTypeField)              \
+                                                                               \
+defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);                    \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    PatchTypeField, typePatchTypeField, patch                                  \
+);                                                                             \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    PatchTypeField,                                                            \
+    typePatchTypeField,                                                        \
+    patchMapper                                                                \
+);                                                                             \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    PatchTypeField, typePatchTypeField, dictionary                             \
 );
 
 
-#define makeFvsPatchFields(type)                                           \
-                                                                           \
-makeFvsPatchTypeField(fvsPatchScalarField, type##FvsPatchScalarField);     \
-makeFvsPatchTypeField(fvsPatchVectorField, type##FvsPatchVectorField);     \
-makeFvsPatchTypeField                                                      \
-(                                                                          \
-    fvsPatchSphericalTensorField,                                          \
-    type##FvsPatchSphericalTensorField                                     \
-);                                                                         \
+#define makeFvsPatchFields(type)                                               \
+                                                                               \
+makeFvsPatchTypeField(fvsPatchScalarField, type##FvsPatchScalarField);         \
+makeFvsPatchTypeField(fvsPatchVectorField, type##FvsPatchVectorField);         \
+makeFvsPatchTypeField                                                          \
+(                                                                              \
+    fvsPatchSphericalTensorField,                                              \
+    type##FvsPatchSphericalTensorField                                         \
+);                                                                             \
 makeFvsPatchTypeField(fvsPatchSymmTensorField, type##FvsPatchSymmTensorField); \
 makeFvsPatchTypeField(fvsPatchTensorField, type##FvsPatchTensorField);
 
 
-#define makeFvsPatchTypeFieldTypedefs(type)                                \
-                                                                           \
-typedef type##FvsPatchField<scalar> type##FvsPatchScalarField;             \
-typedef type##FvsPatchField<vector> type##FvsPatchVectorField;             \
-typedef type##FvsPatchField<sphericalTensor>                               \
-    type##FvsPatchSphericalTensorField;                                    \
-typedef type##FvsPatchField<symmTensor> type##FvsPatchSymmTensorField;     \
+#define makeFvsPatchTypeFieldTypedefs(type)                                    \
+                                                                               \
+typedef type##FvsPatchField<scalar> type##FvsPatchScalarField;                 \
+typedef type##FvsPatchField<vector> type##FvsPatchVectorField;                 \
+typedef type##FvsPatchField<sphericalTensor>                                   \
+    type##FvsPatchSphericalTensorField;                                        \
+typedef type##FvsPatchField<symmTensor> type##FvsPatchSymmTensorField;         \
 typedef type##FvsPatchField<tensor> type##FvsPatchTensorField;
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
index 63b0cc10d8..727065c940 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
@@ -32,16 +32,16 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-#define makeFvsPatchField(fvsPatchTypeField)                                  \
-                                                                              \
-defineNamedTemplateTypeNameAndDebug(fvsPatchTypeField, 0);                    \
-template<>                                                                    \
-int fvsPatchTypeField::disallowGenericFvsPatchField                           \
-(                                                                             \
-    debug::debugSwitch("disallowGenericFvsPatchField", 0)                     \
-);                                                                            \
-defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patch);                \
-defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patchMapper);          \
+#define makeFvsPatchField(fvsPatchTypeField)                                   \
+                                                                               \
+defineNamedTemplateTypeNameAndDebug(fvsPatchTypeField, 0);                     \
+template<>                                                                     \
+int fvsPatchTypeField::disallowGenericFvsPatchField                            \
+(                                                                              \
+    debug::debugSwitch("disallowGenericFvsPatchField", 0)                      \
+);                                                                             \
+defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patch);                 \
+defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patchMapper);           \
 defineTemplateRunTimeSelectionTable(fvsPatchTypeField, dictionary);
 
 makeFvsPatchField(fvsPatchScalarField)
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
index 999413beac..cab9dfdabd 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
@@ -210,7 +210,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            convectionScheme<Type>::addIstreamConstructorToTable<SS<Type>>    \
+            convectionScheme<Type>::addIstreamConstructorToTable<SS<Type>>     \
                 add##SS##Type##IstreamConstructorToTable_;                     \
         }                                                                      \
     }
@@ -232,7 +232,7 @@ makeFvConvectionTypeScheme(SS, tensor)
         namespace fv                                                           \
         {                                                                      \
             convectionScheme<Type>::                                           \
-                addMultivariateConstructorToTable<SS<Type>>                   \
+                addMultivariateConstructorToTable<SS<Type>>                    \
                 add##SS##Type##MultivariateConstructorToTable_;                \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionSchemes.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionSchemes.C
index e0e34a5b6f..13671ef354 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionSchemes.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionSchemes.C
@@ -41,18 +41,18 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Define the constructor function hash tables
 
-#define makeBaseConvectionScheme(Type)                                        \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    convectionScheme<Type>,                                                   \
-    Istream                                                                   \
-);                                                                            \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    convectionScheme<Type>,                                                   \
-    Multivariate                                                              \
+#define makeBaseConvectionScheme(Type)                                         \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    convectionScheme<Type>,                                                    \
+    Istream                                                                    \
+);                                                                             \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    convectionScheme<Type>,                                                    \
+    Multivariate                                                               \
 );
 
 
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
index 80b20137b8..afb1046833 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
@@ -187,7 +187,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            d2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type>>         \
+            d2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type>>          \
                 add##SS##Type##IstreamConstructorToTable_;                     \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
index d3c738ad16..3b42fef134 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
@@ -263,7 +263,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            ddtScheme<Type>::addIstreamConstructorToTable<SS<Type>>           \
+            ddtScheme<Type>::addIstreamConstructorToTable<SS<Type>>            \
                 add##SS##Type##IstreamConstructorToTable_;                     \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
index a50866b4c5..9ed6164477 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
@@ -171,7 +171,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            divScheme<Type>::addIstreamConstructorToTable<SS<Type>>           \
+            divScheme<Type>::addIstreamConstructorToTable<SS<Type>>            \
                 add##SS##Type##IstreamConstructorToTable_;                     \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
index f65cfa71a1..e9bb230cc6 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
@@ -157,7 +157,7 @@ public:
                 LeastSquaresGrad##TYPE##STENCIL##_;                            \
                                                                                \
             gradScheme<Foam::TYPE>::addIstreamConstructorToTable               \
-                <LeastSquaresGrad<Foam::TYPE, Foam::STENCIL>>                 \
+                <LeastSquaresGrad<Foam::TYPE, Foam::STENCIL>>                  \
                 add##SS##STENCIL##TYPE##IstreamConstructorToTable_;            \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
index d228b51ef2..26522ce52f 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
@@ -195,7 +195,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            gradScheme<Type>::addIstreamConstructorToTable<SS<Type>>          \
+            gradScheme<Type>::addIstreamConstructorToTable<SS<Type>>           \
                 add##SS##Type##IstreamConstructorToTable_;                     \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
index 83a5e46cf5..4c18160f8c 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
@@ -139,21 +139,21 @@ public:
 // Use macros to emulate partial-specialisation of the the Laplacian functions
 // for scalar diffusivity gamma
 
-#define defineFvmLaplacianScalarGamma(Type)                                 \
-                                                                            \
-template<>                                                                  \
-tmp<fvMatrix<Type>> gaussLaplacianScheme<Type, scalar>::fvmLaplacian       \
-(                                                                           \
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>&,              \
-    const GeometricField<Type, fvPatchField, volMesh>&                      \
-);                                                                          \
-                                                                            \
-template<>                                                                  \
-tmp<GeometricField<Type, fvPatchField, volMesh>>                           \
-gaussLaplacianScheme<Type, scalar>::fvcLaplacian                            \
-(                                                                           \
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>&,              \
-    const GeometricField<Type, fvPatchField, volMesh>&                      \
+#define defineFvmLaplacianScalarGamma(Type)                                    \
+                                                                               \
+template<>                                                                     \
+tmp<fvMatrix<Type>> gaussLaplacianScheme<Type, scalar>::fvmLaplacian           \
+(                                                                              \
+    const GeometricField<scalar, fvsPatchField, surfaceMesh>&,                 \
+    const GeometricField<Type, fvPatchField, volMesh>&                         \
+);                                                                             \
+                                                                               \
+template<>                                                                     \
+tmp<GeometricField<Type, fvPatchField, volMesh>>                               \
+gaussLaplacianScheme<Type, scalar>::fvcLaplacian                               \
+(                                                                              \
+    const GeometricField<scalar, fvsPatchField, surfaceMesh>&,                 \
+    const GeometricField<Type, fvPatchField, volMesh>&                         \
 );
 
 
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
index ee10741247..417c3ac19e 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
@@ -30,81 +30,81 @@ License
 
 makeFvLaplacianScheme(gaussLaplacianScheme)
 
-#define declareFvmLaplacianScalarGamma(Type)                                 \
-                                                                             \
-template<>                                                                   \
-Foam::tmp<Foam::fvMatrix<Foam::Type>>                                       \
-Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvmLaplacian       \
-(                                                                            \
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& gamma,         \
-    const GeometricField<Type, fvPatchField, volMesh>& vf                    \
-)                                                                            \
-{                                                                            \
-    const fvMesh& mesh = this->mesh();                                       \
-                                                                             \
-    GeometricField<scalar, fvsPatchField, surfaceMesh> gammaMagSf            \
-    (                                                                        \
-        gamma*mesh.magSf()                                                   \
-    );                                                                       \
-                                                                             \
-    tmp<fvMatrix<Type>> tfvm = fvmLaplacianUncorrected                      \
-    (                                                                        \
-        gammaMagSf,                                                          \
-        this->tsnGradScheme_().deltaCoeffs(vf),                              \
-        vf                                                                   \
-    );                                                                       \
-    fvMatrix<Type>& fvm = tfvm();                                            \
-                                                                             \
-    if (this->tsnGradScheme_().corrected())                                  \
-    {                                                                        \
-        if (mesh.fluxRequired(vf.name()))                                    \
-        {                                                                    \
-            fvm.faceFluxCorrectionPtr() = new                                \
-            GeometricField<Type, fvsPatchField, surfaceMesh>                 \
-            (                                                                \
-                gammaMagSf*this->tsnGradScheme_().correction(vf)             \
-            );                                                               \
-                                                                             \
-            fvm.source() -=                                                  \
-                mesh.V()*                                                    \
-                fvc::div                                                     \
-                (                                                            \
-                    *fvm.faceFluxCorrectionPtr()                             \
-                )().internalField();                                         \
-        }                                                                    \
-        else                                                                 \
-        {                                                                    \
-            fvm.source() -=                                                  \
-                mesh.V()*                                                    \
-                fvc::div                                                     \
-                (                                                            \
-                    gammaMagSf*this->tsnGradScheme_().correction(vf)         \
-                )().internalField();                                         \
-        }                                                                    \
-    }                                                                        \
-                                                                             \
-    return tfvm;                                                             \
-}                                                                            \
-                                                                             \
-                                                                             \
-template<>                                                                   \
+#define declareFvmLaplacianScalarGamma(Type)                                   \
+                                                                               \
+template<>                                                                     \
+Foam::tmp<Foam::fvMatrix<Foam::Type>>                                          \
+Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvmLaplacian         \
+(                                                                              \
+    const GeometricField<scalar, fvsPatchField, surfaceMesh>& gamma,           \
+    const GeometricField<Type, fvPatchField, volMesh>& vf                      \
+)                                                                              \
+{                                                                              \
+    const fvMesh& mesh = this->mesh();                                         \
+                                                                               \
+    GeometricField<scalar, fvsPatchField, surfaceMesh> gammaMagSf              \
+    (                                                                          \
+        gamma*mesh.magSf()                                                     \
+    );                                                                         \
+                                                                               \
+    tmp<fvMatrix<Type>> tfvm = fvmLaplacianUncorrected                         \
+    (                                                                          \
+        gammaMagSf,                                                            \
+        this->tsnGradScheme_().deltaCoeffs(vf),                                \
+        vf                                                                     \
+    );                                                                         \
+    fvMatrix<Type>& fvm = tfvm();                                              \
+                                                                               \
+    if (this->tsnGradScheme_().corrected())                                    \
+    {                                                                          \
+        if (mesh.fluxRequired(vf.name()))                                      \
+        {                                                                      \
+            fvm.faceFluxCorrectionPtr() = new                                  \
+            GeometricField<Type, fvsPatchField, surfaceMesh>                   \
+            (                                                                  \
+                gammaMagSf*this->tsnGradScheme_().correction(vf)               \
+            );                                                                 \
+                                                                               \
+            fvm.source() -=                                                    \
+                mesh.V()*                                                      \
+                fvc::div                                                       \
+                (                                                              \
+                    *fvm.faceFluxCorrectionPtr()                               \
+                )().internalField();                                           \
+        }                                                                      \
+        else                                                                   \
+        {                                                                      \
+            fvm.source() -=                                                    \
+                mesh.V()*                                                      \
+                fvc::div                                                       \
+                (                                                              \
+                    gammaMagSf*this->tsnGradScheme_().correction(vf)           \
+                )().internalField();                                           \
+        }                                                                      \
+    }                                                                          \
+                                                                               \
+    return tfvm;                                                               \
+}                                                                              \
+                                                                               \
+                                                                               \
+template<>                                                                     \
 Foam::tmp<Foam::GeometricField<Foam::Type, Foam::fvPatchField, Foam::volMesh>>\
-Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvcLaplacian       \
-(                                                                            \
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& gamma,         \
-    const GeometricField<Type, fvPatchField, volMesh>& vf                    \
-)                                                                            \
-{                                                                            \
-    const fvMesh& mesh = this->mesh();                                       \
-                                                                             \
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tLaplacian             \
-    (                                                                        \
-        fvc::div(gamma*this->tsnGradScheme_().snGrad(vf)*mesh.magSf())       \
-    );                                                                       \
-                                                                             \
+Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvcLaplacian         \
+(                                                                              \
+    const GeometricField<scalar, fvsPatchField, surfaceMesh>& gamma,           \
+    const GeometricField<Type, fvPatchField, volMesh>& vf                      \
+)                                                                              \
+{                                                                              \
+    const fvMesh& mesh = this->mesh();                                         \
+                                                                               \
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tLaplacian                \
+    (                                                                          \
+        fvc::div(gamma*this->tsnGradScheme_().snGrad(vf)*mesh.magSf())         \
+    );                                                                         \
+                                                                               \
     tLaplacian().rename("laplacian(" + gamma.name() + ',' + vf.name() + ')');\
-                                                                             \
-    return tLaplacian;                                                       \
+                                                                               \
+    return tLaplacian;                                                         \
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
index 4c843f0add..a2c8431731 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
@@ -224,7 +224,7 @@ public:
             typedef SS<Type, GType> SS##Type##GType;                           \
                                                                                \
             laplacianScheme<Type, GType>::                                     \
-                addIstreamConstructorToTable<SS<Type, GType>>                 \
+                addIstreamConstructorToTable<SS<Type, GType>>                  \
                 add##SS##Type##GType##IstreamConstructorToTable_;              \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianSchemes.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianSchemes.C
index 9da25a2cb0..64ff659548 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianSchemes.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianSchemes.C
@@ -38,13 +38,13 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Define the constructor function hash tables
 
-#define makeLaplacianGTypeScheme(Type, GType)                                 \
-    typedef laplacianScheme<Type, GType> laplacianScheme##Type##GType;        \
+#define makeLaplacianGTypeScheme(Type, GType)                                  \
+    typedef laplacianScheme<Type, GType> laplacianScheme##Type##GType;         \
     defineTemplateRunTimeSelectionTable(laplacianScheme##Type##GType, Istream);
 
-#define makeLaplacianScheme(Type)                                             \
-    makeLaplacianGTypeScheme(Type, scalar);                                   \
-    makeLaplacianGTypeScheme(Type, symmTensor);                               \
+#define makeLaplacianScheme(Type)                                              \
+    makeLaplacianGTypeScheme(Type, scalar);                                    \
+    makeLaplacianGTypeScheme(Type, symmTensor);                                \
     makeLaplacianGTypeScheme(Type, tensor);
 
 makeLaplacianScheme(scalar);
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
index a16ac7bd84..1a05f609c5 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
@@ -169,7 +169,7 @@ public:
         namespace fv                                                           \
         {                                                                      \
             snGradScheme<TYPE>::addMeshConstructorToTable                      \
-                <CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL>>           \
+                <CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL>>            \
                 add##SS##STENCIL##TYPE##MeshConstructorToTable_;               \
         }                                                                      \
     }
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
index b107d19e10..ae4dea3a1d 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
@@ -195,7 +195,7 @@ public:
     {                                                                          \
         namespace fv                                                           \
         {                                                                      \
-            snGradScheme<Type>::addMeshConstructorToTable<SS<Type>>           \
+            snGradScheme<Type>::addMeshConstructorToTable<SS<Type>>            \
                 add##SS##Type##MeshConstructorToTable_;                        \
         }                                                                      \
     }
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
index 77d747f871..6ab57ef093 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
@@ -161,7 +161,7 @@ public:
                                                                                \
 defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                              \
                                                                                \
-interpolation<Type>::adddictionaryConstructorToTable<SS<Type>>                \
+interpolation<Type>::adddictionaryConstructorToTable<SS<Type>>                 \
     add##SS##Type##ConstructorToTable_;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
index 4af6cda05c..acdbb0245f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
@@ -148,85 +148,85 @@ public:
 // Add the patch constructor functions to the hash tables
 
 #define makeLimitedSurfaceInterpolationTypeScheme\
-(                                                                             \
-    SS,                                                                       \
-    LIMITER,                                                                  \
-    NVDTVD,                                                                   \
-    LIMFUNC,                                                                  \
-    TYPE                                                                      \
-)                                                                             \
-                                                                              \
-typedef LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>             \
-    LimitedScheme##TYPE##LIMITER##NVDTVD##LIMFUNC##_;                         \
-defineTemplateTypeNameAndDebugWithName                                        \
-    (LimitedScheme##TYPE##LIMITER##NVDTVD##LIMFUNC##_, #SS, 0);               \
-                                                                              \
-surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                   \
-<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                  \
-    add##SS##LIMFUNC##TYPE##MeshConstructorToTable_;                          \
-                                                                              \
-surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable               \
-<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                  \
-    add##SS##LIMFUNC##TYPE##MeshFluxConstructorToTable_;                      \
-                                                                              \
-limitedSurfaceInterpolationScheme<TYPE>::addMeshConstructorToTable            \
-<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                  \
-    add##SS##LIMFUNC##TYPE##MeshConstructorToLimitedTable_;                   \
-                                                                              \
-limitedSurfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable        \
-<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                  \
+(                                                                              \
+    SS,                                                                        \
+    LIMITER,                                                                   \
+    NVDTVD,                                                                    \
+    LIMFUNC,                                                                   \
+    TYPE                                                                       \
+)                                                                              \
+                                                                               \
+typedef LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>              \
+    LimitedScheme##TYPE##LIMITER##NVDTVD##LIMFUNC##_;                          \
+defineTemplateTypeNameAndDebugWithName                                         \
+    (LimitedScheme##TYPE##LIMITER##NVDTVD##LIMFUNC##_, #SS, 0);                \
+                                                                               \
+surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                    \
+<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                    \
+    add##SS##LIMFUNC##TYPE##MeshConstructorToTable_;                           \
+                                                                               \
+surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable                \
+<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                    \
+    add##SS##LIMFUNC##TYPE##MeshFluxConstructorToTable_;                       \
+                                                                               \
+limitedSurfaceInterpolationScheme<TYPE>::addMeshConstructorToTable             \
+<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                    \
+    add##SS##LIMFUNC##TYPE##MeshConstructorToLimitedTable_;                    \
+                                                                               \
+limitedSurfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable         \
+<LimitedScheme<TYPE, LIMITER<NVDTVD>, limitFuncs::LIMFUNC>>                    \
     add##SS##LIMFUNC##TYPE##MeshFluxConstructorToLimitedTable_;
 
 
-#define makeLimitedSurfaceInterpolationScheme(SS, LIMITER)                    \
-                                                                              \
-makeLimitedSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,scalar)    \
-makeLimitedSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,vector)    \
-makeLimitedSurfaceInterpolationTypeScheme                                     \
-(                                                                             \
-    SS,                                                                       \
-    LIMITER,                                                                  \
-    NVDTVD,                                                                   \
-    magSqr,                                                                   \
-    sphericalTensor                                                           \
-)                                                                             \
+#define makeLimitedSurfaceInterpolationScheme(SS, LIMITER)                     \
+                                                                               \
+makeLimitedSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,scalar)     \
+makeLimitedSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,vector)     \
+makeLimitedSurfaceInterpolationTypeScheme                                      \
+(                                                                              \
+    SS,                                                                        \
+    LIMITER,                                                                   \
+    NVDTVD,                                                                    \
+    magSqr,                                                                    \
+    sphericalTensor                                                            \
+)                                                                              \
 makeLimitedSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,symmTensor)\
 makeLimitedSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,tensor)
 
 
-#define makeLimitedVSurfaceInterpolationScheme(SS, LIMITER)                   \
+#define makeLimitedVSurfaceInterpolationScheme(SS, LIMITER)                    \
 makeLimitedSurfaceInterpolationTypeScheme(SS,LIMITER,NVDVTVDV,null,vector)
 
 
 #define makeLLimitedSurfaceInterpolationTypeScheme\
-(                                                                             \
-    SS,                                                                       \
-    LLIMITER,                                                                 \
-    LIMITER,                                                                  \
-    NVDTVD,                                                                   \
-    LIMFUNC,                                                                  \
-    TYPE                                                                      \
-)                                                                             \
-                                                                              \
-typedef LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>  \
-    LimitedScheme##TYPE##LLIMITER##LIMITER##NVDTVD##LIMFUNC##_;               \
-defineTemplateTypeNameAndDebugWithName                                        \
-    (LimitedScheme##TYPE##LLIMITER##LIMITER##NVDTVD##LIMFUNC##_, #SS, 0);     \
-                                                                              \
-surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                   \
-<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>       \
-    add##SS##LIMFUNC##TYPE##MeshConstructorToTable_;                          \
-                                                                              \
-surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable               \
-<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>       \
-    add##SS##LIMFUNC##TYPE##MeshFluxConstructorToTable_;                      \
-                                                                              \
-limitedSurfaceInterpolationScheme<TYPE>::addMeshConstructorToTable            \
-<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>       \
-    add##SS##LIMFUNC##TYPE##MeshConstructorToLimitedTable_;                   \
-                                                                              \
-limitedSurfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable        \
-<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>       \
+(                                                                              \
+    SS,                                                                        \
+    LLIMITER,                                                                  \
+    LIMITER,                                                                   \
+    NVDTVD,                                                                    \
+    LIMFUNC,                                                                   \
+    TYPE                                                                       \
+)                                                                              \
+                                                                               \
+typedef LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>    \
+    LimitedScheme##TYPE##LLIMITER##LIMITER##NVDTVD##LIMFUNC##_;                \
+defineTemplateTypeNameAndDebugWithName                                         \
+    (LimitedScheme##TYPE##LLIMITER##LIMITER##NVDTVD##LIMFUNC##_, #SS, 0);      \
+                                                                               \
+surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                    \
+<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>          \
+    add##SS##LIMFUNC##TYPE##MeshConstructorToTable_;                           \
+                                                                               \
+surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable                \
+<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>          \
+    add##SS##LIMFUNC##TYPE##MeshFluxConstructorToTable_;                       \
+                                                                               \
+limitedSurfaceInterpolationScheme<TYPE>::addMeshConstructorToTable             \
+<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>          \
+    add##SS##LIMFUNC##TYPE##MeshConstructorToLimitedTable_;                    \
+                                                                               \
+limitedSurfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable         \
+<LimitedScheme<TYPE, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>>          \
     add##SS##LIMFUNC##TYPE##MeshFluxConstructorToLimitedTable_;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
index 7b5bc0a06e..f49cbb0554 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
@@ -141,13 +141,13 @@ typedef PhiScheme<TYPE, WEIGHT> Phischeme##WEIGHT_;                            \
 defineTemplateTypeNameAndDebugWithName(Phischeme##WEIGHT_, #SS, 0);            \
                                                                                \
 surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                    \
-<PhiScheme<TYPE, WEIGHT>> add##SS##TYPE##MeshConstructorToTable_;             \
+<PhiScheme<TYPE, WEIGHT>> add##SS##TYPE##MeshConstructorToTable_;              \
                                                                                \
 surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable                \
-<PhiScheme<TYPE, WEIGHT>> add##SS##TYPE##MeshFluxConstructorToTable_;         \
+<PhiScheme<TYPE, WEIGHT>> add##SS##TYPE##MeshFluxConstructorToTable_;          \
                                                                                \
 limitedSurfaceInterpolationScheme<TYPE>::addMeshConstructorToTable             \
-<PhiScheme<TYPE, WEIGHT>> add##SS##TYPE##MeshConstructorToLimitedTable_;      \
+<PhiScheme<TYPE, WEIGHT>> add##SS##TYPE##MeshConstructorToLimitedTable_;       \
                                                                                \
 limitedSurfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable         \
 <PhiScheme<TYPE, WEIGHT>> add##SS##TYPE##MeshFluxConstructorToLimitedTable_;
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
index 758334465b..4f27e1302d 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
@@ -204,17 +204,17 @@ public:
                                                                                \
 defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                              \
                                                                                \
-surfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type>>         \
+surfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type>>          \
     add##SS##Type##MeshConstructorToTable_;                                    \
                                                                                \
-surfaceInterpolationScheme<Type>::addMeshFluxConstructorToTable<SS<Type>>     \
+surfaceInterpolationScheme<Type>::addMeshFluxConstructorToTable<SS<Type>>      \
     add##SS##Type##MeshFluxConstructorToTable_;                                \
                                                                                \
-limitedSurfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type>>  \
+limitedSurfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type>>   \
     add##SS##Type##MeshConstructorToLimitedTable_;                             \
                                                                                \
 limitedSurfaceInterpolationScheme<Type>::                                      \
-    addMeshFluxConstructorToTable<SS<Type>>                                   \
+    addMeshFluxConstructorToTable<SS<Type>>                                    \
     add##SS##Type##MeshFluxConstructorToLimitedTable_;
 
 #define makelimitedSurfaceInterpolationScheme(SS)                              \
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationSchemes.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationSchemes.C
index e2d9325ca4..306b21de79 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationSchemes.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationSchemes.C
@@ -32,24 +32,24 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeBaseLimitedSurfaceInterpolationScheme(Type)                       \
-                                                                              \
-defineNamedTemplateTypeNameAndDebug                                           \
-(                                                                             \
-    limitedSurfaceInterpolationScheme<Type>,                                  \
-    0                                                                         \
-);                                                                            \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    limitedSurfaceInterpolationScheme<Type>,                                  \
-    Mesh                                                                      \
-);                                                                            \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    limitedSurfaceInterpolationScheme<Type>,                                  \
-    MeshFlux                                                                  \
+#define makeBaseLimitedSurfaceInterpolationScheme(Type)                        \
+                                                                               \
+defineNamedTemplateTypeNameAndDebug                                            \
+(                                                                              \
+    limitedSurfaceInterpolationScheme<Type>,                                   \
+    0                                                                          \
+);                                                                             \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    limitedSurfaceInterpolationScheme<Type>,                                   \
+    Mesh                                                                       \
+);                                                                             \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    limitedSurfaceInterpolationScheme<Type>,                                   \
+    MeshFlux                                                                   \
 );
 
 makeBaseLimitedSurfaceInterpolationScheme(scalar)
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
index 9673da45bb..1060971f3a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
@@ -181,7 +181,7 @@ multivariateSurfaceInterpolationScheme<scalar>::addIstreamConstructorToTable   \
 typedef multivariateScheme                                                     \
 <                                                                              \
     scalar,                                                                    \
-    LimitedScheme<scalar, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>     \
+    LimitedScheme<scalar, LLIMITER<LIMITER<NVDTVD>>, limitFuncs::LIMFUNC>      \
 >                                                                              \
     multivariateScheme##LLIMITER##LIMITER##NVDTVD##LIMFUNC##_;                 \
 defineTemplateTypeNameAndDebugWithName                                         \
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
index 1b9e23c57c..2279b55e1a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
@@ -212,7 +212,7 @@ public:
 defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                              \
                                                                                \
 multivariateSurfaceInterpolationScheme<Type>::                                 \
-addIstreamConstructorToTable<SS<Type>>                                        \
+addIstreamConstructorToTable<SS<Type>>                                         \
     add##SS##Type##ConstructorToTable_;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
index bc5d3bb766..e094ab9a74 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
@@ -148,37 +148,37 @@ public:
 // Add the patch constructor functions to the hash tables
 
 #define makeCentredFitSurfaceInterpolationTypeScheme\
-(                                                                             \
-    SS,                                                                       \
-    POLYNOMIAL,                                                               \
-    STENCIL,                                                                  \
-    TYPE                                                                      \
-)                                                                             \
-                                                                              \
-typedef CentredFitScheme<TYPE, POLYNOMIAL, STENCIL>                           \
-    CentredFitScheme##TYPE##POLYNOMIAL##STENCIL##_;                           \
-defineTemplateTypeNameAndDebugWithName                                        \
-    (CentredFitScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0);                 \
-                                                                              \
-surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                   \
-<CentredFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                \
-    add##SS##STENCIL##TYPE##MeshConstructorToTable_;                          \
-                                                                              \
-surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable               \
-<CentredFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                \
+(                                                                              \
+    SS,                                                                        \
+    POLYNOMIAL,                                                                \
+    STENCIL,                                                                   \
+    TYPE                                                                       \
+)                                                                              \
+                                                                               \
+typedef CentredFitScheme<TYPE, POLYNOMIAL, STENCIL>                            \
+    CentredFitScheme##TYPE##POLYNOMIAL##STENCIL##_;                            \
+defineTemplateTypeNameAndDebugWithName                                         \
+    (CentredFitScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0);                  \
+                                                                               \
+surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                    \
+<CentredFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                  \
+    add##SS##STENCIL##TYPE##MeshConstructorToTable_;                           \
+                                                                               \
+surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable                \
+<CentredFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                  \
     add##SS##STENCIL##TYPE##MeshFluxConstructorToTable_;
 
-#define makeCentredFitSurfaceInterpolationScheme(SS, POLYNOMIAL, STENCIL)     \
-                                                                              \
-makeCentredFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,scalar)    \
-makeCentredFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,vector)    \
-makeCentredFitSurfaceInterpolationTypeScheme                                  \
-(                                                                             \
-    SS,                                                                       \
-    POLYNOMIAL,                                                               \
-    STENCIL,                                                                  \
-    sphericalTensor                                                           \
-)                                                                             \
+#define makeCentredFitSurfaceInterpolationScheme(SS, POLYNOMIAL, STENCIL)      \
+                                                                               \
+makeCentredFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,scalar)     \
+makeCentredFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,vector)     \
+makeCentredFitSurfaceInterpolationTypeScheme                                   \
+(                                                                              \
+    SS,                                                                        \
+    POLYNOMIAL,                                                                \
+    STENCIL,                                                                   \
+    sphericalTensor                                                            \
+)                                                                              \
 makeCentredFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor)\
 makeCentredFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,tensor)
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
index c74797b0a6..6732a066ff 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
@@ -155,44 +155,44 @@ public:
 // Add the patch constructor functions to the hash tables
 
 #define makePureUpwindFitSurfaceInterpolationTypeScheme\
-(                                                                             \
-    SS,                                                                       \
-    POLYNOMIAL,                                                               \
-    STENCIL,                                                                  \
-    TYPE                                                                      \
-)                                                                             \
-                                                                              \
-typedef PureUpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>                        \
-    PureUpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_;                        \
-defineTemplateTypeNameAndDebugWithName                                        \
-    (PureUpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0);              \
-                                                                              \
-surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                   \
-<PureUpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                             \
-    add##SS##STENCIL##TYPE##MeshConstructorToTable_;                          \
-                                                                              \
-surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable               \
-<PureUpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                             \
+(                                                                              \
+    SS,                                                                        \
+    POLYNOMIAL,                                                                \
+    STENCIL,                                                                   \
+    TYPE                                                                       \
+)                                                                              \
+                                                                               \
+typedef PureUpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>                         \
+    PureUpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_;                         \
+defineTemplateTypeNameAndDebugWithName                                         \
+    (PureUpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0);               \
+                                                                               \
+surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                    \
+<PureUpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                               \
+    add##SS##STENCIL##TYPE##MeshConstructorToTable_;                           \
+                                                                               \
+surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable                \
+<PureUpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                               \
     add##SS##STENCIL##TYPE##MeshFluxConstructorToTable_;
 
-#define makePureUpwindFitSurfaceInterpolationScheme(SS, POLYNOMIAL, STENCIL)  \
-                                                                              \
+#define makePureUpwindFitSurfaceInterpolationScheme(SS, POLYNOMIAL, STENCIL)   \
+                                                                               \
 makePureUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,scalar) \
 makePureUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,vector) \
-makePureUpwindFitSurfaceInterpolationTypeScheme                               \
-(                                                                             \
-    SS,                                                                       \
-    POLYNOMIAL,                                                               \
-    STENCIL,                                                                  \
-    sphericalTensor                                                           \
-)                                                                             \
-makePureUpwindFitSurfaceInterpolationTypeScheme                               \
-(                                                                             \
-    SS,                                                                       \
-    POLYNOMIAL,                                                               \
-    STENCIL,                                                                  \
-    symmTensor                                                                \
-)                                                                             \
+makePureUpwindFitSurfaceInterpolationTypeScheme                                \
+(                                                                              \
+    SS,                                                                        \
+    POLYNOMIAL,                                                                \
+    STENCIL,                                                                   \
+    sphericalTensor                                                            \
+)                                                                              \
+makePureUpwindFitSurfaceInterpolationTypeScheme                                \
+(                                                                              \
+    SS,                                                                        \
+    POLYNOMIAL,                                                                \
+    STENCIL,                                                                   \
+    symmTensor                                                                 \
+)                                                                              \
 makePureUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,tensor)
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
index f56b2790d0..6f5ddf57e6 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
@@ -159,37 +159,37 @@ public:
 // Add the patch constructor functions to the hash tables
 
 #define makeUpwindFitSurfaceInterpolationTypeScheme\
-(                                                                             \
-    SS,                                                                       \
-    POLYNOMIAL,                                                               \
-    STENCIL,                                                                  \
-    TYPE                                                                      \
-)                                                                             \
-                                                                              \
-typedef UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>                            \
-    UpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_;                            \
-defineTemplateTypeNameAndDebugWithName                                        \
-    (UpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0);                  \
-                                                                              \
-surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                   \
-<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                 \
-    add##SS##STENCIL##TYPE##MeshConstructorToTable_;                          \
-                                                                              \
-surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable               \
-<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                 \
+(                                                                              \
+    SS,                                                                        \
+    POLYNOMIAL,                                                                \
+    STENCIL,                                                                   \
+    TYPE                                                                       \
+)                                                                              \
+                                                                               \
+typedef UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>                             \
+    UpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_;                             \
+defineTemplateTypeNameAndDebugWithName                                         \
+    (UpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0);                   \
+                                                                               \
+surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                    \
+<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                   \
+    add##SS##STENCIL##TYPE##MeshConstructorToTable_;                           \
+                                                                               \
+surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable                \
+<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>>                                   \
     add##SS##STENCIL##TYPE##MeshFluxConstructorToTable_;
 
-#define makeUpwindFitSurfaceInterpolationScheme(SS, POLYNOMIAL, STENCIL)      \
-                                                                              \
-makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,scalar)     \
-makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,vector)     \
-makeUpwindFitSurfaceInterpolationTypeScheme                                   \
-(                                                                             \
-    SS,                                                                       \
-    POLYNOMIAL,                                                               \
-    STENCIL,                                                                  \
-    sphericalTensor                                                           \
-)                                                                             \
+#define makeUpwindFitSurfaceInterpolationScheme(SS, POLYNOMIAL, STENCIL)       \
+                                                                               \
+makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,scalar)      \
+makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,vector)      \
+makeUpwindFitSurfaceInterpolationTypeScheme                                    \
+(                                                                              \
+    SS,                                                                        \
+    POLYNOMIAL,                                                                \
+    STENCIL,                                                                   \
+    sphericalTensor                                                            \
+)                                                                              \
 makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor) \
 makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,tensor)
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
index 547a53b58a..5f1e59f716 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
@@ -213,10 +213,10 @@ public:
                                                                                \
 defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                              \
                                                                                \
-surfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type>>         \
+surfaceInterpolationScheme<Type>::addMeshConstructorToTable<SS<Type>>          \
     add##SS##Type##MeshConstructorToTable_;                                    \
                                                                                \
-surfaceInterpolationScheme<Type>::addMeshFluxConstructorToTable<SS<Type>>     \
+surfaceInterpolationScheme<Type>::addMeshFluxConstructorToTable<SS<Type>>      \
     add##SS##Type##MeshFluxConstructorToTable_;
 
 #define makeSurfaceInterpolationScheme(SS)                                     \
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
index fdbc5a977a..9c0da30cb8 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
@@ -32,20 +32,20 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeBaseSurfaceInterpolationScheme(Type)                              \
-                                                                              \
-defineNamedTemplateTypeNameAndDebug(surfaceInterpolationScheme<Type>, 0);     \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    surfaceInterpolationScheme<Type>,                                         \
-    Mesh                                                                      \
-);                                                                            \
-                                                                              \
-defineTemplateRunTimeSelectionTable                                           \
-(                                                                             \
-    surfaceInterpolationScheme<Type>,                                         \
-    MeshFlux                                                                  \
+#define makeBaseSurfaceInterpolationScheme(Type)                               \
+                                                                               \
+defineNamedTemplateTypeNameAndDebug(surfaceInterpolationScheme<Type>, 0);      \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    surfaceInterpolationScheme<Type>,                                          \
+    Mesh                                                                       \
+);                                                                             \
+                                                                               \
+defineTemplateRunTimeSelectionTable                                            \
+(                                                                              \
+    surfaceInterpolationScheme<Type>,                                          \
+    MeshFlux                                                                   \
 );
 
 makeBaseSurfaceInterpolationScheme(scalar)
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
index d3f228fd0c..391ef249bb 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
@@ -151,27 +151,27 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeBinaryCollisionModel(CloudType)                                   \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        BinaryCollisionModel<CloudType>,                                      \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    defineTemplateRunTimeSelectionTable                                       \
-    (                                                                         \
-        BinaryCollisionModel<CloudType>,                                      \
-        dictionary                                                            \
+#define makeBinaryCollisionModel(CloudType)                                    \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        BinaryCollisionModel<CloudType>,                                       \
+        0                                                                      \
+    );                                                                         \
+                                                                               \
+    defineTemplateRunTimeSelectionTable                                        \
+    (                                                                          \
+        BinaryCollisionModel<CloudType>,                                       \
+        dictionary                                                             \
     );
 
 
-#define makeBinaryCollisionModelType(SS, CloudType)                           \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
-                                                                              \
-    BinaryCollisionModel<CloudType>::                                         \
-        adddictionaryConstructorToTable<SS<CloudType>>                       \
+#define makeBinaryCollisionModelType(SS, CloudType)                            \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                     \
+                                                                               \
+    BinaryCollisionModel<CloudType>::                                          \
+        adddictionaryConstructorToTable<SS<CloudType>>                         \
             add##SS##CloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
index 86f2c7893c..847d8b16c0 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
@@ -141,23 +141,23 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeInflowBoundaryModel(CloudType)                                    \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(InflowBoundaryModel<CloudType>, 0);   \
-                                                                              \
-    defineTemplateRunTimeSelectionTable                                       \
-    (                                                                         \
-        InflowBoundaryModel<CloudType>,                                       \
-        dictionary                                                            \
+#define makeInflowBoundaryModel(CloudType)                                     \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(InflowBoundaryModel<CloudType>, 0);    \
+                                                                               \
+    defineTemplateRunTimeSelectionTable                                        \
+    (                                                                          \
+        InflowBoundaryModel<CloudType>,                                        \
+        dictionary                                                             \
     );
 
 
-#define makeInflowBoundaryModelType(SS, CloudType)                            \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
-                                                                              \
-    InflowBoundaryModel<CloudType>::                                          \
-        adddictionaryConstructorToTable<SS<CloudType>>                       \
+#define makeInflowBoundaryModelType(SS, CloudType)                             \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                     \
+                                                                               \
+    InflowBoundaryModel<CloudType>::                                           \
+        adddictionaryConstructorToTable<SS<CloudType>>                         \
             add##SS##CloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index 58e0f77db1..d564c48a63 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
@@ -141,23 +141,23 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeWallInteractionModel(CloudType)                                   \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(WallInteractionModel<CloudType>, 0);  \
-                                                                              \
-    defineTemplateRunTimeSelectionTable                                       \
-    (                                                                         \
-        WallInteractionModel<CloudType>,                                      \
-        dictionary                                                            \
+#define makeWallInteractionModel(CloudType)                                    \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(WallInteractionModel<CloudType>, 0);   \
+                                                                               \
+    defineTemplateRunTimeSelectionTable                                        \
+    (                                                                          \
+        WallInteractionModel<CloudType>,                                       \
+        dictionary                                                             \
     );
 
 
-#define makeWallInteractionModelType(SS, CloudType)                           \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                    \
-                                                                              \
-    WallInteractionModel<CloudType>::                                         \
-        adddictionaryConstructorToTable<SS<CloudType>>                       \
+#define makeWallInteractionModelType(SS, CloudType)                            \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0);                     \
+                                                                               \
+    WallInteractionModel<CloudType>::                                          \
+        adddictionaryConstructorToTable<SS<CloudType>>                         \
             add##SS##CloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/basic/particle/particleMacros.H b/src/lagrangian/basic/particle/particleMacros.H
index 2e46f2a747..bb78819302 100644
--- a/src/lagrangian/basic/particle/particleMacros.H
+++ b/src/lagrangian/basic/particle/particleMacros.H
@@ -39,23 +39,23 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define DefinePropertyList(str)                                               \
-                                                                              \
-    static string propertyList_;                                              \
-                                                                              \
-    static string propertyList()                                              \
-    {                                                                         \
-        return str;                                                           \
+#define DefinePropertyList(str)                                                \
+                                                                               \
+    static string propertyList_;                                               \
+                                                                               \
+    static string propertyList()                                               \
+    {                                                                          \
+        return str;                                                            \
     }
 
 
-#define AddToPropertyList(ParcelType, str)                                    \
-                                                                              \
-    static string propertyList_;                                              \
-                                                                              \
-    static string propertyList()                                              \
-    {                                                                         \
-        return ParcelType::propertyList() + str;                              \
+#define AddToPropertyList(ParcelType, str)                                     \
+                                                                               \
+    static string propertyList_;                                               \
+                                                                               \
+    static string propertyList()                                               \
+    {                                                                          \
+        return ParcelType::propertyList() + str;                               \
     }
 
 
diff --git a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
index 44b67217dd..0972e9670b 100644
--- a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
+++ b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
@@ -37,16 +37,16 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeCoalParcelSurfaceReactionModels(CloudType)                        \
-                                                                              \
-    makeSurfaceReactionModelType(COxidationDiffusionLimitedRate, CloudType);  \
-    makeSurfaceReactionModelType                                              \
-    (                                                                         \
-        COxidationKineticDiffusionLimitedRate,                                \
-        CloudType                                                             \
-    );                                                                        \
-    makeSurfaceReactionModelType(COxidationIntrinsicRate, CloudType);         \
-    makeSurfaceReactionModelType(COxidationHurtMitchell, CloudType);          \
+#define makeCoalParcelSurfaceReactionModels(CloudType)                         \
+                                                                               \
+    makeSurfaceReactionModelType(COxidationDiffusionLimitedRate, CloudType);   \
+    makeSurfaceReactionModelType                                               \
+    (                                                                          \
+        COxidationKineticDiffusionLimitedRate,                                 \
+        CloudType                                                              \
+    );                                                                         \
+    makeSurfaceReactionModelType(COxidationIntrinsicRate, CloudType);          \
+    makeSurfaceReactionModelType(COxidationHurtMitchell, CloudType);           \
     makeSurfaceReactionModelType(COxidationMurphyShaddix, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
index 4684f908cb..c787220ab2 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
@@ -190,22 +190,22 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeIntegrationScheme(Type)                                           \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(IntegrationScheme<Type>, 0);          \
-                                                                              \
-    defineTemplateRunTimeSelectionTable                                       \
-    (                                                                         \
-        IntegrationScheme<Type>,                                              \
-        dictionary                                                            \
+#define makeIntegrationScheme(Type)                                            \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(IntegrationScheme<Type>, 0);           \
+                                                                               \
+    defineTemplateRunTimeSelectionTable                                        \
+    (                                                                          \
+        IntegrationScheme<Type>,                                               \
+        dictionary                                                             \
     );
 
 
-#define makeIntegrationSchemeType(SS, Type)                                   \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                         \
-                                                                              \
-    IntegrationScheme<Type>::adddictionaryConstructorToTable<SS<Type>>       \
+#define makeIntegrationSchemeType(SS, Type)                                    \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                          \
+                                                                               \
+    IntegrationScheme<Type>::adddictionaryConstructorToTable<SS<Type>>         \
         add##SS##Type##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H
index 61011a66a6..2700ddbe59 100644
--- a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H
@@ -34,11 +34,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeMPPICParcelDampingModels(CloudType)                               \
-                                                                              \
-    makeDampingModel(CloudType);                                              \
-                                                                              \
-    makeDampingModelType(NoDamping, CloudType);                               \
+#define makeMPPICParcelDampingModels(CloudType)                                \
+                                                                               \
+    makeDampingModel(CloudType);                                               \
+                                                                               \
+    makeDampingModelType(NoDamping, CloudType);                                \
     makeDampingModelType(Relaxation, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H
index 0780a03d6b..71fcd910d1 100644
--- a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H
@@ -33,11 +33,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeMPPICParcelIsotropyModels(CloudType)                              \
-                                                                              \
-    makeIsotropyModel(CloudType);                                             \
-                                                                              \
-    makeIsotropyModelType(NoIsotropy, CloudType);                             \
+#define makeMPPICParcelIsotropyModels(CloudType)                               \
+                                                                               \
+    makeIsotropyModel(CloudType);                                              \
+                                                                               \
+    makeIsotropyModelType(NoIsotropy, CloudType);                              \
     makeIsotropyModelType(Stochastic, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H
index cdcbf17aa8..d8d1346833 100644
--- a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H
@@ -34,12 +34,12 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeMPPICParcelPackingModels(CloudType)                               \
-                                                                              \
-    makePackingModel(CloudType);                                              \
-                                                                              \
-    makePackingModelType(NoPacking, CloudType);                               \
-    makePackingModelType(Explicit, CloudType);                                \
+#define makeMPPICParcelPackingModels(CloudType)                                \
+                                                                               \
+    makePackingModel(CloudType);                                               \
+                                                                               \
+    makePackingModelType(NoPacking, CloudType);                                \
+    makePackingModelType(Explicit, CloudType);                                 \
     makePackingModelType(Implicit, CloudType);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
index 783878f480..0c4fadfcae 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
@@ -38,16 +38,16 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelCloudFunctionObjects(CloudType)                             \
-                                                                              \
-    makeCloudFunctionObject(CloudType);                                       \
-                                                                              \
-    makeCloudFunctionObjectType(FacePostProcessing, CloudType);               \
-    makeCloudFunctionObjectType(ParticleCollector, CloudType);                \
-    makeCloudFunctionObjectType(ParticleErosion, CloudType);                  \
-    makeCloudFunctionObjectType(ParticleTracks, CloudType);                   \
-    makeCloudFunctionObjectType(ParticleTrap, CloudType);                     \
-    makeCloudFunctionObjectType(PatchPostProcessing, CloudType);              \
+#define makeParcelCloudFunctionObjects(CloudType)                              \
+                                                                               \
+    makeCloudFunctionObject(CloudType);                                        \
+                                                                               \
+    makeCloudFunctionObjectType(FacePostProcessing, CloudType);                \
+    makeCloudFunctionObjectType(ParticleCollector, CloudType);                 \
+    makeCloudFunctionObjectType(ParticleErosion, CloudType);                   \
+    makeCloudFunctionObjectType(ParticleTracks, CloudType);                    \
+    makeCloudFunctionObjectType(ParticleTrap, CloudType);                      \
+    makeCloudFunctionObjectType(PatchPostProcessing, CloudType);               \
     makeCloudFunctionObjectType(VoidFraction, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
index ae5688c765..5dda39e579 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
@@ -38,17 +38,17 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelCollisionModels(CloudType)                                  \
-                                                                              \
-    makeCollisionModel(CloudType);                                            \
-    makeCollisionModelType(NoCollision, CloudType);                           \
-    makeCollisionModelType(PairCollision, CloudType);                         \
-                                                                              \
-    makePairModel(CloudType);                                                 \
-    makePairModelType(PairSpringSliderDashpot, CloudType);                    \
-                                                                              \
-    makeWallModel(CloudType);                                                 \
-    makeWallModelType(WallSpringSliderDashpot, CloudType);                    \
+#define makeParcelCollisionModels(CloudType)                                   \
+                                                                               \
+    makeCollisionModel(CloudType);                                             \
+    makeCollisionModelType(NoCollision, CloudType);                            \
+    makeCollisionModelType(PairCollision, CloudType);                          \
+                                                                               \
+    makePairModel(CloudType);                                                  \
+    makePairModelType(PairSpringSliderDashpot, CloudType);                     \
+                                                                               \
+    makeWallModel(CloudType);                                                  \
+    makeWallModelType(WallSpringSliderDashpot, CloudType);                     \
     makeWallModelType(WallLocalSpringSliderDashpot, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
index fac015c7e8..f14616ddd6 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
@@ -32,9 +32,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelDispersionModels(CloudType)                                 \
-                                                                              \
-    makeDispersionModel(CloudType);                                           \
+#define makeParcelDispersionModels(CloudType)                                  \
+                                                                               \
+    makeDispersionModel(CloudType);                                            \
     makeDispersionModelType(NoDispersion, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
index 47486897ba..35c60580e7 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
@@ -46,21 +46,21 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelForces(CloudType)                                           \
-                                                                              \
-    makeParticleForceModel(CloudType);                                        \
-    makeParticleForceModelType(SphereDragForce, CloudType);                   \
-    makeParticleForceModelType(NonSphereDragForce, CloudType);                \
-    makeParticleForceModelType(WenYuDragForce, CloudType);                    \
-    makeParticleForceModelType(ErgunWenYuDragForce, CloudType);               \
-    makeParticleForceModelType(PlessisMasliyahDragForce, CloudType);          \
-    makeParticleForceModelType(SaffmanMeiLiftForce, CloudType);               \
-    makeParticleForceModelType(TomiyamaLiftForce, CloudType);                 \
-    makeParticleForceModelType(GravityForce, CloudType);                      \
-    makeParticleForceModelType(NonInertialFrameForce, CloudType);             \
-    makeParticleForceModelType(ParamagneticForce, CloudType);                 \
-    makeParticleForceModelType(PressureGradientForce, CloudType);             \
-    makeParticleForceModelType(SRFForce, CloudType);                          \
+#define makeParcelForces(CloudType)                                            \
+                                                                               \
+    makeParticleForceModel(CloudType);                                         \
+    makeParticleForceModelType(SphereDragForce, CloudType);                    \
+    makeParticleForceModelType(NonSphereDragForce, CloudType);                 \
+    makeParticleForceModelType(WenYuDragForce, CloudType);                     \
+    makeParticleForceModelType(ErgunWenYuDragForce, CloudType);                \
+    makeParticleForceModelType(PlessisMasliyahDragForce, CloudType);           \
+    makeParticleForceModelType(SaffmanMeiLiftForce, CloudType);                \
+    makeParticleForceModelType(TomiyamaLiftForce, CloudType);                  \
+    makeParticleForceModelType(GravityForce, CloudType);                       \
+    makeParticleForceModelType(NonInertialFrameForce, CloudType);              \
+    makeParticleForceModelType(ParamagneticForce, CloudType);                  \
+    makeParticleForceModelType(PressureGradientForce, CloudType);              \
+    makeParticleForceModelType(SRFForce, CloudType);                           \
     makeParticleForceModelType(VirtualMassForce, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
index 0ef9ff98df..ef2269edf9 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
@@ -33,11 +33,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelHeatTransferModels(CloudType)                               \
-                                                                              \
-    makeHeatTransferModel(CloudType);                                         \
-                                                                              \
-    makeHeatTransferModelType(NoHeatTransfer, CloudType);                     \
+#define makeParcelHeatTransferModels(CloudType)                                \
+                                                                               \
+    makeHeatTransferModel(CloudType);                                          \
+                                                                               \
+    makeHeatTransferModelType(NoHeatTransfer, CloudType);                      \
     makeHeatTransferModelType(RanzMarshall, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
index 07b00f8d93..ca0941a07b 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
@@ -41,19 +41,19 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelInjectionModels(CloudType)                                  \
-                                                                              \
-    makeInjectionModel(CloudType);                                            \
-                                                                              \
-    makeInjectionModelType(CellZoneInjection, CloudType);                     \
-    makeInjectionModelType(ConeInjection, CloudType);                         \
-    makeInjectionModelType(ConeNozzleInjection, CloudType);                   \
-    makeInjectionModelType(FieldActivatedInjection, CloudType);               \
-    makeInjectionModelType(InflationInjection, CloudType);                    \
-    makeInjectionModelType(KinematicLookupTableInjection, CloudType);         \
-    makeInjectionModelType(ManualInjection, CloudType);                       \
-    makeInjectionModelType(NoInjection, CloudType);                           \
-    makeInjectionModelType(PatchInjection, CloudType);                        \
+#define makeParcelInjectionModels(CloudType)                                   \
+                                                                               \
+    makeInjectionModel(CloudType);                                             \
+                                                                               \
+    makeInjectionModelType(CellZoneInjection, CloudType);                      \
+    makeInjectionModelType(ConeInjection, CloudType);                          \
+    makeInjectionModelType(ConeNozzleInjection, CloudType);                    \
+    makeInjectionModelType(FieldActivatedInjection, CloudType);                \
+    makeInjectionModelType(InflationInjection, CloudType);                     \
+    makeInjectionModelType(KinematicLookupTableInjection, CloudType);          \
+    makeInjectionModelType(ManualInjection, CloudType);                        \
+    makeInjectionModelType(NoInjection, CloudType);                            \
+    makeInjectionModelType(PatchInjection, CloudType);                         \
     makeInjectionModelType(PatchFlowRateInjection, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
index 16d163ed8e..7538ca5782 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
@@ -36,14 +36,14 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelPatchInteractionModels(CloudType)                           \
-                                                                              \
-    makePatchInteractionModel(CloudType);                                     \
-                                                                              \
-    makePatchInteractionModelType(LocalInteraction, CloudType);               \
-    makePatchInteractionModelType(NoInteraction, CloudType);                  \
-    makePatchInteractionModelType(Rebound, CloudType);                        \
-    makePatchInteractionModelType(StandardWallInteraction, CloudType);        \
+#define makeParcelPatchInteractionModels(CloudType)                            \
+                                                                               \
+    makePatchInteractionModel(CloudType);                                      \
+                                                                               \
+    makePatchInteractionModelType(LocalInteraction, CloudType);                \
+    makePatchInteractionModelType(NoInteraction, CloudType);                   \
+    makePatchInteractionModelType(Rebound, CloudType);                         \
+    makePatchInteractionModelType(StandardWallInteraction, CloudType);         \
     makePatchInteractionModelType(MultiInteraction, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H
index d661155657..3d01b13778 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H
@@ -32,9 +32,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelStochasticCollisionModels(CloudType)                        \
-                                                                              \
-    makeStochasticCollisionModel(CloudType);                                  \
+#define makeParcelStochasticCollisionModels(CloudType)                         \
+                                                                               \
+    makeStochasticCollisionModel(CloudType);                                   \
     makeStochasticCollisionModelType(NoStochasticCollision, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H
index bb23357471..f288865072 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H
@@ -32,9 +32,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelSurfaceFilmModels(CloudType)                                \
-                                                                              \
-    makeSurfaceFilmModel(CloudType);                                          \
+#define makeParcelSurfaceFilmModels(CloudType)                                 \
+                                                                               \
+    makeSurfaceFilmModel(CloudType);                                           \
     makeSurfaceFilmModelType(NoSurfaceFilm, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
index 1e518d61d7..0dcea59618 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
@@ -33,10 +33,10 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingMultiphaseParcelCompositionModels(CloudType)              \
-                                                                              \
-    makeCompositionModel(CloudType);                                          \
-    makeCompositionModelType(NoComposition, CloudType);                       \
+#define makeReactingMultiphaseParcelCompositionModels(CloudType)               \
+                                                                               \
+    makeCompositionModel(CloudType);                                           \
+    makeCompositionModelType(NoComposition, CloudType);                        \
     makeCompositionModelType(SingleMixtureFraction, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
index 3c2cc8bc27..a36c300161 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
@@ -34,15 +34,15 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingMultiphaseParcelDevolatilisationModels(CloudType)         \
-                                                                              \
-    makeDevolatilisationModel(CloudType);                                     \
-    makeDevolatilisationModelType(ConstantRateDevolatilisation, CloudType);   \
-    makeDevolatilisationModelType(NoDevolatilisation, CloudType);             \
-    makeDevolatilisationModelType                                             \
-    (                                                                         \
-        SingleKineticRateDevolatilisation,                                    \
-        CloudType                                                             \
+#define makeReactingMultiphaseParcelDevolatilisationModels(CloudType)          \
+                                                                               \
+    makeDevolatilisationModel(CloudType);                                      \
+    makeDevolatilisationModelType(ConstantRateDevolatilisation, CloudType);    \
+    makeDevolatilisationModelType(NoDevolatilisation, CloudType);              \
+    makeDevolatilisationModelType                                              \
+    (                                                                          \
+        SingleKineticRateDevolatilisation,                                     \
+        CloudType                                                              \
     );
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
index 711f88459f..c81eb94b79 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
@@ -40,17 +40,17 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingMultiphaseParcelInjectionModels(CloudType)                \
-                                                                              \
-    makeInjectionModel(CloudType);                                            \
-    makeInjectionModelType(CellZoneInjection, CloudType);                     \
-    makeInjectionModelType(ConeInjection, CloudType);                         \
-    makeInjectionModelType(ConeNozzleInjection, CloudType);                   \
-    makeInjectionModelType(FieldActivatedInjection, CloudType);               \
-    makeInjectionModelType(ManualInjection, CloudType);                       \
-    makeInjectionModelType(NoInjection, CloudType);                           \
-    makeInjectionModelType(PatchInjection, CloudType);                        \
-    makeInjectionModelType(PatchFlowRateInjection, CloudType);                \
+#define makeReactingMultiphaseParcelInjectionModels(CloudType)                 \
+                                                                               \
+    makeInjectionModel(CloudType);                                             \
+    makeInjectionModelType(CellZoneInjection, CloudType);                      \
+    makeInjectionModelType(ConeInjection, CloudType);                          \
+    makeInjectionModelType(ConeNozzleInjection, CloudType);                    \
+    makeInjectionModelType(FieldActivatedInjection, CloudType);                \
+    makeInjectionModelType(ManualInjection, CloudType);                        \
+    makeInjectionModelType(NoInjection, CloudType);                            \
+    makeInjectionModelType(PatchInjection, CloudType);                         \
+    makeInjectionModelType(PatchFlowRateInjection, CloudType);                 \
     makeInjectionModelType(ReactingMultiphaseLookupTableInjection, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelStochasticCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelStochasticCollisionModels.H
index ea8436b119..e06e79f674 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelStochasticCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelStochasticCollisionModels.H
@@ -33,10 +33,10 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingMultiphaseParcelStochasticCollisionModels(CloudType)      \
-                                                                              \
-    makeStochasticCollisionModel(CloudType);                                  \
-    makeStochasticCollisionModelType(NoStochasticCollision, CloudType);       \
+#define makeReactingMultiphaseParcelStochasticCollisionModels(CloudType)       \
+                                                                               \
+    makeStochasticCollisionModel(CloudType);                                   \
+    makeStochasticCollisionModelType(NoStochasticCollision, CloudType);        \
     makeStochasticCollisionModelType(SuppressionCollision, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
index 95249a6a57..4a907f9a40 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
@@ -32,9 +32,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingMultiphaseParcelSurfaceReactionModels(CloudType)          \
-                                                                              \
-    makeSurfaceReactionModel(CloudType);                                      \
+#define makeReactingMultiphaseParcelSurfaceReactionModels(CloudType)           \
+                                                                               \
+    makeSurfaceReactionModel(CloudType);                                       \
     makeSurfaceReactionModelType(NoSurfaceReaction, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
index c8a17037d4..ba552b685c 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
@@ -33,10 +33,10 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingParcelCompositionModels(CloudType)                        \
-                                                                              \
-    makeCompositionModel(CloudType);                                          \
-    makeCompositionModelType(NoComposition, CloudType);                       \
+#define makeReactingParcelCompositionModels(CloudType)                         \
+                                                                               \
+    makeCompositionModel(CloudType);                                           \
+    makeCompositionModelType(NoComposition, CloudType);                        \
     makeCompositionModelType(SinglePhaseMixture, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
index 5fb4c6d562..8ab7e31bf4 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
@@ -40,17 +40,17 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingParcelInjectionModels(CloudType)                          \
-                                                                              \
-    makeInjectionModel(CloudType);                                            \
-    makeInjectionModelType(CellZoneInjection, CloudType);                     \
-    makeInjectionModelType(ConeInjection, CloudType);                         \
-    makeInjectionModelType(ConeNozzleInjection, CloudType);                   \
-    makeInjectionModelType(FieldActivatedInjection, CloudType);               \
-    makeInjectionModelType(ManualInjection, CloudType);                       \
-    makeInjectionModelType(NoInjection, CloudType);                           \
-    makeInjectionModelType(PatchInjection, CloudType);                        \
-    makeInjectionModelType(PatchFlowRateInjection, CloudType);                \
+#define makeReactingParcelInjectionModels(CloudType)                           \
+                                                                               \
+    makeInjectionModel(CloudType);                                             \
+    makeInjectionModelType(CellZoneInjection, CloudType);                      \
+    makeInjectionModelType(ConeInjection, CloudType);                          \
+    makeInjectionModelType(ConeNozzleInjection, CloudType);                    \
+    makeInjectionModelType(FieldActivatedInjection, CloudType);                \
+    makeInjectionModelType(ManualInjection, CloudType);                        \
+    makeInjectionModelType(NoInjection, CloudType);                            \
+    makeInjectionModelType(PatchInjection, CloudType);                         \
+    makeInjectionModelType(PatchFlowRateInjection, CloudType);                 \
     makeInjectionModelType(ReactingLookupTableInjection, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
index 47d4899e9d..9ceb1074a3 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
@@ -34,11 +34,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingParcelPhaseChangeModels(CloudType)                        \
-                                                                              \
-    makePhaseChangeModel(CloudType);                                          \
-    makePhaseChangeModelType(NoPhaseChange, CloudType);                       \
-    makePhaseChangeModelType(LiquidEvaporation, CloudType);                   \
+#define makeReactingParcelPhaseChangeModels(CloudType)                         \
+                                                                               \
+    makePhaseChangeModel(CloudType);                                           \
+    makePhaseChangeModelType(NoPhaseChange, CloudType);                        \
+    makePhaseChangeModelType(LiquidEvaporation, CloudType);                    \
     makePhaseChangeModelType(LiquidEvaporationBoil, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H
index 99d56fc8e9..7fdb8a3bb8 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H
@@ -33,10 +33,10 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReactingParcelSurfaceFilmModels(CloudType)                        \
-                                                                              \
-    makeSurfaceFilmModel(CloudType);                                          \
-    makeSurfaceFilmModelType(NoSurfaceFilm, CloudType);                       \
+#define makeReactingParcelSurfaceFilmModels(CloudType)                         \
+                                                                               \
+    makeSurfaceFilmModel(CloudType);                                           \
+    makeSurfaceFilmModelType(NoSurfaceFilm, CloudType);                        \
     makeSurfaceFilmModelType(ThermoSurfaceFilm, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
index 6045ae2827..77952175cb 100644
--- a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
+++ b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
@@ -43,18 +43,18 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeThermoParcelForces(CloudType)                                     \
-                                                                              \
-    makeParticleForceModel(CloudType);                                        \
-    makeParticleForceModelType(SphereDragForce, CloudType);                   \
-    makeParticleForceModelType(NonSphereDragForce, CloudType);                \
-    makeParticleForceModelType(SaffmanMeiLiftForce, CloudType);               \
-    makeParticleForceModelType(TomiyamaLiftForce, CloudType);                 \
-    makeParticleForceModelType(GravityForce, CloudType);                      \
-    makeParticleForceModelType(NonInertialFrameForce, CloudType);             \
-    makeParticleForceModelType(ParamagneticForce, CloudType);                 \
-    makeParticleForceModelType(PressureGradientForce, CloudType);             \
-    makeParticleForceModelType(SRFForce, CloudType);                          \
+#define makeThermoParcelForces(CloudType)                                      \
+                                                                               \
+    makeParticleForceModel(CloudType);                                         \
+    makeParticleForceModelType(SphereDragForce, CloudType);                    \
+    makeParticleForceModelType(NonSphereDragForce, CloudType);                 \
+    makeParticleForceModelType(SaffmanMeiLiftForce, CloudType);                \
+    makeParticleForceModelType(TomiyamaLiftForce, CloudType);                  \
+    makeParticleForceModelType(GravityForce, CloudType);                       \
+    makeParticleForceModelType(NonInertialFrameForce, CloudType);              \
+    makeParticleForceModelType(ParamagneticForce, CloudType);                  \
+    makeParticleForceModelType(PressureGradientForce, CloudType);              \
+    makeParticleForceModelType(SRFForce, CloudType);                           \
     makeParticleForceModelType(VirtualMassForce, CloudType);
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H b/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H
index 867eab608d..e22350ebc5 100644
--- a/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H
@@ -33,11 +33,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelSurfaceFilmModels(CloudType)                                \
-                                                                              \
-    makeSurfaceFilmModel(CloudType);                                          \
-                                                                              \
-    makeSurfaceFilmModelType(NoSurfaceFilm, CloudType);                       \
+#define makeParcelSurfaceFilmModels(CloudType)                                 \
+                                                                               \
+    makeSurfaceFilmModel(CloudType);                                           \
+                                                                               \
+    makeSurfaceFilmModelType(NoSurfaceFilm, CloudType);                        \
     makeSurfaceFilmModelType(ThermoSurfaceFilm, CloudType);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
index 47ef1b97c3..ae0dcfa0e7 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
@@ -213,7 +213,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);      \
                                                                                \
     Foam::CloudFunctionObject<kinematicCloudType>::                            \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>         \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>          \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
index 1404f17388..6422c1bd33 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
@@ -133,31 +133,31 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeCollisionModel(CloudType)                                         \
-                                                                              \
-    typedef Foam::CloudType::collidingCloudType collidingCloudType;           \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        Foam::CollisionModel<collidingCloudType>,                             \
-        0                                                                     \
-    );                                                                        \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            CollisionModel<collidingCloudType>,                               \
-            dictionary                                                        \
-        );                                                                    \
+#define makeCollisionModel(CloudType)                                          \
+                                                                               \
+    typedef Foam::CloudType::collidingCloudType collidingCloudType;            \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        Foam::CollisionModel<collidingCloudType>,                              \
+        0                                                                      \
+    );                                                                         \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            CollisionModel<collidingCloudType>,                                \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makeCollisionModelType(SS, CloudType)                                 \
-                                                                              \
-    typedef Foam::CloudType::collidingCloudType collidingCloudType;           \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<collidingCloudType>, 0);     \
-                                                                              \
-    Foam::CollisionModel<collidingCloudType>::                                \
-        adddictionaryConstructorToTable<Foam::SS<collidingCloudType>>        \
+#define makeCollisionModelType(SS, CloudType)                                  \
+                                                                               \
+    typedef Foam::CloudType::collidingCloudType collidingCloudType;            \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<collidingCloudType>, 0);      \
+                                                                               \
+    Foam::CollisionModel<collidingCloudType>::                                 \
+        adddictionaryConstructorToTable<Foam::SS<collidingCloudType>>          \
             add##SS##CloudType##collidingCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
index 3490b18e17..6d0bec06f5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
@@ -144,26 +144,26 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makePairModel(CloudType)                                              \
-                                                                              \
+#define makePairModel(CloudType)                                               \
+                                                                               \
     defineNamedTemplateTypeNameAndDebug(Foam::PairModel<Foam::CloudType>, 0); \
-                                                                              \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            PairModel<Foam::CloudType>,                                       \
-            dictionary                                                        \
-        );                                                                    \
+                                                                               \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            PairModel<Foam::CloudType>,                                        \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makePairModelType(SS, CloudType)                                      \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<Foam::CloudType>, 0);        \
-                                                                              \
-    Foam::PairModel<Foam::CloudType>::                                        \
-        adddictionaryConstructorToTable<Foam::SS<Foam::CloudType>>           \
+#define makePairModelType(SS, CloudType)                                       \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<Foam::CloudType>, 0);         \
+                                                                               \
+    Foam::PairModel<Foam::CloudType>::                                         \
+        adddictionaryConstructorToTable<Foam::SS<Foam::CloudType>>             \
         add##SS##CloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
index cfa33f8052..9450e29fe3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
@@ -154,26 +154,26 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeWallModel(CloudType)                                              \
-                                                                              \
+#define makeWallModel(CloudType)                                               \
+                                                                               \
     defineNamedTemplateTypeNameAndDebug(Foam::WallModel<Foam::CloudType>, 0); \
-                                                                              \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            WallModel<Foam::CloudType>,                                       \
-            dictionary                                                        \
-        );                                                                    \
+                                                                               \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            WallModel<Foam::CloudType>,                                        \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makeWallModelType(SS, CloudType)                                      \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<Foam::CloudType>, 0);        \
-                                                                              \
-    Foam::WallModel<Foam::CloudType>::                                        \
-        adddictionaryConstructorToTable<Foam::SS<Foam::CloudType>>           \
+#define makeWallModelType(SS, CloudType)                                       \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<Foam::CloudType>, 0);         \
+                                                                               \
+    Foam::WallModel<Foam::CloudType>::                                         \
+        adddictionaryConstructorToTable<Foam::SS<Foam::CloudType>>             \
             add##SS##CloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
index 4059faec08..6b50f12d02 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
@@ -124,28 +124,28 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeDispersionModel(CloudType)                                        \
-                                                                              \
-    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;           \
-    defineTemplateTypeNameAndDebug                                            \
-        (Foam::DispersionModel<kinematicCloudType>, 0);                       \
-                                                                              \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            DispersionModel<kinematicCloudType>,                              \
-            dictionary                                                        \
-        );                                                                    \
+#define makeDispersionModel(CloudType)                                         \
+                                                                               \
+    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;            \
+    defineTemplateTypeNameAndDebug                                             \
+        (Foam::DispersionModel<kinematicCloudType>, 0);                        \
+                                                                               \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            DispersionModel<kinematicCloudType>,                               \
+            dictionary                                                         \
+        );                                                                     \
     }
 
-#define makeDispersionModelType(SS, CloudType)                                \
-                                                                              \
-    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;           \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);     \
-                                                                              \
-    Foam::DispersionModel<kinematicCloudType>::                               \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>        \
+#define makeDispersionModelType(SS, CloudType)                                 \
+                                                                               \
+    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;            \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);      \
+                                                                               \
+    Foam::DispersionModel<kinematicCloudType>::                                \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>          \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 19e05f854e..964194b6b6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -349,32 +349,32 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeInjectionModel(CloudType)                                         \
-                                                                              \
-    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;           \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        Foam::InjectionModel<kinematicCloudType>,                             \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            InjectionModel<kinematicCloudType>,                               \
-            dictionary                                                        \
-        );                                                                    \
+#define makeInjectionModel(CloudType)                                          \
+                                                                               \
+    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;            \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        Foam::InjectionModel<kinematicCloudType>,                              \
+        0                                                                      \
+    );                                                                         \
+                                                                               \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            InjectionModel<kinematicCloudType>,                                \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makeInjectionModelType(SS, CloudType)                                 \
-                                                                              \
-    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;           \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);     \
-                                                                              \
-    Foam::InjectionModel<kinematicCloudType>::                                \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>        \
+#define makeInjectionModelType(SS, CloudType)                                  \
+                                                                               \
+    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;            \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);      \
+                                                                               \
+    Foam::InjectionModel<kinematicCloudType>::                                 \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>          \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
index 47c0cf2579..9ae5e67f83 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
@@ -215,7 +215,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);      \
                                                                                \
     Foam::ParticleForce<kinematicCloudType>::                                  \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>         \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>          \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
index 2e1dcf0dd1..32cc7be305 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
@@ -172,32 +172,32 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makePatchInteractionModel(CloudType)                                  \
-                                                                              \
-    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;           \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        Foam::PatchInteractionModel<kinematicCloudType>,                      \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            PatchInteractionModel<kinematicCloudType>,                        \
-            dictionary                                                        \
-        );                                                                    \
+#define makePatchInteractionModel(CloudType)                                   \
+                                                                               \
+    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;            \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        Foam::PatchInteractionModel<kinematicCloudType>,                       \
+        0                                                                      \
+    );                                                                         \
+                                                                               \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            PatchInteractionModel<kinematicCloudType>,                         \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makePatchInteractionModelType(SS, CloudType)                          \
-                                                                              \
-    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;           \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);     \
-                                                                              \
-    Foam::PatchInteractionModel<kinematicCloudType>::                         \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>        \
+#define makePatchInteractionModelType(SS, CloudType)                           \
+                                                                               \
+    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;            \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);      \
+                                                                               \
+    Foam::PatchInteractionModel<kinematicCloudType>::                          \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>          \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
index 921b1ae333..49aa66a081 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
@@ -143,13 +143,13 @@ public:
     }
 
 
-#define makeStochasticCollisionModelType(SS, CloudType)                       \
-                                                                              \
-    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;           \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);     \
-                                                                              \
-    Foam::StochasticCollisionModel<kinematicCloudType>::                      \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>        \
+#define makeStochasticCollisionModelType(SS, CloudType)                        \
+                                                                               \
+    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;            \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);      \
+                                                                               \
+    Foam::StochasticCollisionModel<kinematicCloudType>::                       \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>          \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
index d8949e8887..ab36657edb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
@@ -253,7 +253,7 @@ public:
     defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0);      \
                                                                                \
     Foam::SurfaceFilmModel<kinematicCloudType>::                               \
-        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>         \
+        adddictionaryConstructorToTable<Foam::SS<kinematicCloudType>>          \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
index d98ba072bc..7e960b4600 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
@@ -162,7 +162,7 @@ public:
                                                                                \
     Foam::DampingModel<MPPICCloudType>::                                       \
         adddictionaryConstructorToTable                                        \
-        <Foam::DampingModels::SS<MPPICCloudType>>                             \
+        <Foam::DampingModels::SS<MPPICCloudType>>                              \
             add##SS##CloudType##MPPICCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
index a7883b4658..0cf3d1e905 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
@@ -156,7 +156,7 @@ public:
                                                                                \
     Foam::IsotropyModel<MPPICCloudType>::                                      \
         adddictionaryConstructorToTable                                        \
-        <Foam::IsotropyModels::SS<MPPICCloudType>>                            \
+        <Foam::IsotropyModels::SS<MPPICCloudType>>                             \
             add##SS##CloudType##MPPICCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
index 3b7f230391..1a1f061fff 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
@@ -167,7 +167,7 @@ public:
                                                                                \
     Foam::PackingModel<MPPICCloudType>::                                       \
         adddictionaryConstructorToTable                                        \
-        <Foam::PackingModels::SS<MPPICCloudType>>                             \
+        <Foam::PackingModels::SS<MPPICCloudType>>                              \
             add##SS##CloudType##MPPICCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index 0ab2ac3cfa..b59c971893 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -265,31 +265,31 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeCompositionModel(CloudType)                                       \
-                                                                              \
-    typedef Foam::CloudType::reactingCloudType reactingCloudType;             \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        Foam::CompositionModel<reactingCloudType>,                            \
-        0                                                                     \
-    );                                                                        \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            CompositionModel<reactingCloudType>,                              \
-            dictionary                                                        \
-        );                                                                    \
+#define makeCompositionModel(CloudType)                                        \
+                                                                               \
+    typedef Foam::CloudType::reactingCloudType reactingCloudType;              \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        Foam::CompositionModel<reactingCloudType>,                             \
+        0                                                                      \
+    );                                                                         \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            CompositionModel<reactingCloudType>,                               \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makeCompositionModelType(SS, CloudType)                               \
-                                                                              \
-    typedef Foam::CloudType::reactingCloudType reactingCloudType;             \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0);      \
-                                                                              \
-    Foam::CompositionModel<reactingCloudType>::                               \
-        adddictionaryConstructorToTable<Foam::SS<reactingCloudType>>         \
+#define makeCompositionModelType(SS, CloudType)                                \
+                                                                               \
+    typedef Foam::CloudType::reactingCloudType reactingCloudType;              \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0);       \
+                                                                               \
+    Foam::CompositionModel<reactingCloudType>::                                \
+        adddictionaryConstructorToTable<Foam::SS<reactingCloudType>>           \
             add##SS##CloudType##reactingCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index 36c1c9a72e..3afdb46255 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -201,31 +201,31 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makePhaseChangeModel(CloudType)                                       \
-                                                                              \
-    typedef Foam::CloudType::reactingCloudType reactingCloudType;             \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        Foam::PhaseChangeModel<reactingCloudType>,                            \
-        0                                                                     \
-    );                                                                        \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            PhaseChangeModel<reactingCloudType>,                              \
-            dictionary                                                        \
-        );                                                                    \
+#define makePhaseChangeModel(CloudType)                                        \
+                                                                               \
+    typedef Foam::CloudType::reactingCloudType reactingCloudType;              \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        Foam::PhaseChangeModel<reactingCloudType>,                             \
+        0                                                                      \
+    );                                                                         \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            PhaseChangeModel<reactingCloudType>,                               \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makePhaseChangeModelType(SS, CloudType)                               \
-                                                                              \
-    typedef Foam::CloudType::reactingCloudType reactingCloudType;             \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0);      \
-                                                                              \
-    Foam::PhaseChangeModel<reactingCloudType>::                               \
-        adddictionaryConstructorToTable<Foam::SS<reactingCloudType>>         \
+#define makePhaseChangeModelType(SS, CloudType)                                \
+                                                                               \
+    typedef Foam::CloudType::reactingCloudType reactingCloudType;              \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0);       \
+                                                                               \
+    Foam::PhaseChangeModel<reactingCloudType>::                                \
+        adddictionaryConstructorToTable<Foam::SS<reactingCloudType>>           \
             add##SS##CloudType##reactingCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index 086c0b5428..bc3b6dcba5 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -148,35 +148,35 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeDevolatilisationModel(CloudType)                                  \
-                                                                              \
-    typedef Foam::CloudType::reactingMultiphaseCloudType                      \
-        reactingMultiphaseCloudType;                                          \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        Foam::DevolatilisationModel<reactingMultiphaseCloudType>,             \
-        0                                                                     \
-    );                                                                        \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            DevolatilisationModel<reactingMultiphaseCloudType>,               \
-            dictionary                                                        \
-        );                                                                    \
+#define makeDevolatilisationModel(CloudType)                                   \
+                                                                               \
+    typedef Foam::CloudType::reactingMultiphaseCloudType                       \
+        reactingMultiphaseCloudType;                                           \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        Foam::DevolatilisationModel<reactingMultiphaseCloudType>,              \
+        0                                                                      \
+    );                                                                         \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            DevolatilisationModel<reactingMultiphaseCloudType>,                \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makeDevolatilisationModelType(SS, CloudType)                          \
-                                                                              \
-    typedef Foam::CloudType::reactingMultiphaseCloudType                      \
-        reactingMultiphaseCloudType;                                          \
-    defineNamedTemplateTypeNameAndDebug                                       \
-        (Foam::SS<reactingMultiphaseCloudType>, 0);                           \
-                                                                              \
-    Foam::DevolatilisationModel<reactingMultiphaseCloudType>::                \
-        adddictionaryConstructorToTable                                       \
-        <Foam::SS<reactingMultiphaseCloudType>>                              \
+#define makeDevolatilisationModelType(SS, CloudType)                           \
+                                                                               \
+    typedef Foam::CloudType::reactingMultiphaseCloudType                       \
+        reactingMultiphaseCloudType;                                           \
+    defineNamedTemplateTypeNameAndDebug                                        \
+        (Foam::SS<reactingMultiphaseCloudType>, 0);                            \
+                                                                               \
+    Foam::DevolatilisationModel<reactingMultiphaseCloudType>::                 \
+        adddictionaryConstructorToTable                                        \
+        <Foam::SS<reactingMultiphaseCloudType>>                                \
         add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index 6c6eb1d2b4..ceca733c06 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -158,35 +158,35 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSurfaceReactionModel(CloudType)                                   \
-                                                                              \
-    typedef Foam::CloudType::reactingMultiphaseCloudType                      \
-        reactingMultiphaseCloudType;                                          \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        Foam::SurfaceReactionModel<reactingMultiphaseCloudType>,              \
-        0                                                                     \
-    );                                                                        \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            SurfaceReactionModel<reactingMultiphaseCloudType>,                \
-            dictionary                                                        \
-        );                                                                    \
+#define makeSurfaceReactionModel(CloudType)                                    \
+                                                                               \
+    typedef Foam::CloudType::reactingMultiphaseCloudType                       \
+        reactingMultiphaseCloudType;                                           \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        Foam::SurfaceReactionModel<reactingMultiphaseCloudType>,               \
+        0                                                                      \
+    );                                                                         \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            SurfaceReactionModel<reactingMultiphaseCloudType>,                 \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makeSurfaceReactionModelType(SS, CloudType)                           \
-                                                                              \
-    typedef Foam::CloudType::reactingMultiphaseCloudType                      \
-        reactingMultiphaseCloudType;                                          \
-    defineNamedTemplateTypeNameAndDebug                                       \
-        (Foam::SS<reactingMultiphaseCloudType>, 0);                           \
-                                                                              \
-    Foam::SurfaceReactionModel<reactingMultiphaseCloudType>::                 \
-        adddictionaryConstructorToTable                                       \
-        <Foam::SS<reactingMultiphaseCloudType>>                              \
+#define makeSurfaceReactionModelType(SS, CloudType)                            \
+                                                                               \
+    typedef Foam::CloudType::reactingMultiphaseCloudType                       \
+        reactingMultiphaseCloudType;                                           \
+    defineNamedTemplateTypeNameAndDebug                                        \
+        (Foam::SS<reactingMultiphaseCloudType>, 0);                            \
+                                                                               \
+    Foam::SurfaceReactionModel<reactingMultiphaseCloudType>::                  \
+        adddictionaryConstructorToTable                                        \
+        <Foam::SS<reactingMultiphaseCloudType>>                                \
         add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
index c7be8874d2..8324e645f0 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
@@ -147,31 +147,31 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeHeatTransferModel(CloudType)                                      \
-                                                                              \
-    typedef Foam::CloudType::thermoCloudType thermoCloudType;                 \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        Foam::HeatTransferModel<thermoCloudType>,                             \
-        0                                                                     \
-    );                                                                        \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            HeatTransferModel<thermoCloudType>,                               \
-            dictionary                                                        \
-        );                                                                    \
+#define makeHeatTransferModel(CloudType)                                       \
+                                                                               \
+    typedef Foam::CloudType::thermoCloudType thermoCloudType;                  \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        Foam::HeatTransferModel<thermoCloudType>,                              \
+        0                                                                      \
+    );                                                                         \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            HeatTransferModel<thermoCloudType>,                                \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makeHeatTransferModelType(SS, CloudType)                              \
-                                                                              \
-    typedef Foam::CloudType::thermoCloudType thermoCloudType;                 \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<thermoCloudType>, 0);        \
-                                                                              \
-    Foam::HeatTransferModel<thermoCloudType>::                                \
-        adddictionaryConstructorToTable<Foam::SS<thermoCloudType>>           \
+#define makeHeatTransferModelType(SS, CloudType)                               \
+                                                                               \
+    typedef Foam::CloudType::thermoCloudType thermoCloudType;                  \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<thermoCloudType>, 0);         \
+                                                                               \
+    Foam::HeatTransferModel<thermoCloudType>::                                 \
+        adddictionaryConstructorToTable<Foam::SS<thermoCloudType>>             \
             add##SS##CloudType##thermoCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/spray/parcels/include/makeSprayParcelAtomizationModels.H b/src/lagrangian/spray/parcels/include/makeSprayParcelAtomizationModels.H
index 8d240232b9..63ac235486 100644
--- a/src/lagrangian/spray/parcels/include/makeSprayParcelAtomizationModels.H
+++ b/src/lagrangian/spray/parcels/include/makeSprayParcelAtomizationModels.H
@@ -34,11 +34,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSprayParcelAtomizationModels(CloudType)                           \
-                                                                              \
-    makeAtomizationModel(CloudType);                                          \
-    makeAtomizationModelType(NoAtomization, CloudType);                       \
-    makeAtomizationModelType(BlobsSheetAtomization, CloudType);               \
+#define makeSprayParcelAtomizationModels(CloudType)                            \
+                                                                               \
+    makeAtomizationModel(CloudType);                                           \
+    makeAtomizationModelType(NoAtomization, CloudType);                        \
+    makeAtomizationModelType(BlobsSheetAtomization, CloudType);                \
     makeAtomizationModelType(LISAAtomization, CloudType);
 
 
diff --git a/src/lagrangian/spray/parcels/include/makeSprayParcelBreakupModels.H b/src/lagrangian/spray/parcels/include/makeSprayParcelBreakupModels.H
index 0f822318e3..3ec1623b7c 100644
--- a/src/lagrangian/spray/parcels/include/makeSprayParcelBreakupModels.H
+++ b/src/lagrangian/spray/parcels/include/makeSprayParcelBreakupModels.H
@@ -38,15 +38,15 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSprayParcelBreakupModels(CloudType)                               \
-                                                                              \
-    makeBreakupModel(CloudType)                                               \
-    makeBreakupModelType(NoBreakup, CloudType);                               \
-    makeBreakupModelType(PilchErdman, CloudType);                             \
-    makeBreakupModelType(ReitzDiwakar, CloudType);                            \
-    makeBreakupModelType(ReitzKHRT, CloudType);                               \
-    makeBreakupModelType(TAB, CloudType);                                     \
-    makeBreakupModelType(ETAB, CloudType);                                    \
+#define makeSprayParcelBreakupModels(CloudType)                                \
+                                                                               \
+    makeBreakupModel(CloudType)                                                \
+    makeBreakupModelType(NoBreakup, CloudType);                                \
+    makeBreakupModelType(PilchErdman, CloudType);                              \
+    makeBreakupModelType(ReitzDiwakar, CloudType);                             \
+    makeBreakupModelType(ReitzKHRT, CloudType);                                \
+    makeBreakupModelType(TAB, CloudType);                                      \
+    makeBreakupModelType(ETAB, CloudType);                                     \
     makeBreakupModelType(SHF, CloudType);
 
 
diff --git a/src/lagrangian/spray/parcels/include/makeSprayParcelInjectionModels.H b/src/lagrangian/spray/parcels/include/makeSprayParcelInjectionModels.H
index dba5fa2e2d..31e06311ba 100644
--- a/src/lagrangian/spray/parcels/include/makeSprayParcelInjectionModels.H
+++ b/src/lagrangian/spray/parcels/include/makeSprayParcelInjectionModels.H
@@ -40,18 +40,18 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSprayParcelInjectionModels(CloudType)                             \
-                                                                              \
-    makeInjectionModel(CloudType);                                            \
-                                                                              \
-    makeInjectionModelType(CellZoneInjection, CloudType);                     \
-    makeInjectionModelType(ConeInjection, CloudType);                         \
-    makeInjectionModelType(ConeNozzleInjection, CloudType);                   \
-    makeInjectionModelType(FieldActivatedInjection, CloudType);               \
-    makeInjectionModelType(InflationInjection, CloudType);                    \
-    makeInjectionModelType(ManualInjection, CloudType);                       \
-    makeInjectionModelType(NoInjection, CloudType);                           \
-    makeInjectionModelType(PatchFlowRateInjection, CloudType);                \
+#define makeSprayParcelInjectionModels(CloudType)                              \
+                                                                               \
+    makeInjectionModel(CloudType);                                             \
+                                                                               \
+    makeInjectionModelType(CellZoneInjection, CloudType);                      \
+    makeInjectionModelType(ConeInjection, CloudType);                          \
+    makeInjectionModelType(ConeNozzleInjection, CloudType);                    \
+    makeInjectionModelType(FieldActivatedInjection, CloudType);                \
+    makeInjectionModelType(InflationInjection, CloudType);                     \
+    makeInjectionModelType(ManualInjection, CloudType);                        \
+    makeInjectionModelType(NoInjection, CloudType);                            \
+    makeInjectionModelType(PatchFlowRateInjection, CloudType);                 \
     makeInjectionModelType(PatchInjection, CloudType);
 
 
diff --git a/src/lagrangian/spray/parcels/include/makeSprayParcelStochasticCollisionModels.H b/src/lagrangian/spray/parcels/include/makeSprayParcelStochasticCollisionModels.H
index 2d9fdbf4a3..714ff320ee 100644
--- a/src/lagrangian/spray/parcels/include/makeSprayParcelStochasticCollisionModels.H
+++ b/src/lagrangian/spray/parcels/include/makeSprayParcelStochasticCollisionModels.H
@@ -34,11 +34,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSprayParcelStochasticCollisionModels(CloudType)                   \
-                                                                              \
-    makeStochasticCollisionModel(CloudType);                                  \
-    makeStochasticCollisionModelType(NoStochasticCollision, CloudType);       \
-    makeStochasticCollisionModelType(ORourkeCollision, CloudType);            \
+#define makeSprayParcelStochasticCollisionModels(CloudType)                    \
+                                                                               \
+    makeStochasticCollisionModel(CloudType);                                   \
+    makeStochasticCollisionModelType(NoStochasticCollision, CloudType);        \
+    makeStochasticCollisionModelType(ORourkeCollision, CloudType);             \
     makeStochasticCollisionModelType(TrajectoryCollision, CloudType);
 
 
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
index a4f6ddab7d..e83d94382c 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
@@ -144,32 +144,32 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeAtomizationModel(CloudType)                                       \
-                                                                              \
-    typedef Foam::CloudType::sprayCloudType sprayCloudType;                   \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        Foam::AtomizationModel<sprayCloudType>,                               \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            AtomizationModel<sprayCloudType>,                                 \
-            dictionary                                                        \
-        );                                                                    \
+#define makeAtomizationModel(CloudType)                                        \
+                                                                               \
+    typedef Foam::CloudType::sprayCloudType sprayCloudType;                    \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        Foam::AtomizationModel<sprayCloudType>,                                \
+        0                                                                      \
+    );                                                                         \
+                                                                               \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            AtomizationModel<sprayCloudType>,                                  \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makeAtomizationModelType(SS, CloudType)                               \
-                                                                              \
-    typedef Foam::CloudType::sprayCloudType sprayCloudType;                   \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<sprayCloudType>, 0);         \
-                                                                              \
-    Foam::AtomizationModel<sprayCloudType>::                                  \
-        adddictionaryConstructorToTable<Foam::SS<sprayCloudType>>            \
+#define makeAtomizationModelType(SS, CloudType)                                \
+                                                                               \
+    typedef Foam::CloudType::sprayCloudType sprayCloudType;                    \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<sprayCloudType>, 0);          \
+                                                                               \
+    Foam::AtomizationModel<sprayCloudType>::                                   \
+        adddictionaryConstructorToTable<Foam::SS<sprayCloudType>>              \
             add##SS##CloudType##sprayCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
index 15554fb608..26692acb2e 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
@@ -191,32 +191,32 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeBreakupModel(CloudType)                                           \
-                                                                              \
-    typedef Foam::CloudType::sprayCloudType sprayCloudType;                   \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        Foam::BreakupModel<sprayCloudType>,                                   \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    namespace Foam                                                            \
-    {                                                                         \
-        defineTemplateRunTimeSelectionTable                                   \
-        (                                                                     \
-            BreakupModel<sprayCloudType>,                                     \
-            dictionary                                                        \
-        );                                                                    \
+#define makeBreakupModel(CloudType)                                            \
+                                                                               \
+    typedef Foam::CloudType::sprayCloudType sprayCloudType;                    \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        Foam::BreakupModel<sprayCloudType>,                                    \
+        0                                                                      \
+    );                                                                         \
+                                                                               \
+    namespace Foam                                                             \
+    {                                                                          \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            BreakupModel<sprayCloudType>,                                      \
+            dictionary                                                         \
+        );                                                                     \
     }
 
 
-#define makeBreakupModelType(SS, CloudType)                                   \
-                                                                              \
-    typedef Foam::CloudType::sprayCloudType sprayCloudType;                   \
-    defineNamedTemplateTypeNameAndDebug(Foam::SS<sprayCloudType>, 0);         \
-                                                                              \
-    Foam::BreakupModel<sprayCloudType>::                                      \
-        adddictionaryConstructorToTable<Foam::SS<sprayCloudType>>            \
+#define makeBreakupModelType(SS, CloudType)                                    \
+                                                                               \
+    typedef Foam::CloudType::sprayCloudType sprayCloudType;                    \
+    defineNamedTemplateTypeNameAndDebug(Foam::SS<sprayCloudType>, 0);          \
+                                                                               \
+    Foam::BreakupModel<sprayCloudType>::                                       \
+        adddictionaryConstructorToTable<Foam::SS<sprayCloudType>>              \
             add##SS##CloudType##sprayCloudType##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H b/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
index 5bcc0c68bf..5925350cfb 100644
--- a/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
+++ b/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
@@ -33,17 +33,17 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelTurbulenceDispersionModels(CloudType)                       \
-                                                                              \
-    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;           \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        Foam::DispersionRASModel<kinematicCloudType>,                         \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    makeDispersionModelType(GradientDispersionRAS, CloudType);                \
-    makeDispersionModelType(StochasticDispersionRAS, CloudType);              \
+#define makeParcelTurbulenceDispersionModels(CloudType)                        \
+                                                                               \
+    typedef Foam::CloudType::kinematicCloudType kinematicCloudType;            \
+    defineNamedTemplateTypeNameAndDebug                                        \
+    (                                                                          \
+        Foam::DispersionRASModel<kinematicCloudType>,                          \
+        0                                                                      \
+    );                                                                         \
+                                                                               \
+    makeDispersionModelType(GradientDispersionRAS, CloudType);                 \
+    makeDispersionModelType(StochasticDispersionRAS, CloudType);               \
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H b/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H
index d7581110b5..49a9386986 100644
--- a/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H
+++ b/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H
@@ -32,8 +32,8 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeThermoParcelTurbulenceForces(CloudType)                           \
-                                                                              \
+#define makeThermoParcelTurbulenceForces(CloudType)                            \
+                                                                               \
     makeParticleForceModelType(BrownianMotionForce, CloudType);
 
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
index cc8b6216ce..fd0af6039a 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
@@ -247,24 +247,24 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeAMIMethod(AMIType)                                                \
-                                                                              \
-    typedef AMIMethod<AMIType::sourcePatchType,AMIType::targetPatchType>      \
-        AMIMethod##AMIType;                                                   \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(AMIMethod##AMIType, 0);               \
+#define makeAMIMethod(AMIType)                                                 \
+                                                                               \
+    typedef AMIMethod<AMIType::sourcePatchType,AMIType::targetPatchType>       \
+        AMIMethod##AMIType;                                                    \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(AMIMethod##AMIType, 0);                \
     defineTemplateRunTimeSelectionTable(AMIMethod##AMIType, components);
 
 
-#define makeAMIMethodType(AMIType, Method)                                    \
-                                                                              \
-    typedef Method<AMIType::sourcePatchType,AMIType::targetPatchType>         \
-        Method##AMIType;                                                      \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(Method##AMIType, 0);                  \
-                                                                              \
-    AMIMethod<AMIType::sourcePatchType,AMIType::targetPatchType>::            \
-        addcomponentsConstructorToTable<Method##AMIType>                      \
+#define makeAMIMethodType(AMIType, Method)                                     \
+                                                                               \
+    typedef Method<AMIType::sourcePatchType,AMIType::targetPatchType>          \
+        Method##AMIType;                                                       \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(Method##AMIType, 0);                   \
+                                                                               \
+    AMIMethod<AMIType::sourcePatchType,AMIType::targetPatchType>::             \
+        addcomponentsConstructorToTable<Method##AMIType>                       \
         add##Method##AMIType##ConstructorToTable_;
 
 
diff --git a/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H b/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H
index 2f640fc2e0..70e3eadaff 100644
--- a/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H
+++ b/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H
@@ -41,43 +41,43 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSurfaceWriterType(ThisClass)                                      \
-    defineTypeNameAndDebug(ThisClass, 0);                                     \
+#define makeSurfaceWriterType(ThisClass)                                       \
+    defineTypeNameAndDebug(ThisClass, 0);                                      \
     addToRunTimeSelectionTable(surfaceWriter, ThisClass, word)
 
 
-#define defineSurfaceWriterWriteField(ThisClass, FieldType)                   \
-    void ThisClass::write                                                     \
-    (                                                                         \
-        const fileName& outputDir,                                            \
-        const fileName& surfaceName,                                          \
-        const pointField& points,                                             \
-        const faceList& faces,                                                \
-        const word& fieldName,                                                \
-        const Field<FieldType>& values,                                       \
-        const bool isNodeValues,                                              \
-        const bool verbose                                                    \
-    ) const                                                                   \
-    {                                                                         \
-        writeTemplate                                                         \
-        (                                                                     \
-            outputDir,                                                        \
-            surfaceName,                                                      \
-            points,                                                           \
-            faces,                                                            \
-            fieldName,                                                        \
-            values,                                                           \
-            isNodeValues,                                                     \
-            verbose                                                           \
-        );                                                                    \
+#define defineSurfaceWriterWriteField(ThisClass, FieldType)                    \
+    void ThisClass::write                                                      \
+    (                                                                          \
+        const fileName& outputDir,                                             \
+        const fileName& surfaceName,                                           \
+        const pointField& points,                                              \
+        const faceList& faces,                                                 \
+        const word& fieldName,                                                 \
+        const Field<FieldType>& values,                                        \
+        const bool isNodeValues,                                               \
+        const bool verbose                                                     \
+    ) const                                                                    \
+    {                                                                          \
+        writeTemplate                                                          \
+        (                                                                      \
+            outputDir,                                                         \
+            surfaceName,                                                       \
+            points,                                                            \
+            faces,                                                             \
+            fieldName,                                                         \
+            values,                                                            \
+            isNodeValues,                                                      \
+            verbose                                                            \
+        );                                                                     \
     }
 
 
-#define defineSurfaceWriterWriteFields(ThisClass)                             \
-    defineSurfaceWriterWriteField(ThisClass, scalar);                         \
-    defineSurfaceWriterWriteField(ThisClass, vector);                         \
-    defineSurfaceWriterWriteField(ThisClass, sphericalTensor);                \
-    defineSurfaceWriterWriteField(ThisClass, symmTensor);                     \
+#define defineSurfaceWriterWriteFields(ThisClass)                              \
+    defineSurfaceWriterWriteField(ThisClass, scalar);                          \
+    defineSurfaceWriterWriteField(ThisClass, vector);                          \
+    defineSurfaceWriterWriteField(ThisClass, sphericalTensor);                 \
+    defineSurfaceWriterWriteField(ThisClass, symmTensor);                      \
     defineSurfaceWriterWriteField(ThisClass, tensor)
 
 
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaces.C b/src/surfMesh/MeshedSurface/MeshedSurfaces.C
index 7cc72bb7e9..14b22dc709 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaces.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaces.C
@@ -32,15 +32,15 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-#define makeSurface(surfType, faceType)                                       \
-    defineNamedTemplateTypeNameAndDebug(surfType<faceType>, 0);               \
-    defineTemplatedRunTimeSelectionTable(surfType,fileExtension,faceType);    \
-    defineTemplatedMemberFunctionSelectionTable                               \
-    (                                                                         \
-        surfType,                                                             \
-        write,                                                                \
-        fileExtension,                                                        \
-        faceType                                                              \
+#define makeSurface(surfType, faceType)                                        \
+    defineNamedTemplateTypeNameAndDebug(surfType<faceType>, 0);                \
+    defineTemplatedRunTimeSelectionTable(surfType,fileExtension,faceType);     \
+    defineTemplatedMemberFunctionSelectionTable                                \
+    (                                                                          \
+        surfType,                                                              \
+        write,                                                                 \
+        fileExtension,                                                         \
+        faceType                                                               \
     );
 
 
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C
index 6dca32fd2e..1a13e010a9 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C
@@ -33,14 +33,14 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-#define makeSurface(surfType, faceType)                                       \
-    defineNamedTemplateTypeNameAndDebug(surfType<faceType>, 0);               \
-    defineTemplatedMemberFunctionSelectionTable                               \
-    (                                                                         \
-        surfType,                                                             \
-        write,                                                                \
-        fileExtension,                                                        \
-        faceType                                                              \
+#define makeSurface(surfType, faceType)                                        \
+    defineNamedTemplateTypeNameAndDebug(surfType<faceType>, 0);                \
+    defineTemplatedMemberFunctionSelectionTable                                \
+    (                                                                          \
+        surfType,                                                              \
+        write,                                                                 \
+        fileExtension,                                                         \
+        faceType                                                               \
     );
 
 
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C
index 39589e79c3..8ecb251bb3 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C
@@ -32,15 +32,15 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-#define makeSurface(surfType, faceType)                                       \
-    defineNamedTemplateTypeNameAndDebug(surfType<faceType>, 0);               \
-    defineTemplatedRunTimeSelectionTable(surfType,fileExtension,faceType);    \
-    defineTemplatedMemberFunctionSelectionTable                               \
-    (                                                                         \
-        surfType,                                                             \
-        write,                                                                \
-        fileExtension,                                                        \
-        faceType                                                              \
+#define makeSurface(surfType, faceType)                                        \
+    defineNamedTemplateTypeNameAndDebug(surfType<faceType>, 0);                \
+    defineTemplatedRunTimeSelectionTable(surfType,fileExtension,faceType);     \
+    defineTemplatedMemberFunctionSelectionTable                                \
+    (                                                                          \
+        surfType,                                                              \
+        write,                                                                 \
+        fileExtension,                                                         \
+        faceType                                                               \
     );
 
 
diff --git a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
index 7a136ebfb0..e8c1dff6df 100644
--- a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
+++ b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
@@ -38,75 +38,75 @@ Description
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #define makeThermoTypedefs(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\
-                                                                              \
-typedef                                                                       \
-    Transport                                                                 \
-    <                                                                         \
-        species::thermo                                                       \
-        <                                                                     \
-            Thermo                                                            \
-            <                                                                 \
-                EqnOfState                                                    \
-                <                                                             \
-                    Specie                                                    \
-                >                                                             \
-            >,                                                                \
-            Type                                                              \
-        >                                                                     \
-    > Transport##Type##Thermo##EqnOfState##Specie;                            \
-                                                                              \
-typedef                                                                       \
-    Cthermo                                                                   \
-    <                                                                         \
-        BaseThermo,                                                           \
-        Mixture<Transport##Type##Thermo##EqnOfState##Specie>                  \
-    > Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie;          \
-                                                                              \
-defineTemplateTypeNameAndDebugWithName                                        \
-(                                                                             \
-    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,            \
-    (                                                                         \
-        #Cthermo"<"#Mixture"<"                                                \
-      + Transport##Type##Thermo##EqnOfState##Specie::typeName()               \
-      + ">>"                                                                  \
-    ).c_str(),                                                                \
-    0                                                                         \
+                                                                               \
+typedef                                                                        \
+    Transport                                                                  \
+    <                                                                          \
+        species::thermo                                                        \
+        <                                                                      \
+            Thermo                                                             \
+            <                                                                  \
+                EqnOfState                                                     \
+                <                                                              \
+                    Specie                                                     \
+                >                                                              \
+            >,                                                                 \
+            Type                                                               \
+        >                                                                      \
+    > Transport##Type##Thermo##EqnOfState##Specie;                             \
+                                                                               \
+typedef                                                                        \
+    Cthermo                                                                    \
+    <                                                                          \
+        BaseThermo,                                                            \
+        Mixture<Transport##Type##Thermo##EqnOfState##Specie>                   \
+    > Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie;           \
+                                                                               \
+defineTemplateTypeNameAndDebugWithName                                         \
+(                                                                              \
+    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,             \
+    (                                                                          \
+        #Cthermo"<"#Mixture"<"                                                 \
+      + Transport##Type##Thermo##EqnOfState##Specie::typeName()                \
+      + ">>"                                                                   \
+    ).c_str(),                                                                 \
+    0                                                                          \
 );
 
 
 #define makeThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\
-                                                                              \
-makeThermoTypedefs                                                            \
-(                                                                             \
-    BaseThermo,                                                               \
-    Cthermo,                                                                  \
-    Mixture,                                                                  \
-    Transport,                                                                \
-    Type,                                                                     \
-    Thermo,                                                                   \
-    EqnOfState,                                                               \
-    Specie                                                                    \
-)                                                                             \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    basicThermo,                                                              \
-    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,            \
-    fvMesh                                                                    \
-);                                                                            \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    fluidThermo,                                                              \
-    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,            \
-    fvMesh                                                                    \
-);                                                                            \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    BaseThermo,                                                               \
-    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,            \
-    fvMesh                                                                    \
+                                                                               \
+makeThermoTypedefs                                                             \
+(                                                                              \
+    BaseThermo,                                                                \
+    Cthermo,                                                                   \
+    Mixture,                                                                   \
+    Transport,                                                                 \
+    Type,                                                                      \
+    Thermo,                                                                    \
+    EqnOfState,                                                                \
+    Specie                                                                     \
+)                                                                              \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    basicThermo,                                                               \
+    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,             \
+    fvMesh                                                                     \
+);                                                                             \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    fluidThermo,                                                               \
+    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,             \
+    fvMesh                                                                     \
+);                                                                             \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    BaseThermo,                                                                \
+    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,             \
+    fvMesh                                                                     \
 );
 
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H
index c0ae64edf4..2a63d03eb1 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H
@@ -39,15 +39,15 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeChemistryModel(SS, Comp, Thermo)                                  \
-                                                                              \
-    typedef SS<Comp, Thermo> SS##Comp##Thermo;                                \
-                                                                              \
-    defineTemplateTypeNameAndDebugWithName                                    \
-    (                                                                         \
-        SS##Comp##Thermo,                                                     \
-        (#SS"<"#Comp"," + Thermo::typeName() + ">").c_str(),                  \
-        0                                                                     \
+#define makeChemistryModel(SS, Comp, Thermo)                                   \
+                                                                               \
+    typedef SS<Comp, Thermo> SS##Comp##Thermo;                                 \
+                                                                               \
+    defineTemplateTypeNameAndDebugWithName                                     \
+    (                                                                          \
+        SS##Comp##Thermo,                                                      \
+        (#SS"<"#Comp"," + Thermo::typeName() + ">").c_str(),                   \
+        0                                                                      \
     );
 
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
index 0bb9d518db..53f42c81aa 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
@@ -36,48 +36,48 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeChemistrySolverType(SS, Comp, Thermo)                             \
-                                                                              \
-    typedef SS<chemistryModel<Comp, Thermo>> SS##Comp##Thermo;               \
-                                                                              \
-    defineTemplateTypeNameAndDebugWithName                                    \
-    (                                                                         \
-        SS##Comp##Thermo,                                                     \
-        (#SS"<" + word(Comp::typeName_())                                     \
-      + "," + Thermo::typeName() + ">").c_str(),                              \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        Comp,                                                                 \
-        SS##Comp##Thermo,                                                     \
-        fvMesh                                                                \
+#define makeChemistrySolverType(SS, Comp, Thermo)                              \
+                                                                               \
+    typedef SS<chemistryModel<Comp, Thermo>> SS##Comp##Thermo;                 \
+                                                                               \
+    defineTemplateTypeNameAndDebugWithName                                     \
+    (                                                                          \
+        SS##Comp##Thermo,                                                      \
+        (#SS"<" + word(Comp::typeName_())                                      \
+      + "," + Thermo::typeName() + ">").c_str(),                               \
+        0                                                                      \
+    );                                                                         \
+                                                                               \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        Comp,                                                                  \
+        SS##Comp##Thermo,                                                      \
+        fvMesh                                                                 \
     );
 
 
-#define makeChemistrySolverTypes(CompChemModel,Thermo)                        \
-                                                                              \
-    makeChemistrySolverType                                                   \
-    (                                                                         \
-        noChemistrySolver,                                                    \
-        CompChemModel,                                                        \
-        Thermo                                                                \
-    );                                                                        \
-                                                                              \
-    makeChemistrySolverType                                                   \
-    (                                                                         \
-        EulerImplicit,                                                        \
-        CompChemModel,                                                        \
-        Thermo                                                                \
-    );                                                                        \
-                                                                              \
-    makeChemistrySolverType                                                   \
-    (                                                                         \
-        ode,                                                                  \
-        CompChemModel,                                                        \
-        Thermo                                                                \
-    );                                                                        \
+#define makeChemistrySolverTypes(CompChemModel,Thermo)                         \
+                                                                               \
+    makeChemistrySolverType                                                    \
+    (                                                                          \
+        noChemistrySolver,                                                     \
+        CompChemModel,                                                         \
+        Thermo                                                                 \
+    );                                                                         \
+                                                                               \
+    makeChemistrySolverType                                                    \
+    (                                                                          \
+        EulerImplicit,                                                         \
+        CompChemModel,                                                         \
+        Thermo                                                                 \
+    );                                                                         \
+                                                                               \
+    makeChemistrySolverType                                                    \
+    (                                                                          \
+        ode,                                                                   \
+        CompChemModel,                                                         \
+        Thermo                                                                 \
+    );                                                                         \
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
index 5fcacdbd09..fea1013e61 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
@@ -244,20 +244,20 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define addToRadiationRunTimeSelectionTables(model)                           \
-                                                                              \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        radiationModel,                                                       \
-        model,                                                                \
-        dictionary                                                            \
-    );                                                                        \
-                                                                              \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        radiationModel,                                                       \
-        model,                                                                \
-        T                                                                     \
+#define addToRadiationRunTimeSelectionTables(model)                            \
+                                                                               \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        radiationModel,                                                        \
+        model,                                                                 \
+        dictionary                                                             \
+    );                                                                         \
+                                                                               \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        radiationModel,                                                        \
+        model,                                                                 \
+        T                                                                      \
     );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H
index 4676b5efe7..26cab98a46 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H
@@ -31,30 +31,30 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSootTypesThermo(sootModelType, Thermo)                            \
-    typedef Foam::radiation::sootModelType<Foam::Thermo>                      \
-        sootModelType##Thermo;                                                \
-                                                                              \
-    defineTemplateTypeNameAndDebugWithName                                    \
-    (                                                                         \
-        sootModelType##Thermo,                                                \
-        #sootModelType"<"#Thermo">",                                          \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    namespace Foam                                                            \
-    {                                                                         \
-        namespace radiation                                                   \
-        {                                                                     \
-            typedef sootModelType<Thermo> sootModelType##Thermo;              \
-                                                                              \
-            addToRunTimeSelectionTable                                        \
-            (                                                                 \
-                sootModel,                                                    \
-                sootModelType##Thermo,                                        \
-                dictionary                                                    \
-            );                                                                \
-        }                                                                     \
+#define makeSootTypesThermo(sootModelType, Thermo)                             \
+    typedef Foam::radiation::sootModelType<Foam::Thermo>                       \
+        sootModelType##Thermo;                                                 \
+                                                                               \
+    defineTemplateTypeNameAndDebugWithName                                     \
+    (                                                                          \
+        sootModelType##Thermo,                                                 \
+        #sootModelType"<"#Thermo">",                                           \
+        0                                                                      \
+    );                                                                         \
+                                                                               \
+    namespace Foam                                                             \
+    {                                                                          \
+        namespace radiation                                                    \
+        {                                                                      \
+            typedef sootModelType<Thermo> sootModelType##Thermo;               \
+                                                                               \
+            addToRunTimeSelectionTable                                         \
+            (                                                                  \
+                sootModel,                                                     \
+                sootModelType##Thermo,                                         \
+                dictionary                                                     \
+            );                                                                 \
+        }                                                                      \
     }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
index 0852fb578c..6c2cf13771 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
@@ -134,28 +134,28 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 
-#define makeChemistryReader(Thermo)                                           \
-    defineTemplateTypeNameAndDebug(chemistryReader<Thermo>, 0);               \
+#define makeChemistryReader(Thermo)                                            \
+    defineTemplateTypeNameAndDebug(chemistryReader<Thermo>, 0);                \
     defineTemplateRunTimeSelectionTable(chemistryReader<Thermo>, dictionary)
 
 
-#define makeChemistryReaderType(Reader, Thermo)                               \
-    defineNamedTemplateTypeNameAndDebug(Reader<Thermo>, 0);                   \
+#define makeChemistryReaderType(Reader, Thermo)                                \
+    defineNamedTemplateTypeNameAndDebug(Reader<Thermo>, 0);                    \
     chemistryReader<Thermo>::adddictionaryConstructorToTable<Reader<Thermo>> \
         add##Reader##Thermo##ConstructorToTable_
 
 
 // for non-templated chemistry readers
-#define addChemistryReaderType(Reader, Thermo)                                \
-    defineTypeNameAndDebug(Reader, 0);                                        \
-    chemistryReader<Thermo>::adddictionaryConstructorToTable<Reader>          \
+#define addChemistryReaderType(Reader, Thermo)                                 \
+    defineTypeNameAndDebug(Reader, 0);                                         \
+    chemistryReader<Thermo>::adddictionaryConstructorToTable<Reader>           \
         add##Reader##Thermo##ConstructorToTable_
 
 
 // for templated chemistry readers
-#define addTemplateChemistryReaderType(Reader, Thermo)                        \
-    defineNamedTemplateTypeNameAndDebug(Reader, 0);                           \
-    chemistryReader<Thermo>::adddictionaryConstructorToTable<Reader>          \
+#define addTemplateChemistryReaderType(Reader, Thermo)                         \
+    defineNamedTemplateTypeNameAndDebug(Reader, 0);                            \
+    chemistryReader<Thermo>::adddictionaryConstructorToTable<Reader>           \
         add##Reader##Thermo##ConstructorToTable_
 
 
diff --git a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
index 912c44ef95..3edd3a9583 100644
--- a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
@@ -34,31 +34,31 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSolidChemistryModel(sChemistry, SS, Comp, SThermo)                \
-                                                                              \
-    typedef Foam::sChemistry<Foam::Comp, Foam::SThermo>                       \
-        sChemistry##Comp##SThermo;                                            \
-                                                                              \
-    defineTemplateTypeNameAndDebugWithName                                    \
-    (                                                                         \
-        sChemistry##Comp##SThermo,                                            \
-        (Foam::word(sChemistry##Comp##SThermo::typeName_()) + "<"#Comp","     \
-        + SThermo::typeName() + ">").c_str(),                                 \
-        0                                                                     \
+#define makeSolidChemistryModel(sChemistry, SS, Comp, SThermo)                 \
+                                                                               \
+    typedef Foam::sChemistry<Foam::Comp, Foam::SThermo>                        \
+        sChemistry##Comp##SThermo;                                             \
+                                                                               \
+    defineTemplateTypeNameAndDebugWithName                                     \
+    (                                                                          \
+        sChemistry##Comp##SThermo,                                             \
+        (Foam::word(sChemistry##Comp##SThermo::typeName_()) + "<"#Comp","      \
+        + SThermo::typeName() + ">").c_str(),                                  \
+        0                                                                      \
     );
 
 
-#define makeSolidGasChemistryModel(sChemistry, SS, Comp, SThermo, GThermo)    \
-                                                                              \
-    typedef Foam::SS<Foam::Comp, Foam::SThermo, Foam::GThermo>                \
-        SS##Comp##SThermo##GThermo;                                           \
-                                                                              \
-    defineTemplateTypeNameAndDebugWithName                                    \
-    (                                                                         \
-        SS##Comp##SThermo##GThermo,                                           \
-        (Foam::word(SS##Comp##SThermo##GThermo::typeName_()) + "<"#Comp","    \
-        + SThermo::typeName() + "," + GThermo::typeName() + ">").c_str(),     \
-        0                                                                     \
+#define makeSolidGasChemistryModel(sChemistry, SS, Comp, SThermo, GThermo)     \
+                                                                               \
+    typedef Foam::SS<Foam::Comp, Foam::SThermo, Foam::GThermo>                 \
+        SS##Comp##SThermo##GThermo;                                            \
+                                                                               \
+    defineTemplateTypeNameAndDebugWithName                                     \
+    (                                                                          \
+        SS##Comp##SThermo##GThermo,                                            \
+        (Foam::word(SS##Comp##SThermo##GThermo::typeName_()) + "<"#Comp","     \
+        + SThermo::typeName() + "," + GThermo::typeName() + ">").c_str(),      \
+        0                                                                      \
     );
 
 
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
index f638a865ef..0a888421cd 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
@@ -43,46 +43,46 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSolidChemistrySolverType(SS, Schem, Comp, SThermo, GThermo)       \
-                                                                              \
-    typedef SS<Schem<Comp, SThermo, GThermo>>                                \
-        SS##Schem##Comp##SThermo##GThermo;                                    \
-                                                                              \
-    defineTemplateTypeNameAndDebugWithName                                    \
-    (                                                                         \
-        SS##Schem##Comp##SThermo##GThermo,                                    \
-        (#SS"<" + word(Schem<Comp, SThermo, GThermo>::typeName_())            \
-      + "<"#Comp"," + SThermo::typeName()                                     \
-      + ","  + GThermo::typeName() + ">>").c_str(),                           \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        Comp,                                                                 \
-        SS##Schem##Comp##SThermo##GThermo,                                    \
-        fvMesh                                                                \
+#define makeSolidChemistrySolverType(SS, Schem, Comp, SThermo, GThermo)        \
+                                                                               \
+    typedef SS<Schem<Comp, SThermo, GThermo>>                                  \
+        SS##Schem##Comp##SThermo##GThermo;                                     \
+                                                                               \
+    defineTemplateTypeNameAndDebugWithName                                     \
+    (                                                                          \
+        SS##Schem##Comp##SThermo##GThermo,                                     \
+        (#SS"<" + word(Schem<Comp, SThermo, GThermo>::typeName_())             \
+      + "<"#Comp"," + SThermo::typeName()                                      \
+      + ","  + GThermo::typeName() + ">>").c_str(),                            \
+        0                                                                      \
+    );                                                                         \
+                                                                               \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        Comp,                                                                  \
+        SS##Schem##Comp##SThermo##GThermo,                                     \
+        fvMesh                                                                 \
     );
 
 
-#define makeSolidChemistrySolverTypes(SolidChem, Comp, SThermo, GThermo)      \
-                                                                              \
-    makeSolidChemistrySolverType                                              \
-    (                                                                         \
-        noChemistrySolver,                                                    \
-        SolidChem,                                                            \
-        Comp,                                                                 \
-        SThermo,                                                              \
-        GThermo                                                               \
-    );                                                                        \
-                                                                              \
-    makeSolidChemistrySolverType                                              \
-    (                                                                         \
-        ode,                                                                  \
-        SolidChem,                                                            \
-        Comp,                                                                 \
-        SThermo,                                                              \
-        GThermo                                                               \
+#define makeSolidChemistrySolverTypes(SolidChem, Comp, SThermo, GThermo)       \
+                                                                               \
+    makeSolidChemistrySolverType                                               \
+    (                                                                          \
+        noChemistrySolver,                                                     \
+        SolidChem,                                                             \
+        Comp,                                                                  \
+        SThermo,                                                               \
+        GThermo                                                                \
+    );                                                                         \
+                                                                               \
+    makeSolidChemistrySolverType                                               \
+    (                                                                          \
+        ode,                                                                   \
+        SolidChem,                                                             \
+        Comp,                                                                  \
+        SThermo,                                                               \
+        GThermo                                                                \
     );
 
 
diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
index 7674c457d7..306bf3fddb 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
@@ -45,45 +45,45 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSolidReaction(ReactionType, Thermo, ReactionRate)                 \
-                                                                              \
-    typedef solidReaction<Thermo> solidReaction##Thermo;                      \
-                                                                              \
-    typedef Reaction<Thermo> Reaction##Thermo;                                \
-                                                                              \
-    typedef ReactionType<solidReaction, Thermo, ReactionRate>                 \
-        ReactionType##Thermo##ReactionRate;                                   \
-                                                                              \
-    defineTemplateRunTimeSelectionTable(Reaction##Thermo, Istream);           \
-    defineTemplateRunTimeSelectionTable(Reaction##Thermo, dictionary);        \
-                                                                              \
-    defineTemplateTypeNameAndDebug(solidReaction##Thermo, 0);                 \
-    defineTemplateTypeNameAndDebug(Reaction##Thermo, 0);                      \
-                                                                              \
-    template<>                                                                \
-    const word ReactionType##Thermo##ReactionRate::typeName                   \
-    (                                                                         \
-        ReactionType::typeName_()                                             \
-      + ReactionRate::type()                                                  \
-      + solidReaction##Thermo::typeName_()                                    \
-    );                                                                        \
-                                                                              \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        Reaction##Thermo,                                                     \
-        ReactionType##Thermo##ReactionRate,                                   \
-        Istream                                                               \
-    );                                                                        \
-                                                                              \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        Reaction##Thermo,                                                     \
-        ReactionType##Thermo##ReactionRate,                                   \
-        dictionary                                                            \
+#define makeSolidReaction(ReactionType, Thermo, ReactionRate)                  \
+                                                                               \
+    typedef solidReaction<Thermo> solidReaction##Thermo;                       \
+                                                                               \
+    typedef Reaction<Thermo> Reaction##Thermo;                                 \
+                                                                               \
+    typedef ReactionType<solidReaction, Thermo, ReactionRate>                  \
+        ReactionType##Thermo##ReactionRate;                                    \
+                                                                               \
+    defineTemplateRunTimeSelectionTable(Reaction##Thermo, Istream);            \
+    defineTemplateRunTimeSelectionTable(Reaction##Thermo, dictionary);         \
+                                                                               \
+    defineTemplateTypeNameAndDebug(solidReaction##Thermo, 0);                  \
+    defineTemplateTypeNameAndDebug(Reaction##Thermo, 0);                       \
+                                                                               \
+    template<>                                                                 \
+    const word ReactionType##Thermo##ReactionRate::typeName                    \
+    (                                                                          \
+        ReactionType::typeName_()                                              \
+      + ReactionRate::type()                                                   \
+      + solidReaction##Thermo::typeName_()                                     \
+    );                                                                         \
+                                                                               \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        Reaction##Thermo,                                                      \
+        ReactionType##Thermo##ReactionRate,                                    \
+        Istream                                                                \
+    );                                                                         \
+                                                                               \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        Reaction##Thermo,                                                      \
+        ReactionType##Thermo##ReactionRate,                                    \
+        dictionary                                                             \
     );
 
-#define makeSolidIRReactions(Thermo, ReactionRate)                            \
-                                                                              \
+#define makeSolidIRReactions(Thermo, ReactionRate)                             \
+                                                                               \
     makeSolidReaction(IrreversibleReaction, Thermo, ReactionRate)
 
 
diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/makeReactingSolidThermo.H b/src/thermophysicalModels/solidThermo/solidReactionThermo/makeReactingSolidThermo.H
index 34c958b106..56de02ffd2 100644
--- a/src/thermophysicalModels/solidThermo/solidReactionThermo/makeReactingSolidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/makeReactingSolidThermo.H
@@ -37,60 +37,60 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 #define makeSolidReactionMixtureThermo(BaseThermo,Cthermo,Mixture,ThermoPhys) \
-                                                                              \
-typedef SpecieMixture                                                         \
-    <                                                                         \
-        Mixture                                                               \
-        <                                                                     \
-            ThermoPhys                                                        \
-        >                                                                     \
-    > SpecieMixture##Mixture##ThermoPhys;                                     \
-                                                                              \
-typedef                                                                       \
-    heThermo                                                                  \
-    <                                                                         \
-        BaseThermo,                                                           \
-        SpecieMixture##Mixture##ThermoPhys                                    \
-    > heThermo##Mixture##ThermoPhys;                                          \
-                                                                              \
-typedef                                                                       \
-    Cthermo                                                                   \
-    <                                                                         \
-        BaseThermo,                                                           \
-        SpecieMixture##Mixture##ThermoPhys                                    \
-    > Cthermo##Mixture##ThermoPhys;                                           \
-                                                                              \
-                                                                              \
-defineTemplateTypeNameAndDebugWithName                                        \
-(                                                                             \
-    Cthermo##Mixture##ThermoPhys,                                             \
-    (                                                                         \
-        #Cthermo"<"#Mixture"<"                                                \
-      + ThermoPhys::typeName()                                                \
-      + ">>"                                                                  \
-    ).c_str(),                                                                \
-    0                                                                         \
-);                                                                            \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    basicThermo,                                                              \
-    Cthermo##Mixture##ThermoPhys,                                             \
-    fvMesh                                                                    \
-);                                                                            \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    BaseThermo,                                                               \
-    Cthermo##Mixture##ThermoPhys,                                             \
-    fvMesh                                                                    \
-);                                                                            \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    BaseThermo,                                                               \
-    Cthermo##Mixture##ThermoPhys,                                             \
-    dictionary                                                                \
+                                                                               \
+typedef SpecieMixture                                                          \
+    <                                                                          \
+        Mixture                                                                \
+        <                                                                      \
+            ThermoPhys                                                         \
+        >                                                                      \
+    > SpecieMixture##Mixture##ThermoPhys;                                      \
+                                                                               \
+typedef                                                                        \
+    heThermo                                                                   \
+    <                                                                          \
+        BaseThermo,                                                            \
+        SpecieMixture##Mixture##ThermoPhys                                     \
+    > heThermo##Mixture##ThermoPhys;                                           \
+                                                                               \
+typedef                                                                        \
+    Cthermo                                                                    \
+    <                                                                          \
+        BaseThermo,                                                            \
+        SpecieMixture##Mixture##ThermoPhys                                     \
+    > Cthermo##Mixture##ThermoPhys;                                            \
+                                                                               \
+                                                                               \
+defineTemplateTypeNameAndDebugWithName                                         \
+(                                                                              \
+    Cthermo##Mixture##ThermoPhys,                                              \
+    (                                                                          \
+        #Cthermo"<"#Mixture"<"                                                 \
+      + ThermoPhys::typeName()                                                 \
+      + ">>"                                                                   \
+    ).c_str(),                                                                 \
+    0                                                                          \
+);                                                                             \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    basicThermo,                                                               \
+    Cthermo##Mixture##ThermoPhys,                                              \
+    fvMesh                                                                     \
+);                                                                             \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    BaseThermo,                                                                \
+    Cthermo##Mixture##ThermoPhys,                                              \
+    fvMesh                                                                     \
+);                                                                             \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    BaseThermo,                                                                \
+    Cthermo##Mixture##ThermoPhys,                                              \
+    dictionary                                                                 \
 );
 
 
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
index 07b6ffb050..14f564e268 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
@@ -36,124 +36,124 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 #define makeSolidThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\
-                                                                              \
-                                                                              \
-typedef                                                                       \
-    Transport                                                                 \
-    <                                                                         \
-        species::thermo                                                       \
-        <                                                                     \
-            Thermo                                                            \
-            <                                                                 \
-                EqnOfState                                                    \
-                <                                                             \
-                    Specie                                                    \
-                >                                                             \
-            >,                                                                \
-            Type                                                              \
-        >                                                                     \
-    > Transport##Type##Thermo##EqnOfState##Specie;                            \
-                                                                              \
-typedef                                                                       \
-    heThermo                                                                  \
-    <                                                                         \
-        BaseThermo,                                                           \
-        Mixture<Transport##Type##Thermo##EqnOfState##Specie>                  \
-    > heThermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie;         \
-                                                                              \
-typedef                                                                       \
-    Cthermo                                                                   \
-    <                                                                         \
-        BaseThermo,                                                           \
-        Mixture<Transport##Type##Thermo##EqnOfState##Specie>                  \
-    > Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie;          \
-                                                                              \
-                                                                              \
-defineTemplateTypeNameAndDebugWithName                                        \
-(                                                                             \
-    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,            \
-    (                                                                         \
-        #Cthermo"<"#Mixture"<"                                                \
-      + Transport##Type##Thermo##EqnOfState##Specie::typeName()               \
-      + ">>"                                                                  \
-    ).c_str(),                                                                \
-    0                                                                         \
-);                                                                            \
-                                                                              \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    basicThermo,                                                              \
-    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,            \
-    fvMesh                                                                    \
-);                                                                            \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    BaseThermo,                                                               \
-    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,            \
-    fvMesh                                                                    \
-);                                                                            \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    BaseThermo,                                                               \
-    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,            \
-    dictionary                                                                \
+                                                                               \
+                                                                               \
+typedef                                                                        \
+    Transport                                                                  \
+    <                                                                          \
+        species::thermo                                                        \
+        <                                                                      \
+            Thermo                                                             \
+            <                                                                  \
+                EqnOfState                                                     \
+                <                                                              \
+                    Specie                                                     \
+                >                                                              \
+            >,                                                                 \
+            Type                                                               \
+        >                                                                      \
+    > Transport##Type##Thermo##EqnOfState##Specie;                             \
+                                                                               \
+typedef                                                                        \
+    heThermo                                                                   \
+    <                                                                          \
+        BaseThermo,                                                            \
+        Mixture<Transport##Type##Thermo##EqnOfState##Specie>                   \
+    > heThermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie;          \
+                                                                               \
+typedef                                                                        \
+    Cthermo                                                                    \
+    <                                                                          \
+        BaseThermo,                                                            \
+        Mixture<Transport##Type##Thermo##EqnOfState##Specie>                   \
+    > Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie;           \
+                                                                               \
+                                                                               \
+defineTemplateTypeNameAndDebugWithName                                         \
+(                                                                              \
+    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,             \
+    (                                                                          \
+        #Cthermo"<"#Mixture"<"                                                 \
+      + Transport##Type##Thermo##EqnOfState##Specie::typeName()                \
+      + ">>"                                                                   \
+    ).c_str(),                                                                 \
+    0                                                                          \
+);                                                                             \
+                                                                               \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    basicThermo,                                                               \
+    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,             \
+    fvMesh                                                                     \
+);                                                                             \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    BaseThermo,                                                                \
+    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,             \
+    fvMesh                                                                     \
+);                                                                             \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    BaseThermo,                                                                \
+    Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie,             \
+    dictionary                                                                 \
 );
 
 
 
 #define makeSolidThermoPhysicsType(BaseThermo,Cthermo,Mixture,SolidPhysicsType)\
-                                                                              \
-                                                                              \
-                                                                              \
-typedef                                                                       \
-    heThermo                                                                  \
-    <                                                                         \
-        BaseThermo,                                                           \
-        Mixture<SolidPhysicsType>                                             \
-    > heThermo##Mixture##SolidPhysicsType;                                    \
-                                                                              \
-typedef                                                                       \
-    Cthermo                                                                   \
-    <                                                                         \
-        BaseThermo,                                                           \
-        Mixture<SolidPhysicsType>                                             \
-    > Cthermo##Mixture##SolidPhysicsType;                                     \
-                                                                              \
-                                                                              \
-defineTemplateTypeNameAndDebugWithName                                        \
-(                                                                             \
-    Cthermo##Mixture##SolidPhysicsType,                                       \
-    (                                                                         \
-        #Cthermo"<"#Mixture"<"                                                \
-      + SolidPhysicsType::typeName()                                          \
-      + ">>"                                                                  \
-    ).c_str(),                                                                \
-    0                                                                         \
-);                                                                            \
-                                                                              \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    basicThermo,                                                              \
-    Cthermo##Mixture##SolidPhysicsType,                                       \
-    fvMesh                                                                    \
-);                                                                            \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    BaseThermo,                                                               \
-    Cthermo##Mixture##SolidPhysicsType,                                       \
-    fvMesh                                                                    \
-);                                                                            \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    BaseThermo,                                                               \
-    Cthermo##Mixture##SolidPhysicsType,                                       \
-    dictionary                                                                \
+                                                                               \
+                                                                               \
+                                                                               \
+typedef                                                                        \
+    heThermo                                                                   \
+    <                                                                          \
+        BaseThermo,                                                            \
+        Mixture<SolidPhysicsType>                                              \
+    > heThermo##Mixture##SolidPhysicsType;                                     \
+                                                                               \
+typedef                                                                        \
+    Cthermo                                                                    \
+    <                                                                          \
+        BaseThermo,                                                            \
+        Mixture<SolidPhysicsType>                                              \
+    > Cthermo##Mixture##SolidPhysicsType;                                      \
+                                                                               \
+                                                                               \
+defineTemplateTypeNameAndDebugWithName                                         \
+(                                                                              \
+    Cthermo##Mixture##SolidPhysicsType,                                        \
+    (                                                                          \
+        #Cthermo"<"#Mixture"<"                                                 \
+      + SolidPhysicsType::typeName()                                           \
+      + ">>"                                                                   \
+    ).c_str(),                                                                 \
+    0                                                                          \
+);                                                                             \
+                                                                               \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    basicThermo,                                                               \
+    Cthermo##Mixture##SolidPhysicsType,                                        \
+    fvMesh                                                                     \
+);                                                                             \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    BaseThermo,                                                                \
+    Cthermo##Mixture##SolidPhysicsType,                                        \
+    fvMesh                                                                     \
+);                                                                             \
+                                                                               \
+addToRunTimeSelectionTable                                                     \
+(                                                                              \
+    BaseThermo,                                                                \
+    Cthermo##Mixture##SolidPhysicsType,                                        \
+    dictionary                                                                 \
 );
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
index e2dde3e35a..e3dbfcc2d9 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
@@ -226,13 +226,13 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeIcoPolynomial(PolySize)                                          \
-                                                                             \
-defineTemplateTypeNameAndDebugWithName                                       \
-(                                                                            \
-    icoPolynomial<Specie, PolySize>,                                         \
-    "icoPolynomial<"#PolySize">",                                            \
-    0                                                                        \
+#define makeIcoPolynomial(PolySize)                                            \
+                                                                               \
+defineTemplateTypeNameAndDebugWithName                                         \
+(                                                                              \
+    icoPolynomial<Specie, PolySize>,                                           \
+    "icoPolynomial<"#PolySize">",                                              \
+    0                                                                          \
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
index 0b72f6800d..064f5e43d7 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
@@ -57,106 +57,106 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeReaction(Thermo, ReactionType, ReactionRate)                      \
-                                                                              \
-    typedef Reaction<Thermo> Reaction##Thermo;                                \
-                                                                              \
-    typedef ReactionType<Reaction, Thermo, ReactionRate>                      \
-        ReactionType##Thermo##ReactionRate;                                   \
-                                                                              \
-    template<>                                                                \
-    const word ReactionType##Thermo##ReactionRate::typeName                   \
-    (                                                                         \
-        ReactionType::typeName_()                                             \
-      + ReactionRate::type()                                                  \
-      + Reaction##Thermo::typeName_()                                         \
-    );                                                                        \
-                                                                              \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        Reaction##Thermo,                                                     \
-        ReactionType##Thermo##ReactionRate,                                   \
-        Istream                                                               \
-    );                                                                        \
-                                                                              \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        Reaction##Thermo,                                                     \
-        ReactionType##Thermo##ReactionRate,                                   \
-        dictionary                                                            \
+#define makeReaction(Thermo, ReactionType, ReactionRate)                       \
+                                                                               \
+    typedef Reaction<Thermo> Reaction##Thermo;                                 \
+                                                                               \
+    typedef ReactionType<Reaction, Thermo, ReactionRate>                       \
+        ReactionType##Thermo##ReactionRate;                                    \
+                                                                               \
+    template<>                                                                 \
+    const word ReactionType##Thermo##ReactionRate::typeName                    \
+    (                                                                          \
+        ReactionType::typeName_()                                              \
+      + ReactionRate::type()                                                   \
+      + Reaction##Thermo::typeName_()                                          \
+    );                                                                         \
+                                                                               \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        Reaction##Thermo,                                                      \
+        ReactionType##Thermo##ReactionRate,                                    \
+        Istream                                                                \
+    );                                                                         \
+                                                                               \
+    addToRunTimeSelectionTable                                                 \
+    (                                                                          \
+        Reaction##Thermo,                                                      \
+        ReactionType##Thermo##ReactionRate,                                    \
+        dictionary                                                             \
     );
 
 
 #define makePressureDependentReaction\
-(                                                                             \
-    Thermo,                                                                   \
-    Reaction,                                                                 \
-    PressureDependentReactionRate,                                            \
-    ReactionRate,                                                             \
-    FallOffFunction                                                           \
-)                                                                             \
-                                                                              \
-    typedef PressureDependentReactionRate<ReactionRate, FallOffFunction>      \
-        PressureDependentReactionRate##ReactionRate##FallOffFunction;         \
-                                                                              \
-    makeReaction                                                              \
-    (                                                                         \
-        Thermo,                                                               \
-        Reaction,                                                             \
-        PressureDependentReactionRate##ReactionRate##FallOffFunction          \
+(                                                                              \
+    Thermo,                                                                    \
+    Reaction,                                                                  \
+    PressureDependentReactionRate,                                             \
+    ReactionRate,                                                              \
+    FallOffFunction                                                            \
+)                                                                              \
+                                                                               \
+    typedef PressureDependentReactionRate<ReactionRate, FallOffFunction>       \
+        PressureDependentReactionRate##ReactionRate##FallOffFunction;          \
+                                                                               \
+    makeReaction                                                               \
+    (                                                                          \
+        Thermo,                                                                \
+        Reaction,                                                              \
+        PressureDependentReactionRate##ReactionRate##FallOffFunction           \
     )
 
 
-#define makeIRReactions(Thermo, ReactionRate)                                 \
-                                                                              \
-    makeReaction(Thermo, IrreversibleReaction, ReactionRate)                  \
-                                                                              \
+#define makeIRReactions(Thermo, ReactionRate)                                  \
+                                                                               \
+    makeReaction(Thermo, IrreversibleReaction, ReactionRate)                   \
+                                                                               \
     makeReaction(Thermo, ReversibleReaction, ReactionRate)
 
 
-#define makeIRNReactions(Thermo, ReactionRate)                                \
-                                                                              \
-    makeIRReactions(Thermo, ReactionRate)                                     \
-                                                                              \
+#define makeIRNReactions(Thermo, ReactionRate)                                 \
+                                                                               \
+    makeIRReactions(Thermo, ReactionRate)                                      \
+                                                                               \
     makeReaction(Thermo, NonEquilibriumReversibleReaction, ReactionRate)
 
 
 #define makePressureDependentReactions(Thermo, ReactionRate, FallOffFunction) \
-                                                                              \
-    makePressureDependentReaction                                             \
-    (                                                                         \
-        Thermo,                                                               \
-        IrreversibleReaction,                                                 \
-        FallOffReactionRate,                                                  \
-        ReactionRate,                                                         \
-        FallOffFunction                                                       \
-    )                                                                         \
-                                                                              \
-    makePressureDependentReaction                                             \
-    (                                                                         \
-        Thermo,                                                               \
-        ReversibleReaction,                                                   \
-        FallOffReactionRate,                                                  \
-        ReactionRate,                                                         \
-        FallOffFunction                                                       \
-    )                                                                         \
-                                                                              \
-    makePressureDependentReaction                                             \
-    (                                                                         \
-        Thermo,                                                               \
-        IrreversibleReaction,                                                 \
-        ChemicallyActivatedReactionRate,                                      \
-        ReactionRate,                                                         \
-        FallOffFunction                                                       \
-    )                                                                         \
-                                                                              \
-    makePressureDependentReaction                                             \
-    (                                                                         \
-        Thermo,                                                               \
-        ReversibleReaction,                                                   \
-        ChemicallyActivatedReactionRate,                                      \
-        ReactionRate,                                                         \
-        FallOffFunction                                                       \
+                                                                               \
+    makePressureDependentReaction                                              \
+    (                                                                          \
+        Thermo,                                                                \
+        IrreversibleReaction,                                                  \
+        FallOffReactionRate,                                                   \
+        ReactionRate,                                                          \
+        FallOffFunction                                                        \
+    )                                                                          \
+                                                                               \
+    makePressureDependentReaction                                              \
+    (                                                                          \
+        Thermo,                                                                \
+        ReversibleReaction,                                                    \
+        FallOffReactionRate,                                                   \
+        ReactionRate,                                                          \
+        FallOffFunction                                                        \
+    )                                                                          \
+                                                                               \
+    makePressureDependentReaction                                              \
+    (                                                                          \
+        Thermo,                                                                \
+        IrreversibleReaction,                                                  \
+        ChemicallyActivatedReactionRate,                                       \
+        ReactionRate,                                                          \
+        FallOffFunction                                                        \
+    )                                                                          \
+                                                                               \
+    makePressureDependentReaction                                              \
+    (                                                                          \
+        Thermo,                                                                \
+        ReversibleReaction,                                                    \
+        ChemicallyActivatedReactionRate,                                       \
+        ReactionRate,                                                          \
+        FallOffFunction                                                        \
     )
 
 

From 392310db22016ca9514626c4f4c7dad8971820a7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 11 Jan 2016 13:02:52 +0000
Subject: [PATCH 097/447] Update headers

---
 bin/tools/foamListSourceFiles                                   | 2 +-
 src/OpenFOAM/containers/Lists/PackedList/PackedList.C           | 2 +-
 .../globalFunctions/addToGlobalFunctionSelectionTable.H         | 2 +-
 .../globalFunctions/globalFunctionSelectionTables.H             | 2 +-
 .../memberFunctions/memberFunctionSelectionTables.H             | 2 +-
 .../addToStaticMemberFunctionSelectionTable.H                   | 2 +-
 .../staticMemberFunctions/staticMemberFunctionSelectionTables.H | 2 +-
 src/OpenFOAM/db/typeInfo/className.H                            | 2 +-
 src/OpenFOAM/db/typeInfo/typeInfo.H                             | 2 +-
 .../dimensionedTypes/dimensionedScalar/dimensionedScalar.C      | 2 +-
 src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C | 2 +-
 src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H | 2 +-
 src/OpenFOAM/fields/Fields/Field/FieldM.H                       | 2 +-
 src/OpenFOAM/fields/Fields/scalarField/scalarField.C            | 2 +-
 .../pointPatchFields/pointPatchField/pointPatchFieldFunctions.H | 2 +-
 .../fields/pointPatchFields/pointPatchField/pointPatchFields.C  | 2 +-
 src/OpenFOAM/global/constants/dimensionedConstants.H            | 2 +-
 src/OpenFOAM/global/debug/defineDebugSwitch.H                   | 2 +-
 .../interpolationTable/tableReaders/tableReaders.C              | 2 +-
 src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H   | 2 +-
 .../matrices/LduMatrix/Preconditioners/lduPreconditioners.C     | 2 +-
 src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C        | 2 +-
 src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C            | 2 +-
 src/OpenFOAM/primitives/hashes/Hasher/Hasher.C                  | 2 +-
 src/OpenFOAM/primitives/hashes/SHA1/SHA1.C                      | 2 +-
 src/OpenFOAM/primitives/ops/ops.H                               | 2 +-
 src/fileFormats/sampledSetWriters/writers.C                     | 2 +-
 .../fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C        | 2 +-
 .../convectionSchemes/convectionScheme/convectionSchemes.C      | 2 +-
 .../laplacianSchemes/laplacianScheme/laplacianSchemes.C         | 2 +-
 .../limitedSurfaceInterpolationSchemes.C                        | 2 +-
 .../surfaceInterpolationScheme/surfaceInterpolationSchemes.C    | 2 +-
 src/lagrangian/basic/particle/particleMacros.H                  | 2 +-
 .../include/makeCoalParcelSurfaceReactionModels.H               | 2 +-
 .../intermediate/parcels/include/makeMPPICParcelDampingModels.H | 2 +-
 .../parcels/include/makeMPPICParcelIsotropyModels.H             | 2 +-
 .../intermediate/parcels/include/makeMPPICParcelPackingModels.H | 2 +-
 .../parcels/include/makeParcelCloudFunctionObjects.H            | 2 +-
 .../intermediate/parcels/include/makeParcelCollisionModels.H    | 2 +-
 .../intermediate/parcels/include/makeParcelDispersionModels.H   | 2 +-
 src/lagrangian/intermediate/parcels/include/makeParcelForces.H  | 2 +-
 .../intermediate/parcels/include/makeParcelHeatTransferModels.H | 2 +-
 .../intermediate/parcels/include/makeParcelInjectionModels.H    | 2 +-
 .../parcels/include/makeParcelPatchInteractionModels.H          | 2 +-
 .../parcels/include/makeParcelStochasticCollisionModels.H       | 2 +-
 .../intermediate/parcels/include/makeParcelSurfaceFilmModels.H  | 2 +-
 .../include/makeReactingMultiphaseParcelCompositionModels.H     | 2 +-
 .../makeReactingMultiphaseParcelDevolatilisationModels.H        | 2 +-
 .../include/makeReactingMultiphaseParcelInjectionModels.H       | 2 +-
 .../makeReactingMultiphaseParcelStochasticCollisionModels.H     | 2 +-
 .../include/makeReactingMultiphaseParcelSurfaceReactionModels.H | 2 +-
 .../parcels/include/makeReactingParcelCompositionModels.H       | 2 +-
 .../parcels/include/makeReactingParcelInjectionModels.H         | 2 +-
 .../parcels/include/makeReactingParcelPhaseChangeModels.H       | 2 +-
 .../parcels/include/makeReactingParcelSurfaceFilmModels.H       | 2 +-
 .../intermediate/parcels/include/makeThermoParcelForces.H       | 2 +-
 .../parcels/include/makeThermoParcelSurfaceFilmModels.H         | 2 +-
 .../spray/parcels/include/makeSprayParcelAtomizationModels.H    | 2 +-
 .../spray/parcels/include/makeSprayParcelBreakupModels.H        | 2 +-
 .../spray/parcels/include/makeSprayParcelInjectionModels.H      | 2 +-
 .../parcels/include/makeSprayParcelStochasticCollisionModels.H  | 2 +-
 .../parcels/include/makeParcelTurbulenceDispersionModels.H      | 2 +-
 .../parcels/include/makeThermoParcelTurbulenceForces.H          | 2 +-
 src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H  | 2 +-
 src/surfMesh/MeshedSurface/MeshedSurfaces.C                     | 2 +-
 src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C        | 2 +-
 src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C     | 2 +-
 src/thermophysicalModels/basic/fluidThermo/makeThermo.H         | 2 +-
 .../chemistryModel/chemistryModel/makeChemistryModel.H          | 2 +-
 .../radiation/submodels/sootModel/sootModel/makeSootTypes.H     | 2 +-
 .../solidChemistryModel/makeSolidChemistryModel.H               | 2 +-
 .../solidSpecie/reaction/reactions/makeSolidReaction.H          | 2 +-
 .../solidThermo/solidReactionThermo/makeReactingSolidThermo.H   | 2 +-
 .../solidThermo/solidThermo/makeSolidThermo.H                   | 2 +-
 .../specie/equationOfState/icoPolynomial/icoPolynomial.H        | 2 +-
 .../specie/reaction/reactions/makeReaction.H                    | 2 +-
 76 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/bin/tools/foamListSourceFiles b/bin/tools/foamListSourceFiles
index 857eba3161..72690d1bfd 100755
--- a/bin/tools/foamListSourceFiles
+++ b/bin/tools/foamListSourceFiles
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 2362b70c3b..c1b54b68b3 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
index 32894a9c7b..95914f3b56 100644
--- a/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
index 41f8ef7d6d..8e07ef5009 100644
--- a/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
index 6f3e6ee220..2bef103e93 100644
--- a/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
index 2652f40db3..29976b0447 100644
--- a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
index 347a537cc9..4a634b2f3c 100644
--- a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/typeInfo/className.H b/src/OpenFOAM/db/typeInfo/className.H
index b96b1c7a14..745da10fc5 100644
--- a/src/OpenFOAM/db/typeInfo/className.H
+++ b/src/OpenFOAM/db/typeInfo/className.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/typeInfo/typeInfo.H b/src/OpenFOAM/db/typeInfo/typeInfo.H
index a31934522c..c4379036c2 100644
--- a/src/OpenFOAM/db/typeInfo/typeInfo.H
+++ b/src/OpenFOAM/db/typeInfo/typeInfo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
index d306402fb5..a03d895bcf 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index bed9ed67af..69a2ecb50a 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 623fbd5034..b4817d45e0 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldM.H b/src/OpenFOAM/fields/Fields/Field/FieldM.H
index dc542bdb75..28d4788c17 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldM.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldM.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
index 75d7cc7c7a..654a2b4f3d 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H
index 5a6f0bb213..02ed0d8736 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C
index d6eff92481..0d2dd56830 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/global/constants/dimensionedConstants.H b/src/OpenFOAM/global/constants/dimensionedConstants.H
index f6d1e6c6f8..3863e64590 100644
--- a/src/OpenFOAM/global/constants/dimensionedConstants.H
+++ b/src/OpenFOAM/global/constants/dimensionedConstants.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/global/debug/defineDebugSwitch.H b/src/OpenFOAM/global/debug/defineDebugSwitch.H
index 85b60fb95b..219d01c349 100644
--- a/src/OpenFOAM/global/debug/defineDebugSwitch.H
+++ b/src/OpenFOAM/global/debug/defineDebugSwitch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C
index 43a3ea05ef..b2bea3a158 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
index ddb48c2d88..9781cf42cb 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C
index 6e7a334138..ace13865b7 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C b/src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C
index e830d7f6ca..8ff1d4f65c 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
index df439fc59d..c482ec8433 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
index 349fdd943a..17e5697980 100644
--- a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
+++ b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
index cb32fcf676..84c179262c 100644
--- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
+++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H
index cedeb733be..0db26d0026 100644
--- a/src/OpenFOAM/primitives/ops/ops.H
+++ b/src/OpenFOAM/primitives/ops/ops.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/fileFormats/sampledSetWriters/writers.C b/src/fileFormats/sampledSetWriters/writers.C
index 3ffe77bb45..f7f1018064 100644
--- a/src/fileFormats/sampledSetWriters/writers.C
+++ b/src/fileFormats/sampledSetWriters/writers.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
index 727065c940..61d4f1cf32 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionSchemes.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionSchemes.C
index 13671ef354..78fc2f57d6 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionSchemes.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionSchemes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianSchemes.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianSchemes.C
index 64ff659548..87b20c53db 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianSchemes.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianSchemes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationSchemes.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationSchemes.C
index 306b21de79..a382967fb2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationSchemes.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationSchemes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
index 9c0da30cb8..7332b7cbde 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/particle/particleMacros.H b/src/lagrangian/basic/particle/particleMacros.H
index bb78819302..3d95f1fbcb 100644
--- a/src/lagrangian/basic/particle/particleMacros.H
+++ b/src/lagrangian/basic/particle/particleMacros.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
index 0972e9670b..6aa801f696 100644
--- a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
+++ b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H
index 2700ddbe59..fc7361fb7b 100644
--- a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H
index 71fcd910d1..b84189e225 100644
--- a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H
index d8d1346833..b7ff5714ea 100644
--- a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
index 0c4fadfcae..e270bb22ac 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
index 5dda39e579..62501a9f08 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
index f14616ddd6..855d307277 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
index 35c60580e7..bab2f42a9c 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
index ef2269edf9..d81765d88c 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
index ca0941a07b..d8136ca4c5 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
index 7538ca5782..3f53216a3f 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H
index 3d01b13778..8a4eb6dfb7 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H
index f288865072..717acab458 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
index 0dcea59618..01fa83d79b 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
index a36c300161..3ba75db83f 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
index c81eb94b79..fe2608b5f2 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelStochasticCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelStochasticCollisionModels.H
index e06e79f674..74f6267648 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelStochasticCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelStochasticCollisionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
index 4a907f9a40..9eea5af471 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
index ba552b685c..f17cfc5558 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
index 8ab7e31bf4..6ede4d483c 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
index 9ceb1074a3..b2556cba13 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H
index 7fdb8a3bb8..c4ba34ef04 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelSurfaceFilmModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
index 77952175cb..0d1165397f 100644
--- a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
+++ b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H b/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H
index e22350ebc5..83a56fdb9d 100644
--- a/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeThermoParcelSurfaceFilmModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/spray/parcels/include/makeSprayParcelAtomizationModels.H b/src/lagrangian/spray/parcels/include/makeSprayParcelAtomizationModels.H
index 63ac235486..78c4c58f9f 100644
--- a/src/lagrangian/spray/parcels/include/makeSprayParcelAtomizationModels.H
+++ b/src/lagrangian/spray/parcels/include/makeSprayParcelAtomizationModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/spray/parcels/include/makeSprayParcelBreakupModels.H b/src/lagrangian/spray/parcels/include/makeSprayParcelBreakupModels.H
index 3ec1623b7c..866a30dfc1 100644
--- a/src/lagrangian/spray/parcels/include/makeSprayParcelBreakupModels.H
+++ b/src/lagrangian/spray/parcels/include/makeSprayParcelBreakupModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/spray/parcels/include/makeSprayParcelInjectionModels.H b/src/lagrangian/spray/parcels/include/makeSprayParcelInjectionModels.H
index 31e06311ba..0b6de500ac 100644
--- a/src/lagrangian/spray/parcels/include/makeSprayParcelInjectionModels.H
+++ b/src/lagrangian/spray/parcels/include/makeSprayParcelInjectionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/spray/parcels/include/makeSprayParcelStochasticCollisionModels.H b/src/lagrangian/spray/parcels/include/makeSprayParcelStochasticCollisionModels.H
index 714ff320ee..cf5cfca26e 100644
--- a/src/lagrangian/spray/parcels/include/makeSprayParcelStochasticCollisionModels.H
+++ b/src/lagrangian/spray/parcels/include/makeSprayParcelStochasticCollisionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H b/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
index 5925350cfb..f10a122057 100644
--- a/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
+++ b/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H b/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H
index 49a9386986..db6d224dd3 100644
--- a/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H
+++ b/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H b/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H
index 70e3eadaff..dd2331a1f5 100644
--- a/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H
+++ b/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaces.C b/src/surfMesh/MeshedSurface/MeshedSurfaces.C
index 14b22dc709..999c755c7e 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaces.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C
index 1a13e010a9..76750a14d4 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C
index 8ecb251bb3..400cafb148 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
index e8c1dff6df..8581ff5025 100644
--- a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
+++ b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H
index 2a63d03eb1..d28059ec3f 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H
index 26cab98a46..3a54e2246e 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
index 3edd3a9583..1a025f5d1e 100644
--- a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
index 306bf3fddb..bc17d12bb4 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/makeReactingSolidThermo.H b/src/thermophysicalModels/solidThermo/solidReactionThermo/makeReactingSolidThermo.H
index 56de02ffd2..19467060c3 100644
--- a/src/thermophysicalModels/solidThermo/solidReactionThermo/makeReactingSolidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/makeReactingSolidThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
index 14f564e268..e3f5437fa2 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
index e3dbfcc2d9..65ac610a17 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
index 064f5e43d7..74cf7c1e48 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From a6ae4f19aad50916c8834ea4adb1d9e2544f0e55 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 14 Jan 2016 16:34:15 +0000
Subject: [PATCH 098/447] mixedUnburntEnthalpyFvPatchScalarField: Corrected
 formatting

---
 .../mixedUnburntEnthalpyFvPatchScalarField.C  | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
index 11cbf9ff78..1d058ed2ad 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
@@ -1,33 +1,33 @@
- /*---------------------------------------------------------------------------*\
-   =========                 |
-   \\      /  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.
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2016 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 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.
+    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/>.
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
- \*---------------------------------------------------------------------------*/
+\*---------------------------------------------------------------------------*/
 
- #include "mixedUnburntEnthalpyFvPatchScalarField.H"
- #include "addToRunTimeSelectionTable.H"
- #include "fvPatchFieldMapper.H"
- #include "volFields.H"
- #include "psiuReactionThermo.H"
+#include "mixedUnburntEnthalpyFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "psiuReactionThermo.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 

From 36fc8595db40f2ba921440a0754aab225624c8df Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 14 Jan 2016 16:34:37 +0000
Subject: [PATCH 099/447] 
 reactionThermo/functionObjects/moleFractions/moleFractions: New
 functionObject to calculate and write mole-fraction fields

    This function object calculates mole-fraction fields from the mass-fraction
    fields of the psi/rhoReactionThermo and caches them for output and further
    post-processing.

    The names of the mole-fraction fields are obtained from the corresponding
    mass-fraction fields prepended by "X_"

    Example of function object specification:

        moleFractions
        {
            type psiReactionThermoMoleFractions;
        }

     or

        moleFractions
        {
            type rhoReactionThermoMoleFractions;
        }

    depending on the thermodynamics package used in the solver.
---
 .../reactionThermo/Make/files                 |   2 +
 .../moleFractions/moleFractions.C             | 144 +++++++++++++++
 .../moleFractions/moleFractions.H             | 174 ++++++++++++++++++
 .../moleFractionsFunctionObjects.C            |  76 ++++++++
 .../moleFractionsFunctionObjects.H            |  61 ++++++
 5 files changed, 457 insertions(+)
 create mode 100644 src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C
 create mode 100644 src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H
 create mode 100644 src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.C
 create mode 100644 src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.H

diff --git a/src/thermophysicalModels/reactionThermo/Make/files b/src/thermophysicalModels/reactionThermo/Make/files
index 57f14fc0d1..8870103dfe 100644
--- a/src/thermophysicalModels/reactionThermo/Make/files
+++ b/src/thermophysicalModels/reactionThermo/Make/files
@@ -19,4 +19,6 @@ derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField
 derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C
 derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
 
+functionObjects/moleFractions/moleFractionsFunctionObjects.C
+
 LIB = $(FOAM_LIBBIN)/libreactionThermophysicalModels
diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C
new file mode 100644
index 0000000000..4ae994033c
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "moleFractions.H"
+#include "basicThermo.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class ThermoType>
+void Foam::moleFractions<ThermoType>::calculateMoleFractions()
+{
+    const ThermoType& thermo =
+        mesh_.lookupObject<ThermoType>(basicThermo::dictName);
+
+    const PtrList<volScalarField>& Y = thermo.composition().Y();
+
+    const volScalarField W(thermo.composition().W());
+
+    forAll(Y, i)
+    {
+        X_[i] = W*Y[i]/thermo.composition().W(i);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ThermoType>
+Foam::moleFractions<ThermoType>::moleFractions
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    functionObjectFile(obr, name),
+    name_(name),
+    mesh_(refCast<const fvMesh>(obr))
+{
+    if (mesh_.foundObject<ThermoType>(basicThermo::dictName))
+    {
+        const ThermoType& thermo =
+            mesh_.lookupObject<ThermoType>(basicThermo::dictName);
+
+        const PtrList<volScalarField>& Y = thermo.composition().Y();
+
+        X_.setSize(Y.size());
+
+        forAll(Y, i)
+        {
+            X_.set
+            (
+                i,
+                new volScalarField
+                (
+                    IOobject
+                    (
+                        "X_" + Y[i].name(),
+                        mesh_.time().timeName(),
+                        mesh_,
+                        IOobject::NO_READ,
+                        IOobject::AUTO_WRITE
+                    ),
+                    mesh_,
+                    dimensionedScalar("X", dimless, 0)
+                )
+            );
+        }
+
+        calculateMoleFractions();
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Cannot find thermodynamics model of type "
+            << ThermoType::typeName
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class ThermoType>
+Foam::moleFractions<ThermoType>::~moleFractions()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ThermoType>
+void Foam::moleFractions<ThermoType>::read
+(
+    const dictionary& dict
+)
+{}
+
+
+template<class ThermoType>
+void Foam::moleFractions<ThermoType>::execute()
+{
+    calculateMoleFractions();
+}
+
+
+template<class ThermoType>
+void Foam::moleFractions<ThermoType>::end()
+{}
+
+
+template<class ThermoType>
+void Foam::moleFractions<ThermoType>::timeSet()
+{}
+
+
+template<class ThermoType>
+void Foam::moleFractions<ThermoType>::write()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H
new file mode 100644
index 0000000000..b699d16005
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::moleFractions
+
+Description
+    This function object calculates mole-fraction fields from the mass-fraction
+    fields of the psi/rhoReactionThermo and caches them for output and further
+    post-processing.
+
+    The names of the mole-fraction fields are obtained from the corresponding
+    mass-fraction fields prepended by "X_"
+
+    Example of function object specification:
+    \verbatim
+    moleFractions
+    {
+        type psiReactionThermoMoleFractions;
+    }
+    \endverbatim
+    or
+    \verbatim
+    moleFractions
+    {
+        type rhoReactionThermoMoleFractions;
+    }
+    \endverbatim
+    depending on the thermodynamics package used in the solver.
+
+SeeAlso
+    Foam::functionObject
+    Foam::OutputFilterFunctionObject
+
+SourceFiles
+    moleFractions.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef moleFractions_H
+#define moleFractions_H
+
+#include "functionObjectFile.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class moleFractions Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ThermoType>
+class moleFractions
+:
+    public functionObjectFile
+{
+    // Private data
+
+        //- Name of moleFractions functionObject
+        word name_;
+
+        //- Reference to the mesh
+        const fvMesh& mesh_;
+
+        //- Species mole fractions
+        PtrList<volScalarField> X_;
+
+
+    // Private Member Functions
+
+        //- Calculate the mole fraction fields
+        virtual void calculateMoleFractions();
+
+        //- Disallow default bitwise copy construct
+        moleFractions(const moleFractions&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const moleFractions&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("moleFractions");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        moleFractions
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~moleFractions();
+
+
+    // Member Functions
+
+        //- Return name of the moleFractions functionObject
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the moleFractions data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Called when time was set at the end of the Time::operator++
+        virtual void timeSet();
+
+        //- Calculate the moleFractions and write
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const polyMesh&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "moleFractions.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.C b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.C
new file mode 100644
index 0000000000..09c5a1d8cc
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.C
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "moleFractionsFunctionObjects.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTemplateTypeNameAndDebugWithName
+    (
+        moleFractions<psiReactionThermo>,
+        "psiReactionThermoMoleFractions",
+        0
+    );
+
+    defineTemplateTypeNameAndDebugWithName
+    (
+        psiReactionThermoMoleFractionsFunctionObject,
+        "psiReactionThermoMoleFractions",
+        0
+    );
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        psiReactionThermoMoleFractionsFunctionObject,
+        dictionary
+    );
+
+    defineTemplateTypeNameAndDebugWithName
+    (
+        moleFractions<rhoReactionThermo>,
+        "rhoReactionThermoMoleFractions",
+        0
+    );
+
+    defineTemplateTypeNameAndDebugWithName
+    (
+        rhoReactionThermoMoleFractionsFunctionObject,
+        "rhoReactionThermoMoleFractions",
+        0
+    );
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        rhoReactionThermoMoleFractionsFunctionObject,
+        dictionary
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.H b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.H
new file mode 100644
index 0000000000..21092bba3b
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.H
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::moleFractionsFunctionObject
+
+Description
+    FunctionObject wrapper around moleFractions to allow
+    it to be created via the functions entry within controlDict.
+
+SourceFiles
+    moleFractionsFunctionObjects.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef moleFractionsFunctionObjects_H
+#define moleFractionsFunctionObjects_H
+
+#include "OutputFilterFunctionObject.H"
+#include "moleFractions.H"
+#include "psiReactionThermo.H"
+#include "rhoReactionThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<moleFractions<psiReactionThermo>>
+        psiReactionThermoMoleFractionsFunctionObject;
+
+
+    typedef OutputFilterFunctionObject<moleFractions<rhoReactionThermo>>
+        rhoReactionThermoMoleFractionsFunctionObject;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From fa191d345638001feba98e49d29c7be2c942c5cb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 15 Jan 2016 14:47:56 +0000
Subject: [PATCH 100/447] functionObjects/utilities/scalarTransport: Set UName_
 during construction for boundaryTypes() Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1972

---
 .../scalarTransport/scalarTransport.C         | 216 ++++++++----------
 .../scalarTransport/scalarTransport.H         |   5 +-
 2 files changed, 102 insertions(+), 119 deletions(-)

diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
index b3412b0555..8e0b2bbfc3 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,10 +149,9 @@ Foam::scalarTransport::scalarTransport
 :
     name_(name),
     mesh_(refCast<const fvMesh>(obr)),
-    active_(true),
-    phiName_("phi"),
-    UName_("U"),
-    rhoName_("rho"),
+    phiName_(dict.lookupOrDefault<word>("phiName", "phi")),
+    UName_(dict.lookupOrDefault<word>("UName", "U")),
+    rhoName_(dict.lookupOrDefault<word>("rhoName", "rho")),
     DT_(0.0),
     userDT_(false),
     resetOnStartUp_(false),
@@ -193,137 +192,124 @@ Foam::scalarTransport::~scalarTransport()
 
 void Foam::scalarTransport::read(const dictionary& dict)
 {
-    if (active_)
+    Info<< type() << ":" << nl;
+
+    phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
+    UName_ = dict.lookupOrDefault<word>("UName", "U");
+    rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
+
+    userDT_ = false;
+    if (dict.readIfPresent("DT", DT_))
     {
-        Info<< type() << ":" << nl;
-
-        phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
-        UName_ = dict.lookupOrDefault<word>("UName", "U");
-        rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
-
-        userDT_ = false;
-        if (dict.readIfPresent("DT", DT_))
-        {
-            userDT_ = true;
-        }
-
-        dict.lookup("resetOnStartUp") >> resetOnStartUp_;
-
-        dict.readIfPresent("nCorr", nCorr_);
-
-        dict.lookup("autoSchemes") >> autoSchemes_;
-
-        fvOptions_.reset(dict.subDict("fvOptions"));
+        userDT_ = true;
     }
+
+    dict.lookup("resetOnStartUp") >> resetOnStartUp_;
+
+    dict.readIfPresent("nCorr", nCorr_);
+
+    dict.lookup("autoSchemes") >> autoSchemes_;
+
+    fvOptions_.reset(dict.subDict("fvOptions"));
 }
 
 
 void Foam::scalarTransport::execute()
 {
-    if (active_)
+    Info<< type() << " output:" << endl;
+
+    const surfaceScalarField& phi =
+        mesh_.lookupObject<surfaceScalarField>(phiName_);
+
+    // calculate the diffusivity
+    volScalarField DT(this->DT(phi));
+
+    // set schemes
+    word schemeVar = T_.name();
+    if (autoSchemes_)
     {
-        Info<< type() << " output:" << endl;
-
-        const surfaceScalarField& phi =
-            mesh_.lookupObject<surfaceScalarField>(phiName_);
-
-        // calculate the diffusivity
-        volScalarField DT(this->DT(phi));
-
-        // set schemes
-        word schemeVar = T_.name();
-        if (autoSchemes_)
-        {
-            schemeVar = UName_;
-        }
-
-        word divScheme("div(phi," + schemeVar + ")");
-        word laplacianScheme("laplacian(" + DT.name() + "," + schemeVar + ")");
-
-        // set under-relaxation coeff
-        scalar relaxCoeff = 0.0;
-        if (mesh_.relaxEquation(schemeVar))
-        {
-            relaxCoeff = mesh_.equationRelaxationFactor(schemeVar);
-        }
-
-        if (phi.dimensions() == dimMass/dimTime)
-        {
-            const volScalarField& rho =
-                mesh_.lookupObject<volScalarField>(rhoName_);
-
-            // solve
-            for (label i = 0; i <= nCorr_; i++)
-            {
-                fvScalarMatrix TEqn
-                (
-                    fvm::ddt(rho, T_)
-                  + fvm::div(phi, T_, divScheme)
-                  - fvm::laplacian(DT, T_, laplacianScheme)
-                 ==
-                    fvOptions_(rho, T_)
-                );
-
-                TEqn.relax(relaxCoeff);
-
-                fvOptions_.constrain(TEqn);
-
-                TEqn.solve(mesh_.solverDict(schemeVar));
-            }
-        }
-        else if (phi.dimensions() == dimVolume/dimTime)
-        {
-            // solve
-            for (label i = 0; i <= nCorr_; i++)
-            {
-                fvScalarMatrix TEqn
-                (
-                    fvm::ddt(T_)
-                  + fvm::div(phi, T_, divScheme)
-                  - fvm::laplacian(DT, T_, laplacianScheme)
-                 ==
-                    fvOptions_(T_)
-                );
-
-                TEqn.relax(relaxCoeff);
-
-                fvOptions_.constrain(TEqn);
-
-                TEqn.solve(mesh_.solverDict(schemeVar));
-            }
-        }
-        else
-        {
-            FatalErrorInFunction
-                << "Incompatible dimensions for phi: " << phi.dimensions() << nl
-                << "Dimensions should be " << dimMass/dimTime << " or "
-                << dimVolume/dimTime << endl;
-        }
-
-        Info<< endl;
+        schemeVar = UName_;
     }
+
+    word divScheme("div(phi," + schemeVar + ")");
+    word laplacianScheme("laplacian(" + DT.name() + "," + schemeVar + ")");
+
+    // set under-relaxation coeff
+    scalar relaxCoeff = 0.0;
+    if (mesh_.relaxEquation(schemeVar))
+    {
+        relaxCoeff = mesh_.equationRelaxationFactor(schemeVar);
+    }
+
+    if (phi.dimensions() == dimMass/dimTime)
+    {
+        const volScalarField& rho =
+            mesh_.lookupObject<volScalarField>(rhoName_);
+
+        // solve
+        for (label i = 0; i <= nCorr_; i++)
+        {
+            fvScalarMatrix TEqn
+            (
+                fvm::ddt(rho, T_)
+              + fvm::div(phi, T_, divScheme)
+              - fvm::laplacian(DT, T_, laplacianScheme)
+             ==
+                fvOptions_(rho, T_)
+            );
+
+            TEqn.relax(relaxCoeff);
+
+            fvOptions_.constrain(TEqn);
+
+            TEqn.solve(mesh_.solverDict(schemeVar));
+        }
+    }
+    else if (phi.dimensions() == dimVolume/dimTime)
+    {
+        // solve
+        for (label i = 0; i <= nCorr_; i++)
+        {
+            fvScalarMatrix TEqn
+            (
+                fvm::ddt(T_)
+              + fvm::div(phi, T_, divScheme)
+              - fvm::laplacian(DT, T_, laplacianScheme)
+             ==
+                fvOptions_(T_)
+            );
+
+            TEqn.relax(relaxCoeff);
+
+            fvOptions_.constrain(TEqn);
+
+            TEqn.solve(mesh_.solverDict(schemeVar));
+        }
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Incompatible dimensions for phi: " << phi.dimensions() << nl
+            << "Dimensions should be " << dimMass/dimTime << " or "
+            << dimVolume/dimTime << endl;
+    }
+
+    Info<< endl;
 }
 
 
 void Foam::scalarTransport::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    execute();
 }
 
 
 void Foam::scalarTransport::timeSet()
-{
-    // Do nothing
-}
+{}
 
 
 void Foam::scalarTransport::write()
-{
-    // Do nothing
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
index 3006ca197d..8ba8c9ce2c 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,9 +78,6 @@ class scalarTransport
         //- Reference to the mesh database
         const fvMesh& mesh_;
 
-        //- On/off switch
-        bool active_;
-
         //- Name of flux field (optional)
         word phiName_;
 

From 8effc018c1ea24d0e87c2242b937fd0571e0ff60 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 17 Jan 2016 11:02:21 +0000
Subject: [PATCH 101/447] reactingEulerFoam,twoPhaseEulerFoam: Corrected
 pressure equations for transonic operation Resolves bug-report
 http://openfoam.org/mantisbt/view.php?id=1971

---
 .../reactingMultiphaseEulerFoam/pU/pEqn.H      | 11 +++++++----
 .../reactingTwoPhaseEulerFoam/pU/pEqn.H        | 18 ++++++++++++------
 .../reactingTwoPhaseEulerFoam/pUf/pEqn.H       | 18 ++++++++++++------
 .../multiphase/twoPhaseEulerFoam/pU/pEqn.H     | 18 ++++++++++++------
 .../multiphase/twoPhaseEulerFoam/pUf/pEqn.H    | 18 ++++++++++++------
 5 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index 8b4a27f2b8..74e29d3df2 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -318,11 +318,14 @@ while (pimple.correct())
                                 rho
                             )
                         )/rho
-                      + (alpha/rho)*correction
+                      + correction
                         (
-                            phase.thermo().psi()*fvm::ddt(p_rgh)
-                          + fvm::div(phid, p_rgh)
-                          - fvm::Sp(fvc::div(phid), p_rgh)
+                            (alpha/rho)*
+                            (
+                                phase.thermo().psi()*fvm::ddt(p_rgh)
+                              + fvm::div(phid, p_rgh)
+                              - fvm::Sp(fvc::div(phid), p_rgh)
+                            )
                         )
                     ).ptr()
                 );
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
index f269a79760..d6ba189b12 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
@@ -252,10 +252,13 @@ while (pimple.correct())
                     phase1.continuityError()
                   - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
                 )/rho1
-              + (alpha1/rho1)*correction
+              + correction
                 (
-                    psi1*fvm::ddt(p_rgh)
-                  + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
+                    (alpha1/rho1)*
+                    (
+                        psi1*fvm::ddt(p_rgh)
+                      + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
+                    )
                 );
 
             deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
@@ -275,10 +278,13 @@ while (pimple.correct())
                     phase2.continuityError()
                   - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
                 )/rho2
-               + (alpha2/rho2)*correction
+              + correction
                 (
-                    psi2*fvm::ddt(p_rgh)
-                  + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
+                    (alpha2/rho2)*
+                    (
+                        psi2*fvm::ddt(p_rgh)
+                      + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
+                    )
                 );
             deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
             pEqnComp2().relax();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
index e2edf14bed..57f491480e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
@@ -234,10 +234,13 @@ while (pimple.correct())
                 phase1.continuityError()
               - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
             )/rho1
-          + (alpha1/rho1)*correction
+          + correction
             (
-                psi1*fvm::ddt(p_rgh)
-              + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
+                (alpha1/rho1)*
+                (
+                    psi1*fvm::ddt(p_rgh)
+                  + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
+                )
             );
             deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
             pEqnComp1().relax();
@@ -250,10 +253,13 @@ while (pimple.correct())
                 phase2.continuityError()
               - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
             )/rho2
-          + (alpha2/rho2)*correction
+          + correction
             (
-                psi2*fvm::ddt(p_rgh)
-              + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
+                (alpha2/rho2)*
+                (
+                    psi2*fvm::ddt(p_rgh)
+                  + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
+                )
             );
             deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
             pEqnComp2().relax();
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H
index 994f07d672..2d4baf024a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H
@@ -252,10 +252,13 @@ while (pimple.correct())
                 contErr1
               - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
             )/rho1
-          + (alpha1/rho1)*correction
+          + correction
             (
-                psi1*fvm::ddt(p_rgh)
-              + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
+                (alpha1/rho1)*
+                (
+                    psi1*fvm::ddt(p_rgh)
+                  + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
+                )
             );
         deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
         pEqnComp1().relax();
@@ -265,10 +268,13 @@ while (pimple.correct())
                 contErr2
               - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
             )/rho2
-          + (alpha2/rho2)*correction
+          + correction
             (
-                psi2*fvm::ddt(p_rgh)
-              + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
+                (alpha2/rho2)*
+                (
+                    psi2*fvm::ddt(p_rgh)
+                  + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
+                )
             );
         deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
         pEqnComp2().relax();
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
index ab9a23197c..9fd243f275 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
@@ -231,10 +231,13 @@ while (pimple.correct())
                 contErr1
               - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
             )/rho1
-          + (alpha1/rho1)*correction
+          + correction
             (
-                psi1*fvm::ddt(p_rgh)
-              + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
+                (alpha1/rho1)*
+                (
+                    psi1*fvm::ddt(p_rgh)
+                  + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
+                )
             );
         deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
         pEqnComp1().relax();
@@ -244,10 +247,13 @@ while (pimple.correct())
                 contErr2
               - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
             )/rho2
-          + (alpha2/rho2)*correction
+          + correction
             (
-                psi2*fvm::ddt(p_rgh)
-              + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
+                (alpha2/rho2)*
+                (
+                    psi2*fvm::ddt(p_rgh)
+                  + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
+                )
             );
         deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
         pEqnComp2().relax();

From 59b578f1559b284cb6c74e86e3997bb7cacf79e0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 17 Jan 2016 18:56:28 +0000
Subject: [PATCH 102/447] Provide consistency in assignment operators

Always return void to avoid various bugs associated with automatic
type conversion.

Resolves request http://openfoam.org/mantisbt/view.php?id=1973
---
 .../indexedVertex/indexedVertex.H             |   4 +-
 .../Lists/PackedList/PackedBoolList.C         |   7 +-
 .../Lists/PackedList/PackedBoolList.H         |  12 +-
 .../Lists/PackedList/PackedBoolListI.H        |  22 +---
 .../containers/Lists/PackedList/PackedList.C  |  12 +-
 .../containers/Lists/PackedList/PackedList.H  |  16 +--
 .../containers/Lists/PackedList/PackedListI.H |  33 +++---
 .../containers/Lists/PtrList/PtrList.C        |   5 +-
 .../containers/Lists/PtrList/PtrList.H        |   3 +-
 src/OpenFOAM/primitives/bools/Switch/Switch.H |   8 +-
 src/OpenFOAM/primitives/complex/complex.H     |   6 +-
 src/OpenFOAM/primitives/complex/complexI.H    |   8 +-
 .../primitives/nullObject/nullObject.H        |   8 +-
 .../primitives/strings/fileName/fileName.C    | 111 ++++--------------
 .../primitives/strings/fileName/fileName.H    |  56 +++++++--
 .../primitives/strings/keyType/keyType.H      |  10 +-
 .../primitives/strings/keyType/keyTypeI.H     |  14 +--
 src/OpenFOAM/primitives/strings/word/word.H   |  10 +-
 src/OpenFOAM/primitives/strings/word/wordI.H  |  14 +--
 .../primitives/strings/wordRe/wordRe.H        |  14 +--
 .../primitives/strings/wordRe/wordReI.H       |  20 ++--
 .../RAS/buoyantKEpsilon/buoyantKEpsilon.H     |   4 +-
 .../RAS/LamBremhorstKE/LamBremhorstKE.H       |   4 +-
 .../phaseCompressible/LES/Niceno/NicenoKEqn.H |   4 +-
 .../LES/SmagorinskyZhang/SmagorinskyZhang.H   |   4 +-
 .../LES/continuousGasKEqn/continuousGasKEqn.H |   4 +-
 .../RAS/LaheyKEpsilon/LaheyKEpsilon.H         |   4 +-
 .../continuousGasKEpsilon.H                   |   4 +-
 .../RAS/kOmegaSSTSato/kOmegaSSTSato.H         |   4 +-
 .../RAS/mixtureKEpsilon/mixtureKEpsilon.H     |   2 +-
 .../DeardorffDiffStress/DeardorffDiffStress.H |   2 +-
 .../LES/LESeddyViscosity/LESeddyViscosity.H   |   2 +-
 .../LES/Smagorinsky/Smagorinsky.H             |   4 +-
 .../SpalartAllmarasDDES/SpalartAllmarasDDES.H |   4 +-
 .../SpalartAllmarasDES/SpalartAllmarasDES.H   |   4 +-
 .../SpalartAllmarasIDDES.H                    |   4 +-
 .../turbulenceModels/LES/WALE/WALE.H          |   4 +-
 .../LES/dynamicKEqn/dynamicKEqn.H             |   4 +-
 .../LES/dynamicLagrangian/dynamicLagrangian.H |   4 +-
 .../turbulenceModels/LES/kEqn/kEqn.H          |   4 +-
 .../turbulenceModels/RAS/LRR/LRR.H            |   2 +-
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.H     |   2 +-
 .../RAS/RNGkEpsilon/RNGkEpsilon.H             |   2 +-
 .../turbulenceModels/RAS/SSG/SSG.H            |   2 +-
 .../RAS/SpalartAllmaras/SpalartAllmaras.H     |   2 +-
 .../turbulenceModels/RAS/kEpsilon/kEpsilon.H  |   2 +-
 .../RAS/kOmegaSST/kOmegaSST.H                 |   2 +-
 .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.H           |   4 +-
 .../const/constAnIsoSolidTransport.H          |   7 +-
 .../const/constAnIsoSolidTransportI.H         |   5 +-
 .../transport/const/constIsoSolidTransport.H  |   7 +-
 .../transport/const/constIsoSolidTransportI.H |   4 +-
 .../exponential/exponentialSolidTransport.H   |   7 +-
 .../exponential/exponentialSolidTransportI.H  |   4 +-
 .../polynomial/polynomialSolidTransport.H     |   7 +-
 .../polynomial/polynomialSolidTransportI.H    |   5 +-
 .../equationOfState/Boussinesq/Boussinesq.H   |   7 +-
 .../equationOfState/Boussinesq/BoussinesqI.H  |   6 +-
 .../icoPolynomial/icoPolynomial.H             |   2 +-
 .../icoPolynomial/icoPolynomialI.H            |   5 +-
 .../incompressiblePerfectGas.H                |   7 +-
 .../incompressiblePerfectGasI.H               |   7 +-
 .../thermo/hPolynomial/hPolynomialThermo.H    |   4 +-
 .../thermo/hPolynomial/hPolynomialThermoI.H   |   7 +-
 .../specie/transport/const/constTransport.H   |   4 +-
 .../specie/transport/const/constTransportI.H  |   4 +-
 .../polynomial/polynomialTransport.H          |   4 +-
 .../polynomial/polynomialTransportI.H         |   5 +-
 .../sutherland/sutherlandTransport.H          |   4 +-
 .../sutherland/sutherlandTransportI.H         |   5 +-
 70 files changed, 245 insertions(+), 353 deletions(-)

diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
index 32ed1d2447..3cbc6acbc8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
@@ -258,7 +258,7 @@ public:
         //- Fix the vertex so that it can't be moved
         inline bool& fixed();
 
-        inline indexedVertex& operator=(const indexedVertex& rhs)
+        inline void operator=(const indexedVertex& rhs)
         {
             Vb::operator=(rhs);
 
@@ -268,8 +268,6 @@ public:
             this->alignment_ = rhs.alignment();
             this->targetCellSize_ = rhs.targetCellSize();
             this->vertexFixed_ = rhs.fixed();
-
-            return *this;
         }
 
         inline bool operator==(const indexedVertex& rhs) const
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
index 69cdf15e74..791d53cc59 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -286,8 +286,7 @@ Foam::Xfer<Foam::labelList> Foam::PackedBoolList::used() const
 
 // * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
 
-Foam::PackedBoolList&
-Foam::PackedBoolList::operator=(const Foam::UList<bool>& lst)
+void Foam::PackedBoolList::operator=(const Foam::UList<bool>& lst)
 {
     this->setSize(lst.size());
 
@@ -296,8 +295,6 @@ Foam::PackedBoolList::operator=(const Foam::UList<bool>& lst)
     {
         set(elemI, lst[elemI]);
     }
-
-    return *this;
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
index 904d6f1644..37620f97f8 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
@@ -191,24 +191,24 @@ public:
     // Member Operators
 
             //- Assignment of all entries to the given value.
-            inline PackedBoolList& operator=(const bool val);
+            inline void operator=(const bool val);
 
             //- Assignment operator.
-            inline PackedBoolList& operator=(const PackedBoolList&);
+            inline void operator=(const PackedBoolList&);
 
             //- Assignment operator.
-            inline PackedBoolList& operator=(const PackedList<1>&);
+            inline void operator=(const PackedList<1>&);
 
             //- Assignment operator.
-            PackedBoolList& operator=(const Foam::UList<bool>&);
+            void operator=(const Foam::UList<bool>&);
 
             //- Assignment operator,
             //  using the labels as indices to indicate which bits are set
-            inline PackedBoolList& operator=(const labelUList& indices);
+            inline void operator=(const labelUList& indices);
 
             //- Assignment operator,
             //  using the labels as indices to indicate which bits are set
-            inline PackedBoolList& operator=(const UIndirectList<label>&);
+            inline void operator=(const UIndirectList<label>&);
 
             //- Complement operator
             inline PackedBoolList operator~() const;
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
index 772ef763d3..d5561cfc28 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
@@ -126,47 +126,35 @@ inline Foam::Xfer<Foam::PackedBoolList> Foam::PackedBoolList::xfer()
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator=(const bool val)
+inline void Foam::PackedBoolList::operator=(const bool val)
 {
     PackedList<1>::operator=(val);
-    return *this;
 }
 
 
-inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator=(const PackedBoolList& lst)
+inline void Foam::PackedBoolList::operator=(const PackedBoolList& lst)
 {
     PackedList<1>::operator=(lst);
-    return *this;
 }
 
 
-inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator=(const PackedList<1>& lst)
+inline void Foam::PackedBoolList::operator=(const PackedList<1>& lst)
 {
     PackedList<1>::operator=(lst);
-    return *this;
 }
 
 
-inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator=(const labelUList& indices)
+inline void Foam::PackedBoolList::operator=(const labelUList& indices)
 {
     clear();
     set(indices);
-
-    return *this;
 }
 
 
-inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator=(const UIndirectList<label>& indices)
+inline void Foam::PackedBoolList::operator=(const UIndirectList<label>& indices)
 {
     clear();
     set(indices);
-
-    return *this;
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index c1b54b68b3..576471c9a9 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -513,18 +513,15 @@ void Foam::PackedList<nBits>::writeEntry
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<unsigned nBits>
-Foam::PackedList<nBits>&
-Foam::PackedList<nBits>::operator=(const PackedList<nBits>& lst)
+void Foam::PackedList<nBits>::operator=(const PackedList<nBits>& lst)
 {
     StorageList::operator=(lst);
     size_ = lst.size();
-    return *this;
 }
 
 
 template<unsigned nBits>
-Foam::PackedList<nBits>&
-Foam::PackedList<nBits>::operator=(const labelUList& lst)
+void Foam::PackedList<nBits>::operator=(const labelUList& lst)
 {
     setCapacity(lst.size());
     size_ = lst.size();
@@ -533,13 +530,11 @@ Foam::PackedList<nBits>::operator=(const labelUList& lst)
     {
         set(i, lst[i]);
     }
-    return *this;
 }
 
 
 template<unsigned nBits>
-Foam::PackedList<nBits>&
-Foam::PackedList<nBits>::operator=(const UIndirectList<label>& lst)
+void Foam::PackedList<nBits>::operator=(const UIndirectList<label>& lst)
 {
     setCapacity(lst.size());
     size_ = lst.size();
@@ -548,7 +543,6 @@ Foam::PackedList<nBits>::operator=(const UIndirectList<label>& lst)
     {
         set(i, lst[i]);
     }
-    return *this;
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 8b44cc362b..7f038c159b 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -398,16 +398,16 @@ public:
             inline iteratorBase operator[](const label);
 
             //- Assignment of all entries to the given value. Takes linear time.
-            inline PackedList<nBits>& operator=(const unsigned int val);
+            inline void operator=(const unsigned int val);
 
             //- Assignment operator.
-            PackedList<nBits>& operator=(const PackedList<nBits>&);
+            void operator=(const PackedList<nBits>&);
 
             //- Assignment operator.
-            PackedList<nBits>& operator=(const labelUList&);
+            void operator=(const labelUList&);
 
             //- Assignment operator.
-            PackedList<nBits>& operator=(const UIndirectList<label>&);
+            void operator=(const UIndirectList<label>&);
 
 
     // Iterators and helpers
@@ -468,11 +468,11 @@ public:
 
                 //- Assign value, not position.
                 //  This allows packed[0] = packed[3] for assigning values
-                inline unsigned int operator=(const iteratorBase&);
+                inline void operator=(const iteratorBase&);
 
                 //- Assign value.
                 //  A non-existent entry will be auto-vivified.
-                inline unsigned int operator=(const unsigned int val);
+                inline void operator=(const unsigned int val);
 
                 //- Conversion operator
                 //  Never auto-vivify entries.
@@ -522,7 +522,7 @@ public:
 
                 //- Assign from iteratorBase, eg iter = packedlist[i]
                 //  An out-of-range iterator is assigned end()
-                inline iterator& operator=(const iteratorBase&);
+                inline void operator=(const iteratorBase&);
 
                 //- Return value
                 inline unsigned int operator*() const;
@@ -583,7 +583,7 @@ public:
 
                 //- Assign from iteratorBase or derived
                 //  eg, iter = packedlist[i] or even iter = list.begin()
-                inline const_iterator& operator=(const iteratorBase&);
+                inline void operator=(const iteratorBase&);
 
                 //- Return referenced value directly
                 inline unsigned int operator*() const;
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index e4a56f9b70..4b6898cf5e 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -356,18 +356,21 @@ inline bool Foam::PackedList<nBits>::iteratorBase::operator!=
 
 
 template<unsigned nBits>
-inline unsigned int
-Foam::PackedList<nBits>::iteratorBase::operator=(const iteratorBase& iter)
+inline void Foam::PackedList<nBits>::iteratorBase::operator=
+(
+    const iteratorBase& iter
+)
 {
     const unsigned int val = iter.get();
     this->set(val);
-    return val;
 }
 
 
 template<unsigned nBits>
-inline unsigned int
-Foam::PackedList<nBits>::iteratorBase::operator=(const unsigned int val)
+inline void Foam::PackedList<nBits>::iteratorBase::operator=
+(
+    const unsigned int val
+)
 {
     // lazy evaluation - increase size on assigment
     if (index_ >= list_->size_)
@@ -376,7 +379,6 @@ Foam::PackedList<nBits>::iteratorBase::operator=(const unsigned int val)
     }
 
     this->set(val);
-    return val;
 }
 
 
@@ -517,8 +519,10 @@ inline bool Foam::PackedList<nBits>::const_iterator::operator!=
 
 
 template<unsigned nBits>
-inline typename Foam::PackedList<nBits>::iterator&
-Foam::PackedList<nBits>::iterator::operator=(const iteratorBase& iter)
+inline void Foam::PackedList<nBits>::iterator::operator=
+(
+    const iteratorBase& iter
+)
 {
     this->list_  = iter.list_;
     this->index_ = iter.index_;
@@ -529,14 +533,14 @@ Foam::PackedList<nBits>::iterator::operator=(const iteratorBase& iter)
     {
         this->index_ = this->list_->size_;
     }
-
-    return *this;
 }
 
 
 template<unsigned nBits>
-inline typename Foam::PackedList<nBits>::const_iterator&
-Foam::PackedList<nBits>::const_iterator::operator=(const iteratorBase& iter)
+inline void Foam::PackedList<nBits>::const_iterator::operator=
+(
+    const iteratorBase& iter
+)
 {
     this->list_  = iter.list_;
     this->index_ = iter.index_;
@@ -1066,8 +1070,7 @@ Foam::PackedList<nBits>::operator[](const label i)
 
 
 template<unsigned nBits>
-inline Foam::PackedList<nBits>&
-Foam::PackedList<nBits>::operator=(const unsigned int val)
+inline void Foam::PackedList<nBits>::operator=(const unsigned int val)
 {
     const label packLen = packedLength();
 
@@ -1111,8 +1114,6 @@ Foam::PackedList<nBits>::operator=(const unsigned int val)
             StorageList::operator[](i) = 0u;
         }
     }
-
-    return *this;
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
index d526142159..0101d481e6 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
@@ -258,7 +258,7 @@ void Foam::PtrList<T>::reorder(const labelUList& oldToNew)
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
-Foam::PtrList<T>& Foam::PtrList<T>::operator=(const PtrList<T>& a)
+void Foam::PtrList<T>::operator=(const PtrList<T>& a)
 {
     if (this == &a)
     {
@@ -290,9 +290,6 @@ Foam::PtrList<T>& Foam::PtrList<T>::operator=(const PtrList<T>& a)
             << " for type " << typeid(T).name()
             << abort(FatalError);
     }
-
-
-    return *this;
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index 80b751c220..68bf3a7157 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -252,9 +252,8 @@ public:
         //- Return element const pointer.
         inline const T* operator()(const label) const;
 
-
         //- Assignment.
-        PtrList<T>& operator=(const PtrList<T>&);
+        void operator=(const PtrList<T>&);
 
 
     // STL type definitions
diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.H b/src/OpenFOAM/primitives/bools/Switch/Switch.H
index 4ee6d051a4..3538a73006 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.H
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -188,17 +188,15 @@ public:
         }
 
         //- Assignment from enumerated value
-        const Switch& operator=(const switchType sw)
+        void operator=(const switchType sw)
         {
             switch_ = sw;
-            return *this;
         }
 
         //- Assignment from bool
-        const Switch& operator=(const bool b)
+        void operator=(const bool b)
         {
             switch_ = (b ? Switch::TRUE : Switch::FALSE);
-            return *this;
         }
 
 
diff --git a/src/OpenFOAM/primitives/complex/complex.H b/src/OpenFOAM/primitives/complex/complex.H
index 8113103e4e..debae297fe 100644
--- a/src/OpenFOAM/primitives/complex/complex.H
+++ b/src/OpenFOAM/primitives/complex/complex.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,13 +126,13 @@ public:
 
     // Member operators
 
-        inline const complex& operator=(const complex&);
+        inline void operator=(const complex&);
         inline void operator+=(const complex&);
         inline void operator-=(const complex&);
         inline void operator*=(const complex&);
         inline void operator/=(const complex&);
 
-        inline const complex& operator=(const scalar);
+        inline void operator=(const scalar);
         inline void operator+=(const scalar);
         inline void operator-=(const scalar);
         inline void operator*=(const scalar);
diff --git a/src/OpenFOAM/primitives/complex/complexI.H b/src/OpenFOAM/primitives/complex/complexI.H
index 6d8a9152f9..0332b3d0d6 100644
--- a/src/OpenFOAM/primitives/complex/complexI.H
+++ b/src/OpenFOAM/primitives/complex/complexI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,11 +75,10 @@ inline complex complex::conjugate() const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline const complex& complex::operator=(const complex& c)
+inline void complex::operator=(const complex& c)
 {
     re = c.re;
     im = c.im;
-    return *this;
 }
 
 
@@ -109,11 +108,10 @@ inline void complex::operator/=(const complex& c)
 }
 
 
-inline const complex& complex::operator=(const scalar s)
+inline void complex::operator=(const scalar s)
 {
     re = s;
     im = 0.0;
-    return *this;
 }
 
 
diff --git a/src/OpenFOAM/primitives/nullObject/nullObject.H b/src/OpenFOAM/primitives/nullObject/nullObject.H
index d324a92500..1ec31d5341 100644
--- a/src/OpenFOAM/primitives/nullObject/nullObject.H
+++ b/src/OpenFOAM/primitives/nullObject/nullObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,11 +51,11 @@ class NullObject
     NullObject()
     {}
 
-    //- Prevent copy-construction
+    //- Disallow default bitwise copy construct
     NullObject(const NullObject&);
 
-    //- Prevent assignment
-    NullObject& operator=(const NullObject&);
+    //- Disallow default bitwise assignment
+    void operator=(const NullObject&);
 
 public:
 
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.C b/src/OpenFOAM/primitives/strings/fileName/fileName.C
index 637e5e1fe0..becb5db393 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.C
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,6 @@ License
 #include "fileName.H"
 #include "wordList.H"
 #include "DynamicList.H"
-#include "debug.H"
 #include "OSspecific.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -35,6 +34,7 @@ const char* const Foam::fileName::typeName = "fileName";
 int Foam::fileName::debug(debug::debugSwitch(fileName::typeName, 0));
 const Foam::fileName Foam::fileName::null;
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::fileName::fileName(const wordList& lst)
@@ -74,32 +74,18 @@ Foam::fileName& Foam::fileName::toAbsolute()
 }
 
 
-//
-// * remove repeated slashes
-//       /abc////def        -->   /abc/def
-//
-// * remove '/./'
-//       /abc/def/./ghi/.   -->   /abc/def/./ghi
-//       abc/def/./         -->   abc/def
-//
-// * remove '/../'
-//       /abc/def/../ghi/jkl/nmo/..   -->   /abc/ghi/jkl
-//       abc/../def/ghi/../jkl        -->   abc/../def/jkl
-//
-// * remove trailing '/'
-//
 bool Foam::fileName::clean()
 {
-    // the top slash - we are never allowed to go above it
+    // The top slash - we are never allowed to go above it
     string::size_type top = this->find('/');
 
-    // no slashes - nothing to do
+    // No slashes - nothing to do
     if (top == string::npos)
     {
         return false;
     }
 
-    // start with the '/' found:
+    // Start with the '/' found:
     char prev = '/';
     string::size_type nChar  = top+1;
     string::size_type maxLen = this->size();
@@ -108,47 +94,46 @@ bool Foam::fileName::clean()
     (
         string::size_type src = nChar;
         src < maxLen;
-        /*nil*/
     )
     {
         char c = operator[](src++);
 
         if (prev == '/')
         {
-            // repeated '/' - skip it
+            // Repeated '/' - skip it
             if (c == '/')
             {
                 continue;
             }
 
-            // could be '/./' or '/../'
+            // Could be '/./' or '/../'
             if (c == '.')
             {
-                // found trailing '/.' - skip it
+                // Found trailing '/.' - skip it
                 if (src >= maxLen)
                 {
                     continue;
                 }
 
 
-                // peek at the next character
+                // Peek at the next character
                 char c1 = operator[](src);
 
-                // found '/./' - skip it
+                // Found '/./' - skip it
                 if (c1 == '/')
                 {
                     src++;
                     continue;
                 }
 
-                // it is '/..' or '/../'
+                // It is '/..' or '/../'
                 if (c1 == '.' && (src+1 >= maxLen || operator[](src+1) == '/'))
                 {
                     string::size_type parent;
 
-                    // backtrack to find the parent directory
-                    // minimum of 3 characters:  '/x/../'
-                    // strip it, provided it is above the top point
+                    // Backtrack to find the parent directory
+                    // Minimum of 3 characters:  '/x/../'
+                    // Strip it, provided it is above the top point
                     if
                     (
                         nChar > 2
@@ -156,13 +141,13 @@ bool Foam::fileName::clean()
                      && parent >= top
                     )
                     {
-                        nChar = parent + 1;   // retain '/' from the parent
+                        nChar = parent + 1;   // Retain '/' from the parent
                         src += 2;
                         continue;
                     }
 
-                    // bad resolution, eg 'abc/../../'
-                    // retain the sequence, but move the top to avoid it being
+                    // Bad resolution, eg 'abc/../../'
+                    // Retain the sequence, but move the top to avoid it being
                     // considered a valid parent later
                     top = nChar + 2;
                 }
@@ -171,7 +156,7 @@ bool Foam::fileName::clean()
         operator[](nChar++) = prev = c;
     }
 
-    // remove trailing slash
+    // Remove trailing slash
     if (nChar > 1 && operator[](nChar-1) == '/')
     {
         nChar--;
@@ -191,18 +176,6 @@ Foam::fileName Foam::fileName::clean() const
 }
 
 
-
-//  Return file name (part beyond last /)
-//
-//  behaviour compared to /usr/bin/basename:
-//    input           name()          basename
-//    -----           ------          --------
-//    "foo"           "foo"           "foo"
-//    "/foo"          "foo"           "foo"
-//    "foo/bar"       "bar"           "bar"
-//    "/foo/bar"      "bar"           "bar"
-//    "/foo/bar/"     ""              "bar"
-//
 Foam::word Foam::fileName::name() const
 {
     size_type i = rfind('/');
@@ -273,17 +246,6 @@ Foam::word Foam::fileName::name(const bool noExt) const
 }
 
 
-//  Return directory path name (part before last /)
-//
-//  behaviour compared to /usr/bin/dirname:
-//    input           path()          dirname
-//    -----           ------          -------
-//    "foo"           "."             "."
-//    "/foo"          "/"             "foo"
-//    "foo/bar"       "foo"           "foo"
-//    "/foo/bar"      "/foo"          "/foo"
-//    "/foo/bar/"     "/foo/bar/"     "/foo"
-//
 Foam::fileName Foam::fileName::path() const
 {
     size_type i = rfind('/');
@@ -303,7 +265,6 @@ Foam::fileName Foam::fileName::path() const
 }
 
 
-//  Return file name without extension (part before last .)
 Foam::fileName Foam::fileName::lessExt() const
 {
     size_type i = find_last_of("./");
@@ -319,7 +280,6 @@ Foam::fileName Foam::fileName::lessExt() const
 }
 
 
-//  Return file name extension (part after last .)
 Foam::word Foam::fileName::ext() const
 {
     size_type i = find_last_of("./");
@@ -335,19 +295,6 @@ Foam::word Foam::fileName::ext() const
 }
 
 
-// Return the components of the file name as a wordList
-// note that concatenating the components will not necessarily retrieve
-// the original input fileName
-//
-//  behaviour
-//    input           components()
-//    -----           ------
-//    "foo"           1("foo")
-//    "/foo"          1("foo")
-//    "foo/bar"       2("foo", "bar")
-//    "/foo/bar"      2("foo", "bar")
-//    "/foo/bar/"     2("foo", "bar")
-//
 Foam::wordList Foam::fileName::components(const char delimiter) const
 {
     DynamicList<word> wrdList(20);
@@ -356,7 +303,7 @@ Foam::wordList Foam::fileName::components(const char delimiter) const
 
     while ((end = find(delimiter, beg)) != npos)
     {
-        // avoid empty element (caused by doubled slashes)
+        // Avoid empty element (caused by doubled slashes)
         if (beg < end)
         {
             wrdList.append(substr(beg, end-beg));
@@ -364,18 +311,17 @@ Foam::wordList Foam::fileName::components(const char delimiter) const
         beg = end + 1;
     }
 
-    // avoid empty trailing element
+    // Avoid empty trailing element
     if (beg < size())
     {
         wrdList.append(substr(beg, npos));
     }
 
-    // transfer to wordList
+    // Transfer to wordList
     return wordList(wrdList.xfer());
 }
 
 
-// Return a component of the file name
 Foam::word Foam::fileName::component
 (
     const size_type cmpt,
@@ -388,41 +334,36 @@ Foam::word Foam::fileName::component
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-const Foam::fileName& Foam::fileName::operator=(const fileName& str)
+void Foam::fileName::operator=(const fileName& str)
 {
     string::operator=(str);
-    return *this;
 }
 
 
-const Foam::fileName& Foam::fileName::operator=(const word& str)
+void Foam::fileName::operator=(const word& str)
 {
     string::operator=(str);
-    return *this;
 }
 
 
-const Foam::fileName& Foam::fileName::operator=(const string& str)
+void Foam::fileName::operator=(const string& str)
 {
     string::operator=(str);
     stripInvalid();
-    return *this;
 }
 
 
-const Foam::fileName& Foam::fileName::operator=(const std::string& str)
+void Foam::fileName::operator=(const std::string& str)
 {
     string::operator=(str);
     stripInvalid();
-    return *this;
 }
 
 
-const Foam::fileName& Foam::fileName::operator=(const char* str)
+void Foam::fileName::operator=(const char* str)
 {
     string::operator=(str);
     stripInvalid();
-    return *this;
 }
 
 
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.H b/src/OpenFOAM/primitives/strings/fileName/fileName.H
index d6e9684a7a..ee0d751fae 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.H
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,20 @@ public:
         inline static bool valid(char);
 
         //- Cleanup file name
-        //  eg, remove repeated slashes, etc.
+        //
+        // * Removes repeated slashes
+        //       /abc////def        -->   /abc/def
+        //
+        // * Removes '/./'
+        //       /abc/def/./ghi/.   -->   /abc/def/./ghi
+        //       abc/def/./         -->   abc/def
+        //
+        // * Removes '/../'
+        //       /abc/def/../ghi/jkl/nmo/..   -->   /abc/ghi/jkl
+        //       abc/../def/ghi/../jkl        -->   abc/../def/jkl
+        //
+        // * Removes trailing '/'
+        //
         bool clean();
 
         //- Cleanup file name
@@ -154,6 +167,16 @@ public:
         // Decomposition
 
             //- Return file name (part beyond last /)
+            //
+            //  Behaviour compared to /usr/bin/basename:
+            //    Input           name()          basename
+            //    -----           ------          --------
+            //    "foo"           "foo"           "foo"
+            //    "/foo"          "foo"           "foo"
+            //    "foo/bar"       "bar"           "bar"
+            //    "/foo/bar"      "bar"           "bar"
+            //    "/foo/bar/"     ""              "bar"
+            //
             word name() const;
 
             //- Return file name (part beyond last /), subsitute for FOAM_CASE
@@ -163,6 +186,16 @@ public:
             word name(const bool noExt) const;
 
             //- Return directory path name (part before last /)
+            //
+            //  Behaviour compared to /usr/bin/dirname:
+            //    input           path()          dirname
+            //    -----           ------          -------
+            //    "foo"           "."             "."
+            //    "/foo"          "/"             "foo"
+            //    "foo/bar"       "foo"           "foo"
+            //    "/foo/bar"      "/foo"          "/foo"
+            //    "/foo/bar/"     "/foo/bar/"     "/foo"
+            //
             fileName path() const;
 
             //- Return file name without extension (part before last .)
@@ -172,6 +205,15 @@ public:
             word ext() const;
 
             //- Return path components as wordList
+            //
+            //  Behaviour:
+            //    Input           components()
+            //    -----           ------
+            //    "foo"           1("foo")
+            //    "/foo"          1("foo")
+            //    "foo/bar"       2("foo", "bar")
+            //    "/foo/bar"      2("foo", "bar")
+            //    "/foo/bar/"     2("foo", "bar")
             wordList components(const char delimiter='/') const;
 
             //- Return a single component of the path
@@ -182,11 +224,11 @@ public:
 
         // Assignment
 
-            const fileName& operator=(const fileName&);
-            const fileName& operator=(const word&);
-            const fileName& operator=(const string&);
-            const fileName& operator=(const std::string&);
-            const fileName& operator=(const char*);
+            void operator=(const fileName&);
+            void operator=(const word&);
+            void operator=(const string&);
+            void operator=(const std::string&);
+            void operator=(const char*);
 
 
     // IOstream operators
diff --git a/src/OpenFOAM/primitives/strings/keyType/keyType.H b/src/OpenFOAM/primitives/strings/keyType/keyType.H
index b424a95958..53ef756ee4 100644
--- a/src/OpenFOAM/primitives/strings/keyType/keyType.H
+++ b/src/OpenFOAM/primitives/strings/keyType/keyType.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,16 +116,16 @@ public:
         // Assignment
 
             //- Assignment operator
-            inline const keyType& operator=(const keyType&);
+            inline void operator=(const keyType&);
 
             //- Assign as word, not as non regular expression
-            inline const keyType& operator=(const word&);
+            inline void operator=(const word&);
 
             //- Assign as regular expression
-            inline const keyType& operator=(const string&);
+            inline void operator=(const string&);
 
             //- Assign as word, not as non regular expression
-            inline const keyType& operator=(const char*);
+            inline void operator=(const char*);
 
 
     // IOstream operators
diff --git a/src/OpenFOAM/primitives/strings/keyType/keyTypeI.H b/src/OpenFOAM/primitives/strings/keyType/keyTypeI.H
index 136d0cdfeb..0f2b8fc3a3 100644
--- a/src/OpenFOAM/primitives/strings/keyType/keyTypeI.H
+++ b/src/OpenFOAM/primitives/strings/keyType/keyTypeI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,38 +81,34 @@ inline bool Foam::keyType::isPattern() const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline const Foam::keyType& Foam::keyType::operator=(const keyType& s)
+inline void Foam::keyType::operator=(const keyType& s)
 {
     // Bypass checking
     string::operator=(s);
     isPattern_ = s.isPattern_;
-    return *this;
 }
 
 
-inline const Foam::keyType& Foam::keyType::operator=(const word& s)
+inline void Foam::keyType::operator=(const word& s)
 {
     word::operator=(s);
     isPattern_ = false;
-    return *this;
 }
 
 
-inline const Foam::keyType& Foam::keyType::operator=(const string& s)
+inline void Foam::keyType::operator=(const string& s)
 {
     // Bypass checking
     string::operator=(s);
     isPattern_ = true;
-    return *this;
 }
 
 
-inline const Foam::keyType& Foam::keyType::operator=(const char* s)
+inline void Foam::keyType::operator=(const char* s)
 {
     // Bypass checking
     string::operator=(s);
     isPattern_ = false;
-    return *this;
 }
 
 
diff --git a/src/OpenFOAM/primitives/strings/word/word.H b/src/OpenFOAM/primitives/strings/word/word.H
index 65d3b7032b..4b51809306 100644
--- a/src/OpenFOAM/primitives/strings/word/word.H
+++ b/src/OpenFOAM/primitives/strings/word/word.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,10 +117,10 @@ public:
 
         // Assignment
 
-            inline const word& operator=(const word&);
-            inline const word& operator=(const string&);
-            inline const word& operator=(const std::string&);
-            inline const word& operator=(const char*);
+            inline void operator=(const word&);
+            inline void operator=(const string&);
+            inline void operator=(const std::string&);
+            inline void operator=(const char*);
 
 
     // Friend Operators
diff --git a/src/OpenFOAM/primitives/strings/word/wordI.H b/src/OpenFOAM/primitives/strings/word/wordI.H
index b1fb7b7c3e..587adfac99 100644
--- a/src/OpenFOAM/primitives/strings/word/wordI.H
+++ b/src/OpenFOAM/primitives/strings/word/wordI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,34 +131,30 @@ inline bool Foam::word::valid(char c)
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline const Foam::word& Foam::word::operator=(const word& q)
+inline void Foam::word::operator=(const word& q)
 {
     string::operator=(q);
-    return *this;
 }
 
 
-inline const Foam::word& Foam::word::operator=(const string& q)
+inline void Foam::word::operator=(const string& q)
 {
     string::operator=(q);
     stripInvalid();
-    return *this;
 }
 
 
-inline const Foam::word& Foam::word::operator=(const std::string& q)
+inline void Foam::word::operator=(const std::string& q)
 {
     string::operator=(q);
     stripInvalid();
-    return *this;
 }
 
 
-inline const Foam::word& Foam::word::operator=(const char* q)
+inline void Foam::word::operator=(const char* q)
 {
     string::operator=(q);
     stripInvalid();
-    return *this;
 }
 
 
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
index b0cb62e0b4..47992fe733 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -207,26 +207,26 @@ public:
 
             //- Assign copy
             //  Always case sensitive
-            inline const wordRe& operator=(const wordRe&);
+            inline void operator=(const wordRe&);
 
             //- Copy word, never a regular expression
-            inline const wordRe& operator=(const word&);
+            inline void operator=(const word&);
 
             //- Copy keyType, auto-test for regular expression
             //  Always case sensitive
-            inline const wordRe& operator=(const keyType&);
+            inline void operator=(const keyType&);
 
             //- Copy string, auto-test for regular expression
             //  Always case sensitive
-            inline const wordRe& operator=(const string&);
+            inline void operator=(const string&);
 
             //- Copy string, auto-test for regular expression
             //  Always case sensitive
-            inline const wordRe& operator=(const std::string&);
+            inline void operator=(const std::string&);
 
             //- Copy string, auto-test for regular expression
             //  Always case sensitive
-            inline const wordRe& operator=(const char*);
+            inline void operator=(const char*);
 
 
     // IOstream operators
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordReI.H b/src/OpenFOAM/primitives/strings/wordRe/wordReI.H
index 01a3114c6c..d35a8134b7 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordReI.H
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordReI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -236,7 +236,7 @@ inline void Foam::wordRe::set(const char* str, const compOption opt)
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline const Foam::wordRe& Foam::wordRe::operator=(const wordRe& str)
+inline void Foam::wordRe::operator=(const wordRe& str)
 {
     string::operator=(str);
 
@@ -248,50 +248,44 @@ inline const Foam::wordRe& Foam::wordRe::operator=(const wordRe& str)
     {
         re_.clear();
     }
-    return *this;
 }
 
 
-inline const Foam::wordRe& Foam::wordRe::operator=(const word& str)
+inline void Foam::wordRe::operator=(const word& str)
 {
     word::operator=(str);
     re_.clear();
-    return *this;
 }
 
 
-inline const Foam::wordRe& Foam::wordRe::operator=(const keyType& str)
+inline void Foam::wordRe::operator=(const keyType& str)
 {
     string::operator=(str);
     if (str.isPattern())
     {
         compile();
     }
-    return *this;
 }
 
 
-inline const Foam::wordRe& Foam::wordRe::operator=(const string& str)
+inline void Foam::wordRe::operator=(const string& str)
 {
     string::operator=(str);
     compile(DETECT);  // auto-detect regex
-    return *this;
 }
 
 
-inline const Foam::wordRe& Foam::wordRe::operator=(const std::string& str)
+inline void Foam::wordRe::operator=(const std::string& str)
 {
     string::operator=(str);
     compile(DETECT);  // auto-detect regex
-    return *this;
 }
 
 
-inline const Foam::wordRe& Foam::wordRe::operator=(const char* str)
+inline void Foam::wordRe::operator=(const char* str)
 {
     string::operator=(str);
     compile(DETECT);  // auto-detect regex
-    return *this;
 }
 
 
diff --git a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H
index 5ac7d56ae2..f36c0f69a4 100644
--- a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H
+++ b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ class buoyantKEpsilon
 
         // Disallow default bitwise copy construct and assignment
         buoyantKEpsilon(const buoyantKEpsilon&);
-        buoyantKEpsilon& operator=(const buoyantKEpsilon&);
+        void operator=(const buoyantKEpsilon&);
 
 
 protected:
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
index 603b5295f1..e4719b4f17 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ class LamBremhorstKE
 
         // Disallow default bitwise copy construct and assignment
         LamBremhorstKE(const LamBremhorstKE&);
-        LamBremhorstKE& operator=(const LamBremhorstKE&);
+        void operator=(const LamBremhorstKE&);
 
         tmp<volScalarField> Rt() const;
         tmp<volScalarField> fMu(const volScalarField& Rt) const;
diff --git a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H
index d993c35772..62b65a9a6c 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H
+++ b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ class NicenoKEqn
 
         // Disallow default bitwise copy construct and assignment
         NicenoKEqn(const NicenoKEqn&);
-        NicenoKEqn& operator=(const NicenoKEqn&);
+        void operator=(const NicenoKEqn&);
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H
index d0d250c4f6..4e3e5ef03b 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H
+++ b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ class SmagorinskyZhang
 
         // Disallow default bitwise copy construct and assignment
         SmagorinskyZhang(const SmagorinskyZhang&);
-        SmagorinskyZhang& operator=(const SmagorinskyZhang&);
+        void operator=(const SmagorinskyZhang&);
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H
index 3893b8cf92..fe4b8f20a2 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H
+++ b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ class continuousGasKEqn
 
         // Disallow default bitwise copy construct and assignment
         continuousGasKEqn(const continuousGasKEqn&);
-        continuousGasKEqn& operator=(const continuousGasKEqn&);
+        void operator=(const continuousGasKEqn&);
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H
index 63858ecb46..57b2d5da2d 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ class LaheyKEpsilon
 
         // Disallow default bitwise copy construct and assignment
         LaheyKEpsilon(const LaheyKEpsilon&);
-        LaheyKEpsilon& operator=(const LaheyKEpsilon&);
+        void operator=(const LaheyKEpsilon&);
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H
index ab380bc464..60fa636321 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ class continuousGasKEpsilon
 
         // Disallow default bitwise copy construct and assignment
         continuousGasKEpsilon(const continuousGasKEpsilon&);
-        continuousGasKEpsilon& operator=(const continuousGasKEpsilon&);
+        void operator=(const continuousGasKEpsilon&);
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
index 6d0f720b7d..e25ba65fd7 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,7 +142,7 @@ class kOmegaSSTSato
 
         // Disallow default bitwise copy construct and assignment
         kOmegaSSTSato(const kOmegaSSTSato&);
-        kOmegaSSTSato& operator=(const kOmegaSSTSato&);
+        void operator=(const kOmegaSSTSato&);
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
index 1bf8985e91..0f0e835e8a 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
@@ -94,7 +94,7 @@ class mixtureKEpsilon
 
         // Disallow default bitwise copy construct and assignment
         mixtureKEpsilon(const mixtureKEpsilon&);
-        mixtureKEpsilon& operator=(const mixtureKEpsilon&);
+        void operator=(const mixtureKEpsilon&);
 
         //- Return the turbulence model for the other phase
         mixtureKEpsilon<BasicTurbulenceModel>& liquidTurbulence() const;
diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
index 241c4598f8..f0b57e7937 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -88,7 +88,7 @@ class DeardorffDiffStress
 
         // Disallow default bitwise copy construct and assignment
         DeardorffDiffStress(const DeardorffDiffStress&);
-        DeardorffDiffStress& operator=(const DeardorffDiffStress&);
+        void operator=(const DeardorffDiffStress&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
index f2ac98f60e..ca9915d137 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
@@ -61,7 +61,7 @@ class LESeddyViscosity
 
         // Disallow default bitwise copy construct and assignment
         LESeddyViscosity(const LESeddyViscosity&);
-        LESeddyViscosity& operator=(const LESeddyViscosity&);
+        void operator=(const LESeddyViscosity&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H
index 7b472d39f5..8ed2c4626a 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ class Smagorinsky
 
         // Disallow default bitwise copy construct and assignment
         Smagorinsky(const Smagorinsky&);
-        Smagorinsky& operator=(const Smagorinsky&);
+        void operator=(const Smagorinsky&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
index addcb635a4..6e2827650d 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ class SpalartAllmarasDDES
 
         // Disallow default bitwise copy construct and assignment
         SpalartAllmarasDDES(const SpalartAllmarasDDES&);
-        SpalartAllmarasDDES& operator=(const SpalartAllmarasDDES&);
+        void operator=(const SpalartAllmarasDDES&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
index b64ed0d593..6fa86abc67 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ class SpalartAllmarasDES
 
         // Disallow default bitwise copy construct and assignment
         SpalartAllmarasDES(const SpalartAllmarasDES&);
-        SpalartAllmarasDES& operator=(const SpalartAllmarasDES&);
+        void operator=(const SpalartAllmarasDES&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
index e2f64aa6bb..276af65b20 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ class SpalartAllmarasIDDES
 
         // Disallow default bitwise copy construct and assignment
         SpalartAllmarasIDDES(const SpalartAllmarasIDDES&);
-        SpalartAllmarasIDDES& operator=(const SpalartAllmarasIDDES&);
+        void operator=(const SpalartAllmarasIDDES&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H
index 9ac9c00f84..7860f33904 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ class WALE
 
         // Disallow default bitwise copy construct and assignment
         WALE(const WALE&);
-        WALE& operator=(const WALE&);
+        void operator=(const WALE&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H
index d9e9ef47cb..d2f1835c93 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ class dynamicKEqn
 
         // Disallow default bitwise copy construct and assignment
         dynamicKEqn(const dynamicKEqn&);
-        dynamicKEqn& operator=(const dynamicKEqn&);
+        void operator=(const dynamicKEqn&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H
index d95e7730a0..74cfa33188 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ class dynamicLagrangian
 
         // Disallow default bitwise copy construct and assignment
         dynamicLagrangian(const dynamicLagrangian&);
-        dynamicLagrangian& operator=(const dynamicLagrangian&);
+        void operator=(const dynamicLagrangian&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
index 6220fc790f..19fc999ec3 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ class kEqn
 
         // Disallow default bitwise copy construct and assignment
         kEqn(const kEqn&);
-        kEqn& operator=(const kEqn&);
+        void operator=(const kEqn&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
index 8ebdb31b46..bb385757ee 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
@@ -106,7 +106,7 @@ class LRR
 
         // Disallow default bitwise copy construct and assignment
         LRR(const LRR&);
-        LRR& operator=(const LRR&);
+        void operator=(const LRR&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 09614303d2..5e4f3b0013 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -90,7 +90,7 @@ class LaunderSharmaKE
 
         // Disallow default bitwise copy construct and assignment
         LaunderSharmaKE(const LaunderSharmaKE&);
-        LaunderSharmaKE& operator=(const LaunderSharmaKE&);
+        void operator=(const LaunderSharmaKE&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
index de28164e96..81f39eaf0c 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -91,7 +91,7 @@ class RNGkEpsilon
 
         // Disallow default bitwise copy construct and assignment
         RNGkEpsilon(const RNGkEpsilon&);
-        RNGkEpsilon& operator=(const RNGkEpsilon&);
+        void operator=(const RNGkEpsilon&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
index ac8cfb05f8..6195edfec4 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
@@ -101,7 +101,7 @@ class SSG
 
         // Disallow default bitwise copy construct and assignment
         SSG(const SSG&);
-        SSG& operator=(const SSG&);
+        void operator=(const SSG&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
index e4d123e1af..4756e55843 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -94,7 +94,7 @@ class SpalartAllmaras
 
         // Disallow default bitwise copy construct and assignment
         SpalartAllmaras(const SpalartAllmaras&);
-        SpalartAllmaras& operator=(const SpalartAllmaras&);
+        void operator=(const SpalartAllmaras&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
index f7690b6aa9..0877f91fd7 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
@@ -92,7 +92,7 @@ class kEpsilon
 
         // Disallow default bitwise copy construct and assignment
         kEpsilon(const kEpsilon&);
-        kEpsilon& operator=(const kEpsilon&);
+        void operator=(const kEpsilon&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
index b784dc5b5f..56ae2becc4 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
@@ -126,7 +126,7 @@ class kOmegaSST
 
         // Disallow default bitwise copy construct and assignment
         kOmegaSST(const kOmegaSST&);
-        kOmegaSST& operator=(const kOmegaSST&);
+        void operator=(const kOmegaSST&);
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
index 45588790ed..6a29c5312f 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ class kOmegaSSTSAS
 
         // Disallow default bitwise copy construct and assignment
         kOmegaSSTSAS(const kOmegaSSTSAS&);
-        kOmegaSSTSAS& operator=(const kOmegaSSTSAS&);
+        void operator=(const kOmegaSSTSAS&);
 
 
 protected:
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H
index 31af54fe54..414cb669ee 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,10 +133,7 @@ public:
 
     // Member operators
 
-        inline constAnIsoSolidTransport& operator=
-        (
-            const constAnIsoSolidTransport&
-        );
+        inline void operator=(const constAnIsoSolidTransport&);
         inline void operator+=(const constAnIsoSolidTransport&);
         inline void operator-=(const constAnIsoSolidTransport&);
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
index 4ec0ae1f7e..fabc997a8d 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
@@ -98,15 +98,12 @@ alphah(const scalar p, const scalar T) const
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Thermo>
-inline Foam::constAnIsoSolidTransport<Thermo>&
-Foam::constAnIsoSolidTransport<Thermo>::operator=
+inline void Foam::constAnIsoSolidTransport<Thermo>::operator=
 (
     const constAnIsoSolidTransport<Thermo>& ct
 )
 {
     kappa_ = ct.kappa_;
-
-    return *this;
 }
 
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
index d9c47ec444..2dbe8cded2 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,10 +134,7 @@ public:
 
     // Member operators
 
-        inline constIsoSolidTransport& operator=
-        (
-            const constIsoSolidTransport&
-        );
+        inline void operator=(const constIsoSolidTransport&);
         inline void operator+=(const constIsoSolidTransport&);
         inline void operator-=(const constIsoSolidTransport&);
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
index de1d1cb277..7ee8ee618e 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
@@ -98,15 +98,13 @@ alphah(const scalar p, const scalar T) const
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class thermo>
-inline Foam::constIsoSolidTransport<thermo>&
-Foam::constIsoSolidTransport<thermo>::operator=
+inline void Foam::constIsoSolidTransport<thermo>::operator=
 (
     const constIsoSolidTransport<thermo>& ct
 )
 {
     thermo::operator=(ct);
     kappa_ = ct.kappa_;
-    return *this;
 }
 
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H
index 1ea9ffdcac..32d16b69e0 100644
--- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,10 +142,7 @@ public:
 
     // Member operators
 
-        inline exponentialSolidTransport& operator=
-        (
-            const exponentialSolidTransport&
-        );
+        inline void operator=(const exponentialSolidTransport&);
         inline void operator+=(const exponentialSolidTransport&);
         inline void operator-=(const exponentialSolidTransport&);
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
index 8d11b207eb..909106e5db 100644
--- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
@@ -111,8 +111,7 @@ alphah(const scalar p, const scalar T) const
 
 
 template<class Thermo>
-inline Foam::exponentialSolidTransport<Thermo>&
-Foam::exponentialSolidTransport<Thermo>::operator=
+inline void Foam::exponentialSolidTransport<Thermo>::operator=
 (
     const exponentialSolidTransport<Thermo>& ct
 )
@@ -120,7 +119,6 @@ Foam::exponentialSolidTransport<Thermo>::operator=
     kappa0_ = ct.kappa0_;
     n0_ = ct.n0_;
     Tref_ = ct.Tref_;
-    return *this;
 }
 
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
index 90a9e52f6a..5a02e2a7c8 100644
--- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -172,10 +172,7 @@ public:
 
     // Member operators
 
-        inline polynomialSolidTransport& operator=
-        (
-            const polynomialSolidTransport&
-        );
+        inline void operator=(const polynomialSolidTransport&);
         inline void operator+=(const polynomialSolidTransport&);
         inline void operator-=(const polynomialSolidTransport&);
         inline void operator*=(const scalar);
diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
index ad3a0fb2bf..45d4e95f49 100644
--- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
@@ -148,8 +148,7 @@ inline Foam::scalar Foam::polynomialSolidTransport<Thermo, PolySize>::alphah
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Thermo, int PolySize>
-inline Foam::polynomialSolidTransport<Thermo, PolySize>&
-Foam::polynomialSolidTransport<Thermo, PolySize>::operator=
+inline void Foam::polynomialSolidTransport<Thermo, PolySize>::operator=
 (
     const polynomialSolidTransport<Thermo, PolySize>& pt
 )
@@ -157,8 +156,6 @@ Foam::polynomialSolidTransport<Thermo, PolySize>::operator=
     Thermo::operator=(pt);
 
     kappaCoeffs_ = pt.kappaCoeffs_;
-
-    return *this;
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
index fd64b7fcdb..464f829239 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,10 +194,7 @@ public:
 
     // Member operators
 
-        inline Boussinesq& operator=
-        (
-            const Boussinesq&
-        );
+        inline void operator=(const Boussinesq&);
         inline void operator+=(const Boussinesq&);
         inline void operator-=(const Boussinesq&);
 
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
index 573d2225c6..27a729211c 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
@@ -167,8 +167,7 @@ inline Foam::scalar Foam::Boussinesq<Specie>::cpMcv
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Specie>
-inline Foam::Boussinesq<Specie>&
-Foam::Boussinesq<Specie>::operator=
+inline void Foam::Boussinesq<Specie>::operator=
 (
     const Boussinesq<Specie>& b
 )
@@ -178,10 +177,9 @@ Foam::Boussinesq<Specie>::operator=
     rho0_ = b.rho0_;
     T0_ = b.T0_;
     beta_ = b.beta_;
-
-    return *this;
 }
 
+
 template<class Specie>
 inline void Foam::Boussinesq<Specie>::operator+=
 (
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
index 65ac610a17..44eb86ffbd 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
@@ -176,7 +176,7 @@ public:
 
     // Member operators
 
-        inline icoPolynomial& operator=(const icoPolynomial&);
+        inline void operator=(const icoPolynomial&);
         inline void operator+=(const icoPolynomial&);
         inline void operator-=(const icoPolynomial&);
 
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
index d419397d2a..c5302e1828 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
@@ -157,8 +157,7 @@ inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::cpMcv
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Specie, int PolySize>
-inline Foam::icoPolynomial<Specie, PolySize>&
-Foam::icoPolynomial<Specie, PolySize>::operator=
+inline void Foam::icoPolynomial<Specie, PolySize>::operator=
 (
     const icoPolynomial<Specie, PolySize>& ip
 )
@@ -166,8 +165,6 @@ Foam::icoPolynomial<Specie, PolySize>::operator=
     Specie::operator=(ip);
 
     rhoCoeffs_ = ip.rhoCoeffs_;
-
-    return *this;
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
index 0beacf03e5..922466d740 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -179,10 +179,7 @@ public:
 
     // Member operators
 
-        inline incompressiblePerfectGas& operator=
-        (
-            const incompressiblePerfectGas&
-        );
+        inline void operator=(const incompressiblePerfectGas&);
         inline void operator+=(const incompressiblePerfectGas&);
         inline void operator-=(const incompressiblePerfectGas&);
 
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
index 9ef59fd40b..3281e2e613 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
@@ -161,19 +161,16 @@ inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::cpMcv
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Specie>
-inline Foam::incompressiblePerfectGas<Specie>&
-Foam::incompressiblePerfectGas<Specie>::operator=
+inline void Foam::incompressiblePerfectGas<Specie>::operator=
 (
     const incompressiblePerfectGas<Specie>& ipg
 )
 {
     Specie::operator=(ipg);
-
     pRef_ = ipg.pRef_;
-
-    return *this;
 }
 
+
 template<class Specie>
 inline void Foam::incompressiblePerfectGas<Specie>::operator+=
 (
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
index a0b557f215..ed491b3a00 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -187,7 +187,7 @@ public:
 
     // Member operators
 
-        inline hPolynomialThermo& operator=(const hPolynomialThermo&);
+        inline void operator=(const hPolynomialThermo&);
         inline void operator+=(const hPolynomialThermo&);
         inline void operator-=(const hPolynomialThermo&);
         inline void operator*=(const scalar);
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
index 47b02e3cc7..4e8c91f688 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,8 +144,7 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::s
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-inline Foam::hPolynomialThermo<EquationOfState, PolySize>&
-Foam::hPolynomialThermo<EquationOfState, PolySize>::operator=
+inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator=
 (
     const hPolynomialThermo<EquationOfState, PolySize>& pt
 )
@@ -157,8 +156,6 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::operator=
     CpCoeffs_ = pt.CpCoeffs_;
     hCoeffs_ = pt.hCoeffs_;
     sCoeffs_ = pt.sCoeffs_;
-
-    return *this;
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.H b/src/thermophysicalModels/specie/transport/const/constTransport.H
index 65cd3c8a41..a8c445ff8a 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ public:
 
     // Member operators
 
-        inline constTransport& operator=(const constTransport&);
+        inline void operator=(const constTransport&);
 
         inline void operator+=(const constTransport&);
 
diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H
index 6c597b87d5..6c304476fd 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransportI.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransportI.H
@@ -129,7 +129,7 @@ inline Foam::scalar Foam::constTransport<Thermo>::alphah
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Thermo>
-inline Foam::constTransport<Thermo>& Foam::constTransport<Thermo>::operator=
+inline void Foam::constTransport<Thermo>::operator=
 (
     const constTransport<Thermo>& ct
 )
@@ -138,8 +138,6 @@ inline Foam::constTransport<Thermo>& Foam::constTransport<Thermo>::operator=
 
     mu_ = ct.mu_;
     rPr_ = ct.rPr_;
-
-    return *this;
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
index 85ec167256..768c4fe034 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,7 +166,7 @@ public:
 
     // Member operators
 
-        inline polynomialTransport& operator=(const polynomialTransport&);
+        inline void operator=(const polynomialTransport&);
         inline void operator+=(const polynomialTransport&);
         inline void operator-=(const polynomialTransport&);
         inline void operator*=(const scalar);
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
index f51065dfae..ca82f18d86 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
@@ -136,8 +136,7 @@ inline Foam::scalar Foam::polynomialTransport<Thermo, PolySize>::alphah
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Thermo, int PolySize>
-inline Foam::polynomialTransport<Thermo, PolySize>&
-Foam::polynomialTransport<Thermo, PolySize>::operator=
+inline void Foam::polynomialTransport<Thermo, PolySize>::operator=
 (
     const polynomialTransport<Thermo, PolySize>& pt
 )
@@ -146,8 +145,6 @@ Foam::polynomialTransport<Thermo, PolySize>::operator=
 
     muCoeffs_ = pt.muCoeffs_;
     kappaCoeffs_ = pt.kappaCoeffs_;
-
-    return *this;
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
index e7da7b9a5f..1033a73de3 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,7 +186,7 @@ public:
 
     // Member operators
 
-        inline sutherlandTransport& operator=(const sutherlandTransport&);
+        inline void operator=(const sutherlandTransport&);
 
         inline void operator+=(const sutherlandTransport&);
 
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
index 13ba0df2c5..60ce87da8c 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
@@ -165,8 +165,7 @@ inline Foam::scalar Foam::sutherlandTransport<Thermo>::alphah
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Thermo>
-inline Foam::sutherlandTransport<Thermo>&
-Foam::sutherlandTransport<Thermo>::operator=
+inline void Foam::sutherlandTransport<Thermo>::operator=
 (
     const sutherlandTransport<Thermo>& st
 )
@@ -175,8 +174,6 @@ Foam::sutherlandTransport<Thermo>::operator=
 
     As_ = st.As_;
     Ts_ = st.Ts_;
-
-    return *this;
 }
 
 

From 5de9c43fb80f83ba2997c29af6d4d3cdd1733429 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 18 Jan 2016 18:15:29 +0000
Subject: [PATCH 103/447] etc/config/paraview.*: Update include/lib directory
 name seaching to paraview-3.0 for ParaView-4.?

---
 etc/config/paraview.csh | 4 ++--
 etc/config/paraview.sh  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh
index eab513082d..21a16fbbea 100644
--- a/etc/config/paraview.csh
+++ b/etc/config/paraview.csh
@@ -92,8 +92,8 @@ setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraview
 # set paths if binaries or source are present
 if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
     setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-${ParaView_MAJOR}
-    if (! -r $ParaView_INCLUDE_DIR && -r $ParaView_DIR/include/paraview) then
-        setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview
+    if (! -r $ParaView_INCLUDE_DIR && -r $ParaView_DIR/include/paraview-3.0) then
+        setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-3.0
     endif
 
     set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}
diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh
index a2a1373d43..3baaf61e23 100644
--- a/etc/config/paraview.sh
+++ b/etc/config/paraview.sh
@@ -107,9 +107,9 @@ then
     fi
 
     ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR
-    if [ ! -d $ParaView_LIB_DIR -a -d $ParaView_DIR/lib/paraview ]
+    if [ ! -d $ParaView_LIB_DIR -a -d $ParaView_DIR/lib/paraview-3.0 ]
     then
-        ParaView_LIB_DIR=$ParaView_DIR/lib/paraview
+        ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-3.0
     fi
 
     export PATH=$ParaView_DIR/bin:$PATH

From e3a80e909d655f3fda37cca825923c40b8db08fd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 18 Jan 2016 18:22:42 +0000
Subject: [PATCH 104/447] sampledSetsFunctionObject/sampledSetsDict: Added an
 example of sampling on a line

---
 .../sampledSetsFunctionObject/sampledSetsDict | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict

diff --git a/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict b/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
new file mode 100644
index 0000000000..7e92059c21
--- /dev/null
+++ b/src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+functions
+{
+    // Example of sampling on a line
+    lines
+    {
+        type sets;
+
+        functionObjectLibs ("libsampling.so");
+
+        outputControl   outputTime;
+        setFormat       gnuplot;
+        fields          (p U);
+        interpolationScheme cellPoint;
+        sets
+        (
+            diagonal
+            {
+                type midPoint;
+
+                axis x;
+                start (-0.0206 -0.0254 -0.0005);
+                end (0.29 0.0254 0.0005);
+            }
+        );
+    }
+}

From 1896599d8bc6f46deb5968d8245e3061cc22e160 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 18 Jan 2016 19:44:38 +0000
Subject: [PATCH 105/447] Add support for flex-2.6 Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1974

---
 .../utilities/mesh/conversion/ansysToFoam/ansysToFoam.L       | 2 +-
 .../mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L   | 4 ++--
 .../mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L       | 2 +-
 .../utilities/mesh/conversion/gambitToFoam/gambitToFoam.L     | 4 ++--
 src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L       | 4 ++--
 .../chemistryReaders/chemkinReader/chemkinLexer.L             | 2 +-
 src/triSurface/triSurface/interfaces/STL/readSTLASCII.L       | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index 3555577fd7..9a21299127 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -77,7 +77,7 @@ label currentTypei = -1;
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 75a1cfcbc7..10a4b189b5 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,7 +123,7 @@ void uniquify(word& name, HashSet<word>& patchNames)
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index 69b12d5080..3300ba9778 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -100,7 +100,7 @@ wordList patchNameIDs(maxZoneID);
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index 2de3fa2932..6821af8fba 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ label nValuesForPatchFaces = 0;
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
index e54cca5ebf..a3f9e47a6c 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ int yyFlexLexer::yylex()
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
 //! \cond dummy
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index e44b04ab87..318cd7ab49 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -54,7 +54,7 @@ int yyFlexLexer::yylex()
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
 //! \cond dummy
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
index 6c41d5db82..3c4d2fdb66 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ int yyFlexLexer::yylex()
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
 //! \cond dummy
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()

From bbb5a8086a1327a0614528537a0682f9d361d7f3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 19 Jan 2016 15:26:42 +0000
Subject: [PATCH 106/447] 
 reactingEulerFoam/interfacialModels/wallLubricationModels: Apply
 zero-gradient condition at walls

---
 .../wallLubricationModels/Antal/Antal.C       |  8 +++---
 .../wallLubricationModels/Frank/Frank.C       |  8 +++---
 .../TomiyamaWallLubrication.C                 |  8 +++---
 .../wallLubricationModel.C                    | 26 ++++++++++++++++++-
 .../wallLubricationModel.H                    |  8 +++++-
 5 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
index 0b2c7b5012..80cdae42c7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,8 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModels::Antal::Fi() const
 
     const volVectorField& n(nWall());
 
-    return
+    return zeroGradWalls
+    (
         max
         (
             dimensionedScalar("zero", dimless/dimLength, 0),
@@ -80,7 +81,8 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModels::Antal::Fi() const
         )
        *pair_.continuous().rho()
        *magSqr(Ur - (Ur & n)*n)
-       *n;
+       *n
+    );
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
index 0b9065a1a9..6fc1940165 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,8 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModels::Frank::Fi() const
     volScalarField Eo(pair_.Eo());
     volScalarField yTilde(y/(Cwc_*pair_.dispersed().d()));
 
-    return
+    return zeroGradWalls
+    (
         (
             pos(Eo - 1.0)*neg(Eo - 5.0)*exp(-0.933*Eo + 0.179)
           + pos(Eo - 5.0)*neg(Eo - 33.0)*(0.00599*Eo - 0.0187)
@@ -90,7 +91,8 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModels::Frank::Fi() const
         )
        *pair_.continuous().rho()
        *magSqr(Ur - (Ur & n)*n)
-       *n;
+       *n
+    );
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
index 9209c5108c..f6a1492900 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,8 @@ Foam::wallLubricationModels::TomiyamaWallLubrication::Fi() const
 
     volScalarField Eo(pair_.Eo());
 
-    return
+    return zeroGradWalls
+    (
         (
             pos(Eo - 1.0)*neg(Eo - 5.0)*exp(-0.933*Eo + 0.179)
           + pos(Eo - 5.0)*neg(Eo - 33.0)*(0.00599*Eo - 0.0187)
@@ -89,7 +90,8 @@ Foam::wallLubricationModels::TomiyamaWallLubrication::Fi() const
         )
        *pair_.continuous().rho()
        *magSqr(Ur - (Ur & n)*n)
-       *n;
+       *n
+    );
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
index 2f3cb1aaa0..fb755c6347 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,7 @@ License
 #include "wallLubricationModel.H"
 #include "phasePair.H"
 #include "surfaceInterpolate.H"
+#include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -38,6 +39,29 @@ namespace Foam
 const Foam::dimensionSet Foam::wallLubricationModel::dimF(1, -2, -2, 0, 0);
 
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::tmp<Foam::volVectorField> Foam::wallLubricationModel::zeroGradWalls
+(
+    tmp<volVectorField> tFi
+) const
+{
+    volVectorField& Fi = tFi();
+    const fvPatchList& patches =  Fi.mesh().boundary();
+
+    forAll(patches, patchi)
+    {
+        if (isA<wallFvPatch>(patches[patchi]))
+        {
+            fvPatchVectorField& Fiw = Fi.boundaryField()[patchi];
+            Fiw = Fiw.patchInternalField();
+        }
+    }
+
+    return tFi;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::wallLubricationModel::wallLubricationModel
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
index b55415aeb6..53e8a916b6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,6 +63,12 @@ protected:
         const phasePair& pair_;
 
 
+    // Protected member functions
+
+        //- Zero-gradient wall-lubrication force at walls
+        tmp<volVectorField> zeroGradWalls(tmp<volVectorField>) const;
+
+
 public:
 
     //- Runtime type information

From 9de3a4280e57a162d38f1c136467327013701592 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 19 Jan 2016 16:28:23 +0000
Subject: [PATCH 107/447] foamToVTK: Default to ASCII format when
 WM_LABEL_SIZE=64 Based on patch provided by Alexey Matveichev Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=1975

---
 .../dataConversion/foamToVTK/foamToVTK.C      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index b11a5c9c68..a9b1390bb8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -324,18 +324,19 @@ int main(int argc, char *argv[])
     const bool doWriteInternal = !args.optionFound("noInternal");
     const bool doFaceZones     = !args.optionFound("noFaceZones");
     const bool doLinks         = !args.optionFound("noLinks");
-    const bool binary          = !args.optionFound("ascii");
+    bool binary                = !args.optionFound("ascii");
     const bool useTimeName     = args.optionFound("useTimeName");
 
-    // decomposition of polyhedral cells into tets/pyramids cells
+    // Decomposition of polyhedral cells into tets/pyramids cells
     vtkTopo::decomposePoly     = !args.optionFound("poly");
 
     if (binary && (sizeof(floatScalar) != 4 || sizeof(label) != 4))
     {
-        FatalErrorInFunction
-            << "floatScalar and/or label are not 4 bytes in size" << nl
-            << "Hence cannot use binary VTK format. Please use -ascii"
-            << exit(FatalError);
+        WarningInFunction
+            << "Using ASCII rather than binary VTK format because "
+               "floatScalar and/or label are not 4 bytes in size."
+            << nl << endl;
+        binary = false;
     }
 
     const bool nearCellValue = args.optionFound("nearCellValue");
@@ -429,7 +430,7 @@ int main(int argc, char *argv[])
     mkDir(fvPath);
 
 
-    // mesh wrapper; does subsetting and decomposition
+    // Mesh wrapper; does subsetting and decomposition
     vtkMesh vMesh(mesh, cellSetName);
 
 
@@ -680,9 +681,7 @@ int main(int argc, char *argv[])
 
         if (doWriteInternal)
         {
-            //
             // Create file and write header
-            //
             fileName vtkFileName
             (
                 fvPath/vtkName

From 3205337e81c181f2deb81b14c0ab5414746bba59 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 19 Jan 2016 21:20:03 +0000
Subject: [PATCH 108/447] scalarTransportFoam: Added support for steady-state
 solution and all fvOptions Optional under-relaxation is provided for
 steady-state solution. Added missing fvOptions.constrain and
 fvOptions.correct calls.

---
 .../basic/scalarTransportFoam/scalarTransportFoam.C   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
index bef5923700..9082964083 100644
--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Application
     scalarTransportFoam
 
 Description
-    Solves a transport equation for a passive scalar
+    Solves the steady or transient transport equation for a passive scalar.
 
 \*---------------------------------------------------------------------------*/
 
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 
         while (simple.correctNonOrthogonal())
         {
-            solve
+            fvScalarMatrix TEqn
             (
                 fvm::ddt(T)
               + fvm::div(phi, T)
@@ -66,6 +66,11 @@ int main(int argc, char *argv[])
              ==
                 fvOptions(T)
             );
+
+            TEqn.relax();
+            fvOptions.constrain(TEqn);
+            TEqn.solve();
+            fvOptions.correct(T);
         }
 
         runTime.write();

From 5728c1f173815f963ab601ddd306a4d857e73d99 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 19 Jan 2016 21:58:11 +0000
Subject: [PATCH 109/447] Info -> InfoInFunction

---
 .../star3ToFoam/createPolyBoundary.C          | 26 ++++----
 src/OSspecific/POSIX/timer.C                  | 14 ++---
 src/OpenFOAM/db/IOobject/IOobject.C           | 24 ++++----
 src/OpenFOAM/db/IOobject/IOobjectReadHeader.C |  9 ++-
 .../db/IOobject/IOobjectWriteHeader.C         |  4 +-
 src/OpenFOAM/db/IOobjectList/IOobjectList.C   | 15 ++---
 .../isoSurface/sampledIsoSurface.C            | 59 ++++++++++---------
 7 files changed, 74 insertions(+), 77 deletions(-)

diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C
index 25b7bd9e4e..b684735939 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,9 +89,8 @@ void Foam::starMesh::createPolyBoundary()
                                   > nInternalFaces_
                                 )
                                 {
-                                    Info
-                                        << "void starMesh::createPolyBoundary()"
-                                        << ": Problem with face: " << curFace
+                                    InfoInFunction
+                                        << "Problem with face: " << curFace
                                         << "\nProbably multiple definitions "
                                         << "of a single boundary face. " << endl
                                         << "Other boundary face: "
@@ -110,8 +109,7 @@ void Foam::starMesh::createPolyBoundary()
                                                 < starPointID_.size()
                                         )
                                         {
-                                            Info
-                                                << ","
+                                            Info<< ","
                                                 << starPointID_
                                                  [curCellFaces[cellFaceI][spI]];
                                         }
@@ -124,9 +122,8 @@ void Foam::starMesh::createPolyBoundary()
                                 }
                                 else
                                 {
-                                    Info
-                                        << "void starMesh::createPolyBoundary()"
-                                        << ": Problem with face: " << curFace
+                                    InfoInFunction
+                                        << "Problem with face: " << curFace
                                         << "\nProbably trying to define a "
                                         << "boundary face on a previously "
                                         << "matched internal face. " << endl
@@ -146,8 +143,7 @@ void Foam::starMesh::createPolyBoundary()
                                                 < starPointID_.size()
                                         )
                                         {
-                                            Info
-                                                << ","
+                                            Info<< ","
                                                 << starPointID_
                                                  [curCellFaces[cellFaceI][spI]];
                                         }
@@ -190,8 +186,8 @@ void Foam::starMesh::createPolyBoundary()
             {
                 const face& missingFace = cellFaces_[cellI][faceI];
 
-                Info<< "starMesh::createPolyBoundary() : "
-                    << "missing face found in cell " << cellI
+                InfoInFunction
+                    << "Missing face found in cell " << cellI
                     << ".\nType: " << cellShapes_[cellI].model().name()
                     << ". STAR cell number: " << starCellID_[cellI]
                     << ". Face: " << missingFace << endl;
@@ -255,8 +251,8 @@ void Foam::starMesh::createPolyBoundary()
         {
             const face& problemFace = meshFaces_[faceI];
 
-            Info<< "starMesh::createPolyBoundary() : "
-                << "problem with face " << faceI << ": addressed "
+            InfoInFunction
+                << "Problem with face " << faceI << ": addressed "
                 << markupFaces[faceI] << " times (should be 2!). Face: "
                 << problemFace << endl;
 
diff --git a/src/OSspecific/POSIX/timer.C b/src/OSspecific/POSIX/timer.C
index 7e1f5886d3..d9c1bac05e 100644
--- a/src/OSspecific/POSIX/timer.C
+++ b/src/OSspecific/POSIX/timer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,8 +48,7 @@ void Foam::timer::signalHandler(int)
 {
     if (debug)
     {
-        Info<< "Foam::timer::signalHandler(int sig) : "
-            << " timed out. Jumping."
+        InfoInFunction<< "Timed out. Jumping."
             << endl;
     }
     longjmp(envAlarm, 1);
@@ -91,8 +90,8 @@ Foam::timer::timer(const unsigned int newTimeOut)
 
         if (debug)
         {
-            Info<< "Foam::timer::timer(const unsigned int) : "
-                << " installing timeout " << int(newTimeOut_)
+            InfoInFunction
+                << "Installing timeout " << int(newTimeOut_)
                 << " seconds"
                 << " (overriding old timeout " << int(oldTimeOut_)
                 << ")." << endl;
@@ -109,8 +108,8 @@ Foam::timer::~timer()
     {
         if (debug)
         {
-            Info<< "Foam::timer::~timer(const unsigned int) : timeOut="
-                << int(newTimeOut_)
+            InfoInFunction
+                << "timeOut=" << int(newTimeOut_)
                 << " : resetting timeOut to " << int(oldTimeOut_) << endl;
         }
 
@@ -128,4 +127,5 @@ Foam::timer::~timer()
     }
 }
 
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index 7f4c315da4..e3013bc02d 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,7 +133,8 @@ Foam::IOobject::IOobject
 {
     if (objectRegistry::debug)
     {
-        Info<< "Constructing IOobject called " << name_
+        InfoInFunction
+            << "Constructing IOobject called " << name_
             << " of type " << headerClassName_
             << endl;
     }
@@ -164,7 +165,8 @@ Foam::IOobject::IOobject
 {
     if (objectRegistry::debug)
     {
-        Info<< "Constructing IOobject called " << name_
+        InfoInFunction
+            << "Constructing IOobject called " << name_
             << " of type " << headerClassName_
             << endl;
     }
@@ -200,7 +202,8 @@ Foam::IOobject::IOobject
 
     if (objectRegistry::debug)
     {
-        Info<< "Constructing IOobject called " << name_
+        InfoInFunction
+            << "Constructing IOobject called " << name_
             << " of type " << headerClassName_
             << endl;
     }
@@ -405,9 +408,8 @@ bool Foam::IOobject::headerOk()
     {
         if (objectRegistry::debug)
         {
-            Info
-                << "IOobject::headerOk() : "
-                << "file " << objectPath() << " could not be opened"
+            InfoInFunction
+                << "File " << objectPath() << " could not be opened"
                 << endl;
         }
 
@@ -421,7 +423,7 @@ bool Foam::IOobject::headerOk()
             if (objectRegistry::debug)
             {
                 IOWarningInFunction((*isPtr))
-                    << "failed to read header of file " << objectPath()
+                    << "Failed to read header of file " << objectPath()
                     << endl;
             }
 
@@ -440,14 +442,14 @@ void Foam::IOobject::setBad(const string& s)
     if (objState_ != GOOD)
     {
         FatalErrorInFunction
-            << "recurrent failure for object " << s
+            << "Recurrent failure for object " << s
             << exit(FatalError);
     }
 
     if (error::level)
     {
-        Info<< "IOobject::setBad(const string&) : "
-            << "broken object " << s << info() << endl;
+        InfoInFunction
+            << "Broken object " << s << info() << endl;
     }
 
     objState_ = BAD;
diff --git a/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C b/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
index 98b5e3e3ee..7d639e7b5c 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,8 +32,7 @@ bool Foam::IOobject::readHeader(Istream& is)
 {
     if (IOobject::debug)
     {
-        Info<< "IOobject::readHeader(Istream&) : reading header for file "
-            << is.name() << endl;
+        InfoInFunction << "Reading header for file " << is.name() << endl;
     }
 
     // Check Istream not already bad
@@ -114,8 +113,8 @@ bool Foam::IOobject::readHeader(Istream& is)
 
         if (IOobject::debug)
         {
-            Info<< "IOobject::readHeader(Istream&) :"
-                << " stream failure while reading header"
+            InfoInFunction
+                << "Stream failure while reading header"
                 << " on line " << is.lineNumber()
                 << " of file " << is.name() << endl;
         }
diff --git a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
index 5c9fd3210d..b10a6bd1d8 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
@@ -36,8 +36,8 @@ bool Foam::IOobject::writeHeader(Ostream& os, const word& type) const
 {
     if (!os.good())
     {
-        Info<< "IOobject::writeHeader(Ostream&) : "
-            << "no stream open for write" << nl
+        InfoInFunction
+            << "No stream open for write" << nl
             << os.info() << endl;
 
         return false;
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index b1f2643c9e..a3e1ece14d 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,8 +133,7 @@ Foam::IOobject* Foam::IOobjectList::lookup(const word& name) const
     {
         if (IOobject::debug)
         {
-            Info<< "IOobjectList::lookup : found "
-                << name << endl;
+            InfoInFunction << "Found " << name << endl;
         }
 
         return const_cast<IOobject*>(*iter);
@@ -143,8 +142,7 @@ Foam::IOobject* Foam::IOobjectList::lookup(const word& name) const
     {
         if (IOobject::debug)
         {
-            Info<< "IOobjectList::lookup : could not find "
-                << name << endl;
+            InfoInFunction << "Could not find " << name << endl;
         }
 
         return NULL;
@@ -162,7 +160,7 @@ Foam::IOobjectList Foam::IOobjectList::lookup(const wordRe& name) const
         {
             if (IOobject::debug)
             {
-                Info<< "IOobjectList::lookupRe : found " << iter.key() << endl;
+                InfoInFunction << "Found " << iter.key() << endl;
             }
 
             objectsOfName.insert(iter.key(), new IOobject(*iter()));
@@ -185,7 +183,7 @@ Foam::IOobjectList Foam::IOobjectList::lookup(const wordReList& patterns) const
         {
             if (IOobject::debug)
             {
-                Info<< "IOobjectList::lookupRe : found " << iter.key() << endl;
+                InfoInFunction << "Found " << iter.key() << endl;
             }
 
             objectsOfName.insert(iter.key(), new IOobject(*iter()));
@@ -206,8 +204,7 @@ Foam::IOobjectList Foam::IOobjectList::lookupClass(const word& ClassName) const
         {
             if (IOobject::debug)
             {
-                Info<< "IOobjectList::lookupClass : found "
-                    << iter.key() << endl;
+                InfoInFunction << "Found " << iter.key() << endl;
             }
 
             objectsOfClass.insert(iter.key(), new IOobject(*iter()));
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index 4802ccbaf3..31b18133bb 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,8 +56,8 @@ void Foam::sampledIsoSurface::getIsoFields() const
     {
         if (debug)
         {
-            Info<< "sampledIsoSurface::getIsoFields() : lookup volField "
-                << isoField_ << endl;
+            InfoInFunction
+                << "Lookup volField " << isoField_ << endl;
         }
         storedVolFieldPtr_.clear();
         volFieldPtr_ = &fvm.lookupObject<volScalarField>(isoField_);
@@ -68,8 +68,9 @@ void Foam::sampledIsoSurface::getIsoFields() const
 
         if (debug)
         {
-            Info<< "sampledIsoSurface::getIsoFields() : checking "
-                << isoField_ << " for same time " << fvm.time().timeName()
+            InfoInFunction
+                << "Checking " << isoField_
+                << " for same time " << fvm.time().timeName()
                 << endl;
         }
 
@@ -81,8 +82,9 @@ void Foam::sampledIsoSurface::getIsoFields() const
         {
             if (debug)
             {
-                Info<< "sampledIsoSurface::getIsoFields() : reading volField "
-                    << isoField_ << " from time " << fvm.time().timeName()
+                InfoInFunction
+                    << "Reading volField " << isoField_
+                    << " from time " << fvm.time().timeName()
                     << endl;
             }
 
@@ -111,9 +113,9 @@ void Foam::sampledIsoSurface::getIsoFields() const
             else
             {
                 FatalErrorInFunction
-                << "Cannot find isosurface field " << isoField_
-                << " in database or directory " << vfHeader.path()
-                << exit(FatalError);
+                    << "Cannot find isosurface field " << isoField_
+                    << " in database or directory " << vfHeader.path()
+                    << exit(FatalError);
             }
         }
     }
@@ -130,8 +132,8 @@ void Foam::sampledIsoSurface::getIsoFields() const
         {
             if (debug)
             {
-                Info<< "sampledIsoSurface::getIsoFields() : lookup pointField "
-                    << pointFldName << endl;
+                InfoInFunction
+                    << "Lookup pointField " << pointFldName << endl;
             }
             pointFieldPtr_ = &fvm.lookupObject<pointScalarField>(pointFldName);
         }
@@ -141,8 +143,8 @@ void Foam::sampledIsoSurface::getIsoFields() const
 
             if (debug)
             {
-                Info<< "sampledIsoSurface::getIsoFields() : "
-                    << "checking pointField " << pointFldName
+                InfoInFunction
+                    << "Checking pointField " << pointFldName
                     << " for same time " << fvm.time().timeName()
                     << endl;
             }
@@ -155,8 +157,8 @@ void Foam::sampledIsoSurface::getIsoFields() const
             {
                 if (debug)
                 {
-                    Info<< "sampledIsoSurface::getIsoFields() :"
-                        << " interpolating volField " << volFieldPtr_->name()
+                    InfoInFunction
+                        << "Interpolating volField " << volFieldPtr_->name()
                         << " to get pointField " << pointFldName << endl;
                 }
 
@@ -185,11 +187,12 @@ void Foam::sampledIsoSurface::getIsoFields() const
 
         if (debug)
         {
-            Info<< "sampledIsoSurface::getIsoFields() : volField "
-                << volFieldPtr_->name() << " min:" << min(*volFieldPtr_).value()
+            InfoInFunction
+                << "volField " << volFieldPtr_->name()
+                << " min:" << min(*volFieldPtr_).value()
                 << " max:" << max(*volFieldPtr_).value() << endl;
-            Info<< "sampledIsoSurface::getIsoFields() : pointField "
-                << pointFieldPtr_->name()
+            InfoInFunction
+                << "pointField " << pointFieldPtr_->name()
                 << " min:" << gMin(pointFieldPtr_->internalField())
                 << " max:" << gMax(pointFieldPtr_->internalField()) << endl;
         }
@@ -205,8 +208,8 @@ void Foam::sampledIsoSurface::getIsoFields() const
         {
             if (debug)
             {
-                Info<< "sampledIsoSurface::getIsoFields() :"
-                    << " submesh lookup volField "
+                InfoInFunction
+                    << "Sub-mesh lookup volField "
                     << isoField_ << endl;
             }
             storedVolSubFieldPtr_.clear();
@@ -216,8 +219,8 @@ void Foam::sampledIsoSurface::getIsoFields() const
         {
             if (debug)
             {
-                Info<< "sampledIsoSurface::getIsoFields() : "
-                    << "subsetting volField " << isoField_ << endl;
+                InfoInFunction
+                    << "Sub-setting volField " << isoField_ << endl;
             }
             storedVolSubFieldPtr_.reset
             (
@@ -242,8 +245,8 @@ void Foam::sampledIsoSurface::getIsoFields() const
         {
             if (debug)
             {
-                Info<< "sampledIsoSurface::getIsoFields() :"
-                    << " submesh lookup pointField " << pointFldName << endl;
+                InfoInFunction
+                    << "Sub-mesh lookup pointField " << pointFldName << endl;
             }
             storedPointSubFieldPtr_.clear();
             pointSubFieldPtr_ = &subFvm.lookupObject<pointScalarField>
@@ -255,8 +258,8 @@ void Foam::sampledIsoSurface::getIsoFields() const
         {
             if (debug)
             {
-                Info<< "sampledIsoSurface::getIsoFields() :"
-                    << " interpolating submesh volField "
+                InfoInFunction
+                    << "Interpolating submesh volField "
                     << volSubFieldPtr_->name()
                     << " to get submesh pointField " << pointFldName << endl;
             }

From 1bd1a49306b12da27a9d93cd8830cb09cdec242f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 19 Jan 2016 21:58:32 +0000
Subject: [PATCH 110/447] Updated header

---
 src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
index b10a6bd1d8..bb19caf668 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 68e86f97fee94420ea6c358a955041ad2a6eb157 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 20 Jan 2016 10:18:13 +0000
Subject: [PATCH 111/447] Info -> InfoInFunction and updated comments

---
 .../HashTables/HashTable/HashTable.C          | 69 +++++++++----------
 .../StaticHashTable/StaticHashTable.C         | 69 ++++++++-----------
 src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C | 17 ++---
 src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C |  5 +-
 src/OpenFOAM/db/Time/findTimes.C              |  5 +-
 src/OpenFOAM/db/dictionary/dictionaryIO.C     |  4 +-
 .../dlLibraryTable/dlLibraryTable.C           | 12 ++--
 src/OpenFOAM/db/regIOobject/regIOobjectRead.C | 18 ++---
 .../db/regIOobject/regIOobjectWrite.C         |  5 +-
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       |  9 ++-
 src/OpenFOAM/meshes/polyMesh/polyMeshClear.C  | 23 ++-----
 src/OpenFOAM/meshes/polyMesh/polyMeshIO.C     | 54 +--------------
 .../meshes/polyMesh/polyMeshInitMesh.C        |  9 ++-
 src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C |  6 +-
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C |  2 +-
 .../meshes/polyMesh/zones/faceZone/faceZone.C | 39 ++---------
 .../meshes/polyMesh/zones/zone/zone.C         | 12 ++--
 .../primitiveMeshCheck/primitiveMeshCheck.C   | 67 +++++-------------
 .../meshReader/createPolyBoundary.C           | 10 +--
 .../meshReader/starcd/STARCDMeshReader.C      |  4 +-
 .../solidBodyMotionFunctions/SDA/SDA.C        |  5 +-
 .../axisRotationMotion/axisRotationMotion.C   |  6 +-
 .../linearMotion/linearMotion.C               |  6 +-
 .../multiMotion/multiMotion.C                 |  6 +-
 .../oscillatingLinearMotion.C                 |  7 +-
 .../oscillatingRotatingMotion.C               |  7 +-
 .../rotatingMotion/rotatingMotion.C           |  6 +-
 .../tabulated6DoFMotion/tabulated6DoFMotion.C |  3 +-
 .../meshCut/wallLayerCells/wallLayerCells.C   | 11 +--
 .../polyMeshAdder/faceCoupleInfo.C            | 58 +++++-----------
 .../polyMeshAdder/faceCoupleInfo.H            |  6 +-
 src/sampling/probes/patchProbes.C             |  5 +-
 .../sampledSet/sampledSet/sampledSet.C        | 28 ++------
 src/surfMesh/MeshedSurface/MeshedSurface.C    |  5 +-
 src/surfMesh/MeshedSurface/MeshedSurfaceNew.C |  6 +-
 .../UnsortedMeshedSurfaceNew.C                |  4 +-
 src/surfMesh/surfMesh/surfMeshClear.C         | 14 ++--
 src/surfMesh/surfMesh/surfMeshIO.C            |  8 +--
 .../liquidProperties/liquidProperties.C       |  8 +--
 .../solidProperties/solidPropertiesNew.C      | 10 ++-
 .../thermophysicalFunction.C                  | 12 ++--
 .../linearValveFvMesh/linearValveFvMesh.C     |  4 +-
 .../linearValveLayersFvMesh.C                 | 11 ++-
 .../mixerFvMesh/mixerFvMesh.C                 |  8 +--
 .../movingConeTopoFvMesh.C                    | 46 +------------
 45 files changed, 234 insertions(+), 495 deletions(-)

diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index 7e36d1eb6e..a76846247d 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -121,13 +121,12 @@ bool Foam::HashTable<T, Key, Hash>::found(const Key& key) const
         }
     }
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (debug)
     {
-        Info<< "HashTable<T, Key, Hash>::found(const Key& key) : "
-            << "Entry " << key << " not found in hash table\n";
+        InfoInFunction << "Entry " << key << " not found in hash table\n";
     }
-#   endif
+    #endif
 
     return false;
 }
@@ -153,13 +152,12 @@ Foam::HashTable<T, Key, Hash>::find
         }
     }
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (debug)
     {
-        Info<< "HashTable<T, Key, Hash>::find(const Key& key) : "
-            << "Entry " << key << " not found in hash table\n";
+        InfoInFunction << "Entry " << key << " not found in hash table\n";
     }
-#   endif
+    #endif
 
     return iterator();
 }
@@ -185,13 +183,12 @@ Foam::HashTable<T, Key, Hash>::find
         }
     }
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (debug)
     {
-        Info<< "HashTable<T, Key, Hash>::find(const Key& key) const : "
-            << "Entry " << key << " not found in hash table\n";
+        InfoInFunction << "Entry " << key << " not found in hash table\n";
     }
-#   endif
+    #endif
 
     return const_iterator();
 }
@@ -250,7 +247,7 @@ bool Foam::HashTable<T, Key, Hash>::set
         prev = ep;
     }
 
-    // not found, insert it at the head
+    // Not found, insert it at the head
     if (!existing)
     {
         table_[hashIdx] = new hashedEntry(key, table_[hashIdx], newEntry);
@@ -258,39 +255,36 @@ bool Foam::HashTable<T, Key, Hash>::set
 
         if (double(nElmts_)/tableSize_ > 0.8 && tableSize_ < maxTableSize)
         {
-#           ifdef FULLDEBUG
+            #ifdef FULLDEBUG
             if (debug)
             {
-                Info<< "HashTable<T, Key, Hash>::set"
-                    "(const Key& key, T newEntry) : "
-                    "Doubling table size\n";
+                InfoInFunction << "Doubling table size\n";
             }
-#           endif
+            #endif
 
             resize(2*tableSize_);
         }
     }
     else if (protect)
     {
-        // found - but protected from overwriting
+        // Found - but protected from overwriting
         // this corresponds to the STL 'insert' convention
-#       ifdef FULLDEBUG
+        #ifdef FULLDEBUG
         if (debug)
         {
-            Info<< "HashTable<T, Key, Hash>::set"
-                "(const Key& key, T newEntry, true) : "
-                "Cannot insert " << key << " already in hash table\n";
+            InfoInFunction
+                << "Cannot insert " << key << " already in hash table\n";
         }
-#       endif
+        #endif
         return false;
     }
     else
     {
-        // found - overwrite existing entry
+        // Found - overwrite existing entry
         // this corresponds to the Perl convention
         hashedEntry* ep = new hashedEntry(key, existing->next_, newEntry);
 
-        // replace existing element - within list or insert at the head
+        // Replace existing element - within list or insert at the head
         if (prev)
         {
             prev->next_ = ep;
@@ -310,7 +304,7 @@ bool Foam::HashTable<T, Key, Hash>::set
 template<class T, class Key, class Hash>
 bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
 {
-    // note: entryPtr_ is NULL for end(), so this catches that too
+    // Note: entryPtr_ is NULL for end(), so this catches that too
     if (entryPtr_)
     {
         // Search element before entryPtr_
@@ -332,7 +326,7 @@ bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
 
         if (prev)
         {
-            // has an element before entryPtr - reposition to there
+            // Has an element before entryPtr - reposition to there
             prev->next_ = entryPtr_->next_;
             delete entryPtr_;
             entryPtr_ = prev;
@@ -343,7 +337,7 @@ bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
             hashTable_->table_[hashIndex_] = entryPtr_->next_;
             delete entryPtr_;
 
-            // assign any non-NULL pointer value so it doesn't look
+            // Assign any non-NULL pointer value so it doesn't look
             // like end()/cend()
             entryPtr_ = reinterpret_cast<hashedEntry*>(this);
 
@@ -378,7 +372,7 @@ bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
 template<class T, class Key, class Hash>
 bool Foam::HashTable<T, Key, Hash>::erase(const iterator& iter)
 {
-    // adjust iterator after erase
+    // Adjust iterator after erase
     return const_cast<iterator&>(iter).erase();
 }
 
@@ -439,13 +433,12 @@ void Foam::HashTable<T, Key, Hash>::resize(const label sz)
 
     if (newSize == tableSize_)
     {
-#       ifdef FULLDEBUG
+        #ifdef FULLDEBUG
         if (debug)
         {
-            Info<< "HashTable<T, Key, Hash>::resize(const label) : "
-                << "new table size == old table size\n";
+            InfoInFunction << "New table size == old table size\n";
         }
-#       endif
+        #endif
 
         return;
     }
@@ -508,7 +501,7 @@ void Foam::HashTable<T, Key, Hash>::shrink()
 
     if (newSize < tableSize_)
     {
-        // avoid having the table disappear on us
+        // Avoid having the table disappear on us
         resize(newSize ? newSize : 2);
     }
 }
@@ -517,7 +510,7 @@ void Foam::HashTable<T, Key, Hash>::shrink()
 template<class T, class Key, class Hash>
 void Foam::HashTable<T, Key, Hash>::transfer(HashTable<T, Key, Hash>& ht)
 {
-    // as per the Destructor
+    // As per the Destructor
     if (table_)
     {
         clear();
@@ -551,7 +544,7 @@ void Foam::HashTable<T, Key, Hash>::operator=
             << abort(FatalError);
     }
 
-    // could be zero-sized from a previous transfer()
+    // Could be zero-sized from a previous transfer()
     if (!tableSize_)
     {
         resize(rhs.tableSize_);
@@ -574,7 +567,7 @@ bool Foam::HashTable<T, Key, Hash>::operator==
     const HashTable<T, Key, Hash>& rhs
 ) const
 {
-    // sizes (number of keys) must match
+    // Sizes (number of keys) must match
     if (size() != rhs.size())
     {
         return false;
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
index f4fe74840f..05ad88f33e 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
@@ -39,12 +39,12 @@ Foam::label Foam::StaticHashTableCore::canonicalSize(const label size)
         return 0;
     }
 
-    // enforce power of two
+    // Enforce power of two
     unsigned int goodSize = size;
 
     if (goodSize & (goodSize - 1))
     {
-        // brute-force is fast enough
+        // Brute-force is fast enough
         goodSize = 1;
         while (goodSize < unsigned(size))
         {
@@ -58,7 +58,6 @@ Foam::label Foam::StaticHashTableCore::canonicalSize(const label size)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct given initial table size
 template<class T, class Key, class Hash>
 Foam::StaticHashTable<T, Key, Hash>::StaticHashTable(const label size)
 :
@@ -78,7 +77,6 @@ Foam::StaticHashTable<T, Key, Hash>::StaticHashTable(const label size)
 }
 
 
-// Construct as copy
 template<class T, class Key, class Hash>
 Foam::StaticHashTable<T, Key, Hash>::StaticHashTable
 (
@@ -137,13 +135,12 @@ bool Foam::StaticHashTable<T, Key, Hash>::found(const Key& key) const
         }
     }
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (debug)
     {
-        Info<< "StaticHashTable<T, Key, Hash>::found(const Key&) : "
-            << "Entry " << key << " not found in hash table\n";
+        InfoInFunction << "Entry " << key << " not found in hash table\n";
     }
-#   endif
+    #endif
 
     return false;
 }
@@ -170,13 +167,12 @@ Foam::StaticHashTable<T, Key, Hash>::find
         }
     }
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (debug)
     {
-        Info<< "StaticHashTable<T, Key, Hash>::find(const Key&) : "
-            << "Entry " << key << " not found in hash table\n";
+        InfoInFunction << "Entry " << key << " not found in hash table\n";
     }
-#   endif
+    #endif
 
     return end();
 }
@@ -203,19 +199,17 @@ Foam::StaticHashTable<T, Key, Hash>::find
         }
     }
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (debug)
     {
-        Info<< "StaticHashTable<T, Key, Hash>::find(const Key&) const : "
-            << "Entry " << key << " not found in hash table\n";
+        InfoInFunction << "Entry " << key << " not found in hash table\n";
     }
-#   endif
+    #endif
 
     return cend();
 }
 
 
-// Return the table of contents
 template<class T, class Key, class Hash>
 Foam::List<Key> Foam::StaticHashTable<T, Key, Hash>::toc() const
 {
@@ -254,7 +248,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::set
 
     if (existing == localKeys.size())
     {
-        // not found, append
+        // Not found, append
         List<T>& localObjects = objects_[hashIdx];
 
         localKeys.setSize(existing+1);
@@ -267,21 +261,20 @@ bool Foam::StaticHashTable<T, Key, Hash>::set
     }
     else if (protect)
     {
-        // found - but protected from overwriting
+        // Found - but protected from overwriting
         // this corresponds to the STL 'insert' convention
-#       ifdef FULLDEBUG
+        #ifdef FULLDEBUG
         if (debug)
         {
-            Info<< "StaticHashTable<T, Key, Hash>::set"
-                "(const Key& key, T newEntry, true) : "
-                "Cannot insert " << key << " already in hash table\n";
+            InfoInFunction
+                << "Cannot insert " << key << " already in hash table\n";
         }
-#       endif
+        #endif
         return false;
     }
     else
     {
-        // found - overwrite existing entry
+        // Found - overwrite existing entry
         // this corresponds to the Perl convention
         objects_[hashIdx][existing] = newEntry;
     }
@@ -307,7 +300,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::erase(const iterator& cit)
         localKeys.setSize(localKeys.size()-1);
         localObjects.setSize(localObjects.size()-1);
 
-        // adjust iterator after erase
+        // Adjust iterator after erase
         iterator& it = const_cast<iterator&>(cit);
 
         it.elemIndex_--;
@@ -321,25 +314,24 @@ bool Foam::StaticHashTable<T, Key, Hash>::erase(const iterator& cit)
 
         nElmts_--;
 
-#       ifdef FULLDEBUG
+        #ifdef FULLDEBUG
         if (debug)
         {
-            Info<< "StaticHashTable<T, Key, Hash>::erase(iterator&) : "
-                << "hashedEntry removed.\n";
+            InfoInFunction << "hashedEntry removed.\n";
         }
-#       endif
+        #endif
 
         return true;
     }
     else
     {
-#       ifdef FULLDEBUG
+        #ifdef FULLDEBUG
         if (debug)
         {
-            Info<< "StaticHashTable<T, Key, Hash>::erase(iterator&) : "
-                << "cannot remove hashedEntry from hash table\n";
+            InfoInFunction
+                << "Cannot remove hashedEntry from hash table\n";
         }
-#       endif
+        #endif
 
         return false;
     }
@@ -391,13 +383,12 @@ void Foam::StaticHashTable<T, Key, Hash>::resize(const label sz)
 
     if (newSize == keys_.size())
     {
-#       ifdef FULLDEBUG
+        #ifdef FULLDEBUG
         if (debug)
         {
-            Info<< "StaticHashTable<T, Key, Hash>::resize(const label) : "
-                << "new table size == old table size\n";
+            InfoInFunction << "New table size == old table size\n";
         }
-#       endif
+        #endif
 
         return;
     }
@@ -517,7 +508,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::operator==
     const StaticHashTable<T, Key, Hash>& rhs
 ) const
 {
-    // sizes (number of keys) must match
+    // Sizes (number of keys) must match
 
     for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
index cb78b01289..57a90a196d 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(IFstream, 0);
+    defineTypeNameAndDebug(IFstream, 0);
 }
 
 
@@ -46,8 +46,7 @@ Foam::IFstreamAllocator::IFstreamAllocator(const fileName& pathname)
     {
         if (IFstream::debug)
         {
-            Info<< "IFstreamAllocator::IFstreamAllocator(const fileName&) : "
-                    "cannot open null file " << endl;
+            InfoInFunction << "Cannot open null file " << endl;
         }
     }
 
@@ -58,8 +57,7 @@ Foam::IFstreamAllocator::IFstreamAllocator(const fileName& pathname)
     {
         if (IFstream::debug)
         {
-            Info<< "IFstreamAllocator::IFstreamAllocator(const fileName&) : "
-                    "decompressing " << pathname + ".gz" << endl;
+            InfoInFunction << "Decompressing " << pathname + ".gz" << endl;
         }
 
         delete ifPtr_;
@@ -108,11 +106,8 @@ Foam::IFstream::IFstream
     {
         if (debug)
         {
-            Info<< "IFstream::IFstream(const fileName&,"
-                   "streamFormat=ASCII,"
-                   "versionNumber=currentVersion) : "
-                   "could not open file for input"
-                << endl << info() << endl;
+            InfoInFunction
+                << "Could not open file for input" << endl << info() << endl;
         }
 
         setBad();
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index 5e9734d915..f008767f6b 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,8 +49,7 @@ Foam::OFstreamAllocator::OFstreamAllocator
     {
         if (OFstream::debug)
         {
-            Info<< "OFstreamAllocator::OFstreamAllocator(const fileName&) : "
-                   "cannot open null file " << endl;
+            InfoInFunction << "Cannot open null file " << endl;
         }
     }
 
diff --git a/src/OpenFOAM/db/Time/findTimes.C b/src/OpenFOAM/db/Time/findTimes.C
index 3384916737..ccd7312a2b 100644
--- a/src/OpenFOAM/db/Time/findTimes.C
+++ b/src/OpenFOAM/db/Time/findTimes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,8 +42,7 @@ Foam::instantList Foam::Time::findTimes
 {
     if (debug)
     {
-        Info<< "Time::findTimes(const fileName&): finding times in directory "
-            << directory << endl;
+        InfoInFunction << "Finding times in directory " << directory << endl;
     }
 
     // Read directory entries into a list
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index f6beeb1e91..f27d326d8c 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ bool Foam::dictionary::read(Istream& is, const bool keepHeader)
 
     if (is.bad())
     {
-        Info<< "dictionary::read(Istream&, bool) : "
+        InfoInFunction
             << "Istream not OK after reading dictionary " << name()
             << endl;
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
index a052289eb6..83a4658108 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,8 +61,8 @@ Foam::dlLibraryTable::~dlLibraryTable()
         {
             if (debug)
             {
-                Info<< "dlLibraryTable::~dlLibraryTable() : closing "
-                    << libNames_[i]
+                InfoInFunction
+                    << "Closing " << libNames_[i]
                     << " with handle " << uintptr_t(libPtrs_[i]) << endl;
             }
             dlClose(libPtrs_[i]);
@@ -85,7 +85,8 @@ bool Foam::dlLibraryTable::open
 
         if (debug)
         {
-            Info<< "dlLibraryTable::open : opened " << functionLibName
+            InfoInFunction
+                << "Opened " << functionLibName
                 << " resulting in handle " << uintptr_t(functionLibPtr) << endl;
         }
 
@@ -134,7 +135,8 @@ bool Foam::dlLibraryTable::close
     {
         if (debug)
         {
-            Info<< "dlLibraryTable::close : closing " << functionLibName
+            InfoInFunction
+                << "Closing " << functionLibName
                 << " with handle " << uintptr_t(libPtrs_[index]) << endl;
         }
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
index 10ec626974..83f27c0cce 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,15 +28,14 @@ License
 #include "Time.H"
 #include "Pstream.H"
 
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::Istream& Foam::regIOobject::readStream()
 {
     if (IFstream::debug)
     {
-        Info<< "regIOobject::readStream() : "
-            << "reading object " << name()
+        InfoInFunction
+            << "Reading object " << name()
             << " from file " << objectPath()
             << endl;
     }
@@ -112,8 +111,8 @@ Foam::Istream& Foam::regIOobject::readStream(const word& expectName)
 {
     if (IFstream::debug)
     {
-        Info<< "regIOobject::readStream(const word&) : "
-            << "reading object " << name()
+        InfoInFunction
+            << "Reading object " << name()
             << " from file " << objectPath()
             << endl;
     }
@@ -149,8 +148,8 @@ void Foam::regIOobject::close()
 {
     if (IFstream::debug)
     {
-        Info<< "regIOobject::close() : "
-            << "finished reading " << filePath()
+        InfoInFunction
+            << "Finished reading " << filePath()
             << endl;
     }
 
@@ -288,7 +287,8 @@ bool Foam::regIOobject::readIfModified()
         if (modified())
         {
             const fileName& fName = time().getFile(watchIndex_);
-            Info<< "regIOobject::readIfModified() : " << nl
+            InfoInFunction
+                << nl
                 << "    Re-reading object " << name()
                 << " from file " << fName << endl;
             return read();
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
index 3b436890fb..c2b891cd01 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,8 +74,7 @@ bool Foam::regIOobject::writeObject
 
     if (OFstream::debug)
     {
-        Info<< "regIOobject::write() : "
-            << "writing file " << objectPath();
+        InfoInFunction << "Writing file " << objectPath();
     }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 5df8ef5fd7..0a793a5155 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1051,8 +1051,8 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
 {
     if (debug)
     {
-        Info<< "tmp<scalarField> polyMesh::movePoints(const pointField&) : "
-            << " Moving points for time " << time().value()
+        InfoInFunction
+            << "Moving points for time " << time().value()
             << " index " << time().timeIndex() << endl;
     }
 
@@ -1077,8 +1077,7 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
         {
             moveError = true;
 
-            Info<< "tmp<scalarField> polyMesh::movePoints"
-                << "(const pointField&) : "
+            InfoInFunction
                 << "Moving the mesh with given points will "
                 << "invalidate the mesh." << nl
                 << "Mesh motion should not be executed." << endl;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
index 25eb1fd29d..4cea2cb388 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,9 +37,7 @@ void Foam::polyMesh::removeBoundary()
 {
     if (debug)
     {
-        Info<< "void polyMesh::removeBoundary(): "
-            << "Removing boundary patches."
-            << endl;
+        InfoInFunction << "Removing boundary patches." << endl;
     }
 
     // Remove the point zones
@@ -56,9 +54,7 @@ void Foam::polyMesh::clearGeom()
 {
     if (debug)
     {
-        Info<< "void polyMesh::clearGeom() : "
-            << "clearing geometric data"
-            << endl;
+        InfoInFunction << "Clearing geometric data" << endl;
     }
 
     // Clear all geometric mesh objects
@@ -84,9 +80,7 @@ void Foam::polyMesh::clearAdditionalGeom()
 {
     if (debug)
     {
-        Info<< "void polyMesh::clearAdditionalGeom() : "
-            << "clearing additional geometric data"
-            << endl;
+        InfoInFunction << "Clearing additional geometric data" << endl;
     }
 
     // Remove the stored tet base points
@@ -100,9 +94,8 @@ void Foam::polyMesh::clearAddressing(const bool isMeshUpdate)
 {
     if (debug)
     {
-        Info<< "void polyMesh::clearAddressing() : "
-            << "clearing topology  isMeshUpdate:" << isMeshUpdate
-            << endl;
+        InfoInFunction
+            << "Clearing topology  isMeshUpdate:" << isMeshUpdate << endl;
     }
 
     if (isMeshUpdate)
@@ -181,9 +174,7 @@ void Foam::polyMesh::clearCellTree()
 {
     if (debug)
     {
-        Info<< "void polyMesh::clearCellTree() : "
-            << "clearing cell tree"
-            << endl;
+        InfoInFunction << "Clearing cell tree" << endl;
     }
 
     cellTreePtr_.clear();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index f185c79a6f..9ddd2d8394 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,8 +33,7 @@ void Foam::polyMesh::setInstance(const fileName& inst)
 {
     if (debug)
     {
-        Info<< "void polyMesh::setInstance(const fileName& inst) : "
-            << "Resetting file instance to " << inst << endl;
+        InfoInFunction << "Resetting file instance to " << inst << endl;
     }
 
     points_.writeOpt() = IOobject::AUTO_WRITE;
@@ -67,8 +66,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
 {
     if (debug)
     {
-        Info<< "polyMesh::readUpdateState polyMesh::readUpdate() : "
-            << "Updating mesh based on saved data." << endl;
+        InfoInFunction << "Updating mesh based on saved data." << endl;
     }
 
     // Find the point and cell instance
@@ -80,8 +78,6 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
     {
         Info<< "Faces instance: old = " << facesInstance()
             << " new = " << facesInst << nl
-            //<< "Boundary instance: old = " << boundary_.instance()
-            //<< " new = " << boundaryInst << nl
             << "Points instance: old = " << pointsInstance()
             << " new = " << pointsInst << endl;
     }
@@ -449,50 +445,6 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         geometricD_ = Vector<label>::zero;
         solutionD_ = Vector<label>::zero;
 
-
-        //if (boundaryInst != boundary_.instance())
-        //{
-        //    // Boundary file but no topology change
-        //    if (debug)
-        //    {
-        //        Info<< "Boundary state change" << endl;
-        //    }
-        //
-        //    // Reset the boundary patches
-        //    polyBoundaryMesh newBoundary
-        //    (
-        //        IOobject
-        //        (
-        //            "boundary",
-        //            facesInst,
-        //            meshSubDir,
-        //            *this,
-        //            IOobject::MUST_READ,
-        //            IOobject::NO_WRITE,
-        //            false
-        //        ),
-        //        *this
-        //    );
-        //
-        //
-        //
-        //
-        //    boundary_.clear();
-        //    boundary_.setSize(newBoundary.size());
-        //
-        //    forAll(newBoundary, patchI)
-        //    {
-        //        boundary_.set(patchI, newBoundary[patchI].clone(boundary_));
-        //    }
-        //    // Calculate topology for the patches (processor-processor comms
-        //    // etc.)
-        //    boundary_.updateMesh();
-        //
-        //    // Calculate the geometry for the patches (transformation tensors
-        //    // etc.)
-        //    boundary_.calcGeometry();
-        //}
-
         return polyMesh::POINTS_MOVED;
     }
     else
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
index ef2c09e5b6..730d7b3b47 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,8 +31,7 @@ void Foam::polyMesh::initMesh()
 {
     if (debug)
     {
-        Info<< "void polyMesh::initMesh() : "
-            << "initialising primitiveMesh" << endl;
+        InfoInFunction << "initialising primitiveMesh" << endl;
     }
 
     // For backward compatibility check if the neighbour array is the same
@@ -109,8 +108,7 @@ void Foam::polyMesh::initMesh(cellList& c)
 {
     if (debug)
     {
-        Info<< "void polyMesh::initMesh(cellList& c) : "
-            << "calculating owner-neighbour arrays" << endl;
+        InfoInFunction << "Calculating owner-neighbour arrays" << endl;
     }
 
     owner_.setSize(faces_.size(), -1);
@@ -175,4 +173,5 @@ void Foam::polyMesh::initMesh(cellList& c)
     neighbour_.note() = meshInfo;
 }
 
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
index 4a8b5dd7d7..004cee98d8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,8 +40,8 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
 {
     if (debug)
     {
-        Info<< "void polyMesh::updateMesh(const mapPolyMesh&) : "
-            << "updating addressing and (optional) pointMesh/pointFields"
+        InfoInFunction
+            << "Updating addressing and (optional) pointMesh/pointFields"
             << endl;
     }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index f453dee2a0..efb2dc3ab7 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -362,7 +362,7 @@ Foam::label Foam::ZoneMesh<ZoneType, MeshType>::findZoneID
     // Zone not found
     if (debug)
     {
-        Info<< "label ZoneMesh<ZoneType>::findZoneID(const word&) const : "
+        InfoInFunction
             << "Zone named " << zoneName << " not found.  "
             << "List of available zone names: " << names() << endl;
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index 60eb63af66..6bf2a1109f 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,9 +49,7 @@ void Foam::faceZone::calcFaceZonePatch() const
 {
     if (debug)
     {
-        Info<< "void faceZone::calcFaceZonePatch() const : "
-            << "Calculating primitive patch"
-            << endl;
+        InfoInFunction << "Calculating primitive patch" << endl;
     }
 
     if (patchPtr_)
@@ -89,9 +87,7 @@ void Foam::faceZone::calcFaceZonePatch() const
 
     if (debug)
     {
-        Info<< "void faceZone::calcFaceZonePatch() const : "
-            << "Finished calculating primitive patch"
-            << endl;
+        InfoInFunction << "Finished calculating primitive patch" << endl;
     }
 }
 
@@ -100,9 +96,7 @@ void Foam::faceZone::calcCellLayers() const
 {
     if (debug)
     {
-        Info<< "void Foam::faceZone::calcCellLayers() const : "
-            << "calculating master cells"
-            << endl;
+        InfoInFunction << "Calculating master cells" << endl;
     }
 
     // It is an error to attempt to recalculate edgeCells
@@ -153,8 +147,6 @@ void Foam::faceZone::calcCellLayers() const
                 sc[faceI] = neiCellI;
             }
         }
-        //Info<< "masterCells: " << mc << endl;
-        //Info<< "slaveCells: " << sc << endl;
     }
 }
 
@@ -190,7 +182,6 @@ void Foam::faceZone::checkAddressing() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::faceZone::faceZone
 (
     const word& name,
@@ -354,28 +345,6 @@ const Foam::labelList& Foam::faceZone::meshEdges() const
 {
     if (!mePtr_)
     {
-        //labelList faceCells(size());
-        //
-        //const labelList& own = zoneMesh().mesh().faceOwner();
-        //
-        //const labelList& faceLabels = *this;
-        //
-        //forAll(faceCells, faceI)
-        //{
-        //    faceCells[faceI] = own[faceLabels[faceI]];
-        //}
-        //
-        //mePtr_ =
-        //    new labelList
-        //    (
-        //        operator()().meshEdges
-        //        (
-        //            zoneMesh().mesh().edges(),
-        //            zoneMesh().mesh().cellEdges(),
-        //            faceCells
-        //        )
-        //    );
-
         mePtr_ =
             new labelList
             (
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
index 8d31b8a3ad..1d80073138 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(zone, 0);
+    defineTypeNameAndDebug(zone, 0);
 }
 
 
@@ -53,9 +53,7 @@ void Foam::zone::calcLookupMap() const
 {
     if (debug)
     {
-        Info<< "void zone::calcLookupMap() const: "
-            << "Calculating lookup map"
-            << endl;
+        InfoInFunction << "Calculating lookup map" << endl;
     }
 
     if (lookupMapPtr_)
@@ -77,9 +75,7 @@ void Foam::zone::calcLookupMap() const
 
     if (debug)
     {
-        Info<< "void zone::calcLookupMap() const: "
-            << "Finished calculating lookup map"
-            << endl;
+        InfoInFunction << "Finished calculating lookup map" << endl;
     }
 }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index 01daafe355..9f26dd28a8 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,9 +51,8 @@ bool Foam::primitiveMesh::checkClosedBoundary
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkClosedBoundary("
-            << "const bool) const: "
-            << "checking whether the boundary is closed" << endl;
+        InfoInFunction
+            << "Checking whether the boundary is closed" << endl;
     }
 
     // Loop through all boundary faces and sum up the face area vectors.
@@ -112,10 +111,8 @@ bool Foam::primitiveMesh::checkClosedCells
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkClosedCells("
-            << "const bool, labelHashSet*, labelHashSet*"
-            << ", const Vector<label>&) const: "
-            << "checking whether cells are closed" << endl;
+        InfoInFunction
+            << "Checking whether cells are closed" << endl;
     }
 
     // Check that all cells labels are valid
@@ -244,9 +241,7 @@ bool Foam::primitiveMesh::checkFaceAreas
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkFaceAreas("
-            << "const bool, labelHashSet*) const: "
-            << "checking face area magnitudes" << endl;
+        InfoInFunction << "Checking face area magnitudes" << endl;
     }
 
     const scalarField magFaceAreas(mag(faceAreas));
@@ -324,9 +319,7 @@ bool Foam::primitiveMesh::checkCellVolumes
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkCellVolumes("
-            << "const bool, labelHashSet*) const: "
-            << "checking cell volumes" << endl;
+        InfoInFunction << "Checking cell volumes" << endl;
     }
 
     scalar minVolume = GREAT;
@@ -396,9 +389,7 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkFaceOrthogonality("
-            << "const bool, labelHashSet*) const: "
-            << "checking mesh non-orthogonality" << endl;
+        InfoInFunction << "Checking mesh non-orthogonality" << endl;
     }
 
 
@@ -510,9 +501,7 @@ bool Foam::primitiveMesh::checkFacePyramids
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkFacePyramids("
-            << "const bool, const scalar, labelHashSet*) const: "
-            << "checking face orientation" << endl;
+        InfoInFunction << "Checking face orientation" << endl;
     }
 
     const labelList& own = faceOwner();
@@ -614,9 +603,7 @@ bool Foam::primitiveMesh::checkFaceSkewness
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkFaceSkewnesss("
-            << "const bool, labelHashSet*) const: "
-            << "checking face skewness" << endl;
+        InfoInFunction << "Checking face skewness" << endl;
     }
 
     // Warn if the skew correction vector is more than skewWarning times
@@ -692,9 +679,7 @@ bool Foam::primitiveMesh::checkFaceAngles
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkFaceAngles"
-            << "(const bool, const scalar, labelHashSet*) const: "
-            << "checking face angles" << endl;
+        InfoInFunction << "Checking face angles" << endl;
     }
 
     if (maxDeg < -SMALL || maxDeg > 180+SMALL)
@@ -775,9 +760,7 @@ bool Foam::primitiveMesh::checkFaceFlatness
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkFaceFlatness"
-            << "(const bool, const scalar, labelHashSet*) const: "
-            << "checking face flatness" << endl;
+        InfoInFunction << "Checking face flatness" << endl;
     }
 
     if (warnFlatness < 0 || warnFlatness > 1)
@@ -880,9 +863,7 @@ bool Foam::primitiveMesh::checkConcaveCells
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkConcaveCells(const bool"
-            << ", labelHashSet*) const: "
-            << "checking for concave cells" << endl;
+        InfoInFunction << "Checking for concave cells" << endl;
     }
 
     const cellList& c = cells();
@@ -995,9 +976,7 @@ bool Foam::primitiveMesh::checkUpperTriangular
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkUpperTriangular("
-            << "const bool, labelHashSet*) const: "
-            << "checking face ordering" << endl;
+        InfoInFunction << "Checking face ordering" << endl;
     }
 
     // Check whether internal faces are ordered in the upper triangular order
@@ -1160,9 +1139,7 @@ bool Foam::primitiveMesh::checkCellsZipUp
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkCellsZipUp("
-            << "const bool, labelHashSet*) const: "
-            << "checking topological cell openness" << endl;
+        InfoInFunction << "Checking topological cell openness" << endl;
     }
 
     label nOpenCells = 0;
@@ -1261,9 +1238,7 @@ bool Foam::primitiveMesh::checkFaceVertices
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkFaceVertices("
-            << "const bool, labelHashSet*) const: "
-            << "checking face vertices" << endl;
+        InfoInFunction << "Checking face vertices" << endl;
     }
 
     // Check that all vertex labels are valid
@@ -1336,9 +1311,7 @@ bool Foam::primitiveMesh::checkPoints
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkPoints"
-            << "(const bool, labelHashSet*) const: "
-            << "checking points" << endl;
+        InfoInFunction << "Checking points" << endl;
     }
 
     label nFaceErrors = 0;
@@ -1616,8 +1589,7 @@ bool Foam::primitiveMesh::checkFaceFaces
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkFaceFaces(const bool, labelHashSet*)"
-            << " const: " << "checking face-face connectivity" << endl;
+        InfoInFunction << "Checking face-face connectivity" << endl;
     }
 
     const labelListList& pf = pointFaces();
@@ -1954,8 +1926,7 @@ bool Foam::primitiveMesh::checkMesh(const bool report) const
 {
     if (debug)
     {
-        Info<< "bool primitiveMesh::checkMesh(const bool report) const: "
-            << "checking primitiveMesh" << endl;
+        InfoInFunction << "Checking primitiveMesh" << endl;
     }
 
     label noFailedChecks = checkTopology(report) + checkGeometry(report);
diff --git a/src/conversion/meshReader/createPolyBoundary.C b/src/conversion/meshReader/createPolyBoundary.C
index 47fb2008f7..aecf77bcc0 100644
--- a/src/conversion/meshReader/createPolyBoundary.C
+++ b/src/conversion/meshReader/createPolyBoundary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ void Foam::meshReader::addPolyBoundaryFace
     // Debugging
     if (cellPolys_[cellId][cellFaceId] > nInternalFaces_)
     {
-        Info<< "meshReader::createPolyBoundary(): "
+        InfoInFunction
             << "Problem with face: " << thisFace << endl
             << "Probably multiple definitions "
             << "of a single boundary face." << endl
@@ -70,7 +70,7 @@ void Foam::meshReader::addPolyBoundaryFace
     }
     else if (cellPolys_[cellId][cellFaceId] >= 0)
     {
-        Info<< "meshReader::createPolyBoundary(): "
+        InfoInFunction
             << "Problem with face: " << thisFace << endl
             << "Probably trying to define a boundary face "
             << "on a previously matched internal face." << endl
@@ -340,8 +340,8 @@ void Foam::meshReader::createPolyBoundary()
         {
             const face& problemFace = meshFaces_[faceI];
 
-            Info<< "meshReader::createPolyBoundary() : "
-                << "problem with face " << faceI << ": addressed "
+            InfoInFunction
+                << "Problem with face " << faceI << ": addressed "
                 << markupFaces[faceI] << " times (should be 2!). Face: "
                 << problemFace << endl;
 
diff --git a/src/conversion/meshReader/starcd/STARCDMeshReader.C b/src/conversion/meshReader/starcd/STARCDMeshReader.C
index 5ba8c7abc9..52ffa3594a 100644
--- a/src/conversion/meshReader/starcd/STARCDMeshReader.C
+++ b/src/conversion/meshReader/starcd/STARCDMeshReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1041,8 +1041,6 @@ void Foam::meshReaders::STARCD::cullPoints()
 
 bool Foam::meshReaders::STARCD::readGeometry(const scalar scaleFactor)
 {
-    // Info<< "called meshReaders::STARCD::readGeometry" << endl;
-
     readPoints(geometryFile_ + ".vrt", scaleFactor);
     readCells(geometryFile_ + ".cel");
     cullPoints();
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C
index 611f36faf1..269cc3217a 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,8 +93,7 @@ Foam::septernion Foam::solidBodyMotionFunctions::SDA::transformation() const
     quaternion R(rollA*sin(wr*time + phr), 0, 0);
     septernion TR(septernion(CofG_ + T)*R*septernion(-CofG_));
 
-    Info<< "solidBodyMotionFunctions::SDA::transformation(): "
-        << "Time = " << time << " transformation: " << TR << endl;
+    InfoInFunction << "Time = " << time << " transformation: " << TR << endl;
 
     return TR;
 }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
index 7fec360454..ede53f4cb7 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,8 +85,7 @@ Foam::solidBodyMotionFunctions::axisRotationMotion::transformation() const
     quaternion R(omega/magOmega, magOmega);
     septernion TR(septernion(origin_)*R*septernion(-origin_));
 
-    Info<< "solidBodyMotionFunctions::axisRotationMotion::transformation(): "
-        << "Time = " << t << " transformation: " << TR << endl;
+    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
@@ -105,4 +104,5 @@ bool Foam::solidBodyMotionFunctions::axisRotationMotion::read
     return true;
 }
 
+
 // ************************************************************************* //
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C
index 69fc23b2f6..6a9f7bc5b4 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,8 +76,7 @@ Foam::solidBodyMotionFunctions::linearMotion::transformation() const
     quaternion R(0, 0, 0);
     septernion TR(septernion(displacement)*R);
 
-    Info<< "solidBodyMotionFunctions::linearMotion::transformation(): "
-        << "Time = " << t << " transformation: " << TR << endl;
+    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
@@ -95,4 +94,5 @@ bool Foam::solidBodyMotionFunctions::linearMotion::read
     return true;
 }
 
+
 // ************************************************************************* //
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.C
index 963ae01deb..a88c1d9e9f 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,8 +77,7 @@ Foam::solidBodyMotionFunctions::multiMotion::transformation() const
         TR *= SBMFs_[i].transformation();
     }
 
-    Info<< "solidBodyMotionFunctions::multiMotion::transformation(): "
-        << "Time = " << t << " transformation: " << TR << endl;
+    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
@@ -116,4 +115,5 @@ bool Foam::solidBodyMotionFunctions::multiMotion::read
     return true;
 }
 
+
 // ************************************************************************* //
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
index 5fa4cf48f6..5a090577ff 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,9 +76,7 @@ Foam::solidBodyMotionFunctions::oscillatingLinearMotion::transformation() const
     quaternion R(0, 0, 0);
     septernion TR(septernion(displacement)*R);
 
-    Info<< "solidBodyMotionFunctions::oscillatingLinearMotion::"
-        << "transformation(): "
-        << "Time = " << t << " transformation: " << TR << endl;
+    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
@@ -97,4 +95,5 @@ bool Foam::solidBodyMotionFunctions::oscillatingLinearMotion::read
     return true;
 }
 
+
 // ************************************************************************* //
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
index 04bf5d2e1d..64516acf99 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,9 +84,7 @@ transformation() const
     quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z());
     septernion TR(septernion(origin_)*R*septernion(-origin_));
 
-    Info<< "solidBodyMotionFunctions::oscillatingRotatingMotion::"
-        << "transformation(): "
-        << "Time = " << t << " transformation: " << TR << endl;
+    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
@@ -106,4 +104,5 @@ bool Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::read
     return true;
 }
 
+
 // ************************************************************************* //
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
index 8cce3dc680..8a31c71e61 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,8 +80,7 @@ Foam::solidBodyMotionFunctions::rotatingMotion::transformation() const
     quaternion R(axis_, angle);
     septernion TR(septernion(origin_)*R*septernion(-origin_));
 
-    Info<< "solidBodyMotionFunctions::rotatingMotion::transformation(): "
-        << "Time = " << t << " transformation: " << TR << endl;
+    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
@@ -102,4 +101,5 @@ bool Foam::solidBodyMotionFunctions::rotatingMotion::read
     return true;
 }
 
+
 // ************************************************************************* //
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
index 4f76bcd0b5..b25838c75d 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
@@ -107,8 +107,7 @@ Foam::solidBodyMotionFunctions::tabulated6DoFMotion::transformation() const
     quaternion R(TRV[1].x(), TRV[1].y(), TRV[1].z());
     septernion TR(septernion(CofG_ + TRV[0])*R*septernion(-CofG_));
 
-    Info<< "solidBodyMotionFunctions::tabulated6DoFMotion::transformation(): "
-        << "Time = " << t << " transformation: " << TR << endl;
+    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
diff --git a/src/dynamicMesh/meshCut/wallLayerCells/wallLayerCells.C b/src/dynamicMesh/meshCut/wallLayerCells/wallLayerCells.C
index 1e2354f080..a883cd438b 100644
--- a/src/dynamicMesh/meshCut/wallLayerCells/wallLayerCells.C
+++ b/src/dynamicMesh/meshCut/wallLayerCells/wallLayerCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,14 +29,11 @@ License
 #include "wallNormalInfo.H"
 #include "OFstream.H"
 
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-defineTypeNameAndDebug(wallLayerCells, 0);
-
+    defineTypeNameAndDebug(wallLayerCells, 0);
 }
 
 
@@ -64,7 +61,6 @@ bool Foam::wallLayerCells::usesCoupledPatch(const label cellI) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::wallLayerCells::wallLayerCells
 (
     const polyMesh& mesh,
@@ -160,8 +156,7 @@ Foam::wallLayerCells::wallLayerCells
 
     if (debug)
     {
-        Info<< "wallLayerCells::getRefinement : dumping selected faces to "
-            << "selectedFaces.obj" << endl;
+        InfoInFunction << "Dumping selected faces to selectedFaces.obj" << endl;
 
         OFstream fcStream("selectedFaces.obj");
 
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index 02efdeabf0..37b1cab458 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,15 +36,13 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(faceCoupleInfo, 0);
-
-const scalar faceCoupleInfo::angleTol_ = 1e-3;
+    defineTypeNameAndDebug(faceCoupleInfo, 0);
+    const scalar faceCoupleInfo::angleTol_ = 1e-3;
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-//- Write edges
 void Foam::faceCoupleInfo::writeOBJ
 (
     const fileName& fName,
@@ -97,7 +95,6 @@ void Foam::faceCoupleInfo::writeOBJ
 }
 
 
-//- Writes edges.
 void Foam::faceCoupleInfo::writeOBJ
 (
     const fileName& fName,
@@ -122,7 +119,6 @@ void Foam::faceCoupleInfo::writeOBJ
 }
 
 
-//- Writes face and point connectivity as .obj files.
 void Foam::faceCoupleInfo::writePointsFaces() const
 {
     const indirectPrimitivePatch& m = masterPatch();
@@ -303,8 +299,6 @@ void Foam::faceCoupleInfo::writeEdges
 }
 
 
-// Given an edgelist and a map for the points on the edges it tries to find
-// the corresponding patch edges.
 Foam::labelList Foam::faceCoupleInfo::findMappedEdges
 (
     const edgeList& edges,
@@ -334,8 +328,6 @@ Foam::labelList Foam::faceCoupleInfo::findMappedEdges
 }
 
 
-// Detect a cut edge which originates from two boundary faces having different
-// polyPatches.
 bool Foam::faceCoupleInfo::regionEdge
 (
     const polyMesh& slaveMesh,
@@ -377,9 +369,6 @@ bool Foam::faceCoupleInfo::regionEdge
 }
 
 
-// Find edge using pointI that is most aligned with vector between
-// master points. Patchdivision tells us whether or not to use
-// patch information to match edges.
 Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
 (
     const bool report,
@@ -392,6 +381,10 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
     const label edgeEnd
 ) const
 {
+    // Find edge using pointI that is most aligned with vector between master
+    // points. Patchdivision tells us whether or not to use patch information to
+    // match edges.
+
     const pointField& localPoints = cutFaces().localPoints();
 
     const labelList& pEdges = cutFaces().pointEdges()[pointI];
@@ -499,7 +492,6 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
 }
 
 
-// Construct points to split points map (in cut addressing)
 void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
 {
     labelListList masterToCutEdges
@@ -632,8 +624,6 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
 }
 
 
-// Determines rotation for f1 to match up with f0, i.e. the index in f0 of
-// the first point of f1.
 Foam::label Foam::faceCoupleInfo::matchFaces
 (
     const scalar absTol,
@@ -713,11 +703,6 @@ Foam::label Foam::faceCoupleInfo::matchFaces
 }
 
 
-// Find correspondence from patch points to cut points. This might
-// detect shared points so the output is a patch-to-cut point list
-// and a compaction list for the cut points (which will always be equal or more
-// connected than the patch).
-// Returns true if there are any duplicates.
 bool Foam::faceCoupleInfo::matchPointsThroughFaces
 (
     const scalar absTol,
@@ -732,6 +717,10 @@ bool Foam::faceCoupleInfo::matchPointsThroughFaces
     labelList& compactToCut         // inverse ,,
 )
 {
+    // Find correspondence from patch points to cut points. This might detect
+    // shared points so the output is a patch-to-cut point list and a compaction
+    // list for the cut points (which will always be equal or more connected
+    // than the patch).  Returns true if there are any duplicates.
 
     // From slave to cut point
     patchToCutPoints.setSize(patchPoints.size());
@@ -865,7 +854,6 @@ bool Foam::faceCoupleInfo::matchPointsThroughFaces
 }
 
 
-// Return max distance from any point on cutF to masterF
 Foam::scalar Foam::faceCoupleInfo::maxDistance
 (
     const face& cutF,
@@ -943,8 +931,7 @@ void Foam::faceCoupleInfo::findPerfectMatchingFaces
 
     if (matchedAllFaces)
     {
-        Warning
-            << "faceCoupleInfo::faceCoupleInfo : "
+        WarningInFunction
             << "Matched ALL " << fc1.size()
             << " boundary faces of mesh0 to boundary faces of mesh1." << endl
             << "This is only valid if the mesh to add is fully"
@@ -1073,7 +1060,6 @@ void Foam::faceCoupleInfo::findSlavesCoveringMaster
 }
 
 
-// Grow cutToMasterFace across 'internal' edges.
 Foam::label Foam::faceCoupleInfo::growCutFaces
 (
     const labelList& cutToMasterEdges,
@@ -1243,15 +1229,16 @@ void Foam::faceCoupleInfo::checkMatch(const labelList& cutToMasterEdges) const
 }
 
 
-// Extends matching information by elimination across cutFaces using more
-// than one region edge. Updates cutToMasterFaces_ and sets candidates
-// which is for every cutface on a region edge the possible master faces.
 Foam::label Foam::faceCoupleInfo::matchEdgeFaces
 (
     const labelList& cutToMasterEdges,
     Map<labelList>& candidates
 )
 {
+    // Extends matching information by elimination across cutFaces using more
+    // than one region edge. Updates cutToMasterFaces_ and sets candidates which
+    // is for every cutface on a region edge the possible master faces.
+
     // For every unassigned cutFaceI the possible list of master faces.
     candidates.clear();
     candidates.resize(cutFaces().size());
@@ -1348,9 +1335,6 @@ Foam::label Foam::faceCoupleInfo::matchEdgeFaces
 }
 
 
-// Gets a list of cutFaces (that use a master edge) and the candidate
-// master faces.
-// Finds most aligned master face.
 Foam::label Foam::faceCoupleInfo::geometricMatchEdgeFaces
 (
     Map<labelList>& candidates
@@ -1438,14 +1422,15 @@ Foam::label Foam::faceCoupleInfo::geometricMatchEdgeFaces
 }
 
 
-// Calculate the set of cut faces inbetween master and slave patch
-// assuming perfect match (and optional face ordering on slave)
 void Foam::faceCoupleInfo::perfectPointMatch
 (
     const scalar absTol,
     const bool slaveFacesOrdered
 )
 {
+    // Calculate the set of cut faces inbetween master and slave patch assuming
+    // perfect match (and optional face ordering on slave)
+
     if (debug)
     {
         Pout<< "perfectPointMatch :"
@@ -1568,8 +1553,6 @@ void Foam::faceCoupleInfo::perfectPointMatch
 }
 
 
-// Calculate the set of cut faces inbetween master and slave patch
-// assuming that slave patch is subdivision of masterPatch.
 void Foam::faceCoupleInfo::subDivisionMatch
 (
     const polyMesh& slaveMesh,
@@ -1881,7 +1864,6 @@ void Foam::faceCoupleInfo::subDivisionMatch
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from mesh data
 Foam::faceCoupleInfo::faceCoupleInfo
 (
     const polyMesh& masterMesh,
@@ -1970,8 +1952,6 @@ Foam::faceCoupleInfo::faceCoupleInfo
 }
 
 
-// Slave is subdivision of master patch.
-// (so -both cover the same area -all of master points are present in slave)
 Foam::faceCoupleInfo::faceCoupleInfo
 (
     const polyMesh& masterMesh,
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
index ce4e33829b..4ea2819195 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
@@ -278,9 +278,9 @@ class faceCoupleInfo
 
         // Face matching
 
-            //- Matches two faces.Determines rotation for f1 to match up
-            // with f0, i.e. the index in f0 of
-            // the first point of f1.
+            //- Matches two faces.
+            //  Determines rotation for f1 to match up with f0,
+            //  i.e. the index in f0 of the first point of f1.
             static label matchFaces
             (
                 const scalar absTol,
diff --git a/src/sampling/probes/patchProbes.C b/src/sampling/probes/patchProbes.C
index a622d2ecd9..41b9024869 100644
--- a/src/sampling/probes/patchProbes.C
+++ b/src/sampling/probes/patchProbes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,6 @@ License
 #include "patchProbes.H"
 #include "volFields.H"
 #include "IOmanip.H"
-// For 'nearInfo' helper class only
 #include "mappedPatchBase.H"
 #include "treeBoundBox.H"
 #include "treeDataFace.H"
@@ -152,7 +151,7 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
 
     if (debug)
     {
-        Info<< "patchProbes::findElements" << " : " << endl;
+        InfoInFunction << endl;
         forAll(nearest, sampleI)
         {
             label procI = nearest[sampleI].second().second();
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C
index 4be25ac3e1..6167edd46e 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ Foam::scalar Foam::sampledSet::calcSign
 
     if (magVec < VSMALL)
     {
-        // sample on face centre. Regard as inside
+        // Sample on face centre. Regard as inside
         return -1;
     }
 
@@ -133,7 +133,6 @@ Foam::scalar Foam::sampledSet::calcSign
 }
 
 
-// Return face (or -1) of face which is within smallDist of sample
 Foam::label Foam::sampledSet::findNearFace
 (
     const label cellI,
@@ -169,8 +168,6 @@ Foam::label Foam::sampledSet::findNearFace
 }
 
 
-// 'Pushes' point facePt (which is almost on face) in direction of cell centre
-// so it is clearly inside.
 Foam::point Foam::sampledSet::pushIn
 (
     const point& facePt,
@@ -224,16 +221,10 @@ Foam::point Foam::sampledSet::pushIn
             << abort(FatalError);
     }
 
-    //Info<< "pushIn : moved " << facePt << " to " << newPosition
-    //    << endl;
-
     return newPosition;
 }
 
 
-// Calculates start of tracking given samplePt and first boundary intersection
-// (bPoint, bFaceI). bFaceI == -1 if no boundary intersection.
-// Returns true if trackPt is sampling point
 bool Foam::sampledSet::getTrackingPoint
 (
     const vector& offset,
@@ -268,9 +259,6 @@ bool Foam::sampledSet::getTrackingPoint
         {
             // Line samplePt - end_ does not intersect domain at all.
             // (or is along edge)
-            //Info<< "getTrackingPoint : samplePt outside domain : "
-            //    << "  samplePt:" << samplePt
-            //    << endl;
 
             trackCellI = -1;
             trackFaceI = -1;
@@ -279,11 +267,7 @@ bool Foam::sampledSet::getTrackingPoint
         }
         else
         {
-            // start is inside. Use it as tracking point
-            //Info<< "getTrackingPoint : samplePt inside :"
-            //    << "  samplePt:" << samplePt
-            //    << "  trackCellI:" << trackCellI
-            //    << endl;
+            // Start is inside. Use it as tracking point
 
             trackPt = samplePt;
             trackFaceI = -1;
@@ -293,10 +277,6 @@ bool Foam::sampledSet::getTrackingPoint
     }
     else if (mag(samplePt - bPoint) < smallDist)
     {
-        //Info<< "getTrackingPoint : samplePt:" << samplePt
-        //    << " close to bPoint:"
-        //    << bPoint << endl;
-
         // samplePt close to bPoint. Snap to it
         trackPt = pushIn(bPoint, bFaceI);
         trackFaceI = bFaceI;
@@ -330,7 +310,7 @@ bool Foam::sampledSet::getTrackingPoint
 
     if (debug)
     {
-        Info<< "sampledSet::getTrackingPoint :"
+        InfoInFunction
             << " offset:" << offset
             << " samplePt:" << samplePt
             << " bPoint:" << bPoint
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index bc36bdcf09..041aa34231 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -119,10 +119,7 @@ void Foam::MeshedSurface<Face>::write
 {
     if (debug)
     {
-        Info<< "MeshedSurface::write"
-            "(const fileName&, const MeshedSurface&) : "
-            "writing to " << name
-            << endl;
+        InfoInFunction << "Writing to " << name << endl;
     }
 
     const word ext = name.ext();
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
index 02f92594d7..41da2d6a1a 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
@@ -28,16 +28,13 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
 template<class Face>
 Foam::autoPtr<Foam::MeshedSurface<Face>>
 Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
 {
     if (debug)
     {
-        Info<< "MeshedSurface::New(const fileName&, const word&) : "
-            "constructing MeshedSurface"
-            << endl;
+        InfoInFunction << "Constructing MeshedSurface" << endl;
     }
 
     typename fileExtensionConstructorTable::iterator cstrIter =
@@ -82,4 +79,5 @@ Foam::MeshedSurface<Face>::New(const fileName& name)
     return New(name, ext);
 }
 
+
 // ************************************************************************* //
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
index 750edb8996..e61df5c6fc 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
@@ -33,9 +33,7 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
 {
     if (debug)
     {
-        Info<< "UnsortedMeshedSurface::New(const fileName&, const word&) : "
-            "constructing UnsortedMeshedSurface"
-            << endl;
+        InfoInFunction << "Constructing UnsortedMeshedSurface" << endl;
     }
 
     typename fileExtensionConstructorTable::iterator cstrIter =
diff --git a/src/surfMesh/surfMesh/surfMeshClear.C b/src/surfMesh/surfMesh/surfMeshClear.C
index e166059c75..179f202c2d 100644
--- a/src/surfMesh/surfMesh/surfMeshClear.C
+++ b/src/surfMesh/surfMesh/surfMeshClear.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,9 +33,7 @@ void Foam::surfMesh::removeZones()
 {
     if (debug)
     {
-        Info<< "void surfMesh::removeZones(): "
-            << "Removing surface zones."
-            << endl;
+        InfoInFunction << "Removing surface zones." << endl;
     }
 
     // Remove the surface zones
@@ -51,9 +49,7 @@ void Foam::surfMesh::clearGeom()
 {
     if (debug)
     {
-        Info<< "void surfMesh::clearGeom() : "
-            << "clearing geometric data"
-            << endl;
+        InfoInFunction << "Clearing geometric data" << endl;
     }
 
     MeshReference::clearGeom();
@@ -64,9 +60,7 @@ void Foam::surfMesh::clearAddressing()
 {
     if (debug)
     {
-        Info<< "void surfMesh::clearAddressing() : "
-            << "clearing topology"
-            << endl;
+        InfoInFunction << "clearing topology" << endl;
     }
 
     MeshReference::clearPatchMeshAddr();
diff --git a/src/surfMesh/surfMesh/surfMeshIO.C b/src/surfMesh/surfMesh/surfMeshIO.C
index 9cf516bebf..5e7072e3a4 100644
--- a/src/surfMesh/surfMesh/surfMeshIO.C
+++ b/src/surfMesh/surfMesh/surfMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,8 +32,7 @@ void Foam::surfMesh::setInstance(const fileName& inst)
 {
     if (debug)
     {
-        Info<< "void surfMesh::setInstance(const fileName& inst) : "
-            << "Resetting file instance to " << inst << endl;
+        InfoInFunction << "Resetting file instance to " << inst << endl;
     }
 
     instance() = inst;
@@ -53,8 +52,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
 {
     if (debug)
     {
-        Info<< "surfMesh::readUpdateState surfMesh::readUpdate() : "
-            << "Updating mesh based on saved data." << endl;
+        InfoInFunction << "Updating mesh based on saved data." << endl;
     }
 
     // Find point and face instances
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
index 49ac4ab660..042e11df95 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,8 +122,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New(Istream& is)
 {
     if (debug)
     {
-        Info<< "liquidProperties::New(Istream&): "
-            << "constructing liquidProperties" << endl;
+        InfoInFunction << "Constructing liquidProperties" << endl;
     }
 
     const word liquidPropertiesType(is);
@@ -170,8 +169,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
 {
     if (debug)
     {
-        Info<< "liquidProperties::New(const dictionary&):"
-            << "constructing liquidProperties" << endl;
+        InfoInFunction << "Constructing liquidProperties" << endl;
     }
 
     const word& liquidPropertiesTypeName = dict.dictName();
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
index a913aa71d3..203e7e2a27 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,8 +32,7 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New(Istream& is)
 {
     if (debug)
     {
-        Info<< "solidProperties::New(Istream&): constructing solid"
-            << endl;
+        InfoInFunction << "Constructing solid" << endl;
     }
 
     const word solidType(is);
@@ -79,8 +78,7 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
 {
     if (debug)
     {
-        Info<< "solidProperties::New(const dictionary&): constructing solid"
-            << endl;
+        InfoInFunction << "Constructing solid" << endl;
     }
 
     const word solidType(dict.dictName());
@@ -115,4 +113,4 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
index e7698de7f8..16e8f0971a 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,8 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
 #include "thermophysicalFunction.H"
 #include "HashTable.H"
 
@@ -47,8 +45,8 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
 {
     if (debug)
     {
-        Info<< "thermophysicalFunction::New(Istream&) : "
-            << "constructing thermophysicalFunction"
+        InfoInFunction
+            << "Constructing thermophysicalFunction"
             << endl;
     }
 
@@ -79,8 +77,8 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
 {
     if (debug)
     {
-        Info<< "thermophysicalFunction::New(const dictionary&) : "
-            << "constructing thermophysicalFunction"
+        InfoInFunction
+            << "Constructing thermophysicalFunction"
             << endl;
     }
 
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
index d3befc22e7..ec1834fa46 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ void Foam::linearValveFvMesh::addZonesAndModifiers()
      || topoChanger_.size()
     )
     {
-        Info<< "void linearValveFvMesh::addZonesAndModifiers() : "
+        InfoInFunction
             << "Zones and modifiers already present.  Skipping."
             << endl;
 
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 094e09006f..c86a550eb0 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
      || topoChanger_.size()
     )
     {
-        Info<< "void linearValveLayersFvMesh::addZonesAndModifiers() : "
+        InfoInFunction
             << "Zones and modifiers already present.  Skipping."
             << endl;
 
@@ -417,13 +417,12 @@ void Foam::linearValveLayersFvMesh::update()
     setMorphTimeIndex(3*time().timeIndex() + 2);
     updateMesh();
 
-    Info<< "Moving points post slider attach" << endl;
-//     const pointField p = allPoints();
-//     movePoints(p);
+    //Info<< "Moving points post slider attach" << endl;
+    //const pointField p = allPoints();
+    //movePoints(p);
 
     Info<< "Sliding interfaces coupled: " << attached() << endl;
 }
 
 
 // ************************************************************************* //
-
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index 9d329ba083..f67b6cdd45 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
      || topoChanger_.size()
     )
     {
-        Info<< "void mixerFvMesh::addZonesAndModifiers() : "
+        InfoInFunction
             << "Zones and modifiers already present.  Skipping."
             << endl;
 
@@ -196,7 +196,7 @@ void Foam::mixerFvMesh::calcMovingMasks() const
 {
     if (debug)
     {
-        Info<< "void mixerFvMesh::calcMovingMasks() const : "
+        InfoInFunction
             << "Calculating point and cell masks"
             << endl;
     }
@@ -356,7 +356,7 @@ bool Foam::mixerFvMesh::update()
     {
         if (debug)
         {
-            Info<< "Mesh topology is changing" << endl;
+            InfoInFunction << "Mesh topology is changing" << endl;
         }
 
         deleteDemandDrivenData(movingPointsMaskPtr_);
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index 0ed9d4625d..02d6a6ae87 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
      || topoChanger_.size()
     )
     {
-        Info<< "void movingConeTopoFvMesh::addZonesAndModifiers() : "
+        InfoInFunction
             << "Zones and modifiers already present.  Skipping."
             << endl;
 
@@ -337,48 +337,6 @@ bool Foam::movingConeTopoFvMesh::update()
         if (topoChangeMap().hasMotionPoints())
         {
             Info<< "Topology change. Has premotion points" << endl;
-            //Info<< "preMotionPoints:" << topoChangeMap().preMotionPoints()
-            //    << endl;
-
-            //mkDir(time().timePath());
-            //{
-            //    OFstream str(time().timePath()/"meshPoints.obj");
-            //    Pout<< "Writing mesh with meshPoints to " << str.name()
-            //        << endl;
-            //
-            //    const pointField& currentPoints = points();
-            //    label vertI = 0;
-            //    forAll(currentPoints, pointI)
-            //    {
-            //        meshTools::writeOBJ(str, currentPoints[pointI]);
-            //        vertI++;
-            //    }
-            //    forAll(edges(), edgeI)
-            //    {
-            //        const edge& e = edges()[edgeI];
-            //        str << "l " << e[0]+1 << ' ' << e[1]+1 << nl;
-            //    }
-            //}
-            //{
-            //    OFstream str(time().timePath()/"preMotionPoints.obj");
-            //    Pout<< "Writing mesh with preMotionPoints to " << str.name()
-            //        << endl;
-            //
-            //    const pointField& newPoints =
-            //        topoChangeMap().preMotionPoints();
-            //    label vertI = 0;
-            //    forAll(newPoints, pointI)
-            //    {
-            //        meshTools::writeOBJ(str, newPoints[pointI]);
-            //        vertI++;
-            //    }
-            //    forAll(edges(), edgeI)
-            //    {
-            //        const edge& e = edges()[edgeI];
-            //        str << "l " << e[0]+1 << ' ' << e[1]+1 << nl;
-            //    }
-            //}
-
 
             motionMask_ =
                 vertexMarkup

From 19f62b4f0d9771dcd9ab22ec037cc5245532e977 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 20 Jan 2016 10:20:54 +0000
Subject: [PATCH 112/447] interRegionExplicitPorositySource: Corrected
 initialization of firstIter_ Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1978

---
 .../interRegionExplicitPorositySource.C       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
index 10636cf4a2..307eb10ea0 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ void Foam::fv::interRegionExplicitPorositySource::initialise()
             new cellZone
             (
                 zoneName,
-                nbrMesh.faceNeighbour(), // neighbour internal cells
+                nbrMesh.faceNeighbour(), // Neighbour internal cells
                 zoneID,
                 cellZones
             )
@@ -117,7 +117,7 @@ Foam::fv::interRegionExplicitPorositySource::interRegionExplicitPorositySource
 :
     interRegionOption(name, modelType, dict, mesh),
     porosityPtr_(NULL),
-    firstIter_(-1),
+    firstIter_(false),
     UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
     muName_(coeffs_.lookupOrDefault<word>("muName", "thermo:mu"))
 {
@@ -157,7 +157,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
         dimensionedVector("zero", U.dimensions(), vector::zero)
     );
 
-    // map local velocity onto neighbour region
+    // Map local velocity onto neighbour region
     meshInterp().mapSrcToTgt
     (
         U.internalField(),
@@ -169,7 +169,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
 
     porosityPtr_->addResistance(nbrEqn);
 
-    // convert source from neighbour to local region
+    // Convert source from neighbour to local region
     fvMatrix<vector> porosityEqn(U, eqn.dimensions());
     scalarField& Udiag = porosityEqn.diag();
     vectorField& Usource = porosityEqn.source();
@@ -211,7 +211,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
         dimensionedVector("zero", U.dimensions(), vector::zero)
     );
 
-    // map local velocity onto neighbour region
+    // Map local velocity onto neighbour region
     meshInterp().mapSrcToTgt
     (
         U.internalField(),
@@ -252,7 +252,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
     const volScalarField& mu =
         mesh_.lookupObject<volScalarField>(muName_);
 
-    // map local rho onto neighbour region
+    // Map local rho onto neighbour region
     meshInterp().mapSrcToTgt
     (
         rho.internalField(),
@@ -260,7 +260,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
         rhoNbr.internalField()
     );
 
-    // map local mu onto neighbour region
+    // Map local mu onto neighbour region
     meshInterp().mapSrcToTgt
     (
         mu.internalField(),
@@ -270,7 +270,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
 
     porosityPtr_->addResistance(nbrEqn, rhoNbr, muNbr);
 
-    // convert source from neighbour to local region
+    // Convert source from neighbour to local region
     fvMatrix<vector> porosityEqn(U, eqn.dimensions());
     scalarField& Udiag = porosityEqn.diag();
     vectorField& Usource = porosityEqn.source();
@@ -292,7 +292,7 @@ bool Foam::fv::interRegionExplicitPorositySource::read(const dictionary& dict)
         coeffs_.readIfPresent("UName", UName_);
         coeffs_.readIfPresent("muName", muName_);
 
-        // reset the porosity model?
+        // Reset the porosity model?
 
         return true;
     }

From 34d4cfaca35a0ad56966d798ad5a0f6bdd681093 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 20 Jan 2016 10:41:14 +0000
Subject: [PATCH 113/447] Make disallowed member functions private Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=1977

---
 .../meshReader/starcd/STARCDMeshReader.H      | 27 +++++++++++--------
 .../simpleControl/simpleControl.H             |  8 ++++--
 .../removeRegisteredObject.H                  |  5 ++--
 .../IO/writeDictionary/writeDictionary.H      |  7 ++++-
 .../cloud/cloudInfo/cloudInfo.H               |  7 ++++-
 .../fieldCoordinateSystemTransform.H          | 19 ++++++++-----
 .../field/processorField/processorField.H     |  6 +++--
 .../field/readFields/readFields.H             | 17 +++++++-----
 .../surfaceInterpolateFields.H                | 17 +++++++-----
 .../functionObjects/systemCall/systemCall.H   |  6 +++--
 .../utilities/residuals/residuals.H           | 19 ++++++++-----
 .../turbulenceFields/turbulenceFields.H       | 17 +++++++-----
 .../wallShearStress/wallShearStress.H         |  7 ++++-
 .../cellVolumeWeight/cellVolumeWeightMethod.H |  7 ++++-
 .../calcMethod/direct/directMethod.H          |  7 ++++-
 .../meshToMeshMethod/meshToMeshMethod.H       |  9 +++++--
 .../singleStepReactingMixture.H               | 19 ++++++++-----
 17 files changed, 139 insertions(+), 65 deletions(-)

diff --git a/src/conversion/meshReader/starcd/STARCDMeshReader.H b/src/conversion/meshReader/starcd/STARCDMeshReader.H
index 33fadc40e9..bde13a9cd2 100644
--- a/src/conversion/meshReader/starcd/STARCDMeshReader.H
+++ b/src/conversion/meshReader/starcd/STARCDMeshReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,10 +42,10 @@ SourceFiles
 #ifndef STARCDMeshReader_H
 #define STARCDMeshReader_H
 
-# include "meshReader.H"
-# include "boundaryRegion.H"
-# include "cellShape.H"
-# include "IFstream.H"
+#include "meshReader.H"
+#include "boundaryRegion.H"
+#include "cellShape.H"
+#include "IFstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -89,12 +89,6 @@ protected:
 
     // Protected Member Functions
 
-        //- Disallow default bitwise copy construct
-        STARCD(const STARCD&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const STARCD&);
-
         //- Read the mesh from the file(s)
         virtual bool readGeometry(const scalar scaleFactor = 1.0);
 
@@ -120,6 +114,17 @@ protected:
         static bool readHeader(IFstream&, word fileSignature);
 
 
+private:
+
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        STARCD(const STARCD&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const STARCD&);
+
+
 protected:
 
         enum cellType
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
index 71f8d0e04c..a9b3b5b49b 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,6 +65,11 @@ protected:
         //- Return true if all convergence checks are satisfied
         bool criteriaSatisfied();
 
+
+private:
+
+    // Private member functions
+
         //- Disallow default bitwise copy construct
         simpleControl(const simpleControl&);
 
@@ -74,7 +79,6 @@ protected:
 
 public:
 
-
     // Static Data Members
 
         //- Run-time type information
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
index fc02432ad8..8a9b2774f9 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,8 +96,9 @@ protected:
             wordList objectNames_;
 
 
-    // Private Member Functions
+private:
 
+    // Private member functions
 
         //- Disallow default bitwise copy construct
         removeRegisteredObject(const removeRegisteredObject&);
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
index ac2ec7ac58..9282daec35 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
+++ b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,6 +87,11 @@ protected:
             bool& firstDict
         );
 
+
+private:
+
+    // Private member functions
+
         //- Disallow default bitwise copy construct
         writeDictionary(const writeDictionary&);
 
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
index 9bd1761061..e5aeb089be 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,6 +115,11 @@ protected:
         //- File header information
         virtual void writeFileHeader(const label i);
 
+
+private:
+
+    // Private member functions
+
         //- Disallow default bitwise copy construct
         cloudInfo(const cloudInfo&);
 
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
index edd1f13b50..e190360c85 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,12 +120,6 @@ protected:
 
     // Protected Member Functions
 
-        //- Disallow default bitwise copy construct
-        fieldCoordinateSystemTransform(const fieldCoordinateSystemTransform&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const fieldCoordinateSystemTransform&);
-
         template<class Type>
         void transform(const word& fieldName) const;
 
@@ -133,6 +127,17 @@ protected:
         void transformField(const Type& field) const;
 
 
+private:
+
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        fieldCoordinateSystemTransform(const fieldCoordinateSystemTransform&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const fieldCoordinateSystemTransform&);
+
+
 public:
 
     //- Runtime type information
diff --git a/src/postProcessing/functionObjects/field/processorField/processorField.H b/src/postProcessing/functionObjects/field/processorField/processorField.H
index 6d45e32acb..88e7ff383d 100644
--- a/src/postProcessing/functionObjects/field/processorField/processorField.H
+++ b/src/postProcessing/functionObjects/field/processorField/processorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,9 @@ protected:
         bool active_;
 
 
-    // Protected Member Functions
+private:
+
+    // Private member functions
 
         //- Disallow default bitwise copy construct
         processorField(const processorField&);
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index c9cc882a8c..ac5a794b43 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.H
@@ -118,12 +118,6 @@ protected:
 
     // Protected Member Functions
 
-        //- Disallow default bitwise copy construct
-        readFields(const readFields&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const readFields&);
-
         template<class Type>
         void loadField
         (
@@ -133,6 +127,17 @@ protected:
         ) const;
 
 
+private:
+
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        readFields(const readFields&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const readFields&);
+
+
 public:
 
     //- Runtime type information
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
index 0e55e6b4fc..02ebba304b 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
@@ -116,12 +116,6 @@ protected:
 
     // Protected Member Functions
 
-        //- Disallow default bitwise copy construct
-        surfaceInterpolateFields(const surfaceInterpolateFields&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const surfaceInterpolateFields&);
-
         template<class Type>
         void interpolateFields
         (
@@ -129,6 +123,17 @@ protected:
         ) const;
 
 
+private:
+
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        surfaceInterpolateFields(const surfaceInterpolateFields&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const surfaceInterpolateFields&);
+
+
 public:
 
     //- Runtime type information
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.H b/src/postProcessing/functionObjects/systemCall/systemCall.H
index b4d43a2bf7..eb9202c01b 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.H
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,7 +123,9 @@ protected:
         stringList writeCalls_;
 
 
-    // Private Member Functions
+private:
+
+    // Private member functions
 
         //- Disallow default bitwise copy construct
         systemCall(const systemCall&);
diff --git a/src/postProcessing/functionObjects/utilities/residuals/residuals.H b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
index f07c0a1543..39b5dd2d45 100644
--- a/src/postProcessing/functionObjects/utilities/residuals/residuals.H
+++ b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,12 +109,6 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        residuals(const residuals&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const residuals&);
-
         //- Output field header information
         template<class Type>
         void writeFileHeader(const word& fieldName);
@@ -123,6 +117,17 @@ protected:
         virtual void writeFileHeader(const label i);
 
 
+private:
+
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        residuals(const residuals&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const residuals&);
+
+
 public:
 
     //- Runtime type information
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
index ea08fc132f..386d1ba330 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
@@ -154,12 +154,6 @@ protected:
 
     // Protected Member Functions
 
-        //- Disallow default bitwise copy construct
-        turbulenceFields(const turbulenceFields&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const turbulenceFields&);
-
         //- Return true if compressible turbulence model is identified
         bool compressible();
 
@@ -172,6 +166,17 @@ protected:
         );
 
 
+private:
+
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        turbulenceFields(const turbulenceFields&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const turbulenceFields&);
+
+
 public:
 
     //- Runtime type information
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
index b2171a1d67..ba0d5752de 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,6 +130,11 @@ protected:
             volVectorField& shearStress
         );
 
+
+private:
+
+    // Private member functions
+
         //- Disallow default bitwise copy construct
         wallShearStress(const wallShearStress&);
 
diff --git a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
index 9e81715722..02e5335035 100644
--- a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,6 +93,11 @@ protected:
             labelList& seedCells
         ) const;
 
+
+private:
+
+    // Private member functions
+
         //- Disallow default bitwise copy construct
         cellVolumeWeightMethod(const cellVolumeWeightMethod&);
 
diff --git a/src/sampling/meshToMesh/calcMethod/direct/directMethod.H b/src/sampling/meshToMesh/calcMethod/direct/directMethod.H
index ddbb2c208c..15ee8d715e 100644
--- a/src/sampling/meshToMesh/calcMethod/direct/directMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/direct/directMethod.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,6 +98,11 @@ protected:
             label& tgtSeedI
         ) const;
 
+
+private:
+
+    // Private member functions
+
         //- Disallow default bitwise copy construct
         directMethod(const directMethod&);
 
diff --git a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
index 7397673d54..6cde5ed11c 100644
--- a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
@@ -1,8 +1,8 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,6 +102,11 @@ protected:
             scalarListList& tgtToTgtWght
         ) const;
 
+
+private:
+
+    // Private member functions
+
         //- Disallow default bitwise copy construct
         meshToMeshMethod(const meshToMeshMethod&);
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H
index 2e9f327680..ed0b464297 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,12 +87,6 @@ protected:
 
     // Protected member functions
 
-        //- Disallow default bitwise copy construct
-        singleStepReactingMixture(const singleStepReactingMixture&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const singleStepReactingMixture&);
-
         //- Calculate qFuel
         void calculateqFuel();
 
@@ -103,6 +97,17 @@ protected:
         void calculateMaxProducts();
 
 
+private:
+
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        singleStepReactingMixture(const singleStepReactingMixture&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const singleStepReactingMixture&);
+
+
 public:
 
     //- The type of thermo package this mixture is instantiated for

From 5779e4fd165ca9d837875048100e487edc59dedd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 20 Jan 2016 16:21:37 +0000
Subject: [PATCH 114/447] Info -> InfoInFunction and updated comments

---
 .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C    |  4 +--
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C  |  3 --
 .../ddtSchemes/ddtScheme/ddtScheme.C          |  7 ++---
 .../divSchemes/divScheme/divScheme.C          |  4 +--
 .../LeastSquaresGrad/LeastSquaresVectors.C    |  9 ++----
 .../invDistLeastSquaresVectors.C              | 11 +++----
 .../leastSquaresGrad/leastSquaresVectors.C    | 11 +++----
 .../unweightedLeastSquaresVectors.C           | 11 +++----
 .../laplacianScheme/laplacianScheme.C         |  4 +--
 .../CentredFitSnGrad/CentredFitSnGradData.C   |  7 ++---
 .../limitedSnGrad/limitedSnGrad.C             |  3 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            | 30 +++++++------------
 src/finiteVolume/fvMesh/fvMesh.C              | 29 ++++++++----------
 src/finiteVolume/fvMesh/fvMeshGeometry.C      | 27 +++++------------
 .../fvMesh/fvPatches/fvPatch/fvPatchNew.C     |  6 ++--
 .../schemes/CentredFitScheme/CentredFitData.C |  6 ++--
 .../schemes/UpwindFitScheme/UpwindFitData.C   |  6 ++--
 .../skewCorrected/skewCorrectionVectors.C     | 13 +++-----
 .../tabulated6DoFAcceleration.C               |  2 +-
 .../ParticleTracks/ParticleTracks.C           |  5 ++--
 src/mesh/blockMesh/curvedEdges/curvedEdge.C   |  6 ++--
 .../AMIInterpolationParallelOps.C             |  4 +--
 .../searchableSurface/searchablePlate.C       | 10 +++----
 .../searchableSurface/triSurfaceMesh.C        | 10 ++-----
 .../pointToPointPlanarInterpolation.C         |  8 ++---
 .../distributedTriSurfaceMesh.C               | 26 +++++-----------
 .../field/nearWallFields/nearWallFields.C     | 19 +++++-------
 .../regionSizeDistribution.C                  |  2 +-
 .../meshToMesh/meshToMeshParallelOps.C        |  7 +++--
 .../calculateMeshToMesh0Addressing.C          | 13 ++++----
 .../meshToMesh0/calculateMeshToMesh0Weights.C | 17 +++++------
 .../isoSurface/sampledIsoSurface.C            |  6 ++--
 .../isoSurface/sampledIsoSurfaceCell.C        | 20 ++++---------
 .../sampledThresholdCellFaces.C               | 19 ++++--------
 src/surfMesh/MeshedSurface/MeshedSurface.C    |  3 +-
 35 files changed, 134 insertions(+), 234 deletions(-)

diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
index 5189fd4344..8113fed871 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
@@ -50,9 +50,7 @@ tmp<d2dt2Scheme<Type>> d2dt2Scheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "d2dt2Scheme<Type>::New(const fvMesh&, Istream&) : "
-               "constructing d2dt2Scheme<Type>"
-            << endl;
+        InfoInFunction << "Constructing d2dt2Scheme<Type>" << endl;
     }
 
     if (schemeData.eof())
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index f787188a4b..a48cd0004e 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -456,9 +456,6 @@ SLTSDdtScheme<Type>::fvmDdt
 
     scalarField rDeltaT(SLrDeltaT()().internalField());
 
-    Info<< "SLTSDdtScheme<Type>::fvmDdt: max/min rDeltaT "
-        << gMax(rDeltaT) << " " << gMin(rDeltaT) << endl;
-
     fvm.diag() = rDeltaT*mesh().V();
 
     if (mesh().moving())
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 8f7bf67b65..5144c744c9 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -50,9 +50,7 @@ tmp<ddtScheme<Type>> ddtScheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "ddtScheme<Type>::New(const fvMesh&, Istream&) : "
-               "constructing ddtScheme<Type>"
-            << endl;
+        InfoInFunction << "Constructing ddtScheme<Type>" << endl;
     }
 
     if (schemeData.eof())
@@ -166,7 +164,8 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 
     if (debug > 1)
     {
-        Info<< "ddtCouplingCoeff mean max min = "
+        InfoInFunction
+            << "ddtCouplingCoeff mean max min = "
             << gAverage(ddtCouplingCoeff.internalField())
             << " " << gMax(ddtCouplingCoeff.internalField())
             << " " << gMin(ddtCouplingCoeff.internalField())
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
index 47d9930bed..17c042539a 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
@@ -51,9 +51,7 @@ tmp<divScheme<Type>> divScheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "divScheme<Type>::New(const fvMesh&, Istream&) : "
-               "constructing divScheme<Type>"
-            << endl;
+        InfoInFunction << "Constructing divScheme<Type>" << endl;
     }
 
     if (schemeData.eof())
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
index 536208067a..80054e1849 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
@@ -54,9 +54,7 @@ void Foam::fv::LeastSquaresVectors<Stencil>::calcLeastSquaresVectors()
 {
     if (debug)
     {
-        Info<< "LeastSquaresVectors::calcLeastSquaresVectors() :"
-            << "Calculating least square gradient vectors"
-            << endl;
+        InfoInFunction << "Calculating least square gradient vectors" << endl;
     }
 
     const fvMesh& mesh = this->mesh_;
@@ -100,9 +98,8 @@ void Foam::fv::LeastSquaresVectors<Stencil>::calcLeastSquaresVectors()
 
     if (debug)
     {
-        Info<< "LeastSquaresVectors::calcLeastSquaresVectors() :"
-            << "Finished calculating least square gradient vectors"
-            << endl;
+        InfoInFunction
+            << "Finished calculating least square gradient vectors" << endl;
     }
 }
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
index 96e5c1b376..493d650341 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,9 +84,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 {
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
-            << "Calculating least square gradient vectors"
-            << endl;
+        InfoInFunction << "Calculating least square gradient vectors" << endl;
     }
 
     const fvMesh& mesh = mesh_;
@@ -170,9 +168,8 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
-            << "Finished calculating least square gradient vectors"
-            << endl;
+        InfoInFunction
+            <<"Finished calculating least square gradient vectors" << endl;
     }
 }
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
index 48c4c8a256..a83990120c 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,9 +84,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 {
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
-            << "Calculating least square gradient vectors"
-            << endl;
+        InfoInFunction << "Calculating least square gradient vectors" << endl;
     }
 
     const fvMesh& mesh = mesh_;
@@ -209,9 +207,8 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
-            << "Finished calculating least square gradient vectors"
-            << endl;
+        InfoInFunction
+            << "Finished calculating least square gradient vectors" << endl;
     }
 }
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
index 06325e1f61..c025d6a2df 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,9 +84,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 {
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
-            << "Calculating least square gradient vectors"
-            << endl;
+        InfoInFunction << "Calculating least square gradient vectors" << endl;
     }
 
     const fvMesh& mesh = mesh_;
@@ -166,9 +164,8 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
-            << "Finished calculating least square gradient vectors"
-            << endl;
+        InfoInFunction
+            << "Finished calculating least square gradient vectors" << endl;
     }
 }
 
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
index e69cfab4bf..fc24a6221e 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
@@ -49,9 +49,7 @@ tmp<laplacianScheme<Type, GType>> laplacianScheme<Type, GType>::New
 {
     if (fv::debug)
     {
-        Info<< "laplacianScheme<Type, GType>::New(const fvMesh&, Istream&) : "
-               "constructing laplacianScheme<Type, GType>"
-            << endl;
+        InfoInFunction << "Constructing laplacianScheme<Type, GType>" << endl;
     }
 
     if (schemeData.eof())
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
index ed63124fd6..96f5c8745c 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
@@ -52,16 +52,15 @@ Foam::CentredFitSnGradData<Polynomial>::CentredFitSnGradData
 {
     if (debug)
     {
-        Info<< "Contructing CentredFitSnGradData<Polynomial>" << endl;
+        InfoInFunction
+            << "Contructing CentredFitSnGradData<Polynomial>" << endl;
     }
 
     calcFit();
 
     if (debug)
     {
-        Info<< "CentredFitSnGradData<Polynomial>::CentredFitSnGradData() :"
-            << "Finished constructing polynomialFit data"
-            << endl;
+        Info<< "    Finished constructing polynomialFit data" << endl;
     }
 }
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
index 55b4ff38f7..308ad6cad7 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
@@ -76,7 +76,8 @@ limitedSnGrad<Type>::correction
 
     if (fv::debug)
     {
-        Info<< "limitedSnGrad :: limiter min: " << min(limiter.internalField())
+        InfoInFunction
+            << "limiter min: " << min(limiter.internalField())
             << " max: "<< max(limiter.internalField())
             << " avg: " << average(limiter.internalField()) << endl;
     }
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index f173748ab0..91dd8e2347 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -280,10 +280,8 @@ Foam::fvMatrix<Type>::fvMatrix
 {
     if (debug)
     {
-        Info<< "fvMatrix<Type>(GeometricField<Type, fvPatchField, volMesh>&,"
-               " const dimensionSet&) : "
-               "constructing fvMatrix<Type> for field " << psi_.name()
-            << endl;
+        InfoInFunction
+            << "Constructing fvMatrix<Type> for field " << psi_.name() << endl;
     }
 
     // Initialise coupling coefficients
@@ -334,9 +332,8 @@ Foam::fvMatrix<Type>::fvMatrix(const fvMatrix<Type>& fvm)
 {
     if (debug)
     {
-        Info<< "fvMatrix<Type>::fvMatrix(const fvMatrix<Type>&) : "
-            << "copying fvMatrix<Type> for field " << psi_.name()
-            << endl;
+        InfoInFunction
+            << "Copying fvMatrix<Type> for field " << psi_.name() << endl;
     }
 
     if (fvm.faceFluxCorrectionPtr_)
@@ -381,9 +378,8 @@ Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>& tfvm)
 {
     if (debug)
     {
-        Info<< "fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>&) : "
-            << "copying fvMatrix<Type> for field " << psi_.name()
-            << endl;
+        InfoInFunction
+            << "Copying fvMatrix<Type> for field " << psi_.name() << endl;
     }
 
     if (tfvm().faceFluxCorrectionPtr_)
@@ -425,10 +421,8 @@ Foam::fvMatrix<Type>::fvMatrix
 {
     if (debug)
     {
-        Info<< "fvMatrix<Type>"
-               "(GeometricField<Type, fvPatchField, volMesh>&, Istream&) : "
-               "constructing fvMatrix<Type> for field " << psi_.name()
-            << endl;
+        InfoInFunction
+            << "Constructing fvMatrix<Type> for field " << psi_.name() << endl;
     }
 
     // Initialise coupling coefficients
@@ -463,9 +457,8 @@ Foam::fvMatrix<Type>::~fvMatrix()
 {
     if (debug)
     {
-        Info<< "fvMatrix<Type>::~fvMatrix<Type>() : "
-            << "destroying fvMatrix<Type> for field " << psi_.name()
-            << endl;
+        InfoInFunction
+            << "Destroying fvMatrix<Type> for field " << psi_.name() << endl;
     }
 
     if (faceFluxCorrectionPtr_)
@@ -526,8 +519,7 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
     if (debug)
     {
         InfoInFunction
-            << "Relaxing " << psi_.name() << " by " << alpha
-            << endl;
+            << "Relaxing " << psi_.name() << " by " << alpha << endl;
     }
 
     Field<Type>& S = source();
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index dc19051e71..22f12198d8 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,8 +125,7 @@ void Foam::fvMesh::clearAddressing(const bool isMeshUpdate)
 {
     if (debug)
     {
-        Info<< "fvMesh::clearAddressing(const bool) :"
-            << " isMeshUpdate:" << isMeshUpdate << endl;
+        InfoInFunction << "isMeshUpdate: " << isMeshUpdate << endl;
     }
 
     if (isMeshUpdate)
@@ -167,7 +166,7 @@ void Foam::fvMesh::storeOldVol(const scalarField& V)
     {
         if (debug)
         {
-            Info<< "fvMesh::storeOldVol(const scalarField&) :"
+            InfoInFunction
                 << " Storing old time volumes since from time " << curTimeIndex_
                 << " and time now " << time().timeIndex()
                 << " V:" << V.size()
@@ -214,12 +213,12 @@ void Foam::fvMesh::storeOldVol(const scalarField& V)
 
         if (debug)
         {
-            Info<< "fvMesh::storeOldVol() :"
+            InfoInFunction
                 << " Stored old time volumes V0:" << V0Ptr_->size()
                 << endl;
             if (V00Ptr_)
             {
-                Info<< "fvMesh::storeOldVol() :"
+                InfoInFunction
                     << " Stored oldold time volumes V00:" << V00Ptr_->size()
                     << endl;
             }
@@ -265,8 +264,7 @@ Foam::fvMesh::fvMesh(const IOobject& io)
 {
     if (debug)
     {
-        Info<< "Constructing fvMesh from IOobject"
-            << endl;
+        InfoInFunction << "Constructing fvMesh from IOobject" << endl;
     }
 
     // Check the existance of the cell volumes and read if present
@@ -376,7 +374,7 @@ Foam::fvMesh::fvMesh
 {
     if (debug)
     {
-        Info<< "Constructing fvMesh from cellShapes" << endl;
+        InfoInFunction << "Constructing fvMesh from cellShapes" << endl;
     }
 }
 
@@ -410,7 +408,7 @@ Foam::fvMesh::fvMesh
 {
     if (debug)
     {
-        Info<< "Constructing fvMesh from components" << endl;
+        InfoInFunction << "Constructing fvMesh from components" << endl;
     }
 }
 
@@ -443,7 +441,7 @@ Foam::fvMesh::fvMesh
 {
     if (debug)
     {
-        Info<< "Constructing fvMesh from components" << endl;
+        InfoInFunction << "Constructing fvMesh from components" << endl;
     }
 }
 
@@ -481,9 +479,7 @@ void Foam::fvMesh::removeFvBoundary()
 {
     if (debug)
     {
-        Info<< "void fvMesh::removeFvBoundary(): "
-            << "Removing boundary patches."
-            << endl;
+        InfoInFunction << "Removing boundary patches." << endl;
     }
 
     // Remove fvBoundaryMesh data first.
@@ -499,8 +495,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
 {
     if (debug)
     {
-        Info<< "polyMesh::readUpdateState fvMesh::readUpdate() : "
-            << "Updating fvMesh.  ";
+        InfoInFunction << "Updating fvMesh.  ";
     }
 
     polyMesh::readUpdateState state = polyMesh::readUpdate();
@@ -568,7 +563,7 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
 {
     if (debug)
     {
-        Info<< "fvMesh::mapFields :"
+        InfoInFunction
             << " nOldCells:" << meshMap.nOldCells()
             << " nCells:" << nCells()
             << " nOldFaces:" << meshMap.nOldFaces()
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index b16164fa53..c35da60ef0 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,9 +81,7 @@ void fvMesh::makeMagSf() const
 {
     if (debug)
     {
-        Info<< "void fvMesh::makeMagSf() : "
-            << "assembling mag face areas"
-            << endl;
+        InfoInFunction << "Assembling mag face areas" << endl;
     }
 
     // It is an error to attempt to recalculate
@@ -119,9 +117,7 @@ void fvMesh::makeC() const
 {
     if (debug)
     {
-        Info<< "void fvMesh::makeC() : "
-            << "assembling cell centres"
-            << endl;
+        InfoInFunction << "Assembling cell centres" << endl;
     }
 
     // It is an error to attempt to recalculate
@@ -161,9 +157,7 @@ void fvMesh::makeCf() const
 {
     if (debug)
     {
-        Info<< "void fvMesh::makeCf() : "
-            << "assembling face centres"
-            << endl;
+        InfoInFunction << "Assembling face centres" << endl;
     }
 
     // It is an error to attempt to recalculate
@@ -202,9 +196,8 @@ const volScalarField::DimensionedInternalField& fvMesh::V() const
     {
         if (debug)
         {
-            Info<< "fvMesh::V() const: "
-                << "constructing from primitiveMesh::cellVolumes()"
-                << endl;
+            InfoInFunction
+                << "Constructing from primitiveMesh::cellVolumes()" << endl;
         }
 
         VPtr_ = new slicedVolScalarField::DimensionedInternalField
@@ -260,9 +253,7 @@ const volScalarField::DimensionedInternalField& fvMesh::V00() const
     {
         if (debug)
         {
-            Info<< "fvMesh::V00() const: "
-                << "constructing from V0"
-                << endl;
+            InfoInFunction << "Constructing from V0" << endl;
         }
 
         V00Ptr_ = new DimensionedField<scalar, volMesh>
@@ -392,9 +383,7 @@ tmp<surfaceVectorField> fvMesh::delta() const
 {
     if (debug)
     {
-        Info<< "void fvMesh::delta() : "
-            << "calculating face deltas"
-            << endl;
+        InfoInFunction << "Calculating face deltas" << endl;
     }
 
     tmp<surfaceVectorField> tdelta
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
index 257825ea61..ad52725ee9 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,9 +37,7 @@ Foam::autoPtr<Foam::fvPatch> Foam::fvPatch::New
 {
     if (debug)
     {
-        Info<< "fvPatch::New(const polyPatch&, const fvBoundaryMesh&) : "
-            << "constructing fvPatch"
-            << endl;
+        InfoInFunction << "Constructing fvPatch" << endl;
     }
 
     polyPatchConstructorTable::iterator cstrIter =
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
index 0d3669e6b2..975e397805 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
@@ -54,16 +54,14 @@ Foam::CentredFitData<Polynomial>::CentredFitData
 {
     if (debug)
     {
-        Info<< "Contructing CentredFitData<Polynomial>" << endl;
+        InfoInFunction << "Contructing CentredFitData<Polynomial>" << endl;
     }
 
     calcFit();
 
     if (debug)
     {
-        Info<< "CentredFitData<Polynomial>::CentredFitData() :"
-            << "Finished constructing polynomialFit data"
-            << endl;
+        Info<<     "Finished constructing polynomialFit data" << endl;
     }
 }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
index 6a16f708d1..6136f0d6fc 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
@@ -55,16 +55,14 @@ Foam::UpwindFitData<Polynomial>::UpwindFitData
 {
     if (debug)
     {
-        Info<< "Contructing UpwindFitData<Polynomial>" << endl;
+        InfoInFunction << "Contructing UpwindFitData<Polynomial>" << endl;
     }
 
     calcFit();
 
     if (debug)
     {
-        Info<< "UpwindFitData<Polynomial>::UpwindFitData() :"
-            << "Finished constructing polynomialFit data"
-            << endl;
+        Info<< "    Finished constructing polynomialFit data" << endl;
     }
 }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
index 9ba9be2b31..445bf197e5 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,9 +67,7 @@ void Foam::skewCorrectionVectors::calcSkewCorrectionVectors()
 {
     if (debug)
     {
-        Info<< "surfaceInterpolation::calcSkewCorrectionVectors() : "
-            << "Calculating skew correction vectors"
-            << endl;
+        InfoInFunction << "Calculating skew correction vectors" << endl;
     }
 
     // Set local references to mesh data
@@ -135,8 +133,7 @@ void Foam::skewCorrectionVectors::calcSkewCorrectionVectors()
 
     if (debug)
     {
-        Info<< "surfaceInterpolation::calcSkewCorrectionVectors() : "
-            << "skew coefficient = " << skewCoeff << endl;
+        InfoInFunction << "skew coefficient = " << skewCoeff << endl;
     }
 
     if (skewCoeff < 1e-5)
@@ -150,9 +147,7 @@ void Foam::skewCorrectionVectors::calcSkewCorrectionVectors()
 
     if (debug)
     {
-        Info<< "surfaceInterpolation::calcSkewCorrectionVectors() : "
-            << "Finished constructing skew correction vectors"
-            << endl;
+        Info<< "    Finished constructing skew correction vectors" << endl;
     }
 }
 
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
index 4f1eb4e700..a605ac13a6 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
@@ -89,7 +89,7 @@ Foam::tabulated6DoFAcceleration::acceleration() const
         values_
     );
 
-    Info<< "tabulated6DoFAcceleration::acceleration(): "
+    InfoInFunction
         << "Time = " << t << " accelerations: " << avs << endl;
 
     return avs;
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
index b1057c92bc..14ac5b1366 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,8 +46,7 @@ void Foam::ParticleTracks<CloudType>::write()
     {
         if (debug)
         {
-            Info<< "void Foam::ParticleTracks<CloudType>::write()" << nl
-                << "cloupPtr invalid" << endl;
+            InfoInFunction << "cloupPtr invalid" << endl;
         }
     }
 }
diff --git a/src/mesh/blockMesh/curvedEdges/curvedEdge.C b/src/mesh/blockMesh/curvedEdges/curvedEdge.C
index 895c472947..b3816b016c 100644
--- a/src/mesh/blockMesh/curvedEdges/curvedEdge.C
+++ b/src/mesh/blockMesh/curvedEdges/curvedEdge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,9 +81,7 @@ Foam::autoPtr<Foam::curvedEdge> Foam::curvedEdge::New
 {
     if (debug)
     {
-        Info<< "curvedEdge::New(const pointField&, Istream&) : "
-            << "constructing curvedEdge"
-            << endl;
+        InfoInFunction << "Constructing curvedEdge" << endl;
     }
 
     const word edgeType(is);
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
index f42fd92bb8..77e77b2ce6 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
@@ -60,7 +60,7 @@ Foam::label Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcDistribution
             procI = -1;
             if (debug)
             {
-                Info<< "AMIInterpolation::calcDistribution: "
+                InfoInFunction
                     << "AMI split across multiple processors" << endl;
             }
         }
@@ -69,7 +69,7 @@ Foam::label Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcDistribution
             procI = findIndex(facesPresentOnProc, 1);
             if (debug)
             {
-                Info<< "AMIInterpolation::calcDistribution: "
+                InfoInFunction
                     << "AMI local to processor" << procI << endl;
             }
         }
diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C
index e017b4e43c..f03b4ac26f 100644
--- a/src/meshTools/searchableSurface/searchablePlate.C
+++ b/src/meshTools/searchableSurface/searchablePlate.C
@@ -31,10 +31,8 @@ License
 
 namespace Foam
 {
-
-defineTypeNameAndDebug(searchablePlate, 0);
-addToRunTimeSelectionTable(searchableSurface, searchablePlate, dict);
-
+    defineTypeNameAndDebug(searchablePlate, 0);
+    addToRunTimeSelectionTable(searchableSurface, searchablePlate, dict);
 }
 
 
@@ -220,7 +218,7 @@ Foam::searchablePlate::searchablePlate
 {
     if (debug)
     {
-        Info<< "searchablePlate::searchablePlate :"
+        InfoInFunction
             << " origin:" << origin_
             << " origin+span:" << origin_+span_
             << " normal:" << vector::componentNames[normalDir_]
@@ -244,7 +242,7 @@ Foam::searchablePlate::searchablePlate
 {
     if (debug)
     {
-        Info<< "searchablePlate::searchablePlate :"
+        InfoInFunction
             << " origin:" << origin_
             << " origin+span:" << origin_+span_
             << " normal:" << vector::componentNames[normalDir_]
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index 794c3e0953..de185b181c 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -98,7 +98,6 @@ addToRunTimeSelectionTable(searchableSurface, triSurfaceMesh, dict);
 //}
 
 
-//- Check file existence
 const Foam::fileName& Foam::triSurfaceMesh::checkFile
 (
     const fileName& fName,
@@ -690,10 +689,10 @@ void Foam::triSurfaceMesh::getNormal
             if (info[i].hit())
             {
                 label faceI = info[i].index();
-                //- Cached:
+                // Cached:
                 //normal[i] = faceNormals()[faceI];
 
-                //- Uncached
+                // Uncached
                 normal[i] = s[faceI].normal(pts);
                 normal[i] /= mag(normal[i]) + VSMALL;
             }
@@ -784,16 +783,12 @@ void Foam::triSurfaceMesh::getVolumeType
             // - use cached volume type per each tree node
             volType[pointI] = tree().getVolumeType(pt);
         }
-
-//        Info<< "octree : " << pt << " = "
-//            << volumeType::names[volType[pointI]] << endl;
     }
 
     indexedOctree<treeDataTriSurface>::perturbTol() = oldTol;
 }
 
 
-//- Write using given format, version and compression
 bool Foam::triSurfaceMesh::writeObject
 (
     IOstream::streamFormat fmt,
@@ -815,7 +810,6 @@ bool Foam::triSurfaceMesh::writeObject
         return false;
     }
 
-    //return objectRegistry::writeObject(fmt, ver, cmp);
     return true;
 }
 
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
index 3810acc221..87300a9928 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(pointToPointPlanarInterpolation, 0);
+    defineTypeNameAndDebug(pointToPointPlanarInterpolation, 0);
 }
 
 
@@ -112,7 +112,7 @@ Foam::pointToPointPlanarInterpolation::calcCoordinateSystem
 
     if (debug)
     {
-        Info<< "pointToPointPlanarInterpolation::calcCoordinateSystem :"
+        InfoInFunction
             << " Used points " << p0 << ' ' << points[index1]
             << ' ' << points[index2]
             << " to define coordinate system with normal " << n << endl;
@@ -204,7 +204,7 @@ void Foam::pointToPointPlanarInterpolation::calcWeights
 
         if (debug)
         {
-            Info<< "pointToPointPlanarInterpolation::calcWeights :"
+            InfoInFunction
                 << " Perturbing points with " << perturb_
                 << " fraction of a random position inside " << bb
                 << " to break any ties on regular meshes."
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 1db0c9b5df..5eee83a426 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -922,7 +922,7 @@ bool Foam::distributedTriSurfaceMesh::overlaps
         triBb.max() = max(triBb.max(), p1);
         triBb.max() = max(triBb.max(), p2);
 
-        //- Exact test of triangle intersecting bb
+        // Exact test of triangle intersecting bb
 
         // Quick rejection. If whole bounding box of tri is outside cubeBb then
         // there will be no intersection.
@@ -1313,7 +1313,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
 
     if (debug)
     {
-        Info<< "Constructed from triSurface:" << endl;
+        InfoInFunction << "Constructed from triSurface:" << endl;
         writeStats(Info);
 
         labelList nTris(Pstream::nProcs());
@@ -1390,7 +1390,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh(const IOobject& io)
 
     if (debug)
     {
-        Info<< "Read distributedTriSurface from " << io.objectPath()
+        InfoInFunction << "Read distributedTriSurface from " << io.objectPath()
             << ':' << endl;
         writeStats(Info);
 
@@ -1473,7 +1473,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
 
     if (debug)
     {
-        Info<< "Read distributedTriSurface from " << io.objectPath()
+        InfoInFunction << "Read distributedTriSurface from " << io.objectPath()
             << " and dictionary:" << endl;
         writeStats(Info);
 
@@ -2084,13 +2084,6 @@ void Foam::distributedTriSurfaceMesh::distribute
             break;
         }
 
-        //if (debug)
-        //{
-        //    Info<< "old bb:" << procBb_ << endl << endl;
-        //    Info<< "new bb:" << newProcBb << endl << endl;
-        //    Info<< "Same:" << (newProcBb == procBb_) << endl;
-        //}
-
         if (newProcBb == procBb_)
         {
             return;
@@ -2111,9 +2104,8 @@ void Foam::distributedTriSurfaceMesh::distribute
         Pstream::gatherList(nTris);
         Pstream::scatterList(nTris);
 
-        Info<< "distributedTriSurfaceMesh::distribute : before distribution:"
-            << endl
-            << "\tproc\ttris" << endl;
+        InfoInFunction
+            << "before distribution:" << endl << "\tproc\ttris" << endl;
 
         forAll(nTris, procI)
         {
@@ -2368,9 +2360,8 @@ void Foam::distributedTriSurfaceMesh::distribute
         Pstream::gatherList(nTris);
         Pstream::scatterList(nTris);
 
-        Info<< "distributedTriSurfaceMesh::distribute : after distribution:"
-            << endl
-            << "\tproc\ttris" << endl;
+        InfoInFunction
+            << "after distribution:" << endl << "\tproc\ttris" << endl;
 
         forAll(nTris, procI)
         {
@@ -2381,7 +2372,6 @@ void Foam::distributedTriSurfaceMesh::distribute
 }
 
 
-//- Write using given format, version and compression
 bool Foam::distributedTriSurfaceMesh::writeObject
 (
     IOstream::streamFormat fmt,
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
index 7a8c162f45..e581468a0f 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
@@ -56,8 +56,7 @@ void Foam::nearWallFields::calcAddressing()
 
     if (debug)
     {
-        Info<< "nearWallFields::calcAddressing() :"
-            << " nPatchFaces:" << globalWalls.size() << endl;
+        InfoInFunction << "nPatchFaces: " << globalWalls.size() << endl;
     }
 
     // Construct cloud
@@ -139,8 +138,7 @@ void Foam::nearWallFields::calcAddressing()
             mesh.time().path()
            /"wantedTracks_" + mesh.time().timeName() + ".obj"
         );
-        Info<< "nearWallFields::calcAddressing() :"
-            << "Dumping tracks to " << str.name() << endl;
+        InfoInFunction << "Dumping tracks to " << str.name() << endl;
 
         forAllConstIter(Cloud<findCellParticle>, cloud, iter)
         {
@@ -202,8 +200,7 @@ void Foam::nearWallFields::calcAddressing()
                 mesh.time().path()
                /"obtainedTracks_" + mesh.time().timeName() + ".obj"
             );
-            Info<< "nearWallFields::calcAddressing() :"
-                << "Dumping obtained to " << str.name() << endl;
+            InfoInFunction << "Dumping obtained to " << str.name() << endl;
 
             forAll(cellToWalls_, cellI)
             {
@@ -256,7 +253,7 @@ Foam::nearWallFields::~nearWallFields()
 {
     if (debug)
     {
-        Info<< "nearWallFields::~nearWallFields()" << endl;
+        InfoInFunction << endl;
     }
 }
 
@@ -267,7 +264,7 @@ void Foam::nearWallFields::read(const dictionary& dict)
 {
     if (debug)
     {
-        Info<< "nearWallFields::read(const dictionary&)" << endl;
+        InfoInFunction << endl;
     }
 
     if (active_)
@@ -317,7 +314,7 @@ void Foam::nearWallFields::execute()
 {
     if (debug)
     {
-        Info<< "nearWallFields:execute()" << endl;
+        InfoInFunction << endl;
     }
 
 
@@ -363,7 +360,7 @@ void Foam::nearWallFields::end()
 {
     if (debug)
     {
-        Info<< "nearWallFields:end()" << endl;
+        InfoInFunction << endl;
     }
 
     if (active_)
@@ -383,7 +380,7 @@ void Foam::nearWallFields::write()
 {
     if (debug)
     {
-        Info<< "nearWallFields:write()" << endl;
+        InfoInFunction << endl;
     }
 
     if (active_)
diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index 67ba333b24..6d02c13969 100644
--- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index d83deb104c..ebe9a50b93 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@@ -63,7 +63,7 @@ Foam::label Foam::meshToMesh::calcDistribution
             procI = -1;
             if (debug)
             {
-                Info<< "meshToMesh::calcDistribution: "
+                InfoInFunction
                     << "Meshes split across multiple processors" << endl;
             }
         }
@@ -72,7 +72,7 @@ Foam::label Foam::meshToMesh::calcDistribution
             procI = findIndex(cellsPresentOnProc, 1);
             if (debug)
             {
-                Info<< "meshToMesh::calcDistribution: "
+                InfoInFunction
                     << "Meshes local to processor" << procI << endl;
             }
         }
@@ -138,7 +138,8 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
 
     if (debug)
     {
-        Info<< "Determining extent of src mesh per processor:" << nl
+        InfoInFunction
+            << "Determining extent of src mesh per processor:" << nl
             << "\tproc\tbb" << endl;
         forAll(procBb, procI)
         {
diff --git a/src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C b/src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C
index a3ca751858..7aea054720 100644
--- a/src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C
+++ b/src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,8 +41,8 @@ void Foam::meshToMesh0::calcAddressing()
 {
     if (debug)
     {
-        Info<< "meshToMesh0::calculateAddressing() : "
-            << "calculating mesh-to-mesh cell addressing" << endl;
+        InfoInFunction
+            << "Calculating mesh-to-mesh cell addressing" << endl;
     }
 
     // set reference to cells
@@ -62,8 +62,7 @@ void Foam::meshToMesh0::calcAddressing()
 
     if (debug)
     {
-        Info<< "meshToMesh0::calculateAddressing() : "
-            << "Setting up rescue" << endl;
+        InfoInFunction << "Setting up rescue" << endl;
     }
 
     List<bool> boundaryCell(fromCells.size(), false);
@@ -203,8 +202,8 @@ void Foam::meshToMesh0::calcAddressing()
 
     if (debug)
     {
-        Info<< "meshToMesh0::calculateAddressing() : "
-            << "finished calculating mesh-to-mesh cell addressing" << endl;
+        InfoInFunction
+            << "Finished calculating mesh-to-mesh cell addressing" << endl;
     }
 }
 
diff --git a/src/sampling/meshToMesh0/calculateMeshToMesh0Weights.C b/src/sampling/meshToMesh0/calculateMeshToMesh0Weights.C
index 7cf00f9895..277e5e6d91 100644
--- a/src/sampling/meshToMesh0/calculateMeshToMesh0Weights.C
+++ b/src/sampling/meshToMesh0/calculateMeshToMesh0Weights.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,8 +32,8 @@ void Foam::meshToMesh0::calculateInverseDistanceWeights() const
 {
     if (debug)
     {
-        Info<< "meshToMesh0::calculateInverseDistanceWeights() : "
-            << "calculating inverse distance weighting factors" << endl;
+        InfoInFunction
+            << "Calculating inverse distance weighting factors" << endl;
     }
 
     if (inverseDistanceWeightsPtr_)
@@ -134,8 +134,8 @@ void Foam::meshToMesh0::calculateInverseVolumeWeights() const
 {
     if (debug)
     {
-        Info<< "meshToMesh0::calculateInverseVolumeWeights() : "
-            << "calculating inverse volume weighting factors" << endl;
+        InfoInFunction
+            << "Calculating inverse volume weighting factors" << endl;
     }
 
     if (inverseVolumeWeightsPtr_)
@@ -197,8 +197,8 @@ void Foam::meshToMesh0::calculateCellToCellAddressing() const
 {
     if (debug)
     {
-        Info<< "meshToMesh0::calculateCellToCellAddressing() : "
-            << "calculating cell to cell addressing" << endl;
+        InfoInFunction
+            << "Calculating cell to cell addressing" << endl;
     }
 
     if (cellToCellAddressingPtr_)
@@ -223,9 +223,6 @@ void Foam::meshToMesh0::calculateCellToCellAddressing() const
             overlapEngine.overlappingCells(fromMesh_, toMesh_, iTo);
         if (overLapCells.size() > 0)
         {
-            //Info << "To " << iTo << endl;
-            //Info << "cellToCell " << overLapCells << endl;
-
             cellToCell[iTo].setSize(overLapCells.size());
             forAll(overLapCells, j)
             {
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index 31b18133bb..3f8486efa4 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -289,11 +289,13 @@ void Foam::sampledIsoSurface::getIsoFields() const
 
         if (debug)
         {
-            Info<< "sampledIsoSurface::getIsoFields() : volSubField "
+            InfoInFunction
+                << "volSubField "
                 << volSubFieldPtr_->name()
                 << " min:" << min(*volSubFieldPtr_).value()
                 << " max:" << max(*volSubFieldPtr_).value() << endl;
-            Info<< "sampledIsoSurface::getIsoFields() : pointSubField "
+            InfoInFunction
+                << "pointSubField "
                 << pointSubFieldPtr_->name()
                 << " min:" << gMin(pointSubFieldPtr_->internalField())
                 << " max:" << gMax(pointSubFieldPtr_->internalField()) << endl;
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
index 239217a352..012dd99842 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,8 +75,7 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
     {
         if (debug)
         {
-            Info<< "sampledIsoSurfaceCell::updateGeometry() : lookup "
-                << isoField_ << endl;
+            InfoInFunction << "Lookup " << isoField_ << endl;
         }
 
         cellFldPtr = &fvm.lookupObject<volScalarField>(isoField_);
@@ -87,8 +86,9 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
 
         if (debug)
         {
-            Info<< "sampledIsoSurfaceCell::updateGeometry() : reading "
-                << isoField_ << " from time " <<fvm.time().timeName()
+            InfoInFunction
+                << "Reading " << isoField_
+                << " from time " <<fvm.time().timeName()
                 << endl;
         }
 
@@ -212,15 +212,7 @@ Foam::sampledIsoSurfaceCell::sampledIsoSurfaceCell
     facesPtr_(NULL),
     prevTimeIndex_(-1),
     meshCells_(0)
-{
-//    dict.readIfPresent("zone", zoneKey_);
-//
-//    if (debug && zoneKey_.size() && mesh.cellZones().findZoneID(zoneKey_) < 0)
-//    {
-//        Info<< "cellZone " << zoneKey_
-//            << " not found - using entire mesh" << endl;
-//    }
-}
+{}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
index c71c6eba0d..2f1007cb57 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "sampledThresholdCellFaces.H"
-
 #include "dictionary.H"
 #include "volFields.H"
 #include "volPointInterpolation.H"
@@ -70,8 +69,7 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
     {
         if (debug)
         {
-            Info<< "sampledThresholdCellFaces::updateGeometry() : lookup "
-                << fieldName_ << endl;
+            InfoInFunction<< "Lookup " << fieldName_ << endl;
         }
 
         cellFldPtr = &fvm.lookupObject<volScalarField>(fieldName_);
@@ -82,8 +80,9 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
 
         if (debug)
         {
-            Info<< "sampledThresholdCellFaces::updateGeometry() : reading "
-                << fieldName_ << " from time " << fvm.time().timeName()
+            InfoInFunction
+                << "Reading " << fieldName_
+                << " from time " << fvm.time().timeName()
                 << endl;
         }
 
@@ -167,14 +166,6 @@ Foam::sampledThresholdCellFaces::sampledThresholdCellFaces
             << "require at least one of 'lowerLimit' or 'upperLimit'" << endl
             << abort(FatalError);
     }
-
-//    dict.readIfPresent("zone", zoneKey_);
-//
-//    if (debug && zoneKey_.size() && mesh.cellZones().findZoneID(zoneKey_) < 0)
-//    {
-//        Info<< "cellZone " << zoneKey_
-//            << " not found - using entire mesh" << endl;
-//    }
 }
 
 
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index 041aa34231..6eebe1a080 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -600,8 +600,7 @@ bool Foam::MeshedSurface<Face>::stitchFaces
 
     if (verbose)
     {
-        Info<< "MeshedSurface::stitchFaces : Renumbering all faces"
-            << endl;
+        InfoInFunction<< "Renumbering all faces" << endl;
     }
 
     // Set the coordinates to the merged ones

From aa38e25c922addfa0c4c541b723eecb293971ba8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 20 Jan 2016 17:51:15 +0000
Subject: [PATCH 115/447] Info -> InfoInFunction and updated comments

---
 src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C |  7 +-
 src/OpenFOAM/db/Time/findInstance.C           | 26 +++----
 .../GeometricField/GeometricBoundaryField.C   | 62 +++-------------
 .../GeometricField/GeometricField.C           | 72 ++++++++-----------
 .../pointPatchField/pointPatchFieldNew.C      | 20 +-----
 .../GAMGProcAgglomeration.C                   |  7 +-
 .../facePointPatch/facePointPatchNew.C        |  7 +-
 .../polyMesh/polyMeshCheck/polyMeshCheck.C    | 37 ++--------
 .../polyPatches/polyPatch/polyPatchNew.C      | 15 ++--
 .../polyMesh/zones/cellZone/cellZoneNew.C     |  6 +-
 .../polyMesh/zones/faceZone/faceZoneNew.C     |  6 +-
 .../polyMesh/zones/pointZone/pointZoneNew.C   |  6 +-
 .../PrimitivePatch/PrimitivePatchBdryPoints.C | 13 +---
 .../PrimitivePatch/PrimitivePatchCheck.C      | 22 ++----
 .../PrimitivePatch/PrimitivePatchClear.C      | 15 ++--
 .../PrimitivePatch/PrimitivePatchEdgeLoops.C  | 12 +---
 .../PrimitivePatchPointAddressing.C           | 16 ++---
 .../polyMeshModifier/polyMeshModifierNew.C    |  7 +-
 src/edgeMesh/edgeMeshIO.C                     |  7 +-
 .../fvPatchField/fvPatchFieldNew.C            | 17 ++---
 .../fvsPatchField/fvsPatchFieldNew.C          | 35 ++-------
 .../convectionScheme/convectionScheme.C       | 12 +---
 .../gradSchemes/gradScheme/gradScheme.C       |  5 +-
 .../snGradSchemes/snGradScheme/snGradScheme.C |  8 +--
 src/finiteVolume/fvMesh/fvMeshGeometry.C      | 49 ++++++-------
 .../limitedSurfaceInterpolationScheme.C       | 11 ++-
 .../multivariateSurfaceInterpolationScheme.C  |  8 +--
 .../surfaceInterpolationScheme.C              | 31 +++-----
 src/lagrangian/basic/Cloud/Cloud.C            |  5 +-
 src/lagrangian/basic/particle/particle.C      |  4 +-
 .../coordinateSystems/coordinateSystem.C      |  7 +-
 .../mappedPolyPatch/mappedPatchBase.C         |  7 +-
 .../reactingOneDim/reactingOneDim.C           |  8 +--
 .../kinematicSingleLayer.C                    | 26 +++----
 .../thermoSingleLayer/thermoSingleLayer.C     | 14 ++--
 .../thermalBaffle/thermalBaffle.C             |  4 +-
 .../MeshedSurfaceProxy/MeshedSurfaceProxy.C   | 14 ++--
 .../UnsortedMeshedSurface.C                   |  5 +-
 .../basic/psiThermo/hePsiThermo.C             |  8 +--
 .../basic/rhoThermo/heRhoThermo.C             |  6 +-
 .../psiuReactionThermo/heheuPsiThermo.C       |  8 +--
 .../solidThermo/solidThermo/heSolidThermo.C   |  6 +-
 42 files changed, 201 insertions(+), 460 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index f008767f6b..1dd2c0531c 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -31,7 +31,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(OFstream, 0);
+    defineTypeNameAndDebug(OFstream, 0);
 }
 
 
@@ -103,9 +103,8 @@ Foam::OFstream::OFstream
     {
         if (debug)
         {
-            Info<< "OFstream::OFstream(const fileName&,"
-                   "streamFormat, versionNumber, compressionType) : "
-                   "could not open file " << pathname
+            InfoInFunction
+                << "Could not open file " << pathname
                 << "for input\n"
                    "in stream " << info() << Foam::endl;
         }
diff --git a/src/OpenFOAM/db/Time/findInstance.C b/src/OpenFOAM/db/Time/findInstance.C
index e12b9beca2..a19581f043 100644
--- a/src/OpenFOAM/db/Time/findInstance.C
+++ b/src/OpenFOAM/db/Time/findInstance.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,10 +62,8 @@ Foam::word Foam::Time::findInstance
     {
         if (debug)
         {
-            Info<< "Time::findInstance"
-                "(const fileName&, const word&"
-                ", const IOobject::readOption, const word&)"
-                << " : found \"" << name
+            InfoInFunction
+                << "Found \"" << name
                 << "\" in " << timeName()/dir
                 << endl;
         }
@@ -103,10 +101,8 @@ Foam::word Foam::Time::findInstance
         {
             if (debug)
             {
-                Info<< "Time::findInstance"
-                    "(const fileName&, const word&"
-                    ", const IOobject::readOption, const word&)"
-                    << " : found \"" << name
+                InfoInFunction
+                    << "Found \"" << name
                     << "\" in " << ts[instanceI].name()/dir
                     << endl;
             }
@@ -119,10 +115,8 @@ Foam::word Foam::Time::findInstance
         {
             if (debug)
             {
-                Info<< "Time::findInstance"
-                    "(const fileName&, const word&"
-                    ", const IOobject::readOption, const word&)"
-                    << " : hit stopInstance " << stopInstance
+                InfoInFunction
+                    << "Hit stopInstance " << stopInstance
                     << endl;
             }
 
@@ -174,10 +168,8 @@ Foam::word Foam::Time::findInstance
     {
         if (debug)
         {
-            Info<< "Time::findInstance"
-                "(const fileName&, const word&"
-                ", const IOobject::readOption, const word&)"
-                << " : found \"" << name
+            InfoInFunction
+                << "Found \"" << name
                 << "\" in " << constant()/dir
                 << endl;
         }
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index 2cc3264215..88fc8b81d2 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -43,13 +43,7 @@ readField
 
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::"
-               "GeometricBoundaryField::readField"
-               "("
-                   "const DimensionedField<Type, GeoMesh>&, "
-                   "const dictionary&"
-                ")"
-            << endl;
+        InfoInFunction << endl;
     }
 
 
@@ -230,11 +224,7 @@ GeometricBoundaryField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::"
-               "GeometricBoundaryField::"
-               "GeometricBoundaryField(const BoundaryMesh&, "
-               "const DimensionedField<Type>&, const word&)"
-            << endl;
+        InfoInFunction << endl;
     }
 
     forAll(bmesh_, patchi)
@@ -268,16 +258,7 @@ GeometricBoundaryField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::"
-               "GeometricBoundaryField::"
-               "GeometricBoundaryField"
-               "("
-                    "const BoundaryMesh&, "
-                    "const DimensionedField<Type>&, "
-                    "const wordList&, "
-                    "const wordList&"
-                ")"
-            << endl;
+        InfoInFunction << endl;
     }
 
     if
@@ -344,15 +325,7 @@ GeometricBoundaryField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::"
-               "GeometricBoundaryField::"
-               "GeometricBoundaryField"
-               "("
-                    "const BoundaryMesh&, "
-                    "const DimensionedField<Type, GeoMesh>&, "
-                    "const PtrLIst<PatchField<Type>>&"
-               ")"
-            << endl;
+        InfoInFunction << endl;
     }
 
     forAll(bmesh_, patchi)
@@ -376,15 +349,7 @@ GeometricBoundaryField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::"
-               "GeometricBoundaryField::"
-               "GeometricBoundaryField"
-               "("
-                   "const DimensionedField<Type, GeoMesh>&, "
-                   "const typename GeometricField<Type, PatchField, GeoMesh>::"
-                   "GeometricBoundaryField&"
-               ")"
-            << endl;
+        InfoInFunction << endl;
     }
 
     forAll(bmesh_, patchi)
@@ -412,14 +377,7 @@ GeometricBoundaryField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::"
-               "GeometricBoundaryField::"
-               "GeometricBoundaryField"
-               "("
-                   "const GeometricField<Type, PatchField, GeoMesh>::"
-                   "GeometricBoundaryField&"
-               ")"
-            << endl;
+        InfoInFunction << endl;
     }
 }
 
@@ -448,9 +406,7 @@ updateCoeffs()
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::"
-               "GeometricBoundaryField::"
-               "updateCoeffs()" << endl;
+        InfoInFunction << endl;
     }
 
     forAll(*this, patchi)
@@ -466,9 +422,7 @@ evaluate()
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::"
-               "GeometricBoundaryField::"
-               "evaluate()" << endl;
+        InfoInFunction << endl;
     }
 
     if
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index c88a4ac483..4d32e95ae2 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -146,7 +146,7 @@ bool Foam::GeometricField<Type, PatchField, GeoMesh>::readOldTimeIfPresent()
     {
         if (debug)
         {
-            Info<< "Reading old time level for field"
+            InfoInFunction << "Reading old time level for field"
                 << endl << this->info() << endl;
         }
 
@@ -189,9 +189,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "creating temporary"
-            << endl << this->info() << endl;
+        InfoInFunction << "Creating temporary" << endl << this->info() << endl;
     }
 
     readIfPresent();
@@ -216,9 +214,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "creating temporary"
-            << endl << this->info() << endl;
+        InfoInFunction << "Creating temporary" << endl << this->info() << endl;
     }
 
     readIfPresent();
@@ -242,9 +238,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "creating temporary"
-            << endl << this->info() << endl;
+        InfoInFunction << "Creating temporary" << endl << this->info() << endl;
     }
 
     boundaryField_ == dt.value();
@@ -271,9 +265,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "creating temporary"
-            << endl << this->info() << endl;
+        InfoInFunction << "Creating temporary" << endl << this->info() << endl;
     }
 
     boundaryField_ == dt.value();
@@ -300,9 +292,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "constructing from components"
-            << endl << this->info() << endl;
+        InfoInFunction
+            << "Constructing from components" << endl << this->info() << endl;
     }
 
     readIfPresent();
@@ -338,9 +329,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 
     if (debug)
     {
-        Info<< "Finishing read-construct of "
-               "GeometricField<Type, PatchField, GeoMesh>"
-            << endl << this->info() << endl;
+        InfoInFunction
+            << "Finishing read-construction of" << endl << this->info() << endl;
     }
 }
 
@@ -375,8 +365,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 
     if (debug)
     {
-        Info<< "Finishing dictionary-construct of "
-               "GeometricField<Type, PatchField, GeoMesh>"
+        InfoInFunction
+            << "Finishing dictionary-construct of "
             << endl << this->info() << endl;
     }
 }
@@ -396,9 +386,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "constructing as copy"
-            << endl << this->info() << endl;
+        InfoInFunction
+            << "Constructing as copy" << endl << this->info() << endl;
     }
 
     if (gf.field0Ptr_)
@@ -432,9 +421,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "constructing as copy"
-            << endl << this->info() << endl;
+        InfoInFunction
+            << "Constructing as copy" << endl << this->info() << endl;
     }
 
     this->writeOpt() = IOobject::NO_WRITE;
@@ -459,8 +447,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "constructing as copy resetting IO params"
+        InfoInFunction
+            << "Constructing as copy resetting IO params"
             << endl << this->info() << endl;
     }
 
@@ -496,8 +484,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "constructing from tmp resetting IO params"
+        InfoInFunction
+            << "Constructing from tmp resetting IO params"
             << endl << this->info() << endl;
     }
 
@@ -523,8 +511,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "constructing as copy resetting name"
+        InfoInFunction
+            << "Constructing as copy resetting name"
             << endl << this->info() << endl;
     }
 
@@ -560,8 +548,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "constructing from tmp resetting name"
+        InfoInFunction
+            << "Constructing from tmp resetting name"
             << endl << this->info() << endl;
     }
 
@@ -586,8 +574,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "constructing as copy resetting IO params"
+        InfoInFunction
+            << "Constructing as copy resetting IO params"
             << endl << this->info() << endl;
     }
 
@@ -628,8 +616,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 {
     if (debug)
     {
-        Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "constructing as copy resetting IO params and patch types"
+        InfoInFunction
+            << "Constructing as copy resetting IO params and patch types"
             << endl << this->info() << endl;
     }
 
@@ -721,7 +709,8 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::storeOldTime() const
 
         if (debug)
         {
-            Info<< "Storing old time field for field" << endl
+            InfoInFunction
+                << "Storing old time field for field" << endl
                 << this->info() << endl;
         }
 
@@ -797,7 +786,8 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::storePrevIter() const
     {
         if (debug)
         {
-            Info<< "Allocating previous iteration field" << endl
+            InfoInFunction
+                << "Allocating previous iteration field" << endl
                 << this->info() << endl;
         }
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
index 4a05a01acb..277f4c5407 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
@@ -36,11 +36,7 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 {
     if (debug)
     {
-        Info<< "PointPatchField<Type>::"
-               "New(const word&, const word&"
-                ", const pointPatch&, const Field<Type>&) : "
-               "constructing pointPatchField<Type>"
-            << endl;
+        InfoInFunction << "Constructing pointPatchField<Type>" << endl;
     }
 
     typename pointPatchConstructorTable::iterator cstrIter =
@@ -116,10 +112,7 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 {
     if (debug)
     {
-        Info<< "PointPatchField<Type>::"
-               "New(const pointPatch&, const Field<Type>&, const dictionary&)"
-               " : constructing pointPatchField<Type>"
-            << endl;
+        InfoInFunction << "Constructing pointPatchField<Type>" << endl;
     }
 
     word patchFieldType(dict.lookup("type"));
@@ -186,8 +179,6 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 }
 
 
-// Return a pointer to a new patch created on freestore from
-// a given pointPatchField<Type> mapped onto a new patch
 template<class Type>
 Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 (
@@ -199,12 +190,7 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 {
     if (debug)
     {
-        Info<< "PointPatchField<Type>::"
-               "New(const pointPatchField<Type>&,"
-               " const pointPatch&, const Field<Type>&, "
-               "const pointPatchFieldMapper&) : "
-               "constructing pointPatchField<Type>"
-            << endl;
+        InfoInFunction << "Constructing pointPatchField<Type>" << endl;
     }
 
     typename patchMapperConstructorTable::iterator cstrIter =
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
index 9233d11cfc..6c219acacd 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -358,10 +358,7 @@ Foam::autoPtr<Foam::GAMGProcAgglomeration> Foam::GAMGProcAgglomeration::New
 {
     if (debug)
     {
-        Info<< "GAMGProcAgglomeration::New(const word&, GAMGAgglomeration&"
-               ", const dictionary&) : "
-               "constructing GAMGProcAgglomeration"
-            << endl;
+        InfoInFunction << "Constructing GAMGProcAgglomeration" << endl;
     }
 
     GAMGAgglomerationConstructorTable::iterator cstrIter =
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
index b5a1b29dc9..8969bacec9 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,10 +35,7 @@ Foam::autoPtr<Foam::facePointPatch> Foam::facePointPatch::New
 {
     if (debug)
     {
-        Info<< "facePointPatch::New(const polyPatch&, "
-            << " const pointBoundaryMesh&) : "
-            << "constructing facePointPatch"
-            << endl;
+        InfoInFunction << "Constructing facePointPatch" << endl;
     }
 
     polyPatchConstructorTable::iterator cstrIter =
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
index f471696986..e75191e340 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
@@ -41,9 +41,7 @@ bool Foam::polyMesh::checkFaceOrthogonality
 {
     if (debug)
     {
-        Info<< "bool polyMesh::checkFaceOrthogonality("
-            << "const bool, labelHashSet*) const: "
-            << "checking mesh non-orthogonality" << endl;
+        InfoInFunction << "Checking mesh non-orthogonality" << endl;
     }
 
     const labelList& own = faceOwner();
@@ -182,9 +180,7 @@ bool Foam::polyMesh::checkFaceSkewness
 {
     if (debug)
     {
-        Info<< "bool polyMesh::checkFaceSkewnesss("
-            << "const bool, labelHashSet*) const: "
-            << "checking face skewness" << endl;
+        InfoInFunction << "Checking face skewness" << endl;
     }
 
     const labelList& own = faceOwner();
@@ -289,9 +285,7 @@ bool Foam::polyMesh::checkEdgeAlignment
 {
     if (debug)
     {
-        Info<< "bool polyMesh::checkEdgeAlignment("
-            << "const bool, const Vector<label>&, labelHashSet*) const: "
-            << "checking edge alignment" << endl;
+        InfoInFunction << "Checking edge alignment" << endl;
     }
 
     label nDirs = 0;
@@ -422,9 +416,7 @@ bool Foam::polyMesh::checkCellDeterminant
 
     if (debug)
     {
-        Info<< "bool polyMesh::checkCellDeterminant(const bool"
-            << ", labelHashSet*) const: "
-            << "checking for under-determined cells" << endl;
+        InfoInFunction << "Checking for under-determined cells" << endl;
     }
 
     tmp<scalarField> tcellDeterminant = primitiveMeshTools::cellDeterminant
@@ -506,9 +498,7 @@ bool Foam::polyMesh::checkFaceWeight
 {
     if (debug)
     {
-        Info<< "bool polyMesh::checkFaceWeight(const bool"
-            << ", labelHashSet*) const: "
-            << "checking for low face interpolation weights" << endl;
+        InfoInFunction << "Checking for low face interpolation weights" << endl;
     }
 
     tmp<scalarField> tfaceWght = polyMeshTools::faceWeights
@@ -601,9 +591,7 @@ bool Foam::polyMesh::checkVolRatio
 {
     if (debug)
     {
-        Info<< "bool polyMesh::checkVolRatio(const bool"
-            << ", labelHashSet*) const: "
-            << "checking for volume ratio < " << minRatio << endl;
+        InfoInFunction << "Checking for volume ratio < " << minRatio << endl;
     }
 
     tmp<scalarField> tvolRatio = polyMeshTools::volRatio(*this, cellVols);
@@ -680,19 +668,6 @@ bool Foam::polyMesh::checkVolRatio
 }
 
 
-//- Could override checkClosedBoundary to not look at (collocated!) coupled
-//  faces
-//bool Foam::polyMesh::checkClosedBoundary(const bool report) const
-//{
-//    return primitiveMesh::checkClosedBoundary
-//    (
-//        faceAreas(),
-//        report,
-//        syncTools::getInternalOrCollocatedCoupledFaces(*this)
-//    );
-//}
-
-
 bool Foam::polyMesh::checkFaceOrthogonality
 (
     const bool report,
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
index b161194fc3..e44810932d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,10 +40,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
 {
     if (debug)
     {
-        Info<< "polyPatch::New(const word&, const word&, const label, "
-               "const label, const label, const polyBoundaryMesh&) : "
-               "constructing polyPatch"
-            << endl;
+        InfoInFunction << "Constructing polyPatch" << endl;
     }
 
     wordConstructorTable::iterator cstrIter =
@@ -84,9 +81,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
 {
     if (debug)
     {
-        Info<< "polyPatch::New(const word&, const dictionary&, const label, "
-               "const polyBoundaryMesh&) : constructing polyPatch"
-            << endl;
+        InfoInFunction << "Constructing polyPatch" << endl;
     }
 
     word patchType(dict.lookup("type"));
@@ -107,9 +102,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
 {
     if (debug)
     {
-        Info<< "polyPatch::New(const word&, const word&, const dictionary&, "
-               "const label, const polyBoundaryMesh&) : constructing polyPatch"
-            << endl;
+        InfoInFunction << "Constructing polyPatch" << endl;
     }
 
     dictionaryConstructorTable::iterator cstrIter =
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
index 983ff5d8b8..fd6ed39cdd 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,9 +38,7 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
 {
     if (debug)
     {
-        Info<< "cellZone::New(const word&, const dictionary&, const label, "
-               "const cellZoneMesh&) : constructing cellZone " << name
-            << endl;
+        InfoInFunction << "Constructing cellZone " << name << endl;
     }
 
     const word zoneType(dict.lookup("type"));
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
index 8c75b01c08..2b6954b340 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,9 +38,7 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
 {
     if (debug)
     {
-        Info<< "faceZone::New(const word&, const dictionary&, const label, "
-               "const faceZoneMesh&) : constructing faceZone " << name
-            << endl;
+        InfoInFunction << "Constructing faceZone " << name << endl;
     }
 
     const word zoneType(dict.lookup("type"));
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
index f2ddb5480c..3c5feac399 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,9 +38,7 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
 {
     if (debug)
     {
-        Info<< "pointZone::New(const word&, const dictionary&, const label, "
-               "const pointZoneMesh&) : constructing pointZone " << name
-            << endl;
+        InfoInFunction << "Constructing pointZone " << name << endl;
     }
 
     const word zoneType(dict.lookup("type"));
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
index fe0a80ef28..fc3cdce902 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,6 @@ License
 #include "PrimitivePatch.H"
 #include "HashSet.H"
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template
@@ -42,10 +41,7 @@ calcBdryPoints() const
 {
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            << "calcBdryPoints() : "
-            << "calculating boundary points"
-            << endl;
+        InfoInFunction << "Calculating boundary points" << endl;
     }
 
     if (boundaryPointsPtr_)
@@ -74,10 +70,7 @@ calcBdryPoints() const
 
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            << "calcBdryPoints() : "
-            << "finished calculating boundary points"
-            << endl;
+        Info<< "    Finished." << endl;
     }
 }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
index 68be5b7ab5..28452cd286 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,10 +121,7 @@ surfaceType() const
 {
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-               "surfaceType() : "
-               "calculating patch topology"
-            << endl;
+        InfoInFunction << "Calculating patch topology" << endl;
     }
 
     const labelListList& edgeFcs = edgeFaces();
@@ -151,10 +148,7 @@ surfaceType() const
 
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-               "surfaceType() : "
-               "finished calculating patch topology"
-            << endl;
+        Info<< "    Finished." << endl;
     }
 
     return pType;
@@ -178,10 +172,7 @@ checkTopology
 {
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-               "checkTopology(const bool, labelHashSet&) : "
-               "checking patch topology"
-            << endl;
+        InfoInFunction << "Checking patch topology" << endl;
     }
 
     // Check edgeFaces
@@ -217,10 +208,7 @@ checkTopology
 
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-               "checkTopology(const bool, labelHashSet&) : "
-               "finished checking patch topology"
-            << endl;
+        Info<< "    Finished." << endl;
     }
 
     return illegalTopo;
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C
index d4aa873dad..9696208259 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,9 +42,7 @@ clearGeom()
 {
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            << "clearGeom() : clearing geometric data"
-            << endl;
+        InfoInFunction << "Clearing geometric data" << endl;
     }
 
     deleteDemandDrivenData(localPointsPtr_);
@@ -67,9 +65,7 @@ clearTopology()
 {
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            << "clearTopology() : clearing patch addressing"
-            << endl;
+        InfoInFunction << "Clearing patch addressing" << endl;
     }
 
     // group created and destroyed together
@@ -109,10 +105,7 @@ clearPatchMeshAddr()
 {
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            << "clearPatchMeshAddr() : "
-            << "clearing patch-mesh addressing"
-            << endl;
+        InfoInFunction << "Clearing patch-mesh addressing" << endl;
     }
 
     deleteDemandDrivenData(meshPointsPtr_);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
index 3a7501083a..48094cce32 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,10 +45,7 @@ calcEdgeLoops() const
 {
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            << "calcEdgeLoops() : "
-            << "calculating boundary edge loops"
-            << endl;
+        InfoInFunction << "Calculating boundary edge loops" << endl;
     }
 
     if (edgeLoopsPtr_)
@@ -153,10 +150,7 @@ calcEdgeLoops() const
 
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            << "calcEdgeLoops() : "
-            << "finished calculating boundary edge loops"
-            << endl;
+        Info<< "    Finished." << endl;
     }
 }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
index 497e38f918..1e9ad11835 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
@@ -46,9 +46,7 @@ calcPointEdges() const
 {
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            << "calcPointEdges() : calculating pointEdges"
-            << endl;
+        InfoInFunction << "Calculating pointEdges" << endl;
     }
 
     if (pointEdgesPtr_)
@@ -68,9 +66,7 @@ calcPointEdges() const
 
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            << "calcPointEdges() finished calculating pointEdges"
-            << endl;
+        Info<< "    Finished." << endl;
     }
 }
 
@@ -88,9 +84,7 @@ calcPointFaces() const
 {
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            << "calcPointFaces() : calculating pointFaces"
-            << endl;
+        InfoInFunction << "Calculating pointFaces" << endl;
     }
 
     if (pointFacesPtr_)
@@ -135,9 +129,7 @@ calcPointFaces() const
 
     if (debug)
     {
-        Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            << "calcPointFaces() finished calculating pointFaces"
-            << endl;
+        Info<< "    Finished." << endl;
     }
 }
 
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
index 23f90fefca..e85f4d5959 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,10 +38,7 @@ Foam::autoPtr<Foam::polyMeshModifier> Foam::polyMeshModifier::New
 {
     if (debug)
     {
-        Info<< "polyMeshModifier::New(const word&, const dictionary&, "
-            << "const label, const polyTopoChanger&) : "
-            << "constructing polyMeshModifier"
-            << endl;
+        InfoInFunction << "Constructing polyMeshModifier" << endl;
     }
 
     const word modifierType(dict.lookup("type"));
diff --git a/src/edgeMesh/edgeMeshIO.C b/src/edgeMesh/edgeMeshIO.C
index 074510f2c1..e8bc88f402 100644
--- a/src/edgeMesh/edgeMeshIO.C
+++ b/src/edgeMesh/edgeMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,10 +91,7 @@ void Foam::edgeMesh::write
 {
     if (debug)
     {
-        Info<< "edgeMesh::write"
-            "(const fileName&, const edgeMesh&) : "
-            "writing to " << name
-            << endl;
+        InfoInFunction << "Writing to " << name << endl;
     }
 
     const word ext = name.ext();
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
index af6e721b8b..e8f97d0cf8 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
@@ -36,10 +36,8 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
 {
     if (debug)
     {
-        Info<< "fvPatchField<Type>::New(const word&, const word&, "
-               "const fvPatch&, const DimensionedField<Type, volMesh>&) :"
-               " patchFieldType="
-            << patchFieldType
+        InfoInFunction
+            << "patchFieldType = " << patchFieldType
             << " : " << p.type()
             << endl;
     }
@@ -113,9 +111,8 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
 
     if (debug)
     {
-        Info<< "fvPatchField<Type>::New(const fvPatch&, "
-               "const DimensionedField<Type, volMesh>&, "
-               "const dictionary&) : patchFieldType="  << patchFieldType
+        InfoInFunction
+            << "patchFieldType = " << patchFieldType
             << endl;
     }
 
@@ -182,11 +179,7 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
 {
     if (debug)
     {
-        Info<< "fvPatchField<Type>::New(const fvPatchField<Type>&, "
-               "const fvPatch&, const DimensionedField<Type, volMesh>&, "
-               "const fvPatchFieldMapper&) : "
-               "constructing fvPatchField<Type>"
-            << endl;
+        InfoInFunction << "Constructing fvPatchField<Type>" << endl;
     }
 
     typename patchMapperConstructorTable::iterator cstrIter =
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
index c47e89ada2..9becf00ccf 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
@@ -23,15 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
+Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
 (
     const word& patchFieldType,
     const word& actualPatchType,
@@ -41,10 +36,7 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
 {
     if (debug)
     {
-        Info<< "fvsPatchField<Type>::New(const word&, const word&"
-               ", const fvPatch&, const Field<Type>&) : "
-               "constructing fvsPatchField<Type>"
-            << endl;
+        InfoInFunction << "Constructing fvsPatchField<Type>" << endl;
     }
 
     typename patchConstructorTable::iterator cstrIter =
@@ -86,7 +78,7 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
 
 
 template<class Type>
-tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
+Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
 (
     const word& patchFieldType,
     const fvPatch& p,
@@ -98,7 +90,7 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
 
 
 template<class Type>
-tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
+Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
@@ -107,10 +99,7 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
 {
     if (debug)
     {
-        Info<< "fvsPatchField<Type>::New(const fvPatch&, const Field<Type>&, "
-               "const dictionary&) : "
-               "constructing fvsPatchField<Type>"
-            << endl;
+        InfoInFunction << "Constructing fvsPatchField<Type>" << endl;
     }
 
     const word patchFieldType(dict.lookup("type"));
@@ -167,10 +156,8 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
 }
 
 
-// Return a pointer to a new patch created on freestore from
-// a given fvsPatchField<Type> mapped onto a new patch
 template<class Type>
-tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
+Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
 (
     const fvsPatchField<Type>& ptf,
     const fvPatch& p,
@@ -180,11 +167,7 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
 {
     if (debug)
     {
-        Info<< "fvsPatchField<Type>::New(const fvsPatchField<Type>&,"
-               " const fvPatch&, const Field<Type>&, "
-               "const fvPatchFieldMapper&) : "
-               "constructing fvsPatchField<Type>"
-            << endl;
+        InfoInFunction << "Constructing fvsPatchField<Type>" << endl;
     }
 
     typename patchMapperConstructorTable::iterator cstrIter =
@@ -213,8 +196,4 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
index 851ff9fe84..d3e257b0c2 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
@@ -63,10 +63,7 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "convectionScheme<Type>::New"
-               "(const fvMesh&, const surfaceScalarField&, Istream&) : "
-               "constructing convectionScheme<Type>"
-            << endl;
+        InfoInFunction << "Constructing convectionScheme<Type>" << endl;
     }
 
     if (schemeData.eof())
@@ -112,12 +109,7 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "convectionScheme<Type>::New"
-               "(const fvMesh&, "
-               "const typename multivariateSurfaceInterpolationScheme<Type>"
-               "::fieldTable&, const surfaceScalarField&, Istream&) : "
-               "constructing convectionScheme<Type>"
-            << endl;
+        InfoInFunction << "Constructing convectionScheme<Type>" << endl;
     }
 
     if (schemeData.eof())
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index 318bdcd8fa..2c045538e2 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -38,10 +38,7 @@ Foam::tmp<Foam::fv::gradScheme<Type>> Foam::fv::gradScheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "gradScheme<Type>::New"
-               "(const fvMesh& mesh, Istream& schemeData) : "
-               "constructing gradScheme<Type>"
-            << endl;
+        InfoInFunction << "Constructing gradScheme<Type>" << endl;
     }
 
     if (schemeData.eof())
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index 0335b0d8df..c667c4410d 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -50,9 +50,7 @@ tmp<snGradScheme<Type>> snGradScheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "snGradScheme<Type>::New(const fvMesh&, Istream&)"
-               " : constructing snGradScheme<Type>"
-            << endl;
+        InfoInFunction << "Constructing snGradScheme<Type>" << endl;
     }
 
     if (schemeData.eof())
@@ -171,8 +169,6 @@ snGradScheme<Type>::sndGrad
 }
 
 
-//- Return the face-snGrad of the given cell field
-//  with explicit correction
 template<class Type>
 tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 snGradScheme<Type>::snGrad
@@ -194,8 +190,6 @@ snGradScheme<Type>::snGrad
 }
 
 
-//- Return the face-snGrad of the given cell field
-//  with explicit correction
 template<class Type>
 tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 snGradScheme<Type>::snGrad
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index c35da60ef0..17bb30ec05 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -33,20 +33,13 @@ License
 #include "cyclicFvPatchFields.H"
 #include "cyclicAMIFvPatchFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void fvMesh::makeSf() const
+void Foam::fvMesh::makeSf() const
 {
     if (debug)
     {
-        Info<< "void fvMesh::makeSf() : "
-            << "assembling face areas"
-            << endl;
+        InfoInFunction << "Assembling face areas" << endl;
     }
 
     // It is an error to attempt to recalculate
@@ -77,7 +70,7 @@ void fvMesh::makeSf() const
 }
 
 
-void fvMesh::makeMagSf() const
+void Foam::fvMesh::makeMagSf() const
 {
     if (debug)
     {
@@ -113,7 +106,7 @@ void fvMesh::makeMagSf() const
 }
 
 
-void fvMesh::makeC() const
+void Foam::fvMesh::makeC() const
 {
     if (debug)
     {
@@ -153,7 +146,7 @@ void fvMesh::makeC() const
 }
 
 
-void fvMesh::makeCf() const
+void Foam::fvMesh::makeCf() const
 {
     if (debug)
     {
@@ -190,7 +183,7 @@ void fvMesh::makeCf() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const volScalarField::DimensionedInternalField& fvMesh::V() const
+const Foam::volScalarField::DimensionedInternalField& Foam::fvMesh::V() const
 {
     if (!VPtr_)
     {
@@ -221,7 +214,7 @@ const volScalarField::DimensionedInternalField& fvMesh::V() const
 }
 
 
-const volScalarField::DimensionedInternalField& fvMesh::V0() const
+const Foam::volScalarField::DimensionedInternalField& Foam::fvMesh::V0() const
 {
     if (!V0Ptr_)
     {
@@ -234,7 +227,7 @@ const volScalarField::DimensionedInternalField& fvMesh::V0() const
 }
 
 
-volScalarField::DimensionedInternalField& fvMesh::setV0()
+Foam::volScalarField::DimensionedInternalField& Foam::fvMesh::setV0()
 {
     if (!V0Ptr_)
     {
@@ -247,7 +240,7 @@ volScalarField::DimensionedInternalField& fvMesh::setV0()
 }
 
 
-const volScalarField::DimensionedInternalField& fvMesh::V00() const
+const Foam::volScalarField::DimensionedInternalField& Foam::fvMesh::V00() const
 {
     if (!V00Ptr_)
     {
@@ -278,7 +271,8 @@ const volScalarField::DimensionedInternalField& fvMesh::V00() const
 }
 
 
-tmp<volScalarField::DimensionedInternalField> fvMesh::Vsc() const
+Foam::tmp<Foam::volScalarField::DimensionedInternalField>
+Foam::fvMesh::Vsc() const
 {
     if (moving() && time().subCycling())
     {
@@ -306,7 +300,8 @@ tmp<volScalarField::DimensionedInternalField> fvMesh::Vsc() const
 }
 
 
-tmp<volScalarField::DimensionedInternalField> fvMesh::Vsc0() const
+Foam::tmp<Foam::volScalarField::DimensionedInternalField>
+Foam::fvMesh::Vsc0() const
 {
     if (moving() && time().subCycling())
     {
@@ -335,7 +330,7 @@ tmp<volScalarField::DimensionedInternalField> fvMesh::Vsc0() const
 }
 
 
-const surfaceVectorField& fvMesh::Sf() const
+const Foam::surfaceVectorField& Foam::fvMesh::Sf() const
 {
     if (!SfPtr_)
     {
@@ -346,7 +341,7 @@ const surfaceVectorField& fvMesh::Sf() const
 }
 
 
-const surfaceScalarField& fvMesh::magSf() const
+const Foam::surfaceScalarField& Foam::fvMesh::magSf() const
 {
     if (!magSfPtr_)
     {
@@ -357,7 +352,7 @@ const surfaceScalarField& fvMesh::magSf() const
 }
 
 
-const volVectorField& fvMesh::C() const
+const Foam::volVectorField& Foam::fvMesh::C() const
 {
     if (!CPtr_)
     {
@@ -368,7 +363,7 @@ const volVectorField& fvMesh::C() const
 }
 
 
-const surfaceVectorField& fvMesh::Cf() const
+const Foam::surfaceVectorField& Foam::fvMesh::Cf() const
 {
     if (!CfPtr_)
     {
@@ -379,7 +374,7 @@ const surfaceVectorField& fvMesh::Cf() const
 }
 
 
-tmp<surfaceVectorField> fvMesh::delta() const
+Foam::tmp<Foam::surfaceVectorField> Foam::fvMesh::delta() const
 {
     if (debug)
     {
@@ -424,7 +419,7 @@ tmp<surfaceVectorField> fvMesh::delta() const
 }
 
 
-const surfaceScalarField& fvMesh::phi() const
+const Foam::surfaceScalarField& Foam::fvMesh::phi() const
 {
     if (!phiPtr_)
     {
@@ -444,7 +439,7 @@ const surfaceScalarField& fvMesh::phi() const
 }
 
 
-surfaceScalarField& fvMesh::setPhi()
+Foam::surfaceScalarField& Foam::fvMesh::setPhi()
 {
     if (!phiPtr_)
     {
@@ -457,8 +452,4 @@ surfaceScalarField& fvMesh::setPhi()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index 388683c2f9..9b26d679ad 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -40,10 +40,8 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
 {
     if (surfaceInterpolation::debug)
     {
-        Info<< "limitedSurfaceInterpolationScheme<Type>::"
-               "New(const fvMesh&, Istream&)"
-               " : constructing limitedSurfaceInterpolationScheme<Type>"
-            << endl;
+        InfoInFunction
+            << "Constructing limitedSurfaceInterpolationScheme<Type>" << endl;
     }
 
     if (schemeData.eof())
@@ -90,9 +88,8 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
 {
     if (surfaceInterpolation::debug)
     {
-        Info<< "limitedSurfaceInterpolationScheme<Type>::New"
-               "(const fvMesh&, const surfaceScalarField&, Istream&) : "
-               "constructing limitedSurfaceInterpolationScheme<Type>"
+        InfoInFunction
+            << "Constructing limitedSurfaceInterpolationScheme<Type>"
             << endl;
     }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
index 516f2387f0..62288018b0 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
@@ -33,7 +33,6 @@ Description
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct from face-flux field and coefficient
 template<class Type>
 Foam::multivariateSurfaceInterpolationScheme<Type>::
 multivariateSurfaceInterpolationScheme
@@ -63,11 +62,8 @@ Foam::multivariateSurfaceInterpolationScheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "multivariateSurfaceInterpolationScheme<Type>::New"
-               "(const fvMesh& mesh, const fieldTable&, "
-               "const surfaceScalarField&, Istream&) : "
-               "constructing surfaceInterpolationScheme<Type>"
-            << endl;
+        InfoInFunction
+            << "Constructing surfaceInterpolationScheme<Type>" << endl;
     }
 
     const word schemeName(schemeData);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 462d93d265..43bcbe9d1c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -54,11 +54,7 @@ Foam::surfaceInterpolationScheme<Type>::New
 
     if (surfaceInterpolation::debug || surfaceInterpolationScheme<Type>::debug)
     {
-        Info<< "surfaceInterpolationScheme<Type>::New"
-               "(const fvMesh&, Istream&)"
-               " : discretisation scheme === "
-            << schemeName
-            << endl;
+        InfoInFunction << "Discretisation scheme = " << schemeName << endl;
     }
 
     typename MeshConstructorTable::iterator constructorIter =
@@ -105,11 +101,8 @@ Foam::surfaceInterpolationScheme<Type>::New
 
     if (surfaceInterpolation::debug || surfaceInterpolationScheme<Type>::debug)
     {
-        Info<< "surfaceInterpolationScheme<Type>::New"
-               "(const fvMesh&, const surfaceScalarField&, Istream&)"
-               " : discretisation scheme = "
-            << schemeName
-            << endl;
+        InfoInFunction
+            << "Discretisation scheme = " << schemeName << endl;
     }
 
     typename MeshFluxConstructorTable::iterator constructorIter =
@@ -151,11 +144,8 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
 {
     if (surfaceInterpolation::debug)
     {
-        Info<< "surfaceInterpolationScheme<Type>::uncorrectedInterpolate"
-               "(const GeometricField<Type, fvPatchField, volMesh>&, "
-               "const tmp<surfaceScalarField>&, "
-               "const tmp<surfaceScalarField>&) : "
-               "interpolating "
+        InfoInFunction
+            << "Interpolating "
             << vf.type() << " "
             << vf.name()
             << " from cells to faces "
@@ -234,10 +224,8 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
 {
     if (surfaceInterpolation::debug)
     {
-        Info<< "surfaceInterpolationScheme<Type>::interpolate"
-               "(const GeometricField<Type, fvPatchField, volMesh>&, "
-               "const tmp<surfaceScalarField>&) : "
-               "interpolating "
+        InfoInFunction
+            << "Interpolating "
             << vf.type() << " "
             << vf.name()
             << " from cells to faces "
@@ -310,9 +298,8 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
 {
     if (surfaceInterpolation::debug)
     {
-        Info<< "surfaceInterpolationScheme<Type>::interpolate"
-               "(const GeometricField<Type, fvPatchField, volMesh>&) : "
-               "interpolating "
+        InfoInFunction
+            << "Interpolating "
             << vf.type() << " "
             << vf.name()
             << " from cells to faces"
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 9b959cfafa..4a573a46ee 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -402,15 +402,14 @@ void Foam::Cloud<ParticleType>::autoMap
 {
     if (cloud::debug)
     {
-        Info<< "Cloud<ParticleType>::autoMap(TrackData&, const mapPolyMesh&) "
-            << "for lagrangian cloud " << cloud::name() << endl;
+        InfoInFunction << "for lagrangian cloud " << cloud::name() << endl;
     }
 
     const labelList& reverseCellMap = mapper.reverseCellMap();
     const labelList& reverseFaceMap = mapper.reverseFaceMap();
 
     // Reset stored data that relies on the mesh
-//    polyMesh_.clearCellTree();
+    //    polyMesh_.clearCellTree();
     cellWallFacesPtr_.clear();
 
     // Ask for the tetBasePtIs to trigger all processors to build
diff --git a/src/lagrangian/basic/particle/particle.C b/src/lagrangian/basic/particle/particle.C
index c71559d042..9bf602eaba 100644
--- a/src/lagrangian/basic/particle/particle.C
+++ b/src/lagrangian/basic/particle/particle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,8 +130,6 @@ void Foam::particle::transformProperties(const vector&)
 
 Foam::scalar Foam::particle::wallImpactDistance(const vector&) const
 {
-    Info<< "particle::wallImpactDistance" << endl;
-
     return 0.0;
 }
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C
index 68aa5e06f9..e3d9a53c10 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,9 +139,8 @@ Foam::coordinateSystem::coordinateSystem
 
         if (debug)
         {
-            Info<< "coordinateSystem::coordinateSystem"
-                "(const objectRegistry&, const dictionary&):"
-                << nl << "using global coordinate system: "
+            InfoInFunction
+                << "Using global coordinate system: "
                 << key << "=" << index << endl;
         }
 
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 7cbb79b7b1..22e92fa7c3 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -478,8 +478,9 @@ void Foam::mappedPatchBase::findSamples
 
     if (debug)
     {
-        Info<< "mappedPatchBase::findSamples on mesh " << sampleRegion()
-            << " : " << endl;
+        InfoInFunction
+            << "mesh " << sampleRegion() << " : " << endl;
+
         forAll(nearest, sampleI)
         {
             label procI = nearest[sampleI].second().second();
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
index 7b0a694e90..ae118fa10a 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -243,7 +243,7 @@ void reactingOneDim::solveContinuity()
 {
     if (debug)
     {
-        Info<< "reactingOneDim::solveContinuity()" << endl;
+        InfoInFunction << endl;
     }
 
     const scalarField mass0 = rho_*regionMesh().V();
@@ -275,7 +275,7 @@ void reactingOneDim::solveSpeciesMass()
 {
     if (debug)
     {
-        Info<< "reactingOneDim::solveSpeciesMass()" << endl;
+        InfoInFunction << endl;
     }
 
     volScalarField Yt(0.0*Ys_[0]);
@@ -316,7 +316,7 @@ void reactingOneDim::solveEnergy()
 {
     if (debug)
     {
-        Info<< "reactingOneDim::solveEnergy()" << endl;
+        InfoInFunction << endl;
     }
 
     tmp<volScalarField> alpha(solidThermo_.alpha());
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 13a4cb8627..e87619f67f 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -83,7 +83,7 @@ void kinematicSingleLayer::resetPrimaryRegionSourceTerms()
 {
     if (debug)
     {
-        Info<< "kinematicSingleLayer::resetPrimaryRegionSourceTerms()" << endl;
+        InfoInFunction << endl;
     }
 
     rhoSpPrimary_ == dimensionedScalar("zero", rhoSp_.dimensions(), 0.0);
@@ -96,8 +96,7 @@ void kinematicSingleLayer::transferPrimaryRegionThermoFields()
 {
     if (debug)
     {
-        Info<< "kinematicSingleLayer::"
-            << "transferPrimaryRegionThermoFields()" << endl;
+        InfoInFunction << endl;
     }
 
     // Update fields from primary region via direct mapped
@@ -113,8 +112,7 @@ void kinematicSingleLayer::transferPrimaryRegionSourceFields()
 {
     if (debug)
     {
-        Info<< "kinematicSingleLayer::"
-            << "transferPrimaryRegionSourceFields()" << endl;
+        InfoInFunction << endl;
     }
 
     // Convert accummulated source terms into per unit area per unit time
@@ -201,7 +199,7 @@ void kinematicSingleLayer::updateSubmodels()
 {
     if (debug)
     {
-        Info<< "kinematicSingleLayer::updateSubmodels()" << endl;
+        InfoInFunction << endl;
     }
 
     // Update injection model - mass returned is mass available for injection
@@ -240,7 +238,8 @@ void kinematicSingleLayer::continuityCheck()
 
         cumulativeContErr_ += globalContErr;
 
-        Info<< "Surface film: " << type() << nl
+        InfoInFunction
+            << "Surface film: " << type() << nl
             << "    time step continuity errors: sum local = "
             << sumLocalContErr << ", global = " << globalContErr
             << ", cumulative = " << cumulativeContErr_ << endl;
@@ -252,7 +251,7 @@ void kinematicSingleLayer::solveContinuity()
 {
     if (debug)
     {
-        Info<< "kinematicSingleLayer::solveContinuity()" << endl;
+        InfoInFunction << endl;
     }
 
     solve
@@ -290,7 +289,7 @@ tmp<Foam::fvVectorMatrix> kinematicSingleLayer::solveMomentum
 {
     if (debug)
     {
-        Info<< "kinematicSingleLayer::solveMomentum()" << endl;
+        InfoInFunction << endl;
     }
 
     // Momentum
@@ -349,7 +348,7 @@ void kinematicSingleLayer::solveThickness
 {
     if (debug)
     {
-        Info<< "kinematicSingleLayer::solveThickness()" << endl;
+        InfoInFunction << endl;
     }
 
     volScalarField rUA(1.0/UEqn.A());
@@ -836,7 +835,8 @@ void kinematicSingleLayer::addSources
 {
     if (debug)
     {
-        Info<< "\nSurface film: " << type() << ": adding to film source:" << nl
+        InfoInFunction
+            << "\nSurface film: " << type() << ": adding to film source:" << nl
             << "    mass     = " << massSource << nl
             << "    momentum = " << momentumSource << nl
             << "    pressure = " << pressureSource << endl;
@@ -854,7 +854,7 @@ void kinematicSingleLayer::preEvolveRegion()
 {
     if (debug)
     {
-        Info<< "kinematicSingleLayer::preEvolveRegion()" << endl;
+        InfoInFunction << endl;
     }
 
     surfaceFilmModel::preEvolveRegion();
@@ -877,7 +877,7 @@ void kinematicSingleLayer::evolveRegion()
 {
     if (debug)
     {
-        Info<< "kinematicSingleLayer::evolveRegion()" << endl;
+        InfoInFunction << endl;
     }
 
     // Update film coverage indicator
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 4161f1a95d..f29d5d64ed 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -89,7 +89,7 @@ void thermoSingleLayer::resetPrimaryRegionSourceTerms()
 {
     if (debug)
     {
-        Info<< "thermoSingleLayer::resetPrimaryRegionSourceTerms()" << endl;
+        InfoInFunction << endl;
     }
 
     kinematicSingleLayer::resetPrimaryRegionSourceTerms();
@@ -146,7 +146,7 @@ void thermoSingleLayer::transferPrimaryRegionThermoFields()
 {
     if (debug)
     {
-        Info<< "thermoSingleLayer::transferPrimaryRegionThermoFields()" << endl;
+        InfoInFunction << endl;
     }
 
     kinematicSingleLayer::transferPrimaryRegionThermoFields();
@@ -165,7 +165,7 @@ void thermoSingleLayer::transferPrimaryRegionSourceFields()
 {
     if (debug)
     {
-        Info<< "thermoSingleLayer::transferPrimaryRegionSourceFields()" << endl;
+        InfoInFunction << endl;
     }
 
     kinematicSingleLayer::transferPrimaryRegionSourceFields();
@@ -224,7 +224,7 @@ void thermoSingleLayer::updateSubmodels()
 {
     if (debug)
     {
-        Info<< "thermoSingleLayer::updateSubmodels()" << endl;
+        InfoInFunction << endl;
     }
 
     // Update heat transfer coefficient sub-models
@@ -271,7 +271,7 @@ void thermoSingleLayer::solveEnergy()
 {
     if (debug)
     {
-        Info<< "thermoSingleLayer::solveEnergy()" << endl;
+        InfoInFunction << endl;
     }
 
     updateSurfaceTemperatures();
@@ -608,7 +608,7 @@ void thermoSingleLayer::preEvolveRegion()
 {
     if (debug)
     {
-        Info<< "thermoSingleLayer::preEvolveRegion()" << endl;
+        InfoInFunction << endl;
     }
 
 //    correctHsForMappedT();
@@ -625,7 +625,7 @@ void thermoSingleLayer::evolveRegion()
 {
     if (debug)
     {
-        Info<< "thermoSingleLayer::evolveRegion()" << endl;
+        InfoInFunction << endl;
     }
 
     // Update film coverage indicator
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
index f63ccde238..360bdfeb1f 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ void thermalBaffle::solveEnergy()
 {
     if (debug)
     {
-        Info<< "thermalBaffle::solveEnergy()" << endl;
+        InfoInFunction << endl;
     }
 
     const polyBoundaryMesh& rbm = regionMesh().boundaryMesh();
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
index ac75fa52d8..4b8a754bca 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,10 +62,7 @@ void Foam::MeshedSurfaceProxy<Face>::write
 {
     if (debug)
     {
-        Info<< "MeshedSurfaceProxy::write"
-            "(const fileName&, const MeshedSurfaceProxy&) : "
-            "writing to " << name
-            << endl;
+        InfoInFunction << "Writing to " << name << endl;
     }
 
     word ext = name.ext();
@@ -98,14 +95,11 @@ void Foam::MeshedSurfaceProxy<Face>::write
 
     if (debug)
     {
-        Info<< "MeshedSurfaceProxy::write"
-            "(const Time&, const word&) : "
-            "writing to " << name
-            << endl;
+        InfoInFunction << "Writing to " << name << endl;
     }
 
 
-    // the local location
+    // The local location
     const fileName objectDir
     (
         t.timePath()/surfaceRegistry::prefix/name/surfMesh::meshSubDir
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 1315c05536..10a973eb05 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -107,10 +107,7 @@ void Foam::UnsortedMeshedSurface<Face>::write
 {
     if (debug)
     {
-        Info<< "UnsortedMeshedSurface::write"
-            "(const fileName&, const UnsortedMeshedSurface&) : "
-            "writing to " << name
-            << endl;
+        InfoInFunction << "Writing to " << name << endl;
     }
 
     const word ext = name.ext();
diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
index 970fc82fe3..67063b57c4 100644
--- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,8 +131,7 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::correct()
 {
     if (debug)
     {
-        Info<< "entering hePsiThermo<BasicPsiThermo, MixtureType>::correct()"
-            << endl;
+        InfoInFunction << endl;
     }
 
     // force the saving of the old-time values
@@ -142,8 +141,7 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::correct()
 
     if (debug)
     {
-        Info<< "exiting hePsiThermo<BasicPsiThermo, MixtureType>::correct()"
-            << endl;
+        Info<< "    Finished" << endl;
     }
 }
 
diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C
index ec7aad7e72..7db79d8fc8 100644
--- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,14 +133,14 @@ void Foam::heRhoThermo<BasicPsiThermo, MixtureType>::correct()
 {
     if (debug)
     {
-        Info<< "entering heRhoThermo<MixtureType>::correct()" << endl;
+        InfoInFunction << endl;
     }
 
     calculate();
 
     if (debug)
     {
-        Info<< "exiting heRhoThermo<MixtureType>::correct()" << endl;
+        Info<< "    Finished" << endl;
     }
 }
 
diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
index 982446ccb1..7d51293208 100644
--- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -204,8 +204,7 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()
 {
     if (debug)
     {
-        Info<< "entering heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()"
-            << endl;
+        InfoInFunction << endl;
     }
 
     // force the saving of the old-time values
@@ -215,8 +214,7 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()
 
     if (debug)
     {
-        Info<< "exiting heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()"
-            << endl;
+        Info<< "    Finished" << endl;
     }
 }
 
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
index d70e42a77e..75de2bc003 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -168,14 +168,14 @@ void Foam::heSolidThermo<BasicSolidThermo, MixtureType>::correct()
 {
     if (debug)
     {
-        Info<< "entering heSolidThermo<MixtureType>::correct()" << endl;
+        InfoInFunction << endl;
     }
 
     calculate();
 
     if (debug)
     {
-        Info<< "exiting heSolidThermo<MixtureType>::correct()" << endl;
+        Info<< "    Finished" << endl;
     }
 }
 

From 466ae811bdd132ad7b47ef6dca4075d4441037d4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 20 Jan 2016 20:51:09 +0000
Subject: [PATCH 116/447] interRegionExplicitPorositySource: Corrected
 initialization of firstIter_

---
 .../interRegionExplicitPorositySource.C                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
index 307eb10ea0..306421495e 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
@@ -117,7 +117,7 @@ Foam::fv::interRegionExplicitPorositySource::interRegionExplicitPorositySource
 :
     interRegionOption(name, modelType, dict, mesh),
     porosityPtr_(NULL),
-    firstIter_(false),
+    firstIter_(true),
     UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
     muName_(coeffs_.lookupOrDefault<word>("muName", "thermo:mu"))
 {

From cbf62fcba2f4d5ecd166808d97f2f2d31379b123 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 23 Jan 2016 15:16:51 +0000
Subject: [PATCH 117/447] sampledSet: Relax hit tolerance to handle warped
 faces

---
 src/sampling/sampledSet/sampledSet/sampledSet.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C
index 6167edd46e..00f843d570 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -34,7 +34,7 @@ License
 
 namespace Foam
 {
-    const scalar sampledSet::tol = 1e-6;
+    const scalar sampledSet::tol = 1e-3;
 
     defineTypeNameAndDebug(sampledSet, 0);
     defineRunTimeSelectionTable(sampledSet, word);

From 55f8712e4e6fffa11731b513eb81e46c8bf9ae5b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 23 Jan 2016 15:18:38 +0000
Subject: [PATCH 118/447] etc/config/settings.*: Add -std=c++0x to formally
 enable support for of C++11 features when building ThirdParty packages. c++0x
 is used rather than c++11 to support gcc-4.5.?

---
 etc/config/settings.csh | 57 ++++++++--------------------------
 etc/config/settings.sh  | 68 +++++++++++------------------------------
 2 files changed, 29 insertions(+), 96 deletions(-)

diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index cdb701aae5..fb6a1cf2a0 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -60,7 +60,7 @@ case Linux:
             setenv WM_CC 'gcc'
             setenv WM_CXX 'g++'
             setenv WM_CFLAGS '-m32 -fPIC'
-            setenv WM_CXXFLAGS '-m32 -fPIC'
+            setenv WM_CXXFLAGS '-m32 -fPIC -std=c++0x'
             setenv WM_LDFLAGS '-m32'
             breaksw
 
@@ -70,7 +70,7 @@ case Linux:
             setenv WM_CC 'gcc'
             setenv WM_CXX 'g++'
             setenv WM_CFLAGS '-m64 -fPIC'
-            setenv WM_CXXFLAGS '-m64 -fPIC'
+            setenv WM_CXXFLAGS '-m64 -fPIC -std=c++0x'
             setenv WM_LDFLAGS '-m64'
             breaksw
 
@@ -92,7 +92,7 @@ case Linux:
         setenv WM_CC 'gcc'
         setenv WM_CXX 'g++'
         setenv WM_CFLAGS '-m64 -fPIC'
-        setenv WM_CXXFLAGS '-m64 -fPIC'
+        setenv WM_CXXFLAGS '-m64 -fPIC -std=c++0x'
         setenv WM_LDFLAGS '-m64'
         breaksw
 
@@ -102,7 +102,7 @@ case Linux:
         setenv WM_CC 'gcc'
         setenv WM_CXX 'g++'
         setenv WM_CFLAGS '-m64 -fPIC'
-        setenv WM_CXXFLAGS '-m64 -fPIC'
+        setenv WM_CXXFLAGS '-m64 -fPIC -std=c++0x'
         setenv WM_LDFLAGS '-m64'
         breaksw
 
@@ -120,7 +120,7 @@ case SunOS:
     setenv WM_CC 'gcc'
     setenv WM_CXX 'g++'
     setenv WM_CFLAGS '-mabi=64 -fPIC'
-    setenv WM_CXXFLAGS '-mabi=64 -fPIC'
+    setenv WM_CXXFLAGS '-mabi=64 -fPIC -std=c++0x'
     setenv WM_LDFLAGS '-mabi=64 -G0'
     breaksw
 
@@ -187,10 +187,10 @@ if ( -d "${WM_DIR}" ) setenv PATH ${WM_DIR}:${PATH}
 setenv PATH ${WM_PROJECT_DIR}/bin:${PATH}
 
 # Add site-specific scripts to path - only if they exist
-if ( -d "$siteDir/bin" ) then                       # generic
+if ( -d "$siteDir/bin" ) then                       # Generic
     _foamAddPath "$siteDir/bin"
 endif
-if ( -d "$siteDir/$WM_PROJECT_VERSION/bin" ) then   # version-specific
+if ( -d "$siteDir/$WM_PROJECT_VERSION/bin" ) then   # Version-specific
     _foamAddPath "$siteDir/$WM_PROJECT_VERSION/bin"
 endif
 unset siteDir
@@ -216,61 +216,41 @@ endif
 switch ("$foamCompiler")
 case OpenFOAM:
 case ThirdParty:
+    # Default versions of GMP, MPFR and MPC, overide as necessary
+    set gmp_version=gmp-5.1.2
+    set mpfr_version=mpfr-3.1.2
+    set mpc_version=mpc-1.0.1
     switch ("$WM_COMPILER")
     case Gcc:
     case Gcc48:
         set gcc_version=gcc-4.8.5
-        set gmp_version=gmp-5.1.2
-        set mpfr_version=mpfr-3.1.2
-        set mpc_version=mpc-1.0.1
         breaksw
     case Gcc45:
         set gcc_version=gcc-4.5.4
-        set gmp_version=gmp-5.1.2
-        set mpfr_version=mpfr-3.1.2
-        set mpc_version=mpc-1.0.1
         breaksw
     case Gcc46:
         set gcc_version=gcc-4.6.4
-        set gmp_version=gmp-5.1.2
-        set mpfr_version=mpfr-3.1.2
-        set mpc_version=mpc-1.0.1
         breaksw
     case Gcc47:
         set gcc_version=gcc-4.7.4
-        set gmp_version=gmp-5.1.2
-        set mpfr_version=mpfr-3.1.2
-        set mpc_version=mpc-1.0.1
         breaksw
     case Gcc49:
         set gcc_version=gcc-4.9.3
-        set gmp_version=gmp-5.1.2
-        set mpfr_version=mpfr-3.1.2
-        set mpc_version=mpc-1.0.1
         breaksw
     case Gcc51:
         set gcc_version=gcc-5.1.0
-        set gmp_version=gmp-5.1.2
-        set mpfr_version=mpfr-3.1.2
-        set mpc_version=mpc-1.0.1
         breaksw
     case Gcc52:
         set gcc_version=gcc-5.2.0
-        set gmp_version=gmp-5.1.2
-        set mpfr_version=mpfr-3.1.2
-        set mpc_version=mpc-1.0.1
         breaksw
     case Gcc53:
         set gcc_version=gcc-5.3.0
-        set gmp_version=gmp-5.1.2
-        set mpfr_version=mpfr-3.1.2
-        set mpc_version=mpc-1.0.1
         breaksw
     case Clang:
         # Using clang - not gcc
         setenv WM_CC 'clang'
         setenv WM_CXX 'clang++'
-        set clang_version=llvm-3.6.0
+        set clang_version=llvm-3.7.0
         breaksw
     default:
         echo
@@ -357,19 +337,6 @@ default:
 endsw
 
 
-#
-# Add c++0x flags for external programs
-#
-if ( $?WM_CXXFLAGS ) then
-    switch ("$WM_COMPILER")
-    case Gcc*++0x:
-        setenv WM_CXXFLAGS "$WM_CXXFLAGS -std=c++0x"
-        breaksw
-    endsw
-endif
-
-
-
 # Communications library
 # ~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index de634eea79..1a838cebaa 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -68,7 +68,7 @@ case "$WM_ARCH" in
 Linux)
     WM_ARCH=linux
 
-    # compiler specifics
+    # Compiler specifics
     case `uname -m` in
         i686)
             export WM_ARCH_OPTION=32
@@ -81,7 +81,7 @@ Linux)
             export WM_CC='gcc'
             export WM_CXX='g++'
             export WM_CFLAGS='-m32 -fPIC'
-            export WM_CXXFLAGS='-m32 -fPIC'
+            export WM_CXXFLAGS='-m32 -fPIC -std=c++0x'
             export WM_LDFLAGS='-m32'
             ;;
         64)
@@ -90,7 +90,7 @@ Linux)
             export WM_CC='gcc'
             export WM_CXX='g++'
             export WM_CFLAGS='-m64 -fPIC'
-            export WM_CXXFLAGS='-m64 -fPIC'
+            export WM_CXXFLAGS='-m64 -fPIC -std=c++0x'
             export WM_LDFLAGS='-m64'
             ;;
         *)
@@ -111,7 +111,7 @@ Linux)
         export WM_CC='gcc'
         export WM_CXX='g++'
         export WM_CFLAGS='-fPIC'
-        export WM_CXXFLAGS='-fPIC'
+        export WM_CXXFLAGS='-fPIC -std=c++0x'
         export WM_LDFLAGS=
         ;;
 
@@ -121,7 +121,7 @@ Linux)
         export WM_CC='gcc'
         export WM_CXX='g++'
         export WM_CFLAGS='-m64 -fPIC'
-        export WM_CXXFLAGS='-m64 -fPIC'
+        export WM_CXXFLAGS='-m64 -fPIC -std=c++0x'
         export WM_LDFLAGS='-m64'
         ;;
 
@@ -131,7 +131,7 @@ Linux)
         export WM_CC='gcc'
         export WM_CXX='g++'
         export WM_CFLAGS='-m64 -fPIC'
-        export WM_CXXFLAGS='-m64 -fPIC'
+        export WM_CXXFLAGS='-m64 -fPIC -std=c++0x'
         export WM_LDFLAGS='-m64'
         ;;
 
@@ -148,11 +148,11 @@ SunOS)
     export WM_CC='gcc'
     export WM_CXX='g++'
     export WM_CFLAGS='-mabi=64 -fPIC'
-    export WM_CXXFLAGS='-mabi=64 -fPIC'
+    export WM_CXXFLAGS='-mabi=64 -fPIC -std=c++0x'
     export WM_LDFLAGS='-mabi=64 -G0'
     ;;
 
-*)    # an unsupported operating system
+*)    # An unsupported operating system
     /bin/cat <<USAGE 1>&2
 
     Your "$WM_ARCH" operating system is not supported by this release
@@ -211,12 +211,12 @@ export FOAM_RUN=$WM_PROJECT_USER_DIR/run
 # Add OpenFOAM scripts to the path
 export PATH=$WM_PROJECT_DIR/bin:$PATH
 
-# add site-specific scripts to path - only if they exist
-if [ -d "$siteDir/bin" ]                        # generic
+# Add site-specific scripts to path - only if they exist
+if [ -d "$siteDir/bin" ]                        # Generic
 then
     _foamAddPath "$siteDir/bin"
 fi
-if [ -d "$siteDir/$WM_PROJECT_VERSION/bin" ]    # version-specific
+if [ -d "$siteDir/$WM_PROJECT_VERSION/bin" ]    # Version-specific
 then
     _foamAddPath "$siteDir/$WM_PROJECT_VERSION/bin"
 fi
@@ -242,60 +242,40 @@ fi
 
 case "${foamCompiler}" in
 OpenFOAM | ThirdParty)
+    # Default versions of GMP, MPFR and MPC, overide as necessary
+    gmp_version=gmp-5.1.2
+    mpfr_version=mpfr-3.1.2
+    mpc_version=mpc-1.0.1
     case "$WM_COMPILER" in
     Gcc | Gcc48)
         gcc_version=gcc-4.8.5
-        gmp_version=gmp-5.1.2
-        mpfr_version=mpfr-3.1.2
-        mpc_version=mpc-1.0.1
         ;;
     Gcc45)
         gcc_version=gcc-4.5.4
-        gmp_version=gmp-5.1.2
-        mpfr_version=mpfr-3.1.2
-        mpc_version=mpc-1.0.1
         ;;
     Gcc46)
         gcc_version=gcc-4.6.4
-        gmp_version=gmp-5.1.2
-        mpfr_version=mpfr-3.1.2
-        mpc_version=mpc-1.0.1
         ;;
     Gcc47)
         gcc_version=gcc-4.7.4
-        gmp_version=gmp-5.1.2
-        mpfr_version=mpfr-3.1.2
-        mpc_version=mpc-1.0.1
         ;;
     Gcc49)
         gcc_version=gcc-4.9.3
-        gmp_version=gmp-5.1.2
-        mpfr_version=mpfr-3.1.2
-        mpc_version=mpc-1.0.1
         ;;
     Gcc51)
         gcc_version=gcc-5.1.0
-        gmp_version=gmp-5.1.2
-        mpfr_version=mpfr-3.1.2
-        mpc_version=mpc-1.0.1
         ;;
     Gcc52)
         gcc_version=gcc-5.2.0
-        gmp_version=gmp-5.1.2
-        mpfr_version=mpfr-3.1.2
-        mpc_version=mpc-1.0.1
         ;;
     Gcc53)
         gcc_version=gcc-5.3.0
-        gmp_version=gmp-5.1.2
-        mpfr_version=mpfr-3.1.2
-        mpc_version=mpc-1.0.1
         ;;
     Clang)
-        # using clang - not gcc
+        # Using clang - not gcc
         export WM_CC='clang'
         export WM_CXX='clang++'
-        clang_version=llvm-3.6.0
+        clang_version=llvm-3.7.0
         ;;
     *)
         echo 1>&2
@@ -380,20 +360,6 @@ system)
 esac
 
 
-#
-# Add c++0x flags for external programs
-#
-if [ -n "$WM_CXXFLAGS" ]
-then
-    case "$WM_COMPILER" in
-    Gcc*++0x)
-        WM_CXXFLAGS="$WM_CXXFLAGS -std=c++0x"
-        ;;
-    esac
-fi
-
-
-
 # Communications library
 # ~~~~~~~~~~~~~~~~~~~~~~
 

From c3a03105c43cdc8162f80773ab8be5f17af3171c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 24 Jan 2016 14:10:07 +0000
Subject: [PATCH 119/447] wmake: Add support for compiler type default rules
 which may be optionally overridden by version-specific rules.

For example the default rules for gcc on GNU/Linux x86_64 are in the
wmake/rules/linux64Gcc directory.  If there is a need to change any of
the rules for a specific version of gcc, e.g. gcc-4.8.4 the directory
wmake/rules/linux64Gcc48 may be created into which any of the language
files may be provided containing the rules to override the defaults.
---
 wmake/makefiles/files               | 20 +++++++++---------
 wmake/makefiles/general             | 32 ++++++++++++-----------------
 wmake/rules/General/general         | 13 ++++++++++++
 wmake/rules/linux64Clang/c          |  2 +-
 wmake/rules/linux64Clang/c++        |  2 +-
 wmake/rules/linux64Clang/general    |  4 ++--
 wmake/rules/linux64Gcc/c            |  2 +-
 wmake/rules/linux64Gcc/c++          |  2 +-
 wmake/rules/linux64Gcc/general      |  4 ++--
 wmake/rules/linux64Gcc45            |  1 -
 wmake/rules/linux64Gcc46            |  1 -
 wmake/rules/linux64Gcc47            |  1 -
 wmake/rules/linux64Gcc48            |  1 -
 wmake/rules/linux64Gcc49            |  1 -
 wmake/rules/linux64Gcc51            |  1 -
 wmake/rules/linux64Icc/c            |  2 +-
 wmake/rules/linux64Icc/c++          |  2 +-
 wmake/rules/linux64Icc/general      |  4 ++--
 wmake/rules/linuxARM7Gcc/c          |  2 +-
 wmake/rules/linuxARM7Gcc/c++        |  2 +-
 wmake/rules/linuxARM7Gcc/general    |  4 ++--
 wmake/rules/linuxClang/c            |  2 +-
 wmake/rules/linuxClang/c++          |  2 +-
 wmake/rules/linuxClang/general      |  4 ++--
 wmake/rules/linuxGcc/c              |  2 +-
 wmake/rules/linuxGcc/c++            |  2 +-
 wmake/rules/linuxGcc/general        |  4 ++--
 wmake/rules/linuxGcc45              |  1 -
 wmake/rules/linuxGcc46              |  1 -
 wmake/rules/linuxGcc47              |  1 -
 wmake/rules/linuxGcc48              |  1 -
 wmake/rules/linuxGcc49              |  1 -
 wmake/rules/linuxGcc51              |  1 -
 wmake/rules/linuxIA64Gcc/c          |  2 +-
 wmake/rules/linuxIA64Gcc/c++        |  2 +-
 wmake/rules/linuxIA64Gcc/general    |  6 +++---
 wmake/rules/linuxIA64Icc/c          |  2 +-
 wmake/rules/linuxIA64Icc/c++        |  2 +-
 wmake/rules/linuxIA64Icc/general    |  6 +++---
 wmake/rules/linuxIcc/c              |  2 +-
 wmake/rules/linuxIcc/c++            |  2 +-
 wmake/rules/linuxIcc/general        |  4 ++--
 wmake/rules/linuxPPC64Gcc/c         |  2 +-
 wmake/rules/linuxPPC64Gcc/c++       |  2 +-
 wmake/rules/linuxPPC64Gcc/general   |  6 +++---
 wmake/rules/linuxPPC64leGcc/c       |  2 +-
 wmake/rules/linuxPPC64leGcc/c++     |  2 +-
 wmake/rules/linuxPPC64leGcc/general |  6 +++---
 wmake/rules/solaris64Gcc/c          |  2 +-
 wmake/rules/solaris64Gcc/c++        |  2 +-
 wmake/rules/solaris64Gcc/general    |  6 +++---
 wmake/rules/solarisGcc/c            |  2 +-
 wmake/rules/solarisGcc/c++          |  2 +-
 wmake/rules/solarisGcc/general      |  6 +++---
 wmake/src/Makefile                  | 14 +++++--------
 55 files changed, 99 insertions(+), 108 deletions(-)
 delete mode 120000 wmake/rules/linux64Gcc45
 delete mode 120000 wmake/rules/linux64Gcc46
 delete mode 120000 wmake/rules/linux64Gcc47
 delete mode 120000 wmake/rules/linux64Gcc48
 delete mode 120000 wmake/rules/linux64Gcc49
 delete mode 120000 wmake/rules/linux64Gcc51
 delete mode 120000 wmake/rules/linuxGcc45
 delete mode 120000 wmake/rules/linuxGcc46
 delete mode 120000 wmake/rules/linuxGcc47
 delete mode 120000 wmake/rules/linuxGcc48
 delete mode 120000 wmake/rules/linuxGcc49
 delete mode 120000 wmake/rules/linuxGcc51

diff --git a/wmake/makefiles/files b/wmake/makefiles/files
index 91bff6265e..22c6a05f5e 100644
--- a/wmake/makefiles/files
+++ b/wmake/makefiles/files
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -29,24 +29,23 @@
 #
 #------------------------------------------------------------------------------
 
-GENERAL_RULES = $(WM_DIR)/rules/General
-RULES         = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
-OBJECTS_DIR   = $(MAKE_DIR)/$(WM_OPTIONS)
-
+GENERAL_RULES   = $(WM_DIR)/rules/General
 include $(GENERAL_RULES)/general
-include $(RULES)/general
+
 
 #------------------------------------------------------------------------------
 # declare names of make system control files derived from file 'files'
 #------------------------------------------------------------------------------
 
-OPTIONS = $(OBJECTS_DIR)/options
-FILES   = $(OBJECTS_DIR)/files
-VARS    = $(OBJECTS_DIR)/variables
-SFILES  = $(OBJECTS_DIR)/sourceFiles
+OBJECTS_DIR     = $(MAKE_DIR)/$(WM_OPTIONS)
+OPTIONS         = $(OBJECTS_DIR)/options
+FILES           = $(OBJECTS_DIR)/files
+VARS            = $(OBJECTS_DIR)/variables
+SFILES          = $(OBJECTS_DIR)/sourceFiles
 
 -include $(OPTIONS)
 
+
 #------------------------------------------------------------------------------
 # Declare dependecy of all make system files on FILES
 # Causes all derived files to be remade if any are changed or missing
@@ -74,4 +73,5 @@ $(SFILES): $(MAKE_DIR)/files
 
 $(VARS): $(SFILES)
 
+
 #------------------------------------------------------------------------------
diff --git a/wmake/makefiles/general b/wmake/makefiles/general
index 2fc320de19..580e96c7b2 100644
--- a/wmake/makefiles/general
+++ b/wmake/makefiles/general
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -33,7 +33,7 @@
 # The Makefile uses a POSIX shell
 #------------------------------------------------------------------------------
 
-SHELL      = /bin/sh
+SHELL           = /bin/sh
 
 
 #------------------------------------------------------------------------------
@@ -47,29 +47,29 @@ SHELL      = /bin/sh
 # Set the directory containing the wmake scripts
 #------------------------------------------------------------------------------
 
-WM_SCRIPTS   = $(WM_DIR)/scripts
+WM_SCRIPTS      = $(WM_DIR)/scripts
 
 
 #------------------------------------------------------------------------------
 # Declare default paths
 #------------------------------------------------------------------------------
 
-LIB_SRC            = $(WM_PROJECT_DIR)/src
-LIB_PLATFORMS      = $(WM_PROJECT_DIR)/platforms/$(WM_OPTIONS)/lib
-OBJECTS_DIR        = $(MAKE_DIR)/$(WM_OPTIONS)
+LIB_SRC         = $(WM_PROJECT_DIR)/src
+LIB_PLATFORMS   = $(WM_PROJECT_DIR)/platforms/$(WM_OPTIONS)/lib
+OBJECTS_DIR     = $(MAKE_DIR)/$(WM_OPTIONS)
 
-SYS_INC            =
-SYS_LIBS           =
+SYS_INC         =
+SYS_LIBS        =
 
-PROJECT_INC        = -I$(LIB_SRC)/$(WM_PROJECT)/lnInclude \
+PROJECT_INC     = -I$(LIB_SRC)/$(WM_PROJECT)/lnInclude \
 		     -I$(LIB_SRC)/OSspecific/$(WM_OSTYPE)/lnInclude
 
-PROJECT_LIBS       = -l$(WM_PROJECT)
+PROJECT_LIBS    = -l$(WM_PROJECT)
 
-EXE_INC            =
-EXE_LIBS           =
+EXE_INC         =
+EXE_LIBS        =
 
-LIB_LIBS           =
+LIB_LIBS        =
 
 
 #------------------------------------------------------------------------------
@@ -94,13 +94,7 @@ SEXE            = a.out
 #------------------------------------------------------------------------------
 
 GENERAL_RULES = $(WM_DIR)/rules/General
-RULES         = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
-WMAKE_BIN     = $(WM_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)
-
 include $(GENERAL_RULES)/general
-include $(RULES)/general
-include $(RULES)/$(WM_LINK_LANGUAGE)
-include $(GENERAL_RULES)/transform
 
 
 #------------------------------------------------------------------------------
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index 062c704f13..b3f20b48e8 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -12,4 +12,17 @@ GINC       =
 GLIBS      = -lm
 GLIB_LIBS  =
 
+
+COMPILER_TYPE   = $(shell echo $(WM_COMPILER) | tr -d [:digit:])
+DEFAULT_RULES   = $(WM_DIR)/rules/$(WM_ARCH)$(COMPILER_TYPE)
+RULES           = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
+WMAKE_BIN       = $(WM_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)
+
+include $(DEFAULT_RULES)/general
+include $(DEFAULT_RULES)/$(WM_LINK_LANGUAGE)
+-include $(RULES)/general
+-include $(RULES)/$(WM_LINK_LANGUAGE)
+include $(GENERAL_RULES)/transform
+
+
 #------------------------------------------------------------------------------
diff --git a/wmake/rules/linux64Clang/c b/wmake/rules/linux64Clang/c
index e882186177..b743e3f68c 100644
--- a/wmake/rules/linux64Clang/c
+++ b/wmake/rules/linux64Clang/c
@@ -4,7 +4,7 @@ cWARN        = -Wall
 
 cc          = clang -m64
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++
index 2e09ff8827..84ed0f4107 100644
--- a/wmake/rules/linux64Clang/c++
+++ b/wmake/rules/linux64Clang/c++
@@ -7,7 +7,7 @@ c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-u
 
 CC          = clang++ -std=c++0x -m64
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
diff --git a/wmake/rules/linux64Clang/general b/wmake/rules/linux64Clang/general
index 243cb7d8c7..1002cb169b 100644
--- a/wmake/rules/linux64Clang/general
+++ b/wmake/rules/linux64Clang/general
@@ -4,5 +4,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linux64Gcc/c b/wmake/rules/linux64Gcc/c
index 66435ccf05..1097b3a594 100644
--- a/wmake/rules/linux64Gcc/c
+++ b/wmake/rules/linux64Gcc/c
@@ -4,7 +4,7 @@ cWARN        = -Wall
 
 cc          = gcc -m64
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++
index 7c7af702e2..a47d0d499a 100644
--- a/wmake/rules/linux64Gcc/c++
+++ b/wmake/rules/linux64Gcc/c++
@@ -7,7 +7,7 @@ c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
 CC          = g++ -std=c++0x -m64
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general
index 243cb7d8c7..1002cb169b 100644
--- a/wmake/rules/linux64Gcc/general
+++ b/wmake/rules/linux64Gcc/general
@@ -4,5 +4,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linux64Gcc45 b/wmake/rules/linux64Gcc45
deleted file mode 120000
index 7a0c1a8505..0000000000
--- a/wmake/rules/linux64Gcc45
+++ /dev/null
@@ -1 +0,0 @@
-linux64Gcc
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc46 b/wmake/rules/linux64Gcc46
deleted file mode 120000
index 7a0c1a8505..0000000000
--- a/wmake/rules/linux64Gcc46
+++ /dev/null
@@ -1 +0,0 @@
-linux64Gcc
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc47 b/wmake/rules/linux64Gcc47
deleted file mode 120000
index 7a0c1a8505..0000000000
--- a/wmake/rules/linux64Gcc47
+++ /dev/null
@@ -1 +0,0 @@
-linux64Gcc
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc48 b/wmake/rules/linux64Gcc48
deleted file mode 120000
index 7a0c1a8505..0000000000
--- a/wmake/rules/linux64Gcc48
+++ /dev/null
@@ -1 +0,0 @@
-linux64Gcc
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc49 b/wmake/rules/linux64Gcc49
deleted file mode 120000
index 7a0c1a8505..0000000000
--- a/wmake/rules/linux64Gcc49
+++ /dev/null
@@ -1 +0,0 @@
-linux64Gcc
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc51 b/wmake/rules/linux64Gcc51
deleted file mode 120000
index 7a0c1a8505..0000000000
--- a/wmake/rules/linux64Gcc51
+++ /dev/null
@@ -1 +0,0 @@
-linux64Gcc
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/c b/wmake/rules/linux64Icc/c
index 97da5c28f0..14a3a231d5 100644
--- a/wmake/rules/linux64Icc/c
+++ b/wmake/rules/linux64Icc/c
@@ -4,7 +4,7 @@ cWARN        =
 
 cc          = icc
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linux64Icc/c++ b/wmake/rules/linux64Icc/c++
index 85b976ae4f..03bee61dce 100644
--- a/wmake/rules/linux64Icc/c++
+++ b/wmake/rules/linux64Icc/c++
@@ -8,7 +8,7 @@ c++LESSWARN = -diag-disable 1224,2026,2305
 
 CC          = icpc -std=c++0x -fp-trap=common -fp-model precise
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository
 
diff --git a/wmake/rules/linux64Icc/general b/wmake/rules/linux64Icc/general
index 45c285f1ee..52b0e177d7 100644
--- a/wmake/rules/linux64Icc/general
+++ b/wmake/rules/linux64Icc/general
@@ -4,5 +4,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linuxARM7Gcc/c b/wmake/rules/linuxARM7Gcc/c
index d7bda5d1df..dfae4adda0 100644
--- a/wmake/rules/linuxARM7Gcc/c
+++ b/wmake/rules/linuxARM7Gcc/c
@@ -4,7 +4,7 @@ cWARN        = -Wall
 
 cc          = gcc
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxARM7Gcc/c++ b/wmake/rules/linuxARM7Gcc/c++
index b647cc85e6..80fccf2710 100644
--- a/wmake/rules/linuxARM7Gcc/c++
+++ b/wmake/rules/linuxARM7Gcc/c++
@@ -7,7 +7,7 @@ c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
 CC          = g++ -std=c++0x
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
diff --git a/wmake/rules/linuxARM7Gcc/general b/wmake/rules/linuxARM7Gcc/general
index 376c614846..1e51dcc403 100644
--- a/wmake/rules/linuxARM7Gcc/general
+++ b/wmake/rules/linuxARM7Gcc/general
@@ -5,5 +5,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linuxClang/c b/wmake/rules/linuxClang/c
index 7d67b4c022..2c8e8a7f9c 100644
--- a/wmake/rules/linuxClang/c
+++ b/wmake/rules/linuxClang/c
@@ -4,7 +4,7 @@ cWARN        = -Wall
 
 cc          = clang -m32
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++
index 216cc67f7b..b029fbcfd7 100644
--- a/wmake/rules/linuxClang/c++
+++ b/wmake/rules/linuxClang/c++
@@ -7,7 +7,7 @@ c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedef -Wno-tautological-un
 
 CC          = clang++ -std=c++0x -m32
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
diff --git a/wmake/rules/linuxClang/general b/wmake/rules/linuxClang/general
index fa1eb5b925..e3427c3181 100644
--- a/wmake/rules/linuxClang/general
+++ b/wmake/rules/linuxClang/general
@@ -5,5 +5,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linuxGcc/c b/wmake/rules/linuxGcc/c
index 81c64cf710..8eddde0490 100644
--- a/wmake/rules/linuxGcc/c
+++ b/wmake/rules/linuxGcc/c
@@ -4,7 +4,7 @@ cWARN        = -Wall
 
 cc          = gcc -m32
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++
index b115000d95..c1c34a8419 100644
--- a/wmake/rules/linuxGcc/c++
+++ b/wmake/rules/linuxGcc/c++
@@ -7,7 +7,7 @@ c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
 CC          = g++ -std=c++0x -m32
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general
index fa1eb5b925..e3427c3181 100644
--- a/wmake/rules/linuxGcc/general
+++ b/wmake/rules/linuxGcc/general
@@ -5,5 +5,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linuxGcc45 b/wmake/rules/linuxGcc45
deleted file mode 120000
index e30dec7be4..0000000000
--- a/wmake/rules/linuxGcc45
+++ /dev/null
@@ -1 +0,0 @@
-linuxGcc
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc46 b/wmake/rules/linuxGcc46
deleted file mode 120000
index e30dec7be4..0000000000
--- a/wmake/rules/linuxGcc46
+++ /dev/null
@@ -1 +0,0 @@
-linuxGcc
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc47 b/wmake/rules/linuxGcc47
deleted file mode 120000
index e30dec7be4..0000000000
--- a/wmake/rules/linuxGcc47
+++ /dev/null
@@ -1 +0,0 @@
-linuxGcc
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc48 b/wmake/rules/linuxGcc48
deleted file mode 120000
index e30dec7be4..0000000000
--- a/wmake/rules/linuxGcc48
+++ /dev/null
@@ -1 +0,0 @@
-linuxGcc
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc49 b/wmake/rules/linuxGcc49
deleted file mode 120000
index e30dec7be4..0000000000
--- a/wmake/rules/linuxGcc49
+++ /dev/null
@@ -1 +0,0 @@
-linuxGcc
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc51 b/wmake/rules/linuxGcc51
deleted file mode 120000
index e30dec7be4..0000000000
--- a/wmake/rules/linuxGcc51
+++ /dev/null
@@ -1 +0,0 @@
-linuxGcc
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/c b/wmake/rules/linuxIA64Gcc/c
index d7bda5d1df..dfae4adda0 100644
--- a/wmake/rules/linuxIA64Gcc/c
+++ b/wmake/rules/linuxIA64Gcc/c
@@ -4,7 +4,7 @@ cWARN        = -Wall
 
 cc          = gcc
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++
index d07854e064..6d152ecd1a 100644
--- a/wmake/rules/linuxIA64Gcc/c++
+++ b/wmake/rules/linuxIA64Gcc/c++
@@ -7,7 +7,7 @@ c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
 CC          = g++ -std=c++0x
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
diff --git a/wmake/rules/linuxIA64Gcc/general b/wmake/rules/linuxIA64Gcc/general
index 480ea1b9c4..182ee7f901 100644
--- a/wmake/rules/linuxIA64Gcc/general
+++ b/wmake/rules/linuxIA64Gcc/general
@@ -4,6 +4,6 @@ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/X
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linuxIA64Icc/c b/wmake/rules/linuxIA64Icc/c
index 3952de58fb..2b19596b1a 100644
--- a/wmake/rules/linuxIA64Icc/c
+++ b/wmake/rules/linuxIA64Icc/c
@@ -4,7 +4,7 @@ cWARN        =
 
 cc          = icc
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxIA64Icc/c++ b/wmake/rules/linuxIA64Icc/c++
index 4d24538e97..a8a9341e1a 100644
--- a/wmake/rules/linuxIA64Icc/c++
+++ b/wmake/rules/linuxIA64Icc/c++
@@ -8,7 +8,7 @@ c++LESSWARN = -diag-disable 1224,2026,2305
 
 CC          = icpc -std=c++0x
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository
 
diff --git a/wmake/rules/linuxIA64Icc/general b/wmake/rules/linuxIA64Icc/general
index 9dc446d4b2..09a3896656 100644
--- a/wmake/rules/linuxIA64Icc/general
+++ b/wmake/rules/linuxIA64Icc/general
@@ -4,6 +4,6 @@ GLIBS      =
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/X
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linuxIcc/c b/wmake/rules/linuxIcc/c
index a6441bcbd0..c9f75c9021 100644
--- a/wmake/rules/linuxIcc/c
+++ b/wmake/rules/linuxIcc/c
@@ -4,7 +4,7 @@ cWARN        =
 
 cc          = icc -gcc-version=400
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -KPIC
 
diff --git a/wmake/rules/linuxIcc/c++ b/wmake/rules/linuxIcc/c++
index 48fdb9f6b1..88976144c1 100644
--- a/wmake/rules/linuxIcc/c++
+++ b/wmake/rules/linuxIcc/c++
@@ -8,7 +8,7 @@ c++LESSWARN = -diag-disable 1224,2026,2305
 
 CC          = icpc -std=c++0x -fp-trap=common -fp-model precise
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository
 
diff --git a/wmake/rules/linuxIcc/general b/wmake/rules/linuxIcc/general
index 8a38ddf6d4..5c94cad44a 100644
--- a/wmake/rules/linuxIcc/general
+++ b/wmake/rules/linuxIcc/general
@@ -5,5 +5,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linuxPPC64Gcc/c b/wmake/rules/linuxPPC64Gcc/c
index 1fa057876c..f973417062 100644
--- a/wmake/rules/linuxPPC64Gcc/c
+++ b/wmake/rules/linuxPPC64Gcc/c
@@ -4,7 +4,7 @@ cWARN        = -Wall
 
 cc          = gcc -m64 -mcpu=power5+
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++
index c5dcaa4d96..7c33079384 100644
--- a/wmake/rules/linuxPPC64Gcc/c++
+++ b/wmake/rules/linuxPPC64Gcc/c++
@@ -7,7 +7,7 @@ c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
 CC          = g++ -std=c++0x -m64 -mcpu=power5+
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general
index fa717f9645..a590cc29c8 100644
--- a/wmake/rules/linuxPPC64Gcc/general
+++ b/wmake/rules/linuxPPC64Gcc/general
@@ -5,6 +5,6 @@ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/X
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linuxPPC64leGcc/c b/wmake/rules/linuxPPC64leGcc/c
index d9aa80f726..c5e3c73eba 100644
--- a/wmake/rules/linuxPPC64leGcc/c
+++ b/wmake/rules/linuxPPC64leGcc/c
@@ -4,7 +4,7 @@ cWARN        = -Wall
 
 cc          = gcc -m64 -mcpu=power8
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxPPC64leGcc/c++ b/wmake/rules/linuxPPC64leGcc/c++
index 76c4947183..805f821822 100644
--- a/wmake/rules/linuxPPC64leGcc/c++
+++ b/wmake/rules/linuxPPC64leGcc/c++
@@ -7,7 +7,7 @@ c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 
 CC          = g++ -std=c++0x -m64 -mcpu=power8
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
diff --git a/wmake/rules/linuxPPC64leGcc/general b/wmake/rules/linuxPPC64leGcc/general
index f800e09afc..7867cbde8f 100644
--- a/wmake/rules/linuxPPC64leGcc/general
+++ b/wmake/rules/linuxPPC64leGcc/general
@@ -5,6 +5,6 @@ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/X
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/solaris64Gcc/c b/wmake/rules/solaris64Gcc/c
index 66435ccf05..1097b3a594 100644
--- a/wmake/rules/solaris64Gcc/c
+++ b/wmake/rules/solaris64Gcc/c
@@ -4,7 +4,7 @@ cWARN        = -Wall
 
 cc          = gcc -m64
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/solaris64Gcc/c++ b/wmake/rules/solaris64Gcc/c++
index e7f16f4d46..324522f10b 100644
--- a/wmake/rules/solaris64Gcc/c++
+++ b/wmake/rules/solaris64Gcc/c++
@@ -7,7 +7,7 @@ c++LESSWARN =
 
 CC          = g++ -std=c++0x -m64
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
diff --git a/wmake/rules/solaris64Gcc/general b/wmake/rules/solaris64Gcc/general
index 83b7ebf4e0..bbf1b69bc2 100644
--- a/wmake/rules/solaris64Gcc/general
+++ b/wmake/rules/solaris64Gcc/general
@@ -5,6 +5,6 @@ PROJECT_LIBS = -l$(WM_PROJECT) -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/X
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/solarisGcc/c b/wmake/rules/solarisGcc/c
index d7bda5d1df..dfae4adda0 100644
--- a/wmake/rules/solarisGcc/c
+++ b/wmake/rules/solarisGcc/c
@@ -4,7 +4,7 @@ cWARN        = -Wall
 
 cc          = gcc
 
-include $(RULES)/c$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
 
 cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/solarisGcc/c++ b/wmake/rules/solarisGcc/c++
index d6bf189010..d8e968fb9f 100644
--- a/wmake/rules/solarisGcc/c++
+++ b/wmake/rules/solarisGcc/c++
@@ -7,7 +7,7 @@ c++LESSWARN =
 
 CC          = g++ -std=c++0x
 
-include $(RULES)/c++$(WM_COMPILE_OPTION)
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
diff --git a/wmake/rules/solarisGcc/general b/wmake/rules/solarisGcc/general
index cda7ba8673..2e6e7b1f40 100644
--- a/wmake/rules/solarisGcc/general
+++ b/wmake/rules/solarisGcc/general
@@ -4,6 +4,6 @@ PROJECT_LIBS = -l$(WM_PROJECT) -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++
+include $(DEFAULT_RULES)/X
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/src/Makefile b/wmake/src/Makefile
index 92a2b087e6..4162a3b45d 100644
--- a/wmake/src/Makefile
+++ b/wmake/src/Makefile
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -43,19 +43,15 @@ SHELL      = /bin/sh
 
 
 #------------------------------------------------------------------------------
-# set compilation and dependency building rules
+# Set compilation and dependency building rules
 #------------------------------------------------------------------------------
 
-GENERAL_RULES = $(WM_DIR)/rules/General
-RULES         = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
-WMAKE_BIN     = $(WM_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)
-
-include $(RULES)/general
-include $(RULES)/$(WM_LINK_LANGUAGE)
+GENERAL_RULES   = $(WM_DIR)/rules/General
+include $(GENERAL_RULES)/general
 
 
 #------------------------------------------------------------------------------
-# targets
+# Targets
 #------------------------------------------------------------------------------
 
 all:  $(WMAKE_BIN)/dirToString $(WMAKE_BIN)/wmkdep

From cd265693f59f081cf180948706067e8f1a711ab8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 24 Jan 2016 14:37:39 +0000
Subject: [PATCH 120/447] wmake: Update comments

---
 wmake/makefiles/files      |  2 +-
 wmake/scripts/makeFiles    |  4 ++--
 wmake/wmakeFilesAndOptions |  4 ++--
 wmake/wmakeLnInclude       |  4 ++--
 wmake/wmakeLnIncludeAll    |  4 ++--
 wmake/wmakeScheduler       |  6 +++---
 wmake/wmakeSchedulerUptime | 23 +++++++++++------------
 7 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/wmake/makefiles/files b/wmake/makefiles/files
index 22c6a05f5e..521d9341ad 100644
--- a/wmake/makefiles/files
+++ b/wmake/makefiles/files
@@ -34,7 +34,7 @@ include $(GENERAL_RULES)/general
 
 
 #------------------------------------------------------------------------------
-# declare names of make system control files derived from file 'files'
+# Declare names of make system control files derived from file 'files'
 #------------------------------------------------------------------------------
 
 OBJECTS_DIR     = $(MAKE_DIR)/$(WM_OPTIONS)
diff --git a/wmake/scripts/makeFiles b/wmake/scripts/makeFiles
index c5b99db9cf..62f21baf93 100755
--- a/wmake/scripts/makeFiles
+++ b/wmake/scripts/makeFiles
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -47,7 +47,7 @@ for dir in `find . -type d -print`
 do
     case "$dir" in
     . | ./Make | ./lnInclude )
-        # skip special directories
+        # Skip special directories
         ;;
     *)
         baseDir=`echo $dir | sed 's%^\./%%'`
diff --git a/wmake/wmakeFilesAndOptions b/wmake/wmakeFilesAndOptions
index 560f2c1ad6..488c211ab4 100755
--- a/wmake/wmakeFilesAndOptions
+++ b/wmake/wmakeFilesAndOptions
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -56,7 +56,7 @@ USAGE
 while [ "$#" -gt 0 ]
 do
     case "$1" in
-    -h | -help)   # provide immediate help
+    -h | -help)   # Provide immediate help
         usage
         ;;
     -*)
diff --git a/wmake/wmakeLnInclude b/wmake/wmakeLnInclude
index 05d2b9f516..28f4276b9d 100755
--- a/wmake/wmakeLnInclude
+++ b/wmake/wmakeLnInclude
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -78,7 +78,7 @@ unset update silentOpt
 while [ "$#" -gt 0 ]
 do
     case "$1" in
-    -h | -help)   # provide immediate help
+    -h | -help)   # Provide immediate help
         usage
         ;;
     -u | -update)
diff --git a/wmake/wmakeLnIncludeAll b/wmake/wmakeLnIncludeAll
index 2aa833c8d6..7c4c3fa8ac 100755
--- a/wmake/wmakeLnIncludeAll
+++ b/wmake/wmakeLnIncludeAll
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -58,7 +58,7 @@ findName=lnInclude
 while [ "$#" -gt 0 ]
 do
     case "$1" in
-    -h | -help)   # provide immediate help
+    -h | -help)   # Provide immediate help
         usage
         ;;
     -*)
diff --git a/wmake/wmakeScheduler b/wmake/wmakeScheduler
index 11a22009c4..a927af7a37 100755
--- a/wmake/wmakeScheduler
+++ b/wmake/wmakeScheduler
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -108,8 +108,8 @@ fi
 
 # Construct test string for remote execution.
 # Source WM_PROJECT settings if WM_PROJECT environment not set.
-# attempt to preserve the installation directory 'FOAM_INST_DIR'
-# use FOAM_SETTINGS to pass command-line settings
+# Attempt to preserve the installation directory 'FOAM_INST_DIR'
+# Use FOAM_SETTINGS to pass command-line settings
 case $sourceFoam in
 */bashrc)
     if [ "$FOAM_INST_DIR" ]
diff --git a/wmake/wmakeSchedulerUptime b/wmake/wmakeSchedulerUptime
index 1ef11f97b3..6239f9e65c 100755
--- a/wmake/wmakeSchedulerUptime
+++ b/wmake/wmakeSchedulerUptime
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -64,7 +64,7 @@ then
         for slotGroup in $WM_HOSTS
         do
             n=${slotGroup##*:}
-            [ "$n" = "${slotGroup%%:*}" ] && n=1  # missing ':'
+            [ "$n" = "${slotGroup%%:*}" ] && n=1  # Missing ':'
             echo "+ ${n:-1}"
         done
     )
@@ -76,7 +76,7 @@ fi
 # !! Assumes remote computer running same shell and startup files
 # in same location
 
-sourceFoam=false    # fallback command
+sourceFoam=false    # Fallback command
 case $SHELL in
 */csh | */tcsh )    # [t]csh vs bash|ksh|sh
     shellRc=cshrc
@@ -107,8 +107,8 @@ fi
 
 # Construct test string for remote execution.
 # Source WM_PROJECT settings if WM_PROJECT environment not set.
-# attempt to preserve the installation directory 'FOAM_INST_DIR'
-# use FOAM_SETTINGS to pass command-line settings
+# Attempt to preserve the installation directory 'FOAM_INST_DIR'
+# Use FOAM_SETTINGS to pass command-line settings
 case $sourceFoam in
 */bashrc)
     if [ "$FOAM_INST_DIR" ]
@@ -125,9 +125,9 @@ case $sourceFoam in
     ;;
 esac
 
-# quote double-quotes for remote command line
+# Quote double-quotes for remote command line
 rcmd=$(echo $* | sed -e s/\"/\'\"\'/g)
-## the same, without forking (not ksh, maybe not /bin/sh either)
+# The same, without forking (not ksh, maybe not /bin/sh either)
 # rcmd=$(while [ "$#" -gt 0 ]; do echo "${1//\"/'\"'}"; shift; done)
 
 
@@ -147,7 +147,7 @@ set -o pipefail
 
 
 #
-# colour output by argument 1
+# Colour output by argument 1
 #
 colourPipe()
 {
@@ -168,7 +168,7 @@ colourPipe()
 
 
 
-# parse options
+# Parse options
 nprocs=1
 while [ "$#" -gt 0 ]
 do
@@ -194,10 +194,10 @@ while :
 do
     for slotGroup in $WM_HOSTS
     do
-        # split 'host:N', but catch 'host:' and 'host' too
+        # Split 'host:N', but catch 'host:' and 'host' too
         host=${slotGroup%%:*}
         n=${slotGroup##*:}
-        [ "$n" = "$host" ] && n=1  # missing ':'
+        [ "$n" = "$host" ] && n=1  # Missing ':'
         : ${n:=1}
 
 
@@ -249,7 +249,6 @@ do
     done
 
     # Did not find any free machines. Rest a bit.
-    #echo "$Script: Too much load. Waiting"
     sleep 1
 done
 

From b3d47f042375ffc6c492b69e8492aab6bd8cef3c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 27 Jan 2016 14:19:25 +0000
Subject: [PATCH 121/447] bin/tools/RunFunctions: runParallel now obtains the
 number of processors from numberOfSubdomains in decomposeParDict.

This default number of processors may be overridden by the new "-np"
option to runParallel which must be specified before the application
name e.g.:

runParallel -np 4 pisoFoam
---
 bin/tools/RunFunctions                                | 10 ++++++----
 .../fireFoam/les/oppositeBurningPanels/Allrun         |  2 +-
 .../combustion/fireFoam/les/smallPoolFire3D/Allrun    |  2 +-
 .../discreteMethods/dsmcFoam/supersonicCorner/Allrun  |  4 ++--
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun  |  4 ++--
 .../molecularDynamics/mdFoam/nanoNozzle/Allrun        |  4 ++--
 .../externalCoupledCavity/Allrun-parallel             |  2 +-
 .../chtMultiRegionFoam/multiRegionHeater/Allrun       |  2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/Allrun |  2 +-
 .../heatExchanger/Allrun-parallel                     |  2 +-
 .../multiRegionHeaterRadiation/Allrun-parallel        |  2 +-
 .../pimpleDyMFoam/mixerVesselAMI2D/Allrun             |  2 +-
 .../oscillatingInletACMI2D/Allrun-parallel            |  2 +-
 .../incompressible/pimpleDyMFoam/propeller/Allrun     |  2 +-
 .../incompressible/pimpleDyMFoam/wingMotion/Allrun    |  2 +-
 tutorials/incompressible/pimpleFoam/channel395/Allrun |  2 +-
 .../pisoFoam/les/motorBike/lesFiles/Allrun            |  2 +-
 .../pisoFoam/les/motorBike/motorBike/Allrun           |  8 ++++----
 tutorials/incompressible/simpleFoam/motorBike/Allrun  |  8 ++++----
 tutorials/incompressible/simpleFoam/pipeCyclic/Allrun |  2 +-
 .../incompressible/simpleFoam/turbineSiting/Allrun    |  6 +++---
 tutorials/lagrangian/MPPICFoam/cyclone/Allrun         |  9 ++++++---
 .../icoUncoupledKinematicParcelFoam/hopper/Allrun     |  4 ++--
 .../reactingParcelFilmFoam/hotBoxes/Allrun-parallel   |  2 +-
 tutorials/mesh/foamyHexMesh/blob/Allrun-parallel      | 11 ++++-------
 tutorials/mesh/foamyHexMesh/flange/Allrun-parallel    | 11 ++++-------
 tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre    | 11 ++++-------
 .../mesh/foamyHexMesh/mixerVessel/Allrun-simulation   |  5 +----
 .../mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam  |  5 +----
 .../multiphase/cavitatingFoam/les/throttle3D/Allrun   |  2 +-
 .../laminar/depthCharge3D/Allrun                      |  2 +-
 tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun  |  4 ++--
 .../multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun |  2 +-
 tutorials/multiphase/interFoam/laminar/Allrun         |  2 +-
 tutorials/multiphase/interFoam/ras/Allrun             |  2 +-
 tutorials/multiphase/interFoam/ras/DTCHull/Allrun     |  4 ++--
 .../interPhaseChangeDyMFoam/propeller/Allrun          |  2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/Allrun     |  2 +-
 .../laminar/mixerVesselAMI2D/Allrun                   |  2 +-
 .../laminar/damBreak4phaseFine/Allrun                 |  2 +-
 40 files changed, 73 insertions(+), 83 deletions(-)

diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 6dd1fbafa5..8465acbe07 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -81,6 +81,7 @@ runParallel()
     APP_RUN=
     LOG_IGNORE=false
     LOG_APPEND=false
+    nProcs=$(getNumberOfProcessors)
 
     # Parse options and executable
     while [ $# -gt 0 ] && [ -z "$APP_RUN" ]; do
@@ -93,12 +94,13 @@ runParallel()
             -overwrite)
                 LOG_IGNORE=true
                 ;;
+            -np)
+                nProcs="$2"
+                shift
+                ;;
             *)
                 APP_RUN="$key"
                 APP_NAME="${key##*/}"
-                # also read number of processors
-                nProcs="$2"
-                shift
                 ;;
         esac
     shift
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
index 5528c96c78..7b08d9dbdf 100755
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
@@ -30,7 +30,7 @@ decomposePar -region panelRegion > log.decomposeParPanelRegion 2>&1
 
 decomposePar -fields > log.decomposePar 2>&1
 
-runParallel `getApplication` 6
+runParallel `getApplication`
 
 paraFoam -touch
 paraFoam -touch -region panelRegion
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
index ebd159495f..1197f13ca7 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
@@ -12,6 +12,6 @@ runApplication createPatch -overwrite
 runApplication decomposePar -force
 
 # Run
-runParallel $application 4
+runParallel $application
 
 # -----------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
index 8e706a5ac4..8704a9b0cb 100755
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication decomposePar
-runParallel dsmcInitialise 4
-runParallel `getApplication` 4
+runParallel dsmcInitialise
+runParallel `getApplication`
 runApplication reconstructPar -noLagrangian
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
index 51572e4010..7c0b454740 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication decomposePar
-runParallel dsmcInitialise 4
-runParallel `getApplication` 4
+runParallel dsmcInitialise
+runParallel `getApplication`
 runApplication reconstructPar -noLagrangian
 
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
index 697eb2c899..4cdfac76e0 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
@@ -11,8 +11,8 @@ runApplication blockMesh
 
 runApplication decomposePar
 
-runParallel mdInitialise 4
-runParallel $application 4
+runParallel mdInitialise
+runParallel $application
 
 runApplication reconstructPar
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel
index 8c451a124e..4c959ca647 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel
@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication decomposePar
 
-runParallel $(getApplication) 4 &
+runParallel $(getApplication) &
 
 ./externalSolver
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index bf6e7f7487..d0bf0a098a 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -29,7 +29,7 @@ done
 runApplication decomposePar -allRegions
 
 # Run
-runParallel `getApplication` 4
+runParallel `getApplication`
 
 # Reconstruct
 runApplication reconstructPar -allRegions
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
index 1b68a368e4..d53a286e73 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
@@ -34,7 +34,7 @@ runApplication `getApplication`
 #runApplication decomposePar -allRegions
 #
 ## Run
-#runParallel `getApplication` 4
+#runParallel `getApplication`
 #
 ## Reconstruct
 #runApplication reconstructPar -allRegions
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel
index 70ac496b64..32143f46ad 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel
@@ -13,7 +13,7 @@ mv log.decomposePar log.decomposePar.air
 runApplication decomposePar -region porous
 mv log.decomposePar log.decomposePar.porous
 
-runParallel $(getApplication) 4
+runParallel $(getApplication)
 
 runApplication reconstructPar -latestTime -region air
 mv log.reconstructPar log.reconstructPar.air
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
index ea086b20bc..34abacf4ba 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
@@ -28,7 +28,7 @@ do
 done
 
 # Run
-runParallel `getApplication` 4
+runParallel `getApplication`
 
 # Reconstruct
 runApplication reconstructPar -allRegions
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
index 80a0ee95cf..19debb7a09 100755
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
@@ -10,7 +10,7 @@ application=`getApplication`
 
 #runApplication $application
 runApplication decomposePar
-runParallel $application 4
+runParallel $application
 runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel
index 0ee115c577..3f7cab5d82 100755
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel
@@ -8,6 +8,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication decomposePar
 
-runParallel $(getApplication) 4
+runParallel $(getApplication)
 
 runApplication reconstructPar
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun
index 755e965299..1d24256eb0 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun
@@ -8,6 +8,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication decomposePar
 
-runParallel `getApplication` 4
+runParallel `getApplication`
 
 runApplication reconstructPar
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
index 60c6459cfe..c0443867ad 100755
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
@@ -24,7 +24,7 @@ cp -r 0.org 0
 runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
 mv 0/pointDisplacement.unmapped 0/pointDisplacement
 runApplication decomposePar
-runParallel `getApplication` 4
+runParallel `getApplication`
 runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pimpleFoam/channel395/Allrun b/tutorials/incompressible/pimpleFoam/channel395/Allrun
index a94c6e72a3..340e3e1ef8 100755
--- a/tutorials/incompressible/pimpleFoam/channel395/Allrun
+++ b/tutorials/incompressible/pimpleFoam/channel395/Allrun
@@ -14,7 +14,7 @@ runApplication blockMesh
 
 #- Run parallel
 runApplication decomposePar -cellDist
-runParallel $application 4
+runParallel $application
 runApplication reconstructPar
 
 runApplication postChannel
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun
index d39ce623e9..be0ad68bf8 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun
@@ -11,7 +11,7 @@ ls -d processor* | xargs -I {} rm -rf ./{}/0 $1
 ls -d processor* | xargs -I {} mv ./{}/500 ./{}/0 $1
 ls -d processor* | xargs -I {} rm -rf ./{}/0/uniform $1
 
-runParallel pisoFoam 8
+runParallel pisoFoam
 
 runApplication reconstructParMesh -constant -mergeTol 1e-6
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
index 29462ed538..dba0d829ff 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
@@ -15,16 +15,16 @@ cp system/decomposeParDict.hierarchical system/decomposeParDict
 runApplication decomposePar
 
 cp system/decomposeParDict.ptscotch system/decomposeParDict
-runParallel snappyHexMesh 8 -overwrite -parallel
+runParallel snappyHexMesh -overwrite -parallel
 
 find . -type f -iname "*level*" -exec rm {} \;
 
 ls -d processor* | xargs -I {} cp -r 0.org ./{}/0 $1
 
-runParallel renumberMesh 8 -overwrite
+runParallel renumberMesh -overwrite
 
-runParallel potentialFoam 8 -initialiseUBCs
+runParallel potentialFoam -initialiseUBCs
 
-runParallel `getApplication` 8
+runParallel `getApplication`
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index 7b751e1a1f..9cdfeebbf4 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -11,7 +11,7 @@ runApplication surfaceFeatureExtract
 runApplication blockMesh
 
 runApplication decomposePar
-runParallel snappyHexMesh 6 -overwrite
+runParallel snappyHexMesh -overwrite
 
 #- For non-parallel running
 #cp -r 0.org 0 > /dev/null 2>&1
@@ -20,9 +20,9 @@ runParallel snappyHexMesh 6 -overwrite
 ls -d processor* | xargs -I {} rm -rf ./{}/0
 ls -d processor* | xargs -I {} cp -r 0.org ./{}/0
 
-runParallel patchSummary 6
-runParallel potentialFoam 6
-runParallel $(getApplication) 6
+runParallel patchSummary
+runParallel potentialFoam
+runParallel $(getApplication)
 
 runApplication reconstructParMesh -constant
 runApplication reconstructPar -latestTime
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
index 28f5ac16f8..dede11e268 100755
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
@@ -14,7 +14,7 @@ cp -r 0.org 0
 
 #runApplication $application
 runApplication decomposePar -cellDist
-runParallel $application 5
+runParallel $application
 
 runApplication reconstructPar
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
index e2cd04e37a..310b8184e7 100755
--- a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
@@ -12,14 +12,14 @@ cp system/decomposeParDict.hierarchical system/decomposeParDict
 runApplication decomposePar
 
 cp system/decomposeParDict.ptscotch system/decomposeParDict
-runParallel snappyHexMesh 4 -overwrite
+runParallel snappyHexMesh -overwrite
 
 find . -type f -iname "*level*" -exec rm {} \;
 
 ls -d processor* | xargs -I {} cp -r 0.org ./{}/0 $1
 
-runParallel topoSet 4
-runParallel `getApplication` 4
+runParallel topoSet
+runParallel `getApplication`
 
 runApplication reconstructParMesh -constant
 runApplication reconstructPar
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/Allrun b/tutorials/lagrangian/MPPICFoam/cyclone/Allrun
index aafb01639e..20831ede74 100755
--- a/tutorials/lagrangian/MPPICFoam/cyclone/Allrun
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/Allrun
@@ -1,9 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
-
+# Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+
 cp $FOAM_TUTORIALS/resources/geometry/cyclone.stl.gz constant/triSurface
 
 runApplication blockMesh
@@ -12,4 +13,6 @@ runApplication snappyHexMesh -overwrite
 
 runApplication decomposePar
 
-runParallel MPPICFoam $(echo processor* | wc -w)
+runParallel MPPICFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
index 27f3f41e51..c9e57d4e6f 100755
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 cd hopperInitialState
 runApplication blockMesh
 runApplication decomposePar
-runParallel `getApplication` 4
+runParallel `getApplication`
 runApplication reconstructPar -latestTime
 cd ..
 
@@ -17,7 +17,7 @@ cp -r 0.org 0
 runApplication blockMesh
 runApplication mapFields ../hopperInitialState -sourceTime latestTime
 runApplication decomposePar
-runParallel `getApplication` 4
+runParallel `getApplication`
 runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
index f3b7aecb79..79670e84ee 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
@@ -13,7 +13,7 @@ mv log.decomposePar log.decomposePar.wallFilmRegion
 runApplication decomposePar
 mv log.decomposePar log.decomposePar.primaryRegion
 
-runParallel $application 4
+runParallel $application
 
 runApplication reconstructPar -region wallFilmRegion
 mv log.reconstructPar log.reconstructPar.wallFilmRegion
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
index ef0ef9e42f..21ff27d064 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
@@ -4,24 +4,21 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get the number of processors to run on from system/decomposeParDict
-nProc=$(getNumberOfProcessors)
-
 # copy flange surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
 
 runApplication blockMesh -region backgroundMeshDecomposition
 runApplication decomposePar -region backgroundMeshDecomposition
 
-runParallel foamyHexMesh $nProc
+runParallel foamyHexMesh
 
-runParallel collapseEdges $nProc -latestTime -collapseFaces
+runParallel collapseEdges -latestTime -collapseFaces
 mv log.collapseEdges log.collapseFaces
 
-runParallel collapseEdges $nProc -latestTime -collapseFaceSet indirectPatchFaces
+runParallel collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
 mv log.collapseEdges log.collapseFaceSet
 
-runParallel checkMesh $nProc -latestTime -allTopology -allGeometry
+runParallel checkMesh -latestTime -allTopology -allGeometry
 
 runApplication reconstructParMesh -latestTime
 
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
index 9912810e62..318a2381eb 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
@@ -4,9 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get the number of processors to run on from system/decomposeParDict
-nProc=$(getNumberOfProcessors)
-
 # copy flange surface from resources directory
 cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
 
@@ -14,15 +11,15 @@ cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
 runApplication blockMesh -region backgroundMeshDecomposition
 runApplication decomposePar -region backgroundMeshDecomposition
 
-runParallel foamyHexMesh $nProc
+runParallel foamyHexMesh
 
-runParallel collapseEdges $nProc -latestTime -collapseFaces
+runParallel collapseEdges -latestTime -collapseFaces
 mv log.collapseEdges log.collapseFaces
 
-runParallel collapseEdges $nProc -latestTime -collapseFaceSet indirectPatchFaces
+runParallel collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
 mv log.collapseEdges log.collapseFaceSet
 
-runParallel checkMesh $nProc -latestTime -allTopology -allGeometry
+runParallel checkMesh -latestTime -allTopology -allGeometry
 
 runApplication reconstructParMesh -latestTime
 
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
index c7461dd223..93db043a8f 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
@@ -24,9 +24,6 @@ intersectSurfaces()
 # Set application name
 application=$(getApplication)
 
-# Get number of processors to run on
-nProcs=$(getNumberOfProcessors)
-
 \rm -rf 0
 
 
@@ -88,16 +85,16 @@ runApplication decomposePar -region backgroundMeshDecomposition
 
 runApplication surfaceFeatureExtract
 
-runParallel foamyHexMesh $nProcs
+runParallel foamyHexMesh
 
-runParallel collapseEdges $nProcs -collapseFaces -latestTime
+runParallel collapseEdges -collapseFaces -latestTime
 mv log.collapseEdges log.collapseFaces
 
 #\cp system/collapseDict.indirectPatchFaces system/collapseDict
-#runParallel collapseEdges $nProcs -collapseFaceSet indirectPatchFaces -latestTime
+#runParallel collapseEdges -collapseFaceSet indirectPatchFaces -latestTime
 #mv log.collapseEdges log.collapseFaceSet
 
-runParallel checkMesh $nProcs -allTopology -allGeometry -latestTime
+runParallel checkMesh -allTopology -allGeometry -latestTime
 
 runApplication reconstructParMesh -latestTime
 
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
index ddaf676839..8b331ca9cd 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
@@ -9,9 +9,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Set application name
 application=$(getApplication)
 
-# Get number of processors to run on
-nProcs=$(getNumberOfProcessors)
-
 \rm -rf 0
 
 runApplication createBaffles -overwrite
@@ -31,7 +28,7 @@ runApplication setFields
 runApplication decomposePar -force
 
 # Run
-runParallel $application $nProcs
+runParallel $application
 
 # Reconstruct
 runApplication reconstructPar -noFunctionObjects
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
index b917a3f345..2937f5ae7d 100755
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
@@ -4,14 +4,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get the number of processors to run on from system/decomposeParDict
-nProcs=$(getNumberOfProcessors)
-
 cp system/controlDict.rhoCentralFoam system/controlDict
 cp -r 0.org 0
 
 runApplication decomposePar
-runParallel rhoCentralFoam $nProcs
+runParallel rhoCentralFoam
 runApplication reconstructPar
 
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
index 49c90a1c22..90e7cb6685 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
@@ -34,7 +34,7 @@ refineMeshByCellSet 1 2 3
 #runApplication mapFields ../throttle -sourceTime latestTime
 
 runApplication decomposePar
-runParallel $application 4
+runParallel $application
 runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
index aadf250ea3..12e3b0b662 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
@@ -8,7 +8,7 @@ runApplication blockMesh
 cp -r 0.org 0
 runApplication setFields
 runApplication decomposePar
-runParallel $(getApplication) 4
+runParallel $(getApplication)
 runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun b/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
index a50938a33a..a0a9420e31 100755
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
@@ -39,9 +39,9 @@ runApplication setFields
 
 runApplication decomposePar
 
-runParallel renumberMesh 8 -overwrite
+runParallel renumberMesh -overwrite
 
-runParallel $(getApplication) 8
+runParallel $(getApplication)
 
 runApplication reconstructPar
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun
index 6d80a88bc7..dff104f777 100755
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun
@@ -13,7 +13,7 @@ application=`getApplication`
 runApplication decomposePar -force
 
 # Run
-runParallel $application 6
+runParallel $application
 
 # Reconstruct
 runApplication reconstructPar -noFunctionObjects
diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun
index 45adee60c7..c5b58c1513 100755
--- a/tutorials/multiphase/interFoam/laminar/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/Allrun
@@ -47,7 +47,7 @@ cloneCase damBreak damBreakFine
     cp ../damBreak/0/alpha.water.org 0/alpha.water
     runApplication setFields
     runApplication decomposePar
-    runParallel `getApplication` 4
+    runParallel `getApplication`
     runApplication reconstructPar
 )
 
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
index 2d70aedba0..04439eec04 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@@ -39,7 +39,7 @@ cloneCase damBreak damBreakFine
     runApplication blockMesh
     runApplication setFields
     runApplication decomposePar
-    runParallel `getApplication` 4
+    runParallel `getApplication`
     runApplication reconstructPar
 )
 
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/Allrun b/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
index a50938a33a..a0a9420e31 100755
--- a/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
@@ -39,9 +39,9 @@ runApplication setFields
 
 runApplication decomposePar
 
-runParallel renumberMesh 8 -overwrite
+runParallel renumberMesh -overwrite
 
-runParallel $(getApplication) 8
+runParallel $(getApplication)
 
 runApplication reconstructPar
 
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
index 755e965299..1d24256eb0 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
@@ -8,6 +8,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication decomposePar
 
-runParallel `getApplication` 4
+runParallel `getApplication`
 
 runApplication reconstructPar
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
index 33fca4c7bd..623d0fe4a6 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
@@ -13,7 +13,7 @@ cp -r 0.org 0
 runApplication blockMesh
 runApplication setFields
 runApplication decomposePar
-runParallel $application 4
+runParallel $application
 runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
index 08ba9c1a95..a597dd3cae 100755
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
@@ -14,7 +14,7 @@ runApplication setFields
 
 #runApplication $application
 #runApplication decomposePar
-#runParallel $application 4
+#runParallel $application
 #runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
index 9086d49ad6..757afdd11a 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
@@ -12,7 +12,7 @@ cp -r 0.org 0
 runApplication blockMesh
 runApplication setFields
 runApplication decomposePar
-runParallel $application 4
+runParallel $application
 runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file

From a3815ee24a7d039282dba3cd78729e4c58cc446b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 28 Jan 2016 09:02:25 +0000
Subject: [PATCH 122/447] pisoControl: Corrected handling of final inner (PISO)
 iteration control

---
 .../solutionControl/pisoControl/pisoControl.C |  6 ++--
 .../solutionControl/pisoControl/pisoControl.H | 14 +++++++-
 .../pisoControl/pisoControlI.H                | 36 +++++++++++++++++++
 3 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControlI.H

diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C
index 49c670b010..eaff075899 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,9 @@ namespace Foam
 Foam::pisoControl::pisoControl(fvMesh& mesh, const word& dictName)
 :
     pimpleControl(mesh, dictName)
-{}
+{
+    // mesh_.data::add("finalIteration", true);
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
index 3d412e7406..9b5a85de74 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,9 +72,21 @@ public:
 
     //- Destructor
     virtual ~pisoControl();
+
+
+    // Member Functions
+
+        // Solution control
+
+            //- Return true if in the final inner (PISO) iteration
+            inline bool finalInnerIter() const;
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "pisoControlI.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControlI.H b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControlI.H
new file mode 100644
index 0000000000..d973e5a15a
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControlI.H
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline bool Foam::pisoControl::finalInnerIter() const
+{
+    return
+       corrPISO_ == nCorrPISO_
+    && corrNonOrtho_ == nNonOrthCorr_ + 1;
+}
+
+
+// ************************************************************************* //

From 6644f8343bdfd8e3232217380a2a8cbd43e10e2f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 29 Jan 2016 09:56:59 +0000
Subject: [PATCH 123/447] coordinateSystems/coordinateRotation: Corrected e1,
 e2 and e3 and updated documentation Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1982

---
 .../coordinateRotation/EulerCoordinateRotation.H   | 14 +++++++-------
 .../coordinateRotation/STARCDCoordinateRotation.H  | 14 +++++++-------
 .../coordinateRotation/axesRotation.H              | 14 +++++++-------
 .../coordinateRotation/cylindrical.H               |  8 ++++----
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
index 362c846fe1..0b24b4abc9 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,22 +148,22 @@ public:
             return Rtr_;
         };
 
-        //- Return local Cartesian x-axis
+        //- Return local Cartesian x-axis in global coordinates
         virtual const vector e1() const
         {
-            return R_.x();
+            return Rtr_.x();
         }
 
-        //- Return local Cartesian y-axis
+        //- Return local Cartesian y-axis in global coordinates
         virtual const vector e2() const
         {
-            return R_.y();
+            return Rtr_.y();
         }
 
-        //- Return local Cartesian z-axis
+        //- Return local Cartesian z-axis in global coordinates
         virtual const vector e3() const
         {
-            return R_.z();
+            return Rtr_.z();
         }
 
         //- Return transformation tensor field
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
index 1b73f71ee2..e50de63228 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,22 +144,22 @@ public:
             return Rtr_;
         };
 
-        //- Return local Cartesian x-axis
+        //- Return local Cartesian x-axis in global coordinates
         virtual const vector e1() const
         {
-            return R_.x();
+            return Rtr_.x();
         }
 
-        //- Return local Cartesian y-axis
+        //- Return local Cartesian y-axis in global coordinates
         virtual const vector e2() const
         {
-            return R_.y();
+            return Rtr_.y();
         }
 
-        //- Return local Cartesian z-axis
+        //- Return local Cartesian z-axis in global coordinates
         virtual const vector e3() const
         {
-            return R_.z();
+            return Rtr_.z();
         }
 
         //- Return transformation tensor field
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H
index 937f28c041..1254a474d3 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,22 +150,22 @@ public:
             return Rtr_;
         }
 
-        //- Return local Cartesian x-axis
+        //- Return local Cartesian x-axis in global coordinates
         virtual const vector e1() const
         {
-            return R_.x();
+            return Rtr_.x();
         }
 
-        //- Return local Cartesian y-axis
+        //- Return local Cartesian y-axis in global coordinates
         virtual const vector e2() const
         {
-            return R_.y();
+            return Rtr_.y();
         }
 
-        //- Return local Cartesian z-axis
+        //- Return local Cartesian z-axis in global coordinates
         virtual const vector e3() const
         {
-            return R_.z();
+            return Rtr_.z();
         }
 
         //- Return transformation tensor field
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
index 50e0450b27..8c571ff4ae 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,21 +154,21 @@ public:
              return tensor::zero;
         }
 
-        //- Return local Cartesian x-axis
+        //- Return local Cartesian x-axis in global coordinates
         virtual const vector e1() const
         {
             NotImplemented;
             return vector::zero;
         }
 
-        //- Return local Cartesian y-axis
+        //- Return local Cartesian y-axis in global coordinates
         virtual const vector e2() const
         {
             NotImplemented;
             return vector::zero;
         }
 
-        //- Return local Cartesian z-axis
+        //- Return local Cartesian z-axis in global coordinates
         virtual const vector e3() const
         {
             return e3_;

From 451cc4e620a1f1c41ab0e32710b167c67b18f779 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 30 Jan 2016 11:23:38 +0000
Subject: [PATCH 124/447] fieldAverage: Added periodicRestart option and
 rationalized naming of restart options

    When restarting form a previous calculation, the averaging is continuous or
    may be restarted using the \c restartOnRestart option.

    The averaging process may be restarted after each calculation output time
    using the \c restartOnOutput option or restarted periodically using the \c
    periodicRestart option and setting \c restartPeriod to the required
    averaging period.

    Example of function object specification:
    \verbatim
    fieldAverage1
    {
        type fieldAverage;
        functionObjectLibs ("libfieldFunctionObjects.so");
        ...
        restartOnRestart  false;
        restartOnOutput   false;
        periodicRestart false;
        restartPeriod   0.002;
        fields
        (
            U
            {
                mean            on;
                prime2Mean      on;
                base            time;
                window          10.0;
                windowName      w1;
            }
            p
            {
                mean            on;
                prime2Mean      on;
                base            time;
            }
        );
    }
    \endverbatim

    \heading Function object usage
    \table
        Property        | Description           | Required    | Default value
        type            | type name: fieldAverage | yes |
        restartOnRestart  | Restart the averaging on restart | no | no
        restartOnOutput   | Restart the averaging on output | no | no
        periodicRestart | Periodically restart the averaging | no | no
        restartPeriod   | Periodic restart period | conditional |
        fields          | list of fields and averaging options | yes |
    \endtable
---
 .../fieldAverage/fieldAverage/fieldAverage.C  | 61 +++++++++++++------
 .../fieldAverage/fieldAverage/fieldAverage.H  | 51 ++++++++++------
 .../fieldAverage/fieldAverageTemplates.C      |  6 +-
 .../freeSpacePeriodic/system/controlDict      |  1 -
 .../freeSpaceStream/system/controlDict        |  2 +-
 .../supersonicCorner/system/controlDict       |  1 -
 .../dsmcFoam/wedge15Ma5/system/controlDict    |  1 -
 7 files changed, 79 insertions(+), 44 deletions(-)

diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
index 33dc39b951..f37bee4003 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,6 +104,21 @@ void Foam::fieldAverage::initialize()
 }
 
 
+void Foam::fieldAverage::restart()
+{
+    Info<< "    Restarting averaging at time " << obr_.time().timeName()
+        << nl << endl;
+
+    totalIter_.clear();
+    totalIter_.setSize(faItems_.size(), 1);
+
+    totalTime_.clear();
+    totalTime_.setSize(faItems_.size(), obr_.time().deltaTValue());
+
+    initialize();
+}
+
+
 void Foam::fieldAverage::calcAverages()
 {
     if (!initialised_)
@@ -111,8 +126,8 @@ void Foam::fieldAverage::calcAverages()
         initialize();
     }
 
-    const label currentTimeIndex =
-        static_cast<const fvMesh&>(obr_).time().timeIndex();
+    const label currentTimeIndex = obr_.time().timeIndex();
+    const scalar currentTime = obr_.time().value();
 
     if (prevTimeIndex_ == currentTimeIndex)
     {
@@ -123,6 +138,12 @@ void Foam::fieldAverage::calcAverages()
         prevTimeIndex_ = currentTimeIndex;
     }
 
+    if (periodicRestart_ && currentTime > restartPeriod_*periodIndex_)
+    {
+        restart();
+        periodIndex_++;
+    }
+
     Info<< type() << " " << name_ << " output:" << nl;
 
     Info<< "    Calculating averages" << nl;
@@ -195,7 +216,7 @@ void Foam::fieldAverage::readAveragingProperties()
     totalTime_.clear();
     totalTime_.setSize(faItems_.size(), obr_.time().deltaTValue());
 
-    if (resetOnRestart_ || resetOnOutput_)
+    if (restartOnRestart_ || restartOnOutput_)
     {
         Info<< "    Starting averaging at time " << obr_.time().timeName()
             << nl;
@@ -255,12 +276,15 @@ Foam::fieldAverage::fieldAverage
     obr_(obr),
     active_(true),
     prevTimeIndex_(-1),
-    resetOnRestart_(false),
-    resetOnOutput_(false),
+    restartOnRestart_(false),
+    restartOnOutput_(false),
+    periodicRestart_(false),
+    restartPeriod_(GREAT),
     initialised_(false),
     faItems_(),
     totalIter_(),
-    totalTime_()
+    totalTime_(),
+    periodIndex_(1)
 {
     // Only active if a fvMesh is available
     if (isA<fvMesh>(obr_))
@@ -293,10 +317,16 @@ void Foam::fieldAverage::read(const dictionary& dict)
 
         Info<< type() << " " << name_ << ":" << nl;
 
-        dict.readIfPresent("resetOnRestart", resetOnRestart_);
-        dict.readIfPresent("resetOnOutput", resetOnOutput_);
+        dict.readIfPresent("restartOnRestart", restartOnRestart_);
+        dict.readIfPresent("restartOnOutput", restartOnOutput_);
+        dict.readIfPresent("periodicRestart", periodicRestart_);
         dict.lookup("fields") >> faItems_;
 
+        if (periodicRestart_)
+        {
+            dict.lookup("restartPeriod") >> restartPeriod_;
+        }
+
         readAveragingProperties();
 
         Info<< endl;
@@ -335,18 +365,9 @@ void Foam::fieldAverage::write()
         writeAverages();
         writeAveragingProperties();
 
-        if (resetOnOutput_)
+        if (restartOnOutput_)
         {
-            Info<< "    Restarting averaging at time " << obr_.time().timeName()
-                << nl << endl;
-
-            totalIter_.clear();
-            totalIter_.setSize(faItems_.size(), 1);
-
-            totalTime_.clear();
-            totalTime_.setSize(faItems_.size(), obr_.time().deltaTValue());
-
-            initialize();
+            restart();
         }
 
         Info<< endl;
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index 01b2558010..0b47ee3b06 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,12 +54,13 @@ Description
     time are written on a per-field basis to the
     \c fieldAveragingProperties dictionary, located in \<time\>/uniform
 
-    When restarting form a previous calculation, the averaging is continuous.
-    However, the averaging process can be restarted using the \c resetOnRestart
-    option.
+    When restarting form a previous calculation, the averaging is continuous or
+    may be restarted using the \c restartOnRestart option.
 
-    To restart the averaging process after each calculation output time, use
-    the \c resetOnOutput option.
+    The averaging process may be restarted after each calculation output time
+    using the \c restartOnOutput option or restarted periodically using the \c
+    periodicRestart option and setting \c restartPeriod to the required
+    averaging period.
 
     Example of function object specification:
     \verbatim
@@ -68,8 +69,10 @@ Description
         type fieldAverage;
         functionObjectLibs ("libfieldFunctionObjects.so");
         ...
-        resetOnRestart true;
-        resetOnOutput false;
+        restartOnRestart  true;
+        restartOnOutput   false;
+        periodicRestart false;
+        restartPeriod   0.002;
         fields
         (
             U
@@ -92,11 +95,13 @@ Description
 
     \heading Function object usage
     \table
-        Property     | Description             | Required    | Default value
-        type         | type name: fieldAverage | yes         |
-        resetOnRestart | flag to reset the averaging on restart | yes  |
-        resetOnOutput| flag to reset the averaging on output | yes |
-        fields       | list of fields and averaging options | yes |
+        Property        | Description           | Required    | Default value
+        type            | type name: fieldAverage | yes |
+        restartOnRestart  | Restart the averaging on restart | no | no
+        restartOnOutput   | Restart the averaging on output | no | no
+        periodicRestart | Periodically restart the averaging | no | no
+        restartPeriod   | Periodic restart period | conditional |
+        fields          | list of fields and averaging options | yes |
     \endtable
 
 
@@ -156,11 +161,17 @@ protected:
         //- Time at last call, prevents repeated averaging
         label prevTimeIndex_;
 
-        //- Reset the averaging process on restart flag
-        Switch resetOnRestart_;
+        //- Restart the averaging process on restart
+        Switch restartOnRestart_;
 
-        //- Reset the averaging process on output flag
-        Switch resetOnOutput_;
+        //- Restart the averaging process on output
+        Switch restartOnOutput_;
+
+        //- Periodically restart the averaging process
+        Switch periodicRestart_;
+
+        //- Restart period
+        scalar restartPeriod_;
 
         //- Initialised flag
         bool initialised_;
@@ -177,6 +188,9 @@ protected:
             //- Total time counter
             List<scalar> totalTime_;
 
+            //- Index for periodic restart
+            label periodIndex_;
+
 
     // Private Member Functions
 
@@ -190,6 +204,9 @@ protected:
             //  Check requested field averages are valid, populate field lists
             void initialize();
 
+            //- Restart averaging for restartOnOutput
+            void restart();
+
             //- Add mean average field to database
             template<class Type>
             void addMeanFieldType(const label fieldI);
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
index f4660ec82b..6078b95b72 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ void Foam::fieldAverage::addMeanFieldType(const label fieldI)
                     meanFieldName,
                     obr_.time().timeName(obr_.time().startTime().value()),
                     obr_,
-                    resetOnOutput_
+                    restartOnOutput_
                   ? IOobject::NO_READ
                   : IOobject::READ_IF_PRESENT,
                     IOobject::NO_WRITE
@@ -136,7 +136,7 @@ void Foam::fieldAverage::addPrime2MeanFieldType(const label fieldI)
                     prime2MeanFieldName,
                     obr_.time().timeName(obr_.time().startTime().value()),
                     obr_,
-                    resetOnOutput_
+                    restartOnOutput_
                   ? IOobject::NO_READ
                   : IOobject::READ_IF_PRESENT,
                     IOobject::NO_WRITE
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
index 28634ee885..9023648489 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
@@ -54,7 +54,6 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
-        resetOnOutput   off;
 
         fields
         (
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
index 2f17c188c0..5a086c27b0 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
@@ -54,7 +54,7 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
-        resetOnOutput   off;
+        restartOnOutput   off;
 
         fields
         (
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
index 8045c73096..8f2320499b 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
@@ -54,7 +54,6 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
-        resetOnOutput   off;
 
         fields
         (
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
index 7215ec7182..8fa72c1dde 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
@@ -54,7 +54,6 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
-        resetOnOutput   off;
 
         fields
         (

From 43dbe9ec0ac352b835197a9a30874c21584fc461 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 30 Jan 2016 11:26:31 +0000
Subject: [PATCH 125/447] fieldAverage: Minor update to the documentation

---
 .../field/fieldAverage/fieldAverage/fieldAverage.H        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index 0b47ee3b06..ec8ecbd897 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -69,10 +69,10 @@ Description
         type fieldAverage;
         functionObjectLibs ("libfieldFunctionObjects.so");
         ...
-        restartOnRestart  true;
-        restartOnOutput   false;
-        periodicRestart false;
-        restartPeriod   0.002;
+        restartOnRestart    false;
+        restartOnOutput     false;
+        periodicRestart     false;
+        restartPeriod       0.002;
         fields
         (
             U

From 65f94fbcdbb1dd9a122260c75611ea4bf7acc36c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 1 Feb 2016 10:36:58 +0000
Subject: [PATCH 126/447] patchMeanVelocityForce: Add support for
 processorCyclic patches

    If the mean velocity force is applied to a cyclic patch for parallel
    runs include contributions from processorCyclic patches generated
    from the decomposition of the cyclic patch
---
 .../patchMeanVelocityForce.C                  | 48 +++++++++++++++++--
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C
index 9b1acd02b3..cccc4db367 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,12 +74,52 @@ Foam::scalar Foam::fv::patchMeanVelocityForce::magUbarAve
     const volVectorField& U
 ) const
 {
-    return
-        gSum
+    vector2D sumAmagUsumA
+    (
+        sum
         (
             (flowDir_ & U.boundaryField()[patchi_])
            *mesh_.boundary()[patchi_].magSf()
-        )/gSum(mesh_.boundary()[patchi_].magSf());
+        ),
+        sum(mesh_.boundary()[patchi_].magSf())
+    );
+
+
+    // If the mean velocity force is applied to a cyclic patch
+    // for parallel runs include contributions from processorCyclic patches
+    // generated from the decomposition of the cyclic patch
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    if (Pstream::parRun() && isA<cyclicPolyPatch>(patches[patchi_]))
+    {
+        const keyType processorCyclicPatchNames
+        (
+            string("procBoundary.*to.*through" + patch_)
+        );
+
+        labelList processorCyclicPatches
+        (
+            patches.findIndices(processorCyclicPatchNames)
+        );
+
+        forAll(processorCyclicPatches, pcpi)
+        {
+            const label patchi = processorCyclicPatches[pcpi];
+
+            sumAmagUsumA.x() +=
+                sum
+                (
+                    (flowDir_ & U.boundaryField()[patchi])
+                   *mesh_.boundary()[patchi].magSf()
+                );
+
+            sumAmagUsumA.y() += sum(mesh_.boundary()[patchi].magSf());
+        }
+    }
+
+    mesh_.reduce(sumAmagUsumA, sumOp<vector2D>());
+
+    return sumAmagUsumA.x()/sumAmagUsumA.y();
 }
 
 

From 62eb0e1567607208c89a7fba6ef9602c7a459df7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 2 Feb 2016 18:59:44 +0000
Subject: [PATCH 127/447] thermophysicalModels/specie/transport/logPolynomial:
 Polynomial in ln(T) for transport properties

    ln(mu) = sum_i=1^N(a[i]*ln(T)^(i-1))
    ln(kappa) = sum_i=1^N(b[i]* ln(T)^(i-1))

Based on patch provided by Armin Wehrfritz

Resolves feature-request http://www.openfoam.org/mantisbt/view.php?id=978
---
 .../logPolynomial/logPolynomialTransport.C    | 128 ++++++++
 .../logPolynomial/logPolynomialTransport.H    | 238 +++++++++++++++
 .../logPolynomial/logPolynomialTransportI.H   | 274 ++++++++++++++++++
 3 files changed, 640 insertions(+)
 create mode 100644 src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
 create mode 100644 src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
 create mode 100644 src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H

diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
new file mode 100644
index 0000000000..b1fd1f8216
--- /dev/null
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "logPolynomialTransport.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Thermo, int PolySize>
+Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
+(
+    Istream& is
+)
+:
+    Thermo(is),
+    muCoeffs_("muLogCoeffs<" + Foam::name(PolySize) + '>', is),
+    kappaCoeffs_("kappaLogCoeffs<" + Foam::name(PolySize) + '>', is)
+{
+    muCoeffs_ *= this->W();
+    kappaCoeffs_ *= this->W();
+}
+
+
+template<class Thermo, int PolySize>
+Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
+(
+    const dictionary& dict
+)
+:
+    Thermo(dict),
+    muCoeffs_
+    (
+        dict.subDict("transport").lookup
+        (
+            "muLogCoeffs<" + Foam::name(PolySize) + '>'
+        )
+    ),
+    kappaCoeffs_
+    (
+        dict.subDict("transport").lookup
+        (
+            "kappaLogCoeffs<" + Foam::name(PolySize) + '>'
+        )
+    )
+{
+    muCoeffs_ *= this->W();
+    kappaCoeffs_ *= this->W();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Thermo, int PolySize>
+void Foam::logPolynomialTransport<Thermo, PolySize>::write(Ostream& os) const
+{
+    os  << this->name() << endl;
+    os  << token::BEGIN_BLOCK << incrIndent << nl;
+
+    Thermo::write(os);
+
+    dictionary dict("transport");
+    dict.add
+    (
+        word("muLogCoeffs<" + Foam::name(PolySize) + '>'),
+        muCoeffs_/this->W()
+    );
+    dict.add
+    (
+        word("kappaLogCoeffs<" + Foam::name(PolySize) + '>'),
+        kappaCoeffs_/this->W()
+    );
+    os  << indent << dict.dictName() << dict;
+
+    os  << decrIndent << token::END_BLOCK << nl;
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class Thermo, int PolySize>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const logPolynomialTransport<Thermo, PolySize>& pt
+)
+{
+    os  << static_cast<const Thermo&>(pt) << tab
+        << "muLogCoeffs<" << Foam::name(PolySize) << '>' << tab
+        << pt.muCoeffs_/pt.W() << tab
+        << "kappaLogCoeffs<" << Foam::name(PolySize) << '>' << tab
+        << pt.kappaCoeffs_/pt.W();
+
+    os.check
+    (
+        "Ostream& operator<<"
+        "("
+            "Ostream&, "
+            "const logPolynomialTransport<Thermo, PolySize>&"
+        ")"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
new file mode 100644
index 0000000000..f2a3032c5c
--- /dev/null
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
@@ -0,0 +1,238 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::logPolynomialTransport
+
+Description
+    Transport package using polynomial functions of ln(T) for mu and kappa:
+
+        ln(mu)    = sum_i=1^N( a[i] * ln(T)^(i-1) )
+        ln(kappa) = sum_i=1^N( b[i] * ln(T)^(i-1) )
+
+SourceFiles
+    logPolynomialTransportI.H
+    logPolynomialTransport.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef logPolynomialTransport_H
+#define logPolynomialTransport_H
+
+#include "Polynomial.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+template<class Thermo, int PolySize> class logPolynomialTransport;
+
+template<class Thermo, int PolySize>
+inline logPolynomialTransport<Thermo, PolySize> operator+
+(
+    const logPolynomialTransport<Thermo, PolySize>&,
+    const logPolynomialTransport<Thermo, PolySize>&
+);
+
+template<class Thermo, int PolySize>
+inline logPolynomialTransport<Thermo, PolySize> operator-
+(
+    const logPolynomialTransport<Thermo, PolySize>&,
+    const logPolynomialTransport<Thermo, PolySize>&
+);
+
+template<class Thermo, int PolySize>
+inline logPolynomialTransport<Thermo, PolySize> operator*
+(
+    const scalar,
+    const logPolynomialTransport<Thermo, PolySize>&
+);
+
+template<class Thermo, int PolySize>
+inline logPolynomialTransport<Thermo, PolySize> operator==
+(
+    const logPolynomialTransport<Thermo, PolySize>&,
+    const logPolynomialTransport<Thermo, PolySize>&
+);
+
+template<class Thermo, int PolySize>
+Ostream& operator<<
+(
+    Ostream&,
+    const logPolynomialTransport<Thermo, PolySize>&
+);
+
+
+/*---------------------------------------------------------------------------*\
+                     Class logPolynomialTransport Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Thermo, int PolySize=8>
+class logPolynomialTransport
+:
+    public Thermo
+{
+    // Private data
+
+        //- Dynamic viscosity polynomial coefficients
+        //  Note: input in [Pa.s], but internally uses [Pa.s/kmol]
+        Polynomial<PolySize> muCoeffs_;
+
+        //- Thermal conductivity polynomial coefficients
+        //  Note: input in [W/m/K], but internally uses [W/m/K/kmol]
+        Polynomial<PolySize> kappaCoeffs_;
+
+
+    // Private Member Functions
+
+        //- Construct from components
+        inline logPolynomialTransport
+        (
+            const Thermo& t,
+            const Polynomial<PolySize>& muPoly,
+            const Polynomial<PolySize>& kappaPoly
+        );
+
+
+public:
+
+    // Constructors
+
+        //- Construct copy
+        inline logPolynomialTransport(const logPolynomialTransport&);
+
+        //- Construct as named copy
+        inline logPolynomialTransport
+        (
+            const word&,
+            const logPolynomialTransport&
+        );
+
+        //- Construct from Istream
+        logPolynomialTransport(Istream& is);
+
+        //- Construct from dictionary
+        logPolynomialTransport(const dictionary& dict);
+
+        //- Construct and return a clone
+        inline autoPtr<logPolynomialTransport> clone() const;
+
+        // Selector from Istream
+        inline static autoPtr<logPolynomialTransport> New(Istream& is);
+
+        // Selector from dictionary
+        inline static autoPtr<logPolynomialTransport> New
+        (
+            const dictionary& dict
+        );
+
+
+    // Member functions
+
+        //- Return the instantiated type name
+        static word typeName()
+        {
+            return "logPolynomial<" + Thermo::typeName() + '>';
+        }
+
+        //- Dynamic viscosity [kg/ms]
+        inline scalar mu(const scalar p, const scalar T) const;
+
+        //- Thermal conductivity [W/mK]
+        inline scalar kappa(const scalar p, const scalar T) const;
+
+        //- Thermal diffusivity of enthalpy [kg/ms]
+        inline scalar alphah(const scalar p, const scalar T) const;
+
+        // Species diffusivity
+        //inline scalar D(const scalar p, const scalar T) const;
+
+        //- Write to Ostream
+        void write(Ostream& os) const;
+
+
+    // Member operators
+
+        inline void operator=(const logPolynomialTransport&);
+        inline void operator+=(const logPolynomialTransport&);
+        inline void operator-=(const logPolynomialTransport&);
+        inline void operator*=(const scalar);
+
+
+    // Friend operators
+
+        friend logPolynomialTransport operator+ <Thermo, PolySize>
+        (
+            const logPolynomialTransport&,
+            const logPolynomialTransport&
+        );
+
+        friend logPolynomialTransport operator- <Thermo, PolySize>
+        (
+            const logPolynomialTransport&,
+            const logPolynomialTransport&
+        );
+
+        friend logPolynomialTransport operator* <Thermo, PolySize>
+        (
+            const scalar,
+            const logPolynomialTransport&
+        );
+
+        friend logPolynomialTransport operator== <Thermo, PolySize>
+        (
+            const logPolynomialTransport&,
+            const logPolynomialTransport&
+        );
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<< <Thermo, PolySize>
+        (
+            Ostream&,
+            const logPolynomialTransport&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "logPolynomialTransportI.H"
+
+#ifdef NoRepository
+#   include "logPolynomialTransport.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H
new file mode 100644
index 0000000000..5bfab1a40f
--- /dev/null
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H
@@ -0,0 +1,274 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "specie.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Thermo, int PolySize>
+inline Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
+(
+    const logPolynomialTransport& pt
+)
+:
+    Thermo(pt),
+    muCoeffs_(pt.muCoeffs_),
+    kappaCoeffs_(pt.kappaCoeffs_)
+{}
+
+
+template<class Thermo, int PolySize>
+inline Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
+(
+    const Thermo& t,
+    const Polynomial<PolySize>& muCoeffs,
+    const Polynomial<PolySize>& kappaCoeffs
+)
+:
+    Thermo(t),
+    muCoeffs_(muCoeffs),
+    kappaCoeffs_(kappaCoeffs)
+{}
+
+
+template<class Thermo, int PolySize>
+inline Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
+(
+    const word& name,
+    const logPolynomialTransport& pt
+)
+:
+    Thermo(name, pt),
+    muCoeffs_(pt.muCoeffs_),
+    kappaCoeffs_(pt.kappaCoeffs_)
+{}
+
+
+template<class Thermo, int PolySize>
+inline Foam::autoPtr<Foam::logPolynomialTransport<Thermo, PolySize> >
+Foam::logPolynomialTransport<Thermo, PolySize>::clone() const
+{
+    return autoPtr<logPolynomialTransport<Thermo, PolySize> >
+    (
+        new logPolynomialTransport<Thermo, PolySize>(*this)
+    );
+}
+
+
+template<class Thermo, int PolySize>
+inline Foam::autoPtr<Foam::logPolynomialTransport<Thermo, PolySize> >
+Foam::logPolynomialTransport<Thermo, PolySize>::New(Istream& is)
+{
+    return autoPtr<logPolynomialTransport<Thermo, PolySize> >
+    (
+        new logPolynomialTransport<Thermo, PolySize>(is)
+    );
+}
+
+
+template<class Thermo, int PolySize>
+inline Foam::autoPtr<Foam::logPolynomialTransport<Thermo, PolySize> >
+Foam::logPolynomialTransport<Thermo, PolySize>::New(const dictionary& dict)
+{
+    return autoPtr<logPolynomialTransport<Thermo, PolySize> >
+    (
+        new logPolynomialTransport<Thermo, PolySize>(dict)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Thermo, int PolySize>
+inline Foam::scalar Foam::logPolynomialTransport<Thermo, PolySize>::mu
+(
+    const scalar p,
+    const scalar T
+) const
+{
+    return exp(muCoeffs_.value(log(T))/this->W());
+}
+
+
+template<class Thermo, int PolySize>
+inline Foam::scalar Foam::logPolynomialTransport<Thermo, PolySize>::kappa
+(
+    const scalar p,
+    const scalar T
+) const
+{
+    return exp(kappaCoeffs_.value(log(T))/this->W());
+}
+
+
+template<class Thermo, int PolySize>
+inline Foam::scalar Foam::logPolynomialTransport<Thermo, PolySize>::alphah
+(
+    const scalar p, const scalar T
+) const
+{
+    return kappa(p, T)/this->Cpv(p, T);
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Thermo, int PolySize>
+inline void Foam::logPolynomialTransport<Thermo, PolySize>::operator=
+(
+    const logPolynomialTransport<Thermo, PolySize>& pt
+)
+{
+    Thermo::operator=(pt);
+
+    muCoeffs_ = pt.muCoeffs_;
+    kappaCoeffs_ = pt.kappaCoeffs_;
+}
+
+
+template<class Thermo, int PolySize>
+inline void Foam::logPolynomialTransport<Thermo, PolySize>::operator+=
+(
+    const logPolynomialTransport<Thermo, PolySize>& pt
+)
+{
+    scalar molr1 = this->nMoles();
+
+    Thermo::operator+=(pt);
+
+    molr1 /= this->nMoles();
+    scalar molr2 = pt.nMoles()/this->nMoles();
+
+    muCoeffs_ = molr1*muCoeffs_ + molr2*pt.muCoeffs_;
+    kappaCoeffs_ = molr1*kappaCoeffs_ + molr2*pt.kappaCoeffs_;
+}
+
+
+template<class Thermo, int PolySize>
+inline void Foam::logPolynomialTransport<Thermo, PolySize>::operator-=
+(
+    const logPolynomialTransport<Thermo, PolySize>& pt
+)
+{
+    scalar molr1 = this->nMoles();
+
+    Thermo::operator-=(pt);
+
+    molr1 /= this->nMoles();
+    scalar molr2 = pt.nMoles()/this->nMoles();
+
+    muCoeffs_ = molr1*muCoeffs_ - molr2*pt.muCoeffs_;
+    kappaCoeffs_ = molr1*kappaCoeffs_ - molr2*pt.kappaCoeffs_;
+}
+
+
+template<class Thermo, int PolySize>
+inline void Foam::logPolynomialTransport<Thermo, PolySize>::operator*=
+(
+    const scalar s
+)
+{
+    Thermo::operator*=(s);
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+template<class Thermo, int PolySize>
+inline Foam::logPolynomialTransport<Thermo, PolySize> Foam::operator+
+(
+    const logPolynomialTransport<Thermo, PolySize>& pt1,
+    const logPolynomialTransport<Thermo, PolySize>& pt2
+)
+{
+    Thermo t
+    (
+        static_cast<const Thermo&>(pt1) + static_cast<const Thermo&>(pt2)
+    );
+
+    scalar molr1 = pt1.nMoles()/t.nMoles();
+    scalar molr2 = pt2.nMoles()/t.nMoles();
+
+    return logPolynomialTransport<Thermo, PolySize>
+    (
+        t,
+        molr1*pt1.muCoeffs_ + molr2*pt2.muCoeffs_,
+        molr1*pt1.kappaCoeffs_ + molr2*pt2.kappaCoeffs_
+    );
+}
+
+
+template<class Thermo, int PolySize>
+inline Foam::logPolynomialTransport<Thermo, PolySize> Foam::operator-
+(
+    const logPolynomialTransport<Thermo, PolySize>& pt1,
+    const logPolynomialTransport<Thermo, PolySize>& pt2
+)
+{
+    Thermo t
+    (
+        static_cast<const Thermo&>(pt1) - static_cast<const Thermo&>(pt2)
+    );
+
+    scalar molr1 = pt1.nMoles()/t.nMoles();
+    scalar molr2 = pt2.nMoles()/t.nMoles();
+
+    return logPolynomialTransport<Thermo, PolySize>
+    (
+        t,
+        molr1*pt1.muCoeffs_ - molr2*pt2.muCoeffs_,
+        molr1*pt1.kappaCoeffs_ - molr2*pt2.kappaCoeffs_
+    );
+}
+
+
+template<class Thermo, int PolySize>
+inline Foam::logPolynomialTransport<Thermo, PolySize> Foam::operator*
+(
+    const scalar s,
+    const logPolynomialTransport<Thermo, PolySize>& pt
+)
+{
+    return logPolynomialTransport<Thermo, PolySize>
+    (
+        s*static_cast<const Thermo&>(pt),
+        pt.muCoeffs_,
+        pt.kappaCoeffs_
+    );
+}
+
+
+template<class Thermo, int PolySize>
+inline Foam::logPolynomialTransport<Thermo, PolySize> Foam::operator==
+(
+    const logPolynomialTransport<Thermo, PolySize>& pt1,
+    const logPolynomialTransport<Thermo, PolySize>& pt2
+)
+{
+    return pt2 - pt1;
+}
+
+
+// ************************************************************************* //

From 88d644f5cf24ecbf844faa5faf1247184c26938e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 2 Feb 2016 19:53:04 +0000
Subject: [PATCH 128/447] lagrangian: Move penetration function from
 KinematicCloud to SprayCloud

Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=992
---
 .../Templates/KinematicCloud/KinematicCloud.H |   4 -
 .../KinematicCloud/KinematicCloudI.H          | 136 ------------------
 .../kinematicCloud/kinematicCloud.H           |   8 +-
 .../clouds/Templates/SprayCloud/SprayCloud.H  |   6 +
 .../clouds/Templates/SprayCloud/SprayCloudI.H | 136 ++++++++++++++++++
 5 files changed, 143 insertions(+), 147 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index b25942b5e1..46d12b09bf 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -400,7 +400,6 @@ public:
 
 
             //- Optional particle forces
-//            inline const typename parcelType::forceType& forces() const;
             inline const forceType& forces() const;
 
             //- Return the optional particle forces
@@ -499,9 +498,6 @@ public:
             //- Total rotational kinetic energy in the system
             inline scalar rotationalKineticEnergyOfSystem() const;
 
-            //- Penetration for fraction [0-1] of the current total mass
-            inline scalar penetration(const scalar fraction) const;
-
             //- Mean diameter Dij
             inline scalar Dij(const label i, const label j) const;
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index f386091e27..ced4c77f1f 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -355,142 +355,6 @@ inline Foam::scalar Foam::KinematicCloud<CloudType>::Dmax() const
 }
 
 
-template<class CloudType>
-inline Foam::scalar Foam::KinematicCloud<CloudType>::penetration
-(
-    const scalar fraction
-) const
-{
-    if ((fraction < 0) || (fraction > 1))
-    {
-        FatalErrorInFunction
-            << "fraction should be in the range 0 < fraction < 1"
-            << exit(FatalError);
-    }
-
-    scalar distance = 0.0;
-
-    const label nParcel = this->size();
-    globalIndex globalParcels(nParcel);
-    const label nParcelSum = globalParcels.size();
-
-    if (nParcelSum == 0)
-    {
-        return distance;
-    }
-
-    // lists of parcels mass and distance from initial injection point
-    List<List<scalar>> procMass(Pstream::nProcs());
-    List<List<scalar>> procDist(Pstream::nProcs());
-
-    List<scalar>& mass = procMass[Pstream::myProcNo()];
-    List<scalar>& dist = procDist[Pstream::myProcNo()];
-
-    mass.setSize(nParcel);
-    dist.setSize(nParcel);
-
-    label i = 0;
-    scalar mSum = 0.0;
-    forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
-    {
-        const parcelType& p = iter();
-        scalar m = p.nParticle()*p.mass();
-        scalar d = mag(p.position() - p.position0());
-        mSum += m;
-
-        mass[i] = m;
-        dist[i] = d;
-
-        i++;
-    }
-
-    // calculate total mass across all processors
-    reduce(mSum, sumOp<scalar>());
-    Pstream::gatherList(procMass);
-    Pstream::gatherList(procDist);
-
-    if (Pstream::master())
-    {
-        // flatten the mass lists
-        List<scalar> allMass(nParcelSum, 0.0);
-        SortableList<scalar> allDist(nParcelSum, 0.0);
-        for (label procI = 0; procI < Pstream::nProcs(); procI++)
-        {
-            SubList<scalar>
-            (
-                allMass,
-                globalParcels.localSize(procI),
-                globalParcels.offset(procI)
-            ).assign(procMass[procI]);
-
-            // flatten the distance list
-            SubList<scalar>
-            (
-                allDist,
-                globalParcels.localSize(procI),
-                globalParcels.offset(procI)
-            ).assign(procDist[procI]);
-        }
-
-        // sort allDist distances into ascending order
-        // note: allMass masses are left unsorted
-        allDist.sort();
-
-        if (nParcelSum > 1)
-        {
-            const scalar mLimit = fraction*mSum;
-            const labelList& indices = allDist.indices();
-
-            if (mLimit > (mSum - allMass[indices.last()]))
-            {
-                distance = allDist.last();
-            }
-            else
-            {
-                // assuming that 'fraction' is generally closer to 1 than 0,
-                // loop through in reverse distance order
-                const scalar mThreshold = (1.0 - fraction)*mSum;
-                scalar mCurrent = 0.0;
-                label i0 = 0;
-
-                forAllReverse(indices, i)
-                {
-                    label indI = indices[i];
-
-                    mCurrent += allMass[indI];
-
-                    if (mCurrent > mThreshold)
-                    {
-                        i0 = i;
-                        break;
-                    }
-                }
-
-                if (i0 == indices.size() - 1)
-                {
-                    distance = allDist.last();
-                }
-                else
-                {
-                    // linearly interpolate to determine distance
-                    scalar alpha = (mCurrent - mThreshold)/allMass[indices[i0]];
-                    distance =
-                        allDist[i0] + alpha*(allDist[i0+1] - allDist[i0]);
-                }
-            }
-        }
-        else
-        {
-            distance = allDist.first();
-        }
-    }
-
-    Pstream::scatter(distance);
-
-    return distance;
-}
-
-
 template<class CloudType>
 inline Foam::cachedRandom& Foam::KinematicCloud<CloudType>::rndGen()
 {
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
index 07bcd970b0..b3caba28d2 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,12 +85,6 @@ public:
             //- Total linear kinetic energy in the system
             virtual scalar linearKineticEnergyOfSystem() const = 0;
 
-            //- Total rotational kinetic energy in the system
-//            virtual scalar rotationalKineticEnergyOfSystem() const = 0;
-
-            //- Penetration for percentage of the current total mass
-//            virtual scalar penetration(const scalar& fraction) const = 0;
-
             //- Mean diameter Dij
             virtual scalar Dij(const label i, const label j) const = 0;
 
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
index 68b84d850f..f5f0e887dd 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
@@ -183,6 +183,12 @@ public:
             inline scalar averageParcelMass() const;
 
 
+        // Check
+
+            //- Penetration for fraction [0-1] of the current total mass
+            inline scalar penetration(const scalar fraction) const;
+
+
             // Sub-models
 
                 //- Return const-access to the atomization model
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
index ecabcb71a2..ba5bc78aa7 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
@@ -72,4 +72,140 @@ inline Foam::scalar Foam::SprayCloud<CloudType>::averageParcelMass() const
 }
 
 
+template<class CloudType>
+inline Foam::scalar Foam::SprayCloud<CloudType>::penetration
+(
+    const scalar fraction
+) const
+{
+    if ((fraction < 0) || (fraction > 1))
+    {
+        FatalErrorInFunction
+            << "fraction should be in the range 0 < fraction < 1"
+            << exit(FatalError);
+    }
+
+    scalar distance = 0.0;
+
+    const label nParcel = this->size();
+    globalIndex globalParcels(nParcel);
+    const label nParcelSum = globalParcels.size();
+
+    if (nParcelSum == 0)
+    {
+        return distance;
+    }
+
+    // lists of parcels mass and distance from initial injection point
+    List<List<scalar>> procMass(Pstream::nProcs());
+    List<List<scalar>> procDist(Pstream::nProcs());
+
+    List<scalar>& mass = procMass[Pstream::myProcNo()];
+    List<scalar>& dist = procDist[Pstream::myProcNo()];
+
+    mass.setSize(nParcel);
+    dist.setSize(nParcel);
+
+    label i = 0;
+    scalar mSum = 0.0;
+    forAllConstIter(typename SprayCloud<CloudType>, *this, iter)
+    {
+        const parcelType& p = iter();
+        scalar m = p.nParticle()*p.mass();
+        scalar d = mag(p.position() - p.position0());
+        mSum += m;
+
+        mass[i] = m;
+        dist[i] = d;
+
+        i++;
+    }
+
+    // calculate total mass across all processors
+    reduce(mSum, sumOp<scalar>());
+    Pstream::gatherList(procMass);
+    Pstream::gatherList(procDist);
+
+    if (Pstream::master())
+    {
+        // flatten the mass lists
+        List<scalar> allMass(nParcelSum, 0.0);
+        SortableList<scalar> allDist(nParcelSum, 0.0);
+        for (label procI = 0; procI < Pstream::nProcs(); procI++)
+        {
+            SubList<scalar>
+            (
+                allMass,
+                globalParcels.localSize(procI),
+                globalParcels.offset(procI)
+            ).assign(procMass[procI]);
+
+            // flatten the distance list
+            SubList<scalar>
+            (
+                allDist,
+                globalParcels.localSize(procI),
+                globalParcels.offset(procI)
+            ).assign(procDist[procI]);
+        }
+
+        // sort allDist distances into ascending order
+        // note: allMass masses are left unsorted
+        allDist.sort();
+
+        if (nParcelSum > 1)
+        {
+            const scalar mLimit = fraction*mSum;
+            const labelList& indices = allDist.indices();
+
+            if (mLimit > (mSum - allMass[indices.last()]))
+            {
+                distance = allDist.last();
+            }
+            else
+            {
+                // assuming that 'fraction' is generally closer to 1 than 0,
+                // loop through in reverse distance order
+                const scalar mThreshold = (1.0 - fraction)*mSum;
+                scalar mCurrent = 0.0;
+                label i0 = 0;
+
+                forAllReverse(indices, i)
+                {
+                    label indI = indices[i];
+
+                    mCurrent += allMass[indI];
+
+                    if (mCurrent > mThreshold)
+                    {
+                        i0 = i;
+                        break;
+                    }
+                }
+
+                if (i0 == indices.size() - 1)
+                {
+                    distance = allDist.last();
+                }
+                else
+                {
+                    // linearly interpolate to determine distance
+                    scalar alpha = (mCurrent - mThreshold)/allMass[indices[i0]];
+                    distance =
+                        allDist[i0] + alpha*(allDist[i0+1] - allDist[i0]);
+                }
+            }
+        }
+        else
+        {
+            distance = allDist.first();
+        }
+    }
+
+    Pstream::scatter(distance);
+
+    return distance;
+}
+
+
 // ************************************************************************* //

From 923f39a9f879274e6e26417791769f60bea623a2 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 2 Feb 2016 20:06:08 +0000
Subject: [PATCH 129/447] tutorials/incompressible/nonNewtonianIcoFoam: Added
 pFinal

---
 .../offsetCylinder/system/fvSolution                 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
index 0d3d3d41f3..1c7b310e97 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
@@ -20,7 +20,7 @@ solvers
     p
     {
         solver          GAMG;
-        tolerance       0;
+        tolerance       1e-6;
         relTol          0.1;
         smoother        GaussSeidel;
         nPreSweeps      0;
@@ -31,6 +31,12 @@ solvers
         mergeLevels     1;
     }
 
+    pFinal
+    {
+        $p;
+        relTol          0;
+    }
+
     U
     {
         solver          smoothSolver;
@@ -42,8 +48,8 @@ solvers
 
 PISO
 {
-    nCorrectors     4;
-    nNonOrthogonalCorrectors 2;
+    nCorrectors     5;
+    nNonOrthogonalCorrectors 0;
 }
 
 

From 8b9698ad43de622e14fe7599ff22e610abf36c46 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 2 Feb 2016 20:07:16 +0000
Subject: [PATCH 130/447] processorPolyPatch, processorCyclicPolyPatch:
 Rationalized the construction of the patch name

This change ensures that these patches are named consistently so that
they can be looked-up as required in e.g. patchMeanVelocityForce
---
 .../extrude/extrudeMesh/extrudeMesh.C         | 11 +----
 .../extrudeToRegionMesh/extrudeToRegionMesh.C | 12 ++---
 .../conformalVoronoiMeshCalcDualMesh.C        |  5 +-
 .../conformalVoronoiMeshIO.C                  |  1 -
 .../decomposePar/domainDecomposition.C        | 49 +------------------
 .../reconstructParMesh/reconstructParMesh.C   |  7 +--
 .../constraint/processor/processorPolyPatch.C | 46 ++++++++++++++++-
 .../constraint/processor/processorPolyPatch.H | 30 ++++++++++--
 .../processorCyclicPolyPatch.C                | 32 ++++++++++--
 .../processorCyclicPolyPatch.H                | 21 +++++++-
 .../fvMeshDistribute/fvMeshDistribute.C       | 24 +--------
 .../patchMeanVelocityForce.C                  |  8 +--
 .../autoHexMeshDriver/autoLayerDriver.C       | 14 ++----
 13 files changed, 139 insertions(+), 121 deletions(-)

diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index c7f141a8b7..324e7cbad4 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -540,24 +540,15 @@ int main(int argc, char *argv[])
             {
                 label nbrProcI = patchToNbrProc[patchI];
 
-                word name =
-                        "procBoundary"
-                      + Foam::name(Pstream::myProcNo())
-                      + "to"
-                      + Foam::name(nbrProcI);
-
                 Pout<< "Adding patch " << patchI
-                    << " name:" << name
                     << " between " << Pstream::myProcNo()
                     << " and " << nbrProcI
                     << endl;
 
-
                 newPatches.append
                 (
                     new processorPolyPatch
                     (
-                        name,
                         0,                  // size
                         mesh.nFaces(),      // start
                         patchI,             // index
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index 9d3bed8499..3659dcff38 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -955,13 +955,11 @@ void addCoupledPatches
             }
             else
             {
-                // Rrocessor patch
-
-                word name =
-                    "procBoundary"
-                  + Foam::name(Pstream::myProcNo())
-                  + "to"
-                  + Foam::name(nbrProcI);
+                // Processor patch
+                word name
+                (
+                    processorPolyPatch::newName(Pstream::myProcNo(), nbrProcI)
+                );
 
                 sidePatchID[edgeI] = findPatchID(newPatches, name);
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 22554a57df..c563b18330 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -1631,10 +1631,7 @@ Foam::label Foam::conformalVoronoiMesh::createPatchInfo
             if (procUsed[pUI])
             {
                 patchNames[nNonProcPatches + procAddI] =
-                    "procBoundary"
-                   + name(Pstream::myProcNo())
-                   + "to"
-                   + name(pUI);
+                    processorPolyPatch::newName(Pstream::myProcNo(), pUI);
 
                 patchDicts[nNonProcPatches + procAddI].set
                 (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 714cb2bfe2..bc39ba6af5 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -432,7 +432,6 @@ Foam::autoPtr<Foam::fvMesh> Foam::conformalVoronoiMesh::createDummyMesh
         {
             patches[patchI] = new processorPolyPatch
             (
-                patchNames[patchI],
                 0,          //patchSizes[p],
                 0,          //patchStarts[p],
                 patchI,
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 2293ff0044..90ebfc7d8e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -444,29 +444,12 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
         label nInterProcPatches = 0;
         forAll(curSubPatchIDs, procPatchI)
         {
-            //Info<< "For processor " << procI
-            //    << " have to destination processor "
-            //    << curNeighbourProcessors[procPatchI] << endl;
-            //
-            //forAll(curSubPatchIDs[procPatchI], i)
-            //{
-            //    Info<< "    from patch:" << curSubPatchIDs[procPatchI][i]
-            //        << " starting at:" << curSubStarts[procPatchI][i]
-            //        << endl;
-            //}
-
             nInterProcPatches += curSubPatchIDs[procPatchI].size();
         }
 
-        //Info<< "For processor " << procI
-        //    << " have " << nInterProcPatches
-        //    << " patches to neighbouring processors" << endl;
-
-
         List<polyPatch*> procPatches
         (
-            curPatchSizes.size()
-          + nInterProcPatches,          //curProcessorPatchSizes.size(),
+            curPatchSizes.size() + nInterProcPatches,
             reinterpret_cast<polyPatch*>(0)
         );
 
@@ -517,22 +500,12 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
                   : curProcessorPatchSizes[procPatchI] - subStarts[i]
                 );
 
-//                Info<< "From processor:" << procI << endl
-//                    << "  to processor:" << curNeighbourProcessors[procPatchI]
-//                    << endl
-//                    << "    via patch:" << subPatchID[i] << endl
-//                    << "    start    :" << curStart << endl
-//                    << "    size     :" << size << endl;
-
                 if (subPatchID[i] == -1)
                 {
                     // From internal faces
                     procPatches[nPatches] =
                         new processorPolyPatch
                         (
-                            word("procBoundary") + Foam::name(procI)
-                          + "to"
-                          + Foam::name(curNeighbourProcessors[procPatchI]),
                             size,
                             curStart,
                             nPatches,
@@ -549,24 +522,16 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
                               boundaryMesh()[subPatchID[i]]
                           );
 
-                    // From cyclic
-                    const word& referPatch = pcPatch.name();
-
                     procPatches[nPatches] =
                         new processorCyclicPolyPatch
                         (
-                            word("procBoundary") + Foam::name(procI)
-                          + "to"
-                          + Foam::name(curNeighbourProcessors[procPatchI])
-                          + "through"
-                          + referPatch,
                             size,
                             curStart,
                             nPatches,
                             procMesh.boundaryMesh(),
                             procI,
                             curNeighbourProcessors[procPatchI],
-                            referPatch,
+                            pcPatch.name(),
                             pcPatch.transform()
                         );
                 }
@@ -577,16 +542,6 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             }
         }
 
-
-        //forAll(procPatches, patchI)
-        //{
-        //    Pout<< "    " << patchI
-        //        << '\t' << "name:" << procPatches[patchI]->name()
-        //        << '\t' << "type:" << procPatches[patchI]->type()
-        //        << '\t' << "size:" << procPatches[patchI]->size()
-        //        << endl;
-        //}
-
         // Add boundary patches
         procMesh.addPatches(procPatches);
 
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index dbe38743b2..b2fb6ca133 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -161,12 +161,9 @@ autoPtr<faceCoupleInfo> determineCoupledFaces
 
                 for (label mergedProcI = 0; mergedProcI < procI; mergedProcI++)
                 {
-                    const string fromProcString
+                    const word fromProcString
                     (
-                        "procBoundary"
-                      + name(procI)
-                      + "to"
-                      + name(mergedProcI)
+                        processorPolyPatch::newName(procI, mergedProcI)
                     );
 
                     if (pp.name() == fromProcString)
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 50f3ff9b49..3664ce976f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,6 +69,36 @@ Foam::processorPolyPatch::processorPolyPatch
 {}
 
 
+Foam::processorPolyPatch::processorPolyPatch
+(
+    const label size,
+    const label start,
+    const label index,
+    const polyBoundaryMesh& bm,
+    const int myProcNo,
+    const int neighbProcNo,
+    const transformType transform,
+    const word& patchType
+)
+:
+    coupledPolyPatch
+    (
+        newName(myProcNo, neighbProcNo),
+        size,
+        start,
+        index,
+        bm,
+        patchType,
+        transform
+    ),
+    myProcNo_(myProcNo),
+    neighbProcNo_(neighbProcNo),
+    neighbFaceCentres_(),
+    neighbFaceAreas_(),
+    neighbFaceCellCentres_()
+{}
+
+
 Foam::processorPolyPatch::processorPolyPatch
 (
     const word& name,
@@ -149,6 +179,20 @@ Foam::processorPolyPatch::~processorPolyPatch()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+Foam::word Foam::processorPolyPatch::newName
+(
+    const label myProcNo,
+    const label neighbProcNo
+)
+{
+    return
+        "procBoundary"
+      + Foam::name(myProcNo)
+      + "to"
+      + Foam::name(neighbProcNo);
+}
+
+
 void Foam::processorPolyPatch::initGeometry(PstreamBuffers& pBufs)
 {
     if (Pstream::parRun())
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index dde628df7a..0876c72b5a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,6 +81,23 @@ class processorPolyPatch
 
 protected:
 
+    // Protected constructors
+
+        //- Construct from components with specified name
+        processorPolyPatch
+        (
+            const word& name,
+            const label size,
+            const label start,
+            const label index,
+            const polyBoundaryMesh& bm,
+            const int myProcNo,
+            const int neighbProcNo,
+            const transformType transform = UNKNOWN,  // transformation type
+            const word& patchType = typeName
+        );
+
+
     // Protected Member functions
 
         //- Initialise the calculation of the patch geometry
@@ -126,10 +143,9 @@ public:
 
     // Constructors
 
-        //- Construct from components
+        //- Construct from components with automatically generated standard name
         processorPolyPatch
         (
-            const word& name,
             const label size,
             const label start,
             const label index,
@@ -270,6 +286,14 @@ public:
             return !owner();
         }
 
+        //- Return the name of a processorPolyPatch
+        //  constructed from the processor IDs
+        static word newName
+        (
+            const label myProcNo,
+            const label neighbProcNo
+        );
+
         //- Return processor-neighbbour patch face centres
         const vectorField& neighbFaceCentres() const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
index 8bd031532a..ba62b7bb25 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,6 @@ namespace Foam
 
 Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
 (
-    const word& name,
     const label size,
     const label start,
     const label index,
@@ -55,7 +54,7 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
 :
     processorPolyPatch
     (
-        name,
+        newName(referPatchName, myProcNo, neighbProcNo),
         size,
         start,
         index,
@@ -157,6 +156,33 @@ Foam::processorCyclicPolyPatch::~processorCyclicPolyPatch()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+Foam::word Foam::processorCyclicPolyPatch::newName
+(
+    const word& cyclicPolyPatchName,
+    const label myProcNo,
+    const label neighbProcNo
+)
+{
+    return
+        processorPolyPatch::newName(myProcNo, neighbProcNo)
+      + "through"
+      + cyclicPolyPatchName;
+}
+
+
+Foam::labelList Foam::processorCyclicPolyPatch::patchIDs
+(
+    const word& cyclicPolyPatchName,
+    const polyBoundaryMesh& bm
+)
+{
+    return bm.findIndices
+    (
+        string("procBoundary.*to.*through" + cyclicPolyPatchName)
+    );
+}
+
+
 int Foam::processorCyclicPolyPatch::tag() const
 {
     if (tag_ == -1)
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
index 1f98b30bca..ffbb9445e3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,7 +114,6 @@ public:
         //- Construct from components
         processorCyclicPolyPatch
         (
-            const word& name,
             const label size,
             const label start,
             const label index,
@@ -261,11 +260,29 @@ public:
 
     // Member functions
 
+        //- Return name of originating cyclicPolyPatch patch
         const word& referPatchName() const
         {
             return referPatchName_;
         }
 
+        //- Return the name of a processorCyclicPolyPatch
+        //  constructed from cyclicPolyPatch name and the processor IDs
+        static word newName
+        (
+            const word& cyclicPolyPatchName,
+            const label myProcNo,
+            const label neighbProcNo
+        );
+
+        //- Return the indices of a processorCyclicPolyPatchs
+        //  constructed from the given cyclicPolyPatch
+        static labelList patchIDs
+        (
+            const word& cyclicPolyPatchName,
+            const polyBoundaryMesh& bm
+        );
+
         //- Referring patchID.
         label referPatchID() const
         {
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 3da445b570..e38f3c6d47 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -45,7 +45,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(fvMeshDistribute, 0);
+    defineTypeNameAndDebug(fvMeshDistribute, 0);
 }
 
 
@@ -929,16 +929,8 @@ void Foam::fvMeshDistribute::addProcPatches
                 if (referPatchID[bFaceI] == -1)
                 {
                     // Ordinary processor boundary
-
-                    const word patchName =
-                        "procBoundary"
-                      + name(Pstream::myProcNo())
-                      + "to"
-                      + name(procI);
-
                     processorPolyPatch pp
                     (
-                        patchName,
                         0,              // size
                         mesh_.nFaces(),
                         mesh_.boundaryMesh().size(),
@@ -968,27 +960,15 @@ void Foam::fvMeshDistribute::addProcPatches
                               mesh_.boundaryMesh()[referPatchID[bFaceI]]
                           );
 
-                    // Processor boundary originating from cyclic
-                    const word& cycName = pcPatch.name();
-
-                    const word patchName =
-                        "procBoundary"
-                      + name(Pstream::myProcNo())
-                      + "to"
-                      + name(procI)
-                      + "through"
-                      + cycName;
-
                     processorCyclicPolyPatch pp
                     (
-                        patchName,
                         0,              // size
                         mesh_.nFaces(),
                         mesh_.boundaryMesh().size(),
                         mesh_.boundaryMesh(),
                         Pstream::myProcNo(),
                         nbrProc[bFaceI],
-                        cycName,
+                        pcPatch.name(),
                         pcPatch.transform()
                     );
 
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C
index cccc4db367..a305326fa5 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "patchMeanVelocityForce.H"
+#include "processorCyclicPolyPatch.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
@@ -92,14 +93,9 @@ Foam::scalar Foam::fv::patchMeanVelocityForce::magUbarAve
 
     if (Pstream::parRun() && isA<cyclicPolyPatch>(patches[patchi_]))
     {
-        const keyType processorCyclicPatchNames
-        (
-            string("procBoundary.*to.*through" + patch_)
-        );
-
         labelList processorCyclicPatches
         (
-            patches.findIndices(processorCyclicPatchNames)
+            processorCyclicPolyPatch::patchIDs(patch_, patches)
         );
 
         forAll(processorCyclicPatches, pcpi)
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index 06ffb6c525..597d63fccf 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -1018,11 +1018,10 @@ void Foam::autoLayerDriver::determineSidePatches
         for (label patchI = nOldPatches; patchI < nPatches; patchI++)
         {
             label nbrProcI = patchToNbrProc[patchI];
-            word name =
-                    "procBoundary"
-                  + Foam::name(Pstream::myProcNo())
-                  + "to"
-                  + Foam::name(nbrProcI);
+            word name
+            (
+                processorPolyPatch::newName(Pstream::myProcNo(), nbrProcI)
+            );
 
             dictionary patchDict;
             patchDict.add("type", processorPolyPatch::typeName);
@@ -1031,11 +1030,6 @@ void Foam::autoLayerDriver::determineSidePatches
             patchDict.add("nFaces", 0);
             patchDict.add("startFace", mesh.nFaces());
 
-            //Pout<< "Adding patch " << patchI
-            //    << " name:" << name
-            //    << " between " << Pstream::myProcNo()
-            //    << " and " << nbrProcI << endl;
-
             label procPatchI = meshRefiner_.appendPatch
             (
                 mesh,

From 472fa0674a2476d580322b485062b5a432666244 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 2 Feb 2016 20:09:58 +0000
Subject: [PATCH 131/447] Update headers

---
 .../conformalVoronoiMesh/conformalVoronoiMeshIO.C               | 2 +-
 .../parallelProcessing/reconstructParMesh/reconstructParMesh.C  | 2 +-
 .../autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index bc39ba6af5..0794847574 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index b2fb6ca133..76e64f8fce 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index 597d63fccf..f1727c44b0 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From a55db28a06bc7de4bf9a9f8c57bfc7451e50155a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 2 Feb 2016 20:22:27 +0000
Subject: [PATCH 132/447] rawSurfaceWriter: Added support for compressed output

Patch provided by Armin Wehrfritz
Resolves feature request http://www.openfoam.org/mantisbt/view.php?id=843
---
 .../postProcessing/sampling/sample/sampleDict |  4 ++
 .../writers/raw/rawSurfaceWriter.C            | 47 +++++++++++++++----
 .../writers/raw/rawSurfaceWriter.H            | 12 ++++-
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index 92b1c02e35..593bcf82bc 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -44,6 +44,10 @@ formatOptions
     {
         format  ascii;
     }
+    raw
+    {
+         compression  uncompressed; // 'uncompressed' or 'compressed'
+    }
 }
 
 // interpolationScheme. choice of
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
index 1899b1212a..58f9f90d44 100644
--- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,7 @@ License
 namespace Foam
 {
     makeSurfaceWriterType(rawSurfaceWriter);
+    addToRunTimeSelectionTable(surfaceWriter, rawSurfaceWriter, wordDict);
 }
 
 
@@ -226,14 +227,20 @@ void Foam::rawSurfaceWriter::writeTemplate
         mkDir(outputDir);
     }
 
-    OFstream os(outputDir/fieldName + '_' + surfaceName + ".raw");
+    OFstream os
+    (
+        outputDir/fieldName + '_' + surfaceName + ".raw",
+        IOstream::ASCII,
+        IOstream::currentVersion,
+        writeCompression_
+    );
 
     if (verbose)
     {
         Info<< "Writing field " << fieldName << " to " << os.name() << endl;
     }
 
-    // header
+    // Header
     os  << "# " << fieldName;
     if (isNodeValues)
     {
@@ -244,10 +251,10 @@ void Foam::rawSurfaceWriter::writeTemplate
         os  << "  FACE_DATA ";
     }
 
-    // header
+    // Header
     writeHeader(os, fieldName, values);
 
-    // values
+    // Values
     if (isNodeValues)
     {
         forAll(values, elemI)
@@ -272,10 +279,24 @@ void Foam::rawSurfaceWriter::writeTemplate
 
 Foam::rawSurfaceWriter::rawSurfaceWriter()
 :
-    surfaceWriter()
+    surfaceWriter(),
+    writeCompression_(IOstream::UNCOMPRESSED)
 {}
 
 
+Foam::rawSurfaceWriter::rawSurfaceWriter(const dictionary& options)
+:
+    surfaceWriter(),
+    writeCompression_(IOstream::UNCOMPRESSED)
+{
+    if (options.found("compression"))
+    {
+        writeCompression_ =
+            IOstream::compressionEnum(options.lookup("compression"));
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::rawSurfaceWriter::~rawSurfaceWriter()
@@ -298,7 +319,13 @@ void Foam::rawSurfaceWriter::write
         mkDir(outputDir);
     }
 
-    OFstream os(outputDir/surfaceName + ".raw");
+    OFstream os
+    (
+        outputDir/surfaceName + ".raw",
+        IOstream::ASCII,
+        IOstream::currentVersion,
+        writeCompression_
+    );
 
     if (verbose)
     {
@@ -306,7 +333,7 @@ void Foam::rawSurfaceWriter::write
     }
 
 
-    // header
+    // Header
     os  << "# geometry NO_DATA " << faces.size() << nl
         << "#  x  y  z" << nl;
 
@@ -321,7 +348,9 @@ void Foam::rawSurfaceWriter::write
 }
 
 
-// create write methods
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Create write methods
 defineSurfaceWriterWriteFields(Foam::rawSurfaceWriter);
 
 
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
index 6a3b3c2ee2..3d0d061557 100644
--- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,6 +51,12 @@ class rawSurfaceWriter
 :
     public surfaceWriter
 {
+    // Private data
+
+        //- Output compression, defaults to uncompressed
+        IOstream::compressionType writeCompression_;
+
+
     // Private Member Functions
 
         static inline void writeLocation
@@ -106,6 +112,9 @@ public:
         //- Construct null
         rawSurfaceWriter();
 
+        //- Construct with some output options
+        rawSurfaceWriter(const dictionary& options);
+
 
     //- Destructor
     virtual ~rawSurfaceWriter();
@@ -193,7 +202,6 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const;
-
 };
 
 

From a5c829c91b3daa2b5eb3084bf30f976701886300 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 3 Feb 2016 16:28:00 +0000
Subject: [PATCH 133/447] doxygenXmlParser: pre-construct and compile constant
 regular expressions and pre-construct constant strings and names

Speeds-up parsing of DTAGS so that lookup of a name takes ~1s

Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=982
---
 .../doxygenXmlParser/doxygenXmlParser.C       | 72 +++++++++++--------
 1 file changed, 41 insertions(+), 31 deletions(-)

diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C
index b3cc2da3e6..7381f094ff 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,6 @@ License
 #include "doxygenXmlParser.H"
 #include "wordRe.H"
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::doxygenXmlParser::doxygenXmlParser
@@ -39,20 +38,32 @@ Foam::doxygenXmlParser::doxygenXmlParser
 :
     dictionary(dictionary::null)
 {
+    // Pre-construct and compile regular expressions
+    const wordRe nameRe(".*.H", wordRe::DETECT);
+    const wordRe searchStrRe(searchStr, wordRe::DETECT);
+
+    // Pre-construct constant strings and names to speed-up comparisons
+    const string slashStartTag('/' + startTag);
+    const string kindFileStr("kind=\"file\"");
+    const word compoundWord("compound");
+    const word nameWord("name");
+    const word pathWord("path");
+    const word filenameWord("filename");
+
     IFstream is(fName);
 
-    char c;
-
-    // skip forward to entry name
+    // Skip forward to entry name
     skipForward(is, startTag);
 
+    char c;
+
     while (is.get(c))
     {
         if (c == '<')
         {
-            // if in block, read block name
-            string blockName = "";
-            string params = "";
+            // If in block, read block name
+            string blockName;
+            string params;
             bool readingParam = false;
             while (is.get(c)  && c != '>')
             {
@@ -73,17 +84,17 @@ Foam::doxygenXmlParser::doxygenXmlParser
                 }
             }
 
-            if (blockName == '/' + startTag)
+            if (blockName == slashStartTag)
             {
                 break;
             }
 
-            if ((blockName == "compound") && (params == "kind=\"file\""))
+            if ((blockName == compoundWord) && (params == kindFileStr))
             {
-                // keep entry
-                word name = "";
-                fileName path = "";
-                word fName = "";
+                // Keep entry
+                word name;
+                fileName path;
+                word fName;
                 bool foundName = false;
                 bool foundPath = false;
                 bool foundFName = false;
@@ -92,35 +103,35 @@ Foam::doxygenXmlParser::doxygenXmlParser
                 {
                     word entryName;
                     getEntry<word>(is, entryName);
-                    if (entryName == "name")
+                    if (entryName == nameWord)
                     {
                         getValue<word>(is, name);
-                        if (wordRe(".*.H", wordRe::DETECT).match(name))
+                        if (nameRe.match(name))
                         {
                             foundName = true;
                         }
                         else
                         {
-                            // not interested in this compound
+                            // Not interested in this compound
                             break;
                         }
                     }
-                    else if (entryName == "path")
+                    else if (entryName == pathWord)
                     {
                         getValue<fileName>(is, path);
 
-                        // filter path on regExp
-                        if (wordRe(searchStr, wordRe::DETECT).match(path))
+                        // Filter path on regExp
+                        if (searchStrRe.match(path))
                         {
                             foundPath = true;
                         }
                         else
                         {
-                            // not interested in this compound
+                            // Not interested in this compound
                             break;
                         }
                     }
-                    else if (entryName == "filename")
+                    else if (entryName == filenameWord)
                     {
                         getValue<word>(is, fName);
                         foundFName = true;
@@ -135,7 +146,7 @@ Foam::doxygenXmlParser::doxygenXmlParser
                 {
                     word tName(path.components().last());
 
-                    // only insert if type is not already known
+                    // Only insert if type is not already known
                     // NOTE: not ideal for cases where there are multiple types
                     //    but contained within different namespaces
                     //    preferentially take exact match if it exists
@@ -162,7 +173,7 @@ Foam::doxygenXmlParser::doxygenXmlParser
                     }
                 }
 
-                // skip remanining entries
+                // Skip remanining entries
                 skipBlock(is, blockName);
             }
             else
@@ -182,17 +193,17 @@ void Foam::doxygenXmlParser::skipBlock
     const word& blockName
 ) const
 {
-    // recurse to move forward in 'is' until come across </blockName>
-    string closeName = "";
+    // Recurse to move forward in 'is' until come across </blockName>
+    string closeName;
 
     char c;
     while (is.good() && (closeName != blockName))
     {
-        // fast-forward until we reach a '<'
+        // Fast-forward until we reach a '<'
         while (is.get(c) && c  != '<')
         {}
 
-        // check to see if this is a closing block
+        // Check to see if this is a closing block
         if (is.get(c) && c  == '/')
         {
             closeName = "";
@@ -212,7 +223,7 @@ void Foam::doxygenXmlParser::skipForward
     const word& blockName
 ) const
 {
-    // recurse to move forward in 'is' until come across <blockName>
+    // Recurse to move forward in 'is' until come across <blockName>
     string entryName = "";
     char c;
 
@@ -220,7 +231,7 @@ void Foam::doxygenXmlParser::skipForward
     {
         entryName = "";
 
-        // fast-forward until we reach a '<'
+        // Fast-forward until we reach a '<'
         while (is.get(c) && c != '<')
         {}
 
@@ -233,4 +244,3 @@ void Foam::doxygenXmlParser::skipForward
 
 
 // ************************************************************************* //
-

From 9ab6aa9e97240ac9eaae8c605ce58612f69e0f96 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 3 Feb 2016 20:50:35 +0000
Subject: [PATCH 134/447] fieldAverage: Name the field averaging properties
 file "<functionObject name>Properties" rather than the fixed name
 "fieldAveragingProperties" to allow for the same field to be averaged more
 than once.

Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1336
---
 .../field/fieldAverage/fieldAverage/fieldAverage.C            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
index f37bee4003..9ec9ee60fa 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
@@ -186,7 +186,7 @@ void Foam::fieldAverage::writeAveragingProperties() const
     (
         IOobject
         (
-            "fieldAveragingProperties",
+            name() + "Properties",
             obr_.time().timeName(),
             "uniform",
             obr_,
@@ -225,7 +225,7 @@ void Foam::fieldAverage::readAveragingProperties()
     {
         IOobject propsDictHeader
         (
-            "fieldAveragingProperties",
+            name() + "Properties",
             obr_.time().timeName(obr_.time().startTime().value()),
             "uniform",
             obr_,

From aca5a68dc40c50a93c3da1b901e8aa60803ca77d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 3 Feb 2016 20:56:27 +0000
Subject: [PATCH 135/447] fieldAverage: Updated documentation

---
 .../field/fieldAverage/fieldAverage/fieldAverage.H              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index ec8ecbd897..7729163977 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -52,7 +52,7 @@ Description
 
     Information regarding the number of averaging steps, and total averaging
     time are written on a per-field basis to the
-    \c fieldAveragingProperties dictionary, located in \<time\>/uniform
+    \c "<functionObject name>Properties" dictionary, located in \<time\>/uniform
 
     When restarting form a previous calculation, the averaging is continuous or
     may be restarted using the \c restartOnRestart option.

From 34d289095254c809ae418f7cbc3ee5a3e14ad0c2 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 3 Feb 2016 21:24:38 +0000
Subject: [PATCH 136/447] foamyHexMeshBackgroundMesh: Updated to compile

---
 .../foamyHexMeshBackgroundMesh.C                     | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
index 68460e22e8..6b2f44a6d6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2012-2015 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2012-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -467,7 +467,7 @@ int main(int argc, char *argv[])
 
         // Determine the number of cells in each direction.
         const vector span = bb.span();
-        vector nScalarCells = span/cellShapeControls().defaultCellSize();
+        vector nScalarCells = span/cellShapeControls.defaultCellSize();
 
         // Calculate initial cell size to be a little bit smaller than the
         // defaultCellSize to avoid initial refinement triggering.
@@ -576,15 +576,9 @@ int main(int argc, char *argv[])
 
     backgroundMeshDecomposition backgroundMesh
     (
-        1.0,    //spanScale,ratio of poly cell size v.s. hex cell size
-        0.0,    //minCellSizeLimit
-        0,      //minLevels
-        4,      //volRes, check multiple points per cell
-        20.0,   //maxCellWeightCoeff
         runTime,
-        geometryToConformTo,
-        cellShapeControls(),
         rndGen,
+        geometryToConformTo,
         foamyHexMeshDict
     );
 

From e457b3cd1b550868faee24a21e14e3b5ff98d5bb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 4 Feb 2016 17:28:18 +0000
Subject: [PATCH 137/447] DataEntry: Do not instantiate DataEntry<label> for
 DataEntry types which interpolate

    // Polynomial functions and interpolation do evaluate to label
    // Instead evaluate a scalar and convert to label as appropriate
    // makeDataEntryType(PolynomialEntry, label);
    // makeDataEntryType(CSV, label);
    // makeDataEntryType(Table, label);
    // makeDataEntryType(TableFile, label);

Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1987
---
 .../functions/DataEntry/Table/TableBase.H           |  1 -
 .../functions/DataEntry/makeDataEntries.C           | 13 ++++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
index c924c8c892..de931ad28e 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
@@ -112,7 +112,6 @@ protected:
 
     // Protected Member Functions
 
-
         //- Return (demand driven) interpolator
         const interpolationWeights& interpolator() const;
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
index 0289025c0d..37fc55416a 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,10 +43,13 @@ namespace Foam
     makeDataEntry(label);
     makeDataEntryType(CompatibilityConstant, label);
     makeDataEntryType(Constant, label);
-    //makeDataEntryType(PolynomialEntry, label);
-    makeDataEntryType(CSV, label);
-    makeDataEntryType(Table, label);
-    makeDataEntryType(TableFile, label);
+
+    // Polynomial functions and interpolation do evaluate to label
+    // Instead evaluate a scalar and convert to label as appropriate
+    // makeDataEntryType(PolynomialEntry, label);
+    // makeDataEntryType(CSV, label);
+    // makeDataEntryType(Table, label);
+    // makeDataEntryType(TableFile, label);
 
     makeDataEntry(scalar);
     makeDataEntryType(CompatibilityConstant, scalar);

From 59ebf74e831c65be10a4c2f4e1761ad2a6d6cc6b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 4 Feb 2016 20:23:22 +0000
Subject: [PATCH 138/447] TurbulenceModels: Reorder stress component evaluation
 This ensures the U boundary conditions are updated before the explicit parts
 of the stress are evaluated.

Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1988
---
 .../ReynoldsStress/ReynoldsStress.C           | 28 +++++++++----------
 .../linearViscousStress/linearViscousStress.C |  6 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
index 55001003da..0893bea4a6 100644
--- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
+++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -238,43 +238,43 @@ Foam::ReynoldsStress<BasicTurbulenceModel>::divDevRhoReff
     {
         return
         (
-            fvc::div
+            fvc::laplacian
+            (
+                (1.0 - couplingFactor_)*this->alpha_*this->rho_*this->nut(),
+                U,
+                "laplacian(nuEff,U)"
+            )
+          + fvc::div
             (
                 this->alpha_*this->rho_*R_
               + couplingFactor_
                *this->alpha_*this->rho_*this->nut()*fvc::grad(U),
                 "div(devRhoReff)"
             )
-          + fvc::laplacian
-            (
-                (1.0 - couplingFactor_)*this->alpha_*this->rho_*this->nut(),
-                U,
-                "laplacian(nuEff,U)"
-            )
-          - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
           - fvc::div(this->alpha_*this->rho_*this->nu()*dev2(T(fvc::grad(U))))
+          - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
         );
     }
     else
     {
         return
         (
-            fvc::div(this->alpha_*this->rho_*R_)
-          + fvc::laplacian
+            fvc::laplacian
             (
                 this->alpha_*this->rho_*this->nut(),
                 U,
                 "laplacian(nuEff,U)"
             )
-          - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
+          + fvc::div(this->alpha_*this->rho_*R_)
           - fvc::div(this->alpha_*this->rho_*this->nu()*dev2(T(fvc::grad(U))))
+          - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
         );
     }
 
     return
     (
-      - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
       - fvc::div((this->alpha_*this->rho_*this->nuEff())*dev2(T(fvc::grad(U))))
+      - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
     );
 }
 
@@ -289,8 +289,8 @@ Foam::ReynoldsStress<BasicTurbulenceModel>::divDevRhoReff
 {
     return
     (
-      - fvm::laplacian(this->alpha_*rho*this->nuEff(), U)
       - fvc::div((this->alpha_*rho*this->nuEff())*dev2(T(fvc::grad(U))))
+      - fvm::laplacian(this->alpha_*rho*this->nuEff(), U)
     );
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C
index 1ac59915cf..d5e61def56 100644
--- a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C
+++ b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,8 +97,8 @@ Foam::linearViscousStress<BasicTurbulenceModel>::divDevRhoReff
 {
     return
     (
-      - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
       - fvc::div((this->alpha_*this->rho_*this->nuEff())*dev2(T(fvc::grad(U))))
+      - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
     );
 }
 
@@ -113,8 +113,8 @@ Foam::linearViscousStress<BasicTurbulenceModel>::divDevRhoReff
 {
     return
     (
-      - fvm::laplacian(this->alpha_*rho*this->nuEff(), U)
       - fvc::div((this->alpha_*rho*this->nuEff())*dev2(T(fvc::grad(U))))
+      - fvm::laplacian(this->alpha_*rho*this->nuEff(), U)
     );
 }
 

From 48428e7cf851b3cf0f1691174f879bdbdf91445e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 6 Feb 2016 19:34:43 +0000
Subject: [PATCH 139/447] DataEntry: Rationalized IO to ensure consistency
 between read and write

Removed inconsistent binary output.
Removed unused and IO-inconsistent functions.
Simplified the handling of backward-compatible constant value:
    Removed the unnecessary CompatibilityConstant,
    Updated Constant and DataEntryNew to handle constant value construction.
---
 .../functions/DataEntry/CSV/CSVIO.C           |  23 +--
 .../CompatibilityConstant.C                   | 123 --------------
 .../CompatibilityConstant.H                   | 157 ------------------
 .../CompatibilityConstantIO.C                 |  69 --------
 .../functions/DataEntry/Constant/Constant.C   |  51 ++----
 .../functions/DataEntry/Constant/Constant.H   |  30 ++--
 .../functions/DataEntry/Constant/ConstantIO.C |  18 +-
 .../functions/DataEntry/DataEntry/DataEntry.C |  73 --------
 .../functions/DataEntry/DataEntry/DataEntry.H |  41 +----
 .../DataEntry/DataEntry/DataEntryNew.C        |  22 +--
 .../PolynomialEntry/PolynomialEntry.C         |  43 +----
 .../PolynomialEntry/PolynomialEntry.H         |  24 +--
 .../PolynomialEntry/PolynomialEntryIO.C       |  18 +-
 .../functions/DataEntry/Table/Table.C         |  10 +-
 .../functions/DataEntry/Table/TableBase.C     |  27 +--
 .../functions/DataEntry/Table/TableBase.H     |  14 --
 .../functions/DataEntry/Table/TableBaseIO.C   |  16 +-
 .../functions/DataEntry/TableFile/TableFile.C |   8 +-
 .../functions/DataEntry/TableFile/TableFile.H |   1 -
 .../functions/DataEntry/makeDataEntries.C     |   8 -
 20 files changed, 60 insertions(+), 716 deletions(-)
 delete mode 100644 src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.C
 delete mode 100644 src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H
 delete mode 100644 src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstantIO.C

diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C
index 72a120f4ce..098a7649b1 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,20 +34,13 @@ Foam::Ostream& Foam::operator<<
     const CSV<Type>& tbl
 )
 {
-    if (os.format() == IOstream::ASCII)
-    {
-        os  << static_cast<const DataEntry<Type>& >(tbl)
-            << token::SPACE << tbl.nHeaderLine_
-            << token::SPACE << tbl.timeColumn_
-            << token::SPACE << tbl.componentColumns_
-            << token::SPACE << tbl.separator_
-            << token::SPACE << tbl.mergeSeparators_
-            << token::SPACE << tbl.fileName_;
-    }
-    else
-    {
-        os  << static_cast<const DataEntry<Type>& >(tbl);
-    }
+    os  << static_cast<const DataEntry<Type>& >(tbl)
+        << token::SPACE << tbl.nHeaderLine_
+        << token::SPACE << tbl.timeColumn_
+        << token::SPACE << tbl.componentColumns_
+        << token::SPACE << tbl.separator_
+        << token::SPACE << tbl.mergeSeparators_
+        << token::SPACE << tbl.fileName_;
 
     // Check state of Ostream
     os.check("Ostream& operator<<(Ostream&, const CSV<Type>&)");
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.C b/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.C
deleted file mode 100644
index 953328f031..0000000000
--- a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.C
+++ /dev/null
@@ -1,123 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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 "CompatibilityConstant.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::CompatibilityConstant<Type>::CompatibilityConstant
-(
-    const word& entryName,
-    const dictionary& dict
-)
-:
-    DataEntry<Type>(entryName),
-    value_(pTraits<Type>::zero),
-    dimensions_(dimless)
-{
-    Istream& is(dict.lookup(entryName));
-
-    token firstToken(is);
-    if (firstToken.isWord())
-    {
-        token nextToken(is);
-        if (nextToken == token::BEGIN_SQR)
-        {
-            is.putBack(nextToken);
-            is >> dimensions_;
-            is >> value_;
-        }
-    }
-    else
-    {
-        is.putBack(firstToken);
-        is  >> value_;
-    }
-}
-
-
-template<class Type>
-Foam::CompatibilityConstant<Type>::CompatibilityConstant
-(
-    const CompatibilityConstant<Type>& cnst
-)
-:
-    DataEntry<Type>(cnst),
-    value_(cnst.value_),
-    dimensions_(cnst.dimensions_)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::CompatibilityConstant<Type>::~CompatibilityConstant()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-Type Foam::CompatibilityConstant<Type>::value(const scalar x) const
-{
-    return value_;
-}
-
-
-template<class Type>
-Type Foam::CompatibilityConstant<Type>::integrate
-(
-    const scalar x1,
-    const scalar x2
-) const
-{
-    return (x2 - x1)*value_;
-}
-
-
-template<class Type>
-Foam::dimensioned<Type> Foam::CompatibilityConstant<Type>::
-dimValue(const scalar x) const
-{
-    return dimensioned<Type>("dimensionedValue", dimensions_, value_);
-}
-
-
-template<class Type>
-Foam::dimensioned<Type> Foam::CompatibilityConstant<Type>::dimIntegrate
-(
-    const scalar x1, const scalar x2
-) const
-{
-    return dimensioned<Type>("dimensionedValue", dimensions_, (x2-x1)*value_);
-}
-
-// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
-
-#include "CompatibilityConstantIO.C"
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H b/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H
deleted file mode 100644
index 682a3a562e..0000000000
--- a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H
+++ /dev/null
@@ -1,157 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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::CompatibilityConstant
-
-Description
-    Templated basic entry that holds a constant value for backwards
-    compatibility (when DataEntry type is not present)
-
-    Usage - for entry \<entryName\> having the value <value>:
-    \verbatim
-        <entryName>    <value>
-    \endverbatim
-
-SourceFiles
-    CompatibilityConstant.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef CompatibilityConstant_H
-#define CompatibilityConstant_H
-
-#include "DataEntry.H"
-#include "dimensionSet.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-template<class Type>
-class CompatibilityConstant;
-
-template<class Type>
-Ostream& operator<<(Ostream&, const CompatibilityConstant<Type>&);
-
-/*---------------------------------------------------------------------------*\
-                   Class CompatibilityConstant Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class CompatibilityConstant
-:
-    public DataEntry<Type>
-{
-    // Private data
-
-        //- Constant value
-        Type value_;
-
-        //- The dimension set
-        dimensionSet dimensions_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const CompatibilityConstant<Type>&);
-
-
-public:
-
-    // Runtime type information
-    TypeName("CompatibilityConstant");
-
-
-    // Constructors
-
-        //- Construct from entry name and Istream
-        CompatibilityConstant(const word& entryName, const dictionary& dict);
-
-        //- Copy constructor
-        CompatibilityConstant(const CompatibilityConstant<Type>& cnst);
-
-        //- Construct and return a clone
-        virtual tmp<DataEntry<Type>> clone() const
-        {
-            return tmp<DataEntry<Type>>
-            (
-                new CompatibilityConstant<Type>(*this)
-            );
-        }
-
-
-    //- Destructor
-    virtual ~CompatibilityConstant();
-
-
-    // Member Functions
-
-        //- Return constant value
-        Type value(const scalar) const;
-
-        //- Integrate between two values
-        Type integrate(const scalar x1, const scalar x2) const;
-
-        //- Return dimensioned constant value
-        dimensioned<Type> dimValue(const scalar) const;
-
-        //- Integrate between two values and return dimensioned type
-        dimensioned<Type> dimIntegrate
-        (
-            const scalar x1,
-            const scalar x2
-        ) const;
-
-
-    // I/O
-
-        //- Ostream Operator
-        friend Ostream& operator<< <Type>
-        (
-            Ostream& os,
-            const CompatibilityConstant<Type>& cnst
-        );
-
-        //- Write in dictionary format
-        virtual void writeData(Ostream& os) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "CompatibilityConstant.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstantIO.C b/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstantIO.C
deleted file mode 100644
index 4cb72ab8c2..0000000000
--- a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstantIO.C
+++ /dev/null
@@ -1,69 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "DataEntry.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const CompatibilityConstant<Type>& cnst
-)
-{
-    if (os.format() == IOstream::ASCII)
-    {
-        os  << static_cast<const DataEntry<Type>& >(cnst)
-            << token::SPACE << cnst.value_;
-    }
-    else
-    {
-        os  << static_cast<const DataEntry<Type>& >(cnst);
-        os.write
-        (
-            reinterpret_cast<const char*>(&cnst.value_),
-            sizeof(cnst.value_)
-        );
-    }
-
-    // Check state of Ostream
-    os.check
-    (
-        "Ostream& operator<<(Ostream&, const CompatibilityConstant<Type>&)"
-    );
-
-    return os;
-}
-
-
-template<class Type>
-void Foam::CompatibilityConstant<Type>::writeData(Ostream& os) const
-{
-    os.writeKeyword(this->name_) << value_ << token::END_STATEMENT << nl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
index e4f60195a8..8fea8cfe14 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,36 +31,27 @@ template<class Type>
 Foam::Constant<Type>::Constant(const word& entryName, const dictionary& dict)
 :
     DataEntry<Type>(entryName),
-    value_(pTraits<Type>::zero),
-    dimensions_(dimless)
+    value_(pTraits<Type>::zero)
 {
     Istream& is(dict.lookup(entryName));
     word entryType(is);
-    token firstToken(is);
-    if (firstToken.isWord())
-    {
-        token nextToken(is);
-        if (nextToken == token::BEGIN_SQR)
-        {
-            is.putBack(nextToken);
-            is >> dimensions_;
-            is >> value_;
-        }
-    }
-    else
-    {
-        is.putBack(firstToken);
-        is  >> value_;
-    }
+    is  >> value_;
 }
 
 
+template<class Type>
+Foam::Constant<Type>::Constant(const word& entryName, Istream& is)
+:
+    DataEntry<Type>(entryName),
+    value_(pTraits<Type>(is))
+{}
+
+
 template<class Type>
 Foam::Constant<Type>::Constant(const Constant<Type>& cnst)
 :
     DataEntry<Type>(cnst),
-    value_(cnst.value_),
-    dimensions_(cnst.dimensions_)
+    value_(cnst.value_)
 {}
 
 
@@ -87,26 +78,8 @@ Type Foam::Constant<Type>::integrate(const scalar x1, const scalar x2) const
 }
 
 
-template<class Type>
-Foam::dimensioned<Type> Foam::Constant<Type>::dimValue(const scalar x) const
-{
-    return dimensioned<Type>("dimensionedValue", dimensions_, value_);
-}
-
-
-template<class Type>
-Foam::dimensioned<Type> Foam::Constant<Type>::dimIntegrate
-(
-    const scalar x1, const scalar x2
-) const
-{
-    return dimensioned<Type>("dimensionedValue", dimensions_, (x2-x1)*value_);
-}
-
-
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
 #include "ConstantIO.C"
 
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
index c59da3becd..76bb4706ef 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
@@ -41,18 +41,15 @@ SourceFiles
 #define Constant_H
 
 #include "DataEntry.H"
-#include "dimensionSet.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-template<class Type>
-class Constant;
-
-template<class Type>
-Ostream& operator<<(Ostream&, const Constant<Type>&);
+// Forward declaration of friend functions and operators
+template<class Type> class Constant;
+template<class Type> Ostream& operator<<(Ostream&, const Constant<Type>&);
 
 /*---------------------------------------------------------------------------*\
                            Class Constant Declaration
@@ -68,9 +65,6 @@ class Constant
         //- Constant value
         Type value_;
 
-        //- The dimension set
-        dimensionSet dimensions_;
-
 
     // Private Member Functions
 
@@ -86,9 +80,14 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and Istream
+        //- Construct from entry name and dictionary
         Constant(const word& entryName, const dictionary& dict);
 
+        //- Construct from entry name and Istream
+        //  Reads the constant value without the DataEntry type
+        //  for backward compatibility
+        Constant(const word& entryName, Istream& is);
+
         //- Copy constructor
         Constant(const Constant<Type>& cnst);
 
@@ -111,16 +110,6 @@ public:
         //- Integrate between two values
         Type integrate(const scalar x1, const scalar x2) const;
 
-        //- Return dimensioned constant value
-        dimensioned<Type> dimValue(const scalar) const;
-
-        //- Integrate between two values and return dimensioned type
-        dimensioned<Type> dimIntegrate
-        (
-            const scalar x1,
-            const scalar x2
-        ) const;
-
 
     // I/O
 
@@ -144,6 +133,7 @@ public:
 
 #ifdef NoRepository
 #   include "Constant.C"
+#   include "DataEntryNew.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C
index c25e9b9f4c..fd9186343f 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,20 +34,8 @@ Foam::Ostream& Foam::operator<<
     const Constant<Type>& cnst
 )
 {
-    if (os.format() == IOstream::ASCII)
-    {
-        os  << static_cast<const DataEntry<Type>& >(cnst)
-            << token::SPACE << cnst.value_;
-    }
-    else
-    {
-        os  << static_cast<const DataEntry<Type>& >(cnst);
-        os.write
-        (
-            reinterpret_cast<const char*>(&cnst.value_),
-            sizeof(cnst.value_)
-        );
-    }
+    os  << static_cast<const DataEntry<Type>& >(cnst)
+        << token::SPACE << cnst.value_;
 
     // Check state of Ostream
     os.check
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
index 3a4fb3aabf..ab14e40800 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
@@ -120,79 +120,6 @@ Foam::tmp<Foam::Field<Type>> Foam::DataEntry<Type>::integrate
 }
 
 
-
-template<class Type>
-Foam::dimensioned<Type> Foam::DataEntry<Type>::dimValue(const scalar x) const
-{
-    NotImplemented;
-
-    return dimensioned<Type>("zero", dimless, pTraits<Type>::zero);
-}
-
-
-template<class Type>
-Foam::dimensioned<Type> Foam::DataEntry<Type>::dimIntegrate
-(
-    const scalar x1,
-    const scalar x2
-) const
-{
-    NotImplemented;
-
-    return dimensioned<Type>("zero", dimless, pTraits<Type>::zero);
-}
-
-
-template<class Type>
-Foam::tmp<Foam::Field<Foam::dimensioned<Type>>>
-Foam::DataEntry<Type>::dimValue
-(
-    const scalarField& x
-) const
-{
-
-    tmp<Field<dimensioned<Type>>> tfld
-    (
-        new Field<dimensioned<Type>>
-        (
-            x.size(),
-            dimensioned<Type>("zero", dimless, pTraits<Type>::zero)
-        )
-    );
-
-    Field<dimensioned<Type>>& fld = tfld();
-
-    forAll(x, i)
-    {
-        fld[i] = this->dimValue(x[i]);
-    }
-    return tfld;
-}
-
-
-template<class Type>
-Foam::tmp<Foam::Field<Foam::dimensioned<Type>>>
-Foam::DataEntry<Type>::dimIntegrate
-(
-    const scalarField& x1,
-    const scalarField& x2
-) const
-{
-    tmp<Field<dimensioned<Type>>> tfld
-    (
-        new Field<dimensioned<Type>>(x1.size())
-    );
-
-    Field<dimensioned<Type>>& fld = tfld();
-
-    forAll(x1, i)
-    {
-        fld[i] = this->dimIntegrate(x1[i], x2[i]);
-    }
-    return tfld;
-}
-
-
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
 #include "DataEntryIO.C"
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
index 4422d50f06..d95bfa17e0 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
@@ -41,23 +41,18 @@ SourceFiles
 
 #include "dictionary.H"
 #include "Field.H"
-#include "dimensionedType.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+
+// Forward declarations
 class Time;
 
-template<class Type>
-class DataEntry;
-
-template<class Type>
-Ostream& operator<<
-(
-    Ostream&,
-    const DataEntry<Type>&
-);
+// Forward declaration of friend functions and operators
+template<class Type> class DataEntry;
+template<class Type> Ostream& operator<<(Ostream&, const DataEntry<Type>&);
 
 /*---------------------------------------------------------------------------*\
                          Class DataEntry Declaration
@@ -160,30 +155,6 @@ public:
                 const scalarField& x2
             ) const;
 
-            //- Return dimensioned type
-            virtual dimensioned<Type> dimValue(const scalar x) const;
-
-            //- Return dimensioned type as a function of (scalar)
-            virtual tmp<Field<dimensioned<Type>>> dimValue
-            (
-                const scalarField& x
-            ) const;
-
-            //- Integrate between two scalars and return a dimensioned type
-            virtual dimensioned<Type> dimIntegrate
-            (
-                const scalar x1,
-                const scalar x2
-            ) const;
-
-            //- Integrate between two scalar fields and return a field of
-            //  dimensioned type
-            virtual tmp<Field<dimensioned<Type>>> dimIntegrate
-            (
-                const scalarField& x1,
-                const scalarField& x2
-            ) const;
-
 
         // I/O
 
@@ -228,7 +199,7 @@ public:
 
 #ifdef NoRepository
 #   include "DataEntry.C"
-#   include "DataEntryNew.C"
+#   include "Constant.H"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
index 6a0269e0ed..ee17d0ff02 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DataEntry.H"
+#include "Constant.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -37,24 +37,16 @@ Foam::autoPtr<Foam::DataEntry<Type>> Foam::DataEntry<Type>::New
     Istream& is(dict.lookup(entryName, false));
 
     token firstToken(is);
-
     word DataEntryType;
-    if (firstToken.isWord())
+
+    if (!firstToken.isWord())
     {
-        // Dimensioned type default compatibility
-        if (firstToken.wordToken() == entryName)
-        {
-            DataEntryType = "CompatibilityConstant";
-        }
-        else
-        {
-            DataEntryType = firstToken.wordToken();
-        }
+        is.putBack(firstToken);
+        return autoPtr<DataEntry<Type>>(new Constant<Type>(entryName, is));
     }
     else
     {
-        // DataEntryType = CompatibilityConstant<Type>::typeName;
-        DataEntryType = "CompatibilityConstant";
+        DataEntryType = firstToken.wordToken();
     }
 
     typename dictionaryConstructorTable::iterator cstrIter =
@@ -71,7 +63,7 @@ Foam::autoPtr<Foam::DataEntry<Type>> Foam::DataEntry<Type>::New
             << exit(FatalError);
     }
 
-    return autoPtr<DataEntry<Type>>(cstrIter()(entryName, dict));
+    return cstrIter()(entryName, dict);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
index f5d312f7df..c7f30964d5 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
@@ -36,19 +36,11 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
 :
     DataEntry<Type>(entryName),
     coeffs_(),
-    canIntegrate_(true),
-    dimensions_(dimless)
+    canIntegrate_(true)
 {
     Istream& is(dict.lookup(entryName));
     word entryType(is);
 
-    token firstToken(is);
-    is.putBack(firstToken);
-    if (firstToken == token::BEGIN_SQR)
-    {
-        is  >> this->dimensions_;
-    }
-
     is  >> coeffs_;
 
     if (!coeffs_.size())
@@ -88,8 +80,7 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
 :
     DataEntry<Type>(entryName),
     coeffs_(coeffs),
-    canIntegrate_(true),
-    dimensions_(dimless)
+    canIntegrate_(true)
 {
     if (!coeffs_.size())
     {
@@ -124,8 +115,7 @@ Foam::PolynomialEntry<Type>::PolynomialEntry(const PolynomialEntry& poly)
 :
     DataEntry<Type>(poly),
     coeffs_(poly.coeffs_),
-    canIntegrate_(poly.canIntegrate_),
-    dimensions_(poly.dimensions_)
+    canIntegrate_(poly.canIntegrate_)
 {}
 
 
@@ -208,35 +198,8 @@ Type Foam::PolynomialEntry<Type>::integrate
 }
 
 
-template<class Type>
-Foam::dimensioned<Type> Foam::PolynomialEntry<Type>::dimValue
-(
-    const scalar x
-) const
-{
-    return dimensioned<Type>("dimensionedValue", dimensions_, value(x));
-}
-
-
-template<class Type>
-Foam::dimensioned<Type> Foam::PolynomialEntry<Type>::dimIntegrate
-(
-    const scalar x1,
-    const scalar x2
-) const
-{
-    return dimensioned<Type>
-    (
-        "dimensionedValue",
-        dimensions_,
-        integrate(x1, x2)
-    );
-}
-
-
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
 #include "PolynomialEntryIO.C"
 
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
index 5bb2411546..a2d46fa9ac 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
@@ -30,7 +30,7 @@ Description
     e.g. for an entry \<entryName\> that describes y = x^2 + 2x^3
 
     \verbatim
-        <entryName>  polynomial  [0 0 1 0 0] // optional dimensions
+        <entryName>  polynomial
         (
             (1    2)
             (2    3)
@@ -47,7 +47,6 @@ SourceFiles
 
 #include "DataEntry.H"
 #include "Tuple2.H"
-#include "dimensionSet.H"
 #include "DataEntryFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,12 +54,8 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
-
-template<class Type>
-class PolynomialEntry;
-
-// Forward declaration of friend functions
+// Forward declaration of friend functions and operators
+template<class Type> class PolynomialEntry;
 template<class Type>
 Ostream& operator<<(Ostream&, const PolynomialEntry<Type>&);
 
@@ -81,9 +76,6 @@ class PolynomialEntry
         //- Flag to indicate whether poly can be integrated
         bool canIntegrate_;
 
-        //- The dimension set
-        dimensionSet dimensions_;
-
 
     // Private Member Functions
 
@@ -138,16 +130,6 @@ public:
             //- Integrate between two (scalar) values
             Type integrate(const scalar x1, const scalar x2) const;
 
-            //- Return dimensioned constant value
-            dimensioned<Type> dimValue(const scalar) const;
-
-            //- Integrate between two values and return dimensioned type
-            dimensioned<Type> dimIntegrate
-            (
-                const scalar x1,
-                const scalar x2
-            ) const;
-
 
     // I/O
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntryIO.C b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntryIO.C
index af6dacdb48..0a52a10962 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntryIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntryIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,20 +34,8 @@ Foam::Ostream& Foam::operator<<
     const PolynomialEntry<Type>& poly
 )
 {
-    if (os.format() == IOstream::ASCII)
-    {
-        os  << static_cast<const DataEntry<Type>& >(poly)
-            << token::SPACE << poly.coeffs_;
-    }
-    else
-    {
-        os  << static_cast<const DataEntry<Type>& >(poly);
-        os.write
-        (
-            reinterpret_cast<const char*>(&poly.coeffs_),
-            sizeof(poly.coeffs_)
-        );
-    }
+    os  << static_cast<const DataEntry<Type>& >(poly)
+        << token::SPACE << poly.coeffs_;
 
     // Check state of Ostream
     os.check
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
index 1e1e0af54e..9d0213fa3e 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,15 +34,7 @@ Foam::Table<Type>::Table(const word& entryName, const dictionary& dict)
 {
     Istream& is(dict.lookup(entryName));
     word entryType(is);
-
-    token firstToken(is);
-    is.putBack(firstToken);
-    if (firstToken == token::BEGIN_SQR)
-    {
-        is >> this->dimensions_;
-    }
     is  >> this->table_;
-
     TableBase<Type>::check();
 }
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
index e807adad97..1d29170ae6 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
@@ -70,8 +70,7 @@ Foam::TableBase<Type>::TableBase(const word& name, const dictionary& dict)
     (
         dict.lookupOrDefault<word>("interpolationScheme", "linear")
     ),
-    table_(),
-    dimensions_(dimless)
+    table_()
 {}
 
 
@@ -83,7 +82,6 @@ Foam::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
     boundsHandling_(tbl.boundsHandling_),
     interpolationScheme_(tbl.interpolationScheme_),
     table_(tbl.table_),
-    dimensions_(tbl.dimensions_),
     tableSamplesPtr_(tbl.tableSamplesPtr_),
     interpolatorPtr_(tbl.interpolatorPtr_)
 {}
@@ -369,29 +367,6 @@ Type Foam::TableBase<Type>::integrate(const scalar x1, const scalar x2) const
 }
 
 
-template<class Type>
-Foam::dimensioned<Type> Foam::TableBase<Type>::
-dimValue(const scalar x) const
-{
-    return dimensioned<Type>("dimensionedValue", dimensions_, this->value(x));
-}
-
-
-template<class Type>
-Foam::dimensioned<Type> Foam::TableBase<Type>::dimIntegrate
-(
-    const scalar x1, const scalar x2
-) const
-{
-    return dimensioned<Type>
-    (
-        "dimensionedValue",
-        dimensions_,
-        this->integrate(x2, x1)
-    );
-}
-
-
 template<class Type>
 Foam::tmp<Foam::scalarField> Foam::TableBase<Type>::x() const
 {
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
index de931ad28e..8d127663d5 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
@@ -37,7 +37,6 @@ SourceFiles
 
 #include "DataEntry.H"
 #include "Tuple2.H"
-#include "dimensionSet.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -95,9 +94,6 @@ protected:
         //- Table data
         List<Tuple2<scalar, Type>> table_;
 
-        //- The dimension set
-        dimensionSet dimensions_;
-
         //- Extracted values
         mutable autoPtr<scalarField> tableSamplesPtr_;
 
@@ -163,16 +159,6 @@ public:
         //- Integrate between two (scalar) values
         virtual Type integrate(const scalar x1, const scalar x2) const;
 
-        //- Return dimensioned constant value
-        virtual dimensioned<Type> dimValue(const scalar x) const;
-
-        //- Integrate between two values and return dimensioned type
-        virtual dimensioned<Type> dimIntegrate
-        (
-            const scalar x1,
-            const scalar x2
-        ) const;
-
         //- Return the reference values
         virtual tmp<scalarField> x() const;
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
index d4f608b8ab..79c4e46819 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,19 +35,7 @@ Foam::Ostream& Foam::operator<<
 )
 {
     os  << static_cast<const DataEntry<Type>&>(tbl);
-
-    if (os.format() == IOstream::ASCII)
-    {
-         os << token::SPACE << tbl.table_;
-    }
-    else
-    {
-        os.write
-        (
-            reinterpret_cast<const char*>(&tbl.table_),
-            tbl.table_.byteSize()
-        );
-    }
+    os << token::SPACE << tbl.table_;
 
     // Check state of Ostream
     os.check
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
index 25ed90dc68..37b89e0757 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,11 +36,6 @@ Foam::TableFile<Type>::TableFile(const word& entryName, const dictionary& dict)
     const dictionary coeffs(dict.subDict(entryName + "Coeffs"));
     coeffs.lookup("fileName") >> fName_;
 
-    if (coeffs.found("dimensions"))
-    {
-        coeffs.lookup("dimensions") >> this->dimensions_;
-    }
-
     fileName expandedFile(fName_);
     IFstream is(expandedFile.expand());
 
@@ -77,5 +72,4 @@ Foam::TableFile<Type>::~TableFile()
 
 #include "TableFileIO.C"
 
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
index 6f519773f1..5d3bb32a6c 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
@@ -31,7 +31,6 @@ Description
         <entryName> tableFile;
         <entryName>Coeffs
         {
-            dimensions          [0 0 1 0 0]; // optional dimensions
             fileName            dataFile;    // name of data file
             outOfBounds         clamp;       // optional out-of-bounds handling
             interpolationScheme linear;      // optional interpolation method
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
index 37fc55416a..0ebd9b398e 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
@@ -23,11 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "CompatibilityConstant.H"
 #include "Constant.H"
 #include "PolynomialEntry.H"
 #include "CSV.H"
-#include "DataEntry.H"
 #include "Table.H"
 #include "TableFile.H"
 
@@ -41,7 +39,6 @@ License
 namespace Foam
 {
     makeDataEntry(label);
-    makeDataEntryType(CompatibilityConstant, label);
     makeDataEntryType(Constant, label);
 
     // Polynomial functions and interpolation do evaluate to label
@@ -52,7 +49,6 @@ namespace Foam
     // makeDataEntryType(TableFile, label);
 
     makeDataEntry(scalar);
-    makeDataEntryType(CompatibilityConstant, scalar);
     makeDataEntryType(Constant, scalar);
     makeDataEntryType(PolynomialEntry, scalar);
     makeDataEntryType(CSV, scalar);
@@ -60,7 +56,6 @@ namespace Foam
     makeDataEntryType(TableFile, scalar);
 
     makeDataEntry(vector);
-    makeDataEntryType(CompatibilityConstant, vector);
     makeDataEntryType(Constant, vector);
     makeDataEntryType(PolynomialEntry, vector);
     makeDataEntryType(CSV, vector);
@@ -68,7 +63,6 @@ namespace Foam
     makeDataEntryType(TableFile, vector);
 
     makeDataEntry(sphericalTensor);
-    makeDataEntryType(CompatibilityConstant, sphericalTensor);
     makeDataEntryType(Constant, sphericalTensor);
     makeDataEntryType(PolynomialEntry, sphericalTensor);
     makeDataEntryType(CSV, sphericalTensor);
@@ -76,7 +70,6 @@ namespace Foam
     makeDataEntryType(TableFile, sphericalTensor);
 
     makeDataEntry(symmTensor);
-    makeDataEntryType(CompatibilityConstant, symmTensor);
     makeDataEntryType(Constant, symmTensor);
     makeDataEntryType(PolynomialEntry, symmTensor);
     makeDataEntryType(CSV, symmTensor);
@@ -84,7 +77,6 @@ namespace Foam
     makeDataEntryType(TableFile, symmTensor);
 
     makeDataEntry(tensor);
-    makeDataEntryType(CompatibilityConstant, tensor);
     makeDataEntryType(Constant, tensor);
     makeDataEntryType(PolynomialEntry, tensor);
     makeDataEntryType(CSV, tensor);

From e9a2848232c3db0341824e49ab192435ca568991 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 7 Feb 2016 10:25:05 +0000
Subject: [PATCH 140/447] etc/config/paraview.*: Added ParaView-5.0.0

---
 etc/config/paraview.csh | 3 ++-
 etc/config/paraview.sh  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh
index 21a16fbbea..f89ff0ed33 100644
--- a/etc/config/paraview.csh
+++ b/etc/config/paraview.csh
@@ -25,7 +25,7 @@
 #     config/paraview.csh
 #
 # Description
-#     Setup file for paraview-[3-4].x
+#     Setup file for paraview-[3-5].x
 #     Sourced from OpenFOAM-<VERSION>/etc/cshrc or from foamPV alias
 #
 # Note
@@ -54,6 +54,7 @@ end
 #setenv ParaView_VERSION 4.1.0
 #setenv ParaView_VERSION 4.3.1
 setenv ParaView_VERSION 4.4.0
+#setenv ParaView_VERSION 5.0.0
 setenv ParaView_MAJOR detect
 
 
diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh
index 3baaf61e23..7ac247b174 100644
--- a/etc/config/paraview.sh
+++ b/etc/config/paraview.sh
@@ -25,7 +25,7 @@
 #     config/paraview.sh
 #
 # Description
-#     Setup file for paraview-[3-4].x
+#     Setup file for paraview-[3-5].x
 #     Sourced from OpenFOAM-<VERSION>/etc/bashrc or from foamPV alias
 #
 # Note
@@ -56,6 +56,7 @@ done
 #export ParaView_VERSION=4.1.0
 #export ParaView_VERSION=4.3.1
 export ParaView_VERSION=4.4.0
+#export ParaView_VERSION=5.0.0
 export ParaView_MAJOR=detect
 
 

From d1387a8563693f761cf341f64c027be8a6142196 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 7 Feb 2016 13:32:38 +0000
Subject: [PATCH 141/447] DataEntry: Created the DataEntryTypes namespace for
 all the concrete DataEntry types to avoid name conflicts with these primitive
 names in the OpenFOAM namespace

---
 .../utilities/postProcessing/noise/noise.C    |   2 +-
 .../primitives/functions/DataEntry/CSV/CSV.C  | 104 +++++++++---------
 .../primitives/functions/DataEntry/CSV/CSV.H  |  24 ++--
 .../functions/DataEntry/CSV/CSVIO.C           |   4 +-
 .../functions/DataEntry/Constant/Constant.C   |  24 +++-
 .../functions/DataEntry/Constant/Constant.H   |  13 ++-
 .../functions/DataEntry/Constant/ConstantIO.C |   4 +-
 .../functions/DataEntry/DataEntry/DataEntry.H |   4 +-
 .../DataEntry/DataEntry/DataEntryNew.C        |   5 +-
 .../PolynomialEntry/PolynomialEntry.C         |  22 ++--
 .../PolynomialEntry/PolynomialEntry.H         |  34 +++---
 .../PolynomialEntry/PolynomialEntryIO.C       |   6 +-
 .../functions/DataEntry/Table/Table.C         |  10 +-
 .../functions/DataEntry/Table/Table.H         |  17 +--
 .../functions/DataEntry/Table/TableBase.C     |  43 +++++---
 .../functions/DataEntry/Table/TableBase.H     |  23 ++--
 .../functions/DataEntry/Table/TableBaseIO.C   |   6 +-
 .../functions/DataEntry/TableFile/TableFile.C |  10 +-
 .../functions/DataEntry/TableFile/TableFile.H |  17 +--
 .../DataEntry/TableFile/TableFileIO.C         |   4 +-
 .../functions/DataEntry/makeDataEntries.C     |  12 +-
 .../derived/fan/fanFvPatchFields.C            |   2 +-
 22 files changed, 231 insertions(+), 159 deletions(-)

diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C
index 4f4cb599ff..ae4749951e 100644
--- a/applications/utilities/postProcessing/noise/noise.C
+++ b/applications/utilities/postProcessing/noise/noise.C
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
     #include "createFields.H"
 
     Info<< "Reading data file" << endl;
-    CSV<scalar> pData("pressure", dict, "Data");
+    DataEntryTypes::CSV<scalar> pData("pressure", dict, "Data");
 
     // time history data
     const scalarField t(pData.x());
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
index 7da4aad80d..a126e05dac 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
@@ -29,63 +29,67 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-namespace Foam
+template<>
+Foam::label Foam::DataEntryTypes::CSV<Foam::label>::readValue
+(
+    const List<string>& splitted
+)
 {
-    template<>
-    label CSV<label>::readValue(const List<string>& splitted)
+    if (componentColumns_[0] >= splitted.size())
     {
-        if (componentColumns_[0] >= splitted.size())
-        {
-            FatalErrorInFunction
-                << "No column " << componentColumns_[0] << " in "
-                << splitted << endl
-                << exit(FatalError);
-        }
-
-        return readLabel(IStringStream(splitted[componentColumns_[0]])());
+        FatalErrorInFunction
+            << "No column " << componentColumns_[0] << " in "
+            << splitted << endl
+            << exit(FatalError);
     }
 
-    template<>
-    scalar CSV<scalar>::readValue(const List<string>& splitted)
-    {
-        if (componentColumns_[0] >= splitted.size())
-        {
-            FatalErrorInFunction
-                << "No column " << componentColumns_[0] << " in "
-                << splitted << endl
-                << exit(FatalError);
-        }
+    return readLabel(IStringStream(splitted[componentColumns_[0]])());
+}
 
-        return readScalar(IStringStream(splitted[componentColumns_[0]])());
+
+template<>
+Foam::scalar Foam::DataEntryTypes::CSV<Foam::scalar>::readValue
+(
+    const List<string>& splitted
+)
+{
+    if (componentColumns_[0] >= splitted.size())
+    {
+        FatalErrorInFunction
+            << "No column " << componentColumns_[0] << " in "
+            << splitted << endl
+            << exit(FatalError);
     }
 
-
-    template<class Type>
-    Type CSV<Type>::readValue(const List<string>& splitted)
-    {
-        Type result;
-
-        for (label i = 0; i < pTraits<Type>::nComponents; i++)
-        {
-            if (componentColumns_[i] >= splitted.size())
-            {
-                FatalErrorInFunction
-                    << "No column " << componentColumns_[i] << " in "
-                    << splitted << endl
-                    << exit(FatalError);
-            }
-
-            result[i] =
-                readScalar(IStringStream(splitted[componentColumns_[i]])());
-        }
-
-        return result;
-    }
+    return readScalar(IStringStream(splitted[componentColumns_[0]])());
 }
 
 
 template<class Type>
-void Foam::CSV<Type>::read()
+Type Foam::DataEntryTypes::CSV<Type>::readValue(const List<string>& splitted)
+{
+    Type result;
+
+    for (label i = 0; i < pTraits<Type>::nComponents; i++)
+    {
+        if (componentColumns_[i] >= splitted.size())
+        {
+            FatalErrorInFunction
+            << "No column " << componentColumns_[i] << " in "
+                << splitted << endl
+                << exit(FatalError);
+        }
+
+        result[i] =
+        readScalar(IStringStream(splitted[componentColumns_[i]])());
+    }
+
+    return result;
+}
+
+
+template<class Type>
+void Foam::DataEntryTypes::CSV<Type>::read()
 {
     fileName expandedFile(fName_);
     IFstream is(expandedFile.expand());
@@ -196,7 +200,7 @@ void Foam::CSV<Type>::read()
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::CSV<Type>::CSV
+Foam::DataEntryTypes::CSV<Type>::CSV
 (
     const word& entryName,
     const dictionary& dict,
@@ -227,7 +231,7 @@ Foam::CSV<Type>::CSV
 
 
 template<class Type>
-Foam::CSV<Type>::CSV(const CSV<Type>& tbl)
+Foam::DataEntryTypes::CSV<Type>::CSV(const CSV<Type>& tbl)
 :
     TableBase<Type>(tbl),
     nHeaderLine_(tbl.nHeaderLine_),
@@ -242,14 +246,14 @@ Foam::CSV<Type>::CSV(const CSV<Type>& tbl)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::CSV<Type>::~CSV()
+Foam::DataEntryTypes::CSV<Type>::~CSV()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-const Foam::fileName& Foam::CSV<Type>::fName() const
+const Foam::fileName& Foam::DataEntryTypes::CSV<Type>::fName() const
 {
     return fName_;
 }
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
index 13566168bd..4fa669ce68 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
@@ -62,15 +62,17 @@ SourceFiles
 namespace Foam
 {
 
-template<class Type>
-class CSV;
+// Forward declaration of friend functions and operators
+namespace DataEntryTypes
+{
+    template<class Type> class CSV;
+};
 
 template<class Type>
-Ostream& operator<<
-(
-    Ostream&,
-    const CSV<Type>&
-);
+Ostream& operator<<(Ostream&, const DataEntryTypes::CSV<Type>&);
+
+namespace DataEntryTypes
+{
 
 /*---------------------------------------------------------------------------*\
                            Class CSV Declaration
@@ -169,8 +171,16 @@ public:
 };
 
 
+template<>
+label CSV<label>::readValue(const List<string>& splitted);
+
+template<>
+Foam::scalar CSV<scalar>::readValue(const List<string>& splitted);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace DataEntryTypes
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C
index 098a7649b1..286072ec54 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C
@@ -31,7 +31,7 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const CSV<Type>& tbl
+    const DataEntryTypes::CSV<Type>& tbl
 )
 {
     os  << static_cast<const DataEntry<Type>& >(tbl)
@@ -50,7 +50,7 @@ Foam::Ostream& Foam::operator<<
 
 
 template<class Type>
-void Foam::CSV<Type>::writeData(Ostream& os) const
+void Foam::DataEntryTypes::CSV<Type>::writeData(Ostream& os) const
 {
     DataEntry<Type>::writeData(os);
     os  << token::END_STATEMENT << nl;
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
index 8fea8cfe14..8a9758d4ca 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
@@ -28,7 +28,11 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Constant<Type>::Constant(const word& entryName, const dictionary& dict)
+Foam::DataEntryTypes::Constant<Type>::Constant
+(
+    const word& entryName,
+    const dictionary& dict
+)
 :
     DataEntry<Type>(entryName),
     value_(pTraits<Type>::zero)
@@ -40,7 +44,11 @@ Foam::Constant<Type>::Constant(const word& entryName, const dictionary& dict)
 
 
 template<class Type>
-Foam::Constant<Type>::Constant(const word& entryName, Istream& is)
+Foam::DataEntryTypes::Constant<Type>::Constant
+(
+    const word& entryName,
+    Istream& is
+)
 :
     DataEntry<Type>(entryName),
     value_(pTraits<Type>(is))
@@ -48,7 +56,7 @@ Foam::Constant<Type>::Constant(const word& entryName, Istream& is)
 
 
 template<class Type>
-Foam::Constant<Type>::Constant(const Constant<Type>& cnst)
+Foam::DataEntryTypes::Constant<Type>::Constant(const Constant<Type>& cnst)
 :
     DataEntry<Type>(cnst),
     value_(cnst.value_)
@@ -58,21 +66,25 @@ Foam::Constant<Type>::Constant(const Constant<Type>& cnst)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Constant<Type>::~Constant()
+Foam::DataEntryTypes::Constant<Type>::~Constant()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Type Foam::Constant<Type>::value(const scalar x) const
+Type Foam::DataEntryTypes::Constant<Type>::value(const scalar x) const
 {
     return value_;
 }
 
 
 template<class Type>
-Type Foam::Constant<Type>::integrate(const scalar x1, const scalar x2) const
+Type Foam::DataEntryTypes::Constant<Type>::integrate
+(
+    const scalar x1,
+    const scalar x2
+) const
 {
     return (x2 - x1)*value_;
 }
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
index 76bb4706ef..8e8e77320b 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
@@ -48,8 +48,16 @@ namespace Foam
 {
 
 // Forward declaration of friend functions and operators
-template<class Type> class Constant;
-template<class Type> Ostream& operator<<(Ostream&, const Constant<Type>&);
+namespace DataEntryTypes
+{
+    template<class Type> class Constant;
+};
+
+template<class Type>
+Ostream& operator<<(Ostream&, const DataEntryTypes::Constant<Type>&);
+
+namespace DataEntryTypes
+{
 
 /*---------------------------------------------------------------------------*\
                            Class Constant Declaration
@@ -127,6 +135,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace DataEntryTypes
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C
index fd9186343f..f3b63b380a 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C
@@ -31,7 +31,7 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const Constant<Type>& cnst
+    const DataEntryTypes::Constant<Type>& cnst
 )
 {
     os  << static_cast<const DataEntry<Type>& >(cnst)
@@ -48,7 +48,7 @@ Foam::Ostream& Foam::operator<<
 
 
 template<class Type>
-void Foam::Constant<Type>::writeData(Ostream& os) const
+void Foam::DataEntryTypes::Constant<Type>::writeData(Ostream& os) const
 {
     DataEntry<Type>::writeData(os);
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
index d95bfa17e0..63fd851b12 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
@@ -189,9 +189,9 @@ public:
 
 #define makeDataEntryType(SS, Type)                                            \
                                                                                \
-    defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                          \
+    defineNamedTemplateTypeNameAndDebug(DataEntryTypes::SS<Type>, 0);          \
                                                                                \
-    DataEntry<Type>::adddictionaryConstructorToTable<SS<Type>>                 \
+    DataEntry<Type>::adddictionaryConstructorToTable<DataEntryTypes::SS<Type>> \
         add##SS##Type##ConstructorToTable_;
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
index ee17d0ff02..49e394f2d0 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
@@ -42,7 +42,10 @@ Foam::autoPtr<Foam::DataEntry<Type>> Foam::DataEntry<Type>::New
     if (!firstToken.isWord())
     {
         is.putBack(firstToken);
-        return autoPtr<DataEntry<Type>>(new Constant<Type>(entryName, is));
+        return autoPtr<DataEntry<Type>>
+        (
+            new DataEntryTypes::Constant<Type>(entryName, is)
+        );
     }
     else
     {
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
index c7f30964d5..5385c761c5 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::PolynomialEntry<Type>::PolynomialEntry
+Foam::DataEntryTypes::Polynomial<Type>::Polynomial
 (
     const word& entryName,
     const dictionary& dict
@@ -46,7 +46,7 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
     if (!coeffs_.size())
     {
         FatalErrorInFunction
-            << "PolynomialEntry coefficients for entry " << this->name_
+            << "Polynomial coefficients for entry " << this->name_
             << " are invalid (empty)" << nl << exit(FatalError);
     }
 
@@ -64,7 +64,7 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
         if (!canIntegrate_)
         {
             WarningInFunction
-                << "PolynomialEntry " << this->name_ << " cannot be integrated"
+                << "Polynomial " << this->name_ << " cannot be integrated"
                 << endl;
         }
     }
@@ -72,7 +72,7 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
 
 
 template<class Type>
-Foam::PolynomialEntry<Type>::PolynomialEntry
+Foam::DataEntryTypes::Polynomial<Type>::Polynomial
 (
     const word& entryName,
     const List<Tuple2<Type, Type>>& coeffs
@@ -85,7 +85,7 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
     if (!coeffs_.size())
     {
         FatalErrorInFunction
-            << "PolynomialEntry coefficients for entry " << this->name_
+            << "Polynomial coefficients for entry " << this->name_
             << " are invalid (empty)" << nl << exit(FatalError);
     }
 
@@ -103,7 +103,7 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
         if (!canIntegrate_)
         {
             WarningInFunction
-                << "PolynomialEntry " << this->name_ << " cannot be integrated"
+                << "Polynomial " << this->name_ << " cannot be integrated"
                 << endl;
         }
     }
@@ -111,7 +111,7 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
 
 
 template<class Type>
-Foam::PolynomialEntry<Type>::PolynomialEntry(const PolynomialEntry& poly)
+Foam::DataEntryTypes::Polynomial<Type>::Polynomial(const Polynomial& poly)
 :
     DataEntry<Type>(poly),
     coeffs_(poly.coeffs_),
@@ -122,14 +122,14 @@ Foam::PolynomialEntry<Type>::PolynomialEntry(const PolynomialEntry& poly)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::PolynomialEntry<Type>::~PolynomialEntry()
+Foam::DataEntryTypes::Polynomial<Type>::~Polynomial()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::PolynomialEntry<Type>::convertTimeBase(const Time& t)
+void Foam::DataEntryTypes::Polynomial<Type>::convertTimeBase(const Time& t)
 {
     forAll(coeffs_, i)
     {
@@ -144,7 +144,7 @@ void Foam::PolynomialEntry<Type>::convertTimeBase(const Time& t)
 
 
 template<class Type>
-Type Foam::PolynomialEntry<Type>::value(const scalar x) const
+Type Foam::DataEntryTypes::Polynomial<Type>::value(const scalar x) const
 {
     Type y(pTraits<Type>::zero);
     forAll(coeffs_, i)
@@ -161,7 +161,7 @@ Type Foam::PolynomialEntry<Type>::value(const scalar x) const
 
 
 template<class Type>
-Type Foam::PolynomialEntry<Type>::integrate
+Type Foam::DataEntryTypes::Polynomial<Type>::integrate
 (
     const scalar x1,
     const scalar x2
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
index a2d46fa9ac..1fdacf65e0 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
@@ -55,22 +55,29 @@ namespace Foam
 {
 
 // Forward declaration of friend functions and operators
-template<class Type> class PolynomialEntry;
+namespace DataEntryTypes
+{
+    template<class Type> class Polynomial;
+};
+
 template<class Type>
-Ostream& operator<<(Ostream&, const PolynomialEntry<Type>&);
+Ostream& operator<<(Ostream&, const DataEntryTypes::Polynomial<Type>&);
+
+namespace DataEntryTypes
+{
 
 /*---------------------------------------------------------------------------*\
-                        Class PolynomialEntry Declaration
+                        Class Polynomial Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-class PolynomialEntry
+class Polynomial
 :
     public DataEntry<Type>
 {
     // Private data
 
-        //- PolynomialEntry coefficients - list of prefactor, exponent
+        //- Polynomial coefficients - list of prefactor, exponent
         List<Tuple2<Type, Type>> coeffs_;
 
         //- Flag to indicate whether poly can be integrated
@@ -80,7 +87,7 @@ class PolynomialEntry
     // Private Member Functions
 
         //- Disallow default bitwise assignment
-        void operator=(const PolynomialEntry<Type>&);
+        void operator=(const Polynomial<Type>&);
 
 
 public:
@@ -91,27 +98,27 @@ public:
 
     // Constructors
 
-        PolynomialEntry(const word& entryName, const dictionary& dict);
+        Polynomial(const word& entryName, const dictionary& dict);
 
         //- Construct from components
-        PolynomialEntry
+        Polynomial
         (
             const word& entryName,
             const List<Tuple2<Type, Type>>&
         );
 
         //- Copy constructor
-        PolynomialEntry(const PolynomialEntry& poly);
+        Polynomial(const Polynomial& poly);
 
         //- Construct and return a clone
         virtual tmp<DataEntry<Type>> clone() const
         {
-            return tmp<DataEntry<Type>>(new PolynomialEntry(*this));
+            return tmp<DataEntry<Type>>(new Polynomial(*this));
         }
 
 
     //- Destructor
-    virtual ~PolynomialEntry();
+    virtual ~Polynomial();
 
 
     // Member Functions
@@ -124,7 +131,7 @@ public:
 
         // Evaluation
 
-            //- Return PolynomialEntry value
+            //- Return Polynomial value
             Type value(const scalar x) const;
 
             //- Integrate between two (scalar) values
@@ -137,7 +144,7 @@ public:
         friend Ostream& operator<< <Type>
         (
             Ostream& os,
-            const PolynomialEntry<Type>& cnst
+            const Polynomial<Type>& cnst
         );
 
         //- Write in dictionary format
@@ -147,6 +154,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace DataEntryTypes
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntryIO.C b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntryIO.C
index 0a52a10962..6d9124602a 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntryIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntryIO.C
@@ -31,7 +31,7 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const PolynomialEntry<Type>& poly
+    const DataEntryTypes::Polynomial<Type>& poly
 )
 {
     os  << static_cast<const DataEntry<Type>& >(poly)
@@ -40,7 +40,7 @@ Foam::Ostream& Foam::operator<<
     // Check state of Ostream
     os.check
     (
-        "Ostream& operator<<(Ostream&, const PolynomialEntry&)"
+        "Ostream& operator<<(Ostream&, const Polynomial&)"
     );
 
     return os;
@@ -48,7 +48,7 @@ Foam::Ostream& Foam::operator<<
 
 
 template<class Type>
-void Foam::PolynomialEntry<Type>::writeData(Ostream& os) const
+void Foam::DataEntryTypes::Polynomial<Type>::writeData(Ostream& os) const
 {
     DataEntry<Type>::writeData(os);
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
index 9d0213fa3e..0927cc193b 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
@@ -28,7 +28,11 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Table<Type>::Table(const word& entryName, const dictionary& dict)
+Foam::DataEntryTypes::Table<Type>::Table
+(
+    const word& entryName,
+    const dictionary& dict
+)
 :
     TableBase<Type>(entryName, dict)
 {
@@ -40,7 +44,7 @@ Foam::Table<Type>::Table(const word& entryName, const dictionary& dict)
 
 
 template<class Type>
-Foam::Table<Type>::Table(const Table<Type>& tbl)
+Foam::DataEntryTypes::Table<Type>::Table(const Table<Type>& tbl)
 :
     TableBase<Type>(tbl)
 {}
@@ -49,7 +53,7 @@ Foam::Table<Type>::Table(const Table<Type>& tbl)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Table<Type>::~Table()
+Foam::DataEntryTypes::Table<Type>::~Table()
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
index 0ae210f32b..fb0a13fec2 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
@@ -53,15 +53,17 @@ SourceFiles
 namespace Foam
 {
 
-template<class Type>
-class Table;
+// Forward declaration of friend functions and operators
+namespace DataEntryTypes
+{
+    template<class Type> class Table;
+};
 
 template<class Type>
-Ostream& operator<<
-(
-    Ostream&,
-    const Table<Type>&
-);
+Ostream& operator<<(Ostream&, const DataEntryTypes::Table<Type>&);
+
+namespace DataEntryTypes
+{
 
 /*---------------------------------------------------------------------------*\
                            Class Table Declaration
@@ -106,6 +108,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace DataEntryTypes
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
index 1d29170ae6..e220f072ba 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
@@ -30,7 +30,8 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-const Foam::interpolationWeights& Foam::TableBase<Type>::interpolator() const
+const Foam::interpolationWeights&
+Foam::DataEntryTypes::TableBase<Type>::interpolator() const
 {
     if (interpolatorPtr_.empty())
     {
@@ -55,7 +56,11 @@ const Foam::interpolationWeights& Foam::TableBase<Type>::interpolator() const
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::TableBase<Type>::TableBase(const word& name, const dictionary& dict)
+Foam::DataEntryTypes::TableBase<Type>::TableBase
+(
+    const word& name,
+    const dictionary& dict
+)
 :
     DataEntry<Type>(name),
     name_(name),
@@ -75,7 +80,7 @@ Foam::TableBase<Type>::TableBase(const word& name, const dictionary& dict)
 
 
 template<class Type>
-Foam::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
+Foam::DataEntryTypes::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
 :
     DataEntry<Type>(tbl),
     name_(tbl.name_),
@@ -90,14 +95,14 @@ Foam::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::TableBase<Type>::~TableBase()
+Foam::DataEntryTypes::TableBase<Type>::~TableBase()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::word Foam::TableBase<Type>::boundsHandlingToWord
+Foam::word Foam::DataEntryTypes::TableBase<Type>::boundsHandlingToWord
 (
      const boundsHandling& bound
 ) const
@@ -133,8 +138,8 @@ Foam::word Foam::TableBase<Type>::boundsHandlingToWord
 
 
 template<class Type>
-typename Foam::TableBase<Type>::boundsHandling
-Foam::TableBase<Type>::wordToBoundsHandling
+typename Foam::DataEntryTypes::TableBase<Type>::boundsHandling
+Foam::DataEntryTypes::TableBase<Type>::wordToBoundsHandling
 (
     const word& bound
 ) const
@@ -167,8 +172,8 @@ Foam::TableBase<Type>::wordToBoundsHandling
 
 
 template<class Type>
-typename Foam::TableBase<Type>::boundsHandling
-Foam::TableBase<Type>::outOfBounds
+typename Foam::DataEntryTypes::TableBase<Type>::boundsHandling
+Foam::DataEntryTypes::TableBase<Type>::outOfBounds
 (
     const boundsHandling& bound
 )
@@ -181,7 +186,7 @@ Foam::TableBase<Type>::outOfBounds
 
 
 template<class Type>
-void Foam::TableBase<Type>::check() const
+void Foam::DataEntryTypes::TableBase<Type>::check() const
 {
     if (!table_.size())
     {
@@ -210,7 +215,7 @@ void Foam::TableBase<Type>::check() const
 
 
 template<class Type>
-bool Foam::TableBase<Type>::checkMinBounds
+bool Foam::DataEntryTypes::TableBase<Type>::checkMinBounds
 (
     const scalar x,
     scalar& xDash
@@ -260,7 +265,7 @@ bool Foam::TableBase<Type>::checkMinBounds
 
 
 template<class Type>
-bool Foam::TableBase<Type>::checkMaxBounds
+bool Foam::DataEntryTypes::TableBase<Type>::checkMaxBounds
 (
     const scalar x,
     scalar& xDash
@@ -310,7 +315,7 @@ bool Foam::TableBase<Type>::checkMaxBounds
 
 
 template<class Type>
-void Foam::TableBase<Type>::convertTimeBase(const Time& t)
+void Foam::DataEntryTypes::TableBase<Type>::convertTimeBase(const Time& t)
 {
     forAll(table_, i)
     {
@@ -324,7 +329,7 @@ void Foam::TableBase<Type>::convertTimeBase(const Time& t)
 
 
 template<class Type>
-Type Foam::TableBase<Type>::value(const scalar x) const
+Type Foam::DataEntryTypes::TableBase<Type>::value(const scalar x) const
 {
     scalar xDash = x;
 
@@ -352,7 +357,11 @@ Type Foam::TableBase<Type>::value(const scalar x) const
 
 
 template<class Type>
-Type Foam::TableBase<Type>::integrate(const scalar x1, const scalar x2) const
+Type Foam::DataEntryTypes::TableBase<Type>::integrate
+(
+    const scalar x1,
+    const scalar x2
+) const
 {
     // Use interpolator
     interpolator().integrationWeights(x1, x2, currentIndices_, currentWeights_);
@@ -368,7 +377,7 @@ Type Foam::TableBase<Type>::integrate(const scalar x1, const scalar x2) const
 
 
 template<class Type>
-Foam::tmp<Foam::scalarField> Foam::TableBase<Type>::x() const
+Foam::tmp<Foam::scalarField> Foam::DataEntryTypes::TableBase<Type>::x() const
 {
     tmp<scalarField> tfld(new scalarField(table_.size(), 0.0));
     scalarField& fld = tfld();
@@ -383,7 +392,7 @@ Foam::tmp<Foam::scalarField> Foam::TableBase<Type>::x() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::TableBase<Type>::y() const
+Foam::tmp<Foam::Field<Type>> Foam::DataEntryTypes::TableBase<Type>::y() const
 {
     tmp<Field<Type>> tfld(new Field<Type>(table_.size(), pTraits<Type>::zero));
     Field<Type>& fld = tfld();
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
index 8d127663d5..ec45b15346 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
@@ -43,18 +43,20 @@ SourceFiles
 namespace Foam
 {
 
-template<class Type>
-class TableBase;
-
-template<class Type>
-Ostream& operator<<
-(
-    Ostream&,
-    const TableBase<Type>&
-);
-
 class interpolationWeights;
 
+// Forward declaration of friend functions and operators
+namespace DataEntryTypes
+{
+    template<class Type> class TableBase;
+};
+
+template<class Type>
+Ostream& operator<<(Ostream&, const DataEntryTypes::TableBase<Type>&);
+
+namespace DataEntryTypes
+{
+
 /*---------------------------------------------------------------------------*\
                         Class TableBase Declaration
 \*---------------------------------------------------------------------------*/
@@ -186,6 +188,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace DataEntryTypes
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
index 79c4e46819..436983326e 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
@@ -31,7 +31,7 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const TableBase<Type>& tbl
+    const DataEntryTypes::TableBase<Type>& tbl
 )
 {
     os  << static_cast<const DataEntry<Type>&>(tbl);
@@ -48,7 +48,7 @@ Foam::Ostream& Foam::operator<<
 
 
 template<class Type>
-void Foam::TableBase<Type>::writeData(Ostream& os) const
+void Foam::DataEntryTypes::TableBase<Type>::writeData(Ostream& os) const
 {
     DataEntry<Type>::writeData(os);
     os  << nl << indent << table_ << token::END_STATEMENT << nl;
@@ -57,7 +57,7 @@ void Foam::TableBase<Type>::writeData(Ostream& os) const
 
 
 template<class Type>
-void Foam::TableBase<Type>::writeEntries(Ostream& os) const
+void Foam::DataEntryTypes::TableBase<Type>::writeEntries(Ostream& os) const
 {
     if (boundsHandling_ != CLAMP)
     {
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
index 37b89e0757..4fbe2ea29f 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
@@ -28,7 +28,11 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::TableFile<Type>::TableFile(const word& entryName, const dictionary& dict)
+Foam::DataEntryTypes::TableFile<Type>::TableFile
+(
+    const word& entryName,
+    const dictionary& dict
+)
 :
     TableBase<Type>(entryName, dict.subDict(entryName + "Coeffs")),
     fName_("none")
@@ -54,7 +58,7 @@ Foam::TableFile<Type>::TableFile(const word& entryName, const dictionary& dict)
 
 
 template<class Type>
-Foam::TableFile<Type>::TableFile(const TableFile<Type>& tbl)
+Foam::DataEntryTypes::TableFile<Type>::TableFile(const TableFile<Type>& tbl)
 :
     TableBase<Type>(tbl),
     fName_(tbl.fName_)
@@ -64,7 +68,7 @@ Foam::TableFile<Type>::TableFile(const TableFile<Type>& tbl)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::TableFile<Type>::~TableFile()
+Foam::DataEntryTypes::TableFile<Type>::~TableFile()
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
index 5d3bb32a6c..834eae701b 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
@@ -64,15 +64,17 @@ SourceFiles
 namespace Foam
 {
 
-template<class Type>
-class TableFile;
+// Forward declaration of friend functions and operators
+namespace DataEntryTypes
+{
+    template<class Type> class TableFile;
+};
 
 template<class Type>
-Ostream& operator<<
-(
-    Ostream&,
-    const TableFile<Type>&
-);
+Ostream& operator<<(Ostream&, const DataEntryTypes::TableFile<Type>&);
+
+namespace DataEntryTypes
+{
 
 /*---------------------------------------------------------------------------*\
                            Class TableFile Declaration
@@ -129,6 +131,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace DataEntryTypes
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C
index 5b074027fc..9c0a3bbb42 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::TableFile<Type>::writeData(Ostream& os) const
+void Foam::DataEntryTypes::TableFile<Type>::writeData(Ostream& os) const
 {
     DataEntry<Type>::writeData(os);
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
index 0ebd9b398e..06ce416331 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
@@ -43,42 +43,42 @@ namespace Foam
 
     // Polynomial functions and interpolation do evaluate to label
     // Instead evaluate a scalar and convert to label as appropriate
-    // makeDataEntryType(PolynomialEntry, label);
+    // makeDataEntryType(Polynomial, label);
     // makeDataEntryType(CSV, label);
     // makeDataEntryType(Table, label);
     // makeDataEntryType(TableFile, label);
 
     makeDataEntry(scalar);
     makeDataEntryType(Constant, scalar);
-    makeDataEntryType(PolynomialEntry, scalar);
+    makeDataEntryType(Polynomial, scalar);
     makeDataEntryType(CSV, scalar);
     makeDataEntryType(Table, scalar);
     makeDataEntryType(TableFile, scalar);
 
     makeDataEntry(vector);
     makeDataEntryType(Constant, vector);
-    makeDataEntryType(PolynomialEntry, vector);
+    makeDataEntryType(Polynomial, vector);
     makeDataEntryType(CSV, vector);
     makeDataEntryType(Table, vector);
     makeDataEntryType(TableFile, vector);
 
     makeDataEntry(sphericalTensor);
     makeDataEntryType(Constant, sphericalTensor);
-    makeDataEntryType(PolynomialEntry, sphericalTensor);
+    makeDataEntryType(Polynomial, sphericalTensor);
     makeDataEntryType(CSV, sphericalTensor);
     makeDataEntryType(Table, sphericalTensor);
     makeDataEntryType(TableFile, sphericalTensor);
 
     makeDataEntry(symmTensor);
     makeDataEntryType(Constant, symmTensor);
-    makeDataEntryType(PolynomialEntry, symmTensor);
+    makeDataEntryType(Polynomial, symmTensor);
     makeDataEntryType(CSV, symmTensor);
     makeDataEntryType(Table, symmTensor);
     makeDataEntryType(TableFile, symmTensor);
 
     makeDataEntry(tensor);
     makeDataEntryType(Constant, tensor);
-    makeDataEntryType(PolynomialEntry, tensor);
+    makeDataEntryType(Polynomial, tensor);
     makeDataEntryType(CSV, tensor);
     makeDataEntryType(Table, tensor);
     makeDataEntryType(TableFile, tensor);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
index 2a406f5ffc..d8ac18af77 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
@@ -98,7 +98,7 @@ Foam::fanFvPatchField<Foam::scalar>::fanFvPatchField
 
             this->jumpTable_.reset
             (
-                new PolynomialEntry<scalar>("jumpTable", coeffs)
+                new DataEntryTypes::Polynomial<scalar>("jumpTable", coeffs)
             );
         }
         else

From a9bb9c3b9951c644371be2f216c04aae772d3616 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 7 Feb 2016 13:34:03 +0000
Subject: [PATCH 142/447] Updated header

---
 applications/utilities/postProcessing/noise/noise.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C
index ae4749951e..87615d18e3 100644
--- a/applications/utilities/postProcessing/noise/noise.C
+++ b/applications/utilities/postProcessing/noise/noise.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 7b39ea3cc4801c8d6bf40b4beaf72fd75eb7f948 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 7 Feb 2016 13:48:50 +0000
Subject: [PATCH 143/447] DataEntryTypes: Update headers to include the new
 namespace

---
 src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H           | 2 +-
 src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H | 2 +-
 .../functions/DataEntry/PolynomialEntry/PolynomialEntry.H       | 2 +-
 src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H       | 2 +-
 src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H   | 2 +-
 .../primitives/functions/DataEntry/TableFile/TableFile.H        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
index 4fa669ce68..40bc214c69 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::CSV
+    Foam::DataEntryTypes::CSV
 
 Description
     Templated CSV container data entry.  Reference column is always a scalar,
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
index 8e8e77320b..a1e5df884f 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::Constant
+    Foam::DataEntryTypes::Constant
 
 Description
     Templated basic entry that holds a constant value.
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
index 1fdacf65e0..c23a4dfc8a 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::PolynomialEntry
+    Foam::DataEntryTypes::PolynomialEntry
 
 Description
     PolynomialEntry container data entry for scalars. Items are stored in a
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
index fb0a13fec2..bcb25e57a4 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::Table
+    Foam::DataEntryTypes::Table
 
 Description
     Templated table container data entry. Items are stored in a list of
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
index ec45b15346..43af2d8bd0 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::TableBase
+    Foam::DataEntryTypes::TableBase
 
 Description
     Base class for table with bounds handling, interpolation and integration
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
index 834eae701b..9cad75efb3 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::TableFile
+    Foam::DataEntryTypes::TableFile
 
 Description
     Templated table container data entry where data is read from file.

From 14df9bde95974305c0ec8df656a89deb34f5e8e2 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 7 Feb 2016 22:51:01 +0000
Subject: [PATCH 144/447] fixedNormalInletOutletVelocity: Minor reorganization

---
 ...malInletOutletVelocityFvPatchVectorField.C | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
index f45f9893c1..b432f7884e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,25 +52,6 @@ fixedNormalInletOutletVelocityFvPatchVectorField
 }
 
 
-Foam::fixedNormalInletOutletVelocityFvPatchVectorField::
-fixedNormalInletOutletVelocityFvPatchVectorField
-(
-    const fixedNormalInletOutletVelocityFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    directionMixedFvPatchVectorField(ptf, p, iF, mapper),
-    phiName_(ptf.phiName_),
-    fixTangentialInflow_(ptf.fixTangentialInflow_),
-    normalVelocity_
-    (
-        fvPatchVectorField::New(ptf.normalVelocity(), p, iF, mapper)
-    )
-{}
-
-
 Foam::fixedNormalInletOutletVelocityFvPatchVectorField::
 fixedNormalInletOutletVelocityFvPatchVectorField
 (
@@ -94,6 +75,25 @@ fixedNormalInletOutletVelocityFvPatchVectorField
 }
 
 
+Foam::fixedNormalInletOutletVelocityFvPatchVectorField::
+fixedNormalInletOutletVelocityFvPatchVectorField
+(
+    const fixedNormalInletOutletVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    directionMixedFvPatchVectorField(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_),
+    fixTangentialInflow_(ptf.fixTangentialInflow_),
+    normalVelocity_
+    (
+        fvPatchVectorField::New(ptf.normalVelocity(), p, iF, mapper)
+    )
+{}
+
+
 Foam::fixedNormalInletOutletVelocityFvPatchVectorField::
 fixedNormalInletOutletVelocityFvPatchVectorField
 (

From 9fc02015687a0f52d71f6c8ba61d97473cd7551c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 7 Feb 2016 22:55:52 +0000
Subject: [PATCH 145/447] flowRateInletVelocity: Added option to extrapolate
 the velocity profile to the inlet

e.g.

    inlet
    {
        type                flowRateInletVelocity;
        massFlowRate        0.2;
        extrapolateProfile  yes;
        rho                 rho;
        rhoInlet            1.0;
        value               uniform (0 0 0);
    }
---
 .../flowRateInletVelocityFvPatchVectorField.C | 75 ++++++++++++++-----
 .../flowRateInletVelocityFvPatchVectorField.H | 25 +++++--
 2 files changed, 77 insertions(+), 23 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index 7dc2d9497b..bd09517b1e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,6 +28,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "surfaceFields.H"
+#include "one.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -42,7 +43,8 @@ flowRateInletVelocityFvPatchVectorField
     flowRate_(),
     volumetric_(false),
     rhoName_("rho"),
-    rhoInlet_(0.0)
+    rhoInlet_(0.0),
+    extrapolateProfile_(false)
 {}
 
 
@@ -59,7 +61,8 @@ flowRateInletVelocityFvPatchVectorField
     flowRate_(ptf.flowRate_, false),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
-    rhoInlet_(ptf.rhoInlet_)
+    rhoInlet_(ptf.rhoInlet_),
+    extrapolateProfile_(ptf.extrapolateProfile_)
 {}
 
 
@@ -72,7 +75,11 @@ flowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    rhoInlet_(dict.lookupOrDefault<scalar>("rhoInlet", -VGREAT))
+    rhoInlet_(dict.lookupOrDefault<scalar>("rhoInlet", -VGREAT)),
+    extrapolateProfile_
+    (
+        dict.lookupOrDefault<Switch>("extrapolateProfile", false)
+    )
 {
     if (dict.found("volumetricFlowRate"))
     {
@@ -120,7 +127,8 @@ flowRateInletVelocityFvPatchVectorField
     flowRate_(ptf.flowRate_, false),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
-    rhoInlet_(ptf.rhoInlet_)
+    rhoInlet_(ptf.rhoInlet_),
+    extrapolateProfile_(ptf.extrapolateProfile_)
 {}
 
 
@@ -135,12 +143,50 @@ flowRateInletVelocityFvPatchVectorField
     flowRate_(ptf.flowRate_, false),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
-    rhoInlet_(ptf.rhoInlet_)
+    rhoInlet_(ptf.rhoInlet_),
+    extrapolateProfile_(ptf.extrapolateProfile_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class RhoType>
+void Foam::flowRateInletVelocityFvPatchVectorField::updateValues
+(
+    const RhoType& rho
+)
+{
+    const scalar t = db().time().timeOutputValue();
+
+    tmp<vectorField> n = patch().nf();
+
+    if (extrapolateProfile_)
+    {
+        vectorField newValues(this->patchInternalField());
+
+        scalar flowRate = flowRate_->value(t);
+        scalar estimatedFlowRate = -gSum(rho*(this->patch().Sf() & newValues));
+
+        if (estimatedFlowRate/flowRate > 0.5)
+        {
+            newValues *= (mag(flowRate)/mag(estimatedFlowRate));
+        }
+        else
+        {
+            newValues -=
+                ((flowRate - estimatedFlowRate)/gSum(rho*patch().magSf()))*n;
+        }
+
+        this->operator==(newValues);
+    }
+    else
+    {
+        const scalar avgU = -flowRate_->value(t)/gSum(rho*patch().magSf());
+        operator==(n*avgU);
+    }
+}
+
+
 void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
 {
     if (updated())
@@ -148,27 +194,19 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const scalar t = db().time().timeOutputValue();
-
-    // a simpler way of doing this would be nice
-    const scalar avgU = -flowRate_->value(t)/gSum(patch().magSf());
-
-    tmp<vectorField> n = patch().nf();
-
     if (volumetric_ || rhoName_ == "none")
     {
-        // volumetric flow-rate or density not given
-        operator==(n*avgU);
+        updateValues(one());
     }
     else
     {
-        // mass flow-rate
+        // Mass flow-rate
         if (db().foundObject<volScalarField>(rhoName_))
         {
             const fvPatchField<scalar>& rhop =
                 patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
-            operator==(n*avgU/rhop);
+            updateValues(rhop);
         }
         else
         {
@@ -180,7 +218,8 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
                     << " and no constant density 'rhoInlet' specified"
                     << exit(FatalError);
             }
-            operator==(n*avgU/rhoInlet_);
+
+            updateValues(rhoInlet_);
         }
     }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
index 1fbd21c75b..cd46853c3b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
@@ -49,15 +49,17 @@ Description
         massFlowRate | mass flow rate [kg/s]   | no          |
         volumetricFlowRate | volumetric flow rate [m3/s]| no |
         rhoInlet     | inlet density           | no          |
+        extrapolateProfile | Extrapolate velocity profile | no | false
     \endtable
 
     Example of the boundary condition specification for a volumetric flow rate:
     \verbatim
     myPatch
     {
-        type        flowRateInletVelocity;
+        type                flowRateInletVelocity;
         volumetricFlowRate  0.2;
-        value       uniform (0 0 0); // placeholder
+        extrapolateProfile  yes;
+        value               uniform (0 0 0);
     }
     \endverbatim
 
@@ -67,8 +69,10 @@ Description
     {
         type                flowRateInletVelocity;
         massFlowRate        0.2;
+        extrapolateProfile  yes;
         rho                 rho;
         rhoInlet            1.0;
+        value               uniform (0 0 0);
     }
     \endverbatim
 
@@ -78,9 +82,9 @@ Description
 Note
     - \c rhoInlet is required for the case of a mass flow rate, where the
       density field is not available at start-up
-    - the value is positive into the domain (as an inlet)
-    - may not work correctly for transonic inlets
-    - strange behaviour with potentialFoam since the U equation is not solved
+    - The value is positive into the domain (as an inlet)
+    - May not work correctly for transonic inlets
+    - Strange behaviour with potentialFoam since the U equation is not solved
 
 SeeAlso
     Foam::DataEntry
@@ -101,6 +105,7 @@ SourceFiles
 
 namespace Foam
 {
+
 /*---------------------------------------------------------------------------*\
            Class flowRateInletVelocityFvPatchVectorField Declaration
 \*---------------------------------------------------------------------------*/
@@ -123,6 +128,16 @@ class flowRateInletVelocityFvPatchVectorField
         //- Rho initialisation value (for start; if value not supplied)
         scalar rhoInlet_;
 
+        //- Set true to extrapolate the velocity profile from the interior
+        Switch extrapolateProfile_;
+
+
+    // Private member functions
+
+        //- Update the patch values given the appropriate density type and value
+        template<class RhoType>
+        void updateValues(const RhoType& rho);
+
 
 public:
 

From 7ec6f28c49618e18edebaaaf8b663be4bf48ec90 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 8 Feb 2016 10:03:55 +0000
Subject: [PATCH 146/447] Added support for ParaView-5.0.0 PV4FoamReaders:
 Updated to build with ParaView-5.0.0 paraFoam: Updated to load PV4FoamReaders
 for ParaView-5.0.0

Currently this is experimental but if it becomes clear that ParaView-4
and ParaView-5 are and will remain consistent with respect to readers
the plan is to rename

PV4 -> PV

or

PV4 -> PV45 if it is assumed that PV6 may need to be different.
---
 .../postProcessing/graphics/PV4Readers/Allwmake        |  2 +-
 .../PV4FoamReader/PV4FoamReader/CMakeLists.txt         | 10 +++++-----
 .../{PV4FoamReader_SM.xml => PVFoamReader_SM.xml}      |  0
 .../PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options   |  1 +
 .../PV4blockMeshReader/CMakeLists.txt                  | 10 +++++-----
 ...blockMeshReader_SM.xml => PVblockMeshReader_SM.xml} |  0
 .../PV4blockMeshReader/vtkPV4blockMesh/Make/options    |  1 +
 .../graphics/PV4Readers/vtkPV4Readers/Make/options     |  3 ++-
 bin/paraFoam                                           |  4 ++--
 9 files changed, 17 insertions(+), 14 deletions(-)
 rename applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/{PV4FoamReader_SM.xml => PVFoamReader_SM.xml} (100%)
 rename applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/{PV4blockMeshReader_SM.xml => PVblockMeshReader_SM.xml} (100%)

diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
index 6f6e56b9d8..135dd56a18 100755
--- a/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 #set -x
 
 case "$ParaView_VERSION" in
-4*)
+4* | 5*)
     if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
     then
         [ -n "$PV_PLUGIN_PATH" ] || {
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
index 96ed7021fe..d5a6c168b3 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
@@ -53,8 +53,8 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
 
 IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
     ADD_PARAVIEW_PLUGIN(
-        PV4FoamReader_SM "1.0"
-        SERVER_MANAGER_XML PV4FoamReader_SM.xml
+        PVFoamReader_SM "1.0"
+        SERVER_MANAGER_XML PVFoamReader_SM.xml
         SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
         GUI_INTERFACES ${IFACES}
         GUI_SOURCES pqPV4FoamReaderPanel.cxx
@@ -63,8 +63,8 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
     )
 ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
     ADD_PARAVIEW_PLUGIN(
-        PV4FoamReader_SM "1.0"
-        SERVER_MANAGER_XML PV4FoamReader_SM.xml
+        PVFoamReader_SM "1.0"
+        SERVER_MANAGER_XML PVFoamReader_SM.xml
         SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
         GUI_INTERFACES ${IFACES}
         GUI_SOURCES pqPV4FoamReaderPanel.cxx
@@ -73,7 +73,7 @@ ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
 ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
 
 TARGET_LINK_LIBRARIES(
-    PV4FoamReader_SM
+    PVFoamReader_SM
     LINK_PUBLIC
     OpenFOAM
     finiteVolume
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PVFoamReader_SM.xml
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml
rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PVFoamReader_SM.xml
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options
index 1ed6a9e569..648b1d5d3f 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options
@@ -7,6 +7,7 @@ EXE_INC = \
     -I../../vtkPV4Readers/lnInclude \
     -I../PV4FoamReader \
     -I$(ParaView_INCLUDE_DIR) \
+    -I$(ParaView_INCLUDE_DIR)/vtkkwiml \
     $(shell \
         test -f $(ParaView_INCLUDE_DIR)/vtkPolyhedron.h && \
         echo "-DHAS_VTK_POLYHEDRON" || echo "-UHAS_VTK_POLYHEDRON" \
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
index e15613a51f..246a336fd2 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
@@ -52,8 +52,8 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
 
 IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
         ADD_PARAVIEW_PLUGIN(
-            PV4blockMeshReader_SM "1.0"
-        SERVER_MANAGER_XML PV4blockMeshReader_SM.xml
+            PVblockMeshReader_SM "1.0"
+        SERVER_MANAGER_XML PVblockMeshReader_SM.xml
         SERVER_MANAGER_SOURCES  vtkPV4blockMeshReader.cxx
         GUI_INTERFACES ${IFACES}
         GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
@@ -62,8 +62,8 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
     )
 ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
         ADD_PARAVIEW_PLUGIN(
-            PV4blockMeshReader_SM "1.0"
-        SERVER_MANAGER_XML PV4blockMeshReader_SM.xml
+            PVblockMeshReader_SM "1.0"
+        SERVER_MANAGER_XML PVblockMeshReader_SM.xml
         SERVER_MANAGER_SOURCES  vtkPV4blockMeshReader.cxx
         GUI_INTERFACES ${IFACES}
         GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
@@ -74,7 +74,7 @@ ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
 # Build the client-side plugin
 
 TARGET_LINK_LIBRARIES(
-    PV4blockMeshReader_SM
+    PVblockMeshReader_SM
     LINK_PUBLIC
     OpenFOAM
     blockMesh
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader_SM.xml b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PVblockMeshReader_SM.xml
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader_SM.xml
rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PVblockMeshReader_SM.xml
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options
index b1c25d894d..88fb00d0fb 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
     -I$(ParaView_INCLUDE_DIR) \
+    -I$(ParaView_INCLUDE_DIR)/vtkkwiml \
     -I../../vtkPV4Readers/lnInclude \
     -I../PV4blockMeshReader
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/options b/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/options
index 11c006c3be..8a80ee1497 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(ParaView_INCLUDE_DIR)
+    -I$(ParaView_INCLUDE_DIR) \
+    -I$(ParaView_INCLUDE_DIR)/vtkkwiml
 
 LIB_LIBS = \
     $(GLIBS)
diff --git a/bin/paraFoam b/bin/paraFoam
index b032fc6ce8..0a6c152e64 100755
--- a/bin/paraFoam
+++ b/bin/paraFoam
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -125,7 +125,7 @@ done
 version=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\).*$/\1/'`
 
 # Check that reader module has been built
-if [ $requirePV -eq 1 -a ! -f $PV_PLUGIN_PATH/libPV${version}FoamReader_SM.so ]
+if [ $requirePV -eq 1 -a ! -f $PV_PLUGIN_PATH/libPVFoamReader_SM.so ]
 then
     cat<< BUILDREADER
 

From 1507178a1bfffef916faab8f6d69dd72c3f0ee76 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 8 Feb 2016 10:51:49 +0000
Subject: [PATCH 147/447] RunFunctions::getNumberOfProcessors: Added support
 for files included in decomposeParDict

---
 bin/tools/RunFunctions | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 8465acbe07..b9240bb1ac 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -30,7 +30,8 @@
 
 getNumberOfProcessors()
 {
-    sed -ne 's/^numberOfSubdomains\s*\(.*\);/\1/p' system/decomposeParDict
+    expandDictionary system/decomposeParDict \
+        | sed -ne 's/^numberOfSubdomains\s*\(.*\);/\1/p'
 }
 
 getApplication()

From 96f2e3f394004e6cc5dd6d2f55defe2a74398de6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 8 Feb 2016 11:06:28 +0000
Subject: [PATCH 148/447] DataEntry/Sine: New DataEntryType which evaluates a
 sin function with offset

Description
    Templated sine function with support for an offset level.

        \f[
            a sin(2 \pi f (t - t_0)) s + l
        \f]

    where

    \vartable
        a       | Amplitude
        f       | Frequency [1/s]
        s       | Type scale factor
        l       | Type offset level
        t_0     | Start time [s]
        t       | Time [s]
    \endvartable

    Example for a scalar:
    \verbatim
        <entryName> sine;
        <entryName>Coeffs
        {
            frequency 10;
            amplitude 0.1;
            scale     2e-6;
            level     2e-6;
        }
    \endverbatim

    Example for a vector:
    \verbatim
        <entryName> sine;
        <entryName>Coeffs
        {
            frequency 10;
            amplitude 1;
            scale     (1 0.1 0);
            level     (10 1 0);
        }
    \endverbatim
---
 .../functions/DataEntry/Sine/Sine.C           | 102 +++++++++
 .../functions/DataEntry/Sine/Sine.H           | 200 ++++++++++++++++++
 .../functions/DataEntry/Sine/SineIO.C         |  70 ++++++
 .../functions/DataEntry/makeDataEntries.C     |  11 +-
 4 files changed, 378 insertions(+), 5 deletions(-)
 create mode 100644 src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.C
 create mode 100644 src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H
 create mode 100644 src/OpenFOAM/primitives/functions/DataEntry/Sine/SineIO.C

diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.C b/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.C
new file mode 100644
index 0000000000..8bedc6324d
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.C
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Sine.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::DataEntryTypes::Sine<Type>::read(const dictionary& coeffs)
+{
+    t0_ = coeffs.lookupOrDefault<scalar>("t0", 0);
+    amplitude_ = coeffs.lookupOrDefault<scalar>("amplitude", 1);
+    frequency_ = readScalar(coeffs.lookup("frequency"));
+    scale_ = pTraits<Type>(coeffs.lookup("scale"));
+    level_ = pTraits<Type>(coeffs.lookup("level"));
+}
+
+
+template<class Type>
+Foam::DataEntryTypes::Sine<Type>::Sine
+(
+    const word& entryName,
+    const dictionary& dict,
+    const word& ext
+)
+:
+    DataEntry<Type>(entryName)
+{
+    read(dict.subDict(entryName + ext));
+}
+
+
+template<class Type>
+Foam::DataEntryTypes::Sine<Type>::Sine(const Sine<Type>& se)
+:
+    DataEntry<Type>(se),
+    t0_(se.t0_),
+    amplitude_(se.amplitude_),
+    frequency_(se.frequency_),
+    level_(se.level_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::DataEntryTypes::Sine<Type>::~Sine()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Type Foam::DataEntryTypes::Sine<Type>::value(const scalar t) const
+{
+    return
+        amplitude_*sin(constant::mathematical::twoPi*frequency_*(t - t0_))
+       *scale_
+      + level_;
+}
+
+
+template<class Type>
+Type Foam::DataEntryTypes::Sine<Type>::integrate
+(
+    const scalar t1,
+    const scalar t2
+) const
+{
+    NotImplemented;
+    return level_;
+}
+
+
+// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+
+#include "SineIO.C"
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H b/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H
new file mode 100644
index 0000000000..fb08268814
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H
@@ -0,0 +1,200 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::DataEntryTypes::Sine
+
+Description
+    Templated sine function with support for an offset level.
+
+        \f[
+            a sin(2 \pi f (t - t_0)) s + l
+        \f]
+
+    where
+
+    \vartable
+        a       | Amplitude
+        f       | Frequency [1/s]
+        s       | Type scale factor
+        l       | Type offset level
+        t_0     | Start time [s]
+        t       | Time [s]
+    \endvartable
+
+    Example for a scalar:
+    \verbatim
+        <entryName> sine;
+        <entryName>Coeffs
+        {
+            frequency 10;
+            amplitude 0.1;
+            scale     2e-6;
+            level     2e-6;
+        }
+    \endverbatim
+
+    Example for a vector:
+    \verbatim
+        <entryName> sine;
+        <entryName>Coeffs
+        {
+            frequency 10;
+            amplitude 1;
+            scale     (1 0.1 0);
+            level     (10 1 0);
+        }
+    \endverbatim
+
+SourceFiles
+    Sine.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Sine_H
+#define Sine_H
+
+#include "DataEntry.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+namespace DataEntryTypes
+{
+    template<class Type> class Sine;
+};
+
+template<class Type>
+Ostream& operator<<(Ostream&, const DataEntryTypes::Sine<Type>&);
+
+namespace DataEntryTypes
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class Sine Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class Sine
+:
+    public DataEntry<Type>
+{
+    // Private data
+
+        //- Start-time for the sin function
+        scalar t0_;
+
+        //- Scalar amplitude of the sin function
+        scalar amplitude_;
+
+        //- Frequency of the sin function
+        scalar frequency_;
+
+        //- Scaling factor of the sin function
+        Type scale_;
+
+        //- Level to which the sin function is added
+        Type level_;
+
+
+    // Private Member Functions
+
+        //- Read the coefficients from the given dictionary
+        void read(const dictionary& coeffs);
+
+        //- Disallow default bitwise assignment
+        void operator===(const Sine<Type>&);
+
+
+public:
+
+    // Runtime type information
+    TypeName("sine");
+
+
+    // Constructors
+
+        //- Construct from entry name and dictionary
+        Sine
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const word& ext = "Coeffs"
+        );
+
+        //- Copy constructor
+        Sine(const Sine<Type>& se);
+
+        //- Construct and return a clone
+        virtual tmp<DataEntry<Type>> clone() const
+        {
+            return tmp<DataEntry<Type>>(new Sine<Type>(*this));
+        }
+
+
+    //- Destructor
+    virtual ~Sine();
+
+
+    // Member Functions
+
+        //- Return value for time t
+        Type value(const scalar t) const;
+
+        //- Integrate between the two time values t1 and t2
+        Type integrate(const scalar t1, const scalar t2) const;
+
+
+    // I/O
+
+        //- Ostream Operator
+        friend Ostream& operator<< <Type>
+        (
+            Ostream& os,
+            const Sine<Type>& cnst
+        );
+
+        //- Write in dictionary format
+        virtual void writeData(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace DataEntryTypes
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "Sine.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Sine/SineIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Sine/SineIO.C
new file mode 100644
index 0000000000..afbaba8dee
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Sine/SineIO.C
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Sine.H"
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const DataEntryTypes::Sine<Type>& se
+)
+{
+    os  << static_cast<const DataEntry<Type>& >(se)
+        << token::SPACE << se.t0_
+        << token::SPACE << se.amplitude_
+        << token::SPACE << se.frequency_
+        << token::SPACE << se.scale_
+        << token::SPACE << se.level_;
+
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, const Sine<Type>&)"
+    );
+
+    return os;
+}
+
+
+template<class Type>
+void Foam::DataEntryTypes::Sine<Type>::writeData(Ostream& os) const
+{
+    DataEntry<Type>::writeData(os);
+    os  << token::END_STATEMENT << nl;
+    os  << indent << word(this->name() + "Coeffs") << nl;
+    os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
+    os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl;
+    os.writeKeyword("amplitude") << amplitude_ << token::END_STATEMENT << nl;
+    os.writeKeyword("frequency") << frequency_ << token::END_STATEMENT << nl;
+    os.writeKeyword("scale") << scale_ << token::END_STATEMENT << nl;
+    os.writeKeyword("level") << level_ << token::END_STATEMENT << nl;
+    os  << decrIndent << indent << token::END_BLOCK << endl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
index 06ce416331..db8f3f7490 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
@@ -25,6 +25,7 @@ License
 
 #include "Constant.H"
 #include "PolynomialEntry.H"
+#include "Sine.H"
 #include "CSV.H"
 #include "Table.H"
 #include "TableFile.H"
@@ -40,17 +41,13 @@ namespace Foam
 {
     makeDataEntry(label);
     makeDataEntryType(Constant, label);
-
     // Polynomial functions and interpolation do evaluate to label
     // Instead evaluate a scalar and convert to label as appropriate
-    // makeDataEntryType(Polynomial, label);
-    // makeDataEntryType(CSV, label);
-    // makeDataEntryType(Table, label);
-    // makeDataEntryType(TableFile, label);
 
     makeDataEntry(scalar);
     makeDataEntryType(Constant, scalar);
     makeDataEntryType(Polynomial, scalar);
+    makeDataEntryType(Sine, scalar);
     makeDataEntryType(CSV, scalar);
     makeDataEntryType(Table, scalar);
     makeDataEntryType(TableFile, scalar);
@@ -58,6 +55,7 @@ namespace Foam
     makeDataEntry(vector);
     makeDataEntryType(Constant, vector);
     makeDataEntryType(Polynomial, vector);
+    makeDataEntryType(Sine, vector);
     makeDataEntryType(CSV, vector);
     makeDataEntryType(Table, vector);
     makeDataEntryType(TableFile, vector);
@@ -65,6 +63,7 @@ namespace Foam
     makeDataEntry(sphericalTensor);
     makeDataEntryType(Constant, sphericalTensor);
     makeDataEntryType(Polynomial, sphericalTensor);
+    makeDataEntryType(Sine, sphericalTensor);
     makeDataEntryType(CSV, sphericalTensor);
     makeDataEntryType(Table, sphericalTensor);
     makeDataEntryType(TableFile, sphericalTensor);
@@ -72,6 +71,7 @@ namespace Foam
     makeDataEntry(symmTensor);
     makeDataEntryType(Constant, symmTensor);
     makeDataEntryType(Polynomial, symmTensor);
+    makeDataEntryType(Sine, symmTensor);
     makeDataEntryType(CSV, symmTensor);
     makeDataEntryType(Table, symmTensor);
     makeDataEntryType(TableFile, symmTensor);
@@ -79,6 +79,7 @@ namespace Foam
     makeDataEntry(tensor);
     makeDataEntryType(Constant, tensor);
     makeDataEntryType(Polynomial, tensor);
+    makeDataEntryType(Sine, tensor);
     makeDataEntryType(CSV, tensor);
     makeDataEntryType(Table, tensor);
     makeDataEntryType(TableFile, tensor);

From c3f6a149d2583c82cc3ee45e620fa4ce956c0c57 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 8 Feb 2016 11:09:28 +0000
Subject: [PATCH 149/447] DataEntry/Sine: Corrected typo

---
 src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H b/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H
index fb08268814..1c7d7adb28 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H
@@ -126,7 +126,7 @@ class Sine
         void read(const dictionary& coeffs);
 
         //- Disallow default bitwise assignment
-        void operator===(const Sine<Type>&);
+        void operator=(const Sine<Type>&);
 
 
 public:

From 968c888fc492e0531082cd85a784caa617ebb12a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 8 Feb 2016 16:18:07 +0000
Subject: [PATCH 150/447] Rename DataEntry -> Function1

Function1 is an abstract base-class of run-time selectable unary
functions which may be composed of other Function1's allowing the user
to specify complex functions of a single scalar variable, e.g. time.
The implementations need not be a simple or continuous functions;
interpolated tables and polynomials are also supported.  In fact form of
mapping between a single scalar input and a single primitive type output
is supportable.

The primary application of Function1 is in time-varying boundary
conditions, it also used for other functions of time, e.g. injected mass
is spray simulations but is not limited to functions of time.
---
 applications/test/Function1/Make/files        |  3 +
 .../{dataEntry => Function1}/Make/options     |  0
 .../Test-Function1.C}                         | 34 ++++-----
 .../function1Properties}                      |  4 +-
 applications/test/dataEntry/Make/files        |  3 -
 .../utilities/postProcessing/noise/noise.C    |  2 +-
 etc/codeTemplates/BC/BC.C                     |  9 ++-
 etc/codeTemplates/BC/BC.H                     |  4 +-
 etc/controlDict                               |  2 +-
 src/OpenFOAM/Make/files                       |  2 +-
 .../uniformFixedValuePointPatchField.C        |  4 +-
 .../uniformFixedValuePointPatchField.H        |  8 +-
 .../{DataEntry => Function1}/CSV/CSV.C        | 16 ++--
 .../{DataEntry => Function1}/CSV/CSV.H        | 16 ++--
 .../{DataEntry => Function1}/CSV/CSVIO.C      | 10 +--
 .../Constant/Constant.C                       | 18 ++---
 .../Constant/Constant.H                       | 22 +++---
 .../Constant/ConstantIO.C                     |  8 +-
 .../Function1/Function1.C}                    | 22 +++---
 .../Function1/Function1.H}                    | 52 ++++++-------
 .../Function1/Function1Fwd.H}                 | 20 ++---
 .../Function1/Function1IO.C}                  | 10 +--
 .../Function1/Function1New.C}                 | 18 ++---
 .../PolynomialEntry/PolynomialEntry.C         | 20 ++---
 .../PolynomialEntry/PolynomialEntry.H         | 20 ++---
 .../PolynomialEntry/PolynomialEntryIO.C       |  8 +-
 .../{DataEntry => Function1}/Sine/Sine.C      | 16 ++--
 .../{DataEntry => Function1}/Sine/Sine.H      | 18 ++---
 .../{DataEntry => Function1}/Sine/SineIO.C    |  8 +-
 .../{DataEntry => Function1}/Table/Table.C    |  6 +-
 .../{DataEntry => Function1}/Table/Table.H    | 16 ++--
 .../Table/TableBase.C                         | 38 +++++-----
 .../Table/TableBase.H                         | 14 ++--
 .../Table/TableBaseIO.C                       | 12 +--
 .../TableFile/TableFile.C                     |  6 +-
 .../TableFile/TableFile.H                     | 16 ++--
 .../TableFile/TableFileIO.C                   |  6 +-
 .../makeDataEntries.C                         | 74 +++++++++----------
 .../TimeFunction1/TimeFunction1.C}            | 30 ++++----
 .../TimeFunction1/TimeFunction1.H}            | 36 ++++-----
 .../rotatingMotion/rotatingMotion.C           |  4 +-
 .../rotatingMotion/rotatingMotion.H           |  4 +-
 .../cfdTools/general/MRF/MRFZone.C            |  4 +-
 .../cfdTools/general/MRF/MRFZone.H            |  4 +-
 ...lindricalInletVelocityFvPatchVectorField.C |  8 +-
 ...lindricalInletVelocityFvPatchVectorField.H | 12 +--
 .../derived/fan/fanFvPatchField.H             |  6 +-
 .../derived/fan/fanFvPatchFields.C            |  4 +-
 .../fixedProfile/fixedProfileFvPatchField.C   |  4 +-
 .../fixedProfile/fixedProfileFvPatchField.H   | 10 +--
 .../flowRateInletVelocityFvPatchVectorField.C |  4 +-
 .../flowRateInletVelocityFvPatchVectorField.H |  8 +-
 .../oscillatingFixedValueFvPatchField.C       |  4 +-
 .../oscillatingFixedValueFvPatchField.H       | 10 +--
 ...ureInletOutletVelocityFvPatchVectorField.C |  4 +-
 ...ureInletOutletVelocityFvPatchVectorField.H |  6 +-
 .../rotatingTotalPressureFvPatchScalarField.C |  4 +-
 .../rotatingTotalPressureFvPatchScalarField.H |  6 +-
 .../rotatingWallVelocityFvPatchVectorField.C  |  4 +-
 .../rotatingWallVelocityFvPatchVectorField.H  |  8 +-
 ...lFlowRateInletVelocityFvPatchVectorField.C |  6 +-
 ...lFlowRateInletVelocityFvPatchVectorField.H |  8 +-
 .../timeVaryingMappedFixedValueFvPatchField.C |  2 +-
 .../timeVaryingMappedFixedValueFvPatchField.H |  4 +-
 .../uniformFixedGradientFvPatchField.C        |  4 +-
 .../uniformFixedGradientFvPatchField.H        |  8 +-
 .../uniformFixedValueFvPatchField.C           |  4 +-
 .../uniformFixedValueFvPatchField.H           |  8 +-
 .../uniformInletOutletFvPatchField.C          |  4 +-
 .../uniformInletOutletFvPatchField.H          |  4 +-
 .../uniformJump/uniformJumpFvPatchField.C     |  8 +-
 .../uniformJump/uniformJumpFvPatchField.H     |  6 +-
 .../uniformJumpAMIFvPatchField.C              |  6 +-
 .../uniformJumpAMIFvPatchField.H              |  6 +-
 .../uniformTotalPressureFvPatchScalarField.C  |  4 +-
 .../uniformTotalPressureFvPatchScalarField.H  |  8 +-
 ...meVaryingMappedFixedValuePointPatchField.C |  2 +-
 ...meVaryingMappedFixedValuePointPatchField.H |  4 +-
 .../fixedTemperatureConstraint.C              |  6 +-
 .../fixedTemperatureConstraint.H              |  6 +-
 .../ConeInjection/ConeInjection.C             | 12 +--
 .../ConeInjection/ConeInjection.H             | 10 +--
 .../ConeNozzleInjection/ConeNozzleInjection.C | 10 +--
 .../ConeNozzleInjection/ConeNozzleInjection.H | 12 +--
 .../InflationInjection/InflationInjection.C   |  4 +-
 .../InflationInjection/InflationInjection.H   |  4 +-
 .../InjectionModel/InjectionModel.H           |  4 +-
 .../PatchFlowRateInjection.C                  |  6 +-
 .../PatchFlowRateInjection.H                  |  4 +-
 .../PatchInjection/PatchInjection.C           |  6 +-
 .../PatchInjection/PatchInjection.H           |  4 +-
 src/mesh/extrudeModel/radial/radial.C         |  4 +-
 src/mesh/extrudeModel/radial/radial.H         |  4 +-
 .../setTimeStep/setTimeStepFunctionObject.C   |  4 +-
 .../setTimeStep/setTimeStepFunctionObject.H   |  4 +-
 ...linedFilmNusseltHeightFvPatchScalarField.C |  8 +-
 ...linedFilmNusseltHeightFvPatchScalarField.H |  8 +-
 ...lmNusseltInletVelocityFvPatchVectorField.C |  8 +-
 ...lmNusseltInletVelocityFvPatchVectorField.H |  8 +-
 .../energyJump/energyJumpFvPatchScalarField.H |  2 +-
 ...ndentAlphaContactAngleFvPatchScalarField.C |  4 +-
 ...ndentAlphaContactAngleFvPatchScalarField.H |  4 +-
 102 files changed, 497 insertions(+), 494 deletions(-)
 create mode 100644 applications/test/Function1/Make/files
 rename applications/test/{dataEntry => Function1}/Make/options (100%)
 rename applications/test/{dataEntry/Test-DataEntry.C => Function1/Test-Function1.C} (82%)
 rename applications/test/{dataEntry/dataEntryProperties => Function1/function1Properties} (92%)
 delete mode 100644 applications/test/dataEntry/Make/files
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/CSV/CSV.C (93%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/CSV/CSV.H (93%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/CSV/CSVIO.C (93%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/Constant/Constant.C (83%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/Constant/Constant.H (88%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/Constant/ConstantIO.C (89%)
 rename src/OpenFOAM/primitives/functions/{DataEntry/DataEntry/DataEntry.C => Function1/Function1/Function1.C} (81%)
 rename src/OpenFOAM/primitives/functions/{DataEntry/DataEntry/DataEntry.H => Function1/Function1/Function1.H} (82%)
 rename src/OpenFOAM/primitives/functions/{DataEntry/DataEntry/DataEntryFwd.H => Function1/Function1/Function1Fwd.H} (76%)
 rename src/OpenFOAM/primitives/functions/{DataEntry/DataEntry/DataEntryIO.C => Function1/Function1/Function1IO.C} (85%)
 rename src/OpenFOAM/primitives/functions/{DataEntry/DataEntry/DataEntryNew.C => Function1/Function1/Function1New.C} (81%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/PolynomialEntry/PolynomialEntry.C (90%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/PolynomialEntry/PolynomialEntry.H (91%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/PolynomialEntry/PolynomialEntryIO.C (89%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/Sine/Sine.C (87%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/Sine/Sine.H (92%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/Sine/SineIO.C (92%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/Table/Table.C (92%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/Table/Table.H (90%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/Table/TableBase.C (88%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/Table/TableBase.H (95%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/Table/TableBaseIO.C (87%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/TableFile/TableFile.C (93%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/TableFile/TableFile.H (91%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/TableFile/TableFileIO.C (93%)
 rename src/OpenFOAM/primitives/functions/{DataEntry => Function1}/makeDataEntries.C (52%)
 rename src/OpenFOAM/primitives/functions/{TimeDataEntry/TimeDataEntry/TimeDataEntry.C => TimeFunction1/TimeFunction1/TimeFunction1.C} (78%)
 rename src/OpenFOAM/primitives/functions/{TimeDataEntry/TimeDataEntry/TimeDataEntry.H => TimeFunction1/TimeFunction1/TimeFunction1.H} (84%)

diff --git a/applications/test/Function1/Make/files b/applications/test/Function1/Make/files
new file mode 100644
index 0000000000..6647a7cbbe
--- /dev/null
+++ b/applications/test/Function1/Make/files
@@ -0,0 +1,3 @@
+Test-Function1.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-Function1
diff --git a/applications/test/dataEntry/Make/options b/applications/test/Function1/Make/options
similarity index 100%
rename from applications/test/dataEntry/Make/options
rename to applications/test/Function1/Make/options
diff --git a/applications/test/dataEntry/Test-DataEntry.C b/applications/test/Function1/Test-Function1.C
similarity index 82%
rename from applications/test/dataEntry/Test-DataEntry.C
rename to applications/test/Function1/Test-Function1.C
index cde0801610..ab4baee150 100644
--- a/applications/test/dataEntry/Test-DataEntry.C
+++ b/applications/test/Function1/Test-Function1.C
@@ -22,15 +22,15 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    testDataEntry
+    Test-Function1
 
 Description
-    Tests DataEntry
+    Tests Function1
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "DataEntry.H"
+#include "Function1.H"
 #include "IOdictionary.H"
 #include "linearInterpolationWeights.H"
 #include "splineInterpolationWeights.H"
@@ -54,8 +54,8 @@ int main(int argc, char *argv[])
     //values[0] = 0.0;
     //values[1] = 1.0;
 
-    //linearInterpolationWeights interpolator
-    splineInterpolationWeights interpolator
+    linearInterpolationWeights interpolator
+    //splineInterpolationWeights interpolator
     (
         samples
     );
@@ -98,11 +98,11 @@ int main(int argc, char *argv[])
     return 1;
 }
 
-    IOdictionary dataEntryProperties
+    IOdictionary function1Properties
     (
         IOobject
         (
-            "dataEntryProperties",
+            "function1Properties",
             runTime.constant(),
             mesh,
             IOobject::MUST_READ_IF_MODIFIED,
@@ -110,19 +110,19 @@ int main(int argc, char *argv[])
         )
     );
 
-    autoPtr<DataEntry<scalar>> dataEntry
+    autoPtr<Function1<scalar>> function1
     (
-        DataEntry<scalar>::New
+        Function1<scalar>::New
         (
-            "dataEntry",
-            dataEntryProperties
+            "function1",
+            function1Properties
         )
     );
 
-    scalar x0 = readScalar(dataEntryProperties.lookup("x0"));
-    scalar x1 = readScalar(dataEntryProperties.lookup("x1"));
+    scalar x0 = readScalar(function1Properties.lookup("x0"));
+    scalar x1 = readScalar(function1Properties.lookup("x1"));
 
-    Info<< "Data entry type: " << dataEntry().type() << nl << endl;
+    Info<< "Data entry type: " << function1().type() << nl << endl;
 
     Info<< "Inputs" << nl
         << "    x0 = " << x0 << nl
@@ -130,12 +130,12 @@ int main(int argc, char *argv[])
         << endl;
 
     Info<< "Interpolation" << nl
-        << "    f(x0) = " << dataEntry().value(x0) << nl
-        << "    f(x1) = " << dataEntry().value(x1) << nl
+        << "    f(x0) = " << function1().value(x0) << nl
+        << "    f(x1) = " << function1().value(x1) << nl
         << endl;
 
     Info<< "Integration" << nl
-        << "    int(f(x)) lim(x0->x1) = " << dataEntry().integrate(x0, x1) << nl
+        << "    int(f(x)) lim(x0->x1) = " << function1().integrate(x0, x1) << nl
         << endl;
 
     return 0;
diff --git a/applications/test/dataEntry/dataEntryProperties b/applications/test/Function1/function1Properties
similarity index 92%
rename from applications/test/dataEntry/dataEntryProperties
rename to applications/test/Function1/function1Properties
index b2511690f4..07196014b7 100644
--- a/applications/test/dataEntry/dataEntryProperties
+++ b/applications/test/Function1/function1Properties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      dataEntryProperties;
+    object      function1Properties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -19,7 +19,7 @@ x0  0.5;
 x1  1;
 
 
-dataEntry table ((0 0)(10 1));
+function1 table ((0 0)(10 1));
 
 
 // ************************************************************************* //
diff --git a/applications/test/dataEntry/Make/files b/applications/test/dataEntry/Make/files
deleted file mode 100644
index c514002f99..0000000000
--- a/applications/test/dataEntry/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-Test-DataEntry.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-DataEntry
diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C
index 87615d18e3..43597560f0 100644
--- a/applications/utilities/postProcessing/noise/noise.C
+++ b/applications/utilities/postProcessing/noise/noise.C
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
     #include "createFields.H"
 
     Info<< "Reading data file" << endl;
-    DataEntryTypes::CSV<scalar> pData("pressure", dict, "Data");
+    Function1Types::CSV<scalar> pData("pressure", dict, "Data");
 
     // time history data
     const scalarField t(pData.x());
diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index c518262cd9..8095873f5a 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ CONSTRUCT
     scalarData_(readScalar(dict.lookup("scalarData"))),
     data_(pTraits<TYPE>(dict.lookup("data"))),
     fieldData_("fieldData", dict, p.size()),
-    timeVsData_(DataEntry<TYPE>::New("timeVsData", dict)),
+    timeVsData_(Function1<TYPE>::New("timeVsData", dict)),
     wordData_(dict.lookupOrDefault<word>("wordName", "wordDefault")),
     labelData_(-1),
     boolData_(false)
@@ -203,7 +203,10 @@ void Foam::CLASS::updateCoeffs()
     );
 
     const scalarField& phip =
-        this->patch().template lookupPatchField<surfaceScalarField, scalar>("phi");
+        this->patch().template lookupPatchField<surfaceScalarField, scalar>
+        (
+            "phi"
+        );
     this->valueFraction() = 1.0 - pos(phip);
 
     PARENT::updateCoeffs();
diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H
index 14bbcb76cf..27e5ac12dd 100644
--- a/etc/codeTemplates/BC/BC.H
+++ b/etc/codeTemplates/BC/BC.H
@@ -80,7 +80,7 @@ SourceFiles
 #define CONSTRUCT_H
 
 #include "BASEFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -110,7 +110,7 @@ class CONSTRUCT
         FIELD fieldData_;
 
         //- Type specified as a function of time for time-varying BCs
-        autoPtr<DataEntry<TYPE>> timeVsData_;
+        autoPtr<Function1<TYPE>> timeVsData_;
 
         //- Word entry, e.g. pName_ for name of the pressure field on database
         word wordData_;
diff --git a/etc/controlDict b/etc/controlDict
index 6fa473e688..fac98db233 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -123,7 +123,7 @@ DebugSwitches
     DICGaussSeidel      0;
     DILU                0;
     DILUGaussSeidel     0;
-    DataEntry           0;
+    Function1           0;
     DeardorffDiffStress 0;
     DispersionModel     0;
     DispersionRASModel  0;
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 6b271cfc1d..3f325fd453 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -72,7 +72,7 @@ primitives/septernion/septernion.C
 primitives/triad/triad.C
 
 /* functions, data entries */
-primitives/functions/DataEntry/makeDataEntries.C
+primitives/functions/Function1/makeDataEntries.C
 primitives/functions/Polynomial/polynomialFunction.C
 
 primitives/subModelBase/subModelBase.C
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
index ae42db3989..ec9dfa6ea4 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ uniformFixedValuePointPatchField
 )
 :
     fixedValuePointPatchField<Type>(p, iF, dict, false),
-    uniformValue_(DataEntry<Type>::New("uniformValue", dict))
+    uniformValue_(Function1<Type>::New("uniformValue", dict))
 {
     if (dict.found("value"))
     {
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
index 0a3f45df6a..d0d76fd083 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
@@ -36,7 +36,7 @@ Description
     }
     \endverbatim
 
-    The uniformValue entry is a DataEntry type, able to describe time
+    The uniformValue entry is a Function1 type, able to describe time
     varying functions.  The example above gives the usage for supplying a
     constant value.
 
@@ -49,7 +49,7 @@ SourceFiles
 #define uniformFixedValuePointPatchField_H
 
 #include "fixedValuePointPatchField.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -67,7 +67,7 @@ class uniformFixedValuePointPatchField
 {
     // Private data
 
-        autoPtr<DataEntry<Type>> uniformValue_;
+        autoPtr<Function1<Type>> uniformValue_;
 
 
 public:
@@ -150,7 +150,7 @@ public:
         // Access
 
             //- Return the fluctuation scale
-            const DataEntry<Type>& uniformValue() const
+            const Function1<Type>& uniformValue() const
             {
                 return uniformValue_;
             }
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
similarity index 93%
rename from src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
rename to src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
index a126e05dac..9ba3366732 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
@@ -30,7 +30,7 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<>
-Foam::label Foam::DataEntryTypes::CSV<Foam::label>::readValue
+Foam::label Foam::Function1Types::CSV<Foam::label>::readValue
 (
     const List<string>& splitted
 )
@@ -48,7 +48,7 @@ Foam::label Foam::DataEntryTypes::CSV<Foam::label>::readValue
 
 
 template<>
-Foam::scalar Foam::DataEntryTypes::CSV<Foam::scalar>::readValue
+Foam::scalar Foam::Function1Types::CSV<Foam::scalar>::readValue
 (
     const List<string>& splitted
 )
@@ -66,7 +66,7 @@ Foam::scalar Foam::DataEntryTypes::CSV<Foam::scalar>::readValue
 
 
 template<class Type>
-Type Foam::DataEntryTypes::CSV<Type>::readValue(const List<string>& splitted)
+Type Foam::Function1Types::CSV<Type>::readValue(const List<string>& splitted)
 {
     Type result;
 
@@ -89,7 +89,7 @@ Type Foam::DataEntryTypes::CSV<Type>::readValue(const List<string>& splitted)
 
 
 template<class Type>
-void Foam::DataEntryTypes::CSV<Type>::read()
+void Foam::Function1Types::CSV<Type>::read()
 {
     fileName expandedFile(fName_);
     IFstream is(expandedFile.expand());
@@ -200,7 +200,7 @@ void Foam::DataEntryTypes::CSV<Type>::read()
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::CSV<Type>::CSV
+Foam::Function1Types::CSV<Type>::CSV
 (
     const word& entryName,
     const dictionary& dict,
@@ -231,7 +231,7 @@ Foam::DataEntryTypes::CSV<Type>::CSV
 
 
 template<class Type>
-Foam::DataEntryTypes::CSV<Type>::CSV(const CSV<Type>& tbl)
+Foam::Function1Types::CSV<Type>::CSV(const CSV<Type>& tbl)
 :
     TableBase<Type>(tbl),
     nHeaderLine_(tbl.nHeaderLine_),
@@ -246,14 +246,14 @@ Foam::DataEntryTypes::CSV<Type>::CSV(const CSV<Type>& tbl)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::CSV<Type>::~CSV()
+Foam::Function1Types::CSV<Type>::~CSV()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-const Foam::fileName& Foam::DataEntryTypes::CSV<Type>::fName() const
+const Foam::fileName& Foam::Function1Types::CSV<Type>::fName() const
 {
     return fName_;
 }
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
similarity index 93%
rename from src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
rename to src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
index 40bc214c69..08ff3d52ef 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DataEntryTypes::CSV
+    Foam::Function1Types::CSV
 
 Description
     Templated CSV container data entry.  Reference column is always a scalar,
@@ -51,7 +51,7 @@ SourceFiles
 #ifndef CSV_H
 #define CSV_H
 
-#include "DataEntry.H"
+#include "Function1.H"
 #include "TableBase.H"
 #include "Tuple2.H"
 #include "labelList.H"
@@ -63,15 +63,15 @@ namespace Foam
 {
 
 // Forward declaration of friend functions and operators
-namespace DataEntryTypes
+namespace Function1Types
 {
     template<class Type> class CSV;
 };
 
 template<class Type>
-Ostream& operator<<(Ostream&, const DataEntryTypes::CSV<Type>&);
+Ostream& operator<<(Ostream&, const Function1Types::CSV<Type>&);
 
-namespace DataEntryTypes
+namespace Function1Types
 {
 
 /*---------------------------------------------------------------------------*\
@@ -139,9 +139,9 @@ public:
         CSV(const CSV<Type>& tbl);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type>> clone() const
+        virtual tmp<Function1<Type>> clone() const
         {
-            return tmp<DataEntry<Type>>(new CSV<Type>(*this));
+            return tmp<Function1<Type>>(new CSV<Type>(*this));
         }
 
 
@@ -180,7 +180,7 @@ Foam::scalar CSV<scalar>::readValue(const List<string>& splitted);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace DataEntryTypes
+} // End namespace Function1Types
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
similarity index 93%
rename from src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C
rename to src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
index 286072ec54..5b4785b50d 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
@@ -31,10 +31,10 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const DataEntryTypes::CSV<Type>& tbl
+    const Function1Types::CSV<Type>& tbl
 )
 {
-    os  << static_cast<const DataEntry<Type>& >(tbl)
+    os  << static_cast<const Function1<Type>& >(tbl)
         << token::SPACE << tbl.nHeaderLine_
         << token::SPACE << tbl.timeColumn_
         << token::SPACE << tbl.componentColumns_
@@ -50,9 +50,9 @@ Foam::Ostream& Foam::operator<<
 
 
 template<class Type>
-void Foam::DataEntryTypes::CSV<Type>::writeData(Ostream& os) const
+void Foam::Function1Types::CSV<Type>::writeData(Ostream& os) const
 {
-    DataEntry<Type>::writeData(os);
+    Function1<Type>::writeData(os);
     os  << token::END_STATEMENT << nl;
     os  << indent << word(this->name() + "Coeffs") << nl;
     os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
similarity index 83%
rename from src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
rename to src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
index 8a9758d4ca..ecc7ce732c 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
@@ -28,13 +28,13 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::Constant<Type>::Constant
+Foam::Function1Types::Constant<Type>::Constant
 (
     const word& entryName,
     const dictionary& dict
 )
 :
-    DataEntry<Type>(entryName),
+    Function1<Type>(entryName),
     value_(pTraits<Type>::zero)
 {
     Istream& is(dict.lookup(entryName));
@@ -44,21 +44,21 @@ Foam::DataEntryTypes::Constant<Type>::Constant
 
 
 template<class Type>
-Foam::DataEntryTypes::Constant<Type>::Constant
+Foam::Function1Types::Constant<Type>::Constant
 (
     const word& entryName,
     Istream& is
 )
 :
-    DataEntry<Type>(entryName),
+    Function1<Type>(entryName),
     value_(pTraits<Type>(is))
 {}
 
 
 template<class Type>
-Foam::DataEntryTypes::Constant<Type>::Constant(const Constant<Type>& cnst)
+Foam::Function1Types::Constant<Type>::Constant(const Constant<Type>& cnst)
 :
-    DataEntry<Type>(cnst),
+    Function1<Type>(cnst),
     value_(cnst.value_)
 {}
 
@@ -66,21 +66,21 @@ Foam::DataEntryTypes::Constant<Type>::Constant(const Constant<Type>& cnst)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::Constant<Type>::~Constant()
+Foam::Function1Types::Constant<Type>::~Constant()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Type Foam::DataEntryTypes::Constant<Type>::value(const scalar x) const
+Type Foam::Function1Types::Constant<Type>::value(const scalar x) const
 {
     return value_;
 }
 
 
 template<class Type>
-Type Foam::DataEntryTypes::Constant<Type>::integrate
+Type Foam::Function1Types::Constant<Type>::integrate
 (
     const scalar x1,
     const scalar x2
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
similarity index 88%
rename from src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
rename to src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
index a1e5df884f..756e65af53 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DataEntryTypes::Constant
+    Foam::Function1Types::Constant
 
 Description
     Templated basic entry that holds a constant value.
@@ -40,7 +40,7 @@ SourceFiles
 #ifndef Constant_H
 #define Constant_H
 
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,15 +48,15 @@ namespace Foam
 {
 
 // Forward declaration of friend functions and operators
-namespace DataEntryTypes
+namespace Function1Types
 {
     template<class Type> class Constant;
 };
 
 template<class Type>
-Ostream& operator<<(Ostream&, const DataEntryTypes::Constant<Type>&);
+Ostream& operator<<(Ostream&, const Function1Types::Constant<Type>&);
 
-namespace DataEntryTypes
+namespace Function1Types
 {
 
 /*---------------------------------------------------------------------------*\
@@ -66,7 +66,7 @@ namespace DataEntryTypes
 template<class Type>
 class Constant
 :
-    public DataEntry<Type>
+    public Function1<Type>
 {
     // Private data
 
@@ -92,7 +92,7 @@ public:
         Constant(const word& entryName, const dictionary& dict);
 
         //- Construct from entry name and Istream
-        //  Reads the constant value without the DataEntry type
+        //  Reads the constant value without the Function1 type
         //  for backward compatibility
         Constant(const word& entryName, Istream& is);
 
@@ -100,9 +100,9 @@ public:
         Constant(const Constant<Type>& cnst);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type>> clone() const
+        virtual tmp<Function1<Type>> clone() const
         {
-            return tmp<DataEntry<Type>>(new Constant<Type>(*this));
+            return tmp<Function1<Type>>(new Constant<Type>(*this));
         }
 
 
@@ -135,14 +135,14 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace DataEntryTypes
+} // End namespace Function1Types
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
 #   include "Constant.C"
-#   include "DataEntryNew.C"
+#   include "Function1New.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C b/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
similarity index 89%
rename from src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C
rename to src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
index f3b63b380a..bbc5141929 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
@@ -31,10 +31,10 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const DataEntryTypes::Constant<Type>& cnst
+    const Function1Types::Constant<Type>& cnst
 )
 {
-    os  << static_cast<const DataEntry<Type>& >(cnst)
+    os  << static_cast<const Function1<Type>& >(cnst)
         << token::SPACE << cnst.value_;
 
     // Check state of Ostream
@@ -48,9 +48,9 @@ Foam::Ostream& Foam::operator<<
 
 
 template<class Type>
-void Foam::DataEntryTypes::Constant<Type>::writeData(Ostream& os) const
+void Foam::Function1Types::Constant<Type>::writeData(Ostream& os) const
 {
-    DataEntry<Type>::writeData(os);
+    Function1<Type>::writeData(os);
 
     os  << token::SPACE << value_ << token::END_STATEMENT << nl;
 }
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
similarity index 81%
rename from src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
rename to src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index ab14e40800..bfd21c2e30 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -23,13 +23,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DataEntry.H"
+#include "Function1.H"
 #include "Time.H"
 
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntry<Type>::DataEntry(const word& entryName)
+Foam::Function1<Type>::Function1(const word& entryName)
 :
     refCount(),
     name_(entryName)
@@ -37,7 +37,7 @@ Foam::DataEntry<Type>::DataEntry(const word& entryName)
 
 
 template<class Type>
-Foam::DataEntry<Type>::DataEntry(const DataEntry<Type>& de)
+Foam::Function1<Type>::Function1(const Function1<Type>& de)
 :
     refCount(),
     name_(de.name_)
@@ -47,28 +47,28 @@ Foam::DataEntry<Type>::DataEntry(const DataEntry<Type>& de)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntry<Type>::~DataEntry()
+Foam::Function1<Type>::~Function1()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-const Foam::word& Foam::DataEntry<Type>::name() const
+const Foam::word& Foam::Function1<Type>::name() const
 {
     return name_;
 }
 
 
 template<class Type>
-void Foam::DataEntry<Type>::convertTimeBase(const Time&)
+void Foam::Function1<Type>::convertTimeBase(const Time&)
 {
     // do nothing
 }
 
 
 template<class Type>
-Type Foam::DataEntry<Type>::value(const scalar x) const
+Type Foam::Function1<Type>::value(const scalar x) const
 {
     NotImplemented;
 
@@ -77,7 +77,7 @@ Type Foam::DataEntry<Type>::value(const scalar x) const
 
 
 template<class Type>
-Type Foam::DataEntry<Type>::integrate(const scalar x1, const scalar x2) const
+Type Foam::Function1<Type>::integrate(const scalar x1, const scalar x2) const
 {
     NotImplemented;
 
@@ -86,7 +86,7 @@ Type Foam::DataEntry<Type>::integrate(const scalar x1, const scalar x2) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::DataEntry<Type>::value
+Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::value
 (
     const scalarField& x
 ) const
@@ -103,7 +103,7 @@ Foam::tmp<Foam::Field<Type>> Foam::DataEntry<Type>::value
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::DataEntry<Type>::integrate
+Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::integrate
 (
     const scalarField& x1,
     const scalarField& x2
@@ -122,6 +122,6 @@ Foam::tmp<Foam::Field<Type>> Foam::DataEntry<Type>::integrate
 
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
-#include "DataEntryIO.C"
+#include "Function1IO.C"
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
similarity index 82%
rename from src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
rename to src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index 63fd851b12..a5c77c2527 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DataEntry
+    Foam::Function1
 
 Description
     Top level data entry class for use in dictionaries. Provides a mechanism
@@ -31,13 +31,13 @@ Description
     limits.
 
 SourceFiles
-    DataEntry.C
-    DataEntryNew.C
+    Function1.C
+    Function1New.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef DataEntry_H
-#define DataEntry_H
+#ifndef Function1_H
+#define Function1_H
 
 #include "dictionary.H"
 #include "Field.H"
@@ -51,22 +51,22 @@ namespace Foam
 class Time;
 
 // Forward declaration of friend functions and operators
-template<class Type> class DataEntry;
-template<class Type> Ostream& operator<<(Ostream&, const DataEntry<Type>&);
+template<class Type> class Function1;
+template<class Type> Ostream& operator<<(Ostream&, const Function1<Type>&);
 
 /*---------------------------------------------------------------------------*\
-                         Class DataEntry Declaration
+                         Class Function1 Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-class DataEntry
+class Function1
 :
     public refCount
 {
     // Private Member Functions
 
         //- Disallow default bitwise assignment
-        void operator=(const DataEntry<Type>&);
+        void operator=(const Function1<Type>&);
 
 
 protected:
@@ -80,13 +80,13 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("DataEntry")
+    TypeName("Function1")
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
     (
         autoPtr,
-        DataEntry,
+        Function1,
         dictionary,
         (
             const word& entryName,
@@ -99,20 +99,20 @@ public:
     // Constructor
 
         //- Construct from entry name
-        DataEntry(const word& entryName);
+        Function1(const word& entryName);
 
         //- Copy constructor
-        DataEntry(const DataEntry<Type>& de);
+        Function1(const Function1<Type>& de);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type>> clone() const
+        virtual tmp<Function1<Type>> clone() const
         {
-            return tmp<DataEntry<Type>>(new DataEntry<Type>(*this));
+            return tmp<Function1<Type>>(new Function1<Type>(*this));
         }
 
 
     //- Selector
-    static autoPtr<DataEntry<Type>> New
+    static autoPtr<Function1<Type>> New
     (
         const word& entryName,
         const dictionary& dict
@@ -120,7 +120,7 @@ public:
 
 
     //- Destructor
-    virtual ~DataEntry();
+    virtual ~Function1();
 
 
     // Member Functions
@@ -162,7 +162,7 @@ public:
             friend Ostream& operator<< <Type>
             (
                 Ostream& os,
-                const DataEntry<Type>& de
+                const Function1<Type>& de
             );
 
             //- Write in dictionary format
@@ -176,29 +176,29 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeDataEntry(Type)                                                    \
+#define makeFunction1(Type)                                                    \
                                                                                \
-    defineNamedTemplateTypeNameAndDebug(DataEntry<Type>, 0);                   \
+    defineNamedTemplateTypeNameAndDebug(Function1<Type>, 0);                   \
                                                                                \
     defineTemplateRunTimeSelectionTable                                        \
     (                                                                          \
-        DataEntry<Type>,                                                       \
+        Function1<Type>,                                                       \
         dictionary                                                             \
     );
 
 
-#define makeDataEntryType(SS, Type)                                            \
+#define makeFunction1Type(SS, Type)                                            \
                                                                                \
-    defineNamedTemplateTypeNameAndDebug(DataEntryTypes::SS<Type>, 0);          \
+    defineNamedTemplateTypeNameAndDebug(Function1Types::SS<Type>, 0);          \
                                                                                \
-    DataEntry<Type>::adddictionaryConstructorToTable<DataEntryTypes::SS<Type>> \
+    Function1<Type>::adddictionaryConstructorToTable<Function1Types::SS<Type>> \
         add##SS##Type##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DataEntry.C"
+#   include "Function1.C"
 #   include "Constant.H"
 #endif
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryFwd.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1Fwd.H
similarity index 76%
rename from src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryFwd.H
rename to src/OpenFOAM/primitives/functions/Function1/Function1/Function1Fwd.H
index 326a2a4259..6e3b14ba0c 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryFwd.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1Fwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,10 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef DataEntryFws_H
-#define DataEntryFws_H
+#ifndef Function1Fws_H
+#define Function1Fws_H
 
-#include "DataEntry.H"
+#include "Function1.H"
 #include "vector.H"
 #include "symmTensor.H"
 #include "sphericalTensor.H"
@@ -36,12 +36,12 @@ License
 
 namespace Foam
 {
-    typedef DataEntry<label> labelDataEntry;
-    typedef DataEntry<scalar> scalarDataEntry;
-    typedef DataEntry<vector> vectorDataEntry;
-    typedef DataEntry<symmTensor> symmTensorDataEntry;
-    typedef DataEntry<sphericalTensor> sphericalTensorDataEntry;
-    typedef DataEntry<tensor> tensorDataEntry;
+    typedef Function1<label> labelFunction1;
+    typedef Function1<scalar> scalarFunction1;
+    typedef Function1<vector> vectorFunction1;
+    typedef Function1<symmTensor> symmTensorFunction1;
+    typedef Function1<sphericalTensor> sphericalTensorFunction1;
+    typedef Function1<tensor> tensorFunction1;
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryIO.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
similarity index 85%
rename from src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryIO.C
rename to src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
index eabaadbcdc..a0835be61d 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
@@ -31,13 +31,13 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const DataEntry<Type>& de
+    const Function1<Type>& de
 )
 {
     // Check state of Ostream
     os.check
     (
-        "Ostream& operator<<(Ostream&, const DataEntry<Type>&)"
+        "Ostream& operator<<(Ostream&, const Function1<Type>&)"
     );
 
     os  << de.name_;
@@ -47,7 +47,7 @@ Foam::Ostream& Foam::operator<<
 
 
 template<class Type>
-void Foam::DataEntry<Type>::writeData(Ostream& os) const
+void Foam::Function1<Type>::writeData(Ostream& os) const
 {
     os.writeKeyword(name_) << type();
 }
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
similarity index 81%
rename from src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
rename to src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
index 49e394f2d0..81d4565401 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr<Foam::DataEntry<Type>> Foam::DataEntry<Type>::New
+Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
 (
     const word& entryName,
     const dictionary& dict
@@ -37,31 +37,31 @@ Foam::autoPtr<Foam::DataEntry<Type>> Foam::DataEntry<Type>::New
     Istream& is(dict.lookup(entryName, false));
 
     token firstToken(is);
-    word DataEntryType;
+    word Function1Type;
 
     if (!firstToken.isWord())
     {
         is.putBack(firstToken);
-        return autoPtr<DataEntry<Type>>
+        return autoPtr<Function1<Type>>
         (
-            new DataEntryTypes::Constant<Type>(entryName, is)
+            new Function1Types::Constant<Type>(entryName, is)
         );
     }
     else
     {
-        DataEntryType = firstToken.wordToken();
+        Function1Type = firstToken.wordToken();
     }
 
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(DataEntryType);
+        dictionaryConstructorTablePtr_->find(Function1Type);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown DataEntry type "
-            << DataEntryType << " for DataEntry "
+            << "Unknown Function1 type "
+            << Function1Type << " for Function1 "
             << entryName << nl << nl
-            << "Valid DataEntry types are:" << nl
+            << "Valid Function1 types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
similarity index 90%
rename from src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
rename to src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
index 5385c761c5..67824da842 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
@@ -28,13 +28,13 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::Polynomial<Type>::Polynomial
+Foam::Function1Types::Polynomial<Type>::Polynomial
 (
     const word& entryName,
     const dictionary& dict
 )
 :
-    DataEntry<Type>(entryName),
+    Function1<Type>(entryName),
     coeffs_(),
     canIntegrate_(true)
 {
@@ -72,13 +72,13 @@ Foam::DataEntryTypes::Polynomial<Type>::Polynomial
 
 
 template<class Type>
-Foam::DataEntryTypes::Polynomial<Type>::Polynomial
+Foam::Function1Types::Polynomial<Type>::Polynomial
 (
     const word& entryName,
     const List<Tuple2<Type, Type>>& coeffs
 )
 :
-    DataEntry<Type>(entryName),
+    Function1<Type>(entryName),
     coeffs_(coeffs),
     canIntegrate_(true)
 {
@@ -111,9 +111,9 @@ Foam::DataEntryTypes::Polynomial<Type>::Polynomial
 
 
 template<class Type>
-Foam::DataEntryTypes::Polynomial<Type>::Polynomial(const Polynomial& poly)
+Foam::Function1Types::Polynomial<Type>::Polynomial(const Polynomial& poly)
 :
-    DataEntry<Type>(poly),
+    Function1<Type>(poly),
     coeffs_(poly.coeffs_),
     canIntegrate_(poly.canIntegrate_)
 {}
@@ -122,14 +122,14 @@ Foam::DataEntryTypes::Polynomial<Type>::Polynomial(const Polynomial& poly)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::Polynomial<Type>::~Polynomial()
+Foam::Function1Types::Polynomial<Type>::~Polynomial()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::DataEntryTypes::Polynomial<Type>::convertTimeBase(const Time& t)
+void Foam::Function1Types::Polynomial<Type>::convertTimeBase(const Time& t)
 {
     forAll(coeffs_, i)
     {
@@ -144,7 +144,7 @@ void Foam::DataEntryTypes::Polynomial<Type>::convertTimeBase(const Time& t)
 
 
 template<class Type>
-Type Foam::DataEntryTypes::Polynomial<Type>::value(const scalar x) const
+Type Foam::Function1Types::Polynomial<Type>::value(const scalar x) const
 {
     Type y(pTraits<Type>::zero);
     forAll(coeffs_, i)
@@ -161,7 +161,7 @@ Type Foam::DataEntryTypes::Polynomial<Type>::value(const scalar x) const
 
 
 template<class Type>
-Type Foam::DataEntryTypes::Polynomial<Type>::integrate
+Type Foam::Function1Types::Polynomial<Type>::integrate
 (
     const scalar x1,
     const scalar x2
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
similarity index 91%
rename from src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
rename to src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
index c23a4dfc8a..04ad5dfb7b 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DataEntryTypes::PolynomialEntry
+    Foam::Function1Types::PolynomialEntry
 
 Description
     PolynomialEntry container data entry for scalars. Items are stored in a
@@ -45,9 +45,9 @@ SourceFiles
 #ifndef PolynomialEntry_H
 #define PolynomialEntry_H
 
-#include "DataEntry.H"
+#include "Function1.H"
 #include "Tuple2.H"
-#include "DataEntryFwd.H"
+#include "Function1Fwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -55,15 +55,15 @@ namespace Foam
 {
 
 // Forward declaration of friend functions and operators
-namespace DataEntryTypes
+namespace Function1Types
 {
     template<class Type> class Polynomial;
 };
 
 template<class Type>
-Ostream& operator<<(Ostream&, const DataEntryTypes::Polynomial<Type>&);
+Ostream& operator<<(Ostream&, const Function1Types::Polynomial<Type>&);
 
-namespace DataEntryTypes
+namespace Function1Types
 {
 
 /*---------------------------------------------------------------------------*\
@@ -73,7 +73,7 @@ namespace DataEntryTypes
 template<class Type>
 class Polynomial
 :
-    public DataEntry<Type>
+    public Function1<Type>
 {
     // Private data
 
@@ -111,9 +111,9 @@ public:
         Polynomial(const Polynomial& poly);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type>> clone() const
+        virtual tmp<Function1<Type>> clone() const
         {
-            return tmp<DataEntry<Type>>(new Polynomial(*this));
+            return tmp<Function1<Type>>(new Polynomial(*this));
         }
 
 
@@ -154,7 +154,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace DataEntryTypes
+} // End namespace Function1Types
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntryIO.C b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
similarity index 89%
rename from src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntryIO.C
rename to src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
index 6d9124602a..80d4f00bcc 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntryIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
@@ -31,10 +31,10 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const DataEntryTypes::Polynomial<Type>& poly
+    const Function1Types::Polynomial<Type>& poly
 )
 {
-    os  << static_cast<const DataEntry<Type>& >(poly)
+    os  << static_cast<const Function1<Type>& >(poly)
         << token::SPACE << poly.coeffs_;
 
     // Check state of Ostream
@@ -48,9 +48,9 @@ Foam::Ostream& Foam::operator<<
 
 
 template<class Type>
-void Foam::DataEntryTypes::Polynomial<Type>::writeData(Ostream& os) const
+void Foam::Function1Types::Polynomial<Type>::writeData(Ostream& os) const
 {
-    DataEntry<Type>::writeData(os);
+    Function1<Type>::writeData(os);
 
     os  << nl << indent << coeffs_ << token::END_STATEMENT << nl;
 }
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
similarity index 87%
rename from src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.C
rename to src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index 8bedc6324d..ef2b529fe5 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::DataEntryTypes::Sine<Type>::read(const dictionary& coeffs)
+void Foam::Function1Types::Sine<Type>::read(const dictionary& coeffs)
 {
     t0_ = coeffs.lookupOrDefault<scalar>("t0", 0);
     amplitude_ = coeffs.lookupOrDefault<scalar>("amplitude", 1);
@@ -40,23 +40,23 @@ void Foam::DataEntryTypes::Sine<Type>::read(const dictionary& coeffs)
 
 
 template<class Type>
-Foam::DataEntryTypes::Sine<Type>::Sine
+Foam::Function1Types::Sine<Type>::Sine
 (
     const word& entryName,
     const dictionary& dict,
     const word& ext
 )
 :
-    DataEntry<Type>(entryName)
+    Function1<Type>(entryName)
 {
     read(dict.subDict(entryName + ext));
 }
 
 
 template<class Type>
-Foam::DataEntryTypes::Sine<Type>::Sine(const Sine<Type>& se)
+Foam::Function1Types::Sine<Type>::Sine(const Sine<Type>& se)
 :
-    DataEntry<Type>(se),
+    Function1<Type>(se),
     t0_(se.t0_),
     amplitude_(se.amplitude_),
     frequency_(se.frequency_),
@@ -67,14 +67,14 @@ Foam::DataEntryTypes::Sine<Type>::Sine(const Sine<Type>& se)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::Sine<Type>::~Sine()
+Foam::Function1Types::Sine<Type>::~Sine()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Type Foam::DataEntryTypes::Sine<Type>::value(const scalar t) const
+Type Foam::Function1Types::Sine<Type>::value(const scalar t) const
 {
     return
         amplitude_*sin(constant::mathematical::twoPi*frequency_*(t - t0_))
@@ -84,7 +84,7 @@ Type Foam::DataEntryTypes::Sine<Type>::value(const scalar t) const
 
 
 template<class Type>
-Type Foam::DataEntryTypes::Sine<Type>::integrate
+Type Foam::Function1Types::Sine<Type>::integrate
 (
     const scalar t1,
     const scalar t2
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
similarity index 92%
rename from src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H
rename to src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index 1c7d7adb28..c5e852742a 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DataEntryTypes::Sine
+    Foam::Function1Types::Sine
 
 Description
     Templated sine function with support for an offset level.
@@ -74,7 +74,7 @@ SourceFiles
 #ifndef Sine_H
 #define Sine_H
 
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -82,15 +82,15 @@ namespace Foam
 {
 
 // Forward declaration of friend functions and operators
-namespace DataEntryTypes
+namespace Function1Types
 {
     template<class Type> class Sine;
 };
 
 template<class Type>
-Ostream& operator<<(Ostream&, const DataEntryTypes::Sine<Type>&);
+Ostream& operator<<(Ostream&, const Function1Types::Sine<Type>&);
 
-namespace DataEntryTypes
+namespace Function1Types
 {
 
 /*---------------------------------------------------------------------------*\
@@ -100,7 +100,7 @@ namespace DataEntryTypes
 template<class Type>
 class Sine
 :
-    public DataEntry<Type>
+    public Function1<Type>
 {
     // Private data
 
@@ -149,9 +149,9 @@ public:
         Sine(const Sine<Type>& se);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type>> clone() const
+        virtual tmp<Function1<Type>> clone() const
         {
-            return tmp<DataEntry<Type>>(new Sine<Type>(*this));
+            return tmp<Function1<Type>>(new Sine<Type>(*this));
         }
 
 
@@ -184,7 +184,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace DataEntryTypes
+} // End namespace Function1Types
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Sine/SineIO.C b/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
similarity index 92%
rename from src/OpenFOAM/primitives/functions/DataEntry/Sine/SineIO.C
rename to src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
index afbaba8dee..dc1ba58d41 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Sine/SineIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
@@ -31,10 +31,10 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const DataEntryTypes::Sine<Type>& se
+    const Function1Types::Sine<Type>& se
 )
 {
-    os  << static_cast<const DataEntry<Type>& >(se)
+    os  << static_cast<const Function1<Type>& >(se)
         << token::SPACE << se.t0_
         << token::SPACE << se.amplitude_
         << token::SPACE << se.frequency_
@@ -52,9 +52,9 @@ Foam::Ostream& Foam::operator<<
 
 
 template<class Type>
-void Foam::DataEntryTypes::Sine<Type>::writeData(Ostream& os) const
+void Foam::Function1Types::Sine<Type>::writeData(Ostream& os) const
 {
-    DataEntry<Type>::writeData(os);
+    Function1<Type>::writeData(os);
     os  << token::END_STATEMENT << nl;
     os  << indent << word(this->name() + "Coeffs") << nl;
     os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
similarity index 92%
rename from src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
rename to src/OpenFOAM/primitives/functions/Function1/Table/Table.C
index 0927cc193b..92bbefc8cc 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::Table<Type>::Table
+Foam::Function1Types::Table<Type>::Table
 (
     const word& entryName,
     const dictionary& dict
@@ -44,7 +44,7 @@ Foam::DataEntryTypes::Table<Type>::Table
 
 
 template<class Type>
-Foam::DataEntryTypes::Table<Type>::Table(const Table<Type>& tbl)
+Foam::Function1Types::Table<Type>::Table(const Table<Type>& tbl)
 :
     TableBase<Type>(tbl)
 {}
@@ -53,7 +53,7 @@ Foam::DataEntryTypes::Table<Type>::Table(const Table<Type>& tbl)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::Table<Type>::~Table()
+Foam::Function1Types::Table<Type>::~Table()
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
similarity index 90%
rename from src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
rename to src/OpenFOAM/primitives/functions/Function1/Table/Table.H
index bcb25e57a4..afa30eec61 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DataEntryTypes::Table
+    Foam::Function1Types::Table
 
 Description
     Templated table container data entry. Items are stored in a list of
@@ -45,7 +45,7 @@ SourceFiles
 #ifndef Table_H
 #define Table_H
 
-#include "DataEntry.H"
+#include "Function1.H"
 #include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,15 +54,15 @@ namespace Foam
 {
 
 // Forward declaration of friend functions and operators
-namespace DataEntryTypes
+namespace Function1Types
 {
     template<class Type> class Table;
 };
 
 template<class Type>
-Ostream& operator<<(Ostream&, const DataEntryTypes::Table<Type>&);
+Ostream& operator<<(Ostream&, const Function1Types::Table<Type>&);
 
-namespace DataEntryTypes
+namespace Function1Types
 {
 
 /*---------------------------------------------------------------------------*\
@@ -95,9 +95,9 @@ public:
         Table(const Table<Type>& tbl);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type>> clone() const
+        virtual tmp<Function1<Type>> clone() const
         {
-            return tmp<DataEntry<Type>>(new Table<Type>(*this));
+            return tmp<Function1<Type>>(new Table<Type>(*this));
         }
 
 
@@ -108,7 +108,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace DataEntryTypes
+} // End namespace Function1Types
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
similarity index 88%
rename from src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
rename to src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index e220f072ba..7c2755e59a 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -31,7 +31,7 @@ License
 
 template<class Type>
 const Foam::interpolationWeights&
-Foam::DataEntryTypes::TableBase<Type>::interpolator() const
+Foam::Function1Types::TableBase<Type>::interpolator() const
 {
     if (interpolatorPtr_.empty())
     {
@@ -56,13 +56,13 @@ Foam::DataEntryTypes::TableBase<Type>::interpolator() const
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::TableBase<Type>::TableBase
+Foam::Function1Types::TableBase<Type>::TableBase
 (
     const word& name,
     const dictionary& dict
 )
 :
-    DataEntry<Type>(name),
+    Function1<Type>(name),
     name_(name),
     boundsHandling_
     (
@@ -80,9 +80,9 @@ Foam::DataEntryTypes::TableBase<Type>::TableBase
 
 
 template<class Type>
-Foam::DataEntryTypes::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
+Foam::Function1Types::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
 :
-    DataEntry<Type>(tbl),
+    Function1<Type>(tbl),
     name_(tbl.name_),
     boundsHandling_(tbl.boundsHandling_),
     interpolationScheme_(tbl.interpolationScheme_),
@@ -95,14 +95,14 @@ Foam::DataEntryTypes::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::TableBase<Type>::~TableBase()
+Foam::Function1Types::TableBase<Type>::~TableBase()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::word Foam::DataEntryTypes::TableBase<Type>::boundsHandlingToWord
+Foam::word Foam::Function1Types::TableBase<Type>::boundsHandlingToWord
 (
      const boundsHandling& bound
 ) const
@@ -138,8 +138,8 @@ Foam::word Foam::DataEntryTypes::TableBase<Type>::boundsHandlingToWord
 
 
 template<class Type>
-typename Foam::DataEntryTypes::TableBase<Type>::boundsHandling
-Foam::DataEntryTypes::TableBase<Type>::wordToBoundsHandling
+typename Foam::Function1Types::TableBase<Type>::boundsHandling
+Foam::Function1Types::TableBase<Type>::wordToBoundsHandling
 (
     const word& bound
 ) const
@@ -172,8 +172,8 @@ Foam::DataEntryTypes::TableBase<Type>::wordToBoundsHandling
 
 
 template<class Type>
-typename Foam::DataEntryTypes::TableBase<Type>::boundsHandling
-Foam::DataEntryTypes::TableBase<Type>::outOfBounds
+typename Foam::Function1Types::TableBase<Type>::boundsHandling
+Foam::Function1Types::TableBase<Type>::outOfBounds
 (
     const boundsHandling& bound
 )
@@ -186,7 +186,7 @@ Foam::DataEntryTypes::TableBase<Type>::outOfBounds
 
 
 template<class Type>
-void Foam::DataEntryTypes::TableBase<Type>::check() const
+void Foam::Function1Types::TableBase<Type>::check() const
 {
     if (!table_.size())
     {
@@ -215,7 +215,7 @@ void Foam::DataEntryTypes::TableBase<Type>::check() const
 
 
 template<class Type>
-bool Foam::DataEntryTypes::TableBase<Type>::checkMinBounds
+bool Foam::Function1Types::TableBase<Type>::checkMinBounds
 (
     const scalar x,
     scalar& xDash
@@ -265,7 +265,7 @@ bool Foam::DataEntryTypes::TableBase<Type>::checkMinBounds
 
 
 template<class Type>
-bool Foam::DataEntryTypes::TableBase<Type>::checkMaxBounds
+bool Foam::Function1Types::TableBase<Type>::checkMaxBounds
 (
     const scalar x,
     scalar& xDash
@@ -315,7 +315,7 @@ bool Foam::DataEntryTypes::TableBase<Type>::checkMaxBounds
 
 
 template<class Type>
-void Foam::DataEntryTypes::TableBase<Type>::convertTimeBase(const Time& t)
+void Foam::Function1Types::TableBase<Type>::convertTimeBase(const Time& t)
 {
     forAll(table_, i)
     {
@@ -329,7 +329,7 @@ void Foam::DataEntryTypes::TableBase<Type>::convertTimeBase(const Time& t)
 
 
 template<class Type>
-Type Foam::DataEntryTypes::TableBase<Type>::value(const scalar x) const
+Type Foam::Function1Types::TableBase<Type>::value(const scalar x) const
 {
     scalar xDash = x;
 
@@ -357,7 +357,7 @@ Type Foam::DataEntryTypes::TableBase<Type>::value(const scalar x) const
 
 
 template<class Type>
-Type Foam::DataEntryTypes::TableBase<Type>::integrate
+Type Foam::Function1Types::TableBase<Type>::integrate
 (
     const scalar x1,
     const scalar x2
@@ -377,7 +377,7 @@ Type Foam::DataEntryTypes::TableBase<Type>::integrate
 
 
 template<class Type>
-Foam::tmp<Foam::scalarField> Foam::DataEntryTypes::TableBase<Type>::x() const
+Foam::tmp<Foam::scalarField> Foam::Function1Types::TableBase<Type>::x() const
 {
     tmp<scalarField> tfld(new scalarField(table_.size(), 0.0));
     scalarField& fld = tfld();
@@ -392,7 +392,7 @@ Foam::tmp<Foam::scalarField> Foam::DataEntryTypes::TableBase<Type>::x() const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::DataEntryTypes::TableBase<Type>::y() const
+Foam::tmp<Foam::Field<Type>> Foam::Function1Types::TableBase<Type>::y() const
 {
     tmp<Field<Type>> tfld(new Field<Type>(table_.size(), pTraits<Type>::zero));
     Field<Type>& fld = tfld();
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
similarity index 95%
rename from src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
rename to src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index 43af2d8bd0..d3eb69e788 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DataEntryTypes::TableBase
+    Foam::Function1Types::TableBase
 
 Description
     Base class for table with bounds handling, interpolation and integration
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef TableBase_H
 #define TableBase_H
 
-#include "DataEntry.H"
+#include "Function1.H"
 #include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,15 +46,15 @@ namespace Foam
 class interpolationWeights;
 
 // Forward declaration of friend functions and operators
-namespace DataEntryTypes
+namespace Function1Types
 {
     template<class Type> class TableBase;
 };
 
 template<class Type>
-Ostream& operator<<(Ostream&, const DataEntryTypes::TableBase<Type>&);
+Ostream& operator<<(Ostream&, const Function1Types::TableBase<Type>&);
 
-namespace DataEntryTypes
+namespace Function1Types
 {
 
 /*---------------------------------------------------------------------------*\
@@ -64,7 +64,7 @@ namespace DataEntryTypes
 template<class Type>
 class TableBase
 :
-    public DataEntry<Type>
+    public Function1<Type>
 {
 public:
 
@@ -188,7 +188,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace DataEntryTypes
+} // End namespace Function1Types
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
similarity index 87%
rename from src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
rename to src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
index 436983326e..372317ae4e 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
@@ -31,10 +31,10 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const DataEntryTypes::TableBase<Type>& tbl
+    const Function1Types::TableBase<Type>& tbl
 )
 {
-    os  << static_cast<const DataEntry<Type>&>(tbl);
+    os  << static_cast<const Function1<Type>&>(tbl);
     os << token::SPACE << tbl.table_;
 
     // Check state of Ostream
@@ -48,16 +48,16 @@ Foam::Ostream& Foam::operator<<
 
 
 template<class Type>
-void Foam::DataEntryTypes::TableBase<Type>::writeData(Ostream& os) const
+void Foam::Function1Types::TableBase<Type>::writeData(Ostream& os) const
 {
-    DataEntry<Type>::writeData(os);
+    Function1<Type>::writeData(os);
     os  << nl << indent << table_ << token::END_STATEMENT << nl;
     writeEntries(os);
 }
 
 
 template<class Type>
-void Foam::DataEntryTypes::TableBase<Type>::writeEntries(Ostream& os) const
+void Foam::Function1Types::TableBase<Type>::writeEntries(Ostream& os) const
 {
     if (boundsHandling_ != CLAMP)
     {
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
similarity index 93%
rename from src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
rename to src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
index 4fbe2ea29f..071eaf09cf 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::TableFile<Type>::TableFile
+Foam::Function1Types::TableFile<Type>::TableFile
 (
     const word& entryName,
     const dictionary& dict
@@ -58,7 +58,7 @@ Foam::DataEntryTypes::TableFile<Type>::TableFile
 
 
 template<class Type>
-Foam::DataEntryTypes::TableFile<Type>::TableFile(const TableFile<Type>& tbl)
+Foam::Function1Types::TableFile<Type>::TableFile(const TableFile<Type>& tbl)
 :
     TableBase<Type>(tbl),
     fName_(tbl.fName_)
@@ -68,7 +68,7 @@ Foam::DataEntryTypes::TableFile<Type>::TableFile(const TableFile<Type>& tbl)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntryTypes::TableFile<Type>::~TableFile()
+Foam::Function1Types::TableFile<Type>::~TableFile()
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
similarity index 91%
rename from src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
rename to src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
index 9cad75efb3..2ce0e09597 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DataEntryTypes::TableFile
+    Foam::Function1Types::TableFile
 
 Description
     Templated table container data entry where data is read from file.
@@ -56,7 +56,7 @@ SourceFiles
 #ifndef TableFile_H
 #define TableFile_H
 
-#include "DataEntry.H"
+#include "Function1.H"
 #include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,15 +65,15 @@ namespace Foam
 {
 
 // Forward declaration of friend functions and operators
-namespace DataEntryTypes
+namespace Function1Types
 {
     template<class Type> class TableFile;
 };
 
 template<class Type>
-Ostream& operator<<(Ostream&, const DataEntryTypes::TableFile<Type>&);
+Ostream& operator<<(Ostream&, const Function1Types::TableFile<Type>&);
 
-namespace DataEntryTypes
+namespace Function1Types
 {
 
 /*---------------------------------------------------------------------------*\
@@ -112,9 +112,9 @@ public:
         TableFile(const TableFile<Type>& tbl);
 
         //- Construct and return a clone
-        virtual tmp<DataEntry<Type>> clone() const
+        virtual tmp<Function1<Type>> clone() const
         {
-            return tmp<DataEntry<Type>>(new TableFile<Type>(*this));
+            return tmp<Function1<Type>>(new TableFile<Type>(*this));
         }
 
 
@@ -131,7 +131,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace DataEntryTypes
+} // End namespace Function1Types
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFileIO.C
similarity index 93%
rename from src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C
rename to src/OpenFOAM/primitives/functions/Function1/TableFile/TableFileIO.C
index 9c0a3bbb42..dbd39e21b5 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFileIO.C
@@ -23,14 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::DataEntryTypes::TableFile<Type>::writeData(Ostream& os) const
+void Foam::Function1Types::TableFile<Type>::writeData(Ostream& os) const
 {
-    DataEntry<Type>::writeData(os);
+    Function1<Type>::writeData(os);
 
     os  << token::END_STATEMENT << nl
         << indent << word(this->name() + "Coeffs") << nl
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C b/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C
similarity index 52%
rename from src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
rename to src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C
index db8f3f7490..c8d06e5bbc 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
+++ b/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C
@@ -39,50 +39,50 @@ License
 
 namespace Foam
 {
-    makeDataEntry(label);
-    makeDataEntryType(Constant, label);
+    makeFunction1(label);
+    makeFunction1Type(Constant, label);
     // Polynomial functions and interpolation do evaluate to label
     // Instead evaluate a scalar and convert to label as appropriate
 
-    makeDataEntry(scalar);
-    makeDataEntryType(Constant, scalar);
-    makeDataEntryType(Polynomial, scalar);
-    makeDataEntryType(Sine, scalar);
-    makeDataEntryType(CSV, scalar);
-    makeDataEntryType(Table, scalar);
-    makeDataEntryType(TableFile, scalar);
+    makeFunction1(scalar);
+    makeFunction1Type(Constant, scalar);
+    makeFunction1Type(Polynomial, scalar);
+    makeFunction1Type(Sine, scalar);
+    makeFunction1Type(CSV, scalar);
+    makeFunction1Type(Table, scalar);
+    makeFunction1Type(TableFile, scalar);
 
-    makeDataEntry(vector);
-    makeDataEntryType(Constant, vector);
-    makeDataEntryType(Polynomial, vector);
-    makeDataEntryType(Sine, vector);
-    makeDataEntryType(CSV, vector);
-    makeDataEntryType(Table, vector);
-    makeDataEntryType(TableFile, vector);
+    makeFunction1(vector);
+    makeFunction1Type(Constant, vector);
+    makeFunction1Type(Polynomial, vector);
+    makeFunction1Type(Sine, vector);
+    makeFunction1Type(CSV, vector);
+    makeFunction1Type(Table, vector);
+    makeFunction1Type(TableFile, vector);
 
-    makeDataEntry(sphericalTensor);
-    makeDataEntryType(Constant, sphericalTensor);
-    makeDataEntryType(Polynomial, sphericalTensor);
-    makeDataEntryType(Sine, sphericalTensor);
-    makeDataEntryType(CSV, sphericalTensor);
-    makeDataEntryType(Table, sphericalTensor);
-    makeDataEntryType(TableFile, sphericalTensor);
+    makeFunction1(sphericalTensor);
+    makeFunction1Type(Constant, sphericalTensor);
+    makeFunction1Type(Polynomial, sphericalTensor);
+    makeFunction1Type(Sine, sphericalTensor);
+    makeFunction1Type(CSV, sphericalTensor);
+    makeFunction1Type(Table, sphericalTensor);
+    makeFunction1Type(TableFile, sphericalTensor);
 
-    makeDataEntry(symmTensor);
-    makeDataEntryType(Constant, symmTensor);
-    makeDataEntryType(Polynomial, symmTensor);
-    makeDataEntryType(Sine, symmTensor);
-    makeDataEntryType(CSV, symmTensor);
-    makeDataEntryType(Table, symmTensor);
-    makeDataEntryType(TableFile, symmTensor);
+    makeFunction1(symmTensor);
+    makeFunction1Type(Constant, symmTensor);
+    makeFunction1Type(Polynomial, symmTensor);
+    makeFunction1Type(Sine, symmTensor);
+    makeFunction1Type(CSV, symmTensor);
+    makeFunction1Type(Table, symmTensor);
+    makeFunction1Type(TableFile, symmTensor);
 
-    makeDataEntry(tensor);
-    makeDataEntryType(Constant, tensor);
-    makeDataEntryType(Polynomial, tensor);
-    makeDataEntryType(Sine, tensor);
-    makeDataEntryType(CSV, tensor);
-    makeDataEntryType(Table, tensor);
-    makeDataEntryType(TableFile, tensor);
+    makeFunction1(tensor);
+    makeFunction1Type(Constant, tensor);
+    makeFunction1Type(Polynomial, tensor);
+    makeFunction1Type(Sine, tensor);
+    makeFunction1Type(CSV, tensor);
+    makeFunction1Type(Table, tensor);
+    makeFunction1Type(TableFile, tensor);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/TimeDataEntry/TimeDataEntry/TimeDataEntry.C b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.C
similarity index 78%
rename from src/OpenFOAM/primitives/functions/TimeDataEntry/TimeDataEntry/TimeDataEntry.C
rename to src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.C
index e46962bd31..ed8b34ab06 100644
--- a/src/OpenFOAM/primitives/functions/TimeDataEntry/TimeDataEntry/TimeDataEntry.C
+++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "TimeDataEntry.H"
+#include "TimeFunction1.H"
 
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::TimeDataEntry<Type>::TimeDataEntry
+Foam::TimeFunction1<Type>::TimeFunction1
 (
     const Time& t,
     const word& name,
@@ -37,14 +37,14 @@ Foam::TimeDataEntry<Type>::TimeDataEntry
 :
     time_(t),
     name_(name),
-    entry_(DataEntry<Type>::New(name, dict))
+    entry_(Function1<Type>::New(name, dict))
 {
     entry_->convertTimeBase(t);
 }
 
 
 template<class Type>
-Foam::TimeDataEntry<Type>::TimeDataEntry(const Time& t, const word& name)
+Foam::TimeFunction1<Type>::TimeFunction1(const Time& t, const word& name)
 :
     time_(t),
     name_(name),
@@ -53,9 +53,9 @@ Foam::TimeDataEntry<Type>::TimeDataEntry(const Time& t, const word& name)
 
 
 template<class Type>
-Foam::TimeDataEntry<Type>::TimeDataEntry
+Foam::TimeFunction1<Type>::TimeFunction1
 (
-    const TimeDataEntry<Type>& tde
+    const TimeFunction1<Type>& tde
 )
 :
     time_(tde.time_),
@@ -72,18 +72,18 @@ Foam::TimeDataEntry<Type>::TimeDataEntry
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::TimeDataEntry<Type>::~TimeDataEntry()
+Foam::TimeFunction1<Type>::~TimeFunction1()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::TimeDataEntry<Type>::reset(const dictionary& dict)
+void Foam::TimeFunction1<Type>::reset(const dictionary& dict)
 {
     entry_.reset
     (
-        DataEntry<Type>::New
+        Function1<Type>::New
         (
             name_,
             dict
@@ -95,21 +95,21 @@ void Foam::TimeDataEntry<Type>::reset(const dictionary& dict)
 
 
 template<class Type>
-const Foam::word& Foam::TimeDataEntry<Type>::name() const
+const Foam::word& Foam::TimeFunction1<Type>::name() const
 {
     return entry_->name();
 }
 
 
 template<class Type>
-Type Foam::TimeDataEntry<Type>::value(const scalar x) const
+Type Foam::TimeFunction1<Type>::value(const scalar x) const
 {
     return entry_->value(x);
 }
 
 
 template<class Type>
-Type Foam::TimeDataEntry<Type>::integrate
+Type Foam::TimeFunction1<Type>::integrate
 (
     const scalar x1,
     const scalar x2
@@ -125,7 +125,7 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const TimeDataEntry<Type>& de
+    const TimeFunction1<Type>& de
 )
 {
     return de.entry_->operator<<(os, de);
@@ -133,7 +133,7 @@ Foam::Ostream& Foam::operator<<
 
 
 template<class Type>
-void Foam::TimeDataEntry<Type>::writeData(Ostream& os) const
+void Foam::TimeFunction1<Type>::writeData(Ostream& os) const
 {
     entry_->writeData(os);
 }
diff --git a/src/OpenFOAM/primitives/functions/TimeDataEntry/TimeDataEntry/TimeDataEntry.H b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.H
similarity index 84%
rename from src/OpenFOAM/primitives/functions/TimeDataEntry/TimeDataEntry/TimeDataEntry.H
rename to src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.H
index 1b5ee544cd..80f1ed0b63 100644
--- a/src/OpenFOAM/primitives/functions/TimeDataEntry/TimeDataEntry/TimeDataEntry.H
+++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.H
@@ -22,21 +22,21 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::TimeDataEntry
+    Foam::TimeFunction1
 
 Description
-    Light wrapper around DataEntry to provide a mechanism to update time-based
+    Light wrapper around Function1 to provide a mechanism to update time-based
     entries.
 
 SourceFiles
-    TimeDataEntry.C
+    TimeFunction1.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef TimeDataEntry_H
-#define TimeDataEntry_H
+#ifndef TimeFunction1_H
+#define TimeFunction1_H
 
-#include "DataEntry.H"
+#include "Function1.H"
 #include "Time.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,21 +44,21 @@ SourceFiles
 namespace Foam
 {
 template<class Type>
-class TimeDataEntry;
+class TimeFunction1;
 
 template<class Type>
 Ostream& operator<<
 (
     Ostream&,
-    const TimeDataEntry<Type>&
+    const TimeFunction1<Type>&
 );
 
 /*---------------------------------------------------------------------------*\
-                       Class TimeDataEntry Declaration
+                       Class TimeFunction1 Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-class TimeDataEntry
+class TimeFunction1
 {
 
 protected:
@@ -71,8 +71,8 @@ protected:
         //- Name of the data entry
         const word name_;
 
-        //- The underlying DataEntry
-        autoPtr<DataEntry<Type>> entry_;
+        //- The underlying Function1
+        autoPtr<Function1<Type>> entry_;
 
 
 public:
@@ -80,7 +80,7 @@ public:
     // Constructor
 
         //- Construct from entry name
-        TimeDataEntry
+        TimeFunction1
         (
             const Time& t,
             const word& name,
@@ -88,18 +88,18 @@ public:
         );
 
         //- Construct null from entry name
-        TimeDataEntry
+        TimeFunction1
         (
             const Time& t,
             const word& entryName
         );
 
         //- Copy constructor
-        TimeDataEntry(const TimeDataEntry<Type>& tde);
+        TimeFunction1(const TimeFunction1<Type>& tde);
 
 
     //- Destructor
-    virtual ~TimeDataEntry();
+    virtual ~TimeFunction1();
 
 
     // Member Functions
@@ -128,7 +128,7 @@ public:
         friend Ostream& operator<< <Type>
         (
             Ostream& os,
-            const TimeDataEntry<Type>& de
+            const TimeFunction1<Type>& de
         );
 
         //- Write in dictionary format
@@ -143,7 +143,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TimeDataEntry.C"
+#   include "TimeFunction1.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
index 8a31c71e61..d4a6470249 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
@@ -57,7 +57,7 @@ Foam::solidBodyMotionFunctions::rotatingMotion::rotatingMotion
     solidBodyMotionFunction(SBMFCoeffs, runTime),
     origin_(SBMFCoeffs_.lookup("origin")),
     axis_(SBMFCoeffs_.lookup("axis")),
-    omega_(DataEntry<scalar>::New("omega", SBMFCoeffs_))
+    omega_(Function1<scalar>::New("omega", SBMFCoeffs_))
 {}
 
 
@@ -95,7 +95,7 @@ bool Foam::solidBodyMotionFunctions::rotatingMotion::read
 
     omega_.reset
     (
-        DataEntry<scalar>::New("omega", SBMFCoeffs_).ptr()
+        Function1<scalar>::New("omega", SBMFCoeffs_).ptr()
     );
 
     return true;
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
index d1d18511cf..404b450aa1 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
@@ -41,7 +41,7 @@ SourceFiles
 #include "solidBodyMotionFunction.H"
 #include "primitiveFields.H"
 #include "point.H"
-#include "DataEntry.H"
+#include "Function1.H"
 #include "autoPtr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,7 +68,7 @@ class rotatingMotion
         const vector axis_;
 
         //- Angular velocty (rad/sec)
-        autoPtr<DataEntry<scalar>> omega_;
+        autoPtr<Function1<scalar>> omega_;
 
 
     // Private Member Functions
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index 42c6e04834..c350d14a0c 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -253,7 +253,7 @@ Foam::MRFZone::MRFZone
     ),
     origin_(coeffs_.lookup("origin")),
     axis_(coeffs_.lookup("axis")),
-    omega_(DataEntry<scalar>::New("omega", coeffs_))
+    omega_(Function1<scalar>::New("omega", coeffs_))
 {
     if (cellZoneName_ == word::null)
     {
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index c499cf91a2..9054d20d33 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -48,7 +48,7 @@ SourceFiles
 #include "surfaceFields.H"
 #include "fvMatricesFwd.H"
 #include "mapPolyMesh.H"
-#include "DataEntry.H"
+#include "Function1.H"
 #include "autoPtr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -105,7 +105,7 @@ class MRFZone
         vector axis_;
 
         //- Angular velocty (rad/sec)
-        autoPtr<DataEntry<scalar>> omega_;
+        autoPtr<Function1<scalar>> omega_;
 
 
     // Private Member Functions
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
index 3bdfa9e6e9..575eae01f7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,9 +77,9 @@ cylindricalInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(p, iF, dict),
     centre_(dict.lookup("centre")),
     axis_(dict.lookup("axis")),
-    axialVelocity_(DataEntry<scalar>::New("axialVelocity", dict)),
-    radialVelocity_(DataEntry<scalar>::New("radialVelocity", dict)),
-    rpm_(DataEntry<scalar>::New("rpm", dict))
+    axialVelocity_(Function1<scalar>::New("axialVelocity", dict)),
+    radialVelocity_(Function1<scalar>::New("radialVelocity", dict)),
+    rpm_(Function1<scalar>::New("rpm", dict))
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
index db1307dabe..5861a21226 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
@@ -57,13 +57,13 @@ Description
     \endverbatim
 
 Note
-    The \c axialVelocity, \c radialVelocity and \c rpm entries are DataEntry
+    The \c axialVelocity, \c radialVelocity and \c rpm entries are Function1
     types, able to describe time varying functions.  The example above gives
     the usage for supplying constant values.
 
 SeeAlso
     Foam::fixedValueFvPatchField
-    Foam::DataEntry
+    Foam::Function1
 
 SourceFiles
     cylindricalInletVelocityFvPatchVectorField.C
@@ -74,7 +74,7 @@ SourceFiles
 #define cylindricalInletVelocityFvPatchVectorField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -97,13 +97,13 @@ class cylindricalInletVelocityFvPatchVectorField
         const vector axis_;
 
         //- Axial velocity
-        autoPtr<DataEntry<scalar>> axialVelocity_;
+        autoPtr<Function1<scalar>> axialVelocity_;
 
         //- Radial velocity
-        autoPtr<DataEntry<scalar>> radialVelocity_;
+        autoPtr<Function1<scalar>> radialVelocity_;
 
         //- RPM
-        autoPtr<DataEntry<scalar>> rpm_;
+        autoPtr<Function1<scalar>> rpm_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
index f6e560a7f8..52f1e2e682 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
@@ -31,7 +31,7 @@ Description
     This boundary condition provides a jump condition, using the \c cyclic
     condition as a base.
 
-    The jump is specified as a \c DataEntry type, to enable the use of, e.g.
+    The jump is specified as a \c Function1 type, to enable the use of, e.g.
     contant, polynomial, table values.
 
     \heading Patch usage
@@ -70,7 +70,7 @@ Note
      The underlying \c patchType should be set to \c cyclic
 
 SeeAlso
-    Foam::DataEntry
+    Foam::Function1
 
 SourceFiles
     fanFvPatchField.C
@@ -84,7 +84,7 @@ SourceFiles
 #define fanFvPatchField_H
 
 #include "uniformJumpFvPatchField.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
index d8ac18af77..a4f2809df8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
@@ -98,13 +98,13 @@ Foam::fanFvPatchField<Foam::scalar>::fanFvPatchField
 
             this->jumpTable_.reset
             (
-                new DataEntryTypes::Polynomial<scalar>("jumpTable", coeffs)
+                new Function1Types::Polynomial<scalar>("jumpTable", coeffs)
             );
         }
         else
         {
             // Generic input constructed from dictionary
-            this->jumpTable_ = DataEntry<scalar>::New("jumpTable", dict);
+            this->jumpTable_ = Function1<scalar>::New("jumpTable", dict);
         }
     }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index a9db1a7036..681d04ab31 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF),
-    profile_(DataEntry<Type>::New("profile", dict)),
+    profile_(Function1<Type>::New("profile", dict)),
     dir_(dict.lookup("direction")),
     origin_(readScalar(dict.lookup("origin")))
 {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
index 7d78126cf1..7964848cf2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
@@ -34,7 +34,7 @@ Description
 
     \table
         Property     | Description              | Required | Default value
-        profile      | Profile DataEntry        | yes |
+        profile      | Profile Function1        | yes |
         direction    | Profile direction        | yes |
         origin       | Profile origin           | yes |
     \endtable
@@ -79,12 +79,12 @@ Description
     \endverbatim
 
 Note
-    The profile entry is a DataEntry type.  The example above gives the
+    The profile entry is a Function1 type.  The example above gives the
     usage for supplying csv file.
 
 SeeAlso
     Foam::fixedValueFvPatchField
-    Foam::DataEntry
+    Foam::Function1
     Foam::timeVaryingMappedFixedValueFvPatchField
 
 SourceFiles
@@ -96,7 +96,7 @@ SourceFiles
 #define fixedProfileFvPatchField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -115,7 +115,7 @@ class fixedProfileFvPatchField
     // Private data
 
         //- Profile data
-        autoPtr<DataEntry<Type>> profile_;
+        autoPtr<Function1<Type>> profile_;
 
         //- Profile direction
         vector dir_;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index bd09517b1e..95dfaf31cd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -84,13 +84,13 @@ flowRateInletVelocityFvPatchVectorField
     if (dict.found("volumetricFlowRate"))
     {
         volumetric_ = true;
-        flowRate_ = DataEntry<scalar>::New("volumetricFlowRate", dict);
+        flowRate_ = Function1<scalar>::New("volumetricFlowRate", dict);
         rhoName_ = "rho";
     }
     else if (dict.found("massFlowRate"))
     {
         volumetric_ = false;
-        flowRate_ = DataEntry<scalar>::New("massFlowRate", dict);
+        flowRate_ = Function1<scalar>::New("massFlowRate", dict);
         rhoName_ = word(dict.lookupOrDefault<word>("rho", "rho"));
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
index cd46853c3b..2d0c139a4f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
@@ -76,7 +76,7 @@ Description
     }
     \endverbatim
 
-    The \c flowRate entry is a \c DataEntry type, meaning that it can be
+    The \c flowRate entry is a \c Function1 type, meaning that it can be
     specified as constant, a polynomial fuction of time, and ...
 
 Note
@@ -87,7 +87,7 @@ Note
     - Strange behaviour with potentialFoam since the U equation is not solved
 
 SeeAlso
-    Foam::DataEntry
+    Foam::Function1
     Foam::fixedValueFvPatchField
 
 SourceFiles
@@ -99,7 +99,7 @@ SourceFiles
 #define flowRateInletVelocityFvPatchVectorField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -117,7 +117,7 @@ class flowRateInletVelocityFvPatchVectorField
     // Private data
 
         //- Inlet integral flow rate
-        autoPtr<DataEntry<scalar>> flowRate_;
+        autoPtr<Function1<scalar>> flowRate_;
 
         //- Is volumetric?
         bool volumetric_;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
index 61e82b87e7..87d567747d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
@@ -68,8 +68,8 @@ Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
     fixedValueFvPatchField<Type>(p, iF),
     refValue_("refValue", dict, p.size()),
     offset_(dict.lookupOrDefault<Type>("offset", pTraits<Type>::zero)),
-    amplitude_(DataEntry<scalar>::New("amplitude", dict)),
-    frequency_(DataEntry<scalar>::New("frequency", dict)),
+    amplitude_(Function1<scalar>::New("amplitude", dict)),
+    frequency_(Function1<scalar>::New("frequency", dict)),
     curTimeIndex_(-1)
 {
     if (dict.found("value"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H
index 979f649b98..bfc323d70e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H
@@ -69,12 +69,12 @@ Description
     \endverbatim
 
 Note
-    The amplitude and frequency entries are DataEntry types, able to describe
+    The amplitude and frequency entries are Function1 types, able to describe
     time varying functions.  The example above gives the usage for supplying
     constant values.
 
 SeeAlso
-    Foam::DataEntry
+    Foam::Function1
 
 SourceFiles
     oscillatingFixedValueFvPatchField.C
@@ -86,7 +86,7 @@ SourceFiles
 
 #include "Random.H"
 #include "fixedValueFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -111,10 +111,10 @@ class oscillatingFixedValueFvPatchField
         Type offset_;
 
         //- Amplitude
-        autoPtr<DataEntry<scalar>> amplitude_;
+        autoPtr<Function1<scalar>> amplitude_;
 
         //- Frequency
-        autoPtr<DataEntry<scalar>> frequency_;
+        autoPtr<Function1<scalar>> frequency_;
 
         //- Current time index
         label curTimeIndex_;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
index 3a49f4a680..5a60acfab9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField
 )
 :
     pressureInletOutletVelocityFvPatchVectorField(p, iF, dict),
-    omega_(DataEntry<vector>::New("omega", dict))
+    omega_(Function1<vector>::New("omega", dict))
 {
     calcTangentialVelocity();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
index 767856bbe1..2e7eb77d9a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
@@ -53,7 +53,7 @@ Description
     }
     \endverbatim
 
-    The \c omega entry is a DataEntry type, able to describe time varying
+    The \c omega entry is a Function1 type, able to describe time varying
     functions.
 
 Note
@@ -75,7 +75,7 @@ SourceFiles
 
 #include "fvPatchFields.H"
 #include "pressureInletOutletVelocityFvPatchVectorField.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -93,7 +93,7 @@ class rotatingPressureInletOutletVelocityFvPatchVectorField
     // Private data
 
         //- Angular velocity of the frame
-        autoPtr<DataEntry<vector>> omega_;
+        autoPtr<Function1<vector>> omega_;
 
 
     // Private Member Functions
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
index 83647fb782..5d1df66c79 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ rotatingTotalPressureFvPatchScalarField
 )
 :
     totalPressureFvPatchScalarField(p, iF, dict),
-    omega_(DataEntry<vector>::New("omega", dict))
+    omega_(Function1<vector>::New("omega", dict))
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H
index 52e4e3572f..271b1cb09b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H
@@ -59,7 +59,7 @@ Description
     }
     \endverbatim
 
-    The \c omega entry is a DataEntry type, able to describe time varying
+    The \c omega entry is a Function1 type, able to describe time varying
     functions.
 
 SeeAlso
@@ -74,7 +74,7 @@ SourceFiles
 #define rotatingTotalPressureFvPatchScalarField_H
 
 #include "totalPressureFvPatchScalarField.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -92,7 +92,7 @@ class rotatingTotalPressureFvPatchScalarField
     // Private data
 
         //- Angular velocity of the frame
-        autoPtr<DataEntry<vector>> omega_;
+        autoPtr<Function1<vector>> omega_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index 82f5d2e28b..791e07c799 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ rotatingWallVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(p, iF),
     origin_(dict.lookup("origin")),
     axis_(dict.lookup("axis")),
-    omega_(DataEntry<scalar>::New("omega", dict))
+    omega_(Function1<scalar>::New("omega", dict))
 {
     if (dict.found("value"))
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
index e4d38f3a3b..c9ab99efc4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
@@ -50,11 +50,11 @@ Description
     }
     \endverbatim
 
-    The \c omega entry is a DataEntry type, able to describe time varying
+    The \c omega entry is a Function1 type, able to describe time varying
     functions.
 
 SeeAlso
-    Foam::DataEntry
+    Foam::Function1
     Foam::fixedValueFvPatchField
 
 SourceFiles
@@ -66,7 +66,7 @@ SourceFiles
 #define rotatingWallVelocityFvPatchVectorField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -90,7 +90,7 @@ class rotatingWallVelocityFvPatchVectorField
         vector axis_;
 
         //- Rotational speed
-        autoPtr<DataEntry<scalar>> omega_;
+        autoPtr<Function1<scalar>> omega_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
index a871e91de0..7acfaf45ec 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,8 +75,8 @@ swirlFlowRateInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(p, iF, dict),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    flowRate_(DataEntry<scalar>::New("flowRate", dict)),
-    rpm_(DataEntry<scalar>::New("rpm", dict))
+    flowRate_(Function1<scalar>::New("flowRate", dict)),
+    rpm_(Function1<scalar>::New("rpm", dict))
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
index 8d81fe7440..118715a1ae 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
@@ -58,7 +58,7 @@ Description
     \endverbatim
 
 Note
-    - the \c flowRate and \c rpm entries are DataEntry types, able to describe
+    - the \c flowRate and \c rpm entries are Function1 types, able to describe
       time varying functions.  The example above gives the usage for supplying
       constant values.
     - the value is positive into the domain
@@ -75,7 +75,7 @@ SourceFiles
 #define swirlFlowRateInletVelocityFvPatchVectorField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -98,10 +98,10 @@ class swirlFlowRateInletVelocityFvPatchVectorField
         const word rhoName_;
 
         //- Inlet integral flow rate
-        autoPtr<DataEntry<scalar>> flowRate_;
+        autoPtr<Function1<scalar>> flowRate_;
 
         //- Angular speed in revolutions per minute (RPM)
-        autoPtr<DataEntry<scalar>> rpm_;
+        autoPtr<Function1<scalar>> rpm_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index c418fec1b3..e7edad23a5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -82,7 +82,7 @@ timeVaryingMappedFixedValueFvPatchField
     endSampleTime_(-1),
     endSampledValues_(0),
     endAverage_(pTraits<Type>::zero),
-    offset_(DataEntry<Type>::New("offset", dict))
+    offset_(Function1<Type>::New("offset", dict))
 {
     if
     (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
index bbe0d22cc8..64c69b5c3a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
@@ -80,7 +80,7 @@ SourceFiles
 #include "FixedList.H"
 #include "instantList.H"
 #include "pointToPointPlanarInterpolation.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -135,7 +135,7 @@ class timeVaryingMappedFixedValueFvPatchField
         Type endAverage_;
 
         //- Time varying offset values to interpolated data
-        autoPtr<DataEntry<Type>> offset_;
+        autoPtr<Function1<Type>> offset_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index aa7c057a7a..298d5efc07 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(p, iF),
-    uniformGradient_(DataEntry<Type>::New("uniformGradient", dict))
+    uniformGradient_(Function1<Type>::New("uniformGradient", dict))
 {
     this->evaluate();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
index 5d14b0d899..48c2abb813 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
@@ -47,12 +47,12 @@ Description
     \endverbatim
 
 Note
-    The uniformGradient entry is a DataEntry type, able to describe time
+    The uniformGradient entry is a Function1 type, able to describe time
     varying functions.  The example above gives the usage for supplying a
     constant value.
 
 SeeAlso
-    Foam::DataEntry
+    Foam::Function1
     Foam::fixedGradientFvPatchField
 
 SourceFiles
@@ -64,7 +64,7 @@ SourceFiles
 #define uniformFixedGradientFvPatchField_H
 
 #include "fixedGradientFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -83,7 +83,7 @@ class uniformFixedGradientFvPatchField
     // Private data
 
         //- Gradient
-        autoPtr<DataEntry<Type>> uniformGradient_;
+        autoPtr<Function1<Type>> uniformGradient_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index 8d52b8700d..ab03ec6b0e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF),
-    uniformValue_(DataEntry<Type>::New("uniformValue", dict))
+    uniformValue_(Function1<Type>::New("uniformValue", dict))
 {
     this->evaluate();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
index d586a202fc..d85a8ad390 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
@@ -47,12 +47,12 @@ Description
     \endverbatim
 
 Note
-    The uniformValue entry is a DataEntry type, able to describe time
+    The uniformValue entry is a Function1 type, able to describe time
     varying functions.  The example above gives the usage for supplying a
     constant value.
 
 SeeAlso
-    Foam::DataEntry
+    Foam::Function1
     Foam::fixedValueFvPatchField
 
 SourceFiles
@@ -64,7 +64,7 @@ SourceFiles
 #define uniformFixedValueFvPatchField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -82,7 +82,7 @@ class uniformFixedValueFvPatchField
 {
     // Private data
 
-        autoPtr<DataEntry<Type>> uniformValue_;
+        autoPtr<Function1<Type>> uniformValue_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 9e9809c91f..c68304a93b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
 :
     mixedFvPatchField<Type>(p, iF),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    uniformInletValue_(DataEntry<Type>::New("uniformInletValue", dict))
+    uniformInletValue_(Function1<Type>::New("uniformInletValue", dict))
 {
     this->refValue() =
         uniformInletValue_->value(this->db().time().timeOutputValue());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
index fd886ee3bb..384bad76ef 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
@@ -69,7 +69,7 @@ SourceFiles
 #define uniformInletOutletFvPatchField_H
 
 #include "mixedFvPatchField.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -94,7 +94,7 @@ protected:
         word phiName_;
 
         //- Value
-        autoPtr<DataEntry<Type>> uniformInletValue_;
+        autoPtr<Function1<Type>> uniformInletValue_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
index 046d9bbeb8..00f30731de 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 )
 :
     fixedJumpFvPatchField<Type>(p, iF),
-    jumpTable_(new DataEntry<Type>("jumpTable"))
+    jumpTable_(new Function1<Type>("jumpTable"))
 {}
 
 
@@ -62,11 +62,11 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 )
 :
     fixedJumpFvPatchField<Type>(p, iF),
-    jumpTable_(new DataEntry<Type>("jumpTable"))
+    jumpTable_(new Function1<Type>("jumpTable"))
 {
     if (this->cyclicPatch().owner())
     {
-        jumpTable_ = DataEntry<Type>::New("jumpTable", dict);
+        jumpTable_ = Function1<Type>::New("jumpTable", dict);
     }
 
     if (dict.found("value"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
index 19b4a7f9b7..8a3809c379 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
@@ -53,7 +53,7 @@ Description
     The above example shows the use of a fixed jump of '10'.
 
 Note
-    The uniformValue entry is a DataEntry type, able to describe time
+    The uniformValue entry is a Function1 type, able to describe time
     varying functions.  The example above gives the usage for supplying a
     constant value.
 
@@ -71,7 +71,7 @@ SourceFiles
 #define uniformJumpFvPatchField_H
 
 #include "fixedJumpFvPatchField.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -93,7 +93,7 @@ protected:
     // Protected data
 
         //- "jump" table
-        autoPtr<DataEntry<Type>> jumpTable_;
+        autoPtr<Function1<Type>> jumpTable_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
index 7b2d55e1eb..61339e232e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,11 +62,11 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
 )
 :
     fixedJumpAMIFvPatchField<Type>(p, iF),
-    jumpTable_(new DataEntry<Type>("jumpTable"))
+    jumpTable_(new Function1<Type>("jumpTable"))
 {
     if (this->cyclicAMIPatch().owner())
     {
-        jumpTable_ = DataEntry<Type>::New("jumpTable", dict);
+        jumpTable_ = Function1<Type>::New("jumpTable", dict);
     }
 
     if (dict.found("value"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
index 392f09018b..b0b79cfab1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
@@ -53,7 +53,7 @@ Description
     The above example shows the use of a fixed jump of '10'.
 
 Note
-    The uniformValue entry is a DataEntry type, able to describe time
+    The uniformValue entry is a Function1 type, able to describe time
     varying functions.  The example above gives the usage for supplying a
     constant value.
 
@@ -71,7 +71,7 @@ SourceFiles
 #define uniformJumpAMIFvPatchField_H
 
 #include "fixedJumpAMIFvPatchField.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -93,7 +93,7 @@ protected:
     // Protected data
 
         //- "jump" table
-        autoPtr<DataEntry<Type>> jumpTable_;
+        autoPtr<Function1<Type>> jumpTable_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index 52ecf6fe4f..29841b6932 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ uniformTotalPressureFvPatchScalarField
     rhoName_(dict.lookupOrDefault<word>("rho", "none")),
     psiName_(dict.lookupOrDefault<word>("psi", "none")),
     gamma_(readScalar(dict.lookup("gamma"))),
-    pressure_(DataEntry<scalar>::New("pressure", dict))
+    pressure_(Function1<scalar>::New("pressure", dict))
 {
     if (dict.found("value"))
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
index 17715b7fce..bc931db701 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
@@ -57,7 +57,7 @@ Description
     }
     \endverbatim
 
-    The \c pressure entry is specified as a DataEntry type, able to describe
+    The \c pressure entry is specified as a Function1 type, able to describe
     time varying functions.
 
 Note
@@ -65,7 +65,7 @@ Note
 
 
 SeeAlso
-    Foam::DataEntry
+    Foam::Function1
     Foam::uniformFixedValueFvPatchField
     Foam::totalPressureFvPatchField
 
@@ -78,7 +78,7 @@ SourceFiles
 #define uniformTotalPressureFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -112,7 +112,7 @@ class uniformTotalPressureFvPatchScalarField
         scalar gamma_;
 
         //- Table of time vs total pressure, including the bounding treatment
-        autoPtr<DataEntry<scalar>> pressure_;
+        autoPtr<Function1<scalar>> pressure_;
 
 
 public:
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index 124d2408c5..7d3b5a8d7c 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -121,7 +121,7 @@ timeVaryingMappedFixedValuePointPatchField
 {
     if (dict.found("offset"))
     {
-        offset_ = DataEntry<Type>::New("offset", dict);
+        offset_ = Function1<Type>::New("offset", dict);
     }
 
     dict.readIfPresent("fieldTableName", fieldTableName_);
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
index 1dd70b7012..d285b0b97d 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
@@ -41,7 +41,7 @@ SourceFiles
 #include "fixedValuePointPatchField.H"
 #include "instantList.H"
 #include "pointToPointPlanarInterpolation.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -96,7 +96,7 @@ class timeVaryingMappedFixedValuePointPatchField
         Type endAverage_;
 
         //- Time varying offset values to interpolated data
-        autoPtr<DataEntry<Type>> offset_;
+        autoPtr<Function1<Type>> offset_;
 
 
 public:
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index f982abbb40..b95e2f8b2e 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
         {
             Tuniform_.reset
             (
-                DataEntry<scalar>::New("temperature", coeffs_).ptr()
+                Function1<scalar>::New("temperature", coeffs_).ptr()
             );
             break;
         }
@@ -153,7 +153,7 @@ bool Foam::fv::fixedTemperatureConstraint::read(const dictionary& dict)
         {
             Tuniform_.reset
             (
-                DataEntry<scalar>::New(Tuniform_->name(), dict).ptr()
+                Function1<scalar>::New(Tuniform_->name(), dict).ptr()
             );
         }
 
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index 7c5ae7ceca..f2b7029425 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -42,7 +42,7 @@ Description
 
 Note:
     The 'uniform' option allows the use of a time-varying uniform temperature
-    by means of the DataEntry type.
+    by means of the Function1 type.
 
 SourceFiles
     fvOption.C
@@ -54,7 +54,7 @@ SourceFiles
 
 #include "cellSetOption.H"
 #include "NamedEnum.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -94,7 +94,7 @@ protected:
         temperatureMode mode_;
 
         //- Uniform temperature [K]
-        autoPtr<DataEntry<scalar>> Tuniform_;
+        autoPtr<Function1<scalar>> Tuniform_;
 
         //- Temperature field name
         word TName_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index d71e1b070e..34ef7c273f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ConeInjection.H"
-#include "TimeDataEntry.H"
+#include "TimeFunction1.H"
 #include "mathematicalConstants.H"
 #include "unitConversion.H"
 
@@ -52,7 +52,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
     ),
     flowRateProfile_
     (
-        TimeDataEntry<scalar>
+        TimeFunction1<scalar>
         (
             owner.db().time(),
             "flowRateProfile",
@@ -61,7 +61,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
     ),
     Umag_
     (
-        TimeDataEntry<scalar>
+        TimeFunction1<scalar>
         (
             owner.db().time(),
             "Umag",
@@ -70,7 +70,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
     ),
     thetaInner_
     (
-        TimeDataEntry<scalar>
+        TimeFunction1<scalar>
         (
             owner.db().time(),
             "thetaInner",
@@ -79,7 +79,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
     ),
     thetaOuter_
     (
-        TimeDataEntry<scalar>
+        TimeFunction1<scalar>
         (
             owner.db().time(),
             "thetaOuter",
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 614ea43f61..e993410345 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -45,7 +45,7 @@ SourceFiles
 #include "InjectionModel.H"
 #include "distributionModel.H"
 #include "vectorList.H"
-#include "TimeDataEntry.H"
+#include "TimeFunction1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -82,16 +82,16 @@ class ConeInjection
         const label parcelsPerInjector_;
 
         //- Flow rate profile relative to SOI []
-        const TimeDataEntry<scalar> flowRateProfile_;
+        const TimeFunction1<scalar> flowRateProfile_;
 
         //- Parcel velocity magnitude relative to SOI [m/s]
-        const TimeDataEntry<scalar> Umag_;
+        const TimeFunction1<scalar> Umag_;
 
         //- Inner half-cone angle relative to SOI [deg]
-        const TimeDataEntry<scalar> thetaInner_;
+        const TimeFunction1<scalar> thetaInner_;
 
         //- Outer half-cone angle relative to SOI [deg]
-        const TimeDataEntry<scalar> thetaOuter_;
+        const TimeFunction1<scalar> thetaOuter_;
 
         //- Parcel size distribution model
         const autoPtr<distributionModels::distributionModel> sizeDistribution_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 58538988d9..3100a6b703 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ConeNozzleInjection.H"
-#include "TimeDataEntry.H"
+#include "TimeFunction1.H"
 #include "mathematicalConstants.H"
 #include "distributionModel.H"
 
@@ -119,7 +119,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     ),
     flowRateProfile_
     (
-        TimeDataEntry<scalar>
+        TimeFunction1<scalar>
         (
             owner.db().time(),
             "flowRateProfile",
@@ -128,7 +128,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     ),
     thetaInner_
     (
-        TimeDataEntry<scalar>
+        TimeFunction1<scalar>
         (
             owner.db().time(),
             "thetaInner",
@@ -137,7 +137,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     ),
     thetaOuter_
     (
-        TimeDataEntry<scalar>
+        TimeFunction1<scalar>
         (
             owner.db().time(),
             "thetaOuter",
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
index 0440265f07..a8fd69d9d1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
@@ -63,7 +63,7 @@ namespace Foam
 // Forward declaration of classes
 
 template<class Type>
-class TimeDataEntry;
+class TimeFunction1;
 
 class distributionModel;
 
@@ -132,13 +132,13 @@ private:
         const label parcelsPerSecond_;
 
         //- Flow rate profile relative to SOI []
-        const TimeDataEntry<scalar> flowRateProfile_;
+        const TimeFunction1<scalar> flowRateProfile_;
 
         //- Inner half-cone angle relative to SOI [deg]
-        const TimeDataEntry<scalar> thetaInner_;
+        const TimeFunction1<scalar> thetaInner_;
 
         //- Outer half-cone angle relative to SOI [deg]
-        const TimeDataEntry<scalar> thetaOuter_;
+        const TimeFunction1<scalar> thetaOuter_;
 
         //- Parcel size PDF model
         const autoPtr<distributionModels::distributionModel> sizeDistribution_;
@@ -162,10 +162,10 @@ private:
             scalar UMag_;
 
             //- Discharge coefficient, relative to SOI [m/s]
-            TimeDataEntry<scalar> Cd_;
+            TimeFunction1<scalar> Cd_;
 
             //- Injection pressure [Pa]
-            TimeDataEntry<scalar> Pinj_;
+            TimeFunction1<scalar> Pinj_;
 
 
     // Private Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index d770ab18d7..f33f45d86e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -49,7 +49,7 @@ Foam::InflationInjection<CloudType>::InflationInjection
     duration_(readScalar(this->coeffDict().lookup("duration"))),
     flowRateProfile_
     (
-        TimeDataEntry<scalar>
+        TimeFunction1<scalar>
         (
             owner.db().time(),
             "flowRateProfile",
@@ -58,7 +58,7 @@ Foam::InflationInjection<CloudType>::InflationInjection
     ),
     growthRate_
     (
-        TimeDataEntry<scalar>
+        TimeFunction1<scalar>
         (
             owner.db().time(),
             "growthRate",
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
index ec2d13eaa5..799243fdae 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
@@ -84,10 +84,10 @@ class InflationInjection
         scalar duration_;
 
         //- Flow rate profile relative to SOI [m3/s]
-        TimeDataEntry<scalar> flowRateProfile_;
+        TimeFunction1<scalar> flowRateProfile_;
 
         //- Growth rate of particle diameters towards target [m/s]
-        TimeDataEntry<scalar> growthRate_;
+        TimeFunction1<scalar> growthRate_;
 
         //- Positions, velocities, diameters and target diameters of
         //  new particles after splitting
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 964194b6b6..1f3dd7beb5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -53,7 +53,7 @@ SourceFiles
 #include "runTimeSelectionTables.H"
 #include "CloudSubModelBase.H"
 #include "vector.H"
-#include "TimeDataEntry.H"
+#include "TimeFunction1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -104,7 +104,7 @@ protected:
             scalar massTotal_;
 
             //- Mass flow rate profile for steady calculations
-            TimeDataEntry<scalar> massFlowRate_;
+            TimeFunction1<scalar> massFlowRate_;
 
             //- Total mass injected to date [kg]
             scalar massInjected_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index da721e70b2..b5dbd756ed 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "PatchFlowRateInjection.H"
-#include "TimeDataEntry.H"
+#include "TimeFunction1.H"
 #include "distributionModel.H"
 #include "mathematicalConstants.H"
 #include "surfaceFields.H"
@@ -46,7 +46,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
     duration_(readScalar(this->coeffDict().lookup("duration"))),
     concentration_
     (
-        TimeDataEntry<scalar>
+        TimeFunction1<scalar>
         (
             owner.db().time(),
             "concentration",
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
index c733930a36..e09bcbe3a6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
@@ -47,7 +47,7 @@ SourceFiles
 
 #include "InjectionModel.H"
 #include "patchInjectionBase.H"
-#include "TimeDataEntry.H"
+#include "TimeFunction1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -78,7 +78,7 @@ class PatchFlowRateInjection
         scalar duration_;
 
         //- Concentration profile of particle volume to carrier volume [-]
-        const TimeDataEntry<scalar> concentration_;
+        const TimeFunction1<scalar> concentration_;
 
         //- Parcels to introduce per unit volume flow rate m3 [n/m3]
         const scalar parcelConcentration_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index c858a27d01..1a21470832 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "PatchInjection.H"
-#include "TimeDataEntry.H"
+#include "TimeFunction1.H"
 #include "distributionModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -47,7 +47,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
     U0_(this->coeffDict().lookup("U0")),
     flowRateProfile_
     (
-        TimeDataEntry<scalar>
+        TimeFunction1<scalar>
         (
             owner.db().time(),
             "flowRateProfile",
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index 47cf2eaa06..2f53a8e038 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -52,7 +52,7 @@ namespace Foam
 {
 
 template<class Type>
-class TimeDataEntry;
+class TimeFunction1;
 
 class distributionModel;
 
@@ -78,7 +78,7 @@ class PatchInjection
         const vector U0_;
 
         //- Flow rate profile relative to SOI []
-        const TimeDataEntry<scalar> flowRateProfile_;
+        const TimeFunction1<scalar> flowRateProfile_;
 
         //- Parcel size distribution model
         const autoPtr<distributionModels::distributionModel> sizeDistribution_;
diff --git a/src/mesh/extrudeModel/radial/radial.C b/src/mesh/extrudeModel/radial/radial.C
index c2aae13fed..a27ebad2c4 100644
--- a/src/mesh/extrudeModel/radial/radial.C
+++ b/src/mesh/extrudeModel/radial/radial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ addToRunTimeSelectionTable(extrudeModel, radial, dictionary);
 radial::radial(const dictionary& dict)
 :
     extrudeModel(typeName, dict),
-    R_(DataEntry<scalar>::New("R", coeffDict_))
+    R_(Function1<scalar>::New("R", coeffDict_))
 {}
 
 
diff --git a/src/mesh/extrudeModel/radial/radial.H b/src/mesh/extrudeModel/radial/radial.H
index d05971ff0d..2143cde47d 100644
--- a/src/mesh/extrudeModel/radial/radial.H
+++ b/src/mesh/extrudeModel/radial/radial.H
@@ -32,7 +32,7 @@ Description
 #define radial_H
 
 #include "extrudeModel.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,7 +51,7 @@ class radial
 {
     // Private data
 
-        autoPtr<DataEntry<scalar>> R_;
+        autoPtr<Function1<scalar>> R_;
 
 
 public:
diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
index e4c664e6c9..36cef82385 100644
--- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,7 +120,7 @@ bool Foam::setTimeStepFunctionObject::read(const dictionary& dict)
 
     if (enabled_)
     {
-        timeStepPtr_ = DataEntry<scalar>::New("deltaT", dict);
+        timeStepPtr_ = Function1<scalar>::New("deltaT", dict);
 
         // Check that time has adjustTimeStep
         const dictionary& controlDict = time_.controlDict();
diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
index 3ecfa51e82..1749d3d4a7 100644
--- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
@@ -44,7 +44,7 @@ SourceFiles
 
 #include "functionObject.H"
 #include "dictionary.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -71,7 +71,7 @@ class setTimeStepFunctionObject
             bool enabled_;
 
             //- Time step
-            autoPtr<DataEntry<scalar>> timeStepPtr_;
+            autoPtr<Function1<scalar>> timeStepPtr_;
 
 
         //- Disallow default bitwise copy construct
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
index 8bf37add3a..790ff3ab60 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,9 +69,9 @@ inclinedFilmNusseltHeightFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    GammaMean_(DataEntry<scalar>::New("GammaMean", dict)),
-    a_(DataEntry<scalar>::New("a", dict)),
-    omega_(DataEntry<scalar>::New("omega", dict))
+    GammaMean_(Function1<scalar>::New("GammaMean", dict)),
+    a_(Function1<scalar>::New("a", dict)),
+    omega_(Function1<scalar>::New("omega", dict))
 {
     fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
 }
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
index e9cd1669fb..151854be45 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
@@ -39,7 +39,7 @@ SourceFiles
 
 #include "fvPatchFields.H"
 #include "fixedValueFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,13 +57,13 @@ class inclinedFilmNusseltHeightFvPatchScalarField
     // Private data
 
         //- Mean mass flow rate per unit length [kg/s/m]
-        autoPtr<DataEntry<scalar>> GammaMean_;
+        autoPtr<Function1<scalar>> GammaMean_;
 
         //- Perturbation amplitude [m]
-        autoPtr<DataEntry<scalar>> a_;
+        autoPtr<Function1<scalar>> a_;
 
         //- Perturbation frequency [rad/s/m]
-        autoPtr<DataEntry<scalar>> omega_;
+        autoPtr<Function1<scalar>> omega_;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
index a49c093b38..78f75a30a9 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,9 +69,9 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF),
-    GammaMean_(DataEntry<scalar>::New("GammaMean", dict)),
-    a_(DataEntry<scalar>::New("a", dict)),
-    omega_(DataEntry<scalar>::New("omega", dict))
+    GammaMean_(Function1<scalar>::New("GammaMean", dict)),
+    a_(Function1<scalar>::New("a", dict)),
+    omega_(Function1<scalar>::New("omega", dict))
 {
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
 }
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
index 40327fa796..5e56c6c9e7 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
@@ -39,7 +39,7 @@ SourceFiles
 
 #include "fvPatchFields.H"
 #include "fixedValueFvPatchFields.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,13 +57,13 @@ class inclinedFilmNusseltInletVelocityFvPatchVectorField
     // Private data
 
         //- Mean mass flow rate per unit length [kg/s/m]
-        autoPtr<DataEntry<scalar>> GammaMean_;
+        autoPtr<Function1<scalar>> GammaMean_;
 
         //- Perturbation amplitude [m]
-        autoPtr<DataEntry<scalar>> a_;
+        autoPtr<Function1<scalar>> a_;
 
         //- Perturbation frequency [rad/s/m]
-        autoPtr<DataEntry<scalar>> omega_;
+        autoPtr<Function1<scalar>> omega_;
 
 
 public:
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.H
index d79893cc0b..44c95ab72b 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.H
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.H
@@ -44,7 +44,7 @@ SourceFiles
 #define energyJumpFvPatchScalarField_H
 
 #include "fixedJumpFvPatchField.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
index e39da64c06..5eba3cc0b6 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField
 :
     alphaContactAngleFvPatchScalarField(p, iF, dict),
     TName_(dict.lookupOrDefault<word>("T", "T")),
-    theta0_(DataEntry<scalar>::New("theta0", dict))
+    theta0_(Function1<scalar>::New("theta0", dict))
 {
     evaluate();
 }
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
index 64c766bf7b..4725daa9c9 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
@@ -57,7 +57,7 @@ SourceFiles
 #define temperatureDependentAlphaContactAngleFvPatchScalarField_H
 
 #include "alphaContactAngleFvPatchScalarField.H"
-#include "DataEntry.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -78,7 +78,7 @@ class temperatureDependentAlphaContactAngleFvPatchScalarField
         word TName_;
 
         //- Equilibrium contact angle table
-        autoPtr<DataEntry<scalar>> theta0_;
+        autoPtr<Function1<scalar>> theta0_;
 
 
 public:

From fbb9f22d9dac130bdd8798d143963095ccbd2a22 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 8 Feb 2016 16:30:00 +0000
Subject: [PATCH 151/447] Test-PackedList1: Removed chained assigments

---
 applications/test/PackedList1/Test-PackedList1.C | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/applications/test/PackedList1/Test-PackedList1.C b/applications/test/PackedList1/Test-PackedList1.C
index b8ef31a2f2..f39599fa6c 100644
--- a/applications/test/PackedList1/Test-PackedList1.C
+++ b/applications/test/PackedList1/Test-PackedList1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,11 +72,15 @@ int main(int argc, char *argv[])
     list1.printInfo(Info, true);
 
     Info<< "\ntest assign between references, with chaining\n";
-    list1[0] = list1[4] = 1;
+    list1[0] = 1;
+    list1[4] = 1;
     list1.printInfo(Info, true);
 
     Info<< "\ntest assign between references, with chaining and auto-vivify\n";
-    list1[1] = list1[8] = list1[10] = list1[14] = 2;
+    list1[1] = 2;
+    list1[8] = 2;
+    list1[10] = 2;
+    list1[14] = 2;
     list1.printInfo(Info, true);
 
 

From 04b00f4f0558ce9c9a272717a53b9778df3f485c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 8 Feb 2016 16:33:56 +0000
Subject: [PATCH 152/447] pplications/test/ListOps/Make/options: Removed
 extraneous backslash

---
 applications/test/ListOps/Make/options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/test/ListOps/Make/options b/applications/test/ListOps/Make/options
index 9e79e9d733..51903c0ce4 100644
--- a/applications/test/ListOps/Make/options
+++ b/applications/test/ListOps/Make/options
@@ -1,3 +1,3 @@
 EXE_INC = /*-DFULLDEBUG -O0 -g*/ \
 
-EXE_LIBS = \
+EXE_LIBS =

From d64e8f1414f3b22a414c5813e6cf898481caa449 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 8 Feb 2016 18:40:54 +0000
Subject: [PATCH 153/447] tutorials/compressible/rhoPimpleFoam/ras/angledDuct:
 Updated for change in U boundary condition update order

---
 .../compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
index 879c2a07f9..6e49a505ca 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
@@ -57,7 +57,7 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
     consistent          yes;
 
-    rhoMin          0.5;
+    rhoMin          0.4;
     rhoMax          2.0;
 
     residualControl

From 15cd7c14fcf66d0aac14b11d742312a02c2ae1e0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 8 Feb 2016 21:42:46 +0000
Subject: [PATCH 154/447] Function1Types::Sine: Changed parameters to be of
 type Function1 for greater flexibility

    Templated sine function with support for an offset level.

        \f[
            a sin(2 \pi f (t - t_0)) s + l
        \f]

    where

    \vartable
        symbol  | Description       | Data type
        a       | Amplitude         | Function1<scalar>
        f       | Frequency [1/s]   | Function1<scalar>
        s       | Type scale factor | Function1<Type>
        l       | Type offset level | Function1<Type>
        t_0     | Start time [s]    | scalar
        t       | Time [s]          | scalar
    \endvartable
---
 .../functions/Function1/Sine/Sine.C           | 24 ++++++-----
 .../functions/Function1/Sine/Sine.H           | 41 +++++--------------
 .../functions/Function1/Sine/SineIO.C         | 32 ++-------------
 3 files changed, 28 insertions(+), 69 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index ef2b529fe5..820799d702 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -32,10 +32,10 @@ template<class Type>
 void Foam::Function1Types::Sine<Type>::read(const dictionary& coeffs)
 {
     t0_ = coeffs.lookupOrDefault<scalar>("t0", 0);
-    amplitude_ = coeffs.lookupOrDefault<scalar>("amplitude", 1);
-    frequency_ = readScalar(coeffs.lookup("frequency"));
-    scale_ = pTraits<Type>(coeffs.lookup("scale"));
-    level_ = pTraits<Type>(coeffs.lookup("level"));
+    amplitude_ = Function1<scalar>::New("amplitude", coeffs);
+    frequency_ = Function1<scalar>::New("frequency", coeffs);
+    scale_ = Function1<Type>::New("scale", coeffs);
+    level_ = Function1<Type>::New("level", coeffs);
 }
 
 
@@ -58,9 +58,10 @@ Foam::Function1Types::Sine<Type>::Sine(const Sine<Type>& se)
 :
     Function1<Type>(se),
     t0_(se.t0_),
-    amplitude_(se.amplitude_),
-    frequency_(se.frequency_),
-    level_(se.level_)
+    amplitude_(se.amplitude_, false),
+    frequency_(se.frequency_, false),
+    scale_(se.scale_, false),
+    level_(se.level_, false)
 {}
 
 
@@ -77,9 +78,10 @@ template<class Type>
 Type Foam::Function1Types::Sine<Type>::value(const scalar t) const
 {
     return
-        amplitude_*sin(constant::mathematical::twoPi*frequency_*(t - t0_))
-       *scale_
-      + level_;
+        amplitude_->value(t)
+       *sin(constant::mathematical::twoPi*frequency_->value(t)*(t - t0_))
+       *scale_->value(t)
+      + level_->value(t);
 }
 
 
@@ -91,7 +93,7 @@ Type Foam::Function1Types::Sine<Type>::integrate
 ) const
 {
     NotImplemented;
-    return level_;
+    return level_->value(t1);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index c5e852742a..18b2ca0bf4 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -34,12 +34,13 @@ Description
     where
 
     \vartable
-        a       | Amplitude
-        f       | Frequency [1/s]
-        s       | Type scale factor
-        l       | Type offset level
-        t_0     | Start time [s]
-        t       | Time [s]
+        symbol  | Description       | Data type
+        a       | Amplitude         | Function1<scalar>
+        f       | Frequency [1/s]   | Function1<scalar>
+        s       | Type scale factor | Function1<Type>
+        l       | Type offset level | Function1<Type>
+        t_0     | Start time [s]    | scalar
+        t       | Time [s]          | scalar
     \endvartable
 
     Example for a scalar:
@@ -80,16 +81,6 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of friend functions and operators
-namespace Function1Types
-{
-    template<class Type> class Sine;
-};
-
-template<class Type>
-Ostream& operator<<(Ostream&, const Function1Types::Sine<Type>&);
-
 namespace Function1Types
 {
 
@@ -108,16 +99,16 @@ class Sine
         scalar t0_;
 
         //- Scalar amplitude of the sin function
-        scalar amplitude_;
+        autoPtr<Function1<scalar>> amplitude_;
 
         //- Frequency of the sin function
-        scalar frequency_;
+        autoPtr<Function1<scalar>> frequency_;
 
         //- Scaling factor of the sin function
-        Type scale_;
+        autoPtr<Function1<Type>> scale_;
 
         //- Level to which the sin function is added
-        Type level_;
+        autoPtr<Function1<Type>> level_;
 
 
     // Private Member Functions
@@ -167,16 +158,6 @@ public:
         //- Integrate between the two time values t1 and t2
         Type integrate(const scalar t1, const scalar t2) const;
 
-
-    // I/O
-
-        //- Ostream Operator
-        friend Ostream& operator<< <Type>
-        (
-            Ostream& os,
-            const Sine<Type>& cnst
-        );
-
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
 };
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C b/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
index dc1ba58d41..ea2bfadbdb 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
@@ -27,30 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const Function1Types::Sine<Type>& se
-)
-{
-    os  << static_cast<const Function1<Type>& >(se)
-        << token::SPACE << se.t0_
-        << token::SPACE << se.amplitude_
-        << token::SPACE << se.frequency_
-        << token::SPACE << se.scale_
-        << token::SPACE << se.level_;
-
-    // Check state of Ostream
-    os.check
-    (
-        "Ostream& operator<<(Ostream&, const Sine<Type>&)"
-    );
-
-    return os;
-}
-
-
 template<class Type>
 void Foam::Function1Types::Sine<Type>::writeData(Ostream& os) const
 {
@@ -59,10 +35,10 @@ void Foam::Function1Types::Sine<Type>::writeData(Ostream& os) const
     os  << indent << word(this->name() + "Coeffs") << nl;
     os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
     os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl;
-    os.writeKeyword("amplitude") << amplitude_ << token::END_STATEMENT << nl;
-    os.writeKeyword("frequency") << frequency_ << token::END_STATEMENT << nl;
-    os.writeKeyword("scale") << scale_ << token::END_STATEMENT << nl;
-    os.writeKeyword("level") << level_ << token::END_STATEMENT << nl;
+    amplitude_->writeData(os);
+    frequency_->writeData(os);
+    scale_->writeData(os);
+    level_->writeData(os);
     os  << decrIndent << indent << token::END_BLOCK << endl;
 }
 

From ef649ba984c79cf8239387065319129132796d8f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 8 Feb 2016 21:43:56 +0000
Subject: [PATCH 155/447] Function1: Rationalized the stream output

---
 .../primitives/functions/Function1/CSV/CSV.H  | 26 ++-----------------
 .../functions/Function1/CSV/CSVIO.C           | 22 ----------------
 .../functions/Function1/Constant/Constant.H   | 20 --------------
 .../functions/Function1/Constant/ConstantIO.C | 20 --------------
 .../Function1/Function1/Function1IO.C         |  5 ++--
 .../PolynomialEntry/PolynomialEntry.H         | 19 --------------
 .../PolynomialEntry/PolynomialEntryIO.C       | 20 --------------
 .../functions/Function1/Table/Table.H         | 10 -------
 .../functions/Function1/Table/TableBase.H     | 19 --------------
 .../functions/Function1/Table/TableBaseIO.C   | 20 --------------
 .../functions/Function1/TableFile/TableFile.H | 10 -------
 11 files changed, 5 insertions(+), 186 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
index 08ff3d52ef..fd8f8d2655 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
@@ -61,16 +61,6 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of friend functions and operators
-namespace Function1Types
-{
-    template<class Type> class CSV;
-};
-
-template<class Type>
-Ostream& operator<<(Ostream&, const Function1Types::CSV<Type>&);
-
 namespace Function1Types
 {
 
@@ -151,20 +141,8 @@ public:
 
     // Member Functions
 
-        // Access
-
-            //- Return const access to the file name
-            virtual const fileName& fName() const;
-
-
-    // I/O
-
-        //- Ostream Operator
-        friend Ostream& operator<< <Type>
-        (
-            Ostream& os,
-            const CSV<Type>& cnst
-        );
+        //- Return const access to the file name
+        virtual const fileName& fName() const;
 
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
index 5b4785b50d..106ed929cb 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
@@ -27,28 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const Function1Types::CSV<Type>& tbl
-)
-{
-    os  << static_cast<const Function1<Type>& >(tbl)
-        << token::SPACE << tbl.nHeaderLine_
-        << token::SPACE << tbl.timeColumn_
-        << token::SPACE << tbl.componentColumns_
-        << token::SPACE << tbl.separator_
-        << token::SPACE << tbl.mergeSeparators_
-        << token::SPACE << tbl.fileName_;
-
-    // Check state of Ostream
-    os.check("Ostream& operator<<(Ostream&, const CSV<Type>&)");
-
-    return os;
-}
-
-
 template<class Type>
 void Foam::Function1Types::CSV<Type>::writeData(Ostream& os) const
 {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
index 756e65af53..eda6f21654 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
@@ -46,16 +46,6 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of friend functions and operators
-namespace Function1Types
-{
-    template<class Type> class Constant;
-};
-
-template<class Type>
-Ostream& operator<<(Ostream&, const Function1Types::Constant<Type>&);
-
 namespace Function1Types
 {
 
@@ -118,16 +108,6 @@ public:
         //- Integrate between two values
         Type integrate(const scalar x1, const scalar x2) const;
 
-
-    // I/O
-
-        //- Ostream Operator
-        friend Ostream& operator<< <Type>
-        (
-            Ostream& os,
-            const Constant<Type>& cnst
-        );
-
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
 };
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C b/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
index bbc5141929..af9f5e439a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
@@ -27,26 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const Function1Types::Constant<Type>& cnst
-)
-{
-    os  << static_cast<const Function1<Type>& >(cnst)
-        << token::SPACE << cnst.value_;
-
-    // Check state of Ostream
-    os.check
-    (
-        "Ostream& operator<<(Ostream&, const Constant<Type>&)"
-    );
-
-    return os;
-}
-
-
 template<class Type>
 void Foam::Function1Types::Constant<Type>::writeData(Ostream& os) const
 {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
index a0835be61d..47f7ef9312 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
@@ -31,7 +31,7 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const Function1<Type>& de
+    const Function1<Type>& f1
 )
 {
     // Check state of Ostream
@@ -40,7 +40,8 @@ Foam::Ostream& Foam::operator<<
         "Ostream& operator<<(Ostream&, const Function1<Type>&)"
     );
 
-    os  << de.name_;
+    os  << f1.name_;
+    f1.writeData(os);
 
     return os;
 }
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
index 04ad5dfb7b..93ddccbe65 100644
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
@@ -53,16 +53,6 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of friend functions and operators
-namespace Function1Types
-{
-    template<class Type> class Polynomial;
-};
-
-template<class Type>
-Ostream& operator<<(Ostream&, const Function1Types::Polynomial<Type>&);
-
 namespace Function1Types
 {
 
@@ -138,15 +128,6 @@ public:
             Type integrate(const scalar x1, const scalar x2) const;
 
 
-    // I/O
-
-        //- Ostream Operator
-        friend Ostream& operator<< <Type>
-        (
-            Ostream& os,
-            const Polynomial<Type>& cnst
-        );
-
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
 };
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
index 80d4f00bcc..6aa58e405d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
@@ -27,26 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const Function1Types::Polynomial<Type>& poly
-)
-{
-    os  << static_cast<const Function1<Type>& >(poly)
-        << token::SPACE << poly.coeffs_;
-
-    // Check state of Ostream
-    os.check
-    (
-        "Ostream& operator<<(Ostream&, const Polynomial&)"
-    );
-
-    return os;
-}
-
-
 template<class Type>
 void Foam::Function1Types::Polynomial<Type>::writeData(Ostream& os) const
 {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
index afa30eec61..ab1cafd9c5 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
@@ -52,16 +52,6 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of friend functions and operators
-namespace Function1Types
-{
-    template<class Type> class Table;
-};
-
-template<class Type>
-Ostream& operator<<(Ostream&, const Function1Types::Table<Type>&);
-
 namespace Function1Types
 {
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index d3eb69e788..1f2ab0f46f 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
@@ -45,15 +45,6 @@ namespace Foam
 
 class interpolationWeights;
 
-// Forward declaration of friend functions and operators
-namespace Function1Types
-{
-    template<class Type> class TableBase;
-};
-
-template<class Type>
-Ostream& operator<<(Ostream&, const Function1Types::TableBase<Type>&);
-
 namespace Function1Types
 {
 
@@ -167,16 +158,6 @@ public:
         //- Return the dependent values
         virtual tmp<Field<Type>> y() const;
 
-
-    // I/O
-
-        //- Ostream Operator
-        friend Ostream& operator<< <Type>
-        (
-            Ostream& os,
-            const TableBase<Type>& tbl
-        );
-
         //- Write all table data in dictionary format
         virtual void writeData(Ostream& os) const;
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
index 372317ae4e..d607649ad5 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
@@ -27,26 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const Function1Types::TableBase<Type>& tbl
-)
-{
-    os  << static_cast<const Function1<Type>&>(tbl);
-    os << token::SPACE << tbl.table_;
-
-    // Check state of Ostream
-    os.check
-    (
-        "Ostream& operator<<(Ostream&, const TableBase<Type>&, const bool)"
-    );
-
-    return os;
-}
-
-
 template<class Type>
 void Foam::Function1Types::TableBase<Type>::writeData(Ostream& os) const
 {
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
index 2ce0e09597..3bb7d0f813 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
@@ -63,16 +63,6 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of friend functions and operators
-namespace Function1Types
-{
-    template<class Type> class TableFile;
-};
-
-template<class Type>
-Ostream& operator<<(Ostream&, const Function1Types::TableFile<Type>&);
-
 namespace Function1Types
 {
 

From 49f1c7e29a8ceb002d131d85d31ecd01aa81030b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 08:57:42 +0000
Subject: [PATCH 156/447] oscillatingFixedValue BC replaced by
 uniformFixedValue with the new Function1Types::Sine

For example the sinusoidal motion of the floating object in the
potentialFreeSurfaceFoam/oscillatingBox tutorial is now specified thus

    floatingObject
    {
        type            fixedNormalInletOutletVelocity;

        fixTangentialInflow false;

        normalVelocity
        {
            type            uniformFixedValue;
            uniformValue    sine;
            uniformValueCoeffs
            {
                frequency 1;
                amplitude table
                (
                    (   0     0)
                    (  10 0.025)
                    (1000 0.025)
                );
                scale     (0 1 0);
                level     (0 0 0);
            }
        }

        value           uniform (0 0 0);
    }

rather than using

    floatingObject
    {
        type            fixedNormalInletOutletVelocity;

        fixTangentialInflow false;

        normalVelocity
        {
            type            oscillatingFixedValue;
            refValue        uniform (0 1 0);
            offset          (0 -1 0);
            amplitude       table
            (
                (   0     0)
                (  10 0.025)
                (1000 0.025)
            );
            frequency       constant 1;
        }

        value           uniform (0 0 0);
    }
---
 src/finiteVolume/Make/files                   |   1 -
 ...malInletOutletVelocityFvPatchVectorField.H |  26 +-
 .../oscillatingFixedValueFvPatchField.C       | 205 -------------
 .../oscillatingFixedValueFvPatchField.H       | 277 ------------------
 .../oscillatingFixedValueFvPatchFields.C      |  43 ---
 .../oscillatingFixedValueFvPatchFields.H      |  49 ----
 .../oscillatingFixedValueFvPatchFieldsFwd.H   |  50 ----
 .../oscillatingBox/0.org/U                    |  28 +-
 8 files changed, 32 insertions(+), 647 deletions(-)
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFields.C
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFields.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFieldsFwd.H

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 331f1439f5..92e61cecc0 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -157,7 +157,6 @@ $(derivedFvPatchFields)/mappedFixedValue/mappedFixedValueFvPatchFields.C
 $(derivedFvPatchFields)/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
 $(derivedFvPatchFields)/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
 $(derivedFvPatchFields)/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
-$(derivedFvPatchFields)/oscillatingFixedValue/oscillatingFixedValueFvPatchFields.C
 $(derivedFvPatchFields)/outletInlet/outletInletFvPatchFields.C
 $(derivedFvPatchFields)/outletMappedUniformInlet/outletMappedUniformInletFvPatchFields.C
 $(derivedFvPatchFields)/partialSlip/partialSlipFvPatchFields.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H
index 6d6bb2e736..a578e09948 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,16 +59,20 @@ Description
         fixTangentialInflow false;
         normalVelocity
         {
-            type            oscillatingFixedValue;
-            refValue        uniform (0 1 0);
-            offset          (0 -1 0);
-            amplitude       table
-            (
-                (   0     0)
-                (   2 0.088)
-                (   8 0.088)
-            );
-            frequency       constant 1;
+            type            uniformFixedValue;
+            uniformValue    sine;
+            uniformValueCoeffs
+            {
+                frequency 1;
+                amplitude table
+                (
+                    (0  0)
+                    (2  0.088)
+                    (8  0.088)
+                );
+                scale     (0 1 0);
+                level     (0 0 0);
+            }
         }
 
         value           uniform (0 0 0);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
deleted file mode 100644
index 87d567747d..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
+++ /dev/null
@@ -1,205 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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 "oscillatingFixedValueFvPatchField.H"
-#include "mathematicalConstants.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-Foam::scalar Foam::oscillatingFixedValueFvPatchField<Type>::currentScale() const
-{
-    const scalar t = this->db().time().timeOutputValue();
-    const scalar a = amplitude_->value(t);
-    const scalar f = frequency_->value(t);
-
-    return 1.0 + a*sin(constant::mathematical::twoPi*f*t);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<Type>(p, iF),
-    refValue_(p.size()),
-    offset_(pTraits<Type>::zero),
-    amplitude_(),
-    frequency_(),
-    curTimeIndex_(-1)
-{}
-
-
-template<class Type>
-Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<Type>(p, iF),
-    refValue_("refValue", dict, p.size()),
-    offset_(dict.lookupOrDefault<Type>("offset", pTraits<Type>::zero)),
-    amplitude_(Function1<scalar>::New("amplitude", dict)),
-    frequency_(Function1<scalar>::New("frequency", dict)),
-    curTimeIndex_(-1)
-{
-    if (dict.found("value"))
-    {
-        fixedValueFvPatchField<Type>::operator==
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
-    {
-        fixedValueFvPatchField<Type>::operator==
-        (
-            refValue_*currentScale()
-          + offset_
-        );
-    }
-}
-
-
-template<class Type>
-Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
-(
-    const oscillatingFixedValueFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
-    refValue_(ptf.refValue_, mapper),
-    offset_(ptf.offset_),
-    amplitude_(ptf.amplitude_, false),
-    frequency_(ptf.frequency_, false),
-    curTimeIndex_(-1)
-{}
-
-
-template<class Type>
-Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
-(
-    const oscillatingFixedValueFvPatchField<Type>& ptf
-)
-:
-    fixedValueFvPatchField<Type>(ptf),
-    refValue_(ptf.refValue_),
-    offset_(ptf.offset_),
-    amplitude_(ptf.amplitude_, false),
-    frequency_(ptf.frequency_, false),
-    curTimeIndex_(-1)
-{}
-
-
-template<class Type>
-Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
-(
-    const oscillatingFixedValueFvPatchField<Type>& ptf,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<Type>(ptf, iF),
-    refValue_(ptf.refValue_),
-    offset_(ptf.offset_),
-    amplitude_(ptf.amplitude_, false),
-    frequency_(ptf.frequency_, false),
-    curTimeIndex_(-1)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::oscillatingFixedValueFvPatchField<Type>::autoMap
-(
-    const fvPatchFieldMapper& m
-)
-{
-    fixedValueFvPatchField<Type>::autoMap(m);
-    refValue_.autoMap(m);
-}
-
-
-template<class Type>
-void Foam::oscillatingFixedValueFvPatchField<Type>::rmap
-(
-    const fvPatchField<Type>& ptf,
-    const labelList& addr
-)
-{
-    fixedValueFvPatchField<Type>::rmap(ptf, addr);
-
-    const oscillatingFixedValueFvPatchField<Type>& tiptf =
-        refCast<const oscillatingFixedValueFvPatchField<Type>>(ptf);
-
-    refValue_.rmap(tiptf.refValue_, addr);
-}
-
-
-template<class Type>
-void Foam::oscillatingFixedValueFvPatchField<Type>::updateCoeffs()
-{
-    if (this->updated())
-    {
-        return;
-    }
-
-    if (curTimeIndex_ != this->db().time().timeIndex())
-    {
-        fixedValueFvPatchField<Type>::operator==
-        (
-            refValue_*currentScale()
-          + offset_
-        );
-
-        curTimeIndex_ = this->db().time().timeIndex();
-    }
-
-    fixedValueFvPatchField<Type>::updateCoeffs();
-}
-
-
-template<class Type>
-void Foam::oscillatingFixedValueFvPatchField<Type>::write(Ostream& os) const
-{
-    fixedValueFvPatchField<Type>::write(os);
-    refValue_.writeEntry("refValue", os);
-    os.writeKeyword("offset") << offset_ << token::END_STATEMENT << nl;
-    amplitude_->writeData(os);
-    frequency_->writeData(os);
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H
deleted file mode 100644
index bfc323d70e..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H
+++ /dev/null
@@ -1,277 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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::oscillatingFixedValueFvPatchField
-
-Group
-    grpGenericBoundaryConditions
-
-Description
-    This boundary condition provides an oscillating condition in terms of
-    amplitude and frequency.
-
-        \f[
-            x_p = (1 + a sin(2 \pi f t))x_{ref} + x_o
-        \f]
-
-    where
-
-    \vartable
-        x_p     | patch values
-        x_{ref} | patch reference values
-        x_o     | patch offset values
-        a       | amplitude
-        f       | frequency [1/s]
-        t       | time [s]
-    \endvartable
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        refValue     | reference value         | yes         |
-        offset       | offset value            | no          | 0.0
-        amplitude    | oscillation amplitude   | yes         |
-        frequency    | oscillation frequency   | yes         |
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            oscillatingFixedValue;
-        refValue        uniform 5.0;
-        offset          0.0;
-        amplitude       constant 0.5;
-        frequency       constant 10;
-    }
-    \endverbatim
-
-Note
-    The amplitude and frequency entries are Function1 types, able to describe
-    time varying functions.  The example above gives the usage for supplying
-    constant values.
-
-SeeAlso
-    Foam::Function1
-
-SourceFiles
-    oscillatingFixedValueFvPatchField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef oscillatingFixedValueFvPatchField_H
-#define oscillatingFixedValueFvPatchField_H
-
-#include "Random.H"
-#include "fixedValueFvPatchFields.H"
-#include "Function1.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-              Class oscillatingFixedValueFvPatchField Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class oscillatingFixedValueFvPatchField
-:
-    public fixedValueFvPatchField<Type>
-{
-    // Private data
-
-        //- Reference value
-        Field<Type> refValue_;
-
-        //- Offset
-        Type offset_;
-
-        //- Amplitude
-        autoPtr<Function1<scalar>> amplitude_;
-
-        //- Frequency
-        autoPtr<Function1<scalar>> frequency_;
-
-        //- Current time index
-        label curTimeIndex_;
-
-
-    // Private Member Functions
-
-        //- Return current scale
-        scalar currentScale() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("oscillatingFixedValue");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        oscillatingFixedValueFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        oscillatingFixedValueFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given oscillatingFixedValueFvPatchField
-        //  onto a new patch
-        oscillatingFixedValueFvPatchField
-        (
-            const oscillatingFixedValueFvPatchField<Type>&,
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        oscillatingFixedValueFvPatchField
-        (
-            const oscillatingFixedValueFvPatchField<Type>&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchField<Type>> clone() const
-        {
-            return tmp<fvPatchField<Type>>
-            (
-                new oscillatingFixedValueFvPatchField<Type>(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        oscillatingFixedValueFvPatchField
-        (
-            const oscillatingFixedValueFvPatchField<Type>&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type>> clone
-        (
-            const DimensionedField<Type, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchField<Type>>
-            (
-                new oscillatingFixedValueFvPatchField<Type>(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Access
-
-            //- Return the ref value
-            const Field<Type>& refValue() const
-            {
-                return refValue_;
-            }
-
-            //- Return reference to the ref value to allow adjustment
-            Field<Type>& refValue()
-            {
-                return refValue_;
-            }
-
-            //- Return amplitude
-            scalar amplitude() const
-            {
-                return amplitude_;
-            }
-
-            scalar& amplitude()
-            {
-                return amplitude_;
-            }
-
-            //- Return frequency
-            scalar frequency() const
-            {
-                return frequency_;
-            }
-
-            scalar& frequency()
-            {
-                return frequency_;
-            }
-
-
-        // Mapping functions
-
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap
-            (
-                const fvPatchFieldMapper&
-            );
-
-            //- Reverse map the given fvPatchField onto this fvPatchField
-            virtual void rmap
-            (
-                const fvPatchField<Type>&,
-                const labelList&
-            );
-
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "oscillatingFixedValueFvPatchField.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFields.C
deleted file mode 100644
index a75aa80c34..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFields.C
+++ /dev/null
@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "oscillatingFixedValueFvPatchFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makePatchFields(oscillatingFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFields.H
deleted file mode 100644
index 557d4973e7..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFields.H
+++ /dev/null
@@ -1,49 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef oscillatingFixedValueFvPatchFields_H
-#define oscillatingFixedValueFvPatchFields_H
-
-#include "oscillatingFixedValueFvPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(oscillatingFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFieldsFwd.H
deleted file mode 100644
index f46b9216b9..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef oscillatingFixedValueFvPatchFieldsFwd_H
-#define oscillatingFixedValueFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class oscillatingFixedValueFvPatchField;
-
-makePatchTypeFieldTypedefs(oscillatingFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U
index 4be67ee364..32e07b0044 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U
@@ -26,11 +26,13 @@ boundaryField
         type            pressureInletOutletParSlipVelocity;
         value           uniform (0 0 0);
     }
+
     walls
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
+
     floatingObject
     {
         type            fixedNormalInletOutletVelocity;
@@ -39,21 +41,25 @@ boundaryField
 
         normalVelocity
         {
-            type            oscillatingFixedValue;
-            refValue        uniform (0 1 0);
-            offset          (0 -1 0);
-            amplitude       table
-            (
-                (   0     0)
-                (  10 0.025)
-                (1000 0.025)
-            );
-            frequency       constant 1;
-            value           uniform (0 0 0);
+            type            uniformFixedValue;
+            uniformValue    sine;
+            uniformValueCoeffs
+            {
+                frequency 1;
+                amplitude table
+                (
+                    (   0     0)
+                    (  10 0.025)
+                    (1000 0.025)
+                );
+                scale     (0 1 0);
+                level     (0 0 0);
+            }
         }
 
         value           uniform (0 0 0);
     }
+
     frontAndBack
     {
         type            empty;

From 81b3c28f704efc04eaa978b65605fa74d9f38227 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 12:24:04 +0000
Subject: [PATCH 157/447] flowRateInletVelocityFvPatchVectorField: Minor
 updates

---
 .../flowRateInletVelocityFvPatchVectorField.C | 40 +++++++++----------
 .../flowRateInletVelocityFvPatchVectorField.H |  2 +-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index 95dfaf31cd..b286c9c74e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -25,10 +25,8 @@ License
 
 #include "flowRateInletVelocityFvPatchVectorField.H"
 #include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "surfaceFields.H"
 #include "one.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -48,24 +46,6 @@ flowRateInletVelocityFvPatchVectorField
 {}
 
 
-Foam::flowRateInletVelocityFvPatchVectorField::
-flowRateInletVelocityFvPatchVectorField
-(
-    const flowRateInletVelocityFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    flowRate_(ptf.flowRate_, false),
-    volumetric_(ptf.volumetric_),
-    rhoName_(ptf.rhoName_),
-    rhoInlet_(ptf.rhoInlet_),
-    extrapolateProfile_(ptf.extrapolateProfile_)
-{}
-
-
 Foam::flowRateInletVelocityFvPatchVectorField::
 flowRateInletVelocityFvPatchVectorField
 (
@@ -117,6 +97,24 @@ flowRateInletVelocityFvPatchVectorField
 }
 
 
+Foam::flowRateInletVelocityFvPatchVectorField::
+flowRateInletVelocityFvPatchVectorField
+(
+    const flowRateInletVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
+    flowRate_(ptf.flowRate_, false),
+    volumetric_(ptf.volumetric_),
+    rhoName_(ptf.rhoName_),
+    rhoInlet_(ptf.rhoInlet_),
+    extrapolateProfile_(ptf.extrapolateProfile_)
+{}
+
+
 Foam::flowRateInletVelocityFvPatchVectorField::
 flowRateInletVelocityFvPatchVectorField
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
index 2d0c139a4f..f27795df1e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
@@ -87,8 +87,8 @@ Note
     - Strange behaviour with potentialFoam since the U equation is not solved
 
 SeeAlso
-    Foam::Function1
     Foam::fixedValueFvPatchField
+    Foam::Function1Types
 
 SourceFiles
     flowRateInletVelocityFvPatchVectorField.C

From b2e90de6946ceb69072623f2577688529fb10ca6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 12:24:18 +0000
Subject: [PATCH 158/447] fixedMeanFvPatchField: Added support for time-varying
 mean-value

---
 .../derived/fixedMean/fixedMeanFvPatchField.C | 47 ++++++++++---------
 .../derived/fixedMean/fixedMeanFvPatchField.H | 20 ++++----
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
index e1eebee79c..8f5d8f41ba 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,20 @@ Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF),
-    meanValue_(pTraits<Type>::zero)
+    meanValue_()
+{}
+
+
+template<class Type>
+Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<Type>(p, iF, dict),
+    meanValue_(Function1<Type>::New(dict.lookup("meanValue"), dict))
 {}
 
 
@@ -50,20 +63,7 @@ Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
-    meanValue_(ptf.meanValue_)
-{}
-
-
-template<class Type>
-Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<Type>(p, iF, dict),
-    meanValue_(pTraits<Type>(dict.lookup("meanValue")))
+    meanValue_(ptf.meanValue_, false)
 {}
 
 
@@ -74,7 +74,7 @@ Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf),
-    meanValue_(ptf.meanValue_)
+    meanValue_(ptf.meanValue_, false)
 {}
 
 
@@ -86,7 +86,7 @@ Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf, iF),
-    meanValue_(ptf.meanValue_)
+    meanValue_(ptf.meanValue_, false)
 {}
 
 
@@ -100,19 +100,22 @@ void Foam::fixedMeanFvPatchField<Type>::updateCoeffs()
         return;
     }
 
+    const scalar t = this->db().time().timeOutputValue();
+    Type meanValue = meanValue_->value(t);
+
     Field<Type> newValues(this->patchInternalField());
 
     Type meanValuePsi =
         gSum(this->patch().magSf()*newValues)
        /gSum(this->patch().magSf());
 
-    if (mag(meanValue_) > SMALL && mag(meanValuePsi)/mag(meanValue_) > 0.5)
+    if (mag(meanValue) > SMALL && mag(meanValuePsi)/mag(meanValue) > 0.5)
     {
-        newValues *= mag(meanValue_)/mag(meanValuePsi);
+        newValues *= mag(meanValue)/mag(meanValuePsi);
     }
     else
     {
-        newValues += (meanValue_ - meanValuePsi);
+        newValues += (meanValue - meanValuePsi);
     }
 
     this->operator==(newValues);
@@ -125,7 +128,7 @@ template<class Type>
 void Foam::fixedMeanFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    os.writeKeyword("meanValue") << meanValue_ << token::END_STATEMENT << nl;
+    meanValue_->writeData(os);
     this->writeEntry("value", os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
index cddd17d298..757a3aad31 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
@@ -29,13 +29,14 @@ Group
 
 Description
     This boundary condition extrapolates field to the patch using the near-cell
-    values and adjusts the distribution to match the specified mean value.
+    values and adjusts the distribution to match the specified, optionally
+    time-varying, mean value.
 
     \heading Patch usage
 
     \table
         Property     | Description             | Required    | Default value
-        meanValue    | mean value              | yes         |
+        meanValue    | mean value Function1    | yes         |
     \endtable
 
     Example of the boundary condition specification:
@@ -49,6 +50,7 @@ Description
 
 SeeAlso
     Foam::fixedValueFvPatchField
+    Foam::Function1Types
 
 SourceFiles
     fixedMeanFvPatchField.C
@@ -59,6 +61,7 @@ SourceFiles
 #define fixedMeanFvPatchField_H
 
 #include "fixedValueFvPatchFields.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -74,13 +77,10 @@ class fixedMeanFvPatchField
 :
     public fixedValueFvPatchField<Type>
 {
-
-protected:
-
-    // Protected data
+    // Private data
 
         //- MeanValue value the field is adjusted to maintain
-        Type meanValue_;
+        autoPtr<Function1<Type>> meanValue_;
 
 
 public:
@@ -153,10 +153,8 @@ public:
 
     // Member functions
 
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
 
         //- Write
         virtual void write(Ostream&) const;

From 011177665f50307f1d81b82a06fd5a57c09ccb97 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 13:42:39 +0000
Subject: [PATCH 159/447] porousBlockage: New pisoFoam tutorial to demonstrate
 the porosity source fvOption

To see the different behavior of flow through and around the blockage
change D in constant/fvOptions:

        // D 100;  // Very little blockage
        // D 200;  // Some blockage but steady flow
        // D 500;  // Slight waviness in the far wake
        D 1000; // Fully shedding behavior
---
 .../pisoFoam/laminar/porousBlockage/0/U       | 39 +++++++++
 .../pisoFoam/laminar/porousBlockage/0/p       | 38 ++++++++
 .../pisoFoam/laminar/porousBlockage/Allrun    | 15 ++++
 .../laminar/porousBlockage/constant/fvOptions | 56 ++++++++++++
 .../constant/transportProperties              | 22 +++++
 .../constant/turbulenceProperties             | 20 +++++
 .../porousBlockage/system/blockMeshDict       | 86 +++++++++++++++++++
 .../laminar/porousBlockage/system/controlDict | 49 +++++++++++
 .../laminar/porousBlockage/system/fvSchemes   | 51 +++++++++++
 .../laminar/porousBlockage/system/fvSolution  | 59 +++++++++++++
 .../laminar/porousBlockage/system/topoSetDict | 43 ++++++++++
 11 files changed, 478 insertions(+)
 create mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/U
 create mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/p
 create mode 100755 tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
 create mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions
 create mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/transportProperties
 create mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties
 create mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/blockMeshDict
 create mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/controlDict
 create mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSchemes
 create mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution
 create mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict

diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/U b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/U
new file mode 100644
index 0000000000..73b9ed5aee
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/U
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (1 0 0);
+
+boundaryField
+{
+    //- Set patchGroups for constraint patches
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        value           $internalField;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/p b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/p
new file mode 100644
index 0000000000..723c5f95a0
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/p
@@ -0,0 +1,38 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    //- Set patchGroups for constraint patches
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            zeroGradient;
+    }
+
+    outlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
new file mode 100755
index 0000000000..a72c18a9dd
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication blockMesh
+
+runApplication topoSet
+
+runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions
new file mode 100644
index 0000000000..fcba4b2188
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      fvOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+porosity1
+{
+    type            explicitPorositySource;
+    active          yes;
+
+    explicitPorositySourceCoeffs
+    {
+        selectionMode   cellZone;
+        cellZone        porousBlockage;
+
+        type            DarcyForchheimer;
+
+        // D 100;  // Very little blockage
+        // D 200;  // Some blockage but steady flow
+        // D 500;  // Slight waviness in the far wake
+        D 1000; // Fully shedding behavior
+
+        DarcyForchheimerCoeffs
+        {
+            d   ($D $D $D);
+            f   (0 0 0);
+
+            coordinateSystem
+            {
+                type    cartesian;
+                origin  (0 0 0);
+                coordinateRotation
+                {
+                    type    axesRotation;
+                    e1  (1 0 0);
+                    e2  (0 1 0);
+                }
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/transportProperties b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/transportProperties
new file mode 100644
index 0000000000..e277198874
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/transportProperties
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel  Newtonian;
+
+nu              [0 2 -1 0 0 0 0] 5e-3; // Re_blockage = 200
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties
new file mode 100644
index 0000000000..e26b4d516f
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/blockMeshDict b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/blockMeshDict
new file mode 100644
index 0000000000..2b3aa69023
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/blockMeshDict
@@ -0,0 +1,86 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (-2 -2 -0.1)
+    (6  -2 -0.1)
+    (6   2 -0.1)
+    (-2  2 -0.1)
+    (-2 -2  0.1)
+    (6  -2  0.1)
+    (6   2  0.1)
+    (-2  2  0.1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (64 32 1) simpleGrading (1 1 1)
+);
+
+boundary
+(
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    top
+    {
+        type symmetryPlane;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+
+    bottom
+    {
+        type symmetryPlane;
+        faces
+        (
+
+            (1 5 4 0)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/controlDict b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/controlDict
new file mode 100644
index 0000000000..ddc096b19d
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/controlDict
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     pisoFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         100;
+
+deltaT          0.05;
+
+writeControl    runTime;
+
+writeInterval   1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSchemes b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSchemes
new file mode 100644
index 0000000000..131fe0b498
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSchemes
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss LUST grad(U);
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear uncorrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         uncorrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution
new file mode 100644
index 0000000000..7342e01ebe
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution
@@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          GAMG;
+        tolerance       1e-06;
+        relTol          0.1;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        cacheAgglomeration on;
+        agglomerator    faceAreaPair;
+        nCellsInCoarsestLevel 10;
+        mergeLevels     1;
+    }
+
+    pFinal
+    {
+        $p;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    "(U|k|epsilon|omega|R|nuTilda)"
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-05;
+        relTol          0;
+    }
+}
+
+PISO
+{
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+    pRefCell        0;
+    pRefValue       0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict
new file mode 100644
index 0000000000..1102b49108
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    // porousBlockage
+    {
+        name    porousBlockageCellSet;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-0.5 -0.5 -1) (0.5 0.5 1);
+        }
+    }
+    {
+        name    porousBlockage;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set porousBlockageCellSet;
+        }
+    }
+);
+
+// ************************************************************************* //

From 399c724eff454d9f08be73636913846337511c10 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 15:26:02 +0000
Subject: [PATCH 160/447] Function1/makeDataEntries: Introduced macro to
 simplify instantiation of Function1Types

---
 .../functions/Function1/makeDataEntries.C     | 55 ++++++-------------
 1 file changed, 16 insertions(+), 39 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C b/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C
index c8d06e5bbc..aaae5bc10a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C
+++ b/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C
@@ -37,6 +37,17 @@ License
 #include "symmTensor.H"
 #include "tensor.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeFunction1s(Type)                                                   \
+    makeFunction1(Type);                                                       \
+    makeFunction1Type(Constant, Type);                                         \
+    makeFunction1Type(Polynomial, Type);                                       \
+    makeFunction1Type(Sine, Type);                                             \
+    makeFunction1Type(CSV, Type);                                              \
+    makeFunction1Type(Table, Type);                                            \
+    makeFunction1Type(TableFile, Type);
+
 namespace Foam
 {
     makeFunction1(label);
@@ -44,45 +55,11 @@ namespace Foam
     // Polynomial functions and interpolation do evaluate to label
     // Instead evaluate a scalar and convert to label as appropriate
 
-    makeFunction1(scalar);
-    makeFunction1Type(Constant, scalar);
-    makeFunction1Type(Polynomial, scalar);
-    makeFunction1Type(Sine, scalar);
-    makeFunction1Type(CSV, scalar);
-    makeFunction1Type(Table, scalar);
-    makeFunction1Type(TableFile, scalar);
-
-    makeFunction1(vector);
-    makeFunction1Type(Constant, vector);
-    makeFunction1Type(Polynomial, vector);
-    makeFunction1Type(Sine, vector);
-    makeFunction1Type(CSV, vector);
-    makeFunction1Type(Table, vector);
-    makeFunction1Type(TableFile, vector);
-
-    makeFunction1(sphericalTensor);
-    makeFunction1Type(Constant, sphericalTensor);
-    makeFunction1Type(Polynomial, sphericalTensor);
-    makeFunction1Type(Sine, sphericalTensor);
-    makeFunction1Type(CSV, sphericalTensor);
-    makeFunction1Type(Table, sphericalTensor);
-    makeFunction1Type(TableFile, sphericalTensor);
-
-    makeFunction1(symmTensor);
-    makeFunction1Type(Constant, symmTensor);
-    makeFunction1Type(Polynomial, symmTensor);
-    makeFunction1Type(Sine, symmTensor);
-    makeFunction1Type(CSV, symmTensor);
-    makeFunction1Type(Table, symmTensor);
-    makeFunction1Type(TableFile, symmTensor);
-
-    makeFunction1(tensor);
-    makeFunction1Type(Constant, tensor);
-    makeFunction1Type(Polynomial, tensor);
-    makeFunction1Type(Sine, tensor);
-    makeFunction1Type(CSV, tensor);
-    makeFunction1Type(Table, tensor);
-    makeFunction1Type(TableFile, tensor);
+    makeFunction1s(scalar);
+    makeFunction1s(vector);
+    makeFunction1s(sphericalTensor);
+    makeFunction1s(symmTensor);
+    makeFunction1s(tensor);
 }
 
 

From 668a2684f4e289a207d2ad33fa48c793fccc175b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 15:41:52 +0000
Subject: [PATCH 161/447] fftRenumber: Corrected namespace

---
 src/randomProcesses/fft/fftRenumber.C | 24 +++---------------------
 src/randomProcesses/fft/fftRenumber.H | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/randomProcesses/fft/fftRenumber.C b/src/randomProcesses/fft/fftRenumber.C
index 235bcd24a6..07f8b238be 100644
--- a/src/randomProcesses/fft/fftRenumber.C
+++ b/src/randomProcesses/fft/fftRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,16 +32,7 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// recursively evaluate the indexing necessary to do the folding of
-// the fft data. We recurse until we have the indexing ncessary for
-// the folding in all directions.
-
-void fftRenumberRecurse
+void Foam::fftRenumberRecurse
 (
     List<complex>& data,
     List<complex>& renumData,
@@ -101,12 +92,7 @@ void fftRenumberRecurse
 }
 
 
-// fftRenumber : fold the n-d data array to get the fft components in
-// the right places.
-
-#include "fftRenumber.H"
-
-void fftRenumber
+void Foam::fftRenumber
 (
     List<complex>& data,
     const labelList& nn
@@ -135,8 +121,4 @@ void fftRenumber
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/randomProcesses/fft/fftRenumber.H b/src/randomProcesses/fft/fftRenumber.H
index bc77adb0b1..fa2e50c580 100644
--- a/src/randomProcesses/fft/fftRenumber.H
+++ b/src/randomProcesses/fft/fftRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,6 +47,22 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Recursively evaluate the indexing necessary to do the folding of the fft
+// data. We recurse until we have the indexing ncessary for the folding in all
+// directions.
+void fftRenumberRecurse
+(
+    List<complex>& data,
+    List<complex>& renumData,
+    const labelList& nn,
+    label nnprod,
+    label ii,
+    label l1,
+    label l2
+);
+
+
+// Fold the n-d data array to get the fft components in the right places.
 void fftRenumber
 (
     List<complex>& data,

From ca679a86348c7007dd250bc074de9cc00b321180 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 15:42:13 +0000
Subject: [PATCH 162/447] fvPatchFields: Added Function1Types to SeeAlso as
 appropriate

---
 .../cylindricalInletVelocityFvPatchVectorField.H                | 2 +-
 .../fields/fvPatchFields/derived/fan/fanFvPatchField.H          | 2 +-
 .../fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H     | 2 +-
 .../derived/fixedProfile/fixedProfileFvPatchField.H             | 2 +-
 .../rotatingPressureInletOutletVelocityFvPatchVectorField.H     | 1 +
 .../rotatingTotalPressureFvPatchScalarField.H                   | 1 +
 .../rotatingWallVelocityFvPatchVectorField.H                    | 2 +-
 .../swirlFlowRateInletVelocityFvPatchVectorField.H              | 1 +
 .../timeVaryingMappedFixedValueFvPatchField.H                   | 1 +
 .../uniformFixedGradient/uniformFixedGradientFvPatchField.H     | 2 +-
 .../derived/uniformFixedValue/uniformFixedValueFvPatchField.H   | 2 +-
 .../derived/uniformInletOutlet/uniformInletOutletFvPatchField.H | 1 +
 .../fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H | 1 +
 .../derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H         | 1 +
 .../uniformTotalPressureFvPatchScalarField.H                    | 2 +-
 15 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
index 5861a21226..f390c15b95 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
@@ -63,7 +63,7 @@ Note
 
 SeeAlso
     Foam::fixedValueFvPatchField
-    Foam::Function1
+    Foam::Function1Types
 
 SourceFiles
     cylindricalInletVelocityFvPatchVectorField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
index 52f1e2e682..c9808939d9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
@@ -70,7 +70,7 @@ Note
      The underlying \c patchType should be set to \c cyclic
 
 SeeAlso
-    Foam::Function1
+    Foam::Function1Types
 
 SourceFiles
     fanFvPatchField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
index 757a3aad31..1b3dd9d2c4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
@@ -25,7 +25,7 @@ Class
     Foam::fixedMeanFvPatchField
 
 Group
-    grpGenericBoundaryConditions
+    grpInletBoundaryConditions
 
 Description
     This boundary condition extrapolates field to the patch using the near-cell
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
index 7964848cf2..997917ed85 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
@@ -84,7 +84,7 @@ Note
 
 SeeAlso
     Foam::fixedValueFvPatchField
-    Foam::Function1
+    Foam::Function1Types
     Foam::timeVaryingMappedFixedValueFvPatchField
 
 SourceFiles
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
index 2e7eb77d9a..94ee5b8c3f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
@@ -64,6 +64,7 @@ Note
 
 SeeAlso
     Foam::pressureInletOutletVelocityFvPatchVectorField
+    Foam::Function1Types
 
 SourceFiles
     rotatingPressureInletOutletVelocityFvPatchVectorField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H
index 271b1cb09b..eeb618ed0f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H
@@ -64,6 +64,7 @@ Description
 
 SeeAlso
     Foam::totalPressureFvPatchScalarField
+    Foam::Function1Types
 
 SourceFiles
     rotatingTotalPressureFvPatchScalarField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
index c9ab99efc4..9cbb121a6d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
@@ -54,7 +54,7 @@ Description
     functions.
 
 SeeAlso
-    Foam::Function1
+    Foam::Function1Types
     Foam::fixedValueFvPatchField
 
 SourceFiles
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
index 118715a1ae..6579b7a86b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
@@ -65,6 +65,7 @@ Note
 
 SeeAlso
     Foam::fixedValueFvPatchField
+    Foam::Function1Types
 
 SourceFiles
     swirlFlowRateInletVelocityFvPatchVectorField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
index 64c69b5c3a..ab90b04063 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
@@ -67,6 +67,7 @@ Description
 
 SeeAlso
     Foam::fixedValueFvPatchField
+    Foam::Function1Types
 
 SourceFiles
     timeVaryingMappedFixedValueFvPatchField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
index 48c2abb813..eed5afe79d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
@@ -52,7 +52,7 @@ Note
     constant value.
 
 SeeAlso
-    Foam::Function1
+    Foam::Function1Types
     Foam::fixedGradientFvPatchField
 
 SourceFiles
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
index d85a8ad390..401b621426 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
@@ -52,7 +52,7 @@ Note
     constant value.
 
 SeeAlso
-    Foam::Function1
+    Foam::Function1Types
     Foam::fixedValueFvPatchField
 
 SourceFiles
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
index 384bad76ef..a94092eeed 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
@@ -59,6 +59,7 @@ Note
 
 SeeAlso
     Foam::inletOutletFvPatchField
+    Foam::Function1Types
 
 SourceFiles
     uniformInletOutletFvPatchField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
index 8a3809c379..bed083da90 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
@@ -61,6 +61,7 @@ Note
 
 SeeAlso
     Foam::fixedJumpFvPatchField
+    Foam::Function1Types
 
 SourceFiles
     uniformJumpFvPatchField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
index b0b79cfab1..8147aa107b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
@@ -61,6 +61,7 @@ Note
 
 SeeAlso
     Foam::jumpCyclicAMIFvPatchField
+    Foam::Function1Types
 
 SourceFiles
     uniformJumpAMIFvPatchField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
index bc931db701..0f766e413d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
@@ -65,7 +65,7 @@ Note
 
 
 SeeAlso
-    Foam::Function1
+    Foam::Function1Types
     Foam::uniformFixedValueFvPatchField
     Foam::totalPressureFvPatchField
 

From 905eaa01e68efa1590590e62309b1d5ae19f567c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 18:43:48 +0000
Subject: [PATCH 163/447] movingWallVelocityFvPatchVectorField: Updated to
 obtain the velocity field from the dimensionedInteralField rather than by
 "lookup" from the database.

---
 .../movingWallVelocityFvPatchVectorField.C    | 49 +++++++++----------
 .../movingWallVelocityFvPatchVectorField.H    | 17 +------
 2 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
index 07c79444cb..46a7c7a90f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,11 +24,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "movingWallVelocityFvPatchVectorField.H"
-#include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "fvcMeshPhi.H"
-
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -39,22 +38,7 @@ movingWallVelocityFvPatchVectorField
     const DimensionedField<vector, volMesh>& iF
 )
 :
-    fixedValueFvPatchVectorField(p, iF),
-    UName_("U")
-{}
-
-
-Foam::movingWallVelocityFvPatchVectorField::
-movingWallVelocityFvPatchVectorField
-(
-    const movingWallVelocityFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchVectorField(ptf, p, iF, mapper),
-    UName_(ptf.UName_)
+    fixedValueFvPatchVectorField(p, iF)
 {}
 
 
@@ -66,21 +50,32 @@ movingWallVelocityFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchVectorField(p, iF),
-    UName_(dict.lookupOrDefault<word>("U", "U"))
+    fixedValueFvPatchVectorField(p, iF)
 {
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
 }
 
 
+Foam::movingWallVelocityFvPatchVectorField::
+movingWallVelocityFvPatchVectorField
+(
+    const movingWallVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchVectorField(ptf, p, iF, mapper)
+{}
+
+
 Foam::movingWallVelocityFvPatchVectorField::
 movingWallVelocityFvPatchVectorField
 (
     const movingWallVelocityFvPatchVectorField& mwvpvf
 )
 :
-    fixedValueFvPatchVectorField(mwvpvf),
-    UName_(mwvpvf.UName_)
+    fixedValueFvPatchVectorField(mwvpvf)
 {}
 
 
@@ -91,8 +86,7 @@ movingWallVelocityFvPatchVectorField
     const DimensionedField<vector, volMesh>& iF
 )
 :
-    fixedValueFvPatchVectorField(mwvpvf, iF),
-    UName_(mwvpvf.UName_)
+    fixedValueFvPatchVectorField(mwvpvf, iF)
 {}
 
 
@@ -124,7 +118,9 @@ void Foam::movingWallVelocityFvPatchVectorField::updateCoeffs()
 
         const vectorField Up((pp.faceCentres() - oldFc)/deltaT);
 
-        const volVectorField& U = db().lookupObject<volVectorField>(UName_);
+        const volVectorField& U =
+            static_cast<const volVectorField&>(dimensionedInternalField());
+
         scalarField phip
         (
             p.patchField<surfaceScalarField, scalar>(fvc::meshPhi(U))
@@ -145,7 +141,6 @@ void Foam::movingWallVelocityFvPatchVectorField::updateCoeffs()
 void Foam::movingWallVelocityFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchVectorField::write(os);
-    writeEntryIfDifferent<word>(os, "U", "U", UName_);
     writeEntry("value", os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H
index be5b50e6f8..2885a7d586 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,21 +32,14 @@ Description
     moving walls.  In addition, it should also be applied to 'moving' walls
     for moving reference frame (MRF) calculations.
 
-
     \heading Patch usage
 
-    \table
-        Property     | Description             | Required    | Default value
-        U            | velociy field name      | no          | U
-    \endtable
-
     Example of the boundary condition specification:
     \verbatim
     myPatch
     {
         type            movingWallVelocity;
-        U               U;
-        value           uniform 0; // initial value
+        value           uniform (0 0 0);    // Initial value
     }
     \endverbatim
 
@@ -62,7 +55,6 @@ SourceFiles
 #ifndef movingWallVelocityFvPatchVectorField_H
 #define movingWallVelocityFvPatchVectorField_H
 
-#include "fvPatchFields.H"
 #include "fixedValueFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -78,11 +70,6 @@ class movingWallVelocityFvPatchVectorField
 :
     public fixedValueFvPatchVectorField
 {
-    // Private data
-
-       //- Name of velocity field
-       word UName_;
-
 
 public:
 

From 92333618992a6e89abf22b38f48e6fe8c754375d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 18:45:13 +0000
Subject: [PATCH 164/447] noSlip: New wall boundary condition for velocity

noSlip is equivalent to fixedValue with a value of (0 0 0) but is
simpler to specify e.g.

     upperWall
     {
         type            noSlip;
     }
---
 src/finiteVolume/Make/files                   |   1 +
 .../basic/fixedValue/fixedValueFvPatchField.C |  12 ++
 .../basic/fixedValue/fixedValueFvPatchField.H |   8 +
 .../derived/noSlip/noSlipFvPatchVectorField.C | 102 ++++++++++++
 .../derived/noSlip/noSlipFvPatchVectorField.H | 153 ++++++++++++++++++
 .../fvPatchFields/fvPatchField/fvPatchField.C |  67 +++++---
 .../fvPatchFields/fvPatchField/fvPatchField.H |   8 +
 .../incompressible/simpleFoam/pitzDaily/0/U   |   6 +-
 8 files changed, 328 insertions(+), 29 deletions(-)
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.H

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 92e61cecc0..4506679f7b 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -156,6 +156,7 @@ $(derivedFvPatchFields)/mappedFixedPushedInternalValue/mappedFixedPushedInternal
 $(derivedFvPatchFields)/mappedFixedValue/mappedFixedValueFvPatchFields.C
 $(derivedFvPatchFields)/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
 $(derivedFvPatchFields)/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
+$(derivedFvPatchFields)/noSlip/noSlipFvPatchVectorField.C
 $(derivedFvPatchFields)/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
 $(derivedFvPatchFields)/outletInlet/outletInletFvPatchFields.C
 $(derivedFvPatchFields)/outletMappedUniformInlet/outletMappedUniformInletFvPatchFields.C
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
index 3c09e36a1d..445bed4f7e 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
@@ -38,6 +38,18 @@ Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
 {}
 
 
+template<class Type>
+Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const Type& value
+)
+:
+    fvPatchField<Type>(p, iF, value)
+{}
+
+
 template<class Type>
 Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
index 105a1afddc..be4e368ca4 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
@@ -87,6 +87,14 @@ public:
             const DimensionedField<Type, volMesh>&
         );
 
+        //- Construct from patch, internal field and value
+        fixedValueFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const Type& value
+        );
+
         //- Construct from patch, internal field and dictionary
         fixedValueFvPatchField
         (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
new file mode 100644
index 0000000000..da715a6d29
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "noSlipFvPatchVectorField.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchVectorField(p, iF, vector::zero)
+{}
+
+
+Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchVectorField(p, iF, vector::zero)
+{}
+
+
+Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
+(
+    const noSlipFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchVectorField(p, iF, vector::zero)
+{}
+
+
+Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
+(
+    const noSlipFvPatchVectorField& mwvpvf
+)
+:
+    fixedValueFvPatchVectorField(mwvpvf)
+{}
+
+
+Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
+(
+    const noSlipFvPatchVectorField& mwvpvf,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchVectorField(mwvpvf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::noSlipFvPatchVectorField::write(Ostream& os) const
+{
+    fvPatchVectorField::write(os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchVectorField,
+        noSlipFvPatchVectorField
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.H
new file mode 100644
index 0000000000..a2925e992f
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.H
@@ -0,0 +1,153 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::noSlipFvPatchVectorField
+
+Group
+    grpWallBoundaryConditions
+
+Description
+    This boundary condition fixes the velocity to zero at walls.
+
+    \heading Patch usage
+
+    Example of the boundary condition specification:
+    \verbatim
+    myPatch
+    {
+        type            noSlip;
+    }
+    \endverbatim
+
+SeeAlso
+    Foam::fixedValueFvPatchVectorField
+
+SourceFiles
+    noSlipFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef noSlipFvPatchVectorField_H
+#define noSlipFvPatchVectorField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+             Class noSlipFvPatchVectorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class noSlipFvPatchVectorField
+:
+    public fixedValueFvPatchVectorField
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("noSlip");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        noSlipFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        noSlipFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given noSlipFvPatchVectorField
+        //  onto a new patch
+        noSlipFvPatchVectorField
+        (
+            const noSlipFvPatchVectorField&,
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        noSlipFvPatchVectorField
+        (
+            const noSlipFvPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new noSlipFvPatchVectorField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        noSlipFvPatchVectorField
+        (
+            const noSlipFvPatchVectorField&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
+        (
+            const DimensionedField<vector, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new noSlipFvPatchVectorField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index e46692d50b..2487e76cc9 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -47,6 +47,23 @@ Foam::fvPatchField<Type>::fvPatchField
 {}
 
 
+template<class Type>
+Foam::fvPatchField<Type>::fvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const Type& value
+)
+:
+    Field<Type>(p.size(), value),
+    patch_(p),
+    internalField_(iF),
+    updated_(false),
+    manipulatedMatrix_(false),
+    patchType_(word::null)
+{}
+
+
 template<class Type>
 Foam::fvPatchField<Type>::fvPatchField
 (
@@ -81,31 +98,6 @@ Foam::fvPatchField<Type>::fvPatchField
 {}
 
 
-template<class Type>
-Foam::fvPatchField<Type>::fvPatchField
-(
-    const fvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    Field<Type>(p.size()),
-    patch_(p),
-    internalField_(iF),
-    updated_(false),
-    manipulatedMatrix_(false),
-    patchType_(ptf.patchType_)
-{
-    // For unmapped faces set to internal field value (zero-gradient)
-    if (notNull(iF) && iF.size())
-    {
-        fvPatchField<Type>::operator=(this->patchInternalField());
-    }
-    this->map(ptf, mapper);
-}
-
-
 template<class Type>
 Foam::fvPatchField<Type>::fvPatchField
 (
@@ -144,6 +136,31 @@ Foam::fvPatchField<Type>::fvPatchField
 }
 
 
+template<class Type>
+Foam::fvPatchField<Type>::fvPatchField
+(
+    const fvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    Field<Type>(p.size()),
+    patch_(p),
+    internalField_(iF),
+    updated_(false),
+    manipulatedMatrix_(false),
+    patchType_(ptf.patchType_)
+{
+    // For unmapped faces set to internal field value (zero-gradient)
+    if (notNull(iF) && iF.size())
+    {
+        fvPatchField<Type>::operator=(this->patchInternalField());
+    }
+    this->map(ptf, mapper);
+}
+
+
 template<class Type>
 Foam::fvPatchField<Type>::fvPatchField
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index c87a5b1ee0..496524c763 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -166,6 +166,14 @@ public:
             const DimensionedField<Type, volMesh>&
         );
 
+        //- Construct from patch, internal field and value
+        fvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const Type& value
+        );
+
         //- Construct from patch and internal field and patch type
         fvPatchField
         (
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/U b/tutorials/incompressible/simpleFoam/pitzDaily/0/U
index 885c5b9de4..9c15c3c575 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/U
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/U
@@ -33,14 +33,12 @@ boundaryField
 
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack

From daf44fda3d468237eabc3171c2efa53e16882227 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 20:08:34 +0000
Subject: [PATCH 165/447] tutorials and templates: Updated wall BC for velocity
 to noSlip

---
 etc/templates/closedVolume/0/U                |  3 +-
 etc/templates/closedVolumeRotating/0/U        |  3 +-
 etc/templates/compressibleInflowOutflow/0/U   |  3 +-
 etc/templates/inflowOutflow/0/U               |  3 +-
 etc/templates/inflowOutflowRotating/0/U       |  3 +-
 .../basic/potentialFoam/pitzDaily/0.org/U     |  6 ++--
 .../basic/scalarTransportFoam/pitzDaily/0/U   |  6 ++--
 .../flamePropagationWithObstacles/0.org/U     |  6 ++--
 .../combustion/engineFoam/kivaTest/-180/U     |  6 ++--
 .../0/filmRegion/Uf                           |  6 ++--
 .../fireFoam/les/smallPoolFire2D/0/U          |  3 +-
 .../fireFoam/les/smallPoolFire3D/0/U          |  3 +-
 .../rhoCentralDyMFoam/movingCone/0/U          |  9 ++---
 .../rhoCentralFoam/LadenburgJet60psi/0.org/U  |  3 +-
 .../rhoCentralFoam/LadenburgJet60psi/0/U      |  3 +-
 .../rhoPimpleFoam/les/pitzDaily/0/U           |  6 ++--
 .../rhoPimpleFoam/ras/angledDuct/0/U          |  9 ++---
 .../rhoPimpleFoam/ras/angledDuctLTS/0/U       |  9 ++---
 .../rhoPimpleFoam/ras/mixerVessel2D/0/U       |  6 ++--
 .../angledDuctImplicit/0/U                    |  9 ++---
 .../angledDuctExplicitFixedCoeff/0/U          |  9 ++---
 .../compressible/rhoSimpleFoam/squareBend/0/U |  3 +-
 .../compressible/sonicDyMFoam/movingCone/0/U  |  9 ++---
 .../sonicFoam/laminar/forwardStep/0/U         |  3 +-
 .../sonicFoam/ras/nacaAirfoil/0/U             |  3 +-
 .../compressible/sonicFoam/ras/prism/0/U      |  3 +-
 .../sonicLiquidFoam/decompressionTank/0/U     |  3 +-
 .../dsmcFoam/supersonicCorner/0/boundaryU     |  3 +-
 .../dsmcFoam/wedge15Ma5/0/boundaryU           |  3 +-
 .../molecularDynamics/mdFoam/nanoNozzle/0/U   | 18 ++++------
 .../electromagnetics/mhdFoam/hartmann/0/U     |  6 ++--
 .../buoyantBoussinesqPimpleFoam/hotRoom/0/U   |  9 ++---
 .../buoyantBoussinesqSimpleFoam/hotRoom/0/U   |  9 ++---
 .../iglooWithFridges/0/U                      |  3 +-
 .../buoyantPimpleFoam/hotRoom/0/U             |  9 ++---
 .../buoyantSimpleFoam/buoyantCavity/0/U       | 12 +++----
 .../circuitBoardCooling/0.org/U               |  6 ++--
 .../externalCoupledCavity/0/U                 | 12 +++----
 .../buoyantSimpleFoam/hotRadiationRoom/0/U    | 12 +++----
 .../hotRadiationRoomFvDOM/0/U                 | 12 +++----
 .../multiRegionHeater/0/bottomWater/U         | 18 ++++------
 .../heatExchanger/0.org/air/U                 |  6 ++--
 .../heatExchanger/0.org/porous/U              |  3 +-
 .../SRFPimpleFoam/rotor2D/0/Urel              |  3 +-
 .../incompressible/SRFSimpleFoam/mixer/0/Urel |  3 +-
 .../pitzDaily/0/U                             |  6 ++--
 .../pitzDaily/0/Ua                            |  6 ++--
 .../boundaryFoam/boundaryLaunderSharma/0/U    |  6 ++--
 .../boundaryFoam/boundaryWallFunctions/0/U    |  6 ++--
 .../boundaryWallFunctionsProfile/0/U          |  6 ++--
 tutorials/incompressible/icoFoam/cavity/0/U   |  3 +-
 .../incompressible/icoFoam/cavityClipped/0/U  |  3 +-
 .../incompressible/icoFoam/cavityGrade/0/U    |  3 +-
 tutorials/incompressible/icoFoam/elbow/0/U    |  6 ++--
 .../nonNewtonianIcoFoam/offsetCylinder/0/U    |  9 ++---
 .../pimpleDyMFoam/mixerVesselAMI2D/0/U        |  4 +--
 .../pimpleDyMFoam/movingCone/0/U              |  9 ++---
 .../oscillatingInletACMI2D/0.org/U            |  6 ++--
 .../pimpleDyMFoam/propeller/0.org/U           |  3 +-
 .../wingMotion2D_simpleFoam/0.org/U           |  3 +-
 .../incompressible/pimpleFoam/TJunction/0/U   |  3 +-
 .../pimpleFoam/TJunctionFan/0.org/U           |  3 +-
 .../pimpleFoam/channel395/0.org/U             |  6 ++--
 .../pimpleFoam/elipsekkLOmega/0/U             |  3 +-
 .../incompressible/pimpleFoam/pitzDaily/0/U   |  6 ++--
 .../pisoFoam/les/motorBike/motorBike/0.org/U  |  3 +-
 .../incompressible/pisoFoam/les/pitzDaily/0/U |  6 ++--
 .../incompressible/pisoFoam/ras/cavity/0/U    |  3 +-
 .../pisoFoam/ras/cavityCoupledU/0/U           |  3 +-
 .../porousSimpleFoam/angledDuctImplicit/0/U   |  9 ++---
 .../porousSimpleFoam/straightDuctImplicit/0/U |  9 ++---
 .../incompressible/simpleFoam/airFoil2D/0/U   |  3 +-
 .../simpleFoam/mixerVessel2D/0/U              |  6 ++--
 .../simpleFoam/motorBike/0.org/U              |  3 +-
 .../simpleFoam/pipeCyclic/0.org/U             |  3 +-
 .../simpleFoam/pitzDailyExptInlet/0/U         |  6 ++--
 .../simpleFoam/windAroundBuildings/0/U        |  3 +-
 .../lagrangian/DPMFoam/Goldschmidt/0/U.air    |  3 +-
 .../lagrangian/MPPICFoam/Goldschmidt/0/U.air  |  3 +-
 tutorials/lagrangian/MPPICFoam/column/0/U.air |  6 ++--
 .../lagrangian/MPPICFoam/cyclone/0/U.air      |  3 +-
 .../MPPICFoam/injectionChannel/0/U.air        |  3 +-
 .../coalChemistryFoam/simplifiedSiwek/0/U     |  9 ++---
 .../hopper/hopperEmptying/0.org/U             |  6 ++--
 .../hopper/hopperInitialState/0/U             |  6 ++--
 .../reactingParcelFilmFoam/cylinder/0.org/U   |  6 ++--
 .../cylinder/0.org/wallFilmRegion/Uf          |  6 ++--
 .../hotBoxes/0.org/wallFilmRegion/Uf          |  3 +-
 .../rivuletPanel/0.org/U                      |  3 +-
 .../rivuletPanel/0.org/wallFilmRegion/Uf      |  6 ++--
 .../splashPanel/0.org/U                       |  3 +-
 .../splashPanel/0.org/wallFilmRegion/Uf       | 15 +++-----
 .../reactingParcelFoam/filter/0.org/U         |  3 +-
 .../lagrangian/reactingParcelFoam/filter/0/U  |  3 +-
 .../reactingParcelFoam/parcelInBox/0/U        |  3 +-
 .../verticalChannel/0.org/U                   |  3 +-
 .../verticalChannelLTS/0.org/U                |  3 +-
 .../reactingParcelFoam/verticalChannelLTS/0/U |  3 +-
 .../verticalChannel/0.org/U                   |  3 +-
 .../verticalChannel/0/U                       |  3 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U  |  3 +-
 .../cavitatingFoam/les/throttle/0/U           |  3 +-
 .../cavitatingFoam/les/throttle3D/0.org/U     |  6 ++--
 .../cavitatingFoam/ras/throttle/0/U           |  3 +-
 .../laminar/depthCharge2D/0.org/U             |  3 +-
 .../laminar/depthCharge3D/0.org/U             |  3 +-
 .../laminar/damBreak4phase/0.org/U            |  9 ++---
 .../multiphase/driftFluxFoam/ras/dahl/0/U     |  6 ++--
 .../driftFluxFoam/ras/mixerVessel2D/0/U       |  6 ++--
 .../multiphase/driftFluxFoam/ras/tank3D/0/U   | 36 +++++++------------
 .../interDyMFoam/ras/floatingObject/0.org/U   |  3 +-
 .../interFoam/laminar/capillaryRise/0/U       |  3 +-
 .../multiphase/interFoam/laminar/damBreak/0/U |  9 ++---
 .../interFoam/laminar/mixerVessel2D/0/U       |  6 ++--
 .../multiphase/interFoam/les/nozzleFlow2D/0/U |  3 +-
 .../multiphase/interFoam/ras/angledDuct/0/U   |  9 ++---
 .../multiphase/interFoam/ras/damBreak/0/U     |  9 ++---
 .../interFoam/ras/damBreakPorousBaffle/0/U    |  9 ++---
 .../multiphase/interFoam/ras/waterChannel/0/U |  3 +-
 .../interFoam/ras/weirOverflow/0.org/U        |  3 +-
 .../interMixingFoam/laminar/damBreak/0/U      |  9 ++---
 .../interPhaseChangeDyMFoam/propeller/0.org/U |  3 +-
 .../cavitatingBullet/0.org/U                  |  3 +-
 .../damBreak4phase/0.org/U                    |  9 ++---
 .../damBreak4phase/0.org/U.air                |  9 ++---
 .../damBreak4phase/0.org/U.mercury            |  9 ++---
 .../damBreak4phase/0.org/U.oil                |  9 ++---
 .../damBreak4phase/0.org/U.water              |  9 ++---
 .../damBreak4phaseFine/0.org/U                |  9 ++---
 .../damBreak4phaseFine/0.org/U.air            |  9 ++---
 .../damBreak4phaseFine/0.org/U.mercury        |  9 ++---
 .../damBreak4phaseFine/0.org/U.oil            |  9 ++---
 .../damBreak4phaseFine/0.org/U.water          |  9 ++---
 .../multiphaseEulerFoam/mixerVessel2D/0/U.air |  6 ++--
 .../mixerVessel2D/0/U.mercury                 |  6 ++--
 .../multiphaseEulerFoam/mixerVessel2D/0/U.oil |  6 ++--
 .../mixerVessel2D/0/U.water                   |  6 ++--
 .../laminar/mixerVesselAMI2D/0.org/U          |  3 +-
 .../laminar/damBreak4phase/0.org/U            |  9 ++---
 .../laminar/damBreak4phaseFine/0.org/U        |  9 ++---
 .../laminar/mixerVessel2D/0.org/U             |  6 ++--
 .../laminar/mixerVessel2D/0/U                 |  6 ++--
 .../oscillatingBox/0.org/U                    |  3 +-
 .../oscillatingBox/0.org/U                    |  3 +-
 .../laminar/mixerVessel2D/0/U.air             |  6 ++--
 .../laminar/mixerVessel2D/0/U.mercury         |  6 ++--
 .../laminar/mixerVessel2D/0/U.oil             |  6 ++--
 .../laminar/mixerVessel2D/0/U.water           |  6 ++--
 .../bubbleColumnEvaporatingReacting/0/U.gas   |  3 +-
 .../0/U.liquid                                |  3 +-
 .../RAS/fluidisedBed/0/U.air                  |  3 +-
 .../RAS/wallBoiling/0/U.gas                   |  6 ++--
 .../RAS/wallBoiling/0/U.liquid                |  6 ++--
 .../laminar/bubbleColumnEvaporating/0/U.gas   |  3 +-
 .../bubbleColumnEvaporating/0/U.liquid        |  3 +-
 .../laminar/fluidisedBed/0/U.air              |  3 +-
 .../laminar/mixerVessel2D/0/U.air             |  6 ++--
 .../laminar/mixerVessel2D/0/U.water           |  6 ++--
 .../laminar/steamInjection/0/U.steam          |  3 +-
 .../laminar/steamInjection/0/U.water          |  3 +-
 .../RAS/fluidisedBed/0/U.air                  |  3 +-
 .../laminar/fluidisedBed/0/U.air              |  3 +-
 .../laminar/mixerVessel2D/0/U.air             |  6 ++--
 .../laminar/mixerVessel2D/0/U.water           |  6 ++--
 164 files changed, 314 insertions(+), 626 deletions(-)

diff --git a/etc/templates/closedVolume/0/U b/etc/templates/closedVolume/0/U
index b279dc1f78..3693806bb5 100644
--- a/etc/templates/closedVolume/0/U
+++ b/etc/templates/closedVolume/0/U
@@ -22,8 +22,7 @@ boundaryField
 {
     wall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/etc/templates/closedVolumeRotating/0/U b/etc/templates/closedVolumeRotating/0/U
index ca3c572c86..0edfb791e3 100644
--- a/etc/templates/closedVolumeRotating/0/U
+++ b/etc/templates/closedVolumeRotating/0/U
@@ -27,8 +27,7 @@ boundaryField
     }
     wall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/etc/templates/compressibleInflowOutflow/0/U b/etc/templates/compressibleInflowOutflow/0/U
index 8b7d69447a..b6179db447 100644
--- a/etc/templates/compressibleInflowOutflow/0/U
+++ b/etc/templates/compressibleInflowOutflow/0/U
@@ -36,8 +36,7 @@ boundaryField
 
     wall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     #includeEtc "caseDicts/setConstraintTypes"
diff --git a/etc/templates/inflowOutflow/0/U b/etc/templates/inflowOutflow/0/U
index 8b7d69447a..b6179db447 100644
--- a/etc/templates/inflowOutflow/0/U
+++ b/etc/templates/inflowOutflow/0/U
@@ -36,8 +36,7 @@ boundaryField
 
     wall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     #includeEtc "caseDicts/setConstraintTypes"
diff --git a/etc/templates/inflowOutflowRotating/0/U b/etc/templates/inflowOutflowRotating/0/U
index 8c1cfbebf1..0b011d64a6 100644
--- a/etc/templates/inflowOutflowRotating/0/U
+++ b/etc/templates/inflowOutflowRotating/0/U
@@ -42,8 +42,7 @@ boundaryField
 
     wall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     #includeEtc "caseDicts/setConstraintTypes"
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0.org/U b/tutorials/basic/potentialFoam/pitzDaily/0.org/U
index 885c5b9de4..9c15c3c575 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/0.org/U
+++ b/tutorials/basic/potentialFoam/pitzDaily/0.org/U
@@ -33,14 +33,12 @@ boundaryField
 
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/0/U b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
index bd853af1ab..5eb5ebff6b 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
@@ -12262,14 +12262,12 @@ boundaryField
 
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U
index e8f7c714a7..cf7e9a8dc6 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U
@@ -29,13 +29,11 @@ boundaryField
     }
     ground
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     blockedFaces
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     baffleWall
     {
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/U b/tutorials/combustion/engineFoam/kivaTest/-180/U
index 46d20b16d4..b4354d2e45 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/U
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/U
@@ -29,14 +29,12 @@ boundaryField
 
     liner
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     cylinderHead
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf
index 0ac01a3002..32284e7824 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf
@@ -28,8 +28,7 @@ boundaryField
 
     region0_to_filmRegion_coupledWall // Patch to pyrolysis
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     outlet
@@ -39,8 +38,7 @@ boundaryField
 
     "side.*"
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     inlet
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
index 1b7249d44f..3618095ba0 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
@@ -31,8 +31,7 @@ boundaryField
 
     base
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     inlet
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
index 459ab9f086..6c15bb5118 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
@@ -30,8 +30,7 @@ boundaryField
 
     base
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     inlet
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/U b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/U
index 2e86739791..8fa2c6c004 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/U
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/U
@@ -28,14 +28,12 @@ boundaryField
 
     farFieldMoving
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     fixedWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     left
@@ -46,8 +44,7 @@ boundaryField
 
     farField
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     back
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U
index de2bad551b..f19146bf90 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U
@@ -40,8 +40,7 @@ boundaryField
 
     freestreamInlet
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     wedge1 {type wedge;}
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
index c0560004a0..8c8f8f3e52 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
@@ -1261,8 +1261,7 @@ boundaryField
     }
     freestreamInlet
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     freestream
     {
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
index 29279adbfe..8a7ac7f945 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
@@ -37,14 +37,12 @@ boundaryField
 
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
index 590ae2411e..1525a01c78 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
@@ -22,18 +22,15 @@ boundaryField
 {
     front
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     back
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     porosityWall
     {
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/U b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/U
index 47440fb13c..9843976f5b 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/U
@@ -22,18 +22,15 @@ boundaryField
 {
     front
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     back
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     porosityWall
     {
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/U b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/U
index 8f856ef5ea..96fb64189c 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/U
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
index e121b9c3c1..a0b6fc4c39 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
@@ -22,18 +22,15 @@ boundaryField
 {
     front
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     back
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     porosityWall
     {
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
index e121b9c3c1..a0b6fc4c39 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
@@ -22,18 +22,15 @@ boundaryField
 {
     front
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     back
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     porosityWall
     {
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/U b/tutorials/compressible/rhoSimpleFoam/squareBend/0/U
index 22ce6f4d03..15eb17462d 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/U
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/U
@@ -22,8 +22,7 @@ boundaryField
 {
     Default_Boundary_Region
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     inlet
     {
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/U b/tutorials/compressible/sonicDyMFoam/movingCone/0/U
index 2e86739791..8fa2c6c004 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/U
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/0/U
@@ -28,14 +28,12 @@ boundaryField
 
     farFieldMoving
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     fixedWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     left
@@ -46,8 +44,7 @@ boundaryField
 
     farField
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     back
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
index 108d3b176d..c8614e3b88 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
@@ -43,8 +43,7 @@ boundaryField
 
     obstacle
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     defaultFaces
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
index c50c9171d0..ad519244c0 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
@@ -44,8 +44,7 @@ boundaryField
 
     WALL10
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/U b/tutorials/compressible/sonicFoam/ras/prism/0/U
index f9eff07595..5b5e23c0e9 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/U
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/U
@@ -55,8 +55,7 @@ boundaryField
 
     prismWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     defaultFaces
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
index 8cd64051f0..03a8423af2 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
@@ -22,8 +22,7 @@ boundaryField
 {
     outerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     axis
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
index 744ecbbfb8..613c97629c 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
@@ -33,8 +33,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
index cf0b5fbe89..b0f6c12470 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
@@ -28,8 +28,7 @@ boundaryField
 
     obstacle
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U
index 34e7af7e7c..7cd1b5044b 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U
@@ -22,33 +22,27 @@ boundaryField
 {
     sectionAEnd
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     sectionCEnd
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     front
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     back
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     top
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     bottom
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/U b/tutorials/electromagnetics/mhdFoam/hartmann/0/U
index a419bbdc71..80913f22bb 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/U
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/U
@@ -33,14 +33,12 @@ boundaryField
 
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U
index 6c92f22050..907d753d91 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U
@@ -22,20 +22,17 @@ boundaryField
 {
     floor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     ceiling
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     fixedWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U
index 6c92f22050..907d753d91 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U
@@ -22,20 +22,17 @@ boundaryField
 {
     floor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     ceiling
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     fixedWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
index 8c96ab7f5f..394f486732 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
@@ -25,8 +25,7 @@ boundaryField
 
     wall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
index 6c92f22050..907d753d91 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
@@ -22,20 +22,17 @@ boundaryField
 {
     floor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     ceiling
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     fixedWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
index 2d917d036f..b345bc896b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
@@ -23,26 +23,22 @@ boundaryField
 {
     frontAndBack
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     topAndBottom
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     hot
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     cold
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
index 7bcd3844cc..9c08200a03 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
@@ -26,13 +26,11 @@ boundaryField
 
     floor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     ceiling
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     inlet
     {
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/U
index 2d917d036f..b345bc896b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/U
@@ -23,26 +23,22 @@ boundaryField
 {
     frontAndBack
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     topAndBottom
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     hot
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     cold
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/U
index e1d0972d79..66fbb62e8b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/U
@@ -22,26 +22,22 @@ boundaryField
 {
     floor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     ceiling
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     fixedWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     box
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/U
index e1d0972d79..66fbb62e8b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/U
@@ -22,26 +22,22 @@ boundaryField
 {
     floor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     ceiling
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     fixedWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     box
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U
index 5b206de234..3a19b9d768 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U
@@ -34,33 +34,27 @@ boundaryField
     }
     minY
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     minZ
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     maxZ
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     bottomWater_to_rightSolid
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     bottomWater_to_leftSolid
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     bottomWater_to_heater
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/U
index a5466e3636..1391d618d5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/U
@@ -23,8 +23,7 @@ boundaryField
 {
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     inlet
     {
@@ -39,8 +38,7 @@ boundaryField
     }
     blades
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/U
index 23454ad6de..4641c9ebfc 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/U
@@ -34,8 +34,7 @@ boundaryField
     }
     fixedWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/Urel b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/Urel
index f9e9e7cf5d..ddc052c634 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/Urel
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/Urel
@@ -22,8 +22,7 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     freestream
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel b/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
index c5a14c7e8c..b8075a28d3 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
@@ -35,8 +35,7 @@ boundaryField
     }
     innerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     outerWall
     {
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
index b333f4acc2..090118328d 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
@@ -35,14 +35,12 @@ boundaryField
 
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
index e25eb90eee..95d98d6af7 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
@@ -37,14 +37,12 @@ boundaryField
 
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
index 893d2bcbb2..ef3ff28ad6 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
@@ -23,13 +23,11 @@ boundaryField
 {
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     front
     {
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
index d4791411aa..eed0dae1c4 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
@@ -23,13 +23,11 @@ boundaryField
 {
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     front
     {
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
index 8044da3873..9a5fc057ec 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
@@ -23,13 +23,11 @@ boundaryField
 {
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     front
     {
diff --git a/tutorials/incompressible/icoFoam/cavity/0/U b/tutorials/incompressible/icoFoam/cavity/0/U
index 711702f987..e492299d8e 100644
--- a/tutorials/incompressible/icoFoam/cavity/0/U
+++ b/tutorials/incompressible/icoFoam/cavity/0/U
@@ -28,8 +28,7 @@ boundaryField
 
     fixedWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/0/U b/tutorials/incompressible/icoFoam/cavityClipped/0/U
index a6397f5f68..41204f6c87 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/0/U
+++ b/tutorials/incompressible/icoFoam/cavityClipped/0/U
@@ -28,8 +28,7 @@ boundaryField
     }
     fixedWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     frontAndBack
     {
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/0/U b/tutorials/incompressible/icoFoam/cavityGrade/0/U
index b0731001e7..4c5368259c 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/0/U
+++ b/tutorials/incompressible/icoFoam/cavityGrade/0/U
@@ -28,8 +28,7 @@ boundaryField
     }
     fixedWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     frontAndBack
     {
diff --git a/tutorials/incompressible/icoFoam/elbow/0/U b/tutorials/incompressible/icoFoam/elbow/0/U
index 737cbb41c2..19c515fdb0 100644
--- a/tutorials/incompressible/icoFoam/elbow/0/U
+++ b/tutorials/incompressible/icoFoam/elbow/0/U
@@ -22,8 +22,7 @@ boundaryField
 {
     wall-4
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     velocity-inlet-5
@@ -45,8 +44,7 @@ boundaryField
 
     wall-8
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBackPlanes
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
index fe19c84035..0c3b6aca13 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
@@ -33,20 +33,17 @@ boundaryField
 
     down
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     up
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     cylinder
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     defaultFaces
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/U b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/U
index 1904f895ce..843a28d50f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/U
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/U
@@ -22,13 +22,13 @@ boundaryField
 {
     rotor
     {
-        type            movingWallVelocity; // fixedValue;
+        type            movingWallVelocity;
         value           uniform (0 0 0);
     }
 
     stator
     {
-        type            movingWallVelocity; // fixedValue;
+        type            movingWallVelocity;
         value           uniform (0 0 0);
     }
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
index 2e86739791..8fa2c6c004 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
@@ -28,14 +28,12 @@ boundaryField
 
     farFieldMoving
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     fixedWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     left
@@ -46,8 +44,7 @@ boundaryField
 
     farField
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     back
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/U b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/U
index 72f38fd6dd..cc71e5d7d3 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/U
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/U
@@ -43,8 +43,7 @@ boundaryField
     }
     ACMI1_blockage
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     ACMI1_couple
     {
@@ -53,8 +52,7 @@ boundaryField
     }
     ACMI2_blockage
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     ACMI2_couple
     {
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
index cea2ca0d79..87c2471590 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
@@ -39,8 +39,7 @@ boundaryField
 
     outerCylinder
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     "propeller.*"
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/U b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/U
index 94c7cb1bca..6f5fd75aa5 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/U
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/U
@@ -34,8 +34,7 @@ boundaryField
 
     wing
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     #include "include/frontBackTopBottomPatches"
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/U b/tutorials/incompressible/pimpleFoam/TJunction/0/U
index 1616d0b038..ad5356427e 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/U
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/U
@@ -42,8 +42,7 @@ boundaryField
 
     defaultFaces
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/U b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/U
index 54e519308c..07f11658a2 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/U
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/U
@@ -40,8 +40,7 @@ boundaryField
     }
     defaultFaces
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/U b/tutorials/incompressible/pimpleFoam/channel395/0.org/U
index a079b6fd9a..5c686f2fac 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/U
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/U
@@ -23,13 +23,11 @@ boundaryField
 {
     bottomWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     topWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     sides1_half0
     {
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/U b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/U
index 9b63f3c191..b6b3a3b3cd 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/U
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/U
@@ -37,8 +37,7 @@ boundaryField
     }
     hole
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     frontAndBack
     {
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/U b/tutorials/incompressible/pimpleFoam/pitzDaily/0/U
index 885c5b9de4..9c15c3c575 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/0/U
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/0/U
@@ -33,14 +33,12 @@ boundaryField
 
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U
index 359098a8e3..c3f6505ee8 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U
@@ -47,8 +47,7 @@ boundaryField
     }
     "motorBike_.*"
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     upperWall
     {
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
index 510508331e..a73dcd99bf 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
@@ -37,14 +37,12 @@ boundaryField
 
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/U b/tutorials/incompressible/pisoFoam/ras/cavity/0/U
index 711702f987..e492299d8e 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/U
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/U
@@ -28,8 +28,7 @@ boundaryField
 
     fixedWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/U b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/U
index 711702f987..e492299d8e 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/U
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/U
@@ -28,8 +28,7 @@ boundaryField
 
     fixedWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
index fe2432b8aa..976e542102 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
@@ -22,18 +22,15 @@ boundaryField
 {
     front
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     back
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     porosityWall
     {
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U
index 842ef78abe..77c53fed4f 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U
@@ -22,18 +22,15 @@ boundaryField
 {
     front
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     back
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     porosityWall
     {
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/U b/tutorials/incompressible/simpleFoam/airFoil2D/0/U
index 3fa0d8ab8b..81dfbe1067 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/U
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/U
@@ -34,8 +34,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/U b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/U
index 8f856ef5ea..96fb64189c 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/U
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/U
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/U b/tutorials/incompressible/simpleFoam/motorBike/0.org/U
index 9ce8375a2b..2117e5fc91 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/U
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/U
@@ -43,8 +43,7 @@ boundaryField
 
     motorBikeGroup
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     #include "include/frontBackUpperPatches"
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
index 7ae235fa09..dbc94abc5e 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
@@ -48,8 +48,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
index bb861bfc6d..fe3d7e7e7e 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
@@ -34,14 +34,12 @@ boundaryField
 
     upperWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/U b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/U
index 8b7d69447a..b6179db447 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/U
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/U
@@ -36,8 +36,7 @@ boundaryField
 
     wall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     #includeEtc "caseDicts/setConstraintTypes"
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
index 486a026f8d..e3f0028c3d 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
@@ -23,8 +23,7 @@ boundaryField
 {
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     top
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
index 486a026f8d..e3f0028c3d 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
@@ -23,8 +23,7 @@ boundaryField
 {
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     top
diff --git a/tutorials/lagrangian/MPPICFoam/column/0/U.air b/tutorials/lagrangian/MPPICFoam/column/0/U.air
index fefe194de0..4bddb668f1 100644
--- a/tutorials/lagrangian/MPPICFoam/column/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/column/0/U.air
@@ -28,14 +28,12 @@ boundaryField
 
     top
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     bottom
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air b/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air
index 7f8968fb24..a88657faae 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air
@@ -37,8 +37,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
index 08270dfd69..40fb407c7e 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
@@ -23,8 +23,7 @@ boundaryField
 {
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     lowerInlet
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/U b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/U
index 104a8c18de..b7d665a61f 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/U
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/U
@@ -23,18 +23,15 @@ boundaryField
 {
     top
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     bottom
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     symmetry
     {
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/U
index 779c65fb9b..bfceca03a2 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/U
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/U
@@ -23,13 +23,11 @@ boundaryField
 {
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     frontAndBack
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     inlet
     {
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
index 0cf7233205..75ed42fbdb 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
@@ -27,13 +27,11 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     frontAndBack
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/U
index 3881e0ef43..2309b0bfd4 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/U
@@ -23,13 +23,11 @@ boundaryField
 {
     "(sides|frontAndBack)"
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Uf
index 6c0c54bc0a..18608ce03a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Uf
@@ -28,14 +28,12 @@ boundaryField
 
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     sides
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBack
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Uf
index 944e0883b8..1f9ea1d602 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Uf
@@ -42,8 +42,7 @@ boundaryField
     // floor sides
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/U
index ba15e86721..d917723db5 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/U
@@ -38,8 +38,7 @@ boundaryField
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Uf
index 747b11c53f..100c0dd0c4 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Uf
@@ -28,8 +28,7 @@ boundaryField
 
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     inlet
@@ -45,8 +44,7 @@ boundaryField
 
     sides
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/U
index d784c2620c..f668d5e9df 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/U
@@ -28,8 +28,7 @@ boundaryField
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Uf
index 3f1e95c9bb..8b594f7c00 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Uf
@@ -28,32 +28,27 @@ boundaryField
 
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     side1
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     side2
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     side3
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     side4
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U
index 0fb8c0a8ad..31461039a3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U
@@ -23,8 +23,7 @@ boundaryField
 {
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     inlet
     {
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/U b/tutorials/lagrangian/reactingParcelFoam/filter/0/U
index 0fb8c0a8ad..31461039a3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/U
@@ -23,8 +23,7 @@ boundaryField
 {
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     inlet
     {
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U
index aaa843b84c..9d90ce189b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U
@@ -31,8 +31,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     outlet
     {
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U
index a403d36428..089ad25e7b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U
@@ -48,8 +48,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U
index 7f8c434997..26165716c5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U
@@ -48,8 +48,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U
index 7f8c434997..26165716c5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U
@@ -48,8 +48,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/U b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/U
index 401e7ced02..9e2994bfeb 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/U
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/U
@@ -50,8 +50,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U
index 401e7ced02..9e2994bfeb 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U
@@ -50,8 +50,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U
index 3b20a7f85e..d2fc21cee2 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U
@@ -51,8 +51,7 @@ boundaryField
 
     letters
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/U b/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
index f910c08cd5..8800e63495 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
@@ -34,8 +34,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontBack
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
index 5321455943..259a2e2961 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
@@ -34,14 +34,12 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontBack
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
index f910c08cd5..8800e63495 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
@@ -34,8 +34,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontBack
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/U
index f267a870fc..ffee387090 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.org/U
@@ -22,8 +22,7 @@ boundaryField
 {
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     frontAndBack
     {
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/U
index f267a870fc..ffee387090 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.org/U
@@ -22,8 +22,7 @@ boundaryField
 {
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     frontAndBack
     {
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/U b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/U
index 7ea3a0c323..5392c520e7 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/U
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/U
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U
index 0e54934898..a17dcd6f65 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U
@@ -34,14 +34,12 @@ boundaryField
 
     bottomWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     endWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     top
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U
index 500a0fbea1..068d6f9dcc 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U
@@ -23,13 +23,11 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     front
     {
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
index da99a43dd3..29be9090c8 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
@@ -64,74 +64,62 @@ boundaryField
 
     WALL8
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     WALL61
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     WALL62
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     WALL63
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     WALL64
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     WALL65
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     WALL66
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     WALL67
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     WALL68
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     WALL69
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     WALL7
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     WALL70
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     OUTL15
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U
index 3bd47593e0..a6ee9b8e71 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U
@@ -23,8 +23,7 @@ boundaryField
 {
     stationaryWalls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/U b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/U
index 5eac8e3fb3..04e7bbb27b 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/U
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/U
@@ -35,8 +35,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     defaultFaces
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/U b/tutorials/multiphase/interFoam/laminar/damBreak/0/U
index 7ea3a0c323..5392c520e7 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/U
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/U
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/U b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/U
index 500a0fbea1..068d6f9dcc 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/U
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/U
@@ -23,13 +23,11 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     front
     {
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
index 8b03633eb9..33de42305f 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
@@ -33,8 +33,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/U b/tutorials/multiphase/interFoam/ras/angledDuct/0/U
index 454300ab0e..20672ad86b 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/0/U
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/0/U
@@ -22,18 +22,15 @@ boundaryField
 {
     front
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     back
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     porosityWall
     {
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/U b/tutorials/multiphase/interFoam/ras/damBreak/0/U
index 7ea3a0c323..5392c520e7 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/U
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/U
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/U b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/U
index a9f5e35e96..f1db6dbb34 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/U
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/U
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/U b/tutorials/multiphase/interFoam/ras/waterChannel/0/U
index 687c94d919..8af3a6faaf 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/0/U
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/U
@@ -28,8 +28,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
index 6c087afc7d..e269ca081a 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
@@ -37,8 +37,7 @@ boundaryField
 
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U
index 7ea3a0c323..5392c520e7 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
index 569f1d99df..fb4939a21a 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
@@ -45,8 +45,7 @@ boundaryField
 
     outerCylinder
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     "propeller.*"
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/U b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/U
index 2929f0e586..a22343315e 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/U
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/U
@@ -41,8 +41,7 @@ boundaryField
 
     bullet
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U
index b82b7ce18a..7e018e522b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air
index abef789c9c..6aa2ab387b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury
index c9a998697d..b6c2cca01e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil
index 1820dbd6d6..de75add32d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.water
index 4977c8a6d5..ac0c3c6a72 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.water
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U
index b82b7ce18a..7e018e522b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air
index abef789c9c..6aa2ab387b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury
index c9a998697d..b6c2cca01e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil
index 1820dbd6d6..de75add32d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.water
index 4977c8a6d5..ac0c3c6a72 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.water
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air
index 6c91343655..97e363446e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury
index 44441b84d8..5358842a01 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil
index 9f6f8f999c..3d3b713308 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water
index 65f9af410b..2e44bf22ee 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/U b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/U
index 5efde4733d..821a827e41 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/U
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/U
@@ -29,8 +29,7 @@ boundaryField
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/U
index 7ea3a0c323..5392c520e7 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/U
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/U
index 7ea3a0c323..5392c520e7 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/U
@@ -23,18 +23,15 @@ boundaryField
 {
     leftWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     rightWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     lowerWall
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     atmosphere
     {
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/U b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/U
index 500a0fbea1..068d6f9dcc 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/U
@@ -23,13 +23,11 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     front
     {
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/U b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/U
index 500a0fbea1..068d6f9dcc 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/U
@@ -23,13 +23,11 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     front
     {
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/U b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/U
index 9f290533e5..c36586fa5a 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/U
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/U
@@ -29,8 +29,7 @@ boundaryField
 
     ".*Wall"
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     "floatingObject.*"
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U
index 32e07b0044..e66d1ae65e 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U
@@ -29,8 +29,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     floatingObject
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air
index 6c91343655..97e363446e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury
index 44441b84d8..5358842a01 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil
index 9f6f8f999c..3d3b713308 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water
index 65f9af410b..2e44bf22ee 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.gas
index 48fc136a2d..bc6bfcc94b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.gas
@@ -34,8 +34,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.liquid
index b041afd007..3c9e2adf68 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.liquid
@@ -34,8 +34,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
index a9af55993e..b637e991be 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
@@ -37,8 +37,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBackPlanes
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.gas
index 2eddfc721b..1e0fad876f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.gas
@@ -1971,13 +1971,11 @@ boundaryField
     }
     wall1
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     wall2
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     defaultFaces
     {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.liquid
index 41ee729104..e1d1aeb361 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.liquid
@@ -1971,13 +1971,11 @@ boundaryField
     }
     wall1
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     wall2
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
     defaultFaces
     {
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.gas
index 48fc136a2d..bc6bfcc94b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.gas
@@ -34,8 +34,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.liquid
index b041afd007..3c9e2adf68 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.liquid
@@ -34,8 +34,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
index a9af55993e..b637e991be 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
@@ -37,8 +37,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBackPlanes
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
index 7a88b38478..d81cc4bddb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
index b93b8d870d..72155a0b32 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam
index 15d945857a..dc12ed6b06 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam
@@ -34,8 +34,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water
index 256fe1cb1a..3fbc438694 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water
@@ -34,8 +34,7 @@ boundaryField
     }
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
index a9af55993e..b637e991be 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
@@ -37,8 +37,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBackPlanes
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
index a9af55993e..b637e991be 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
@@ -37,8 +37,7 @@ boundaryField
 
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     frontAndBackPlanes
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
index 7a88b38478..d81cc4bddb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
index b93b8d870d..72155a0b32 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
@@ -22,14 +22,12 @@ boundaryField
 {
     rotor
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     stator
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
 
     front

From 0431d4e67ce84478239d2d05b1895852854af259 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 9 Feb 2016 20:09:45 +0000
Subject: [PATCH 166/447] surfaceNormalFixedValueFvPatchVectorField: Corrected
 mapping constructor

---
 ...urfaceNormalFixedValueFvPatchVectorField.C | 34 +++++++++----------
 ...urfaceNormalFixedValueFvPatchVectorField.H |  3 +-
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
index bc6cc097d9..478600608b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,21 @@ surfaceNormalFixedValueFvPatchVectorField
 {}
 
 
+Foam::surfaceNormalFixedValueFvPatchVectorField::
+surfaceNormalFixedValueFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchVectorField(p, iF),
+    refValue_("refValue", dict, p.size())
+{
+    fvPatchVectorField::operator=(refValue_*patch().nf());
+}
+
+
 Foam::surfaceNormalFixedValueFvPatchVectorField::
 surfaceNormalFixedValueFvPatchVectorField
 (
@@ -56,7 +71,7 @@ surfaceNormalFixedValueFvPatchVectorField
 {
     // Note: calculate product only on ptf to avoid multiplication on
     // unset values in reconstructPar.
-    fixedValueFvPatchVectorField::operator=
+    fvPatchVectorField::operator=
     (
         vectorField
         (
@@ -67,21 +82,6 @@ surfaceNormalFixedValueFvPatchVectorField
 }
 
 
-Foam::surfaceNormalFixedValueFvPatchVectorField::
-surfaceNormalFixedValueFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchVectorField(p, iF),
-    refValue_("refValue", dict, p.size())
-{
-    fvPatchVectorField::operator=(refValue_*patch().nf());
-}
-
-
 Foam::surfaceNormalFixedValueFvPatchVectorField::
 surfaceNormalFixedValueFvPatchVectorField
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.H
index d57dbee5b5..30a7464e2c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,7 +156,6 @@ public:
         }
 
 
-
     // Member functions
 
         // Mapping functions

From d9c7c671d647170d1075948df5bd6d4b1be78108 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 09:43:45 +0000
Subject: [PATCH 167/447] Function1: Simplified files

---
 .../primitives/functions/Function1/CSV/CSV.C  | 38 +++++++++-
 .../functions/Function1/CSV/CSVIO.C           | 69 -------------------
 .../functions/Function1/Constant/Constant.C   |  9 ++-
 .../functions/Function1/Constant/ConstantIO.C | 39 -----------
 .../functions/Function1/Function1/Function1.C | 27 +++++++-
 .../Function1/Function1/Function1IO.C         | 57 ---------------
 .../PolynomialEntry/PolynomialEntry.C         |  9 ++-
 .../PolynomialEntry/PolynomialEntryIO.C       | 39 -----------
 .../functions/Function1/Sine/Sine.C           | 16 ++++-
 .../functions/Function1/Sine/SineIO.C         | 46 -------------
 .../functions/Function1/Table/TableBase.C     | 25 ++++++-
 .../functions/Function1/Table/TableBaseIO.C   | 55 ---------------
 .../functions/Function1/TableFile/TableFile.C | 20 +++++-
 .../Function1/TableFile/TableFileIO.C         | 48 -------------
 .../{TimeFunction1 => }/TimeFunction1.C       |  0
 .../{TimeFunction1 => }/TimeFunction1.H       |  0
 16 files changed, 131 insertions(+), 366 deletions(-)
 delete mode 100644 src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
 delete mode 100644 src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
 delete mode 100644 src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
 delete mode 100644 src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
 delete mode 100644 src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
 delete mode 100644 src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
 delete mode 100644 src/OpenFOAM/primitives/functions/Function1/TableFile/TableFileIO.C
 rename src/OpenFOAM/primitives/functions/TimeFunction1/{TimeFunction1 => }/TimeFunction1.C (100%)
 rename src/OpenFOAM/primitives/functions/TimeFunction1/{TimeFunction1 => }/TimeFunction1.H (100%)

diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
index 9ba3366732..513298f8c7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
@@ -259,9 +259,43 @@ const Foam::fileName& Foam::Function1Types::CSV<Type>::fName() const
 }
 
 
-// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+template<class Type>
+void Foam::Function1Types::CSV<Type>::writeData(Ostream& os) const
+{
+    Function1<Type>::writeData(os);
+    os  << token::END_STATEMENT << nl;
+    os  << indent << word(this->name() + "Coeffs") << nl;
+    os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
 
-#include "CSVIO.C"
+    // Note: for TableBase write the dictionary entries it needs but not
+    // the values themselves
+    TableBase<Type>::writeEntries(os);
+
+    os.writeKeyword("nHeaderLine") << nHeaderLine_ << token::END_STATEMENT
+        << nl;
+    os.writeKeyword("refColumn") << refColumn_ << token::END_STATEMENT << nl;
+
+    // Force writing labelList in ascii
+    os.writeKeyword("componentColumns");
+    if (os.format() == IOstream::BINARY)
+    {
+        os.format(IOstream::ASCII);
+        os  << componentColumns_;
+        os.format(IOstream::BINARY);
+    }
+    else
+    {
+        os  << componentColumns_;
+    }
+    os  << token::END_STATEMENT << nl;
+
+    os.writeKeyword("separator") << string(separator_)
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("mergeSeparators") << mergeSeparators_
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("fileName") << fName_ << token::END_STATEMENT << nl;
+    os  << decrIndent << indent << token::END_BLOCK << endl;
+}
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
deleted file mode 100644
index 106ed929cb..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
+++ /dev/null
@@ -1,69 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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 "Function1.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::CSV<Type>::writeData(Ostream& os) const
-{
-    Function1<Type>::writeData(os);
-    os  << token::END_STATEMENT << nl;
-    os  << indent << word(this->name() + "Coeffs") << nl;
-    os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
-
-    // Note: for TableBase write the dictionary entries it needs but not
-    // the values themselves
-    TableBase<Type>::writeEntries(os);
-
-    os.writeKeyword("nHeaderLine") << nHeaderLine_ << token::END_STATEMENT
-        << nl;
-    os.writeKeyword("refColumn") << refColumn_ << token::END_STATEMENT << nl;
-
-    // Force writing labelList in ascii
-    os.writeKeyword("componentColumns");
-    if (os.format() == IOstream::BINARY)
-    {
-        os.format(IOstream::ASCII);
-        os  << componentColumns_;
-        os.format(IOstream::BINARY);
-    }
-    else
-    {
-        os  << componentColumns_;
-    }
-    os  << token::END_STATEMENT << nl;
-
-    os.writeKeyword("separator") << string(separator_)
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("mergeSeparators") << mergeSeparators_
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("fileName") << fName_ << token::END_STATEMENT << nl;
-    os  << decrIndent << indent << token::END_BLOCK << endl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
index ecc7ce732c..8b757e59bc 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
@@ -90,8 +90,13 @@ Type Foam::Function1Types::Constant<Type>::integrate
 }
 
 
-// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+template<class Type>
+void Foam::Function1Types::Constant<Type>::writeData(Ostream& os) const
+{
+    Function1<Type>::writeData(os);
+
+    os  << token::SPACE << value_ << token::END_STATEMENT << nl;
+}
 
-#include "ConstantIO.C"
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C b/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
deleted file mode 100644
index af9f5e439a..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
+++ /dev/null
@@ -1,39 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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 "Constant.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::Constant<Type>::writeData(Ostream& os) const
-{
-    Function1<Type>::writeData(os);
-
-    os  << token::SPACE << value_ << token::END_STATEMENT << nl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index bfd21c2e30..b65c908f67 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -120,8 +120,33 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::integrate
 }
 
 
+template<class Type>
+void Foam::Function1<Type>::writeData(Ostream& os) const
+{
+    os.writeKeyword(name_) << type();
+}
+
+
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
-#include "Function1IO.C"
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const Function1<Type>& f1
+)
+{
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, const Function1<Type>&)"
+    );
+
+    os  << f1.name_;
+    f1.writeData(os);
+
+    return os;
+}
+
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
deleted file mode 100644
index 47f7ef9312..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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 "Function1.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const Function1<Type>& f1
-)
-{
-    // Check state of Ostream
-    os.check
-    (
-        "Ostream& operator<<(Ostream&, const Function1<Type>&)"
-    );
-
-    os  << f1.name_;
-    f1.writeData(os);
-
-    return os;
-}
-
-
-template<class Type>
-void Foam::Function1<Type>::writeData(Ostream& os) const
-{
-    os.writeKeyword(name_) << type();
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
index 67824da842..4859b50949 100644
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
@@ -198,8 +198,13 @@ Type Foam::Function1Types::Polynomial<Type>::integrate
 }
 
 
-// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+template<class Type>
+void Foam::Function1Types::Polynomial<Type>::writeData(Ostream& os) const
+{
+    Function1<Type>::writeData(os);
+
+    os  << nl << indent << coeffs_ << token::END_STATEMENT << nl;
+}
 
-#include "PolynomialEntryIO.C"
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
deleted file mode 100644
index 6aa58e405d..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
+++ /dev/null
@@ -1,39 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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 "PolynomialEntry.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::Polynomial<Type>::writeData(Ostream& os) const
-{
-    Function1<Type>::writeData(os);
-
-    os  << nl << indent << coeffs_ << token::END_STATEMENT << nl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index 820799d702..ae4d7e217c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -97,8 +97,20 @@ Type Foam::Function1Types::Sine<Type>::integrate
 }
 
 
-// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+template<class Type>
+void Foam::Function1Types::Sine<Type>::writeData(Ostream& os) const
+{
+    Function1<Type>::writeData(os);
+    os  << token::END_STATEMENT << nl;
+    os  << indent << word(this->name() + "Coeffs") << nl;
+    os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
+    os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl;
+    amplitude_->writeData(os);
+    frequency_->writeData(os);
+    scale_->writeData(os);
+    level_->writeData(os);
+    os  << decrIndent << indent << token::END_BLOCK << endl;
+}
 
-#include "SineIO.C"
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C b/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
deleted file mode 100644
index ea2bfadbdb..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 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 "Sine.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::Sine<Type>::writeData(Ostream& os) const
-{
-    Function1<Type>::writeData(os);
-    os  << token::END_STATEMENT << nl;
-    os  << indent << word(this->name() + "Coeffs") << nl;
-    os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
-    os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl;
-    amplitude_->writeData(os);
-    frequency_->writeData(os);
-    scale_->writeData(os);
-    level_->writeData(os);
-    os  << decrIndent << indent << token::END_BLOCK << endl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 7c2755e59a..0d38c9f049 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -406,8 +406,29 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1Types::TableBase<Type>::y() const
 }
 
 
-// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+template<class Type>
+void Foam::Function1Types::TableBase<Type>::writeEntries(Ostream& os) const
+{
+    if (boundsHandling_ != CLAMP)
+    {
+        os.writeKeyword("outOfBounds") << boundsHandlingToWord(boundsHandling_)
+            << token::END_STATEMENT << nl;
+    }
+    if (interpolationScheme_ != "linear")
+    {
+        os.writeKeyword("interpolationScheme") << interpolationScheme_
+            << token::END_STATEMENT << nl;
+    }
+}
+
+
+template<class Type>
+void Foam::Function1Types::TableBase<Type>::writeData(Ostream& os) const
+{
+    Function1<Type>::writeData(os);
+    os  << nl << indent << table_ << token::END_STATEMENT << nl;
+    writeEntries(os);
+}
 
-#include "TableBaseIO.C"
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
deleted file mode 100644
index d607649ad5..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
+++ /dev/null
@@ -1,55 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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 "Function1.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::TableBase<Type>::writeData(Ostream& os) const
-{
-    Function1<Type>::writeData(os);
-    os  << nl << indent << table_ << token::END_STATEMENT << nl;
-    writeEntries(os);
-}
-
-
-template<class Type>
-void Foam::Function1Types::TableBase<Type>::writeEntries(Ostream& os) const
-{
-    if (boundsHandling_ != CLAMP)
-    {
-        os.writeKeyword("outOfBounds") << boundsHandlingToWord(boundsHandling_)
-            << token::END_STATEMENT << nl;
-    }
-    if (interpolationScheme_ != "linear")
-    {
-        os.writeKeyword("interpolationScheme") << interpolationScheme_
-            << token::END_STATEMENT << nl;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
index 071eaf09cf..8551d1a84a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
@@ -72,8 +72,24 @@ Foam::Function1Types::TableFile<Type>::~TableFile()
 {}
 
 
-// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1Types::TableFile<Type>::writeData(Ostream& os) const
+{
+    Function1<Type>::writeData(os);
+
+    os  << token::END_STATEMENT << nl
+        << indent << word(this->name() + "Coeffs") << nl
+        << indent << token::BEGIN_BLOCK << nl << incrIndent;
+
+    // Note: for TableBase write the dictionary entries it needs but not
+    // the values themselves
+    TableBase<Type>::writeEntries(os);
+
+    os.writeKeyword("fileName")<< fName_ << token::END_STATEMENT << nl;
+    os  << decrIndent << indent << token::END_BLOCK << endl;
+}
 
-#include "TableFileIO.C"
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFileIO.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFileIO.C
deleted file mode 100644
index dbd39e21b5..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFileIO.C
+++ /dev/null
@@ -1,48 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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 "Function1.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::TableFile<Type>::writeData(Ostream& os) const
-{
-    Function1<Type>::writeData(os);
-
-    os  << token::END_STATEMENT << nl
-        << indent << word(this->name() + "Coeffs") << nl
-        << indent << token::BEGIN_BLOCK << nl << incrIndent;
-
-    // Note: for TableBase write the dictionary entries it needs but not
-    // the values themselves
-    TableBase<Type>::writeEntries(os);
-
-    os.writeKeyword("fileName")<< fName_ << token::END_STATEMENT << nl;
-    os  << decrIndent << indent << token::END_BLOCK << endl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.C b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
similarity index 100%
rename from src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.C
rename to src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.H b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
similarity index 100%
rename from src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.H
rename to src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H

From 502de5e8e8cf0e429e92b358538c1f59ac4cd086 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 09:44:18 +0000
Subject: [PATCH 168/447] flowRateInletVelocity: Minor update

---
 .../flowRateInletVelocityFvPatchVectorField.C                  | 2 +-
 .../flowRateInletVelocityFvPatchVectorField.H                  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index b286c9c74e..152c327a4c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -24,9 +24,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "flowRateInletVelocityFvPatchVectorField.H"
+#include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
 #include "one.H"
-#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
index f27795df1e..8699ad31dc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
@@ -76,8 +76,7 @@ Description
     }
     \endverbatim
 
-    The \c flowRate entry is a \c Function1 type, meaning that it can be
-    specified as constant, a polynomial fuction of time, and ...
+    The \c flowRate entry is a \c Function1 of time, see Foam::Function1Types.
 
 Note
     - \c rhoInlet is required for the case of a mass flow rate, where the

From 5c6b3783826d665e9c5cf1d5c492ffb905e2f727 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 09:44:38 +0000
Subject: [PATCH 169/447] rotatingWallVelocityFvPatchVectorField: Minor update

---
 .../rotatingWallVelocityFvPatchVectorField.C  | 32 +++++++++----------
 .../rotatingWallVelocityFvPatchVectorField.H  |  5 ++-
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index 791e07c799..4262a54a3f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -44,22 +44,6 @@ rotatingWallVelocityFvPatchVectorField
 {}
 
 
-Foam::rotatingWallVelocityFvPatchVectorField::
-rotatingWallVelocityFvPatchVectorField
-(
-    const rotatingWallVelocityFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    origin_(ptf.origin_),
-    axis_(ptf.axis_),
-    omega_(ptf.omega_, false)
-{}
-
-
 Foam::rotatingWallVelocityFvPatchVectorField::
 rotatingWallVelocityFvPatchVectorField
 (
@@ -88,6 +72,22 @@ rotatingWallVelocityFvPatchVectorField
 }
 
 
+Foam::rotatingWallVelocityFvPatchVectorField::
+rotatingWallVelocityFvPatchVectorField
+(
+    const rotatingWallVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
+    origin_(ptf.origin_),
+    axis_(ptf.axis_),
+    omega_(ptf.omega_, false)
+{}
+
+
 Foam::rotatingWallVelocityFvPatchVectorField::
 rotatingWallVelocityFvPatchVectorField
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
index 9cbb121a6d..3d08d32b89 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
@@ -50,12 +50,11 @@ Description
     }
     \endverbatim
 
-    The \c omega entry is a Function1 type, able to describe time varying
-    functions.
+    The \c omega entry is a Function1 of time, see Foam::Function1Types.
 
 SeeAlso
-    Foam::Function1Types
     Foam::fixedValueFvPatchField
+    Foam::Function1Types
 
 SourceFiles
     rotatingWallVelocityFvPatchVectorField.C

From 9beda11f6f3f35381d4b0b13c774f6313d224623 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 09:44:55 +0000
Subject: [PATCH 170/447] translatingWallVelocityFvPatchVectorField: Changed
 the translation velocity to a Function1 to support time-variation

---
 ...ranslatingWallVelocityFvPatchVectorField.C | 46 ++++++++++---------
 ...ranslatingWallVelocityFvPatchVectorField.H | 26 +++++------
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
index c60d0cc3fe..37b7ada772 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,6 @@ License
 #include "translatingWallVelocityFvPatchVectorField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
-#include "surfaceFields.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -38,21 +37,7 @@ translatingWallVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    U_(vector::zero)
-{}
-
-
-Foam::translatingWallVelocityFvPatchVectorField::
-translatingWallVelocityFvPatchVectorField
-(
-    const translatingWallVelocityFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    U_(ptf.U_)
+    U_(0)
 {}
 
 
@@ -65,13 +50,27 @@ translatingWallVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    U_(dict.lookup("U"))
+    U_(Function1<vector>::New("U", dict))
 {
     // Evaluate the wall velocity
     updateCoeffs();
 }
 
 
+Foam::translatingWallVelocityFvPatchVectorField::
+translatingWallVelocityFvPatchVectorField
+(
+    const translatingWallVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
+    U_(ptf.U_, false)
+{}
+
+
 Foam::translatingWallVelocityFvPatchVectorField::
 translatingWallVelocityFvPatchVectorField
 (
@@ -79,7 +78,7 @@ translatingWallVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(twvpvf),
-    U_(twvpvf.U_)
+    U_(twvpvf.U_, false)
 {}
 
 
@@ -91,7 +90,7 @@ translatingWallVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(twvpvf, iF),
-    U_(twvpvf.U_)
+    U_(twvpvf.U_, false)
 {}
 
 
@@ -104,9 +103,12 @@ void Foam::translatingWallVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
+    const scalar t = this->db().time().timeOutputValue();
+    const vector U = U_->value(t);
+
     // Remove the component of U normal to the wall in case the wall is not flat
     const vectorField n(patch().nf());
-    vectorField::operator=(U_ - n*(n & U_));
+    vectorField::operator=(U - n*(n & U));
 
     fixedValueFvPatchVectorField::updateCoeffs();
 }
@@ -115,7 +117,7 @@ void Foam::translatingWallVelocityFvPatchVectorField::updateCoeffs()
 void Foam::translatingWallVelocityFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchVectorField::write(os);
-    os.writeKeyword("U") << U_ << token::END_STATEMENT << nl;
+    U_->writeData(os);
     writeEntry("value", os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.H
index c6e9c70b88..5bc1d5e057 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 
     \table
         Property     | Description             | Required    | Default value
-        U            | translational velocity  | yes|
+        U            | translational velocity  | yes         |
     \endtable
 
     Example of the boundary condition specification:
@@ -47,9 +47,12 @@ Description
     }
     \endverbatim
 
+    The \c U entry is a Function1 of time, see Foam::Function1Types.
+
 
 SeeAlso
     Foam::fixedValueFvPatchField
+    Foam::Function1Types
 
 SourceFiles
     translatingWallVelocityFvPatchVectorField.C
@@ -60,6 +63,7 @@ SourceFiles
 #define translatingWallVelocityFvPatchVectorField_H
 
 #include "fixedValueFvPatchFields.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,7 +81,7 @@ class translatingWallVelocityFvPatchVectorField
     // Private data
 
         //- Translational velocity
-        vector U_;
+        autoPtr<Function1<vector>> U_;
 
 
 public:
@@ -150,19 +154,11 @@ public:
 
     // Member functions
 
-        // Access functions
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
 
-            //- Return the velocity
-            const vector& U() const
-            {
-                return U_;
-            }
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-            //- Write
-            virtual void write(Ostream&) const;
+        //- Write
+        virtual void write(Ostream&) const;
 };
 
 

From e37da9fe4103336643b4c05e119d64f2bd68ca8e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 09:46:23 +0000
Subject: [PATCH 171/447] turbulentInletFvPatchField: Minor update

---
 .../derived/turbulentInlet/turbulentInletFvPatchField.H         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
index 7f167b296e..812946f112 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
@@ -99,7 +99,7 @@ class turbulentInletFvPatchField
         //- Random number generator
         Random ranGen_;
 
-        //- Fluctuation scake
+        //- Fluctuation scale
         Type fluctuationScale_;
 
         //- Reference field

From 3b3bb7173ca6d4e094dc9193dee8e15f20a81b5e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 09:46:37 +0000
Subject: [PATCH 172/447] 
 variableHeightFlowRateInletVelocityFvPatchVectorField: Changed the flow-rate
 to a Function1 to support time-variation

---
 ...tFlowRateInletVelocityFvPatchVectorField.C | 54 +++++++++----------
 ...tFlowRateInletVelocityFvPatchVectorField.H | 23 +++-----
 2 files changed, 32 insertions(+), 45 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
index 1fcc5feb7d..f0f3802339 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,10 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "variableHeightFlowRateInletVelocityFvPatchVectorField.H"
-#include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "surfaceFields.H"
+#include "volFields.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -39,11 +37,25 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    flowRate_(0),
+    flowRate_(),
     alphaName_("none")
 {}
 
 
+Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
+::variableHeightFlowRateInletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<vector>(p, iF, dict),
+    flowRate_(Function1<scalar>::New("flowRate", dict)),
+    alphaName_(dict.lookup("alpha"))
+{}
+
+
 Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 ::variableHeightFlowRateInletVelocityFvPatchVectorField
 (
@@ -54,25 +66,11 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    flowRate_(ptf.flowRate_),
+    flowRate_(ptf.flowRate_, false),
     alphaName_(ptf.alphaName_)
 {}
 
 
-Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
-::variableHeightFlowRateInletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<vector>(p, iF, dict),
-    flowRate_(readScalar(dict.lookup("flowRate"))),
-    alphaName_(dict.lookup("alpha"))
-{}
-
-
 Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 ::variableHeightFlowRateInletVelocityFvPatchVectorField
 (
@@ -80,7 +78,7 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf),
-    flowRate_(ptf.flowRate_),
+    flowRate_(ptf.flowRate_, false),
     alphaName_(ptf.alphaName_)
 {}
 
@@ -93,7 +91,7 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, iF),
-    flowRate_(ptf.flowRate_),
+    flowRate_(ptf.flowRate_, false),
     alphaName_(ptf.alphaName_)
 {}
 
@@ -114,8 +112,11 @@ void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
     alphap = max(alphap, scalar(0));
     alphap = min(alphap, scalar(1));
 
+    const scalar t = db().time().timeOutputValue();
+    scalar flowRate = flowRate_->value(t);
+
     // a simpler way of doing this would be nice
-    scalar avgU = -flowRate_/gSum(patch().magSf()*alphap);
+    scalar avgU = -flowRate/gSum(patch().magSf()*alphap);
 
     vectorField n(patch().nf());
 
@@ -131,11 +132,8 @@ void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField::write
 ) const
 {
     fvPatchField<vector>::write(os);
-
-    os.writeKeyword("flowRate") << flowRate_
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("alpha") << alphaName_
-        << token::END_STATEMENT << nl;
+    flowRate_->writeData(os);
+    os.writeKeyword("alpha") << alphaName_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
index 34742c7567..eed9937029 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,6 +53,8 @@ Description
     }
     \endverbatim
 
+    The \c flowRate entry is a \c Function1 of time, see Foam::Function1Types.
+
 Note
     - the value is positive into the domain
     - may not work correctly for transonic inlets
@@ -61,6 +63,7 @@ Note
 
 SeeAlso
     Foam::fixedValueFvPatchField
+    Foam::Function1Types
 
 SourceFiles
     variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -71,6 +74,7 @@ SourceFiles
 #define variableHeightFlowRateInletVelocityFvPatchVectorField_H
 
 #include "fixedValueFvPatchFields.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -87,7 +91,7 @@ class variableHeightFlowRateInletVelocityFvPatchVectorField
     // Private data
 
         //- Inlet integral flow rate
-        scalar flowRate_;
+        autoPtr<Function1<scalar>> flowRate_;
 
         //- Name of the phase-fraction field
         word alphaName_;
@@ -168,21 +172,6 @@ public:
 
     // Member functions
 
-        // Access
-
-            //- Return the flux
-            scalar flowRate() const
-            {
-                return flowRate_;
-            }
-
-            //- Return reference to the flux to allow adjustment
-            scalar& flowRate()
-            {
-                return flowRate_;
-            }
-
-
         //- Update the coefficients associated with the patch field
         virtual void updateCoeffs();
 

From 1193903d8d336f6c52d093d6fa77b428bc5b4a66 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 10:22:25 +0000
Subject: [PATCH 173/447] OpenFOAM-dev/etc: separated scripts for bash and csh
 into separate directories etc/config.sh and etc/config.csh

This structure is more convenient to add support for other shells, e.g. zsh, fish etc.

Resolves feature request to simplify support for other shells in
http://www.openfoam.org/mantisbt/view.php?id=1232
---
 etc/README.org                                | 20 +++++++
 etc/bashrc                                    | 14 ++---
 etc/{config/CGAL.csh => config.csh/CGAL}      |  4 +-
 .../aliases.csh => config.csh/aliases}        |  8 +--
 .../ensight.csh => config.csh/ensight}        |  4 +-
 .../example/compiler}                         |  6 +--
 .../example/openmpi}                          |  6 +--
 .../example/paraview}                         |  8 +--
 etc/{config => config.csh}/example/prefs.csh  |  4 +-
 .../paraview.csh => config.csh/paraview}      |  2 +-
 .../settings.csh => config.csh/settings}      | 26 ++++-----
 etc/{config/unset.csh => config.csh/unset}    |  4 +-
 etc/{config/CGAL.sh => config.sh/CGAL}        |  4 +-
 etc/{config/aliases.sh => config.sh/aliases}  |  8 +--
 etc/{config/ensight.sh => config.sh/ensight}  |  4 +-
 .../example/compiler}                         |  6 +--
 .../openmpi.sh => config.sh/example/openmpi}  |  6 +--
 .../example/paraview}                         | 10 ++--
 etc/{config => config.sh}/example/prefs.sh    |  4 +-
 .../gperftools.sh => config.sh/gperftools}    |  4 +-
 etc/{config/metis.sh => config.sh/metis}      |  4 +-
 .../paraview.sh => config.sh/paraview}        |  2 +-
 etc/{config/scotch.sh => config.sh/scotch}    |  4 +-
 .../settings.sh => config.sh/settings}        | 26 ++++-----
 etc/{config/unset.sh => config.sh/unset}      |  4 +-
 etc/config/README                             | 54 -------------------
 etc/cshrc                                     | 12 ++---
 27 files changed, 112 insertions(+), 146 deletions(-)
 create mode 100644 etc/README.org
 rename etc/{config/CGAL.csh => config.csh/CGAL} (95%)
 rename etc/{config/aliases.csh => config.csh/aliases} (92%)
 rename etc/{config/ensight.csh => config.csh/ensight} (94%)
 rename etc/{config/example/compiler.csh => config.csh/example/compiler} (90%)
 rename etc/{config/example/openmpi.csh => config.csh/example/openmpi} (88%)
 rename etc/{config/example/paraview.csh => config.csh/example/paraview} (86%)
 rename etc/{config => config.csh}/example/prefs.csh (94%)
 rename etc/{config/paraview.csh => config.csh/paraview} (99%)
 rename etc/{config/settings.csh => config.csh/settings} (95%)
 rename etc/{config/unset.csh => config.csh/unset} (98%)
 rename etc/{config/CGAL.sh => config.sh/CGAL} (95%)
 rename etc/{config/aliases.sh => config.sh/aliases} (92%)
 rename etc/{config/ensight.sh => config.sh/ensight} (94%)
 rename etc/{config/example/compiler.sh => config.sh/example/compiler} (90%)
 rename etc/{config/example/openmpi.sh => config.sh/example/openmpi} (88%)
 rename etc/{config/example/paraview.sh => config.sh/example/paraview} (82%)
 rename etc/{config => config.sh}/example/prefs.sh (94%)
 rename etc/{config/gperftools.sh => config.sh/gperftools} (93%)
 rename etc/{config/metis.sh => config.sh/metis} (94%)
 rename etc/{config/paraview.sh => config.sh/paraview} (99%)
 rename etc/{config/scotch.sh => config.sh/scotch} (94%)
 rename etc/{config/settings.sh => config.sh/settings} (95%)
 rename etc/{config/unset.sh => config.sh/unset} (97%)
 delete mode 100644 etc/config/README

diff --git a/etc/README.org b/etc/README.org
new file mode 100644
index 0000000000..139918db97
--- /dev/null
+++ b/etc/README.org
@@ -0,0 +1,20 @@
+* OpenFOAM Configuration
+  The main OpenFOAM settings are located in the parent etc/ directory.  The bash
+  and csh shells are supported and to configure OpenFOAM source etc/bashrc or
+  etc/cshrc respectively which source the following files in the config.sh or
+  config.csh respectively:
+  + =settings=: core settings
+  + =aliases=: aliases for interactive shells
+  + =unset=: sourced to clear as many OpenFOAM environment settings as possible
+  + =ensight=: application settings for EnSight
+  + =paraview=: application settings for ParaView
+  + =scotch=: application settings for compiling against scotch
+  + =metis=: application settings for compiling against metis 5
+
+  The config.*/example directories contains various example configuration files
+  for the corresponding shell:
+  + =compiler=: an example of fine tuning ThirdParty compiler settings
+  + =openmpi=: an example of fine tuning openmpi settings for OpenFOAM
+  + =paraview=: an example of chaining to the standard config/paraview with a
+    different ParaView_VERSION
+  + =prefs=: an example of supplying alternative site-defined settings
diff --git a/etc/bashrc b/etc/bashrc
index 18fad39985..892d23e719 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -211,16 +211,16 @@ export PATH LD_LIBRARY_PATH MANPATH
 
 # Source project setup files
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~
-_foamSource $WM_PROJECT_DIR/etc/config/settings.sh
-_foamSource $WM_PROJECT_DIR/etc/config/aliases.sh
+_foamSource $WM_PROJECT_DIR/etc/config.sh/settings
+_foamSource $WM_PROJECT_DIR/etc/config.sh/aliases
 
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview.sh`
-_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.sh`
-_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/gperftools.sh`
-_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/CGAL.sh`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/paraview`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/ensight`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/gperftools`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL`
 
 
 # Clean environment paths again. Only remove duplicates
diff --git a/etc/config/CGAL.csh b/etc/config.csh/CGAL
similarity index 95%
rename from etc/config/CGAL.csh
rename to etc/config.csh/CGAL
index 7269587c30..1627935ef3 100644
--- a/etc/config/CGAL.csh
+++ b/etc/config.csh/CGAL
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/CGAL.csh
+#     config.csh/CGAL
 #
 # Description
 #     Setup file for CGAL (& boost) include/libraries.
diff --git a/etc/config/aliases.csh b/etc/config.csh/aliases
similarity index 92%
rename from etc/config/aliases.csh
rename to etc/config.csh/aliases
index 489a771268..d95bfb3b22 100644
--- a/etc/config/aliases.csh
+++ b/etc/config.csh/aliases
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     etc/config/aliases.csh
+#     etc/config.csh/aliases
 #
 # Description
 #     Aliases for working with OpenFOAM
@@ -42,7 +42,7 @@ alias wmDP 'wmSET WM_PRECISION_OPTION=DP'
 alias wmREFRESH 'wmSET $FOAM_SETTINGS'
 
 # clear env
-alias wmUNSET 'source $WM_PROJECT_DIR/etc/config/unset.csh'
+alias wmUNSET 'source $WM_PROJECT_DIR/etc/config.csh/unset'
 
 # Toggle wmakeScheduler on/off
 #  - also need to set WM_HOSTS
@@ -52,7 +52,7 @@ alias wmSchedOFF 'unsetenv WM_SCHEDULER'
 
 # Change ParaView version
 # ~~~~~~~~~~~~~~~~~~~~~~~
-alias foamPV 'source `$WM_PROJECT_DIR/etc/config/paraview.csh` ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION'
+alias foamPV 'source `$WM_PROJECT_DIR/etc/config.csh/paraview` ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION'
 
 
 # Change directory aliases
diff --git a/etc/config/ensight.csh b/etc/config.csh/ensight
similarity index 94%
rename from etc/config/ensight.csh
rename to etc/config.csh/ensight
index bdf4ac29e5..5e9eda5a54 100644
--- a/etc/config/ensight.csh
+++ b/etc/config.csh/ensight
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/ensight.csh
+#     config.csh/ensight
 #
 # Description
 #     Setup file for Ensight
diff --git a/etc/config/example/compiler.csh b/etc/config.csh/example/compiler
similarity index 90%
rename from etc/config/example/compiler.csh
rename to etc/config.csh/example/compiler
index 4310f43cc7..2eed7a3c04 100644
--- a/etc/config/example/compiler.csh
+++ b/etc/config.csh/example/compiler
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,11 +22,11 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/example/compiler.csh
+#     config.csh/example/compiler
 #
 # Description
 #     Example of fine tuning ThirdParty compiler settings for OpenFOAM
-#     Sourced from OpenFOAM-<VERSION>/etc/config/settings.csh
+#     Sourced from OpenFOAM-<VERSION>/etc/config.csh/settings
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/config/example/openmpi.csh b/etc/config.csh/example/openmpi
similarity index 88%
rename from etc/config/example/openmpi.csh
rename to etc/config.csh/example/openmpi
index dc4854b53f..293475ff35 100644
--- a/etc/config/example/openmpi.csh
+++ b/etc/config.csh/example/openmpi
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,11 +22,11 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/example/openmpi.csh
+#     config.csh/example/openmpi
 #
 # Description
 #     Example of fine tuning openmpi settings for OpenFOAM
-#     Sourced from OpenFOAM-<VERSION>/etc/config/settings.csh
+#     Sourced from OpenFOAM-<VERSION>/etc/config.csh/settings
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/config/example/paraview.csh b/etc/config.csh/example/paraview
similarity index 86%
rename from etc/config/example/paraview.csh
rename to etc/config.csh/example/paraview
index 9b639c74ba..7c163df9c7 100644
--- a/etc/config/example/paraview.csh
+++ b/etc/config.csh/example/paraview
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,10 +22,10 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/example/paraview.csh
+#     config.csh/example/paraview
 #
 # Description
-#     Example of chaining to the standard config/paraview.csh with a
+#     Example of chaining to the standard config.csh/paraview with a
 #     different ParaView_VERSION
 #
 # Note
@@ -38,7 +38,7 @@
 # Use other (shipped) paraview.csh with a different ParaView_VERSION
 #
 
-set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode o config/paraview.csh`
+set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode o config.csh/paraview`
 if ( $status == 0 ) source $foamFile ParaView_VERSION=3.12.0
 
 unset foamFile
diff --git a/etc/config/example/prefs.csh b/etc/config.csh/example/prefs.csh
similarity index 94%
rename from etc/config/example/prefs.csh
rename to etc/config.csh/example/prefs.csh
index 03fb5d048f..c9db36cefe 100644
--- a/etc/config/example/prefs.csh
+++ b/etc/config.csh/example/prefs.csh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/example/prefs.csh
+#     config.csh/example/prefs.csh
 #
 # Description
 #     Preset variables for the OpenFOAM configuration - C-Shell shell syntax.
diff --git a/etc/config/paraview.csh b/etc/config.csh/paraview
similarity index 99%
rename from etc/config/paraview.csh
rename to etc/config.csh/paraview
index f89ff0ed33..c4a5dad835 100644
--- a/etc/config/paraview.csh
+++ b/etc/config.csh/paraview
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/paraview.csh
+#     config.csh/paraview
 #
 # Description
 #     Setup file for paraview-[3-5].x
diff --git a/etc/config/settings.csh b/etc/config.csh/settings
similarity index 95%
rename from etc/config/settings.csh
rename to etc/config.csh/settings
index fb6a1cf2a0..d1d9dac611 100644
--- a/etc/config/settings.csh
+++ b/etc/config.csh/settings
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     etc/config/settings.csh
+#     etc/config.csh/settings
 #
 # Description
 #     Startup file for OpenFOAM
@@ -209,7 +209,7 @@ unsetenv MPFR_ARCH_PATH GMP_ARCH_PATH
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 if ( ! $?foamCompiler ) then
     set foamCompiler=system
-    echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
+    echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
     echo "    foamCompiler not set, using '$foamCompiler'"
 endif
 
@@ -254,7 +254,7 @@ case ThirdParty:
         breaksw
     default:
         echo
-        echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
+        echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
         echo "    Unknown OpenFOAM compiler type '$WM_COMPILER'"
         echo "    Please check your settings"
         echo
@@ -262,7 +262,7 @@ case ThirdParty:
     endsw
 
     # Optional configuration tweaks:
-    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/compiler.csh`
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/compiler`
 
     if ( $?gcc_version ) then
         set gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version
@@ -275,7 +275,7 @@ case ThirdParty:
         # Check that the compiler directory can be found
         if ( ! -d "$gccDir" ) then
             echo
-            echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
+            echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
             echo "    Cannot find $gccDir installation."
             echo "    Please install this compiler version or if you wish to" \
                  " use the system compiler,"
@@ -311,7 +311,7 @@ case ThirdParty:
         # Check that the compiler directory can be found
         if ( ! -d "$clangDir" ) then
             echo
-            echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
+            echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
             echo "    Cannot find $clangDir installation."
             echo "    Please install this compiler version or if you wish to" \
                  " use the system compiler,"
@@ -360,7 +360,7 @@ case SYSTEMOPENMPI:
 case OPENMPI:
     setenv FOAM_MPI openmpi-1.10.0
     # Optional configuration tweaks:
-    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/openmpi`
 
     setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
 
@@ -381,7 +381,7 @@ case SYSTEMMPI:
 
     if ( ! ($?MPI_ROOT) ) then
         echo
-        echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
+        echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
         echo "    Please set the environment variable MPI_ROOT to point to" \
              " the base folder for the system MPI in use."
         echo "    Example:"
@@ -393,7 +393,7 @@ case SYSTEMMPI:
 
         if ( ! ($?MPI_ARCH_FLAGS) ) then
             echo
-            echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
+            echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
             echo "    MPI_ARCH_FLAGS is not set. Example:"
             echo
             echo '        setenv MPI_ARCH_FLAGS "-DOMPI_SKIP_MPICXX"'
@@ -402,7 +402,7 @@ case SYSTEMMPI:
 
         if ( ! ($?MPI_ARCH_INC) ) then
             echo
-            echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
+            echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
             echo "    MPI_ARCH_INC is not set. Example:"
             echo
             echo '        setenv MPI_ARCH_INC "-isystem $MPI_ROOT/include"'
@@ -411,7 +411,7 @@ case SYSTEMMPI:
 
         if ( ! ($?MPI_ARCH_LIBS) ) then
             echo
-            echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
+            echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
             echo "    MPI_ARCH_LIBS is not set. Example:"
             echo
             echo '        setenv MPI_ARCH_LIBS "-L$MPI_ROOT/lib -lmpi"'
@@ -499,7 +499,7 @@ case SGIMPI:
     if ( ! $?MPI_ROOT) setenv MPI_ROOT /dummy
 
     if ( ! -d "$MPI_ROOT" ) then
-        echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
+        echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
         echo "    MPI_ROOT not a valid mpt installation directory."
         echo "    Please set MPI_ROOT to the mpt installation directory."
         echo "    (usually done by loading the mpt module)"
@@ -529,7 +529,7 @@ case INTELMPI:
     if ( ! $?MPI_ROOT) setenv MPI_ROOT /dummy
 
     if ( ! -d "$MPI_ROOT" ) then
-        echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
+        echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
         echo "    MPI_ROOT not a valid mpt installation directory."
         echo "    Please set MPI_ROOT to the mpt installation directory."
         echo "    (usually done by loading the mpt module)"
diff --git a/etc/config/unset.csh b/etc/config.csh/unset
similarity index 98%
rename from etc/config/unset.csh
rename to etc/config.csh/unset
index 928f08f442..efcd21ee3f 100644
--- a/etc/config/unset.csh
+++ b/etc/config.csh/unset
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     etc/config/unset.csh
+#     etc/config.csh/unset
 #
 # Description
 #     Clear as many OpenFOAM environment settings as possible
diff --git a/etc/config/CGAL.sh b/etc/config.sh/CGAL
similarity index 95%
rename from etc/config/CGAL.sh
rename to etc/config.sh/CGAL
index 7a59fc6e00..221fa4bba2 100644
--- a/etc/config/CGAL.sh
+++ b/etc/config.sh/CGAL
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/CGAL.sh
+#     config.sh/CGAL
 #
 # Description
 #     Setup file for CGAL (& boost) include/libraries.
diff --git a/etc/config/aliases.sh b/etc/config.sh/aliases
similarity index 92%
rename from etc/config/aliases.sh
rename to etc/config.sh/aliases
index 7f120a5caa..40d4c88e0e 100644
--- a/etc/config/aliases.sh
+++ b/etc/config.sh/aliases
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     etc/config/aliases.sh
+#     etc/config.sh/aliases
 #
 # Description
 #     Aliases for working with OpenFOAM
@@ -42,7 +42,7 @@ alias wmDP='wmSET WM_PRECISION_OPTION=DP'
 alias wmREFRESH='wmSET $FOAM_SETTINGS'
 
 # clear env
-alias wmUNSET='. $WM_PROJECT_DIR/etc/config/unset.sh'
+alias wmUNSET='. $WM_PROJECT_DIR/etc/config.sh/unset'
 
 # Toggle wmakeScheduler on/off
 #  - also need to set WM_HOSTS
@@ -55,7 +55,7 @@ alias wmSchedOFF='unset WM_SCHEDULER'
 unset foamPV
 foamPV()
 {
-    . $WM_PROJECT_DIR/etc/config/paraview.sh ParaView_VERSION=$1
+    . $WM_PROJECT_DIR/etc/config.sh/paraview ParaView_VERSION=$1
     echo "paraview-$ParaView_VERSION  (major: $ParaView_MAJOR)" 1>&2
 }
 
diff --git a/etc/config/ensight.sh b/etc/config.sh/ensight
similarity index 94%
rename from etc/config/ensight.sh
rename to etc/config.sh/ensight
index 75d7a3221e..e0aa567384 100644
--- a/etc/config/ensight.sh
+++ b/etc/config.sh/ensight
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/ensight.sh
+#     config.sh/ensight
 #
 # Description
 #     Setup file for Ensight
diff --git a/etc/config/example/compiler.sh b/etc/config.sh/example/compiler
similarity index 90%
rename from etc/config/example/compiler.sh
rename to etc/config.sh/example/compiler
index 4b4fdd9d70..a1238c9223 100644
--- a/etc/config/example/compiler.sh
+++ b/etc/config.sh/example/compiler
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,11 +22,11 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/example/compiler.sh
+#     config.sh/example/compiler
 #
 # Description
 #     Example of fine tuning ThirdParty compiler settings for OpenFOAM
-#     Sourced from OpenFOAM-<VERSION>/etc/config/settings.sh
+#     Sourced from OpenFOAM-<VERSION>/etc/config.sh/settings
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/config/example/openmpi.sh b/etc/config.sh/example/openmpi
similarity index 88%
rename from etc/config/example/openmpi.sh
rename to etc/config.sh/example/openmpi
index cbb6957a45..cd2acc320f 100644
--- a/etc/config/example/openmpi.sh
+++ b/etc/config.sh/example/openmpi
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,11 +22,11 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/example/openmpi.sh
+#     config.sh/example/openmpi
 #
 # Description
 #     Example of fine tuning openmpi settings for OpenFOAM
-#     Sourced from OpenFOAM-<VERSION>/etc/config/settings.sh
+#     Sourced from OpenFOAM-<VERSION>/etc/config.sh/settings
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/config/example/paraview.sh b/etc/config.sh/example/paraview
similarity index 82%
rename from etc/config/example/paraview.sh
rename to etc/config.sh/example/paraview
index 9586dc81dc..f958f431e2 100644
--- a/etc/config/example/paraview.sh
+++ b/etc/config.sh/example/paraview
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,10 +22,10 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/example/paraview.sh
+#     config.sh/example/paraview
 #
 # Description
-#     Example of chaining to the standard config/paraview.sh with a
+#     Example of chaining to the standard config.sh/paraview with a
 #     different ParaView_VERSION
 #
 # Note
@@ -35,10 +35,10 @@
 #------------------------------------------------------------------------------
 
 #
-# Use other (shipped) paraview.sh with a different ParaView_VERSION
+# Use other (shipped) paraview with a different ParaView_VERSION
 #
 
-foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o config/paraview.sh 2>/dev/null)
+foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o config.sh/paraview 2>/dev/null)
 [ $? -eq 0 ] && . $foamFile ParaView_VERSION=3.12.0
 
 unset foamFile
diff --git a/etc/config/example/prefs.sh b/etc/config.sh/example/prefs.sh
similarity index 94%
rename from etc/config/example/prefs.sh
rename to etc/config.sh/example/prefs.sh
index eec63fc545..2992298887 100644
--- a/etc/config/example/prefs.sh
+++ b/etc/config.sh/example/prefs.sh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/example/prefs.sh
+#     config.sh/example/prefs.sh
 #
 # Description
 #     Preset variables for the OpenFOAM configuration - POSIX shell syntax.
diff --git a/etc/config/gperftools.sh b/etc/config.sh/gperftools
similarity index 93%
rename from etc/config/gperftools.sh
rename to etc/config.sh/gperftools
index f71a6cf2af..e096eb0762 100644
--- a/etc/config/gperftools.sh
+++ b/etc/config.sh/gperftools
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/gperftools.sh
+#     config.sh/gperftools
 #
 # Description
 #     Setup file for gperftools binaries libraries.
diff --git a/etc/config/metis.sh b/etc/config.sh/metis
similarity index 94%
rename from etc/config/metis.sh
rename to etc/config.sh/metis
index af7efde3ac..f912611a3a 100644
--- a/etc/config/metis.sh
+++ b/etc/config.sh/metis
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/metis.sh
+#     config.sh/metis
 #
 # Description
 #     Setup file for metis include/libraries.
diff --git a/etc/config/paraview.sh b/etc/config.sh/paraview
similarity index 99%
rename from etc/config/paraview.sh
rename to etc/config.sh/paraview
index 7ac247b174..33fb031d24 100644
--- a/etc/config/paraview.sh
+++ b/etc/config.sh/paraview
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/paraview.sh
+#     config.sh/paraview
 #
 # Description
 #     Setup file for paraview-[3-5].x
diff --git a/etc/config/scotch.sh b/etc/config.sh/scotch
similarity index 94%
rename from etc/config/scotch.sh
rename to etc/config.sh/scotch
index e40e1c7bdf..a52c58e59d 100644
--- a/etc/config/scotch.sh
+++ b/etc/config.sh/scotch
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config/scotch.sh
+#     config.sh/scotch
 #
 # Description
 #     Setup file for scotch include/libraries.
diff --git a/etc/config/settings.sh b/etc/config.sh/settings
similarity index 95%
rename from etc/config/settings.sh
rename to etc/config.sh/settings
index 1a838cebaa..0a613c935d 100644
--- a/etc/config/settings.sh
+++ b/etc/config.sh/settings
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     etc/config/settings.sh
+#     etc/config.sh/settings
 #
 # Description
 #     Startup file for OpenFOAM
@@ -236,7 +236,7 @@ unset MPFR_ARCH_PATH GMP_ARCH_PATH
 if [ -z "$foamCompiler" ]
 then
     foamCompiler=system
-    echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
+    echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
     echo "    foamCompiler not set, using '$foamCompiler'" 1>&2
 fi
 
@@ -279,7 +279,7 @@ OpenFOAM | ThirdParty)
         ;;
     *)
         echo 1>&2
-        echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
+        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
         echo "    Unknown OpenFOAM compiler type '$WM_COMPILER'" 1>&2
         echo "    Please check your settings" 1>&2
         echo 1>&2
@@ -287,7 +287,7 @@ OpenFOAM | ThirdParty)
     esac
 
     # Optional configuration tweaks:
-    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/compiler.sh`
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler`
 
     if [ -n "$gcc_version" ]
     then
@@ -299,7 +299,7 @@ OpenFOAM | ThirdParty)
         # Check that the compiler directory can be found
         [ -d "$gccDir" ] || {
             echo 1>&2
-            echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
+            echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
             echo "    Cannot find $gccDir installation." 1>&2
             echo "    Please install this compiler version or if you wish to" \
                  " use the system compiler," 1>&2
@@ -337,7 +337,7 @@ OpenFOAM | ThirdParty)
         # Check that the compiler directory can be found
         [ -d "$clangDir" ] || {
             echo 1>&2
-            echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
+            echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
             echo "    Cannot find $clangDir installation." 1>&2
             echo "    Please install this compiler version or if you wish to" \
                  " use the system compiler," 1>&2
@@ -383,7 +383,7 @@ SYSTEMOPENMPI)
 OPENMPI)
     export FOAM_MPI=openmpi-1.10.0
     # Optional configuration tweaks:
-    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/openmpi`
 
     export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
 
@@ -405,7 +405,7 @@ SYSTEMMPI)
     if [ -z "$MPI_ROOT" ]
     then
         echo 1>&2
-        echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
+        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
         echo "    Please set the environment variable MPI_ROOT to point to" \
              " the base folder for the system MPI in use." 1>&2
         echo "    Example:" 1>&2
@@ -418,7 +418,7 @@ SYSTEMMPI)
         if [ -z "$MPI_ARCH_FLAGS" ]
         then
             echo 1>&2
-            echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
+            echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
             echo "    MPI_ARCH_FLAGS is not set. Example:" 1>&2
             echo 1>&2
             echo "        export MPI_ARCH_FLAGS=\"-DOMPI_SKIP_MPICXX\"" 1>&2
@@ -428,7 +428,7 @@ SYSTEMMPI)
         if [ -z "$MPI_ARCH_INC" ]
         then
             echo 1>&2
-            echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
+            echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
             echo "    MPI_ARCH_INC is not set. Example:" 1>&2
             echo 1>&2
             echo "        export MPI_ARCH_INC=\"-isystem \$MPI_ROOT/include\"" 1>&2
@@ -438,7 +438,7 @@ SYSTEMMPI)
         if [ -z "$MPI_ARCH_LIBS" ]
         then
             echo 1>&2
-            echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
+            echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
             echo "    MPI_ARCH_LIBS is not set. Example:" 1>&2
             echo 1>&2
             echo "        export MPI_ARCH_LIBS=\"-L\$MPI_ROOT/lib -lmpi\"" 1>&2
@@ -532,7 +532,7 @@ SGIMPI)
 
     if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ]
     then
-        echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
+        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
         echo "    MPI_ROOT not a valid mpt installation directory or ending" \
              " in a '/'." 1>&2
         echo "    Please set MPI_ROOT to the mpt installation directory." 1>&2
@@ -559,7 +559,7 @@ INTELMPI)
 
     if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ]
     then
-        echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
+        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
         echo "    MPI_ROOT not a valid mpt installation directory or ending" \
              " in a '/'." 1>&2
         echo "    Please set MPI_ROOT to the mpt installation directory." 1>&2
diff --git a/etc/config/unset.sh b/etc/config.sh/unset
similarity index 97%
rename from etc/config/unset.sh
rename to etc/config.sh/unset
index 59428c5d6b..11394486db 100644
--- a/etc/config/unset.sh
+++ b/etc/config.sh/unset
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     etc/config/unset.sh
+#     etc/config.sh/unset
 #
 # Description
 #     Clear as many OpenFOAM environment settings as possible
diff --git a/etc/config/README b/etc/config/README
deleted file mode 100644
index b63135f141..0000000000
--- a/etc/config/README
+++ /dev/null
@@ -1,54 +0,0 @@
-The main OpenFOAM settings are located in the parent etc/ directory
-
-* bashrc, cshrc
-  entry point for sourcing
-
-* prefs.csh, prefs.sh
-  these files are untracked and can be used for some site-defined
-  settings
-
-
-The etc/config/ directory contains various configuration files in
-sh/csh variants:
-
-* settings.csh, settings.sh
-  core settings
-
-* aliases.csh, aliases.sh
-  aliases for interactive shells
-
-* unset.csh, unset.sh
-  sourced to clear as many OpenFOAM environment settings as possible
-
-
-* ensight.csh, ensight.sh
-  application settings for EnSight
-
-* paraview.csh, paraview.sh
-  application settings for ParaView
-
-* scotch.sh
-  application settings for compiling against scotch
-
-* metis.sh
-  application settings for compiling against metis 5
-
----
-
-The config/example directory contains various example configuration files
-in sh/csh variants
-
-* compiler.csh, compiler.sh
-  an example of fine tuning ThirdParty compiler settings for OpenFOAM
-
-* openmpi.csh, openmpi.sh
-  an example of fine tuning openmpi settings for OpenFOAM
-
-* paraview.csh, paraview.sh
-  an example of chaining to the standard config/paraview.sh with a
-  different ParaView_VERSION
-
-* prefs.csh, prefs.sh
-  an example of supplying alternative site-defined settings
-
----
diff --git a/etc/cshrc b/etc/cshrc
index e1a6ada091..39ee93d9a7 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -202,14 +202,14 @@ if ( $status == 0 ) setenv MANPATH $cleaned
 
 # Source project setup files
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~
-_foamSource $WM_PROJECT_DIR/etc/config/settings.csh
-_foamSource $WM_PROJECT_DIR/etc/config/aliases.csh
+_foamSource $WM_PROJECT_DIR/etc/config.csh/settings
+_foamSource $WM_PROJECT_DIR/etc/config.csh/aliases
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview.csh`
-_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.csh`
-_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/CGAL.csh`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/paraview`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/ensight`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/CGAL`
 
 
 # Clean environment paths again. Only remove duplicates

From 60281da4668039ec94afa70ff6e8a95a0cbbe22f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 15:40:19 +0000
Subject: [PATCH 174/447] Function1Types::Square: New square-wave Function1
 with the same controls as Sine with optional specification of the mark/space
 ratio

    Templated square-wave function with support for an offset level.

        \f[
            a square(f (t - t_0)) s + l
        \f]

    where

    \f$ square(t) \f$ is the square-wave function in range \f$ [-1, 1] \f$
    with a mark/space ratio of \f$ r \f$

    \vartable
        symbol  | Description       | Data type         | Default
        a       | Amplitude         | Function1<scalar> |
        f       | Frequency [1/s]   | Function1<scalar> |
        s       | Type scale factor | Function1<Type>   |
        l       | Type offset level | Function1<Type>   |
        t_0     | Start time [s]    | scalar            | 0
        r       | mark/space ratio  | scalar            | 1
        t       | Time [s]          | scalar
    \endvartable

    Example for a scalar:
    \verbatim
        <entryName> square;
        <entryName>Coeffs
        {
            frequency 10;
            amplitude 0.1;
            scale     2e-6;
            level     2e-6;
        }
    \endverbatim
---
 .../functions/Function1/Sine/Sine.C           |  12 --
 .../functions/Function1/Sine/Sine.H           |   3 -
 .../functions/Function1/Square/Square.C       | 118 +++++++++++
 .../functions/Function1/Square/Square.H       | 185 ++++++++++++++++++
 .../functions/Function1/makeDataEntries.C     |   9 +-
 5 files changed, 306 insertions(+), 21 deletions(-)
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/Square/Square.C
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/Square/Square.H

diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index ae4d7e217c..6031096643 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -85,18 +85,6 @@ Type Foam::Function1Types::Sine<Type>::value(const scalar t) const
 }
 
 
-template<class Type>
-Type Foam::Function1Types::Sine<Type>::integrate
-(
-    const scalar t1,
-    const scalar t2
-) const
-{
-    NotImplemented;
-    return level_->value(t1);
-}
-
-
 template<class Type>
 void Foam::Function1Types::Sine<Type>::writeData(Ostream& os) const
 {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index 18b2ca0bf4..00320d7568 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -155,9 +155,6 @@ public:
         //- Return value for time t
         Type value(const scalar t) const;
 
-        //- Integrate between the two time values t1 and t2
-        Type integrate(const scalar t1, const scalar t2) const;
-
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
 };
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.C b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
new file mode 100644
index 0000000000..213e768321
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
@@ -0,0 +1,118 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Square.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1Types::Square<Type>::read(const dictionary& coeffs)
+{
+    t0_ = coeffs.lookupOrDefault<scalar>("t0", 0);
+    markSpace_ = coeffs.lookupOrDefault<scalar>("markSpace", 1);
+    amplitude_ = Function1<scalar>::New("amplitude", coeffs);
+    frequency_ = Function1<scalar>::New("frequency", coeffs);
+    scale_ = Function1<Type>::New("scale", coeffs);
+    level_ = Function1<Type>::New("level", coeffs);
+}
+
+
+template<class Type>
+Foam::Function1Types::Square<Type>::Square
+(
+    const word& entryName,
+    const dictionary& dict,
+    const word& ext
+)
+:
+    Function1<Type>(entryName)
+{
+    read(dict.subDict(entryName + ext));
+}
+
+
+template<class Type>
+Foam::Function1Types::Square<Type>::Square(const Square<Type>& se)
+:
+    Function1<Type>(se),
+    t0_(se.t0_),
+    markSpace_(se.markSpace_),
+    amplitude_(se.amplitude_, false),
+    frequency_(se.frequency_, false),
+    scale_(se.scale_, false),
+    level_(se.level_, false)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Function1Types::Square<Type>::~Square()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Type Foam::Function1Types::Square<Type>::value(const scalar t) const
+{
+    // Number of waves including fractions
+    scalar waves = frequency_->value(t)*(t - t0_);
+
+    // Number of complete waves
+    scalar nWaves;
+
+    // Fraction of last incomplete wave
+    scalar waveFrac = std::modf(waves, &nWaves);
+
+    // Mark fraction of a wave
+    scalar markFrac = markSpace_/(1.0 + markSpace_);
+
+    return
+        amplitude_->value(t)
+       *(waveFrac < markFrac ? 1 : -1)
+       *scale_->value(t)
+      + level_->value(t);
+}
+
+
+template<class Type>
+void Foam::Function1Types::Square<Type>::writeData(Ostream& os) const
+{
+    Function1<Type>::writeData(os);
+    os  << token::END_STATEMENT << nl;
+    os  << indent << word(this->name() + "Coeffs") << nl;
+    os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
+    os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl;
+    os.writeKeyword("markSpace") << markSpace_ << token::END_STATEMENT << nl;
+    amplitude_->writeData(os);
+    frequency_->writeData(os);
+    scale_->writeData(os);
+    level_->writeData(os);
+    os  << decrIndent << indent << token::END_BLOCK << endl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
new file mode 100644
index 0000000000..9ae5cd8b14
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
@@ -0,0 +1,185 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::Function1Types::Square
+
+Description
+    Templated square-wave function with support for an offset level.
+
+        \f[
+            a square(f (t - t_0)) s + l
+        \f]
+
+    where
+
+    \f$ square(t) \f$ is the square-wave function in range \f$ [-1, 1] \f$
+    with a mark/space ratio of \f$ r \f$
+
+    \vartable
+        symbol  | Description       | Data type         | Default
+        a       | Amplitude         | Function1<scalar> |
+        f       | Frequency [1/s]   | Function1<scalar> |
+        s       | Type scale factor | Function1<Type>   |
+        l       | Type offset level | Function1<Type>   |
+        t_0     | Start time [s]    | scalar            | 0
+        r       | mark/space ratio  | scalar            | 1
+        t       | Time [s]          | scalar
+    \endvartable
+
+    Example for a scalar:
+    \verbatim
+        <entryName> square;
+        <entryName>Coeffs
+        {
+            frequency 10;
+            amplitude 0.1;
+            scale     2e-6;
+            level     2e-6;
+        }
+    \endverbatim
+
+    Example for a vector:
+    \verbatim
+        <entryName> square;
+        <entryName>Coeffs
+        {
+            frequency 10;
+            amplitude 1;
+            scale     (1 0.1 0);
+            level     (10 1 0);
+        }
+    \endverbatim
+
+SourceFiles
+    Square.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Square_H
+#define Square_H
+
+#include "Function1.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace Function1Types
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class Square Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class Square
+:
+    public Function1<Type>
+{
+    // Private data
+
+        //- Start-time for the square function
+        scalar t0_;
+
+        //- Mark/space ratio of the square function
+        scalar markSpace_;
+
+        //- Scalar amplitude of the square function
+        autoPtr<Function1<scalar>> amplitude_;
+
+        //- Frequency of the square function
+        autoPtr<Function1<scalar>> frequency_;
+
+        //- Scaling factor of the square function
+        autoPtr<Function1<Type>> scale_;
+
+        //- Level to which the square function is added
+        autoPtr<Function1<Type>> level_;
+
+
+    // Private Member Functions
+
+        //- Read the coefficients from the given dictionary
+        void read(const dictionary& coeffs);
+
+        //- Disallow default bitwise assignment
+        void operator=(const Square<Type>&);
+
+
+public:
+
+    // Runtime type information
+    TypeName("square");
+
+
+    // Constructors
+
+        //- Construct from entry name and dictionary
+        Square
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const word& ext = "Coeffs"
+        );
+
+        //- Copy constructor
+        Square(const Square<Type>& se);
+
+        //- Construct and return a clone
+        virtual tmp<Function1<Type>> clone() const
+        {
+            return tmp<Function1<Type>>(new Square<Type>(*this));
+        }
+
+
+    //- Destructor
+    virtual ~Square();
+
+
+    // Member Functions
+
+        //- Return value for time t
+        Type value(const scalar t) const;
+
+        //- Write in dictionary format
+        virtual void writeData(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Function1Types
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "Square.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C b/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C
index aaae5bc10a..babb5bad63 100644
--- a/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C
+++ b/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C
@@ -26,16 +26,12 @@ License
 #include "Constant.H"
 #include "PolynomialEntry.H"
 #include "Sine.H"
+#include "Square.H"
 #include "CSV.H"
 #include "Table.H"
 #include "TableFile.H"
 
-#include "label.H"
-#include "scalar.H"
-#include "vector.H"
-#include "sphericalTensor.H"
-#include "symmTensor.H"
-#include "tensor.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,6 +40,7 @@ License
     makeFunction1Type(Constant, Type);                                         \
     makeFunction1Type(Polynomial, Type);                                       \
     makeFunction1Type(Sine, Type);                                             \
+    makeFunction1Type(Square, Type);                                           \
     makeFunction1Type(CSV, Type);                                              \
     makeFunction1Type(Table, Type);                                            \
     makeFunction1Type(TableFile, Type);

From bbcfb509656ac70659a3256e439043a34200aaf4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 15:43:31 +0000
Subject: [PATCH 175/447] particle: Updated property list Resolved bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1990

---
 src/lagrangian/basic/particle/particle.H | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H
index cbc29774a4..3277b5c31a 100644
--- a/src/lagrangian/basic/particle/particle.H
+++ b/src/lagrangian/basic/particle/particle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -313,7 +313,11 @@ public:
         TypeName("particle");
 
         //- String representation of properties
-        DefinePropertyList("(Px Py Pz) cellI tetFaceI tetPtI origProc origId");
+        DefinePropertyList
+        (
+            "(Px Py Pz) cellI faceI stepFraction "
+            "tetFaceI tetPtI origProc origId"
+        );
 
         //- Cumulative particle counter - used to provode unique ID
         static label particleCount_;

From f9d61d7e3c390fb1a26353e09ff9ba6cfdd9967a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 16:20:19 +0000
Subject: [PATCH 176/447] Updates for changes to etc/config structure

---
 .gitignore                                  | 4 ++--
 bin/tools/foamConfigurePaths                | 8 ++++----
 etc/config.sh/paraview                      | 4 ++--
 src/fvAgglomerationMethods/Allwmake         | 4 ++--
 src/parallel/decompose/Allwmake             | 4 ++--
 src/parallel/decompose/metisDecomp/Allwmake | 4 ++--
 src/renumber/Allwmake                       | 4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index ec46862766..195dbe74ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,8 +58,8 @@ doc/Doxygen/DTAGS
 # Untracked configuration files
 /etc/prefs.csh
 /etc/prefs.sh
-/etc/config/prefs.csh
-/etc/config/prefs.sh
+/etc/config.csh/prefs.csh
+/etc/config.sh/prefs.sh
 
 # Source packages - anywhere
 *.tar.bz2
diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths
index 34c6fc2004..700ab15273 100755
--- a/bin/tools/foamConfigurePaths
+++ b/bin/tools/foamConfigurePaths
@@ -146,7 +146,7 @@ do
         paraviewInstall="$2"
         # replace ParaView_DIR=...
         _inlineSed \
-            etc/config/paraview.sh \
+            etc/config.sh/paraview \
             'ParaView_DIR=.*' \
             'ParaView_DIR='"$paraviewInstall" \
             "Replacing ParaView_DIR setting by '$paraviewInstall'"
@@ -157,7 +157,7 @@ do
         paraviewVersion="$2"
         # replace ParaView_VERSION=...
         _inlineSed \
-            etc/config/paraview.sh \
+            etc/config.sh/paraview \
             'ParaView_VERSION=.*' \
             'ParaView_VERSION='"$paraviewVersion" \
             "Replacing ParaView_VERSION setting by '$paraviewVersion'"
@@ -167,7 +167,7 @@ do
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
         scotchVersion="$2"
         _inlineSed \
-            etc/config/scotch.sh \
+            etc/config.sh/scotch \
             'SCOTCH_VERSION=.*' \
             'SCOTCH_VERSION='"$scotchVersion" \
             "Replacing SCOTCH_VERSION setting by '$scotchVersion'"
@@ -177,7 +177,7 @@ do
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
         scotchArchPath="$2"
         _inlineSed \
-            etc/config/scotch.sh \
+            etc/config.sh/scotch \
             'SCOTCH_ARCH_PATH=.*' \
             'SCOTCH_ARCH_PATH='"$scotchArchPath" \
             "Replacing SCOTCH_ARCH_PATH setting by '$scotchArchPath'"
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 33fb031d24..1f23bb61ae 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -55,8 +55,8 @@ done
 #export ParaView_VERSION=4.0.1
 #export ParaView_VERSION=4.1.0
 #export ParaView_VERSION=4.3.1
-export ParaView_VERSION=4.4.0
-#export ParaView_VERSION=5.0.0
+#export ParaView_VERSION=4.4.0
+export ParaView_VERSION=5.0.0
 export ParaView_MAJOR=detect
 
 
diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
index 16340f0efb..f80a7e5ffd 100755
--- a/src/fvAgglomerationMethods/Allwmake
+++ b/src/fvAgglomerationMethods/Allwmake
@@ -17,13 +17,13 @@ wmake $targetType pairPatchAgglomeration
 
 
 ## get SCOTCH_VERSION, SCOTCH_ARCH_PATH
-if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/scotch.sh`
+if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
 then
     . $settings
     echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
 else
     echo
-    echo "Error: no config/scotch.sh settings"
+    echo "Error: no config.sh/scotch settings"
     echo
 fi
 
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 603ee5277b..4ce2aa27a6 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -6,13 +6,13 @@ targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 # get SCOTCH_VERSION, SCOTCH_ARCH_PATH
-if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/scotch.sh`
+if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
 then
     . $settings
     echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
 else
     echo
-    echo "Error: no config/scotch.sh settings"
+    echo "Error: no config.sh/scotch settings"
     echo
 fi
 
diff --git a/src/parallel/decompose/metisDecomp/Allwmake b/src/parallel/decompose/metisDecomp/Allwmake
index 549e4229b8..8259ce1436 100755
--- a/src/parallel/decompose/metisDecomp/Allwmake
+++ b/src/parallel/decompose/metisDecomp/Allwmake
@@ -6,7 +6,7 @@ targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 # get METIS_VERSION, METIS_ARCH_PATH
-if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/metis.sh`
+if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis`
 then
     . $settings
     echo "using METIS_ARCH_PATH=$METIS_ARCH_PATH"
@@ -16,7 +16,7 @@ then
     fi
 else
     echo
-    echo "Error: no config/metis.sh settings"
+    echo "Error: no config.sh/metis settings"
     echo
 fi
 
diff --git a/src/renumber/Allwmake b/src/renumber/Allwmake
index ec1acb8320..01200e712e 100755
--- a/src/renumber/Allwmake
+++ b/src/renumber/Allwmake
@@ -6,13 +6,13 @@ targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 ## get ZOLTAN_ARCH_PATH
-#if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/zoltan.sh`
+#if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan`
 #then
 #    . $settings
 #    echo "using ZOLTAN_ARCH_PATH=$ZOLTAN_ARCH_PATH"
 #else
 #    echo
-#    echo "Error: no config/zoltan.sh settings"
+#    echo "Error: no config.sh/zoltan settings"
 #    echo
 #fi
 

From 45253d62042b0024fe3b29c0e0f763879de307aa Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 16:20:46 +0000
Subject: [PATCH 177/447] Update header

---
 bin/tools/foamConfigurePaths | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths
index 700ab15273..57e714c9c4 100755
--- a/bin/tools/foamConfigurePaths
+++ b/bin/tools/foamConfigurePaths
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License

From 9a7c6287a80b42fce09c17365f84ea6938d8c763 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 20:46:24 +0000
Subject: [PATCH 178/447] etc/config.*: Separate MPI settings into separate
 files and upgrade OpenMPI to 10.0.2

---
 etc/bashrc              |   1 +
 etc/config.csh/mpi      | 277 ++++++++++++++++++++++++++++++++++++++++
 etc/config.csh/settings | 245 -----------------------------------
 etc/config.sh/mpi       | 270 +++++++++++++++++++++++++++++++++++++++
 etc/config.sh/settings  | 241 ----------------------------------
 etc/cshrc               |   1 +
 6 files changed, 549 insertions(+), 486 deletions(-)
 create mode 100644 etc/config.csh/mpi
 create mode 100644 etc/config.sh/mpi

diff --git a/etc/bashrc b/etc/bashrc
index 892d23e719..632e1670fa 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -217,6 +217,7 @@ _foamSource $WM_PROJECT_DIR/etc/config.sh/aliases
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/mpi`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/paraview`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/ensight`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/gperftools`
diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
new file mode 100644
index 0000000000..867ac4c55d
--- /dev/null
+++ b/etc/config.csh/mpi
@@ -0,0 +1,277 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2016 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/>.
+#
+# File
+#     etc/config.csh/mpi
+#
+# Description
+#     Startup file for communications library (MPI) for OpenFOAM
+#     Sourced from OpenFOAM-<VERSION>/etc/bashrc
+#
+#------------------------------------------------------------------------------
+
+# Communications library
+# ~~~~~~~~~~~~~~~~~~~~~~
+
+unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
+
+switch ("$WM_MPLIB")
+case SYSTEMOPENMPI:
+    # Use the system installed openmpi, get library directory via mpicc
+    setenv FOAM_MPI openmpi-system
+
+    set libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'`
+
+    # Bit of a hack: strip off 'lib' and hope this is the path to openmpi
+    # Include files and libraries.
+    setenv MPI_ARCH_PATH "${libDir:h}"
+
+    _foamAddLib     $libDir
+    unset libDir
+    breaksw
+
+case OPENMPI:
+    setenv FOAM_MPI openmpi-1.10.2
+    # Optional configuration tweaks:
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/openmpi`
+
+    setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+
+    # Tell OpenMPI where to find its install directory
+    setenv OPAL_PREFIX $MPI_ARCH_PATH
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    _foamAddLib     $MPI_ARCH_PATH/lib
+
+    _foamAddMan     $MPI_ARCH_PATH/share/man
+    breaksw
+
+case SYSTEMMPI:
+    setenv FOAM_MPI mpi-system
+
+    if ( ! ($?MPI_ROOT) ) then
+        echo
+        echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
+        echo "    Please set the environment variable MPI_ROOT to point to" \
+             " the base folder for the system MPI in use."
+        echo "    Example:"
+        echo
+        echo "        setenv MPI_ROOT /opt/mpi"
+        echo
+    else
+        setenv MPI_ARCH_PATH $MPI_ROOT
+
+        if ( ! ($?MPI_ARCH_FLAGS) ) then
+            echo
+            echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
+            echo "    MPI_ARCH_FLAGS is not set. Example:"
+            echo
+            echo '        setenv MPI_ARCH_FLAGS "-DOMPI_SKIP_MPICXX"'
+            echo
+        endif
+
+        if ( ! ($?MPI_ARCH_INC) ) then
+            echo
+            echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
+            echo "    MPI_ARCH_INC is not set. Example:"
+            echo
+            echo '        setenv MPI_ARCH_INC "-isystem $MPI_ROOT/include"'
+            echo
+        endif
+
+        if ( ! ($?MPI_ARCH_LIBS) ) then
+            echo
+            echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
+            echo "    MPI_ARCH_LIBS is not set. Example:"
+            echo
+            echo '        setenv MPI_ARCH_LIBS "-L$MPI_ROOT/lib -lmpi"'
+            echo
+        endif
+    endif
+    breaksw
+
+case MPICH:
+    setenv FOAM_MPI mpich2-1.1.1p1
+    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$FOAM_MPI
+    setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    _foamAddLib     $MPI_ARCH_PATH/lib
+
+    _foamAddMan     $MPI_ARCH_PATH/share/man
+    breaksw
+
+case MPICH-GM:
+    setenv FOAM_MPI mpich-gm
+    setenv MPI_ARCH_PATH /opt/mpi
+    setenv MPICH_PATH $MPI_ARCH_PATH
+    setenv GM_LIB_PATH /opt/gm/lib64
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    _foamAddLib     $MPI_ARCH_PATH/lib
+
+    _foamAddLib     $GM_LIB_PATH
+    breaksw
+
+case HPMPI:
+    setenv FOAM_MPI hpmpi
+    setenv MPI_HOME /opt/hpmpi
+    setenv MPI_ARCH_PATH $MPI_HOME
+
+    _foamAddPath $MPI_ARCH_PATH/bin
+
+    switch (`uname -m`)
+    case i686:
+        _foamAddLib $MPI_ARCH_PATH/lib/linux_ia32
+        breaksw
+    case x86_64:
+        _foamAddLib $MPI_ARCH_PATH/lib/linux_amd64
+        breaksw
+    case ia64:
+        _foamAddLib $MPI_ARCH_PATH/lib/linux_ia64
+        breaksw
+    default:
+        echo Unknown processor type `uname -m` for Linux
+        breaksw
+    endsw
+    breaksw
+
+case MPI:
+    setenv FOAM_MPI mpi
+    setenv MPI_ARCH_PATH /opt/mpi
+    breaksw
+
+case FJMPI:
+    setenv FOAM_MPI fjmpi
+    setenv MPI_ARCH_PATH /opt/FJSVmpi2
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+    _foamAddLib     $MPI_ARCH_PATH/lib/sparcv9
+    _foamAddLib     /opt/FSUNf90/lib/sparcv9
+    _foamAddLib     /opt/FJSVpnidt/lib
+    breaksw
+
+case QSMPI:
+    setenv FOAM_MPI qsmpi
+    setenv MPI_ARCH_PATH /usr/lib/mpi
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+    _foamAddLib     $MPI_ARCH_PATH/lib
+    breaksw
+
+case SGIMPI:
+    if ( ! $?MPI_ROOT) setenv MPI_ROOT /dummy
+
+    if ( ! -d "$MPI_ROOT" ) then
+        echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
+        echo "    MPI_ROOT not a valid mpt installation directory."
+        echo "    Please set MPI_ROOT to the mpt installation directory."
+        echo "    (usually done by loading the mpt module)"
+        echo "    MPI_ROOT currently set to '$MPI_ROOT'"
+    endif
+
+    if ( "${MPI_ROOT:h}/" == $MPI_ROOT ) then
+        setenv MPI_ROOT ${MPI_ROOT:h}
+    endif
+
+    setenv FOAM_MPI ${MPI_ROOT:t}
+    setenv MPI_ARCH_PATH $MPI_ROOT
+
+
+    if ($?FOAM_VERBOSE && $?prompt) then
+        echo "Using SGI MPT:"
+        echo "    MPI_ROOT : $MPI_ROOT"
+        echo "    FOAM_MPI : $FOAM_MPI"
+    endif
+
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+    _foamAddLib     $MPI_ARCH_PATH/lib
+    breaksw
+
+case INTELMPI:
+    if ( ! $?MPI_ROOT) setenv MPI_ROOT /dummy
+
+    if ( ! -d "$MPI_ROOT" ) then
+        echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
+        echo "    MPI_ROOT not a valid mpt installation directory."
+        echo "    Please set MPI_ROOT to the mpt installation directory."
+        echo "    (usually done by loading the mpt module)"
+        echo "    MPI_ROOT currently set to '$MPI_ROOT'"
+    endif
+
+    if ( "${MPI_ROOT:h}/" == $MPI_ROOT ) then
+        setenv MPI_ROOT ${MPI_ROOT:h}
+    endif
+
+    setenv FOAM_MPI ${MPI_ROOT:t}
+    setenv MPI_ARCH_PATH $MPI_ROOT
+
+
+    if ($?FOAM_VERBOSE && $?prompt) then
+        echo "Using INTEL MPT:"
+        echo "    MPI_ROOT : $MPI_ROOT"
+        echo "    FOAM_MPI : $FOAM_MPI"
+    endif
+
+
+    _foamAddPath    $MPI_ARCH_PATH/bin64
+    _foamAddLib     $MPI_ARCH_PATH/lib64
+    breaksw
+
+default:
+    setenv FOAM_MPI dummy
+    breaksw
+endsw
+
+
+# Add (non-dummy) MPI implementation
+# Dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
+if ( "$FOAM_MPI" != dummy ) then
+    _foamAddLib ${FOAM_LIBBIN}/${FOAM_MPI}:${FOAM_EXT_LIBBIN}/${FOAM_MPI}
+endif
+
+
+
+# Set the minimum MPI buffer size (used by all platforms except SGI MPI)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+if ( ! $?minBufferSize ) set minBufferSize=20000000
+
+if ( $?MPI_BUFFER_SIZE ) then
+    if ( $MPI_BUFFER_SIZE < $minBufferSize ) then
+        setenv MPI_BUFFER_SIZE $minBufferSize
+    endif
+else
+    setenv MPI_BUFFER_SIZE $minBufferSize
+endif
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index d1d9dac611..c99a55985f 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -337,251 +337,6 @@ default:
 endsw
 
 
-# Communications library
-# ~~~~~~~~~~~~~~~~~~~~~~
-
-unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
-
-switch ("$WM_MPLIB")
-case SYSTEMOPENMPI:
-    # Use the system installed openmpi, get library directory via mpicc
-    setenv FOAM_MPI openmpi-system
-
-    set libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'`
-
-    # Bit of a hack: strip off 'lib' and hope this is the path to openmpi
-    # Include files and libraries.
-    setenv MPI_ARCH_PATH "${libDir:h}"
-
-    _foamAddLib     $libDir
-    unset libDir
-    breaksw
-
-case OPENMPI:
-    setenv FOAM_MPI openmpi-1.10.0
-    # Optional configuration tweaks:
-    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/openmpi`
-
-    setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
-
-    # Tell OpenMPI where to find its install directory
-    setenv OPAL_PREFIX $MPI_ARCH_PATH
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-
-    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
-    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
-    _foamAddLib     $MPI_ARCH_PATH/lib
-
-    _foamAddMan     $MPI_ARCH_PATH/share/man
-    breaksw
-
-case SYSTEMMPI:
-    setenv FOAM_MPI mpi-system
-
-    if ( ! ($?MPI_ROOT) ) then
-        echo
-        echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
-        echo "    Please set the environment variable MPI_ROOT to point to" \
-             " the base folder for the system MPI in use."
-        echo "    Example:"
-        echo
-        echo "        setenv MPI_ROOT /opt/mpi"
-        echo
-    else
-        setenv MPI_ARCH_PATH $MPI_ROOT
-
-        if ( ! ($?MPI_ARCH_FLAGS) ) then
-            echo
-            echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
-            echo "    MPI_ARCH_FLAGS is not set. Example:"
-            echo
-            echo '        setenv MPI_ARCH_FLAGS "-DOMPI_SKIP_MPICXX"'
-            echo
-        endif
-
-        if ( ! ($?MPI_ARCH_INC) ) then
-            echo
-            echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
-            echo "    MPI_ARCH_INC is not set. Example:"
-            echo
-            echo '        setenv MPI_ARCH_INC "-isystem $MPI_ROOT/include"'
-            echo
-        endif
-
-        if ( ! ($?MPI_ARCH_LIBS) ) then
-            echo
-            echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
-            echo "    MPI_ARCH_LIBS is not set. Example:"
-            echo
-            echo '        setenv MPI_ARCH_LIBS "-L$MPI_ROOT/lib -lmpi"'
-            echo
-        endif
-    endif
-    breaksw
-
-case MPICH:
-    setenv FOAM_MPI mpich2-1.1.1p1
-    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$FOAM_MPI
-    setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-
-    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
-    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
-    _foamAddLib     $MPI_ARCH_PATH/lib
-
-    _foamAddMan     $MPI_ARCH_PATH/share/man
-    breaksw
-
-case MPICH-GM:
-    setenv FOAM_MPI mpich-gm
-    setenv MPI_ARCH_PATH /opt/mpi
-    setenv MPICH_PATH $MPI_ARCH_PATH
-    setenv GM_LIB_PATH /opt/gm/lib64
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-
-    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
-    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
-    _foamAddLib     $MPI_ARCH_PATH/lib
-
-    _foamAddLib     $GM_LIB_PATH
-    breaksw
-
-case HPMPI:
-    setenv FOAM_MPI hpmpi
-    setenv MPI_HOME /opt/hpmpi
-    setenv MPI_ARCH_PATH $MPI_HOME
-
-    _foamAddPath $MPI_ARCH_PATH/bin
-
-    switch (`uname -m`)
-    case i686:
-        _foamAddLib $MPI_ARCH_PATH/lib/linux_ia32
-        breaksw
-    case x86_64:
-        _foamAddLib $MPI_ARCH_PATH/lib/linux_amd64
-        breaksw
-    case ia64:
-        _foamAddLib $MPI_ARCH_PATH/lib/linux_ia64
-        breaksw
-    default:
-        echo Unknown processor type `uname -m` for Linux
-        breaksw
-    endsw
-    breaksw
-
-case MPI:
-    setenv FOAM_MPI mpi
-    setenv MPI_ARCH_PATH /opt/mpi
-    breaksw
-
-case FJMPI:
-    setenv FOAM_MPI fjmpi
-    setenv MPI_ARCH_PATH /opt/FJSVmpi2
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-    _foamAddLib     $MPI_ARCH_PATH/lib/sparcv9
-    _foamAddLib     /opt/FSUNf90/lib/sparcv9
-    _foamAddLib     /opt/FJSVpnidt/lib
-    breaksw
-
-case QSMPI:
-    setenv FOAM_MPI qsmpi
-    setenv MPI_ARCH_PATH /usr/lib/mpi
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-    _foamAddLib     $MPI_ARCH_PATH/lib
-    breaksw
-
-case SGIMPI:
-    if ( ! $?MPI_ROOT) setenv MPI_ROOT /dummy
-
-    if ( ! -d "$MPI_ROOT" ) then
-        echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
-        echo "    MPI_ROOT not a valid mpt installation directory."
-        echo "    Please set MPI_ROOT to the mpt installation directory."
-        echo "    (usually done by loading the mpt module)"
-        echo "    MPI_ROOT currently set to '$MPI_ROOT'"
-    endif
-
-    if ( "${MPI_ROOT:h}/" == $MPI_ROOT ) then
-        setenv MPI_ROOT ${MPI_ROOT:h}
-    endif
-
-    setenv FOAM_MPI ${MPI_ROOT:t}
-    setenv MPI_ARCH_PATH $MPI_ROOT
-
-
-    if ($?FOAM_VERBOSE && $?prompt) then
-        echo "Using SGI MPT:"
-        echo "    MPI_ROOT : $MPI_ROOT"
-        echo "    FOAM_MPI : $FOAM_MPI"
-    endif
-
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-    _foamAddLib     $MPI_ARCH_PATH/lib
-    breaksw
-
-case INTELMPI:
-    if ( ! $?MPI_ROOT) setenv MPI_ROOT /dummy
-
-    if ( ! -d "$MPI_ROOT" ) then
-        echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
-        echo "    MPI_ROOT not a valid mpt installation directory."
-        echo "    Please set MPI_ROOT to the mpt installation directory."
-        echo "    (usually done by loading the mpt module)"
-        echo "    MPI_ROOT currently set to '$MPI_ROOT'"
-    endif
-
-    if ( "${MPI_ROOT:h}/" == $MPI_ROOT ) then
-        setenv MPI_ROOT ${MPI_ROOT:h}
-    endif
-
-    setenv FOAM_MPI ${MPI_ROOT:t}
-    setenv MPI_ARCH_PATH $MPI_ROOT
-
-
-    if ($?FOAM_VERBOSE && $?prompt) then
-        echo "Using INTEL MPT:"
-        echo "    MPI_ROOT : $MPI_ROOT"
-        echo "    FOAM_MPI : $FOAM_MPI"
-    endif
-
-
-    _foamAddPath    $MPI_ARCH_PATH/bin64
-    _foamAddLib     $MPI_ARCH_PATH/lib64
-    breaksw
-
-default:
-    setenv FOAM_MPI dummy
-    breaksw
-endsw
-
-
-# Add (non-dummy) MPI implementation
-# Dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
-if ( "$FOAM_MPI" != dummy ) then
-    _foamAddLib ${FOAM_LIBBIN}/${FOAM_MPI}:${FOAM_EXT_LIBBIN}/${FOAM_MPI}
-endif
-
-
-
-# Set the minimum MPI buffer size (used by all platforms except SGI MPI)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-if ( ! $?minBufferSize ) set minBufferSize=20000000
-
-if ( $?MPI_BUFFER_SIZE ) then
-    if ( $MPI_BUFFER_SIZE < $minBufferSize ) then
-        setenv MPI_BUFFER_SIZE $minBufferSize
-    endif
-else
-    setenv MPI_BUFFER_SIZE $minBufferSize
-endif
-
-
 # Cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
 #- keep _foamAddPath _foamAddLib _foamAddMan
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
new file mode 100644
index 0000000000..fc7b3b5176
--- /dev/null
+++ b/etc/config.sh/mpi
@@ -0,0 +1,270 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2016 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/>.
+#
+# File
+#     etc/config.sh/mpi
+#
+# Description
+#     Startup file for communications library (MPI) for OpenFOAM
+#     Sourced from OpenFOAM-<VERSION>/etc/bashrc
+#
+#------------------------------------------------------------------------------
+
+unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
+
+case "$WM_MPLIB" in
+SYSTEMOPENMPI)
+    # Use the system installed openmpi, get library directory via mpicc
+    export FOAM_MPI=openmpi-system
+
+    libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'`
+
+    # Bit of a hack: strip off 'lib' and hope this is the path to openmpi
+    # include files and libraries.
+    export MPI_ARCH_PATH="${libDir%/*}"
+
+    _foamAddLib     $libDir
+    unset libDir
+    ;;
+
+OPENMPI)
+    export FOAM_MPI=openmpi-1.10.2
+    # Optional configuration tweaks:
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/openmpi`
+
+    export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+
+    # Tell OpenMPI where to find its install directory
+    export OPAL_PREFIX=$MPI_ARCH_PATH
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    _foamAddLib     $MPI_ARCH_PATH/lib
+
+    _foamAddMan     $MPI_ARCH_PATH/share/man
+    ;;
+
+SYSTEMMPI)
+    export FOAM_MPI=mpi-system
+
+    if [ -z "$MPI_ROOT" ]
+    then
+        echo 1>&2
+        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
+        echo "    Please set the environment variable MPI_ROOT to point to" \
+             " the base folder for the system MPI in use." 1>&2
+        echo "    Example:" 1>&2
+        echo 1>&2
+        echo "        export MPI_ROOT=/opt/mpi" 1>&2
+        echo 1>&2
+    else
+        export MPI_ARCH_PATH=$MPI_ROOT
+
+        if [ -z "$MPI_ARCH_FLAGS" ]
+        then
+            echo 1>&2
+            echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
+            echo "    MPI_ARCH_FLAGS is not set. Example:" 1>&2
+            echo 1>&2
+            echo "        export MPI_ARCH_FLAGS=\"-DOMPI_SKIP_MPICXX\"" 1>&2
+            echo 1>&2
+        fi
+
+        if [ -z "$MPI_ARCH_INC" ]
+        then
+            echo 1>&2
+            echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
+            echo "    MPI_ARCH_INC is not set. Example:" 1>&2
+            echo 1>&2
+            echo "        export MPI_ARCH_INC=\"-isystem \$MPI_ROOT/include\"" 1>&2
+            echo 1>&2
+        fi
+
+        if [ -z "$MPI_ARCH_LIBS" ]
+        then
+            echo 1>&2
+            echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
+            echo "    MPI_ARCH_LIBS is not set. Example:" 1>&2
+            echo 1>&2
+            echo "        export MPI_ARCH_LIBS=\"-L\$MPI_ROOT/lib -lmpi\"" 1>&2
+            echo 1>&2
+        fi
+    fi
+    ;;
+
+MPICH)
+    export FOAM_MPI=mpich2-1.1.1p1
+    export MPI_HOME=$WM_THIRD_PARTY_DIR/$FOAM_MPI
+    export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    _foamAddLib     $MPI_ARCH_PATH/lib
+
+    _foamAddMan     $MPI_ARCH_PATH/share/man
+    ;;
+
+MPICH-GM)
+    export FOAM_MPI=mpich-gm
+    export MPI_ARCH_PATH=/opt/mpi
+    export MPICH_PATH=$MPI_ARCH_PATH
+    export GM_LIB_PATH=/opt/gm/lib64
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    _foamAddLib     $MPI_ARCH_PATH/lib
+
+    _foamAddLib     $GM_LIB_PATH
+    ;;
+
+HPMPI)
+    export FOAM_MPI=hpmpi
+    export MPI_HOME=/opt/hpmpi
+    export MPI_ARCH_PATH=$MPI_HOME
+
+    _foamAddPath $MPI_ARCH_PATH/bin
+
+    case `uname -m` in
+    i686)
+        _foamAddLib $MPI_ARCH_PATH/lib/linux_ia32
+        ;;
+
+    x86_64)
+        _foamAddLib $MPI_ARCH_PATH/lib/linux_amd64
+        ;;
+    ia64)
+        _foamAddLib $MPI_ARCH_PATH/lib/linux_ia64
+        ;;
+    *)
+        echo Unknown processor type `uname -m` 1>&2
+        ;;
+    esac
+    ;;
+
+MPI)
+    export FOAM_MPI=mpi
+    export MPI_ARCH_PATH=/opt/mpi
+    ;;
+
+FJMPI)
+    export FOAM_MPI=fjmpi
+    export MPI_ARCH_PATH=/opt/FJSVmpi2
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+    _foamAddLib     $MPI_ARCH_PATH/lib/sparcv9
+    _foamAddLib     /opt/FSUNf90/lib/sparcv9
+    _foamAddLib     /opt/FJSVpnidt/lib
+    ;;
+
+QSMPI)
+    export FOAM_MPI=qsmpi
+    export MPI_ARCH_PATH=/usr/lib/mpi
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+    _foamAddLib     $MPI_ARCH_PATH/lib
+    ;;
+
+SGIMPI)
+    # No trailing slash
+    [ "${MPI_ROOT%/}" = "${MPI_ROOT}" ] || MPI_ROOT="${MPI_ROOT%/}"
+
+    export FOAM_MPI="${MPI_ROOT##*/}"
+    export MPI_ARCH_PATH=$MPI_ROOT
+
+    if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ]
+    then
+        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
+        echo "    MPI_ROOT not a valid mpt installation directory or ending" \
+             " in a '/'." 1>&2
+        echo "    Please set MPI_ROOT to the mpt installation directory." 1>&2
+        echo "    MPI_ROOT currently set to '$MPI_ROOT'" 1>&2
+    fi
+
+    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    then
+        echo "Using SGI MPT:" 1>&2
+        echo "    MPI_ROOT : $MPI_ROOT" 1>&2
+        echo "    FOAM_MPI : $FOAM_MPI" 1>&2
+    fi
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+    _foamAddLib     $MPI_ARCH_PATH/lib
+    ;;
+
+INTELMPI)
+    # No trailing slash
+    [ "${MPI_ROOT%/}" = "${MPI_ROOT}" ] || MPI_ROOT="${MPI_ROOT%/}"
+
+    export FOAM_MPI="${MPI_ROOT##*/}"
+    export MPI_ARCH_PATH=$MPI_ROOT
+
+    if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ]
+    then
+        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
+        echo "    MPI_ROOT not a valid mpt installation directory or ending" \
+             " in a '/'." 1>&2
+        echo "    Please set MPI_ROOT to the mpt installation directory." 1>&2
+        echo "    MPI_ROOT currently set to '$MPI_ROOT'" 1>&2
+    fi
+
+    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    then
+        echo "Using INTEL MPI:" 1>&2
+        echo "    MPI_ROOT : $MPI_ROOT" 1>&2
+        echo "    FOAM_MPI : $FOAM_MPI" 1>&2
+    fi
+
+    _foamAddPath    $MPI_ARCH_PATH/bin64
+    _foamAddLib     $MPI_ARCH_PATH/lib64
+    ;;
+*)
+    export FOAM_MPI=dummy
+    ;;
+esac
+
+# Add (non-dummy) MPI implementation
+# Dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
+if [ "$FOAM_MPI" != dummy ]
+then
+    _foamAddLib $FOAM_LIBBIN/$FOAM_MPI:$FOAM_EXT_LIBBIN/$FOAM_MPI
+fi
+
+
+
+# Set the minimum MPI buffer size (used by all platforms except SGI MPI)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+: ${minBufferSize:=20000000}
+
+if [ "${MPI_BUFFER_SIZE:=$minBufferSize}" -lt $minBufferSize ]
+then
+    MPI_BUFFER_SIZE=$minBufferSize
+fi
+export MPI_BUFFER_SIZE
+
+# -----------------------------------------------------------------------------
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index 0a613c935d..cd0fb0adf5 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -360,247 +360,6 @@ system)
 esac
 
 
-# Communications library
-# ~~~~~~~~~~~~~~~~~~~~~~
-
-unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
-
-case "$WM_MPLIB" in
-SYSTEMOPENMPI)
-    # Use the system installed openmpi, get library directory via mpicc
-    export FOAM_MPI=openmpi-system
-
-    libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'`
-
-    # Bit of a hack: strip off 'lib' and hope this is the path to openmpi
-    # include files and libraries.
-    export MPI_ARCH_PATH="${libDir%/*}"
-
-    _foamAddLib     $libDir
-    unset libDir
-    ;;
-
-OPENMPI)
-    export FOAM_MPI=openmpi-1.10.0
-    # Optional configuration tweaks:
-    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/openmpi`
-
-    export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
-
-    # Tell OpenMPI where to find its install directory
-    export OPAL_PREFIX=$MPI_ARCH_PATH
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-
-    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
-    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
-    _foamAddLib     $MPI_ARCH_PATH/lib
-
-    _foamAddMan     $MPI_ARCH_PATH/share/man
-    ;;
-
-SYSTEMMPI)
-    export FOAM_MPI=mpi-system
-
-    if [ -z "$MPI_ROOT" ]
-    then
-        echo 1>&2
-        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
-        echo "    Please set the environment variable MPI_ROOT to point to" \
-             " the base folder for the system MPI in use." 1>&2
-        echo "    Example:" 1>&2
-        echo 1>&2
-        echo "        export MPI_ROOT=/opt/mpi" 1>&2
-        echo 1>&2
-    else
-        export MPI_ARCH_PATH=$MPI_ROOT
-
-        if [ -z "$MPI_ARCH_FLAGS" ]
-        then
-            echo 1>&2
-            echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
-            echo "    MPI_ARCH_FLAGS is not set. Example:" 1>&2
-            echo 1>&2
-            echo "        export MPI_ARCH_FLAGS=\"-DOMPI_SKIP_MPICXX\"" 1>&2
-            echo 1>&2
-        fi
-
-        if [ -z "$MPI_ARCH_INC" ]
-        then
-            echo 1>&2
-            echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
-            echo "    MPI_ARCH_INC is not set. Example:" 1>&2
-            echo 1>&2
-            echo "        export MPI_ARCH_INC=\"-isystem \$MPI_ROOT/include\"" 1>&2
-            echo 1>&2
-        fi
-
-        if [ -z "$MPI_ARCH_LIBS" ]
-        then
-            echo 1>&2
-            echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
-            echo "    MPI_ARCH_LIBS is not set. Example:" 1>&2
-            echo 1>&2
-            echo "        export MPI_ARCH_LIBS=\"-L\$MPI_ROOT/lib -lmpi\"" 1>&2
-            echo 1>&2
-        fi
-    fi
-    ;;
-
-MPICH)
-    export FOAM_MPI=mpich2-1.1.1p1
-    export MPI_HOME=$WM_THIRD_PARTY_DIR/$FOAM_MPI
-    export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-
-    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
-    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
-    _foamAddLib     $MPI_ARCH_PATH/lib
-
-    _foamAddMan     $MPI_ARCH_PATH/share/man
-    ;;
-
-MPICH-GM)
-    export FOAM_MPI=mpich-gm
-    export MPI_ARCH_PATH=/opt/mpi
-    export MPICH_PATH=$MPI_ARCH_PATH
-    export GM_LIB_PATH=/opt/gm/lib64
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-
-    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
-    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
-    _foamAddLib     $MPI_ARCH_PATH/lib
-
-    _foamAddLib     $GM_LIB_PATH
-    ;;
-
-HPMPI)
-    export FOAM_MPI=hpmpi
-    export MPI_HOME=/opt/hpmpi
-    export MPI_ARCH_PATH=$MPI_HOME
-
-    _foamAddPath $MPI_ARCH_PATH/bin
-
-    case `uname -m` in
-    i686)
-        _foamAddLib $MPI_ARCH_PATH/lib/linux_ia32
-        ;;
-
-    x86_64)
-        _foamAddLib $MPI_ARCH_PATH/lib/linux_amd64
-        ;;
-    ia64)
-        _foamAddLib $MPI_ARCH_PATH/lib/linux_ia64
-        ;;
-    *)
-        echo Unknown processor type `uname -m` 1>&2
-        ;;
-    esac
-    ;;
-
-MPI)
-    export FOAM_MPI=mpi
-    export MPI_ARCH_PATH=/opt/mpi
-    ;;
-
-FJMPI)
-    export FOAM_MPI=fjmpi
-    export MPI_ARCH_PATH=/opt/FJSVmpi2
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-    _foamAddLib     $MPI_ARCH_PATH/lib/sparcv9
-    _foamAddLib     /opt/FSUNf90/lib/sparcv9
-    _foamAddLib     /opt/FJSVpnidt/lib
-    ;;
-
-QSMPI)
-    export FOAM_MPI=qsmpi
-    export MPI_ARCH_PATH=/usr/lib/mpi
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-    _foamAddLib     $MPI_ARCH_PATH/lib
-    ;;
-
-SGIMPI)
-    # No trailing slash
-    [ "${MPI_ROOT%/}" = "${MPI_ROOT}" ] || MPI_ROOT="${MPI_ROOT%/}"
-
-    export FOAM_MPI="${MPI_ROOT##*/}"
-    export MPI_ARCH_PATH=$MPI_ROOT
-
-    if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ]
-    then
-        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
-        echo "    MPI_ROOT not a valid mpt installation directory or ending" \
-             " in a '/'." 1>&2
-        echo "    Please set MPI_ROOT to the mpt installation directory." 1>&2
-        echo "    MPI_ROOT currently set to '$MPI_ROOT'" 1>&2
-    fi
-
-    if [ "$FOAM_VERBOSE" -a "$PS1" ]
-    then
-        echo "Using SGI MPT:" 1>&2
-        echo "    MPI_ROOT : $MPI_ROOT" 1>&2
-        echo "    FOAM_MPI : $FOAM_MPI" 1>&2
-    fi
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-    _foamAddLib     $MPI_ARCH_PATH/lib
-    ;;
-
-INTELMPI)
-    # No trailing slash
-    [ "${MPI_ROOT%/}" = "${MPI_ROOT}" ] || MPI_ROOT="${MPI_ROOT%/}"
-
-    export FOAM_MPI="${MPI_ROOT##*/}"
-    export MPI_ARCH_PATH=$MPI_ROOT
-
-    if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ]
-    then
-        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
-        echo "    MPI_ROOT not a valid mpt installation directory or ending" \
-             " in a '/'." 1>&2
-        echo "    Please set MPI_ROOT to the mpt installation directory." 1>&2
-        echo "    MPI_ROOT currently set to '$MPI_ROOT'" 1>&2
-    fi
-
-    if [ "$FOAM_VERBOSE" -a "$PS1" ]
-    then
-        echo "Using INTEL MPI:" 1>&2
-        echo "    MPI_ROOT : $MPI_ROOT" 1>&2
-        echo "    FOAM_MPI : $FOAM_MPI" 1>&2
-    fi
-
-    _foamAddPath    $MPI_ARCH_PATH/bin64
-    _foamAddLib     $MPI_ARCH_PATH/lib64
-    ;;
-*)
-    export FOAM_MPI=dummy
-    ;;
-esac
-
-# Add (non-dummy) MPI implementation
-# Dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
-if [ "$FOAM_MPI" != dummy ]
-then
-    _foamAddLib $FOAM_LIBBIN/$FOAM_MPI:$FOAM_EXT_LIBBIN/$FOAM_MPI
-fi
-
-
-
-# Set the minimum MPI buffer size (used by all platforms except SGI MPI)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-: ${minBufferSize:=20000000}
-
-if [ "${MPI_BUFFER_SIZE:=$minBufferSize}" -lt $minBufferSize ]
-then
-    MPI_BUFFER_SIZE=$minBufferSize
-fi
-export MPI_BUFFER_SIZE
-
-
 # Cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
 #keep _foamAddPath _foamAddLib _foamAddMan
diff --git a/etc/cshrc b/etc/cshrc
index 39ee93d9a7..80c32cfa2b 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -207,6 +207,7 @@ _foamSource $WM_PROJECT_DIR/etc/config.csh/aliases
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/mpi`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/paraview`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/ensight`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/CGAL`

From 177d3ecfe7c531117abdb98c7f32cf8ad692131a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 20:47:51 +0000
Subject: [PATCH 179/447] Update docs

---
 etc/config.sh/CGAL       | 2 +-
 etc/config.sh/ensight    | 2 +-
 etc/config.sh/gperftools | 2 +-
 etc/config.sh/metis      | 2 +-
 etc/config.sh/paraview   | 2 +-
 etc/config.sh/scotch     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index 221fa4bba2..1d8949ba0c 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config.sh/CGAL
+#     etc/config.sh/CGAL
 #
 # Description
 #     Setup file for CGAL (& boost) include/libraries.
diff --git a/etc/config.sh/ensight b/etc/config.sh/ensight
index e0aa567384..2ee772e77a 100644
--- a/etc/config.sh/ensight
+++ b/etc/config.sh/ensight
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config.sh/ensight
+#     etc/config.sh/ensight
 #
 # Description
 #     Setup file for Ensight
diff --git a/etc/config.sh/gperftools b/etc/config.sh/gperftools
index e096eb0762..8a33c082da 100644
--- a/etc/config.sh/gperftools
+++ b/etc/config.sh/gperftools
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config.sh/gperftools
+#     etc/config.sh/gperftools
 #
 # Description
 #     Setup file for gperftools binaries libraries.
diff --git a/etc/config.sh/metis b/etc/config.sh/metis
index f912611a3a..39e3d57602 100644
--- a/etc/config.sh/metis
+++ b/etc/config.sh/metis
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config.sh/metis
+#     etc/config.sh/metis
 #
 # Description
 #     Setup file for metis include/libraries.
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 1f23bb61ae..67ae5e8c45 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config.sh/paraview
+#     etc/config.sh/paraview
 #
 # Description
 #     Setup file for paraview-[3-5].x
diff --git a/etc/config.sh/scotch b/etc/config.sh/scotch
index a52c58e59d..beb4dd1f2e 100644
--- a/etc/config.sh/scotch
+++ b/etc/config.sh/scotch
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     config.sh/scotch
+#     etc/config.sh/scotch
 #
 # Description
 #     Setup file for scotch include/libraries.

From 629508a85ad8ef1eaf8e0271b755e31e456e778f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 20:49:04 +0000
Subject: [PATCH 180/447] etc/README.org: Added mpi

---
 etc/README.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/README.org b/etc/README.org
index 139918db97..60029da36a 100644
--- a/etc/README.org
+++ b/etc/README.org
@@ -6,6 +6,7 @@
   + =settings=: core settings
   + =aliases=: aliases for interactive shells
   + =unset=: sourced to clear as many OpenFOAM environment settings as possible
+  + =mpi=: MPI communications library settings
   + =ensight=: application settings for EnSight
   + =paraview=: application settings for ParaView
   + =scotch=: application settings for compiling against scotch

From 69b59b65867cedebd629775b1ee9b11b11bf228f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 21:12:49 +0000
Subject: [PATCH 181/447] Renamed PV4Readers -> PVReaders to avoid confusion
 when compiling the reader for ParaView-5

---
 .../PV4FoamReader/vtkPV4Foam/Make/files       |  11 --
 .../vtkPV4blockMesh/Make/files                |   5 -
 .../PV4Readers/vtkPV4Readers/Make/files       |   3 -
 .../{PV4Readers => PVReaders}/Allwclean       |   6 +-
 .../{PV4Readers => PVReaders}/Allwmake        |   8 +-
 .../PVFoamReader}/Allwclean                   |   6 +-
 .../PVFoamReader}/Allwmake                    |   4 +-
 .../PVFoamReader/PVFoamReader}/CMakeLists.txt |  20 ++--
 .../PVFoamReader/PVFoamReader.qrc}            |   2 +-
 .../PVFoamReader/PVFoamReader.xml}            |   2 +-
 .../PVFoamReader}/PVFoamReader_SM.xml         |   4 +-
 .../PVFoamReader/pqPVFoamReaderPanel.cxx}     |  24 ++---
 .../PVFoamReader/pqPVFoamReaderPanel.h}       |  20 ++--
 .../PVFoamReader/vtkPVFoamReader.cxx}         | 102 +++++++++---------
 .../PVFoamReader/vtkPVFoamReader.h}           |  32 +++---
 .../PVFoamReader/vtkPVFoam/Make/files         |  11 ++
 .../PVFoamReader/vtkPVFoam}/Make/options      |   6 +-
 .../vtkPVFoam}/vtkOpenFOAMPoints.H            |   4 +-
 .../vtkPVFoam}/vtkOpenFOAMTupleRemap.H        |   4 +-
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.C}       |  62 +++++------
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.H}       |  70 ++++++------
 .../vtkPVFoam/vtkPVFoamAddToSelection.H}      |   8 +-
 .../vtkPVFoam/vtkPVFoamFaceField.H}           |  10 +-
 .../PVFoamReader/vtkPVFoam/vtkPVFoamFields.C} |  30 +++---
 .../vtkPVFoam/vtkPVFoamLagrangianFields.H}    |  12 +--
 .../PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C}   |  60 +++++------
 .../vtkPVFoam/vtkPVFoamMeshLagrangian.C}      |  10 +-
 .../vtkPVFoam/vtkPVFoamMeshSet.C}             |  16 +--
 .../vtkPVFoam/vtkPVFoamMeshVolume.C}          |  10 +-
 .../vtkPVFoam/vtkPVFoamMeshZone.C}            |  10 +-
 .../vtkPVFoam/vtkPVFoamPatchField.H}          |  12 +--
 .../vtkPVFoam/vtkPVFoamPointFields.H}         |  16 +--
 .../vtkPVFoam/vtkPVFoamTemplates.C}           |  10 +-
 .../vtkPVFoam/vtkPVFoamUpdateInfo.C}          |  50 ++++-----
 .../vtkPVFoam/vtkPVFoamUpdateInfoFields.H}    |  12 +--
 .../PVFoamReader/vtkPVFoam/vtkPVFoamUtils.C}  |  26 ++---
 .../vtkPVFoam/vtkPVFoamVolFields.H}           |  16 +--
 .../PVblockMeshReader}/Allwclean              |   6 +-
 .../PVblockMeshReader}/Allwmake               |   4 +-
 .../PVblockMeshReader}/CMakeLists.txt         |  20 ++--
 .../PVblockMeshReader/PVblockMeshReader.qrc}  |   2 +-
 .../PVblockMeshReader/PVblockMeshReader.xml}  |   2 +-
 .../PVblockMeshReader_SM.xml                  |   4 +-
 .../pqPVblockMeshReaderPanel.cxx}             |   8 +-
 .../pqPVblockMeshReaderPanel.h}               |  20 ++--
 .../vtkPVblockMeshReader.cxx}                 |  60 +++++------
 .../PVblockMeshReader/vtkPVblockMeshReader.h} |  32 +++---
 .../vtkPVblockMesh/Make/files                 |   5 +
 .../vtkPVblockMesh}/Make/options              |   6 +-
 .../vtkPVblockMesh}/vtkOpenFOAMPoints.H       |   4 +-
 .../vtkPVblockMesh/vtkPVblockMesh.C}          |  52 ++++-----
 .../vtkPVblockMesh/vtkPVblockMesh.H}          |  38 +++----
 .../vtkPVblockMesh/vtkPVblockMeshConvert.C}   |  22 ++--
 .../vtkPVblockMesh/vtkPVblockMeshUtils.C}     |  28 ++---
 .../PVReaders/vtkPVReaders/Make/files         |   3 +
 .../vtkPVReaders}/Make/options                |   0
 .../vtkPVReaders/vtkPVReaders.C}              |  24 ++---
 .../vtkPVReaders/vtkPVReaders.H}              |  18 ++--
 58 files changed, 536 insertions(+), 536 deletions(-)
 delete mode 100644 applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/files
 delete mode 100644 applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/files
 delete mode 100644 applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/files
 rename applications/utilities/postProcessing/graphics/{PV4Readers => PVReaders}/Allwclean (65%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers => PVReaders}/Allwmake (76%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader => PVReaders/PVFoamReader}/Allwclean (66%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader => PVReaders/PVFoamReader}/Allwmake (86%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/PV4FoamReader => PVReaders/PVFoamReader/PVFoamReader}/CMakeLists.txt (81%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc => PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.qrc} (65%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml => PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.xml} (80%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/PV4FoamReader => PVReaders/PVFoamReader/PVFoamReader}/PVFoamReader_SM.xml (99%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.cxx => PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.cxx} (95%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.h => PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h} (87%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.cxx => PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx} (85%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.h => PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h} (92%)
 create mode 100644 applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/files
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam => PVReaders/PVFoamReader/vtkPVFoam}/Make/options (83%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam => PVReaders/PVFoamReader/vtkPVFoam}/vtkOpenFOAMPoints.H (96%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam => PVReaders/PVFoamReader/vtkPVFoam}/vtkOpenFOAMTupleRemap.H (96%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C} (93%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H} (95%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamAddToSelection.H => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamAddToSelection.H} (91%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFaceField.H => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFaceField.H} (94%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C} (90%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamLagrangianFields.H => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamLagrangianFields.H} (92%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMesh.C => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C} (89%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshLagrangian.C => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C} (91%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshSet.C => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshSet.C} (88%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C} (98%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshZone.C => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C} (87%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPatchField.H => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPatchField.H} (93%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPointFields.H => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H} (96%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamTemplates.C => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C} (89%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C} (92%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H} (92%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUtils.C} (92%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H => PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H} (97%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader => PVReaders/PVblockMeshReader}/Allwclean (63%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader => PVReaders/PVblockMeshReader}/Allwmake (84%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/PV4blockMeshReader => PVReaders/PVblockMeshReader/PVblockMeshReader}/CMakeLists.txt (80%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader.qrc => PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.qrc} (62%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader.xml => PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.xml} (78%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/PV4blockMeshReader => PVReaders/PVblockMeshReader/PVblockMeshReader}/PVblockMeshReader_SM.xml (98%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/PV4blockMeshReader/pqPV4blockMeshReaderPanel.cxx => PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.cxx} (93%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/PV4blockMeshReader/pqPV4blockMeshReaderPanel.h => PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.h} (82%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/PV4blockMeshReader/vtkPV4blockMeshReader.cxx => PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx} (83%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/PV4blockMeshReader/vtkPV4blockMeshReader.h => PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h} (86%)
 create mode 100644 applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/files
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/vtkPV4blockMesh => PVReaders/PVblockMeshReader/vtkPVblockMesh}/Make/options (68%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/vtkPV4blockMesh => PVReaders/PVblockMeshReader/vtkPVblockMesh}/vtkOpenFOAMPoints.H (95%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMesh.C => PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C} (89%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMesh.H => PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H} (92%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshConvert.C => PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C} (92%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C => PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshUtils.C} (90%)
 create mode 100644 applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/files
 rename applications/utilities/postProcessing/graphics/{PV4Readers/vtkPV4Readers => PVReaders/vtkPVReaders}/Make/options (100%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/vtkPV4Readers/vtkPV4Readers.C => PVReaders/vtkPVReaders/vtkPVReaders.C} (92%)
 rename applications/utilities/postProcessing/graphics/{PV4Readers/vtkPV4Readers/vtkPV4Readers.H => PVReaders/vtkPVReaders/vtkPVReaders.H} (95%)

diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/files b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/files
deleted file mode 100644
index 548c4b8a93..0000000000
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/files
+++ /dev/null
@@ -1,11 +0,0 @@
-vtkPV4Foam.C
-vtkPV4FoamFields.C
-vtkPV4FoamMesh.C
-vtkPV4FoamMeshLagrangian.C
-vtkPV4FoamMeshSet.C
-vtkPV4FoamMeshVolume.C
-vtkPV4FoamMeshZone.C
-vtkPV4FoamUpdateInfo.C
-vtkPV4FoamUtils.C
-
-LIB = $(FOAM_LIBBIN)/libvtkPV4Foam
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/files b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/files
deleted file mode 100644
index 510637fa3f..0000000000
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/files
+++ /dev/null
@@ -1,5 +0,0 @@
-vtkPV4blockMesh.C
-vtkPV4blockMeshConvert.C
-vtkPV4blockMeshUtils.C
-
-LIB = $(FOAM_LIBBIN)/libvtkPV4blockMesh
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/files b/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/files
deleted file mode 100644
index 39feee713d..0000000000
--- a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-vtkPV4Readers.C
-
-LIB = $(FOAM_LIBBIN)/libvtkPV4Readers
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
similarity index 65%
rename from applications/utilities/postProcessing/graphics/PV4Readers/Allwclean
rename to applications/utilities/postProcessing/graphics/PVReaders/Allwclean
index 524a715f44..ac21c736e2 100755
--- a/applications/utilities/postProcessing/graphics/PV4Readers/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
@@ -2,8 +2,8 @@
 cd ${0%/*} || exit 1    # Run from this directory
 set -x
 
-wclean libso vtkPV4Readers
-PV4blockMeshReader/Allwclean
-PV4FoamReader/Allwclean
+wclean libso vtkPVReaders
+PVblockMeshReader/Allwclean
+PVFoamReader/Allwclean
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
similarity index 76%
rename from applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
rename to applications/utilities/postProcessing/graphics/PVReaders/Allwmake
index 135dd56a18..6108a18d81 100755
--- a/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
@@ -14,15 +14,15 @@ case "$ParaView_VERSION" in
         # ensure CMake gets the correct C++ compiler
         [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
 
-        wmake libso vtkPV4Readers
-        PV4blockMeshReader/Allwmake
-        PV4FoamReader/Allwmake
+        wmake libso vtkPVReaders
+        PVblockMeshReader/Allwmake
+        PVFoamReader/Allwmake
     else
         echo "ERROR: ParaView not found in $ParaView_DIR"
     fi
     ;;
 *)
-    echo "WARN: PV4 readers not building: ParaView_VERSION=$ParaView_VERSION"
+    echo "WARN: PV readers not building: ParaView_VERSION=$ParaView_VERSION"
     ;;
 esac
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
similarity index 66%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwclean
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
index b6ef33f863..abe861cba0 100755
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
@@ -3,9 +3,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 set -x
 
 # deal with client/server vs combined plugins
-rm -f $FOAM_LIBBIN/libPV4FoamReader* 2>/dev/null
+rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null
 
-rm -rf PV4FoamReader/Make
-wclean libso vtkPV4Foam
+rm -rf PVFoamReader/Make
+wclean libso vtkPVFoam
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
similarity index 86%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwmake
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
index 0728cf9f6a..aff103a023 100755
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
@@ -4,9 +4,9 @@ set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    wmake libso vtkPV4Foam
+    wmake libso vtkPVFoam
     (
-        cd PV4FoamReader
+        cd PVFoamReader
         mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
         cd Make/$WM_OPTIONS
         cmake ../..
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt
similarity index 81%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt
index d5a6c168b3..fbaedcfb30 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt
@@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES(
     $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude
     $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude
     $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude
-    ${PROJECT_SOURCE_DIR}/../vtkPV4Foam
+    ${PROJECT_SOURCE_DIR}/../vtkPVFoam
 )
 
 ADD_DEFINITIONS(
@@ -43,11 +43,11 @@ SET(
 #
 
 # Extend the auto-generated panel
-QT4_WRAP_CPP(MOC_SRCS pqPV4FoamReaderPanel.h)
+QT4_WRAP_CPP(MOC_SRCS pqPVFoamReaderPanel.h)
 
 ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
-  CLASS_NAME pqPV4FoamReaderPanel
-  XML_NAME  PV4FoamReader  # name of SourceProxy in *SM.xml
+  CLASS_NAME pqPVFoamReaderPanel
+  XML_NAME  PVFoamReader  # name of SourceProxy in *SM.xml
   XML_GROUP sources
 )
 
@@ -55,19 +55,19 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
     ADD_PARAVIEW_PLUGIN(
         PVFoamReader_SM "1.0"
         SERVER_MANAGER_XML PVFoamReader_SM.xml
-        SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
+        SERVER_MANAGER_SOURCES vtkPVFoamReader.cxx
         GUI_INTERFACES ${IFACES}
-        GUI_SOURCES pqPV4FoamReaderPanel.cxx
+        GUI_SOURCES pqPVFoamReaderPanel.cxx
             ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
-        GUI_RESOURCE_FILES PV4FoamReader.xml
+        GUI_RESOURCE_FILES PVFoamReader.xml
     )
 ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
     ADD_PARAVIEW_PLUGIN(
         PVFoamReader_SM "1.0"
         SERVER_MANAGER_XML PVFoamReader_SM.xml
-        SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
+        SERVER_MANAGER_SOURCES vtkPVFoamReader.cxx
         GUI_INTERFACES ${IFACES}
-        GUI_SOURCES pqPV4FoamReaderPanel.cxx
+        GUI_SOURCES pqPVFoamReaderPanel.cxx
             ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
     )
 ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
@@ -77,7 +77,7 @@ TARGET_LINK_LIBRARIES(
     LINK_PUBLIC
     OpenFOAM
     finiteVolume
-    vtkPV4Foam
+    vtkPVFoam
 )
 
 #-----------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.qrc
similarity index 65%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.qrc
index c5bfc27b71..9bb30ea5c0 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/ParaViewResources" >
-        <file>PV4FoamReader.xml</file>
+        <file>PVFoamReader.xml</file>
     </qresource>
 </RCC>
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.xml
similarity index 80%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.xml
index bb940768de..aef46449b3 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.xml
@@ -1,5 +1,5 @@
 <ParaViewReaders>
-  <Reader name="PV4FoamReader"
+  <Reader name="PVFoamReader"
           extensions="OpenFOAM"
           file_description="OpenFOAM Reader">
   </Reader>
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PVFoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml
similarity index 99%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PVFoamReader_SM.xml
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml
index c0e92cfb77..69bcfc0962 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PVFoamReader_SM.xml
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml
@@ -1,8 +1,8 @@
 <ServerManagerConfiguration>
   <ProxyGroup name="sources">
   <SourceProxy
-    name="PV4FoamReader"
-    class="vtkPV4FoamReader">
+    name="PVFoamReader"
+    class="vtkPVFoamReader">
 
     <!-- File name - compulsory -->
     <StringVectorProperty
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.cxx
similarity index 95%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.cxx
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.cxx
index 775ed90c38..521068d409 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.cxx
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "pqPV4FoamReaderPanel.h"
+#include "pqPVFoamReaderPanel.h"
 
 // QT
 #include <QGridLayout>
@@ -50,7 +50,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-pqPV4FoamReaderPanel::pqPV4FoamReaderPanel
+pqPVFoamReaderPanel::pqPVFoamReaderPanel
 (
     pqProxy *proxy,
     QWidget *p
@@ -356,7 +356,7 @@ pqPV4FoamReaderPanel::pqPV4FoamReaderPanel
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void pqPV4FoamReaderPanel::CacheMeshToggled()
+void pqPVFoamReaderPanel::CacheMeshToggled()
 {
     vtkSMIntVectorProperty::SafeDownCast
     (
@@ -365,7 +365,7 @@ void pqPV4FoamReaderPanel::CacheMeshToggled()
 }
 
 
-void pqPV4FoamReaderPanel::RefreshPressed()
+void pqPVFoamReaderPanel::RefreshPressed()
 {
     // update everything
     vtkSMIntVectorProperty::SafeDownCast
@@ -380,7 +380,7 @@ void pqPV4FoamReaderPanel::RefreshPressed()
 }
 
 
-void pqPV4FoamReaderPanel::ZeroTimeToggled()
+void pqPVFoamReaderPanel::ZeroTimeToggled()
 {
     vtkSMIntVectorProperty::SafeDownCast
     (
@@ -391,7 +391,7 @@ void pqPV4FoamReaderPanel::ZeroTimeToggled()
 }
 
 
-void pqPV4FoamReaderPanel::ShowPatchNamesToggled()
+void pqPVFoamReaderPanel::ShowPatchNamesToggled()
 {
     vtkSMIntVectorProperty::SafeDownCast
     (
@@ -408,7 +408,7 @@ void pqPV4FoamReaderPanel::ShowPatchNamesToggled()
 }
 
 
-void pqPV4FoamReaderPanel::ShowGroupsOnlyToggled()
+void pqPVFoamReaderPanel::ShowGroupsOnlyToggled()
 {
     vtkSMProperty* prop;
 
@@ -424,7 +424,7 @@ void pqPV4FoamReaderPanel::ShowGroupsOnlyToggled()
 }
 
 
-void pqPV4FoamReaderPanel::IncludeSetsToggled()
+void pqPVFoamReaderPanel::IncludeSetsToggled()
 {
     vtkSMProperty* prop;
 
@@ -440,7 +440,7 @@ void pqPV4FoamReaderPanel::IncludeSetsToggled()
 }
 
 
-void pqPV4FoamReaderPanel::IncludeZonesToggled()
+void pqPVFoamReaderPanel::IncludeZonesToggled()
 {
     vtkSMProperty* prop;
 
@@ -456,7 +456,7 @@ void pqPV4FoamReaderPanel::IncludeZonesToggled()
 }
 
 
-void pqPV4FoamReaderPanel::ExtrapolatePatchesToggled()
+void pqPVFoamReaderPanel::ExtrapolatePatchesToggled()
 {
     vtkSMProperty* prop;
 
@@ -469,7 +469,7 @@ void pqPV4FoamReaderPanel::ExtrapolatePatchesToggled()
 }
 
 
-void pqPV4FoamReaderPanel::InterpolateVolFieldsToggled()
+void pqPVFoamReaderPanel::InterpolateVolFieldsToggled()
 {
     vtkSMProperty* prop;
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h
similarity index 87%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.h
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h
index 3f641e271d..2bdeaa6028 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    pqPV4FoamReaderPanel
+    pqPVFoamReaderPanel
 
 Description
     GUI modifications for the ParaView reader panel
 
-    A custom panel for the PV4FoamReader.
+    A custom panel for the PVFoamReader.
 
 SourceFiles
-    pqPV4FoamReaderPanel.cxx
+    pqPVFoamReaderPanel.cxx
 
 \*---------------------------------------------------------------------------*/
-#ifndef pqPV4FoamReaderPanel_h
-#define pqPV4FoamReaderPanel_h
+#ifndef pqPVFoamReaderPanel_h
+#define pqPVFoamReaderPanel_h
 
 
 #include "pqAutoGeneratedObjectPanel.h"
@@ -51,10 +51,10 @@ class vtkSMSourceProxy;
 
 
 /*---------------------------------------------------------------------------*\
-                  Class pqPV4FoamReaderPanel Declaration
+                  Class pqPVFoamReaderPanel Declaration
 \*---------------------------------------------------------------------------*/
 
-class pqPV4FoamReaderPanel
+class pqPVFoamReaderPanel
 :
     public pqAutoGeneratedObjectPanel
 {
@@ -105,11 +105,11 @@ public:
     // Constructors
 
         //- Construct from components
-        pqPV4FoamReaderPanel(pqProxy*, QWidget*);
+        pqPVFoamReaderPanel(pqProxy*, QWidget*);
 
 
     //- Destructor
-    // virtual ~pqPV4FoamReaderPanel();
+    // virtual ~pqPVFoamReaderPanel();
 };
 
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
similarity index 85%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.cxx
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
index 176895b668..0398421065 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
-#include "vtkPV4FoamReader.h"
+#include "vtkPVFoamReader.h"
 
 #include "pqApplicationCore.h"
 #include "pqRenderView.h"
@@ -40,18 +40,18 @@ License
 #include "vtkStringArray.h"
 
 // OpenFOAM includes
-#include "vtkPV4Foam.H"
+#include "vtkPVFoam.H"
 
 #undef EXPERIMENTAL_TIME_CACHING
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-vtkStandardNewMacro(vtkPV4FoamReader);
+vtkStandardNewMacro(vtkPVFoamReader);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-vtkPV4FoamReader::vtkPV4FoamReader()
+vtkPVFoamReader::vtkPVFoamReader()
 {
     Debug = 0;
     vtkDebugMacro(<<"Constructor");
@@ -63,7 +63,7 @@ vtkPV4FoamReader::vtkPV4FoamReader()
 
     output0_  = NULL;
 
-#ifdef VTKPV4FOAM_DUALPORT
+#ifdef VTKPVFOAM_DUALPORT
     // Add second output for the Lagrangian
     this->SetNumberOfOutputPorts(2);
     vtkMultiBlockDataSet *lagrangian = vtkMultiBlockDataSet::New();
@@ -100,7 +100,7 @@ vtkPV4FoamReader::vtkPV4FoamReader()
     SelectionObserver = vtkCallbackCommand::New();
     SelectionObserver->SetCallback
     (
-        &vtkPV4FoamReader::SelectionModifiedCallback
+        &vtkPVFoamReader::SelectionModifiedCallback
     );
     SelectionObserver->SetClientData(this);
 
@@ -129,7 +129,7 @@ vtkPV4FoamReader::vtkPV4FoamReader()
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-vtkPV4FoamReader::~vtkPV4FoamReader()
+vtkPVFoamReader::~vtkPVFoamReader()
 {
     vtkDebugMacro(<<"Deconstructor");
 
@@ -168,7 +168,7 @@ vtkPV4FoamReader::~vtkPV4FoamReader()
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 // Do everything except set the output info
-int vtkPV4FoamReader::RequestInformation
+int vtkPVFoamReader::RequestInformation
 (
     vtkInformation* vtkNotUsed(request),
     vtkInformationVector** vtkNotUsed(inputVector),
@@ -177,7 +177,7 @@ int vtkPV4FoamReader::RequestInformation
 {
     vtkDebugMacro(<<"RequestInformation");
 
-    if (Foam::vtkPV4Foam::debug)
+    if (Foam::vtkPVFoam::debug)
     {
         cout<<"REQUEST_INFORMATION\n";
     }
@@ -190,7 +190,7 @@ int vtkPV4FoamReader::RequestInformation
 
     int nInfo = outputVector->GetNumberOfInformationObjects();
 
-    if (Foam::vtkPV4Foam::debug)
+    if (Foam::vtkPVFoam::debug)
     {
         cout<<"RequestInformation with " << nInfo << " item(s)\n";
         for (int infoI = 0; infoI < nInfo; ++infoI)
@@ -201,7 +201,7 @@ int vtkPV4FoamReader::RequestInformation
 
     if (!foamData_)
     {
-        foamData_ = new Foam::vtkPV4Foam(FileName, this);
+        foamData_ = new Foam::vtkPVFoam(FileName, this);
     }
     else
     {
@@ -238,7 +238,7 @@ int vtkPV4FoamReader::RequestInformation
         timeRange[0] = timeSteps[0];
         timeRange[1] = timeSteps[nTimeSteps-1];
 
-        if (Foam::vtkPV4Foam::debug > 1)
+        if (Foam::vtkPVFoam::debug > 1)
         {
             cout<<"nTimeSteps " << nTimeSteps << "\n"
                 <<"timeRange " << timeRange[0] << " to " << timeRange[1]
@@ -268,7 +268,7 @@ int vtkPV4FoamReader::RequestInformation
 
 
 // Set the output info
-int vtkPV4FoamReader::RequestData
+int vtkPVFoamReader::RequestData
 (
     vtkInformation* vtkNotUsed(request),
     vtkInformationVector** vtkNotUsed(inputVector),
@@ -292,7 +292,7 @@ int vtkPV4FoamReader::RequestData
 
     int nInfo = outputVector->GetNumberOfInformationObjects();
 
-    if (Foam::vtkPV4Foam::debug)
+    if (Foam::vtkPVFoam::debug)
     {
         cout<<"RequestData with " << nInfo << " item(s)\n";
         for (int infoI = 0; infoI < nInfo; ++infoI)
@@ -310,7 +310,7 @@ int vtkPV4FoamReader::RequestData
     // taking port0 as the lead for other outputs would be nice, but fails when
     // a filter is added - we need to check everything
     // but since PREVIOUS_UPDATE_TIME_STEPS() is protected, relay the logic
-    // to the vtkPV4Foam::setTime() method
+    // to the vtkPVFoam::setTime() method
     for (int infoI = 0; infoI < nInfo; ++infoI)
     {
         vtkInformation *outInfo = outputVector->GetInformationObject(infoI);
@@ -342,7 +342,7 @@ int vtkPV4FoamReader::RequestData
         )
     );
 
-    if (Foam::vtkPV4Foam::debug)
+    if (Foam::vtkPVFoam::debug)
     {
         cout<< "update output with "
             << output->GetNumberOfBlocks() << " blocks\n";
@@ -370,7 +370,7 @@ int vtkPV4FoamReader::RequestData
         output->ShallowCopy(output0_);
     }
 
-    if (Foam::vtkPV4Foam::debug)
+    if (Foam::vtkPVFoam::debug)
     {
         if (needsUpdate)
         {
@@ -390,7 +390,7 @@ int vtkPV4FoamReader::RequestData
 
 #else
 
-#ifdef VTKPV4FOAM_DUALPORT
+#ifdef VTKPVFOAM_DUALPORT
     foamData_->Update
     (
         output,
@@ -417,13 +417,13 @@ int vtkPV4FoamReader::RequestData
 }
 
 
-void vtkPV4FoamReader::SetRefresh(int val)
+void vtkPVFoamReader::SetRefresh(int val)
 {
     Modified();
 }
 
 
-void vtkPV4FoamReader::SetIncludeSets(int val)
+void vtkPVFoamReader::SetIncludeSets(int val)
 {
     if (IncludeSets != val)
     {
@@ -436,7 +436,7 @@ void vtkPV4FoamReader::SetIncludeSets(int val)
 }
 
 
-void vtkPV4FoamReader::SetIncludeZones(int val)
+void vtkPVFoamReader::SetIncludeZones(int val)
 {
     if (IncludeZones != val)
     {
@@ -449,7 +449,7 @@ void vtkPV4FoamReader::SetIncludeZones(int val)
 }
 
 
-void vtkPV4FoamReader::SetShowPatchNames(int val)
+void vtkPVFoamReader::SetShowPatchNames(int val)
 {
     if (ShowPatchNames != val)
     {
@@ -459,7 +459,7 @@ void vtkPV4FoamReader::SetShowPatchNames(int val)
 }
 
 
-void vtkPV4FoamReader::SetShowGroupsOnly(int val)
+void vtkPVFoamReader::SetShowGroupsOnly(int val)
 {
     if (ShowGroupsOnly != val)
     {
@@ -472,7 +472,7 @@ void vtkPV4FoamReader::SetShowGroupsOnly(int val)
 }
 
 
-void vtkPV4FoamReader::updatePatchNamesView(const bool show)
+void vtkPVFoamReader::updatePatchNamesView(const bool show)
 {
     pqApplicationCore* appCore = pqApplicationCore::instance();
 
@@ -506,7 +506,7 @@ void vtkPV4FoamReader::updatePatchNamesView(const bool show)
 }
 
 
-void vtkPV4FoamReader::PrintSelf(ostream& os, vtkIndent indent)
+void vtkPVFoamReader::PrintSelf(ostream& os, vtkIndent indent)
 {
     vtkDebugMacro(<<"PrintSelf");
 
@@ -522,7 +522,7 @@ void vtkPV4FoamReader::PrintSelf(ostream& os, vtkIndent indent)
 }
 
 
-int vtkPV4FoamReader::GetTimeStep()
+int vtkPVFoamReader::GetTimeStep()
 {
     return foamData_ ? foamData_->timeIndex() : -1;
 }
@@ -531,35 +531,35 @@ int vtkPV4FoamReader::GetTimeStep()
 // ----------------------------------------------------------------------
 // Parts selection list control
 
-vtkDataArraySelection* vtkPV4FoamReader::GetPartSelection()
+vtkDataArraySelection* vtkPVFoamReader::GetPartSelection()
 {
     vtkDebugMacro(<<"GetPartSelection");
     return PartSelection;
 }
 
 
-int vtkPV4FoamReader::GetNumberOfPartArrays()
+int vtkPVFoamReader::GetNumberOfPartArrays()
 {
     vtkDebugMacro(<<"GetNumberOfPartArrays");
     return PartSelection->GetNumberOfArrays();
 }
 
 
-const char* vtkPV4FoamReader::GetPartArrayName(int index)
+const char* vtkPVFoamReader::GetPartArrayName(int index)
 {
     vtkDebugMacro(<<"GetPartArrayName");
     return PartSelection->GetArrayName(index);
 }
 
 
-int vtkPV4FoamReader::GetPartArrayStatus(const char* name)
+int vtkPVFoamReader::GetPartArrayStatus(const char* name)
 {
     vtkDebugMacro(<<"GetPartArrayStatus");
     return PartSelection->ArrayIsEnabled(name);
 }
 
 
-void vtkPV4FoamReader::SetPartArrayStatus(const char* name, int status)
+void vtkPVFoamReader::SetPartArrayStatus(const char* name, int status)
 {
     vtkDebugMacro("Set mesh part \"" << name << "\" status to: " << status);
 
@@ -577,35 +577,35 @@ void vtkPV4FoamReader::SetPartArrayStatus(const char* name, int status)
 // ----------------------------------------------------------------------
 // volField selection list control
 
-vtkDataArraySelection* vtkPV4FoamReader::GetVolFieldSelection()
+vtkDataArraySelection* vtkPVFoamReader::GetVolFieldSelection()
 {
     vtkDebugMacro(<<"GetVolFieldSelection");
     return VolFieldSelection;
 }
 
 
-int vtkPV4FoamReader::GetNumberOfVolFieldArrays()
+int vtkPVFoamReader::GetNumberOfVolFieldArrays()
 {
     vtkDebugMacro(<<"GetNumberOfVolFieldArrays");
     return VolFieldSelection->GetNumberOfArrays();
 }
 
 
-const char* vtkPV4FoamReader::GetVolFieldArrayName(int index)
+const char* vtkPVFoamReader::GetVolFieldArrayName(int index)
 {
     vtkDebugMacro(<<"GetVolFieldArrayName");
     return VolFieldSelection->GetArrayName(index);
 }
 
 
-int vtkPV4FoamReader::GetVolFieldArrayStatus(const char* name)
+int vtkPVFoamReader::GetVolFieldArrayStatus(const char* name)
 {
     vtkDebugMacro(<<"GetVolFieldArrayStatus");
     return VolFieldSelection->ArrayIsEnabled(name);
 }
 
 
-void vtkPV4FoamReader::SetVolFieldArrayStatus(const char* name, int status)
+void vtkPVFoamReader::SetVolFieldArrayStatus(const char* name, int status)
 {
     vtkDebugMacro(<<"SetVolFieldArrayStatus");
     if (status)
@@ -622,35 +622,35 @@ void vtkPV4FoamReader::SetVolFieldArrayStatus(const char* name, int status)
 // ----------------------------------------------------------------------
 // pointField selection list control
 
-vtkDataArraySelection* vtkPV4FoamReader::GetPointFieldSelection()
+vtkDataArraySelection* vtkPVFoamReader::GetPointFieldSelection()
 {
     vtkDebugMacro(<<"GetPointFieldSelection");
     return PointFieldSelection;
 }
 
 
-int vtkPV4FoamReader::GetNumberOfPointFieldArrays()
+int vtkPVFoamReader::GetNumberOfPointFieldArrays()
 {
     vtkDebugMacro(<<"GetNumberOfPointFieldArrays");
     return PointFieldSelection->GetNumberOfArrays();
 }
 
 
-const char* vtkPV4FoamReader::GetPointFieldArrayName(int index)
+const char* vtkPVFoamReader::GetPointFieldArrayName(int index)
 {
     vtkDebugMacro(<<"GetPointFieldArrayName");
     return PointFieldSelection->GetArrayName(index);
 }
 
 
-int vtkPV4FoamReader::GetPointFieldArrayStatus(const char* name)
+int vtkPVFoamReader::GetPointFieldArrayStatus(const char* name)
 {
     vtkDebugMacro(<<"GetPointFieldArrayStatus");
     return PointFieldSelection->ArrayIsEnabled(name);
 }
 
 
-void vtkPV4FoamReader::SetPointFieldArrayStatus(const char* name, int status)
+void vtkPVFoamReader::SetPointFieldArrayStatus(const char* name, int status)
 {
     vtkDebugMacro(<<"SetPointFieldArrayStatus");
     if (status)
@@ -667,35 +667,35 @@ void vtkPV4FoamReader::SetPointFieldArrayStatus(const char* name, int status)
 // ----------------------------------------------------------------------
 // lagrangianField selection list control
 
-vtkDataArraySelection* vtkPV4FoamReader::GetLagrangianFieldSelection()
+vtkDataArraySelection* vtkPVFoamReader::GetLagrangianFieldSelection()
 {
     vtkDebugMacro(<<"GetLagrangianFieldSelection");
     return LagrangianFieldSelection;
 }
 
 
-int vtkPV4FoamReader::GetNumberOfLagrangianFieldArrays()
+int vtkPVFoamReader::GetNumberOfLagrangianFieldArrays()
 {
     vtkDebugMacro(<<"GetNumberOfLagrangianFieldArrays");
     return LagrangianFieldSelection->GetNumberOfArrays();
 }
 
 
-const char* vtkPV4FoamReader::GetLagrangianFieldArrayName(int index)
+const char* vtkPVFoamReader::GetLagrangianFieldArrayName(int index)
 {
     vtkDebugMacro(<<"GetLagrangianFieldArrayName");
     return LagrangianFieldSelection->GetArrayName(index);
 }
 
 
-int vtkPV4FoamReader::GetLagrangianFieldArrayStatus(const char* name)
+int vtkPVFoamReader::GetLagrangianFieldArrayStatus(const char* name)
 {
     vtkDebugMacro(<<"GetLagrangianFieldArrayStatus");
     return LagrangianFieldSelection->ArrayIsEnabled(name);
 }
 
 
-void vtkPV4FoamReader::SetLagrangianFieldArrayStatus
+void vtkPVFoamReader::SetLagrangianFieldArrayStatus
 (
     const char* name,
     int status
@@ -715,7 +715,7 @@ void vtkPV4FoamReader::SetLagrangianFieldArrayStatus
 
 // ----------------------------------------------------------------------
 
-void vtkPV4FoamReader::SelectionModifiedCallback
+void vtkPVFoamReader::SelectionModifiedCallback
 (
     vtkObject*,
     unsigned long,
@@ -723,18 +723,18 @@ void vtkPV4FoamReader::SelectionModifiedCallback
     void*
 )
 {
-    static_cast<vtkPV4FoamReader*>(clientdata)->SelectionModified();
+    static_cast<vtkPVFoamReader*>(clientdata)->SelectionModified();
 }
 
 
-void vtkPV4FoamReader::SelectionModified()
+void vtkPVFoamReader::SelectionModified()
 {
     vtkDebugMacro(<<"SelectionModified");
     Modified();
 }
 
 
-int vtkPV4FoamReader::FillOutputPortInformation
+int vtkPVFoamReader::FillOutputPortInformation
 (
     int port,
     vtkInformation* info
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
similarity index 92%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.h
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
index 0b898e3a9c..d29b80e1ff 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,21 +22,21 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    vtkPV4FoamReader
+    vtkPVFoamReader
 
 Description
     reads a dataset in OpenFOAM format
 
-    vtkPV4blockMeshReader creates an multiblock dataset.
+    vtkPVblockMeshReader creates an multiblock dataset.
     It uses the OpenFOAM infrastructure (fvMesh, etc) to handle mesh and
     field data.
 
 SourceFiles
-    vtkPV4blockMeshReader.cxx
+    vtkPVblockMeshReader.cxx
 
 \*---------------------------------------------------------------------------*/
-#ifndef vtkPV4FoamReader_h
-#define vtkPV4FoamReader_h
+#ifndef vtkPVFoamReader_h
+#define vtkPVFoamReader_h
 
 // VTK includes
 #include "vtkMultiBlockDataSetAlgorithm.h"
@@ -50,23 +50,23 @@ class vtkCallbackCommand;
 // OpenFOAM forward declarations
 namespace Foam
 {
-    class vtkPV4Foam;
+    class vtkPVFoam;
 }
 
 
 /*---------------------------------------------------------------------------*\
-                     Class vtkPV4FoamReader Declaration
+                     Class vtkPVFoamReader Declaration
 \*---------------------------------------------------------------------------*/
 
-class vtkPV4FoamReader
+class vtkPVFoamReader
 :
     public vtkMultiBlockDataSetAlgorithm
 {
 public:
-    vtkTypeMacro(vtkPV4FoamReader, vtkMultiBlockDataSetAlgorithm);
+    vtkTypeMacro(vtkPVFoamReader, vtkMultiBlockDataSetAlgorithm);
     void PrintSelf(ostream&, vtkIndent);
 
-    static vtkPV4FoamReader* New();
+    static vtkPVFoamReader* New();
 
     // Description:
     // Get the current timestep and the timestep range.
@@ -184,10 +184,10 @@ public:
 protected:
 
     //- Construct null
-    vtkPV4FoamReader();
+    vtkPVFoamReader();
 
     //- Destructor
-    ~vtkPV4FoamReader();
+    ~vtkPVFoamReader();
 
     //- Return information about mesh, times, etc without loading anything
     virtual int RequestInformation
@@ -218,10 +218,10 @@ protected:
 private:
 
     //- Disallow default bitwise copy construct
-    vtkPV4FoamReader(const vtkPV4FoamReader&);
+    vtkPVFoamReader(const vtkPVFoamReader&);
 
     //- Disallow default bitwise assignment
-    void operator=(const vtkPV4FoamReader&);
+    void operator=(const vtkPVFoamReader&);
 
     //- Add/remove patch names to/from the view
     void updatePatchNamesView(const bool show);
@@ -251,7 +251,7 @@ private:
     vtkMultiBlockDataSet* output0_;
 
     //BTX
-    Foam::vtkPV4Foam* foamData_;
+    Foam::vtkPVFoam* foamData_;
     //ETX
 };
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/files b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/files
new file mode 100644
index 0000000000..b26829761d
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/files
@@ -0,0 +1,11 @@
+vtkPVFoam.C
+vtkPVFoamFields.C
+vtkPVFoamMesh.C
+vtkPVFoamMeshLagrangian.C
+vtkPVFoamMeshSet.C
+vtkPVFoamMeshVolume.C
+vtkPVFoamMeshZone.C
+vtkPVFoamUpdateInfo.C
+vtkPVFoamUtils.C
+
+LIB = $(FOAM_LIBBIN)/libvtkPVFoam
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options
similarity index 83%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options
index 648b1d5d3f..cb6127c483 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options
@@ -4,8 +4,8 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I../../vtkPV4Readers/lnInclude \
-    -I../PV4FoamReader \
+    -I../../vtkPVReaders/lnInclude \
+    -I../PVFoamReader \
     -I$(ParaView_INCLUDE_DIR) \
     -I$(ParaView_INCLUDE_DIR)/vtkkwiml \
     $(shell \
@@ -18,5 +18,5 @@ LIB_LIBS = \
     -lfiniteVolume \
     -lgenericPatchFields \
     -llagrangian \
-    -L$(FOAM_LIBBIN) -lvtkPV4Readers \
+    -L$(FOAM_LIBBIN) -lvtkPVReaders \
     $(GLIBS)
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMPoints.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMPoints.H
similarity index 96%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMPoints.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMPoints.H
index a41fe2730d..2a45d73b2a 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMPoints.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMPoints.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InClass
-    vtkPV4Foam
+    vtkPVFoam
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMTupleRemap.H
similarity index 96%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMTupleRemap.H
index b8358b57fe..610eac4f34 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMTupleRemap.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InClass
-    vtkPV4Foam
+    vtkPVFoam
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
similarity index 93%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index cf7170a738..2bfefc267c 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -23,8 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4Foam.H"
-#include "vtkPV4FoamReader.h"
+#include "vtkPVFoam.H"
+#include "vtkPVFoamReader.h"
 
 // OpenFOAM includes
 #include "fvMesh.H"
@@ -42,16 +42,16 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(vtkPV4Foam, 0);
+defineTypeNameAndDebug(vtkPVFoam, 0);
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-#include "vtkPV4FoamAddToSelection.H"
-#include "vtkPV4FoamUpdateInfoFields.H"
+#include "vtkPVFoamAddToSelection.H"
+#include "vtkPVFoamUpdateInfoFields.H"
 
-void Foam::vtkPV4Foam::resetCounters()
+void Foam::vtkPVFoam::resetCounters()
 {
     // Reset array range information (ids and sizes)
     arrayRangeVolume_.reset();
@@ -66,7 +66,7 @@ void Foam::vtkPV4Foam::resetCounters()
 }
 
 
-void Foam::vtkPV4Foam::reduceMemory()
+void Foam::vtkPVFoam::reduceMemory()
 {
     forAll(regionPolyDecomp_, i)
     {
@@ -91,7 +91,7 @@ void Foam::vtkPV4Foam::reduceMemory()
 }
 
 
-int Foam::vtkPV4Foam::setTime(int nRequest, const double requestTimes[])
+int Foam::vtkPVFoam::setTime(int nRequest, const double requestTimes[])
 {
     Time& runTime = dbPtr_();
 
@@ -116,7 +116,7 @@ int Foam::vtkPV4Foam::setTime(int nRequest, const double requestTimes[])
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::setTime(";
+        Info<< "<beg> Foam::vtkPVFoam::setTime(";
         for (int requestI = 0; requestI < nRequest; ++requestI)
         {
             if (requestI)
@@ -160,7 +160,7 @@ int Foam::vtkPV4Foam::setTime(int nRequest, const double requestTimes[])
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::setTime() - selectedTime="
+        Info<< "<end> Foam::vtkPVFoam::setTime() - selectedTime="
             << Times[nearestIndex].name() << " index=" << timeIndex_
             << "/" << Times.size()
             << " meshChanged=" << Switch(meshChanged_)
@@ -171,11 +171,11 @@ int Foam::vtkPV4Foam::setTime(int nRequest, const double requestTimes[])
 }
 
 
-void Foam::vtkPV4Foam::updateMeshPartsStatus()
+void Foam::vtkPVFoam::updateMeshPartsStatus()
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::updateMeshPartsStatus" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::updateMeshPartsStatus" << endl;
     }
 
     vtkDataArraySelection* selection = reader_->GetPartSelection();
@@ -212,17 +212,17 @@ void Foam::vtkPV4Foam::updateMeshPartsStatus()
     }
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::updateMeshPartsStatus" << endl;
+        Info<< "<end> Foam::vtkPVFoam::updateMeshPartsStatus" << endl;
     }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::vtkPV4Foam::vtkPV4Foam
+Foam::vtkPVFoam::vtkPVFoam
 (
     const char* const FileName,
-    vtkPV4FoamReader* reader
+    vtkPVFoamReader* reader
 )
 :
     reader_(reader),
@@ -245,7 +245,7 @@ Foam::vtkPV4Foam::vtkPV4Foam
 {
     if (debug)
     {
-        Info<< "Foam::vtkPV4Foam::vtkPV4Foam - " << FileName << endl;
+        Info<< "Foam::vtkPVFoam::vtkPVFoam - " << FileName << endl;
         printMemory();
     }
 
@@ -329,11 +329,11 @@ Foam::vtkPV4Foam::vtkPV4Foam
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::vtkPV4Foam::~vtkPV4Foam()
+Foam::vtkPVFoam::~vtkPVFoam()
 {
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::~vtkPV4Foam" << endl;
+        Info<< "<end> Foam::vtkPVFoam::~vtkPVFoam" << endl;
     }
 
     delete meshPtr_;
@@ -342,11 +342,11 @@ Foam::vtkPV4Foam::~vtkPV4Foam()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::vtkPV4Foam::updateInfo()
+void Foam::vtkPVFoam::updateInfo()
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::updateInfo"
+        Info<< "<beg> Foam::vtkPVFoam::updateInfo"
             << " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "] timeIndex="
             << timeIndex_ << endl;
     }
@@ -409,17 +409,17 @@ void Foam::vtkPV4Foam::updateInfo()
     {
         // just for debug info
         getSelectedArrayEntries(partSelection);
-        Info<< "<end> Foam::vtkPV4Foam::updateInfo" << endl;
+        Info<< "<end> Foam::vtkPVFoam::updateInfo" << endl;
     }
 
 }
 
 
-void Foam::vtkPV4Foam::updateFoamMesh()
+void Foam::vtkPVFoam::updateFoamMesh()
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::updateFoamMesh" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::updateFoamMesh" << endl;
         printMemory();
     }
 
@@ -463,13 +463,13 @@ void Foam::vtkPV4Foam::updateFoamMesh()
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::updateFoamMesh" << endl;
+        Info<< "<end> Foam::vtkPVFoam::updateFoamMesh" << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPV4Foam::Update
+void Foam::vtkPVFoam::Update
 (
     vtkMultiBlockDataSet* output,
     vtkMultiBlockDataSet* lagrangianOutput
@@ -477,7 +477,7 @@ void Foam::vtkPV4Foam::Update
 {
     if (debug)
     {
-        cout<< "<beg> Foam::vtkPV4Foam::Update - output with "
+        cout<< "<beg> Foam::vtkPVFoam::Update - output with "
             << output->GetNumberOfBlocks() << " and "
             << lagrangianOutput->GetNumberOfBlocks() << " blocks\n";
         output->Print(cout);
@@ -518,7 +518,7 @@ void Foam::vtkPV4Foam::Update
         reader_->UpdateProgress(0.7);
     }
 
-#ifdef VTKPV4FOAM_DUALPORT
+#ifdef VTKPVFOAM_DUALPORT
     // restart port1 at block=0
     blockNo = 0;
 #endif
@@ -540,7 +540,7 @@ void Foam::vtkPV4Foam::Update
 }
 
 
-void Foam::vtkPV4Foam::CleanUp()
+void Foam::vtkPVFoam::CleanUp()
 {
     // reclaim some memory
     reduceMemory();
@@ -548,7 +548,7 @@ void Foam::vtkPV4Foam::CleanUp()
 }
 
 
-double* Foam::vtkPV4Foam::findTimes(int& nTimeSteps)
+double* Foam::vtkPVFoam::findTimes(int& nTimeSteps)
 {
     int nTimes = 0;
     double* tsteps = NULL;
@@ -621,7 +621,7 @@ double* Foam::vtkPV4Foam::findTimes(int& nTimeSteps)
 }
 
 
-void Foam::vtkPV4Foam::renderPatchNames
+void Foam::vtkPVFoam::renderPatchNames
 (
     vtkRenderer* renderer,
     const bool show
@@ -819,7 +819,7 @@ void Foam::vtkPV4Foam::renderPatchNames
 }
 
 
-void Foam::vtkPV4Foam::PrintSelf(ostream& os, vtkIndent indent) const
+void Foam::vtkPVFoam::PrintSelf(ostream& os, vtkIndent indent) const
 {
     os  << indent << "Number of nodes: "
         << (meshPtr_ ? meshPtr_->nPoints() : 0) << "\n";
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
similarity index 95%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
index b177df59f6..9c154e46e9 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
@@ -22,39 +22,39 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::vtkPV4Foam
+    Foam::vtkPVFoam
 
 Description
     Provides a reader interface for OpenFOAM to VTK interaction.
 
 SourceFiles
-    vtkPV4Foam.C
-    vtkPV4Foam.H
-    vtkPV4FoamFields.C
-    vtkPV4FoamMesh.C
-    vtkPV4FoamMeshLagrangian.C
-    vtkPV4FoamTemplates.C
-    vtkPV4FoamMeshSet.C
-    vtkPV4FoamMeshVolume.C
-    vtkPV4FoamMeshZone.C
-    vtkPV4FoamFaceField.H
-    vtkPV4FoamLagrangianFields.H
-    vtkPV4FoamPatchField.H
-    vtkPV4FoamPointFields.H
-    vtkPV4FoamPoints.H
-    vtkPV4FoamUpdateInfo.C
-    vtkPV4FoamUpdateInfoFields.H
-    vtkPV4FoamUtils.C
-    vtkPV4FoamVolFields.H
-    vtkPV4FoamAddToSelection.H
+    vtkPVFoam.C
+    vtkPVFoam.H
+    vtkPVFoamFields.C
+    vtkPVFoamMesh.C
+    vtkPVFoamMeshLagrangian.C
+    vtkPVFoamTemplates.C
+    vtkPVFoamMeshSet.C
+    vtkPVFoamMeshVolume.C
+    vtkPVFoamMeshZone.C
+    vtkPVFoamFaceField.H
+    vtkPVFoamLagrangianFields.H
+    vtkPVFoamPatchField.H
+    vtkPVFoamPointFields.H
+    vtkPVFoamPoints.H
+    vtkPVFoamUpdateInfo.C
+    vtkPVFoamUpdateInfoFields.H
+    vtkPVFoamUtils.C
+    vtkPVFoamVolFields.H
+    vtkPVFoamAddToSelection.H
 
     // Needed by VTK:
     vtkDataArrayTemplateImplicit.txx
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkPV4Foam_H
-#define vtkPV4Foam_H
+#ifndef vtkPVFoam_H
+#define vtkPVFoam_H
 
 // do not include legacy strstream headers
 #ifndef  VTK_EXCLUDE_STRSTREAM_HEADERS
@@ -69,14 +69,14 @@ SourceFiles
 #include "PrimitivePatchInterpolation.H"
 #include "volPointInterpolation.H"
 
-#undef VTKPV4FOAM_DUALPORT
+#undef VTKPVFOAM_DUALPORT
 
 // * * * * * * * * * * * * * Forward Declarations  * * * * * * * * * * * * * //
 
 class vtkDataArraySelection;
 class vtkDataSet;
 class vtkPoints;
-class vtkPV4FoamReader;
+class vtkPVFoamReader;
 class vtkRenderer;
 class vtkTextActor;
 class vtkMultiBlockDataSet;
@@ -102,10 +102,10 @@ template<class Type> class IOField;
 template<class Type> class List;
 
 /*---------------------------------------------------------------------------*\
-                        Class vtkPV4Foam Declaration
+                        Class vtkPVFoam Declaration
 \*---------------------------------------------------------------------------*/
 
-class vtkPV4Foam
+class vtkPVFoam
 {
     // Private classes
 
@@ -246,8 +246,8 @@ class vtkPV4Foam
 
     // Private Data
 
-        //- Access to the controlling vtkPV4FoamReader
-        vtkPV4FoamReader* reader_;
+        //- Access to the controlling vtkPVFoamReader
+        vtkPVFoamReader* reader_;
 
         //- OpenFOAM time control
         autoPtr<Time> dbPtr_;
@@ -652,31 +652,31 @@ class vtkPV4Foam
 
 
         //- Disallow default bitwise copy construct
-        vtkPV4Foam(const vtkPV4Foam&);
+        vtkPVFoam(const vtkPVFoam&);
 
         //- Disallow default bitwise assignment
-        void operator=(const vtkPV4Foam&);
+        void operator=(const vtkPVFoam&);
 
 
 public:
 
     //- Static data members
 
-        ClassName("vtkPV4Foam");
+        ClassName("vtkPVFoam");
 
 
     // Constructors
 
         //- Construct from components
-        vtkPV4Foam
+        vtkPVFoam
         (
             const char* const FileName,
-            vtkPV4FoamReader* reader
+            vtkPVFoamReader* reader
         );
 
 
     //- Destructor
-    ~vtkPV4Foam();
+    ~vtkPVFoam();
 
 
     // Member Functions
@@ -731,7 +731,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "vtkPV4FoamTemplates.C"
+    #include "vtkPVFoamTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamAddToSelection.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamAddToSelection.H
similarity index 91%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamAddToSelection.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamAddToSelection.H
index 0dc9c1a463..8368b7d350 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamAddToSelection.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamAddToSelection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,8 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkPV4FoamAddToSelection_H
-#define vtkPV4FoamAddToSelection_H
+#ifndef vtkPVFoamAddToSelection_H
+#define vtkPVFoamAddToSelection_H
 
 // OpenFOAM includes
 #include "IOobjectList.H"
@@ -36,7 +36,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::label Foam::vtkPV4Foam::addToSelection
+Foam::label Foam::vtkPVFoam::addToSelection
 (
     vtkDataArraySelection *select,
     const IOobjectList& objectLst,
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFaceField.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFaceField.H
similarity index 94%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFaceField.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFaceField.H
index b1f25f116a..dae21728b0 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFaceField.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFaceField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,12 +22,12 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InClass
-    vtkPV4Foam
+    vtkPVFoam
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkPV4FoamFaceField_H
-#define vtkPV4FoamFaceField_H
+#ifndef vtkPVFoamFaceField_H
+#define vtkPVFoamFaceField_H
 
 // VTK includes
 #include "vtkCellData.h"
@@ -40,7 +40,7 @@ InClass
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::vtkPV4Foam::convertFaceField
+void Foam::vtkPVFoam::convertFaceField
 (
     const GeometricField<Type, fvPatchField, volMesh>& tf,
     vtkMultiBlockDataSet* output,
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
similarity index 90%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
index 949627089c..6f35e41aea 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
@@ -23,11 +23,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4Foam.H"
+#include "vtkPVFoam.H"
 
 // OpenFOAM includes
 #include "IOobjectList.H"
-#include "vtkPV4FoamReader.h"
+#include "vtkPVFoamReader.h"
 
 // VTK includes
 #include "vtkDataArraySelection.h"
@@ -36,12 +36,12 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-#include "vtkPV4FoamVolFields.H"
-#include "vtkPV4FoamPointFields.H"
-#include "vtkPV4FoamLagrangianFields.H"
+#include "vtkPVFoamVolFields.H"
+#include "vtkPVFoamPointFields.H"
+#include "vtkPVFoamLagrangianFields.H"
 
 
-void Foam::vtkPV4Foam::pruneObjectList
+void Foam::vtkPVFoam::pruneObjectList
 (
     IOobjectList& objects,
     const wordHashSet& selected
@@ -64,7 +64,7 @@ void Foam::vtkPV4Foam::pruneObjectList
 }
 
 
-void Foam::vtkPV4Foam::convertVolFields
+void Foam::vtkPVFoam::convertVolFields
 (
     vtkMultiBlockDataSet* output
 )
@@ -93,7 +93,7 @@ void Foam::vtkPV4Foam::convertVolFields
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertVolFields" << nl
+        Info<< "<beg> Foam::vtkPVFoam::convertVolFields" << nl
             << "converting OpenFOAM volume fields" << endl;
         forAllConstIter(IOobjectList, objects, iter)
         {
@@ -145,13 +145,13 @@ void Foam::vtkPV4Foam::convertVolFields
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertVolFields" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertVolFields" << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPV4Foam::convertPointFields
+void Foam::vtkPVFoam::convertPointFields
 (
     vtkMultiBlockDataSet* output
 )
@@ -184,7 +184,7 @@ void Foam::vtkPV4Foam::convertPointFields
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertPointFields" << nl
+        Info<< "<beg> Foam::vtkPVFoam::convertPointFields" << nl
             << "converting OpenFOAM volume fields -> point fields" << endl;
         forAllConstIter(IOobjectList, objects, iter)
         {
@@ -221,13 +221,13 @@ void Foam::vtkPV4Foam::convertPointFields
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertPointFields" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertPointFields" << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPV4Foam::convertLagrangianFields
+void Foam::vtkPVFoam::convertLagrangianFields
 (
     vtkMultiBlockDataSet* output
 )
@@ -247,7 +247,7 @@ void Foam::vtkPV4Foam::convertLagrangianFields
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertLagrangianFields" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::convertLagrangianFields" << endl;
         printMemory();
     }
 
@@ -316,7 +316,7 @@ void Foam::vtkPV4Foam::convertLagrangianFields
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertLagrangianFields" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertLagrangianFields" << endl;
         printMemory();
     }
 }
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamLagrangianFields.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamLagrangianFields.H
similarity index 92%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamLagrangianFields.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamLagrangianFields.H
index 9edea96c55..fcaff892ec 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamLagrangianFields.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamLagrangianFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,12 +22,12 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InClass
-    vtkPV4Foam
+    vtkPVFoam
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkPV4FoamLagrangianFields_H
-#define vtkPV4FoamLagrangianFields_H
+#ifndef vtkPVFoamLagrangianFields_H
+#define vtkPVFoamLagrangianFields_H
 
 #include "Cloud.H"
 
@@ -36,7 +36,7 @@ InClass
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::vtkPV4Foam::convertLagrangianFields
+void Foam::vtkPVFoam::convertLagrangianFields
 (
     const IOobjectList& objects,
     vtkMultiBlockDataSet* output,
@@ -58,7 +58,7 @@ void Foam::vtkPV4Foam::convertLagrangianFields
 
 
 template<class Type>
-void Foam::vtkPV4Foam::convertLagrangianField
+void Foam::vtkPVFoam::convertLagrangianField
 (
     const IOField<Type>& tf,
     vtkMultiBlockDataSet* output,
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
similarity index 89%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMesh.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
index 379868404c..8d1c9a7949 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,14 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4Foam.H"
+#include "vtkPVFoam.H"
 
 // OpenFOAM includes
 #include "cellSet.H"
 #include "faceSet.H"
 #include "pointSet.H"
 #include "fvMeshSubset.H"
-#include "vtkPV4FoamReader.h"
+#include "vtkPVFoamReader.h"
 #include "uindirectPrimitivePatch.H"
 
 // VTK includes
@@ -41,7 +41,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::vtkPV4Foam::convertMeshVolume
+void Foam::vtkPVFoam::convertMeshVolume
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -57,7 +57,7 @@ void Foam::vtkPV4Foam::convertMeshVolume
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertMeshVolume" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::convertMeshVolume" << endl;
         printMemory();
     }
 
@@ -95,13 +95,13 @@ void Foam::vtkPV4Foam::convertMeshVolume
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertMeshVolume" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertMeshVolume" << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPV4Foam::convertMeshLagrangian
+void Foam::vtkPVFoam::convertMeshLagrangian
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -114,7 +114,7 @@ void Foam::vtkPV4Foam::convertMeshLagrangian
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertMeshLagrangian" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::convertMeshLagrangian" << endl;
         printMemory();
     }
 
@@ -146,13 +146,13 @@ void Foam::vtkPV4Foam::convertMeshLagrangian
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertMeshLagrangian" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertMeshLagrangian" << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPV4Foam::convertMeshPatches
+void Foam::vtkPVFoam::convertMeshPatches
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -166,7 +166,7 @@ void Foam::vtkPV4Foam::convertMeshPatches
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertMeshPatches" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::convertMeshPatches" << endl;
         printMemory();
     }
 
@@ -235,13 +235,13 @@ void Foam::vtkPV4Foam::convertMeshPatches
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertMeshPatches" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertMeshPatches" << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPV4Foam::convertMeshCellZones
+void Foam::vtkPVFoam::convertMeshCellZones
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -262,7 +262,7 @@ void Foam::vtkPV4Foam::convertMeshCellZones
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertMeshCellZones" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::convertMeshCellZones" << endl;
         printMemory();
     }
 
@@ -324,13 +324,13 @@ void Foam::vtkPV4Foam::convertMeshCellZones
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertMeshCellZones" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertMeshCellZones" << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPV4Foam::convertMeshCellSets
+void Foam::vtkPVFoam::convertMeshCellSets
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -346,7 +346,7 @@ void Foam::vtkPV4Foam::convertMeshCellSets
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertMeshCellSets" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::convertMeshCellSets" << endl;
         printMemory();
     }
 
@@ -406,13 +406,13 @@ void Foam::vtkPV4Foam::convertMeshCellSets
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertMeshCellSets" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertMeshCellSets" << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPV4Foam::convertMeshFaceZones
+void Foam::vtkPVFoam::convertMeshFaceZones
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -430,7 +430,7 @@ void Foam::vtkPV4Foam::convertMeshFaceZones
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertMeshFaceZones" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::convertMeshFaceZones" << endl;
         printMemory();
     }
 
@@ -470,13 +470,13 @@ void Foam::vtkPV4Foam::convertMeshFaceZones
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertMeshFaceZones" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertMeshFaceZones" << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPV4Foam::convertMeshFaceSets
+void Foam::vtkPVFoam::convertMeshFaceSets
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -489,7 +489,7 @@ void Foam::vtkPV4Foam::convertMeshFaceSets
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertMeshFaceSets" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::convertMeshFaceSets" << endl;
         printMemory();
     }
 
@@ -527,13 +527,13 @@ void Foam::vtkPV4Foam::convertMeshFaceSets
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertMeshFaceSets" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertMeshFaceSets" << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPV4Foam::convertMeshPointZones
+void Foam::vtkPVFoam::convertMeshPointZones
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -546,7 +546,7 @@ void Foam::vtkPV4Foam::convertMeshPointZones
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertMeshPointZones" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::convertMeshPointZones" << endl;
         printMemory();
     }
 
@@ -582,14 +582,14 @@ void Foam::vtkPV4Foam::convertMeshPointZones
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertMeshPointZones" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertMeshPointZones" << endl;
         printMemory();
     }
 }
 
 
 
-void Foam::vtkPV4Foam::convertMeshPointSets
+void Foam::vtkPVFoam::convertMeshPointSets
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -602,7 +602,7 @@ void Foam::vtkPV4Foam::convertMeshPointSets
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::convertMeshPointSets" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::convertMeshPointSets" << endl;
         printMemory();
     }
 
@@ -640,7 +640,7 @@ void Foam::vtkPV4Foam::convertMeshPointSets
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::convertMeshPointSets" << endl;
+        Info<< "<end> Foam::vtkPVFoam::convertMeshPointSets" << endl;
         printMemory();
     }
 }
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshLagrangian.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
similarity index 91%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshLagrangian.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
index 9ade1f47e5..6ec0176530 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshLagrangian.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4Foam.H"
+#include "vtkPVFoam.H"
 
 // OpenFOAM includes
 #include "Cloud.H"
@@ -39,7 +39,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-vtkPolyData* Foam::vtkPV4Foam::lagrangianVTKMesh
+vtkPolyData* Foam::vtkPVFoam::lagrangianVTKMesh
 (
     const fvMesh& mesh,
     const word& cloudName
@@ -49,7 +49,7 @@ vtkPolyData* Foam::vtkPV4Foam::lagrangianVTKMesh
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::lagrangianVTKMesh - timePath "
+        Info<< "<beg> Foam::vtkPVFoam::lagrangianVTKMesh - timePath "
             << mesh.time().timePath()/cloud::prefix/cloudName << endl;
         printMemory();
     }
@@ -98,7 +98,7 @@ vtkPolyData* Foam::vtkPV4Foam::lagrangianVTKMesh
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::lagrangianVTKMesh" << endl;
+        Info<< "<end> Foam::vtkPVFoam::lagrangianVTKMesh" << endl;
         printMemory();
     }
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshSet.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshSet.C
similarity index 88%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshSet.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshSet.C
index 2d5f3bdb79..f72627367f 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshSet.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4Foam.H"
+#include "vtkPVFoam.H"
 
 // OpenFOAM includes
 #include "faceSet.H"
@@ -37,7 +37,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-vtkPolyData* Foam::vtkPV4Foam::faceSetVTKMesh
+vtkPolyData* Foam::vtkPVFoam::faceSetVTKMesh
 (
     const fvMesh& mesh,
     const faceSet& fSet
@@ -47,7 +47,7 @@ vtkPolyData* Foam::vtkPV4Foam::faceSetVTKMesh
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::faceSetVTKMesh" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::faceSetVTKMesh" << endl;
         printMemory();
     }
 
@@ -100,7 +100,7 @@ vtkPolyData* Foam::vtkPV4Foam::faceSetVTKMesh
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::faceSetVTKMesh" << endl;
+        Info<< "<end> Foam::vtkPVFoam::faceSetVTKMesh" << endl;
         printMemory();
     }
 
@@ -108,7 +108,7 @@ vtkPolyData* Foam::vtkPV4Foam::faceSetVTKMesh
 }
 
 
-vtkPolyData* Foam::vtkPV4Foam::pointSetVTKMesh
+vtkPolyData* Foam::vtkPVFoam::pointSetVTKMesh
 (
     const fvMesh& mesh,
     const pointSet& pSet
@@ -118,7 +118,7 @@ vtkPolyData* Foam::vtkPV4Foam::pointSetVTKMesh
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::pointSetVTKMesh" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::pointSetVTKMesh" << endl;
         printMemory();
     }
 
@@ -137,7 +137,7 @@ vtkPolyData* Foam::vtkPV4Foam::pointSetVTKMesh
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::pointSetVTKMesh" << endl;
+        Info<< "<end> Foam::vtkPVFoam::pointSetVTKMesh" << endl;
         printMemory();
     }
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
similarity index 98%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
index 9756316e81..c4a52dbc98 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
@@ -23,8 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4Foam.H"
-#include "vtkPV4FoamReader.h"
+#include "vtkPVFoam.H"
+#include "vtkPVFoamReader.h"
 
 // OpenFOAM includes
 #include "fvMesh.H"
@@ -39,7 +39,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-vtkUnstructuredGrid* Foam::vtkPV4Foam::volumeVTKMesh
+vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
 (
     const fvMesh& mesh,
     polyDecomp& decompInfo
@@ -56,7 +56,7 @@ vtkUnstructuredGrid* Foam::vtkPV4Foam::volumeVTKMesh
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::volumeVTKMesh" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::volumeVTKMesh" << endl;
         printMemory();
     }
 
@@ -469,7 +469,7 @@ vtkUnstructuredGrid* Foam::vtkPV4Foam::volumeVTKMesh
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::volumeVTKMesh" << endl;
+        Info<< "<end> Foam::vtkPVFoam::volumeVTKMesh" << endl;
         printMemory();
     }
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshZone.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C
similarity index 87%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshZone.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C
index 78eb386b1a..fbeaf966a0 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshZone.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4Foam.H"
+#include "vtkPVFoam.H"
 
 // OpenFOAM includes
 #include "vtkOpenFOAMPoints.H"
@@ -35,7 +35,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-vtkPolyData* Foam::vtkPV4Foam::pointZoneVTKMesh
+vtkPolyData* Foam::vtkPVFoam::pointZoneVTKMesh
 (
     const fvMesh& mesh,
     const labelList& pointLabels
@@ -45,7 +45,7 @@ vtkPolyData* Foam::vtkPV4Foam::pointZoneVTKMesh
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::pointZoneVTKMesh" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::pointZoneVTKMesh" << endl;
         printMemory();
     }
 
@@ -64,7 +64,7 @@ vtkPolyData* Foam::vtkPV4Foam::pointZoneVTKMesh
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::pointZoneVTKMesh" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::pointZoneVTKMesh" << endl;
         printMemory();
     }
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPatchField.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPatchField.H
similarity index 93%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPatchField.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPatchField.H
index 982c9d8099..0aafd18bd2 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPatchField.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,12 +22,12 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InClass
-    vtkPV4Foam
+    vtkPVFoam
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkPV4FoamPatchField_H
-#define vtkPV4FoamPatchField_H
+#ifndef vtkPVFoamPatchField_H
+#define vtkPVFoamPatchField_H
 
 // VTK includes
 #include "vtkCellData.h"
@@ -41,7 +41,7 @@ InClass
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::vtkPV4Foam::convertPatchField
+void Foam::vtkPVFoam::convertPatchField
 (
     const word& name,
     const Field<Type>& ptf,
@@ -83,7 +83,7 @@ void Foam::vtkPV4Foam::convertPatchField
 
 // as above, but with PointData()
 template<class Type>
-void Foam::vtkPV4Foam::convertPatchPointField
+void Foam::vtkPVFoam::convertPatchPointField
 (
     const word& name,
     const Field<Type>& pptf,
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPointFields.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H
similarity index 96%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPointFields.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H
index 05bc1b1bd6..2e83520e44 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPointFields.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,12 +22,12 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InClass
-    vtkPV4Foam
+    vtkPVFoam
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkPV4FoamPointFields_H
-#define vtkPV4FoamPointFields_H
+#ifndef vtkPVFoamPointFields_H
+#define vtkPVFoamPointFields_H
 
 // OpenFOAM includes
 #include "interpolatePointToCell.H"
@@ -37,7 +37,7 @@ InClass
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::vtkPV4Foam::convertPointFields
+void Foam::vtkPVFoam::convertPointFields
 (
     const fvMesh& mesh,
     const pointMesh& pMesh,
@@ -62,7 +62,7 @@ void Foam::vtkPV4Foam::convertPointFields
 
         if (debug)
         {
-            Info<< "Foam::vtkPV4Foam::convertPointFields : "
+            Info<< "Foam::vtkPVFoam::convertPointFields : "
                 << fieldName << endl;
         }
 
@@ -170,7 +170,7 @@ void Foam::vtkPV4Foam::convertPointFields
 
 
 template<class Type>
-void Foam::vtkPV4Foam::convertPointFieldBlock
+void Foam::vtkPVFoam::convertPointFieldBlock
 (
     const GeometricField<Type, pointPatchField, pointMesh>& ptf,
     vtkMultiBlockDataSet* output,
@@ -199,7 +199,7 @@ void Foam::vtkPV4Foam::convertPointFieldBlock
 
 
 template<class Type>
-void Foam::vtkPV4Foam::convertPointField
+void Foam::vtkPVFoam::convertPointField
 (
     const GeometricField<Type, pointPatchField, pointMesh>& ptf,
     const GeometricField<Type, fvPatchField, volMesh>& tf,
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
similarity index 89%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamTemplates.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
index bfdf3f5a95..6f044d42ac 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4Foam.H"
+#include "vtkPVFoam.H"
 
 // OpenFOAM includes
 #include "polyPatch.H"
@@ -38,7 +38,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class PatchType>
-vtkPolyData* Foam::vtkPV4Foam::patchVTKMesh
+vtkPolyData* Foam::vtkPVFoam::patchVTKMesh
 (
     const word& name,
     const PatchType& p
@@ -48,7 +48,7 @@ vtkPolyData* Foam::vtkPV4Foam::patchVTKMesh
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::patchVTKMesh - " << name << endl;
+        Info<< "<beg> Foam::vtkPVFoam::patchVTKMesh - " << name << endl;
         printMemory();
     }
 
@@ -88,7 +88,7 @@ vtkPolyData* Foam::vtkPV4Foam::patchVTKMesh
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::patchVTKMesh - " << name << endl;
+        Info<< "<end> Foam::vtkPVFoam::patchVTKMesh - " << name << endl;
         printMemory();
     }
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
similarity index 92%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
index 653d481d14..9761783333 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4Foam.H"
+#include "vtkPVFoam.H"
 
 // OpenFOAM includes
 #include "cellSet.H"
@@ -34,11 +34,11 @@ License
 #include "polyBoundaryMeshEntries.H"
 #include "entry.H"
 #include "Cloud.H"
-#include "vtkPV4FoamReader.h"
+#include "vtkPVFoamReader.h"
 
 // local headers
-#include "vtkPV4FoamAddToSelection.H"
-#include "vtkPV4FoamUpdateInfoFields.H"
+#include "vtkPVFoamAddToSelection.H"
+#include "vtkPVFoamUpdateInfoFields.H"
 
 // VTK includes
 #include "vtkDataArraySelection.h"
@@ -82,7 +82,7 @@ public:
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class ZoneType>
-Foam::wordList Foam::vtkPV4Foam::getZoneNames
+Foam::wordList Foam::vtkPVFoam::getZoneNames
 (
     const ZoneMesh<ZoneType, polyMesh>& zmesh
 ) const
@@ -103,7 +103,7 @@ Foam::wordList Foam::vtkPV4Foam::getZoneNames
 }
 
 
-Foam::wordList Foam::vtkPV4Foam::getZoneNames(const word& zoneType) const
+Foam::wordList Foam::vtkPVFoam::getZoneNames(const word& zoneType) const
 {
     wordList names;
 
@@ -139,14 +139,14 @@ Foam::wordList Foam::vtkPV4Foam::getZoneNames(const word& zoneType) const
 }
 
 
-void Foam::vtkPV4Foam::updateInfoInternalMesh
+void Foam::vtkPVFoam::updateInfoInternalMesh
 (
     vtkDataArraySelection* arraySelection
 )
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::updateInfoInternalMesh" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::updateInfoInternalMesh" << endl;
     }
 
     // Determine mesh parts (internalMesh, patches...)
@@ -163,19 +163,19 @@ void Foam::vtkPV4Foam::updateInfoInternalMesh
         // just for debug info
         getSelectedArrayEntries(arraySelection);
 
-        Info<< "<end> Foam::vtkPV4Foam::updateInfoInternalMesh" << endl;
+        Info<< "<end> Foam::vtkPVFoam::updateInfoInternalMesh" << endl;
     }
 }
 
 
-void Foam::vtkPV4Foam::updateInfoLagrangian
+void Foam::vtkPVFoam::updateInfoLagrangian
 (
     vtkDataArraySelection* arraySelection
 )
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::updateInfoLagrangian" << nl
+        Info<< "<beg> Foam::vtkPVFoam::updateInfoLagrangian" << nl
             << "    " << dbPtr_->timePath()/cloud::prefix << endl;
     }
 
@@ -214,12 +214,12 @@ void Foam::vtkPV4Foam::updateInfoLagrangian
         // just for debug info
         getSelectedArrayEntries(arraySelection);
 
-        Info<< "<end> Foam::vtkPV4Foam::updateInfoLagrangian" << endl;
+        Info<< "<end> Foam::vtkPVFoam::updateInfoLagrangian" << endl;
     }
 }
 
 
-void Foam::vtkPV4Foam::updateInfoPatches
+void Foam::vtkPVFoam::updateInfoPatches
 (
     vtkDataArraySelection* arraySelection,
     stringList& enabledEntries
@@ -227,7 +227,7 @@ void Foam::vtkPV4Foam::updateInfoPatches
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::updateInfoPatches"
+        Info<< "<beg> Foam::vtkPVFoam::updateInfoPatches"
             << " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "]" << endl;
     }
 
@@ -458,12 +458,12 @@ void Foam::vtkPV4Foam::updateInfoPatches
         // just for debug info
         getSelectedArrayEntries(arraySelection);
 
-        Info<< "<end> Foam::vtkPV4Foam::updateInfoPatches" << endl;
+        Info<< "<end> Foam::vtkPVFoam::updateInfoPatches" << endl;
     }
 }
 
 
-void Foam::vtkPV4Foam::updateInfoZones
+void Foam::vtkPVFoam::updateInfoZones
 (
     vtkDataArraySelection* arraySelection
 )
@@ -475,7 +475,7 @@ void Foam::vtkPV4Foam::updateInfoZones
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::updateInfoZones"
+        Info<< "<beg> Foam::vtkPVFoam::updateInfoZones"
             << " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "]" << endl;
     }
 
@@ -554,12 +554,12 @@ void Foam::vtkPV4Foam::updateInfoZones
         // just for debug info
         getSelectedArrayEntries(arraySelection);
 
-        Info<< "<end> Foam::vtkPV4Foam::updateInfoZones" << endl;
+        Info<< "<end> Foam::vtkPVFoam::updateInfoZones" << endl;
     }
 }
 
 
-void Foam::vtkPV4Foam::updateInfoSets
+void Foam::vtkPVFoam::updateInfoSets
 (
     vtkDataArraySelection* arraySelection
 )
@@ -571,7 +571,7 @@ void Foam::vtkPV4Foam::updateInfoSets
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::updateInfoSets" << endl;
+        Info<< "<beg> Foam::vtkPVFoam::updateInfoSets" << endl;
     }
 
     // Add names of sets. Search for last time directory with a sets
@@ -596,7 +596,7 @@ void Foam::vtkPV4Foam::updateInfoSets
 
     if (debug)
     {
-        Info<< "     Foam::vtkPV4Foam::updateInfoSets read "
+        Info<< "     Foam::vtkPVFoam::updateInfoSets read "
             << objects.names() << " from " << setsInstance << endl;
     }
 
@@ -630,16 +630,16 @@ void Foam::vtkPV4Foam::updateInfoSets
         // just for debug info
         getSelectedArrayEntries(arraySelection);
 
-        Info<< "<end> Foam::vtkPV4Foam::updateInfoSets" << endl;
+        Info<< "<end> Foam::vtkPVFoam::updateInfoSets" << endl;
     }
 }
 
 
-void Foam::vtkPV4Foam::updateInfoLagrangianFields()
+void Foam::vtkPVFoam::updateInfoLagrangianFields()
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::updateInfoLagrangianFields"
+        Info<< "<beg> Foam::vtkPVFoam::updateInfoLagrangianFields"
             << endl;
     }
 
@@ -715,7 +715,7 @@ void Foam::vtkPV4Foam::updateInfoLagrangianFields()
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::updateInfoLagrangianFields - "
+        Info<< "<end> Foam::vtkPVFoam::updateInfoLagrangianFields - "
             << "lagrangian objects.size() = " << objects.size() << endl;
     }
 }
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H
similarity index 92%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H
index 0c659fffdd..3fe08f1b10 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H
@@ -22,24 +22,24 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InClass
-    vtkPV4Foam
+    vtkPVFoam
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkPV4FoamUpdateInfoFields_H
-#define vtkPV4FoamUpdateInfoFields_H
+#ifndef vtkPVFoamUpdateInfoFields_H
+#define vtkPVFoamUpdateInfoFields_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<template<class> class patchType, class meshType>
-void Foam::vtkPV4Foam::updateInfoFields
+void Foam::vtkPVFoam::updateInfoFields
 (
     vtkDataArraySelection* select
 )
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4Foam::updateInfoFields <"
+        Info<< "<beg> Foam::vtkPVFoam::updateInfoFields <"
             << meshType::Mesh::typeName
             << "> [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "]"
             << endl;
@@ -104,7 +104,7 @@ void Foam::vtkPV4Foam::updateInfoFields
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4Foam::updateInfoFields" << endl;
+        Info<< "<end> Foam::vtkPVFoam::updateInfoFields" << endl;
     }
 }
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUtils.C
similarity index 92%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUtils.C
index 18573ec94f..0280afa5ae 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUtils.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,8 +26,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4Foam.H"
-#include "vtkPV4FoamReader.h"
+#include "vtkPVFoam.H"
+#include "vtkPVFoamReader.h"
 
 // OpenFOAM includes
 #include "fvMesh.H"
@@ -72,7 +72,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::vtkPV4Foam::AddToBlock
+void Foam::vtkPVFoam::AddToBlock
 (
     vtkMultiBlockDataSet* output,
     vtkDataSet* dataset,
@@ -132,7 +132,7 @@ void Foam::vtkPV4Foam::AddToBlock
 }
 
 
-vtkDataSet* Foam::vtkPV4Foam::GetDataSetFromBlock
+vtkDataSet* Foam::vtkPVFoam::GetDataSetFromBlock
 (
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
@@ -154,7 +154,7 @@ vtkDataSet* Foam::vtkPV4Foam::GetDataSetFromBlock
 
 
 // ununsed at the moment
-Foam::label Foam::vtkPV4Foam::GetNumberOfDataSets
+Foam::label Foam::vtkPVFoam::GetNumberOfDataSets
 (
     vtkMultiBlockDataSet* output,
     const arrayRange& range
@@ -173,13 +173,13 @@ Foam::label Foam::vtkPV4Foam::GetNumberOfDataSets
 }
 
 
-Foam::word Foam::vtkPV4Foam::getPartName(const int partId)
+Foam::word Foam::vtkPVFoam::getPartName(const int partId)
 {
     return getFirstWord(reader_->GetPartArrayName(partId));
 }
 
 
-Foam::wordHashSet Foam::vtkPV4Foam::getSelected
+Foam::wordHashSet Foam::vtkPVFoam::getSelected
 (
     vtkDataArraySelection* select
 )
@@ -199,7 +199,7 @@ Foam::wordHashSet Foam::vtkPV4Foam::getSelected
 }
 
 
-Foam::wordHashSet Foam::vtkPV4Foam::getSelected
+Foam::wordHashSet Foam::vtkPVFoam::getSelected
 (
     vtkDataArraySelection* select,
     const arrayRange& range
@@ -220,7 +220,7 @@ Foam::wordHashSet Foam::vtkPV4Foam::getSelected
 }
 
 
-Foam::stringList Foam::vtkPV4Foam::getSelectedArrayEntries
+Foam::stringList Foam::vtkPVFoam::getSelectedArrayEntries
 (
     vtkDataArraySelection* select
 )
@@ -259,7 +259,7 @@ Foam::stringList Foam::vtkPV4Foam::getSelectedArrayEntries
 }
 
 
-Foam::stringList Foam::vtkPV4Foam::getSelectedArrayEntries
+Foam::stringList Foam::vtkPVFoam::getSelectedArrayEntries
 (
     vtkDataArraySelection* select,
     const arrayRange& range
@@ -298,7 +298,7 @@ Foam::stringList Foam::vtkPV4Foam::getSelectedArrayEntries
 }
 
 
-void Foam::vtkPV4Foam::setSelectedArrayEntries
+void Foam::vtkPVFoam::setSelectedArrayEntries
 (
     vtkDataArraySelection* select,
     const stringList& selections
@@ -326,7 +326,7 @@ void Foam::vtkPV4Foam::setSelectedArrayEntries
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::vtkPV4Foam::printMemory()
+void Foam::vtkPVFoam::printMemory()
 {
     memInfo mem;
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H
similarity index 97%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H
index 9c836ef397..d1b4a771dc 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H
@@ -22,12 +22,12 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InClass
-    vtkPV4Foam
+    vtkPVFoam
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkPV4FoamVolFields_H
-#define vtkPV4FoamVolFields_H
+#ifndef vtkPVFoamVolFields_H
+#define vtkPVFoamVolFields_H
 
 // OpenFOAM includes
 #include "emptyFvPatchField.H"
@@ -35,15 +35,15 @@ InClass
 #include "faceSet.H"
 #include "volPointInterpolation.H"
 
-#include "vtkPV4FoamFaceField.H"
-#include "vtkPV4FoamPatchField.H"
+#include "vtkPVFoamFaceField.H"
+#include "vtkPVFoamPatchField.H"
 
 #include "vtkOpenFOAMTupleRemap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::vtkPV4Foam::convertVolFields
+void Foam::vtkPVFoam::convertVolFields
 (
     const fvMesh& mesh,
     const PtrList<PrimitivePatchInterpolation<primitivePatch>>& ppInterpList,
@@ -281,7 +281,7 @@ void Foam::vtkPV4Foam::convertVolFields
 
 
 template<class Type>
-void Foam::vtkPV4Foam::convertVolFieldBlock
+void Foam::vtkPVFoam::convertVolFieldBlock
 (
     const GeometricField<Type, fvPatchField, volMesh>& tf,
     autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
@@ -323,7 +323,7 @@ void Foam::vtkPV4Foam::convertVolFieldBlock
 
 
 template<class Type>
-void Foam::vtkPV4Foam::convertVolField
+void Foam::vtkPVFoam::convertVolField
 (
     const GeometricField<Type, fvPatchField, volMesh>& tf,
     vtkMultiBlockDataSet* output,
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
similarity index 63%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/Allwclean
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
index f735dbbe52..a4ff9d233f 100755
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
@@ -3,9 +3,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 set -x
 
 # deal with client/server vs combined plugins
-rm -f $FOAM_LIBBIN/libPV4blockMeshReader*  2>/dev/null
+rm -f $FOAM_LIBBIN/libPVblockMeshReader*  2>/dev/null
 
-rm -rf PV4blockMeshReader/Make
-wclean libso vtkPV4blockMesh
+rm -rf PVblockMeshReader/Make
+wclean libso vtkPVblockMesh
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
similarity index 84%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/Allwmake
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
index a13503094c..d0a7aa2091 100755
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
@@ -4,9 +4,9 @@ set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    wmake libso vtkPV4blockMesh
+    wmake libso vtkPVblockMesh
     (
-        cd PV4blockMeshReader
+        cd PVblockMeshReader
         mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
         cd Make/$WM_OPTIONS
         cmake ../..
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/CMakeLists.txt
similarity index 80%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/CMakeLists.txt
index 246a336fd2..2b28dafd1a 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/CMakeLists.txt
@@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES(
     $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude
     $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude
     $ENV{WM_PROJECT_DIR}/src/meshing/blockMesh/lnInclude
-    ${PROJECT_SOURCE_DIR}/../vtkPV4blockMesh
+    ${PROJECT_SOURCE_DIR}/../vtkPVblockMesh
 )
 
 ADD_DEFINITIONS(
@@ -42,11 +42,11 @@ SET(
 #
 
 # Extend the auto-generated panel
-QT4_WRAP_CPP(MOC_SRCS pqPV4blockMeshReaderPanel.h)
+QT4_WRAP_CPP(MOC_SRCS pqPVblockMeshReaderPanel.h)
 
 ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
-  CLASS_NAME pqPV4blockMeshReaderPanel
-  XML_NAME  PV4blockMeshReader # name of SourceProxy in *SM.xml
+  CLASS_NAME pqPVblockMeshReaderPanel
+  XML_NAME  PVblockMeshReader # name of SourceProxy in *SM.xml
   XML_GROUP sources
 )
 
@@ -54,19 +54,19 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
         ADD_PARAVIEW_PLUGIN(
             PVblockMeshReader_SM "1.0"
         SERVER_MANAGER_XML PVblockMeshReader_SM.xml
-        SERVER_MANAGER_SOURCES  vtkPV4blockMeshReader.cxx
+        SERVER_MANAGER_SOURCES  vtkPVblockMeshReader.cxx
         GUI_INTERFACES ${IFACES}
-        GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
+        GUI_SOURCES pqPVblockMeshReaderPanel.cxx
             ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
-        GUI_RESOURCE_FILES PV4blockMeshReader.xml
+        GUI_RESOURCE_FILES PVblockMeshReader.xml
     )
 ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
         ADD_PARAVIEW_PLUGIN(
             PVblockMeshReader_SM "1.0"
         SERVER_MANAGER_XML PVblockMeshReader_SM.xml
-        SERVER_MANAGER_SOURCES  vtkPV4blockMeshReader.cxx
+        SERVER_MANAGER_SOURCES  vtkPVblockMeshReader.cxx
         GUI_INTERFACES ${IFACES}
-        GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
+        GUI_SOURCES pqPVblockMeshReaderPanel.cxx
             ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
     )
 ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
@@ -78,7 +78,7 @@ TARGET_LINK_LIBRARIES(
     LINK_PUBLIC
     OpenFOAM
     blockMesh
-    vtkPV4blockMesh
+    vtkPVblockMesh
 )
 
 #-----------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader.qrc b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.qrc
similarity index 62%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader.qrc
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.qrc
index 5b5cc69b52..228226bd56 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader.qrc
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.qrc
@@ -1,5 +1,5 @@
 <RCC>
   <qresource prefix="/ParaViewResources" >
-      <file>PV4blockMeshReader.xml</file>
+      <file>PVblockMeshReader.xml</file>
   </qresource>
 </RCC>
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.xml
similarity index 78%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader.xml
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.xml
index 0d4b97285e..18413ee300 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader.xml
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.xml
@@ -1,5 +1,5 @@
 <ParaViewReaders>
-  <Reader name="PV4blockMeshReader"
+  <Reader name="PVblockMeshReader"
       extensions="blockMesh"
       file_description="OpenFOAM blockMesh reader">
   </Reader>
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PVblockMeshReader_SM.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader_SM.xml
similarity index 98%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PVblockMeshReader_SM.xml
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader_SM.xml
index 09f962d32f..3a80fe5136 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PVblockMeshReader_SM.xml
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader_SM.xml
@@ -1,8 +1,8 @@
 <ServerManagerConfiguration>
   <ProxyGroup name="sources">
   <SourceProxy
-    name="PV4blockMeshReader"
-    class="vtkPV4blockMeshReader">
+    name="PVblockMeshReader"
+    class="vtkPVblockMeshReader">
 
     <!-- File name - compulsory -->
     <StringVectorProperty
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/pqPV4blockMeshReaderPanel.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.cxx
similarity index 93%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/pqPV4blockMeshReaderPanel.cxx
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.cxx
index b5f10f01fd..70b1489dd0 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/pqPV4blockMeshReaderPanel.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.cxx
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "pqPV4blockMeshReaderPanel.h"
+#include "pqPVblockMeshReaderPanel.h"
 
 // QT
 #include <QGridLayout>
@@ -50,7 +50,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-pqPV4blockMeshReaderPanel::pqPV4blockMeshReaderPanel
+pqPVblockMeshReaderPanel::pqPVblockMeshReaderPanel
 (
     pqProxy *proxy,
     QWidget *p
@@ -90,7 +90,7 @@ pqPV4blockMeshReaderPanel::pqPV4blockMeshReaderPanel
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void pqPV4blockMeshReaderPanel::ShowPointNumbersToggled()
+void pqPVblockMeshReaderPanel::ShowPointNumbersToggled()
 {
     vtkSMIntVectorProperty::SafeDownCast
     (
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/pqPV4blockMeshReaderPanel.h b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.h
similarity index 82%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/pqPV4blockMeshReaderPanel.h
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.h
index 215787a00a..f6a8acf247 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/pqPV4blockMeshReaderPanel.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.h
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    pqPV4blockMeshReaderPanel
+    pqPVblockMeshReaderPanel
 
 Description
     GUI modifications for the ParaView reader panel
 
-    A custom panel for the PV4blockMeshReader.
+    A custom panel for the PVblockMeshReader.
 
 SourceFiles
-    pqPV4blockMeshReaderPanel.cxx
+    pqPVblockMeshReaderPanel.cxx
 
 \*---------------------------------------------------------------------------*/
-#ifndef pqPV4blockMeshReaderPanel_h
-#define pqPV4blockMeshReaderPanel_h
+#ifndef pqPVblockMeshReaderPanel_h
+#define pqPVblockMeshReaderPanel_h
 
 #include "pqAutoGeneratedObjectPanel.h"
 
@@ -50,10 +50,10 @@ class vtkSMSourceProxy;
 
 
 /*---------------------------------------------------------------------------*\
-                 Class pqPV4blockMeshReaderPanel Declaration
+                 Class pqPVblockMeshReaderPanel Declaration
 \*---------------------------------------------------------------------------*/
 
-class pqPV4blockMeshReaderPanel
+class pqPVblockMeshReaderPanel
 :
     public pqAutoGeneratedObjectPanel
 {
@@ -74,11 +74,11 @@ public:
     // Constructors
 
         //- Construct from components
-        pqPV4blockMeshReaderPanel(pqProxy*, QWidget*);
+        pqPVblockMeshReaderPanel(pqProxy*, QWidget*);
 
 
     //- Destructor
-    // virtual ~pqPV4blockMeshReaderPanel();
+    // virtual ~pqPVblockMeshReaderPanel();
 };
 
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/vtkPV4blockMeshReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
similarity index 83%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/vtkPV4blockMeshReader.cxx
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
index aa7667c784..b6e3769c76 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/vtkPV4blockMeshReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
-#include "vtkPV4blockMeshReader.h"
+#include "vtkPVblockMeshReader.h"
 
 #include "pqApplicationCore.h"
 #include "pqRenderView.h"
@@ -40,16 +40,16 @@ License
 #include "vtkStringArray.h"
 
 // OpenFOAM includes
-#include "vtkPV4blockMesh.H"
+#include "vtkPVblockMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-vtkStandardNewMacro(vtkPV4blockMeshReader);
+vtkStandardNewMacro(vtkPVblockMeshReader);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-vtkPV4blockMeshReader::vtkPV4blockMeshReader()
+vtkPVblockMeshReader::vtkPVblockMeshReader()
 {
     Debug = 0;
     vtkDebugMacro(<<"Constructor");
@@ -70,7 +70,7 @@ vtkPV4blockMeshReader::vtkPV4blockMeshReader()
     SelectionObserver = vtkCallbackCommand::New();
     SelectionObserver->SetCallback
     (
-        &vtkPV4blockMeshReader::SelectionModifiedCallback
+        &vtkPVblockMeshReader::SelectionModifiedCallback
     );
     SelectionObserver->SetClientData(this);
 
@@ -91,7 +91,7 @@ vtkPV4blockMeshReader::vtkPV4blockMeshReader()
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-vtkPV4blockMeshReader::~vtkPV4blockMeshReader()
+vtkPVblockMeshReader::~vtkPVblockMeshReader()
 {
     vtkDebugMacro(<<"Deconstructor");
 
@@ -118,7 +118,7 @@ vtkPV4blockMeshReader::~vtkPV4blockMeshReader()
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 // Do everything except set the output info
-int vtkPV4blockMeshReader::RequestInformation
+int vtkPVblockMeshReader::RequestInformation
 (
     vtkInformation* vtkNotUsed(request),
     vtkInformationVector** vtkNotUsed(inputVector),
@@ -127,7 +127,7 @@ int vtkPV4blockMeshReader::RequestInformation
 {
     vtkDebugMacro(<<"RequestInformation");
 
-    if (Foam::vtkPV4blockMesh::debug)
+    if (Foam::vtkPVblockMesh::debug)
     {
         cout<<"REQUEST_INFORMATION\n";
     }
@@ -140,7 +140,7 @@ int vtkPV4blockMeshReader::RequestInformation
 
     int nInfo = outputVector->GetNumberOfInformationObjects();
 
-    if (Foam::vtkPV4blockMesh::debug)
+    if (Foam::vtkPVblockMesh::debug)
     {
         cout<<"RequestInformation with " << nInfo << " item(s)\n";
         for (int infoI = 0; infoI < nInfo; ++infoI)
@@ -151,7 +151,7 @@ int vtkPV4blockMeshReader::RequestInformation
 
     if (!foamData_)
     {
-        foamData_ = new Foam::vtkPV4blockMesh(FileName, this);
+        foamData_ = new Foam::vtkPVblockMesh(FileName, this);
     }
     else
     {
@@ -175,7 +175,7 @@ int vtkPV4blockMeshReader::RequestInformation
 
 
 // Set the output info
-int vtkPV4blockMeshReader::RequestData
+int vtkPVblockMeshReader::RequestData
 (
     vtkInformation* vtkNotUsed(request),
     vtkInformationVector** vtkNotUsed(inputVector),
@@ -199,7 +199,7 @@ int vtkPV4blockMeshReader::RequestData
 
     int nInfo = outputVector->GetNumberOfInformationObjects();
 
-    if (Foam::vtkPV4blockMesh::debug)
+    if (Foam::vtkPVblockMesh::debug)
     {
         cout<<"RequestData with " << nInfo << " item(s)\n";
         for (int infoI = 0; infoI < nInfo; ++infoI)
@@ -216,7 +216,7 @@ int vtkPV4blockMeshReader::RequestData
         )
     );
 
-    if (Foam::vtkPV4blockMesh::debug)
+    if (Foam::vtkPVblockMesh::debug)
     {
         cout<< "update output with "
             << output->GetNumberOfBlocks() << " blocks\n";
@@ -234,7 +234,7 @@ int vtkPV4blockMeshReader::RequestData
 
 
 
-void vtkPV4blockMeshReader::SetShowPointNumbers(const int val)
+void vtkPVblockMeshReader::SetShowPointNumbers(const int val)
 {
     if (ShowPointNumbers != val)
     {
@@ -244,7 +244,7 @@ void vtkPV4blockMeshReader::SetShowPointNumbers(const int val)
 }
 
 
-void vtkPV4blockMeshReader::updatePointNumbersView(const bool show)
+void vtkPVblockMeshReader::updatePointNumbersView(const bool show)
 {
     pqApplicationCore* appCore = pqApplicationCore::instance();
 
@@ -277,7 +277,7 @@ void vtkPV4blockMeshReader::updatePointNumbersView(const bool show)
 }
 
 
-void vtkPV4blockMeshReader::PrintSelf(ostream& os, vtkIndent indent)
+void vtkPVblockMeshReader::PrintSelf(ostream& os, vtkIndent indent)
 {
     vtkDebugMacro(<<"PrintSelf");
 
@@ -292,35 +292,35 @@ void vtkPV4blockMeshReader::PrintSelf(ostream& os, vtkIndent indent)
 // ----------------------------------------------------------------------
 // Block selection list control
 
-vtkDataArraySelection* vtkPV4blockMeshReader::GetBlockSelection()
+vtkDataArraySelection* vtkPVblockMeshReader::GetBlockSelection()
 {
     vtkDebugMacro(<<"GetBlockSelection");
     return BlockSelection;
 }
 
 
-int vtkPV4blockMeshReader::GetNumberOfBlockArrays()
+int vtkPVblockMeshReader::GetNumberOfBlockArrays()
 {
     vtkDebugMacro(<<"GetNumberOfBlockArrays");
     return BlockSelection->GetNumberOfArrays();
 }
 
 
-const char* vtkPV4blockMeshReader::GetBlockArrayName(int index)
+const char* vtkPVblockMeshReader::GetBlockArrayName(int index)
 {
     vtkDebugMacro(<<"GetBlockArrayName");
     return BlockSelection->GetArrayName(index);
 }
 
 
-int vtkPV4blockMeshReader::GetBlockArrayStatus(const char* name)
+int vtkPVblockMeshReader::GetBlockArrayStatus(const char* name)
 {
     vtkDebugMacro(<<"GetBlockArrayStatus");
     return BlockSelection->ArrayIsEnabled(name);
 }
 
 
-void vtkPV4blockMeshReader::SetBlockArrayStatus
+void vtkPVblockMeshReader::SetBlockArrayStatus
 (
     const char* name,
     int status
@@ -341,35 +341,35 @@ void vtkPV4blockMeshReader::SetBlockArrayStatus
 // ----------------------------------------------------------------------
 // CurvedEdges selection list control
 
-vtkDataArraySelection* vtkPV4blockMeshReader::GetCurvedEdgesSelection()
+vtkDataArraySelection* vtkPVblockMeshReader::GetCurvedEdgesSelection()
 {
     vtkDebugMacro(<<"GetCurvedEdgesSelection");
     return CurvedEdgesSelection;
 }
 
 
-int vtkPV4blockMeshReader::GetNumberOfCurvedEdgesArrays()
+int vtkPVblockMeshReader::GetNumberOfCurvedEdgesArrays()
 {
     vtkDebugMacro(<<"GetNumberOfCurvedEdgesArrays");
     return CurvedEdgesSelection->GetNumberOfArrays();
 }
 
 
-const char* vtkPV4blockMeshReader::GetCurvedEdgesArrayName(int index)
+const char* vtkPVblockMeshReader::GetCurvedEdgesArrayName(int index)
 {
     vtkDebugMacro(<<"GetCurvedEdgesArrayName");
     return CurvedEdgesSelection->GetArrayName(index);
 }
 
 
-int vtkPV4blockMeshReader::GetCurvedEdgesArrayStatus(const char* name)
+int vtkPVblockMeshReader::GetCurvedEdgesArrayStatus(const char* name)
 {
     vtkDebugMacro(<<"GetCurvedEdgesArrayStatus");
     return CurvedEdgesSelection->ArrayIsEnabled(name);
 }
 
 
-void vtkPV4blockMeshReader::SetCurvedEdgesArrayStatus
+void vtkPVblockMeshReader::SetCurvedEdgesArrayStatus
 (
     const char* name,
     int status
@@ -389,7 +389,7 @@ void vtkPV4blockMeshReader::SetCurvedEdgesArrayStatus
 
 // ----------------------------------------------------------------------
 
-void vtkPV4blockMeshReader::SelectionModifiedCallback
+void vtkPVblockMeshReader::SelectionModifiedCallback
 (
     vtkObject*,
     unsigned long,
@@ -397,11 +397,11 @@ void vtkPV4blockMeshReader::SelectionModifiedCallback
     void*
 )
 {
-    static_cast<vtkPV4blockMeshReader*>(clientdata)->Modified();
+    static_cast<vtkPVblockMeshReader*>(clientdata)->Modified();
 }
 
 
-int vtkPV4blockMeshReader::FillOutputPortInformation
+int vtkPVblockMeshReader::FillOutputPortInformation
 (
     int port,
     vtkInformation* info
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/vtkPV4blockMeshReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h
similarity index 86%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/vtkPV4blockMeshReader.h
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h
index ba0deee4ff..a08c85acb4 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/vtkPV4blockMeshReader.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,21 +22,21 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    vtkPV4blockMeshReader
+    vtkPVblockMeshReader
 
 Description
     reads a dataset in OpenFOAM bockMesh format
 
-    vtkPV4blockMeshReader creates an multiblock dataset.
+    vtkPVblockMeshReader creates an multiblock dataset.
     It uses the OpenFOAM infrastructure (blockMesh).
 
 SourceFiles
-    vtkPV4blockMeshReader.cxx
+    vtkPVblockMeshReader.cxx
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkPV4blockMeshReader_h
-#define vtkPV4blockMeshReader_h
+#ifndef vtkPVblockMeshReader_h
+#define vtkPVblockMeshReader_h
 
 // VTK includes
 #include "vtkMultiBlockDataSetAlgorithm.h"
@@ -49,22 +49,22 @@ class vtkCallbackCommand;
 
 namespace Foam
 {
-    class vtkPV4blockMesh;
+    class vtkPVblockMesh;
 }
 
 /*---------------------------------------------------------------------------*\
-                   Class vtkPV4blockMeshReader Declaration
+                   Class vtkPVblockMeshReader Declaration
 \*---------------------------------------------------------------------------*/
 
-class vtkPV4blockMeshReader
+class vtkPVblockMeshReader
 :
     public vtkMultiBlockDataSetAlgorithm
 {
 public:
-    vtkTypeMacro(vtkPV4blockMeshReader, vtkMultiBlockDataSetAlgorithm);
+    vtkTypeMacro(vtkPVblockMeshReader, vtkMultiBlockDataSetAlgorithm);
     void PrintSelf(ostream&, vtkIndent);
 
-    static vtkPV4blockMeshReader* New();
+    static vtkPVblockMeshReader* New();
 
     // Description:
     // Set/Get the filename.
@@ -113,10 +113,10 @@ public:
 protected:
 
     //- Construct null
-    vtkPV4blockMeshReader();
+    vtkPVblockMeshReader();
 
     //- Destructor
-    ~vtkPV4blockMeshReader();
+    ~vtkPVblockMeshReader();
 
     //- Return information about mesh, times, etc without loading anything
     virtual int RequestInformation
@@ -146,10 +146,10 @@ protected:
 private:
 
     //- Disallow default bitwise copy construct
-    vtkPV4blockMeshReader(const vtkPV4blockMeshReader&);
+    vtkPVblockMeshReader(const vtkPVblockMeshReader&);
 
     //- Disallow default bitwise assignment
-    void operator=(const vtkPV4blockMeshReader&);
+    void operator=(const vtkPVblockMeshReader&);
 
     //- Add/remove point numbers to/from the view
     void updatePointNumbersView(const bool show);
@@ -166,7 +166,7 @@ private:
     vtkDataArraySelection* CurvedEdgesSelection;
 
     //BTX
-    Foam::vtkPV4blockMesh* foamData_;
+    Foam::vtkPVblockMesh* foamData_;
     //ETX
 };
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/files b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/files
new file mode 100644
index 0000000000..e6e4fb230e
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/files
@@ -0,0 +1,5 @@
+vtkPVblockMesh.C
+vtkPVblockMeshConvert.C
+vtkPVblockMeshUtils.C
+
+LIB = $(FOAM_LIBBIN)/libvtkPVblockMesh
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options
similarity index 68%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options
index 88fb00d0fb..ccbea978f7 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options
@@ -3,11 +3,11 @@ EXE_INC = \
     -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
     -I$(ParaView_INCLUDE_DIR) \
     -I$(ParaView_INCLUDE_DIR)/vtkkwiml \
-    -I../../vtkPV4Readers/lnInclude \
-    -I../PV4blockMeshReader
+    -I../../vtkPVReaders/lnInclude \
+    -I../PVblockMeshReader
 
 LIB_LIBS = \
     -lmeshTools \
     -lblockMesh \
-    -L$(FOAM_LIBBIN) -lvtkPV4Readers \
+    -L$(FOAM_LIBBIN) -lvtkPVReaders \
     $(GLIBS)
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkOpenFOAMPoints.H b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkOpenFOAMPoints.H
similarity index 95%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkOpenFOAMPoints.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkOpenFOAMPoints.H
index d97dfed2dc..d36406984e 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkOpenFOAMPoints.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkOpenFOAMPoints.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InClass
-    vtkPV4blockMesh
+    vtkPVblockMesh
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
similarity index 89%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMesh.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
index b9a40707e9..8737cc8f1b 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,8 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4blockMesh.H"
-#include "vtkPV4blockMeshReader.h"
+#include "vtkPVblockMesh.H"
+#include "vtkPVblockMeshReader.h"
 
 // OpenFOAM includes
 #include "blockMesh.H"
@@ -43,13 +43,13 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(vtkPV4blockMesh, 0);
+    defineTypeNameAndDebug(vtkPVblockMesh, 0);
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::vtkPV4blockMesh::resetCounters()
+void Foam::vtkPVblockMesh::resetCounters()
 {
     // Reset mesh part ids and sizes
     arrayRangeBlocks_.reset();
@@ -58,14 +58,14 @@ void Foam::vtkPV4blockMesh::resetCounters()
 }
 
 
-void Foam::vtkPV4blockMesh::updateInfoBlocks
+void Foam::vtkPVblockMesh::updateInfoBlocks
 (
     vtkDataArraySelection* arraySelection
 )
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4blockMesh::updateInfoBlocks"
+        Info<< "<beg> Foam::vtkPVblockMesh::updateInfoBlocks"
             << " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "]" << endl;
     }
 
@@ -96,19 +96,19 @@ void Foam::vtkPV4blockMesh::updateInfoBlocks
         // just for debug info
         getSelectedArrayEntries(arraySelection);
 
-        Info<< "<end> Foam::vtkPV4blockMesh::updateInfoBlocks" << endl;
+        Info<< "<end> Foam::vtkPVblockMesh::updateInfoBlocks" << endl;
     }
 }
 
 
-void Foam::vtkPV4blockMesh::updateInfoEdges
+void Foam::vtkPVblockMesh::updateInfoEdges
 (
     vtkDataArraySelection* arraySelection
 )
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4blockMesh::updateInfoEdges"
+        Info<< "<beg> Foam::vtkPVblockMesh::updateInfoEdges"
             << " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "]" << endl;
     }
 
@@ -136,17 +136,17 @@ void Foam::vtkPV4blockMesh::updateInfoEdges
         // just for debug info
         getSelectedArrayEntries(arraySelection);
 
-        Info<< "<end> Foam::vtkPV4blockMesh::updateInfoEdges" << endl;
+        Info<< "<end> Foam::vtkPVblockMesh::updateInfoEdges" << endl;
     }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::vtkPV4blockMesh::vtkPV4blockMesh
+Foam::vtkPVblockMesh::vtkPVblockMesh
 (
     const char* const FileName,
-    vtkPV4blockMeshReader* reader
+    vtkPVblockMeshReader* reader
 )
 :
     reader_(reader),
@@ -160,7 +160,7 @@ Foam::vtkPV4blockMesh::vtkPV4blockMesh
 {
     if (debug)
     {
-        Info<< "Foam::vtkPV4blockMesh::vtkPV4blockMesh - "
+        Info<< "Foam::vtkPVblockMesh::vtkPVblockMesh - "
             << FileName << endl;
     }
 
@@ -243,11 +243,11 @@ Foam::vtkPV4blockMesh::vtkPV4blockMesh
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::vtkPV4blockMesh::~vtkPV4blockMesh()
+Foam::vtkPVblockMesh::~vtkPVblockMesh()
 {
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4blockMesh::~vtkPV4blockMesh" << endl;
+        Info<< "<end> Foam::vtkPVblockMesh::~vtkPVblockMesh" << endl;
     }
 
     // Hmm. pointNumberTextActors are not getting removed
@@ -264,11 +264,11 @@ Foam::vtkPV4blockMesh::~vtkPV4blockMesh()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::vtkPV4blockMesh::updateInfo()
+void Foam::vtkPVblockMesh::updateInfo()
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4blockMesh::updateInfo"
+        Info<< "<beg> Foam::vtkPVblockMesh::updateInfo"
             << " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "] " << endl;
     }
 
@@ -314,16 +314,16 @@ void Foam::vtkPV4blockMesh::updateInfo()
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4blockMesh::updateInfo" << endl;
+        Info<< "<end> Foam::vtkPVblockMesh::updateInfo" << endl;
     }
 }
 
 
-void Foam::vtkPV4blockMesh::updateFoamMesh()
+void Foam::vtkPVblockMesh::updateFoamMesh()
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4blockMesh::updateFoamMesh" << endl;
+        Info<< "<beg> Foam::vtkPVblockMesh::updateFoamMesh" << endl;
     }
 
     // Check to see if the OpenFOAM mesh has been created
@@ -370,12 +370,12 @@ void Foam::vtkPV4blockMesh::updateFoamMesh()
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4blockMesh::updateFoamMesh" << endl;
+        Info<< "<end> Foam::vtkPVblockMesh::updateFoamMesh" << endl;
     }
 }
 
 
-void Foam::vtkPV4blockMesh::Update
+void Foam::vtkPVblockMesh::Update
 (
     vtkMultiBlockDataSet* output
 )
@@ -406,13 +406,13 @@ void Foam::vtkPV4blockMesh::Update
 }
 
 
-void Foam::vtkPV4blockMesh::CleanUp()
+void Foam::vtkPVblockMesh::CleanUp()
 {
     reader_->UpdateProgress(1.0);
 }
 
 
-void Foam::vtkPV4blockMesh::renderPointNumbers
+void Foam::vtkPVblockMesh::renderPointNumbers
 (
     vtkRenderer* renderer,
     const bool show
@@ -471,7 +471,7 @@ void Foam::vtkPV4blockMesh::renderPointNumbers
 
 
 
-void Foam::vtkPV4blockMesh::PrintSelf(ostream& os, vtkIndent indent) const
+void Foam::vtkPVblockMesh::PrintSelf(ostream& os, vtkIndent indent) const
 {
 #if 0
     os  << indent << "Number of nodes: "
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMesh.H b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
similarity index 92%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMesh.H
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
index 48b0b036df..dc502926f4 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMesh.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,24 +22,24 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::vtkPV4blockMesh
+    Foam::vtkPVblockMesh
 
 Description
     Provides a reader interface for OpenFOAM blockMesh to VTK interaction
 
 SourceFiles
-    vtkPV4blockMesh.C
-    vtkPV4blockMeshConvert.C
-    vtkPV4blockMeshUpdate.C
-    vtkPV4blockMeshUtils.C
+    vtkPVblockMesh.C
+    vtkPVblockMeshConvert.C
+    vtkPVblockMeshUpdate.C
+    vtkPVblockMeshUtils.C
 
     // Needed by VTK:
     vtkDataArrayTemplateImplicit.txx
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkPV4blockMesh_H
-#define vtkPV4blockMesh_H
+#ifndef vtkPVblockMesh_H
+#define vtkPVblockMesh_H
 
 // do not include legacy strstream headers
 #ifndef  VTK_EXCLUDE_STRSTREAM_HEADERS
@@ -58,7 +58,7 @@ SourceFiles
 class vtkDataArraySelection;
 class vtkDataSet;
 class vtkPoints;
-class vtkPV4blockMeshReader;
+class vtkPVblockMeshReader;
 class vtkRenderer;
 class vtkTextActor;
 class vtkMultiBlockDataSet;
@@ -79,10 +79,10 @@ class blockMesh;
 template<class Type> class List;
 
 /*---------------------------------------------------------------------------*\
-                     Class vtkPV4blockMesh Declaration
+                     Class vtkPVblockMesh Declaration
 \*---------------------------------------------------------------------------*/
 
-class vtkPV4blockMesh
+class vtkPVblockMesh
 {
     // Private classes
 
@@ -164,8 +164,8 @@ class vtkPV4blockMesh
 
     // Private Data
 
-        //- Access to the controlling vtkPV4blockMeshReader
-        vtkPV4blockMeshReader* reader_;
+        //- Access to the controlling vtkPVblockMeshReader
+        vtkPVblockMeshReader* reader_;
 
         //- OpenFOAM time control
         autoPtr<Time> dbPtr_;
@@ -294,31 +294,31 @@ class vtkPV4blockMesh
 
 
         //- Disallow default bitwise copy construct
-        vtkPV4blockMesh(const vtkPV4blockMesh&);
+        vtkPVblockMesh(const vtkPVblockMesh&);
 
         //- Disallow default bitwise assignment
-        void operator=(const vtkPV4blockMesh&);
+        void operator=(const vtkPVblockMesh&);
 
 
 public:
 
     //- Static data members
 
-        ClassName("vtkPV4blockMesh");
+        ClassName("vtkPVblockMesh");
 
 
     // Constructors
 
         //- Construct from components
-        vtkPV4blockMesh
+        vtkPVblockMesh
         (
             const char* const FileName,
-            vtkPV4blockMeshReader* reader
+            vtkPVblockMeshReader* reader
         );
 
 
     //- Destructor
-    ~vtkPV4blockMesh();
+    ~vtkPVblockMesh();
 
 
     // Member Functions
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshConvert.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
similarity index 92%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshConvert.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
index d0552eb96d..b723b36bca 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshConvert.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,8 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4blockMesh.H"
-#include "vtkPV4blockMeshReader.h"
+#include "vtkPVblockMesh.H"
+#include "vtkPVblockMeshReader.h"
 
 // OpenFOAM includes
 #include "blockMesh.H"
@@ -43,7 +43,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::vtkPV4blockMesh::convertMeshBlocks
+void Foam::vtkPVblockMesh::convertMeshBlocks
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -59,7 +59,7 @@ void Foam::vtkPV4blockMesh::convertMeshBlocks
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4blockMesh::convertMeshBlocks" << endl;
+        Info<< "<beg> Foam::vtkPVblockMesh::convertMeshBlocks" << endl;
     }
 
     int blockI = 0;
@@ -130,12 +130,12 @@ void Foam::vtkPV4blockMesh::convertMeshBlocks
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4blockMesh::convertMeshBlocks" << endl;
+        Info<< "<end> Foam::vtkPVblockMesh::convertMeshBlocks" << endl;
     }
 }
 
 
-void Foam::vtkPV4blockMesh::convertMeshEdges
+void Foam::vtkPVblockMesh::convertMeshEdges
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -240,13 +240,13 @@ void Foam::vtkPV4blockMesh::convertMeshEdges
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4blockMesh::convertMeshEdges" << endl;
+        Info<< "<end> Foam::vtkPVblockMesh::convertMeshEdges" << endl;
     }
 
 }
 
 
-void Foam::vtkPV4blockMesh::convertMeshCorners
+void Foam::vtkPVblockMesh::convertMeshCorners
 (
     vtkMultiBlockDataSet* output,
     int& blockNo
@@ -261,7 +261,7 @@ void Foam::vtkPV4blockMesh::convertMeshCorners
 
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4blockMesh::convertMeshCorners" << endl;
+        Info<< "<beg> Foam::vtkPVblockMesh::convertMeshCorners" << endl;
     }
 
     if (true)  // or some flag or other condition
@@ -311,7 +311,7 @@ void Foam::vtkPV4blockMesh::convertMeshCorners
 
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4blockMesh::convertMeshCorners" << endl;
+        Info<< "<end> Foam::vtkPVblockMesh::convertMeshCorners" << endl;
     }
 }
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshUtils.C
similarity index 90%
rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshUtils.C
index 7cb1073058..a838c5b602 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshUtils.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,8 +26,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4blockMesh.H"
-#include "vtkPV4blockMeshReader.h"
+#include "vtkPVblockMesh.H"
+#include "vtkPVblockMeshReader.h"
 
 // VTK includes
 #include "vtkDataArraySelection.h"
@@ -66,7 +66,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::vtkPV4blockMesh::AddToBlock
+void Foam::vtkPVblockMesh::AddToBlock
 (
     vtkMultiBlockDataSet* output,
     vtkDataSet* dataset,
@@ -126,7 +126,7 @@ void Foam::vtkPV4blockMesh::AddToBlock
 }
 
 
-vtkDataSet* Foam::vtkPV4blockMesh::GetDataSetFromBlock
+vtkDataSet* Foam::vtkPVblockMesh::GetDataSetFromBlock
 (
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
@@ -148,7 +148,7 @@ vtkDataSet* Foam::vtkPV4blockMesh::GetDataSetFromBlock
 
 
 // ununsed at the moment
-Foam::label Foam::vtkPV4blockMesh::GetNumberOfDataSets
+Foam::label Foam::vtkPVblockMesh::GetNumberOfDataSets
 (
     vtkMultiBlockDataSet* output,
     const arrayRange& range
@@ -167,7 +167,7 @@ Foam::label Foam::vtkPV4blockMesh::GetNumberOfDataSets
 }
 
 
-Foam::wordHashSet Foam::vtkPV4blockMesh::getSelected
+Foam::wordHashSet Foam::vtkPVblockMesh::getSelected
 (
     vtkDataArraySelection* select
 )
@@ -187,7 +187,7 @@ Foam::wordHashSet Foam::vtkPV4blockMesh::getSelected
 }
 
 
-Foam::wordHashSet Foam::vtkPV4blockMesh::getSelected
+Foam::wordHashSet Foam::vtkPVblockMesh::getSelected
 (
     vtkDataArraySelection* select,
     const arrayRange& range
@@ -208,7 +208,7 @@ Foam::wordHashSet Foam::vtkPV4blockMesh::getSelected
 }
 
 
-Foam::stringList Foam::vtkPV4blockMesh::getSelectedArrayEntries
+Foam::stringList Foam::vtkPVblockMesh::getSelectedArrayEntries
 (
     vtkDataArraySelection* select
 )
@@ -247,7 +247,7 @@ Foam::stringList Foam::vtkPV4blockMesh::getSelectedArrayEntries
 }
 
 
-Foam::stringList Foam::vtkPV4blockMesh::getSelectedArrayEntries
+Foam::stringList Foam::vtkPVblockMesh::getSelectedArrayEntries
 (
     vtkDataArraySelection* select,
     const arrayRange& range
@@ -286,7 +286,7 @@ Foam::stringList Foam::vtkPV4blockMesh::getSelectedArrayEntries
 }
 
 
-void Foam::vtkPV4blockMesh::setSelectedArrayEntries
+void Foam::vtkPVblockMesh::setSelectedArrayEntries
 (
     vtkDataArraySelection* select,
     const stringList& selections
@@ -312,7 +312,7 @@ void Foam::vtkPV4blockMesh::setSelectedArrayEntries
 }
 
 
-void Foam::vtkPV4blockMesh::updateBoolListStatus
+void Foam::vtkPVblockMesh::updateBoolListStatus
 (
     boolList& status,
     vtkDataArraySelection* selection
@@ -320,7 +320,7 @@ void Foam::vtkPV4blockMesh::updateBoolListStatus
 {
     if (debug)
     {
-        Info<< "<beg> Foam::vtkPV4blockMesh::updateBoolListStatus" << endl;
+        Info<< "<beg> Foam::vtkPVblockMesh::updateBoolListStatus" << endl;
     }
 
     const label nElem = selection->GetNumberOfArrays();
@@ -345,7 +345,7 @@ void Foam::vtkPV4blockMesh::updateBoolListStatus
     }
     if (debug)
     {
-        Info<< "<end> Foam::vtkPV4blockMesh::updateBoolListStatus" << endl;
+        Info<< "<end> Foam::vtkPVblockMesh::updateBoolListStatus" << endl;
     }
 }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/files b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/files
new file mode 100644
index 0000000000..e26a8c4979
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/files
@@ -0,0 +1,3 @@
+vtkPVReaders.C
+
+LIB = $(FOAM_LIBBIN)/libvtkPVReaders
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/options
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/options
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/options
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.C
similarity index 92%
rename from applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.C
index dfb9511999..2197fb7361 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "vtkPV4Readers.H"
+#include "vtkPVReaders.H"
 
 // OpenFOAM includes
 #include "IFstream.H"
@@ -41,7 +41,7 @@ Description
 
 namespace Foam
 {
-defineTypeNameAndDebug(vtkPV4Readers, 0);
+defineTypeNameAndDebug(vtkPVReaders, 0);
 }
 
 
@@ -75,7 +75,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::vtkPV4Readers::AddToBlock
+void Foam::vtkPVReaders::AddToBlock
 (
     vtkMultiBlockDataSet* output,
     vtkDataSet* dataset,
@@ -135,7 +135,7 @@ void Foam::vtkPV4Readers::AddToBlock
 }
 
 
-vtkDataSet* Foam::vtkPV4Readers::GetDataSetFromBlock
+vtkDataSet* Foam::vtkPVReaders::GetDataSetFromBlock
 (
     vtkMultiBlockDataSet* output,
     const partInfo& selector,
@@ -157,7 +157,7 @@ vtkDataSet* Foam::vtkPV4Readers::GetDataSetFromBlock
 
 
 // ununsed at the moment
-Foam::label Foam::vtkPV4Readers::GetNumberOfDataSets
+Foam::label Foam::vtkPVReaders::GetNumberOfDataSets
 (
     vtkMultiBlockDataSet* output,
     const partInfo& selector
@@ -176,13 +176,13 @@ Foam::label Foam::vtkPV4Readers::GetNumberOfDataSets
 }
 
 
-// Foam::word Foam::vtkPV4Readers::getPartName(int partId)
+// Foam::word Foam::vtkPVReaders::getPartName(int partId)
 // {
 //     return getFirstWord(reader_->GetPartArrayName(partId));
 // }
 
 
-Foam::wordHashSet Foam::vtkPV4Readers::getSelected
+Foam::wordHashSet Foam::vtkPVReaders::getSelected
 (
     vtkDataArraySelection* select
 )
@@ -202,7 +202,7 @@ Foam::wordHashSet Foam::vtkPV4Readers::getSelected
 }
 
 
-Foam::wordHashSet Foam::vtkPV4Readers::getSelected
+Foam::wordHashSet Foam::vtkPVReaders::getSelected
 (
     vtkDataArraySelection* select,
     const partInfo& selector
@@ -223,7 +223,7 @@ Foam::wordHashSet Foam::vtkPV4Readers::getSelected
 }
 
 
-Foam::stringList Foam::vtkPV4Readers::getSelectedArrayEntries
+Foam::stringList Foam::vtkPVReaders::getSelectedArrayEntries
 (
     vtkDataArraySelection* select
 )
@@ -262,7 +262,7 @@ Foam::stringList Foam::vtkPV4Readers::getSelectedArrayEntries
 }
 
 
-Foam::stringList Foam::vtkPV4Readers::getSelectedArrayEntries
+Foam::stringList Foam::vtkPVReaders::getSelectedArrayEntries
 (
     vtkDataArraySelection* select,
     const partInfo& selector
@@ -301,7 +301,7 @@ Foam::stringList Foam::vtkPV4Readers::getSelectedArrayEntries
 }
 
 
-void Foam::vtkPV4Readers::setSelectedArrayEntries
+void Foam::vtkPVReaders::setSelectedArrayEntries
 (
     vtkDataArraySelection* select,
     const stringList& selections
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.H
similarity index 95%
rename from applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.H
index 8ab4b94f2c..958668105f 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Namespace
-    Foam::vtkPV4Readers
+    Foam::vtkPVReaders
 
 Description
     A collection of helper functions when building a reader interface in
     ParaView3.
 
 SourceFiles
-    vtkPV4Readers.C
+    vtkPVReaders.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkPV4Readers_H
-#define vtkPV4Readers_H
+#ifndef vtkPVReaders_H
+#define vtkPVReaders_H
 
 // do not include legacy strstream headers
 #ifndef  VTK_EXCLUDE_STRSTREAM_HEADERS
@@ -53,7 +53,7 @@ SourceFiles
 class vtkDataArraySelection;
 class vtkDataSet;
 class vtkPoints;
-class vtkPV4FoamReader;
+class vtkPVFoamReader;
 class vtkRenderer;
 class vtkTextActor;
 class vtkMultiBlockDataSet;
@@ -66,10 +66,10 @@ class vtkIndent;
 
 namespace Foam
 {
-namespace vtkPV4Readers
+namespace vtkPVReaders
 {
     //- Declare name of the class and its debug switch
-    NamespaceName("vtkPV4Readers");
+    NamespaceName("vtkPVReaders");
 
     //- Bookkeeping for GUI checklists and the multi-block organization
     class partInfo
@@ -217,7 +217,7 @@ namespace vtkPV4Readers
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace vtkPV4
+} // End namespace vtkPV
 
 } // End namespace Foam
 

From 01d8544916b1d16b5436c452d4cefd6395b47191 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 22:44:19 +0000
Subject: [PATCH 182/447] etc/config.sh/paraview: Reset the default ParaView
 version to 4.4.0

---
 etc/config.sh/paraview | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 67ae5e8c45..16a0cbc8d1 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -55,8 +55,8 @@ done
 #export ParaView_VERSION=4.0.1
 #export ParaView_VERSION=4.1.0
 #export ParaView_VERSION=4.3.1
-#export ParaView_VERSION=4.4.0
-export ParaView_VERSION=5.0.0
+export ParaView_VERSION=4.4.0
+#export ParaView_VERSION=5.0.0
 export ParaView_MAJOR=detect
 
 

From 566512bc28eca1cd9f6e442768c76aebfb4fb4b7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 11 Feb 2016 08:48:15 +0000
Subject: [PATCH 183/447] driftFluxFoam: Set Udm BCs to type calculated

---
 .../relativeVelocityModel/relativeVelocityModel.C            | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
index be4de6b2c0..5131d63e57 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,8 +59,7 @@ Foam::relativeVelocityModel::relativeVelocityModel
             IOobject::AUTO_WRITE
         ),
         alphac_.mesh(),
-        dimensionedVector("Udm", dimVelocity, vector::zero),
-        mixture.U().boundaryField().types()
+        dimensionedVector("Udm", dimVelocity, vector::zero)
     )
 {}
 

From 6fde55cbd65db9d51d38ac52a40db1dfade78b0a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 12 Feb 2016 14:08:38 +0000
Subject: [PATCH 184/447] tmp: Added assignment to pointer operator to
 initialize null-tmp to an allocated object

This is a convenient method to set a null-constructed tmp in a
conditional statement.
---
 src/OpenFOAM/memory/tmp/tmp.H  |  7 +++--
 src/OpenFOAM/memory/tmp/tmpI.H | 48 +++++++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 7ca3a13ca2..783d06feb8 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,10 @@ public:
         //- Return const object pointer
         inline const T* operator->() const;
 
-        //- Assignment operator
+        //- Assignment to pointer changing this tmp to a temporary T
+        inline void operator=(T*);
+
+        //- Assignment transfering the temporary T to this tmp
         inline void operator=(const tmp<T>&);
 };
 
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index e289a06ca0..4f3ae9c662 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -266,6 +266,37 @@ inline const T* Foam::tmp<T>::operator->() const
 }
 
 
+template<class T>
+inline void Foam::tmp<T>::operator=(T* tPtr)
+{
+    if (isTmp_ && ptr_)
+    {
+        if (ptr_->okToDelete())
+        {
+            delete ptr_;
+            ptr_ = 0;
+        }
+        else
+        {
+            ptr_->operator--();
+        }
+    }
+
+    isTmp_ = true;
+
+    if (!tPtr)
+    {
+        FatalErrorInFunction
+            << "attempted copy of a deallocated temporary"
+            << " of type " << typeid(T).name()
+            << abort(FatalError);
+    }
+
+    ptr_ = tPtr;
+    ptr_->resetRefCount();
+}
+
+
 template<class T>
 inline void Foam::tmp<T>::operator=(const tmp<T>& t)
 {
@@ -285,24 +316,23 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
     if (t.isTmp_)
     {
         isTmp_ = true;
-        ptr_ = t.ptr_;
 
-        if (ptr_)
-        {
-            ptr_->operator++();
-        }
-        else
+        if (!t.ptr_)
         {
             FatalErrorInFunction
-                << "attempted copy of a deallocated temporary"
+                << "attempted assignment to a deallocated temporary"
                 << " of type " << typeid(T).name()
                 << abort(FatalError);
         }
+
+        ptr_ = t.ptr_;
+        t.ptr_ = 0;
+        ptr_->resetRefCount();
     }
     else
     {
         FatalErrorInFunction
-            << "attempted to assign to a const reference to constant object"
+            << "attempted assignment to a const reference to constant object"
             << " of type " << typeid(T).name()
             << abort(FatalError);
     }

From 12b30732e17f24e607094bd2cc120ad2e803c92c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 12 Feb 2016 14:11:04 +0000
Subject: [PATCH 185/447] GeometricField: Added another constructor from
 tmp<GeometricField> which supports re-using the internalField storage

---
 .../GeometricField/GeometricField.C           | 43 ++++++++++++++++++-
 .../GeometricField/GeometricField.H           | 11 +++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 4d32e95ae2..14098437e2 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -422,7 +422,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
     if (debug)
     {
         InfoInFunction
-            << "Constructing as copy" << endl << this->info() << endl;
+            << "Constructing from tmp" << endl << this->info() << endl;
     }
 
     this->writeOpt() = IOobject::NO_WRITE;
@@ -634,6 +634,47 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 }
 
 
+#ifndef NoConstructFromTmp
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
+(
+    const IOobject& io,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf,
+    const wordList& patchFieldTypes,
+    const wordList& actualPatchTypes
+)
+:
+    DimensionedField<Type, GeoMesh>
+    (
+        io,
+        const_cast<GeometricField<Type, PatchField, GeoMesh>&>(tgf()),
+        tgf.isTmp()
+    ),
+    timeIndex_(tgf().timeIndex()),
+    field0Ptr_(NULL),
+    fieldPrevIterPtr_(NULL),
+    boundaryField_
+    (
+        this->mesh().boundary(),
+        *this,
+        patchFieldTypes,
+        actualPatchTypes
+    )
+{
+    if (debug)
+    {
+        InfoInFunction
+            << "Constructing from tmp resetting IO params and patch types"
+            << endl << this->info() << endl;
+    }
+
+    boundaryField_ == tgf().boundaryField_;
+
+    tgf.clear();
+}
+#endif
+
+
 // * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * * //
 
 template<class Type, template<class> class PatchField, class GeoMesh>
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index 7c47a526cb..5c27f055d1 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -411,6 +411,17 @@ public:
             const wordList& actualPatchTypes = wordList()
         );
 
+        //- Construct as copy resetting IO parameters and boundary types
+        #ifndef NoConstructFromTmp
+        GeometricField
+        (
+            const IOobject&,
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>&,
+            const wordList& patchFieldTypes,
+            const wordList& actualPatchTypes = wordList()
+        );
+        #endif
+
 
     //- Destructor
     virtual ~GeometricField();

From eef9853a2316503d001ccf2bdfc6b8b8ae9ef52e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 12 Feb 2016 14:12:05 +0000
Subject: [PATCH 186/447] valuePointPatchField: Change assignment to use the
 object's internalField rather than that of the argument

Avoids dependency on the state of the argument pointPatchField the
internalField of which may have been de-allocated
---
 .../fixedValue/fixedValuePointPatchField.H    |  7 +--
 .../basic/value/valuePointPatchField.C        |  4 +-
 .../pointPatchField/pointPatchField.H         | 43 +++----------------
 3 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
index 3b0aa4e59f..1e101b8f88 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
@@ -136,11 +136,8 @@ public:
 
         // Disable assignment operators
 
-            virtual void operator=(const Field<Type>&)
-            {}
-
-            virtual void operator=(const Type&)
-            {}
+            virtual void operator=(const Field<Type>&){}
+            virtual void operator=(const Type&){}
 };
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index e40a781a35..d72d22b81a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -201,7 +201,7 @@ void Foam::valuePointPatchField<Type>::operator=
     const pointPatchField<Type>& ptf
 )
 {
-    Field<Type>::operator=(ptf.patchInternalField());
+    Field<Type>::operator=(this->patchInternalField());
 }
 
 
@@ -242,7 +242,7 @@ void Foam::valuePointPatchField<Type>::operator==
     const pointPatchField<Type>& ptf
 )
 {
-    Field<Type>::operator=(ptf.patchInternalField());
+    Field<Type>::operator=(this->patchInternalField());
 }
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index d7ef103d16..ba296fb124 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -432,35 +432,11 @@ public:
 
     // Member operators
 
-        virtual void operator=
-        (
-            const pointPatchField<Type>&
-        )
-        {}
-
-        virtual void operator+=
-        (
-            const pointPatchField<Type>&
-        )
-        {}
-
-        virtual void operator-=
-        (
-            const pointPatchField<Type>&
-        )
-        {}
-
-        virtual void operator*=
-        (
-            const pointPatchField<scalar>&
-        )
-        {}
-
-        virtual void operator/=
-        (
-            const pointPatchField<scalar>&
-        )
-        {}
+        virtual void operator=(const pointPatchField<Type>&){}
+        virtual void operator+=(const pointPatchField<Type>&){}
+        virtual void operator-=(const pointPatchField<Type>&){}
+        virtual void operator*=(const pointPatchField<scalar>&){}
+        virtual void operator/=(const pointPatchField<scalar>&){}
 
         virtual void operator=(const Field<Type>&){}
         virtual void operator+=(const Field<Type>&){}
@@ -480,12 +456,7 @@ public:
         // By generic these do nothing unless the patch actually has boundary
         // values
 
-            virtual void operator==
-            (
-                const pointPatchField<Type>&
-            )
-            {}
-
+            virtual void operator==(const pointPatchField<Type>&){}
             virtual void operator==(const Field<Type>&){}
             virtual void operator==(const Type&){}
 
@@ -527,7 +498,7 @@ const pointPatchField<Type>& operator+
 #endif
 
 
-#define addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)      \
+#define addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField) \
     addToRunTimeSelectionTable                                                 \
     (                                                                          \
         PatchTypeField,                                                        \

From be0008b39a136f4e04e78562e506cf6ab8b6b615 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 12 Feb 2016 14:26:49 +0000
Subject: [PATCH 187/447] fvPatchFields: Added "assignable()" attribute which
 returns true if the fvPatchField type provides an assignment operator

---
 .../basic/calculated/calculatedFvPatchField.H |  2 +-
 .../directionMixedFvPatchField.H              | 10 ++++-
 .../basic/fixedValue/fixedValueFvPatchField.H |  8 +++-
 .../basic/mixed/mixedFvPatchField.H           |  6 +++
 .../basic/sliced/slicedFvPatchField.H         |  8 +++-
 .../basic/transform/transformFvPatchField.H   | 10 +++++
 ...malInletOutletVelocityFvPatchVectorField.H |  9 ++++
 .../fixedNormalSlipFvPatchField.H             |  9 ++++
 .../inletOutlet/inletOutletFvPatchField.H     |  9 ++++
 .../partialSlip/partialSlipFvPatchField.H     |  9 ++++
 ...aseHydrostaticPressureFvPatchScalarField.H | 11 ++++-
 ...tedInletOutletVelocityFvPatchVectorField.H | 11 ++++-
 ...eDirectedInletVelocityFvPatchVectorField.H | 10 ++++-
 ...tOutletParSlipVelocityFvPatchVectorField.H | 11 ++++-
 ...ureInletOutletVelocityFvPatchVectorField.H | 11 ++++-
 ...reInletUniformVelocityFvPatchVectorField.H | 11 ++++-
 .../pressureInletVelocityFvPatchVectorField.H | 11 ++++-
 ...malInletOutletVelocityFvPatchVectorField.H | 11 ++++-
 .../derived/slip/slipFvPatchField.H           | 34 ++++++++++++++
 .../uniformInletOutletFvPatchField.H          | 41 ++++++++++-------
 .../fvPatchFields/fvPatchField/fvPatchField.H | 44 ++++++++++++-------
 ...ilmHeightInletVelocityFvPatchVectorField.H | 11 ++++-
 22 files changed, 250 insertions(+), 47 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
index c34005a6d5..1afb39929c 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
@@ -138,7 +138,7 @@ public:
 
     // Member functions
 
-        // Access
+        // Attributes
 
             //- Return true if this patch field fixes a value.
             //  Needed to check if a level has to be specified while solving
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
index f7314852dc..86fbb9702c 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
@@ -130,9 +130,9 @@ public:
 
     // Member functions
 
-        // Access
+        // Attributes
 
-            //- Return true if this patch field fixes a value.
+            //- Return true: this patch field fixes a value.
             //  Needed to check if a level has to be specified while solving
             //  Poissons equations.
             virtual bool fixesValue() const
@@ -140,6 +140,12 @@ public:
                 return true;
             }
 
+            //- Return false: this patch field is not altered by assignment
+            virtual bool assignable() const
+            {
+                return false;
+            }
+
 
         // Mapping functions
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
index be4e368ca4..5046987851 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
@@ -150,7 +150,7 @@ public:
 
     // Member functions
 
-        // Access
+        // Attributes
 
             //- Return true if this patch field fixes a value.
             //  Needed to check if a level has to be specified while solving
@@ -160,6 +160,12 @@ public:
                 return true;
             }
 
+            //- Return false: this patch field is not altered by assignment
+            virtual bool assignable() const
+            {
+                return false;
+            }
+
 
         // Evaluation functions
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
index 3ef0d50d79..dc6d9cbb88 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
@@ -179,6 +179,12 @@ public:
                 return true;
             }
 
+            //- Return false: this patch field is not altered by assignment
+            virtual bool assignable() const
+            {
+                return false;
+            }
+
 
         // Return defining fields
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
index 49e9a1d7a6..aeef595cb0 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
@@ -131,7 +131,7 @@ public:
 
     // Member functions
 
-        // Access
+        // Attributes
 
             //- Return true if this patch field fixes a value.
             //  Needed to check if a level has to be specified while solving
@@ -141,6 +141,12 @@ public:
                 return true;
             }
 
+            //- Return false: this patch field is not altered by assignment
+            virtual bool assignable() const
+            {
+                return false;
+            }
+
 
         // Evaluation functions
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
index ae10a70cbd..1b677ceeff 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
@@ -113,6 +113,16 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true if the value of the patch field
+            //  is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
         // Evaluation functions
 
             //- Return gradient at boundary
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H
index a578e09948..41a8f41bc7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H
@@ -186,6 +186,15 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
         // Access
 
             //- Return the name of phi
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
index e4310a91b9..e5c5d6b210 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
@@ -149,6 +149,15 @@ public:
 
     // Member functions
 
+        // Access
+
+            //- Return false: this patch field is not altered by assignment
+            virtual bool assignable() const
+            {
+                return false;
+            }
+
+
         // Mapping functions
 
             //- Map (and resize as needed) from self given a mapping object
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
index 0e1f1187cc..95bea2eb68 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
@@ -165,6 +165,15 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
         //- Update the coefficients associated with the patch field
         virtual void updateCoeffs();
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
index 5d1b4c78a1..0adb57f948 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
@@ -150,6 +150,15 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return false: this patch field is not altered by assignment
+            virtual bool assignable() const
+            {
+                return false;
+            }
+
+
         // Mapping functions
 
             //- Map (and resize as needed) from self given a mapping object
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
index cb0c472da4..41b5db3a7f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,6 +185,15 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
         // Access
 
             //- Return the phaseName
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H
index b6e24c73c7..83fde6d2c6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -177,6 +177,15 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
         // Access
 
             //- Return the name of rho
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H
index b700779876..697f3bce16 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -173,6 +173,14 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
         // Access
 
             //- Return the name of rho
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H
index f73730907d..52f19ab079 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -173,6 +173,15 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
         // Access
 
             //- Return the name of rho
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H
index 1a6def9be3..6d44757d70 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,6 +163,15 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
         // Access
 
             //- Return the name of phi
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H
index d22757c672..4a2a1fbda4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,6 +138,15 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
         //- Update the coefficients associated with the patch field
         virtual void updateCoeffs();
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H
index 12b7d8bec5..94d3caf943 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,6 +156,15 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
         // Access
 
             //- Return the name of rho
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H
index c138b18f69..d5eefefb80 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -172,6 +172,15 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
         // Access
 
             //- Return the name of rho
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H
index 550f4cfba0..555ab0494c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H
@@ -130,6 +130,40 @@ public:
                 new slipFvPatchField<Type>(*this, iF)
             );
         }
+
+
+    // Member functions
+
+        // Attributes
+
+            //- Return false: this patch field is not altered by assignment
+            virtual bool assignable() const
+            {
+                return false;
+            }
+
+
+    // Member operators
+
+        // virtual void operator=(const UList<Type>&) {}
+
+        // virtual void operator=(const fvPatchField<Type>&) {}
+        // virtual void operator+=(const fvPatchField<Type>&) {}
+        // virtual void operator-=(const fvPatchField<Type>&) {}
+        // virtual void operator*=(const fvPatchField<scalar>&) {}
+        // virtual void operator/=(const fvPatchField<scalar>&) {}
+
+        // virtual void operator+=(const Field<Type>&) {}
+        // virtual void operator-=(const Field<Type>&) {}
+
+        // virtual void operator*=(const Field<scalar>&) {}
+        // virtual void operator/=(const Field<scalar>&) {}
+
+        // virtual void operator=(const Type&) {}
+        // virtual void operator+=(const Type&) {}
+        // virtual void operator-=(const Type&) {}
+        // virtual void operator*=(const scalar) {}
+        // virtual void operator/=(const scalar) {}
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
index a94092eeed..c652b917a1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
@@ -166,24 +166,33 @@ public:
         }
 
 
-    // Mapping functions
-
-        //- Map (and resize as needed) from self given a mapping object
-        virtual void autoMap
-        (
-            const fvPatchFieldMapper&
-        );
-
-        //- Reverse map the given fvPatchField onto this fvPatchField
-        virtual void rmap
-        (
-            const fvPatchField<Type>&,
-            const labelList&
-        );
-
-
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const fvPatchFieldMapper&
+            );
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchField<Type>&,
+                const labelList&
+            );
+
+
         //- Update the coefficients associated with the patch field
         virtual void updateCoeffs();
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 496524c763..ffed3dd1fd 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -300,6 +300,33 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return the type of the calculated for of fvPatchField
+            static const word& calculatedType();
+
+            //- Return true if this patch field fixes a value.
+            //  Needed to check if a level has to be specified while solving
+            //  Poissons equations.
+            virtual bool fixesValue() const
+            {
+                return false;
+            }
+
+            //- Return true if the value of the patch field
+            //  is altered by assignment (the default)
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+            //- Return true if this patch field is coupled
+            virtual bool coupled() const
+            {
+                return false;
+            }
+
+
         // Access
 
             //- Return local objectRegistry
@@ -336,23 +363,6 @@ public:
                 return patchType_;
             }
 
-            //- Return the type of the calculated for of fvPatchField
-            static const word& calculatedType();
-
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return false;
-            }
-
-            //- Return true if this patch field is coupled
-            virtual bool coupled() const
-            {
-                return false;
-            }
-
             //- Return true if the boundary condition has already been updated
             bool updated() const
             {
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
index 98b8f49808..a2e931907d 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -177,6 +177,15 @@ public:
 
     // Member functions
 
+        // Attributes
+
+            //- Return true: this patch field is altered by assignment
+            virtual bool assignable() const
+            {
+                return true;
+            }
+
+
         // Access
 
             //- Return the name of phi

From 0326cbbd570e480f2f0aecaef4ea8bb273399aa6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 12 Feb 2016 14:28:12 +0000
Subject: [PATCH 188/447] etc/config.*/paraview: Set ParaView-5.0.0 as the
 default for OpenFOAM-dev to encourage testing and feedback

---
 etc/config.csh/paraview | 4 ++--
 etc/config.sh/paraview  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index c4a5dad835..33c89d6e43 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -53,8 +53,8 @@ end
 #setenv ParaView_VERSION 4.0.1
 #setenv ParaView_VERSION 4.1.0
 #setenv ParaView_VERSION 4.3.1
-setenv ParaView_VERSION 4.4.0
-#setenv ParaView_VERSION 5.0.0
+#setenv ParaView_VERSION 4.4.0
+setenv ParaView_VERSION 5.0.0
 setenv ParaView_MAJOR detect
 
 
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 16a0cbc8d1..67ae5e8c45 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -55,8 +55,8 @@ done
 #export ParaView_VERSION=4.0.1
 #export ParaView_VERSION=4.1.0
 #export ParaView_VERSION=4.3.1
-export ParaView_VERSION=4.4.0
-#export ParaView_VERSION=5.0.0
+#export ParaView_VERSION=4.4.0
+export ParaView_VERSION=5.0.0
 export ParaView_MAJOR=detect
 
 

From 263864984ed790d9ee03259af2b16c5d31d133c0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 12 Feb 2016 14:45:53 +0000
Subject: [PATCH 189/447] OpenFOAM/matrices/solution: Simplify debug messages
 for consistency

---
 src/OpenFOAM/matrices/solution/solution.C | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index 6ece7ccc89..72725c9e99 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,12 +39,10 @@ namespace Foam
 }
 
 // List of sub-dictionaries to rewrite
-//! \cond localScope
 static const Foam::List<Foam::word> subDictNames
 (
     Foam::IStringStream("(preconditioner smoother)")()
 );
-//! \endcond
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
@@ -108,7 +106,7 @@ void Foam::solution::read(const dictionary& dict)
 
         if (debug)
         {
-            Info<< "relaxation factors:" << nl
+            Info<< "Relaxation factors:" << nl
                 << "fields: " << fieldRelaxDict_ << nl
                 << "equations: " << eqnRelaxDict_ << endl;
         }
@@ -364,8 +362,7 @@ const Foam::dictionary& Foam::solution::solverDict(const word& name) const
 {
     if (debug)
     {
-        InfoInFunction
-            << "Lookup solver for " << name << endl;
+        Info<< "Lookup solver for " << name << endl;
     }
 
     return solvers_.subDict(name);
@@ -376,8 +373,7 @@ const Foam::dictionary& Foam::solution::solver(const word& name) const
 {
     if (debug)
     {
-        InfoInFunction
-            << "Lookup solver for " << name << endl;
+        Info<< "Lookup solver for " << name << endl;
     }
 
     return solvers_.subDict(name);

From 0315d654d9b9eb9f9c63643a770746f02e50d818 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 12 Feb 2016 15:48:10 +0000
Subject: [PATCH 190/447] tutorials: Add pFinal to PISO settings in icoFoam and
 mhdFoam tutorials

---
 .../mhdFoam/hartmann/system/fvSolution               | 12 ++++++++++++
 .../incompressible/icoFoam/cavity/system/fvSolution  |  6 ++++++
 .../icoFoam/cavityClipped/system/fvSolution          |  6 ++++++
 .../icoFoam/cavityGrade/system/fvSolution            |  6 ++++++
 .../incompressible/icoFoam/elbow/system/fvSolution   |  6 ++++++
 5 files changed, 36 insertions(+)

diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
index 0f31523126..ab662efd05 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
@@ -22,6 +22,12 @@ solvers
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-06;
+        relTol          0.05;
+    }
+
+    pFinal
+    {
+        $p;
         relTol          0;
     }
 
@@ -32,6 +38,12 @@ solvers
         relTol          0;
     }
 
+    pBFinal
+    {
+        $pB;
+        relTol          0;
+    }
+
     "(U|B)"
     {
         solver          smoothSolver;
diff --git a/tutorials/incompressible/icoFoam/cavity/system/fvSolution b/tutorials/incompressible/icoFoam/cavity/system/fvSolution
index f9e556f155..1770091122 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavity/system/fvSolution
@@ -22,6 +22,12 @@ solvers
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-06;
+        relTol          0.05;
+    }
+
+    pFinal
+    {
+        $p;
         relTol          0;
     }
 
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution
index f9e556f155..1770091122 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution
@@ -22,6 +22,12 @@ solvers
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-06;
+        relTol          0.05;
+    }
+
+    pFinal
+    {
+        $p;
         relTol          0;
     }
 
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution
index f9e556f155..1770091122 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution
@@ -22,6 +22,12 @@ solvers
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-06;
+        relTol          0.05;
+    }
+
+    pFinal
+    {
+        $p;
         relTol          0;
     }
 
diff --git a/tutorials/incompressible/icoFoam/elbow/system/fvSolution b/tutorials/incompressible/icoFoam/elbow/system/fvSolution
index 009414f72c..e6d076a58e 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/elbow/system/fvSolution
@@ -22,6 +22,12 @@ solvers
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-06;
+        relTol          0.05;
+    }
+
+    pFinal
+    {
+        $p;
         relTol          0;
     }
 

From e405c69c39adf2cfe1032974b8f46a858cca9606 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 12 Feb 2016 18:09:21 +0000
Subject: [PATCH 191/447] tutorials/incompressible/icoFoam: Simplified the
 handling of the wall BCs in cavityClipped

---
 tutorials/incompressible/icoFoam/Allrun             | 5 -----
 tutorials/incompressible/icoFoam/resetFixedWallsScr | 8 --------
 2 files changed, 13 deletions(-)
 delete mode 100644 tutorials/incompressible/icoFoam/resetFixedWallsScr

diff --git a/tutorials/incompressible/icoFoam/Allrun b/tutorials/incompressible/icoFoam/Allrun
index 723784c427..a66f6fc671 100755
--- a/tutorials/incompressible/icoFoam/Allrun
+++ b/tutorials/incompressible/icoFoam/Allrun
@@ -79,11 +79,6 @@ do
     cavityClipped)
         cp -r $caseName/0 $caseName/0.5
         runMapFields cavity $caseName
-        if [ ".`grep nonuniform $caseName/0.5/U`" != "." ]
-        then
-            sed -f resetFixedWallsScr $caseName/0.5/U > $caseName/0.5/U.temp
-            mv $caseName/0.5/U.temp $caseName/0.5/U
-        fi
         ;;
     esac
 
diff --git a/tutorials/incompressible/icoFoam/resetFixedWallsScr b/tutorials/incompressible/icoFoam/resetFixedWallsScr
deleted file mode 100644
index 5a8d98ce46..0000000000
--- a/tutorials/incompressible/icoFoam/resetFixedWallsScr
+++ /dev/null
@@ -1,8 +0,0 @@
-/fixedWalls/,/}/{
-/fixedWalls/p
-/{/p
-/type            fixedValue;/p
-s/value[ \t]*nonuniform[ \t]*List<vector>[ \t]*/value           uniform (0 0 0);/p
-/}/p
-d
-}

From fc2ce7372345fe4fc71694a35fc361746f11440f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 13 Feb 2016 17:48:26 +0000
Subject: [PATCH 192/447] Solvers: Added support for extrapolated pressure
 boundary conditions

The boundary conditions of HbyA are now constrained by the new "constrainHbyA"
function which applies the velocity boundary values for patches for which the
velocity cannot be modified by assignment and pressure extrapolation is
not specified via the new
"fixedFluxExtrapolatedPressureFvPatchScalarField".

The new function "constrainPressure" sets the pressure gradient
appropriately for "fixedFluxPressureFvPatchScalarField" and
"fixedFluxExtrapolatedPressureFvPatchScalarField" boundary conditions to
ensure the evaluated flux corresponds to the known velocity values at
the boundary.

The "fixedFluxPressureFvPatchScalarField" boundary condition operates
exactly as before, ensuring the correct flux at fixed-flux boundaries by
compensating for the body forces (gravity in particular) with the
pressure gradient.

The new "fixedFluxExtrapolatedPressureFvPatchScalarField" boundary
condition may be used for cases with or without body-forces to set the
pressure gradient to compensate not only for the body-force but also the
extrapolated "HbyA" which provides a second-order boundary condition for
pressure.  This is useful for a range a problems including impinging
flow, extrapolated inlet conditions with body-forces or for highly
viscous flows, pressure-induced separation etc.  To test this boundary
condition at walls in the motorBike tutorial case set

    lowerWall
    {
        type            fixedFluxExtrapolatedPressure;
    }

    motorBikeGroup
    {
        type            fixedFluxExtrapolatedPressure;
    }

Currently the new extrapolated pressure boundary condition is supported
for all incompressible and sub-sonic compressible solvers except those
providing implicit and tensorial porosity support.  The approach will be
extended to cover these solvers and options in the future.

Note: the extrapolated pressure boundary condition is experimental and
requires further testing to assess the range of applicability,
stability, accuracy etc.

Henry G. Weller
CFD Direct Ltd.
---
 applications/solvers/DNS/dnsFoam/dnsFoam.C    |   9 +-
 .../solvers/combustion/PDRFoam/pEqn.H         |   4 +-
 applications/solvers/combustion/XiFoam/pEqn.H |   7 +-
 .../solvers/combustion/engineFoam/pEqn.H      |  11 +-
 .../solvers/combustion/fireFoam/fireFoam.C    |   3 +-
 .../solvers/combustion/fireFoam/pEqn.H        |  16 +-
 .../solvers/combustion/reactingFoam/pEqn.H    |   7 +-
 .../solvers/combustion/reactingFoam/pcEqn.H   |   6 +-
 .../rhoReactingBuoyantFoam/pEqn.H             |  16 +-
 .../rhoReactingBuoyantFoam.C                  |   3 +-
 .../reactingFoam/rhoReactingFoam/pEqn.H       |   7 +-
 .../mixedFixedValueSlipFvPatchField.H         |   9 ++
 .../solvers/compressible/rhoPimpleFoam/pEqn.H |   7 +-
 .../compressible/rhoPimpleFoam/pcEqn.H        |   6 +-
 .../rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H     |   7 +-
 .../solvers/compressible/rhoSimpleFoam/pEqn.H |  12 +-
 .../compressible/rhoSimpleFoam/pcEqn.H        |   8 +-
 .../rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H  |   8 +-
 .../solvers/compressible/sonicFoam/pEqn.H     |   5 +-
 .../sonicFoam/sonicDyMFoam/pEqn.H             |   5 +-
 .../electromagnetics/mhdFoam/mhdFoam.C        |  10 +-
 .../buoyantBoussinesqPimpleFoam.C             |   3 +-
 .../buoyantBoussinesqPimpleFoam/pEqn.H        |  15 +-
 .../buoyantBoussinesqSimpleFoam.C             |   3 +-
 .../buoyantBoussinesqSimpleFoam/pEqn.H        |  14 +-
 .../buoyantPimpleFoam/buoyantPimpleFoam.C     |   3 +-
 .../heatTransfer/buoyantPimpleFoam/pEqn.H     |  26 +---
 .../buoyantSimpleFoam/buoyantSimpleFoam.C     |   3 +-
 .../heatTransfer/buoyantSimpleFoam/pEqn.H     |  16 +-
 .../chtMultiRegionFoam/chtMultiRegionFoam.C   |   3 +-
 .../chtMultiRegionSimpleFoam.C                |   3 +-
 .../chtMultiRegionSimpleFoam/fluid/pEqn.H     |  16 +-
 .../chtMultiRegionFoam/fluid/pEqn.H           |  16 +-
 .../adjointShapeOptimizationFoam.C            |   8 +-
 .../solvers/incompressible/icoFoam/icoFoam.C  |   9 +-
 .../nonNewtonianIcoFoam/nonNewtonianIcoFoam.C |   9 +-
 .../pimpleFoam/SRFPimpleFoam/pEqn.H           |   3 +
 .../solvers/incompressible/pimpleFoam/pEqn.H  |  19 +--
 .../pimpleFoam/pimpleDyMFoam/pEqn.H           |  19 +--
 .../pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C  |   3 +-
 .../incompressible/pimpleFoam/pimpleFoam.C    |   3 +-
 .../solvers/incompressible/pisoFoam/pEqn.H    |   6 +-
 .../simpleFoam/SRFSimpleFoam/pEqn.H           |   3 +
 .../solvers/incompressible/simpleFoam/pEqn.H  |   7 +-
 .../simpleFoam/porousSimpleFoam/pEqn.H        |   7 +-
 .../solvers/lagrangian/DPMFoam/DPMFoam.C      |   3 +-
 .../solvers/lagrangian/DPMFoam/pEqn.H         |  11 +-
 .../lagrangian/coalChemistryFoam/pEqn.H       |   7 +-
 .../lagrangian/reactingParcelFilmFoam/pEqn.H  |  16 +-
 .../reactingParcelFilmFoam.C                  |   3 +-
 .../lagrangian/reactingParcelFoam/pEqn.H      |   8 +-
 .../simpleReactingParcelFoam/pEqn.H           |  11 +-
 .../solvers/lagrangian/sprayFoam/pEqn.H       |   7 +-
 .../lagrangian/sprayFoam/sprayDyMFoam/pEqn.H  |   7 +-
 .../cavitatingFoam/cavitatingDyMFoam/pEqn.H   |   4 +-
 .../solvers/multiphase/cavitatingFoam/pEqn.H  |   4 +-
 .../compressibleInterDyMFoam.C                |   3 +-
 .../compressibleInterDyMFoam/pEqn.H           |  16 +-
 .../compressibleInterFoam.C                   |   3 +-
 .../multiphase/compressibleInterFoam/pEqn.H   |  16 +-
 .../compressibleMultiphaseInterFoam.C         |   3 +-
 .../compressibleMultiphaseInterFoam/pEqn.H    |  16 +-
 .../multiphase/driftFluxFoam/driftFluxFoam.C  |   3 +-
 .../solvers/multiphase/driftFluxFoam/pEqn.H   |  16 +-
 .../interFoam/interDyMFoam/interDyMFoam.C     |   3 +-
 .../multiphase/interFoam/interDyMFoam/pEqn.H  |  16 +-
 .../solvers/multiphase/interFoam/interFoam.C  |   3 +-
 .../interMixingFoam/interMixingFoam.C         |   3 +-
 .../solvers/multiphase/interFoam/pEqn.H       |  14 +-
 .../interPhaseChangeDyMFoam.C                 |   3 +-
 .../interPhaseChangeDyMFoam/pEqn.H            |  16 +-
 .../interPhaseChangeFoam.C                    |   3 +-
 .../multiphase/interPhaseChangeFoam/pEqn.H    |  16 +-
 .../multiphaseEulerFoam/multiphaseEulerFoam.C |   3 +-
 .../multiphaseInterDyMFoam.C                  |   3 +-
 .../multiphaseInterFoam/multiphaseInterFoam.C |   3 +-
 .../potentialFreeSurfaceFoam/pEqn.H           |  15 +-
 .../potentialFreeSurfaceDyMFoam/pEqn.H        |  15 +-
 .../potentialFreeSurfaceDyMFoam.C             |   3 +-
 .../potentialFreeSurfaceFoam.C                |   3 +-
 .../reactingMultiphaseEulerFoam.C             |   3 +-
 .../reactingTwoPhaseEulerFoam.C               |   3 +-
 .../multiphase/twoLiquidMixingFoam/pEqn.H     |  16 +-
 .../twoLiquidMixingFoam/twoLiquidMixingFoam.C |   3 +-
 .../twoPhaseEulerFoam/twoPhaseEulerFoam.C     |   3 +-
 src/finiteVolume/Make/files                   |   2 +
 .../general/constrainHbyA/constrainHbyA.C     |  73 +++++++++
 .../general/constrainHbyA/constrainHbyA.H     |  61 ++++++++
 .../constrainPressure/constrainPressure.C     | 134 ++++++++++++++++
 .../constrainPressure/constrainPressure.H     | 131 ++++++++++++++++
 .../cfdTools/general/include/fvCFD.H          |   3 +
 ...uxExtrapolatedPressureFvPatchScalarField.C | 100 ++++++++++++
 ...uxExtrapolatedPressureFvPatchScalarField.H | 147 ++++++++++++++++++
 .../circuitBoardCooling/system/fvSchemes      |   8 +-
 .../pimpleFoam/pitzDaily/system/fvSchemes     |  11 +-
 95 files changed, 886 insertions(+), 474 deletions(-)
 create mode 100644 src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C
 create mode 100644 src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.H
 create mode 100644 src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C
 create mode 100644 src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.C
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H

diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index 38c5b7be8f..238a05c696 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,9 +88,7 @@ int main(int argc, char *argv[])
         {
             volScalarField rAU(1.0/UEqn.A());
             surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-            volVectorField HbyA("HbyA", U);
-            HbyA = rAU*UEqn.H();
-
+            volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
             surfaceScalarField phiHbyA
             (
                 "phiHbyA",
@@ -98,6 +96,9 @@ int main(int argc, char *argv[])
               + rAUf*fvc::ddtCorr(U, phi)
             );
 
+            // Update the pressure BCs to ensure flux consistency
+            constrainPressure(p, U, phiHbyA, rAUf);
+
             fvScalarMatrix pEqn
             (
                 fvm::laplacian(rAUf, p) == fvc::div(phiHbyA)
diff --git a/applications/solvers/combustion/PDRFoam/pEqn.H b/applications/solvers/combustion/PDRFoam/pEqn.H
index 499885875b..b8d21b7e38 100644
--- a/applications/solvers/combustion/PDRFoam/pEqn.H
+++ b/applications/solvers/combustion/PDRFoam/pEqn.H
@@ -1,9 +1,7 @@
 rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
-
-volVectorField HbyA("HbyA", U);
-HbyA = invA & UEqn.H();
+volVectorField HbyA(constrainHbyA(invA & UEqn.H(), U, p));
 
 if (pimple.transonic())
 {
diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H
index 2b11dc73f8..39830d0135 100644
--- a/applications/solvers/combustion/XiFoam/pEqn.H
+++ b/applications/solvers/combustion/XiFoam/pEqn.H
@@ -2,9 +2,7 @@ rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn.H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 if (pimple.transonic())
 {
@@ -52,6 +50,9 @@ else
 
     MRF.makeRelative(phiHbyA);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H
index c962353e3f..d84b9bd154 100644
--- a/applications/solvers/combustion/engineFoam/pEqn.H
+++ b/applications/solvers/combustion/engineFoam/pEqn.H
@@ -2,9 +2,7 @@ rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn.H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 if (pimple.transonic())
 {
@@ -29,7 +27,7 @@ if (pimple.transonic())
         (
             fvm::ddt(psi, p)
           + fvm::div(phid, p)
-          - fvm::laplacian(rho*rAU, p)
+          - fvm::laplacian(rhorAUf, p)
          ==
             fvOptions(psi, p, rho.name())
         );
@@ -56,13 +54,16 @@ else
     fvc::makeRelative(phiHbyA, rho, U);
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
             fvm::ddt(psi, p)
           + fvc::div(phiHbyA)
-          - fvm::laplacian(rho*rAU, p)
+          - fvm::laplacian(rhorAUf, p)
          ==
             fvOptions(psi, p, rho.name())
         );
diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C
index 34e97b634e..fd8e2a4357 100644
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,6 @@ Description
 #include "psiCombustionModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H
index 6f8b034581..11f140577f 100644
--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@@ -2,9 +2,7 @@ rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn.H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
@@ -20,16 +18,8 @@ surfaceScalarField phiHbyA
 
 MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
-// Update the fixedFluxPressure BCs to ensure flux consistency
-setSnGrad<fixedFluxPressureFvPatchScalarField>
-(
-    p_rgh.boundaryField(),
-    (
-        phiHbyA.boundaryField()
-      - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-       *rho.boundaryField()
-    )/(mesh.magSf().boundaryField()*rhorAUf.boundaryField())
-);
+// Update the pressure BCs to ensure flux consistency
+constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
 
 while (pimple.correctNonOrthogonal())
 {
diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H
index 2f352db5da..ae5478c5b6 100644
--- a/applications/solvers/combustion/reactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pEqn.H
@@ -5,9 +5,7 @@ rho.relax();
 
 volScalarField rAU(1.0/UEqn().A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
@@ -60,6 +58,9 @@ else
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/combustion/reactingFoam/pcEqn.H b/applications/solvers/combustion/reactingFoam/pcEqn.H
index 3d7fffc459..8bef07a5bb 100644
--- a/applications/solvers/combustion/reactingFoam/pcEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pcEqn.H
@@ -5,8 +5,7 @@ rho.relax();
 
 volScalarField rAU(1.0/UEqn().A());
 volScalarField rAtU(1.0/(1.0/rAU - UEqn().H1()));
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
@@ -76,6 +75,9 @@ else
 
     volScalarField rhorAtU("rhorAtU", rho*rAtU);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAtU, MRF);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
index 965ff5bad2..ad01cd5f83 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
@@ -7,9 +7,7 @@
 
     volScalarField rAU(1.0/UEqn.A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
     surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
@@ -25,16 +23,8 @@
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-           *rho.boundaryField()
-        )/(mesh.magSf().boundaryField()*rhorAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
 
     fvScalarMatrix p_rghDDtEqn
     (
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
index 11c028d166..bff96fdb89 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,6 @@ Description
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
index c3b18e6bd7..cd19153462 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
@@ -7,9 +7,7 @@
 
     volScalarField rAU(1.0/UEqn().A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn().H();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
 
     if (pimple.transonic())
     {
@@ -65,6 +63,9 @@
 
         MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
+        // Update the pressure BCs to ensure flux consistency
+        constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
         fvScalarMatrix pDDtEqn
         (
             fvc::ddt(rho) + psi*correction(fvm::ddt(p))
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H
index 8c98fb5f83..5ab7d3835f 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H
@@ -130,6 +130,15 @@ public:
 
     // Member functions
 
+        // Access
+
+            //- Return false: this patch field is not altered by assignment
+            virtual bool assignable() const
+            {
+                return false;
+            }
+
+
         // Mapping functions
 
             //- Map (and resize as needed) from self given a mapping object
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index 2f352db5da..ae5478c5b6 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -5,9 +5,7 @@ rho.relax();
 
 volScalarField rAU(1.0/UEqn().A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
@@ -60,6 +58,9 @@ else
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
index 3d7fffc459..8bef07a5bb 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
@@ -5,8 +5,7 @@ rho.relax();
 
 volScalarField rAU(1.0/UEqn().A());
 volScalarField rAtU(1.0/(1.0/rAU - UEqn().H1()));
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
@@ -76,6 +75,9 @@ else
 
     volScalarField rhorAtU("rhorAtU", rho*rAtU);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAtU, MRF);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
index 33039b3dc9..615682db12 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
@@ -5,9 +5,7 @@ rho.relax();
 
 volScalarField rAU(1.0/UEqn().A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
@@ -60,6 +58,9 @@ else
     fvc::makeRelative(phiHbyA, rho, U);
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
     while (pimple.correctNonOrthogonal())
     {
         // Pressure corrector
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index 38c9806ee9..4c6276711c 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -1,8 +1,7 @@
 {
     volScalarField rAU(1.0/UEqn().A());
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn().H();
-
+    surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
+    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
     UEqn.clear();
 
     bool closedVolume = false;
@@ -23,7 +22,7 @@
             fvScalarMatrix pEqn
             (
                 fvm::div(phid, p)
-              - fvm::laplacian(rho*rAU, p)
+              - fvm::laplacian(rhorAUf, p)
               ==
                 fvOptions(psi, p, rho.name())
             );
@@ -53,12 +52,15 @@
 
         closedVolume = adjustPhi(phiHbyA, U, p);
 
+        // Update the pressure BCs to ensure flux consistency
+        constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
         while (simple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
                 fvc::div(phiHbyA)
-              - fvm::laplacian(rho*rAU, p)
+              - fvm::laplacian(rhorAUf, p)
               ==
                 fvOptions(psi, p, rho.name())
             );
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
index 82161f230c..7b77048a99 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
@@ -1,9 +1,6 @@
 volScalarField rAU(1.0/UEqn().A());
 volScalarField rAtU(1.0/(1.0/rAU - UEqn().H1()));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
-
+volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
 UEqn.clear();
 
 bool closedVolume = false;
@@ -70,6 +67,9 @@ else
 
     volScalarField rhorAtU("rhorAtU", rho*rAtU);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAtU, MRF);
+
     while (simple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
index b0af0e3f8b..d54f7eec24 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
@@ -1,16 +1,16 @@
 {
     const volScalarField& psi = thermo.psi();
 
-    volVectorField HbyA("HbyA", U);
-
+    tmp<volVectorField> tHbyA;
     if (pressureImplicitPorosity)
     {
-        HbyA = trTU() & UEqn().H();
+        tHbyA = constrainHbyA(trTU()&UEqn().H(), U, p);
     }
     else
     {
-        HbyA = trAU()*UEqn().H();
+        tHbyA = constrainHbyA(trAU()*UEqn().H(), U, p);
     }
+    volVectorField& HbyA = tHbyA();
 
     UEqn.clear();
 
diff --git a/applications/solvers/compressible/sonicFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/pEqn.H
index d61808b23c..f4f6d5ae2a 100644
--- a/applications/solvers/compressible/sonicFoam/pEqn.H
+++ b/applications/solvers/compressible/sonicFoam/pEqn.H
@@ -2,10 +2,7 @@ rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn.H();
-
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 surfaceScalarField phid
 (
     "phid",
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
index 439709ed07..283e450e00 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
@@ -2,10 +2,7 @@ rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn.H();
-
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 surfaceScalarField phid
 (
     "phid",
diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
index c9cb0242bd..0d21312a30 100644
--- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
+++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,10 +97,7 @@ int main(int argc, char *argv[])
             {
                 volScalarField rAU(1.0/UEqn.A());
                 surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-                volVectorField HbyA("HbyA", U);
-                HbyA = rAU*UEqn.H();
-
+                volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
                 surfaceScalarField phiHbyA
                 (
                     "phiHbyA",
@@ -108,6 +105,9 @@ int main(int argc, char *argv[])
                   + rAUf*fvc::ddtCorr(U, phi)
                 );
 
+                // Update the pressure BCs to ensure flux consistency
+                constrainPressure(p, U, phiHbyA, rAUf);
+
                 while (piso.correctNonOrthogonal())
                 {
                     fvScalarMatrix pEqn
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
index cead654669..eb0bf5fcbb 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,6 @@ Description
 #include "radiationModel.H"
 #include "fvOptions.H"
 #include "pimpleControl.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
index 9ec089ee4c..a9be0e59f7 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
@@ -1,9 +1,7 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
 
     surfaceScalarField phig(-rAUf*ghf*fvc::snGrad(rhok)*mesh.magSf());
 
@@ -17,15 +15,8 @@
 
     MRF.makeRelative(phiHbyA);
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, U, phiHbyA, rAUf, MRF);
 
     while (pimple.correctNonOrthogonal())
     {
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index 35b49c8b8b..63c35ed424 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,6 @@ Description
 #include "radiationModel.H"
 #include "fvOptions.H"
 #include "simpleControl.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
index b6d8067358..13200035d8 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
@@ -1,9 +1,8 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn().A());
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
+    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_rgh));
 
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn().H();
     UEqn.clear();
 
     surfaceScalarField phig(-rAUf*ghf*fvc::snGrad(rhok)*mesh.magSf());
@@ -20,15 +19,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, U, phiHbyA, rAUf, MRF);
 
     while (simple.correctNonOrthogonal())
     {
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
index d683e8fbeb..7a956a09e6 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,6 @@ Description
 #include "radiationModel.H"
 #include "fvOptions.H"
 #include "pimpleControl.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index e2f99671a3..66864139fa 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@@ -6,35 +6,25 @@
     thermo.rho() -= psi*p_rgh;
 
     volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf("rAUf", fvc::interpolate(rho*rAU));
+    surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
 
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
-
-    surfaceScalarField phig(-rAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
+    surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
         (
             (fvc::interpolate(rho*HbyA) & mesh.Sf())
-          + rAUf*fvc::ddtCorr(rho, U, phi)
+          + rhorAUf*fvc::ddtCorr(rho, U, phi)
         )
       + phig
     );
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-           *rho.boundaryField()
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
 
     fvScalarMatrix p_rghDDtEqn
     (
@@ -49,7 +39,7 @@
         fvScalarMatrix p_rghEqn
         (
             p_rghDDtEqn
-          - fvm::laplacian(rAUf, p_rgh)
+          - fvm::laplacian(rhorAUf, p_rgh)
         );
 
         p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
@@ -64,7 +54,7 @@
 
             // Correct the momentum source with the pressure gradient flux
             // calculated from the relaxed pressure
-            U = HbyA + rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rAUf);
+            U = HbyA + rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rhorAUf);
             U.correctBoundaryConditions();
             fvOptions.correct(U);
             K = 0.5*magSqr(U);
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index 21a9ed9525..c319804418 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,6 @@ Description
 #include "radiationModel.H"
 #include "simpleControl.H"
 #include "fvOptions.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index 85157e8b2f..132e440bcd 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -4,9 +4,7 @@
 
     volScalarField rAU("rAU", 1.0/UEqn().A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn().H();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_rgh));
     UEqn.clear();
 
     surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
@@ -23,16 +21,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-           *rho.boundaryField()
-        )/(mesh.magSf().boundaryField()*rhorAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
 
     while (simple.correctNonOrthogonal())
     {
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index ec0532c11b..f8c62042d6 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,6 @@ Description
 #include "radiationModel.H"
 #include "fvOptions.H"
 #include "coordinateSystem.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
index 625737aed1..6b4811a026 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,6 @@ Description
 #include "radiationModel.H"
 #include "fvOptions.H"
 #include "coordinateSystem.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
index ccae3cc079..341de6b13e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
@@ -6,9 +6,7 @@
 
     volScalarField rAU("rAU", 1.0/UEqn().A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn().H();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_rgh));
     UEqn.clear();
 
     surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
@@ -25,16 +23,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-           *rho.boundaryField()
-        )/(mesh.magSf().boundaryField()*rhorAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
 
     dimensionedScalar compressibility = fvc::domainIntegrate(psi);
     bool compressible = (compressibility.value() > SMALL);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
index 002faddb59..0b82c44068 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
@@ -7,9 +7,7 @@
 
     volScalarField rAU("rAU", 1.0/UEqn().A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn().H();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_rgh));
 
     surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
@@ -25,16 +23,8 @@
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-           *rho.boundaryField()
-        )/(mesh.magSf().boundaryField()*rhorAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
 
     {
         fvScalarMatrix p_rghDDtEqn
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index baf2518aa1..fbd8e5f150 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,8 +125,7 @@ int main(int argc, char *argv[])
             fvOptions.correct(U);
 
             volScalarField rAU(1.0/UEqn().A());
-            volVectorField HbyA("HbyA", U);
-            HbyA = rAU*UEqn().H();
+            volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
             UEqn.clear();
             surfaceScalarField phiHbyA
             (
@@ -135,6 +134,9 @@ int main(int argc, char *argv[])
             );
             adjustPhi(phiHbyA, U, p);
 
+            // Update the pressure BCs to ensure flux consistency
+            constrainPressure(p, U, phiHbyA, rAU);
+
             // Non-orthogonal pressure corrector loop
             while (simple.correctNonOrthogonal())
             {
diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C
index 80e13faa8d..e3a7fb67c5 100644
--- a/applications/solvers/incompressible/icoFoam/icoFoam.C
+++ b/applications/solvers/incompressible/icoFoam/icoFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,9 +73,7 @@ int main(int argc, char *argv[])
         while (piso.correct())
         {
             volScalarField rAU(1.0/UEqn.A());
-
-            volVectorField HbyA("HbyA", U);
-            HbyA = rAU*UEqn.H();
+            volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
             surfaceScalarField phiHbyA
             (
                 "phiHbyA",
@@ -85,6 +83,9 @@ int main(int argc, char *argv[])
 
             adjustPhi(phiHbyA, U, p);
 
+            // Update the pressure BCs to ensure flux consistency
+            constrainPressure(p, U, phiHbyA, rAU);
+
             // Non-orthogonal pressure corrector loop
             while (piso.correctNonOrthogonal())
             {
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index 9d3b567d3b..3edbedf39f 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,9 +77,7 @@ int main(int argc, char *argv[])
         while (piso.correct())
         {
             volScalarField rAU(1.0/UEqn.A());
-
-            volVectorField HbyA("HbyA", U);
-            HbyA = rAU*UEqn.H();
+            volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
             surfaceScalarField phiHbyA
             (
                 "phiHbyA",
@@ -89,6 +87,9 @@ int main(int argc, char *argv[])
 
             adjustPhi(phiHbyA, U, p);
 
+            // Update the pressure BCs to ensure flux consistency
+            constrainPressure(p, U, phiHbyA, rAU);
+
             // Non-orthogonal pressure corrector loop
             while (piso.correctNonOrthogonal())
             {
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
index d305d1a261..0e3936bc5d 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
@@ -26,6 +26,9 @@ if (pimple.nCorrPISO() <= 1)
     UrelEqn.clear();
 }
 
+// Update the pressure BCs to ensure flux consistency
+constrainPressure(p, Urel, phiHbyA, rAtUrel());
+
 // Non-orthogonal pressure corrector loop
 while (pimple.correctNonOrthogonal())
 {
diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H
index 18083aa810..6d4eb90334 100644
--- a/applications/solvers/incompressible/pimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H
@@ -1,7 +1,5 @@
 volScalarField rAU(1.0/UEqn().A());
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
-
+volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
 surfaceScalarField phiHbyA
 (
     "phiHbyA",
@@ -28,17 +26,8 @@ if (pimple.nCorrPISO() <= 1)
     UEqn.clear();
 }
 
-surfaceScalarField rAUf("rAUf", fvc::interpolate(rAtU()));
-
-// Update the fixedFluxPressure BCs to ensure flux consistency
-setSnGrad<fixedFluxPressureFvPatchScalarField>
-(
-    p.boundaryField(),
-    (
-        phiHbyA.boundaryField()
-      - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-    )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-);
+// Update the pressure BCs to ensure flux consistency
+constrainPressure(p, U, phiHbyA, rAtU(), MRF);
 
 // Non-orthogonal pressure corrector loop
 while (pimple.correctNonOrthogonal())
@@ -46,7 +35,7 @@ while (pimple.correctNonOrthogonal())
     // Pressure corrector
     fvScalarMatrix pEqn
     (
-        fvm::laplacian(rAUf, p) == fvc::div(phiHbyA)
+        fvm::laplacian(rAtU(), p) == fvc::div(phiHbyA)
     );
 
     pEqn.setReference(pRefCell, pRefValue);
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
index 5b5fe720ad..f4106997c6 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
@@ -1,7 +1,5 @@
 volScalarField rAU(1.0/UEqn().A());
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
-
+volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
 surfaceScalarField phiHbyA
 (
     "phiHbyA",
@@ -33,24 +31,15 @@ if (pimple.nCorrPISO() <= 1)
     UEqn.clear();
 }
 
-surfaceScalarField rAUf("rAUf", fvc::interpolate(rAtU()));
-
-// Update the fixedFluxPressure BCs to ensure flux consistency
-setSnGrad<fixedFluxPressureFvPatchScalarField>
-(
-    p.boundaryField(),
-    (
-        phiHbyA.boundaryField()
-      - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-    )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-);
+// Update the pressure BCs to ensure flux consistency
+constrainPressure(p, U, phiHbyA, rAtU(), MRF);
 
 // Non-orthogonal pressure corrector loop
 while (pimple.correctNonOrthogonal())
 {
     fvScalarMatrix pEqn
     (
-        fvm::laplacian(rAUf, p) == fvc::div(phiHbyA)
+        fvm::laplacian(rAtU(), p) == fvc::div(phiHbyA)
     );
 
     pEqn.setReference(pRefCell, pRefValue);
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
index 54c94d9c72..9db6844761 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,6 @@ Description
 #include "pimpleControl.H"
 #include "CorrectPhi.H"
 #include "fvOptions.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index feeeaa000e..a065bcbd3c 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,6 @@ Description
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/incompressible/pisoFoam/pEqn.H b/applications/solvers/incompressible/pisoFoam/pEqn.H
index f8c5a45978..7d3284e0d4 100644
--- a/applications/solvers/incompressible/pisoFoam/pEqn.H
+++ b/applications/solvers/incompressible/pisoFoam/pEqn.H
@@ -1,6 +1,5 @@
 volScalarField rAU(1.0/UEqn.A());
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn.H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 surfaceScalarField phiHbyA
 (
     "phiHbyA",
@@ -12,6 +11,9 @@ MRF.makeRelative(phiHbyA);
 
 adjustPhi(phiHbyA, U, p);
 
+// Update the pressure BCs to ensure flux consistency
+constrainPressure(p, U, phiHbyA, rAU, MRF);
+
 // Non-orthogonal pressure corrector loop
 while (piso.correctNonOrthogonal())
 {
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H
index 50691c0154..636a4c571d 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H
@@ -18,6 +18,9 @@
 
     UrelEqn.clear();
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, Urel, phiHbyA, rAtUrel());
+
     // Non-orthogonal pressure corrector loop
     while (simple.correctNonOrthogonal())
     {
diff --git a/applications/solvers/incompressible/simpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/pEqn.H
index 4438a3bff5..b506bf43cf 100644
--- a/applications/solvers/incompressible/simpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/pEqn.H
@@ -1,8 +1,6 @@
 {
     volScalarField rAU(1.0/UEqn().A());
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn().H();
-
+    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
     surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
     MRF.makeRelative(phiHbyA);
     adjustPhi(phiHbyA, U, p);
@@ -19,6 +17,9 @@
 
     UEqn.clear();
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, U, phiHbyA, rAtU(), MRF);
+
     // Non-orthogonal pressure corrector loop
     while (simple.correctNonOrthogonal())
     {
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
index b4a0f2e668..e4ad23aabc 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
@@ -1,12 +1,13 @@
-volVectorField HbyA("HbyA", U);
+tmp<volVectorField> tHbyA;
 if (pressureImplicitPorosity)
 {
-    HbyA = trTU()&UEqn().H();
+    tHbyA = constrainHbyA(trTU()&UEqn().H(), U, p);
 }
 else
 {
-    HbyA = trAU()*UEqn().H();
+    tHbyA = constrainHbyA(trAU()*UEqn().H(), U, p);
 }
+volVectorField& HbyA = tHbyA();
 
 UEqn.clear();
 surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index 8999e03663..9e2208479d 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,6 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "PhaseIncompressibleTurbulenceModel.H"
 #include "pimpleControl.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 #ifdef MPPIC
     #include "basicKinematicMPPICCloud.H"
diff --git a/applications/solvers/lagrangian/DPMFoam/pEqn.H b/applications/solvers/lagrangian/DPMFoam/pEqn.H
index 34cce4f166..6b7084de63 100644
--- a/applications/solvers/lagrangian/DPMFoam/pEqn.H
+++ b/applications/solvers/lagrangian/DPMFoam/pEqn.H
@@ -12,15 +12,8 @@
         )
     );
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-            - (mesh.Sf().boundaryField() & Uc.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUcf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, Uc, phiHbyA, rAUcf);
 
     // Non-orthogonal pressure corrector loop
     while (pimple.correctNonOrthogonal())
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
index 480ce25f7c..ce9f819646 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@@ -2,9 +2,7 @@ rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn.H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 if (pimple.transonic())
 {
@@ -53,6 +51,9 @@ else
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
index 6f8b034581..11f140577f 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
@@ -2,9 +2,7 @@ rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn.H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
@@ -20,16 +18,8 @@ surfaceScalarField phiHbyA
 
 MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
-// Update the fixedFluxPressure BCs to ensure flux consistency
-setSnGrad<fixedFluxPressureFvPatchScalarField>
-(
-    p_rgh.boundaryField(),
-    (
-        phiHbyA.boundaryField()
-      - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-       *rho.boundaryField()
-    )/(mesh.magSf().boundaryField()*rhorAUf.boundaryField())
-);
+// Update the pressure BCs to ensure flux consistency
+constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
 
 while (pimple.correctNonOrthogonal())
 {
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
index 220e2f28a8..0f54e9fdc6 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,6 @@ Description
 #include "SLGThermo.H"
 #include "fvOptions.H"
 #include "pimpleControl.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
index f266fded0a..cb5b083b88 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
@@ -7,10 +7,7 @@
 
     volScalarField rAU(1.0/UEqn.A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
-
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -22,6 +19,9 @@
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
     fvScalarMatrix pDDtEqn
     (
         fvc::ddt(rho) + psi*correction(fvm::ddt(p))
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
index b5d3e1471a..aa775bc0d0 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
@@ -4,11 +4,9 @@
     thermo.rho() -= psi*p;
 
     volScalarField rAU(1.0/UEqn().A());
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn().H();
-
+    surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
+    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
     UEqn.clear();
-
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -17,12 +15,15 @@
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
     while (simple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
             fvc::div(phiHbyA)
-          - fvm::laplacian(rho*rAU, p)
+          - fvm::laplacian(rhorAUf, p)
          ==
             parcels.Srho()
           + fvOptions(psi, p, rho.name())
diff --git a/applications/solvers/lagrangian/sprayFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/pEqn.H
index ee450daab9..5d28412683 100644
--- a/applications/solvers/lagrangian/sprayFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/pEqn.H
@@ -5,9 +5,7 @@ rho.relax();
 
 volScalarField rAU(1.0/UEqn().A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
@@ -61,6 +59,9 @@ else
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H
index c620a892d1..406128feed 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H
@@ -5,9 +5,7 @@ rho.relax();
 
 volScalarField rAU(1.0/UEqn().A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
@@ -61,6 +59,9 @@ else
     fvc::makeRelative(phiHbyA, rho, U);
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
index b07846b6de..37892c0e73 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
@@ -13,9 +13,7 @@
 
     volScalarField rAU(1.0/UEqn.A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
     phi = (fvc::interpolate(HbyA) & mesh.Sf())
          + rhorAUf*fvc::ddtCorr(U, Uf);
diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index da8047914c..5b238ccefa 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -13,9 +13,7 @@
 
     volScalarField rAU(1.0/UEqn.A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
     phi = (fvc::interpolate(HbyA) & mesh.Sf())
          + rhorAUf*fvc::ddtCorr(U, phi);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 410bb604bb..65cc137acb 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,6 @@ Description
 #include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
 #include "CorrectPhi.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
index 89089fe616..e1ac128810 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
@@ -1,10 +1,7 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
-
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -22,15 +19,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - (mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, U, phiHbyA, rAUf);
 
     // Make the fluxes relative to the mesh motion
     fvc::makeRelative(phiHbyA, U);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 1db6fc06f2..efbdc398cc 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,6 @@ Description
 #include "twoPhaseMixtureThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index 673f1c8271..fb23042a87 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -1,10 +1,7 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
-
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -22,15 +19,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - (mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, U, phiHbyA, rAUf);
 
     tmp<fvScalarMatrix> p_rghEqnComp1;
     tmp<fvScalarMatrix> p_rghEqnComp2;
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
index c968a4e313..8c8de8af6e 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,6 @@ Description
 #include "multiphaseMixtureThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H
index a8f4bcb9f2..ccf4bc9794 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H
@@ -1,10 +1,7 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
-
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -22,15 +19,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - (mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, U, phiHbyA, rAUf);
 
     PtrList<fvScalarMatrix> p_rghEqnComps(mixture.phases().size());
 
diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
index a026a32faf..c0a2be76a7 100644
--- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
+++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,6 @@ Description
 #include "CompressibleTurbulenceModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 #include "gaussLaplacianScheme.H"
 #include "uncorrectedSnGrad.H"
 
diff --git a/applications/solvers/multiphase/driftFluxFoam/pEqn.H b/applications/solvers/multiphase/driftFluxFoam/pEqn.H
index 73c6ea9877..6cc93506df 100644
--- a/applications/solvers/multiphase/driftFluxFoam/pEqn.H
+++ b/applications/solvers/multiphase/driftFluxFoam/pEqn.H
@@ -1,10 +1,7 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
-
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -23,15 +20,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, U, phiHbyA, rAUf, MRF);
 
     while (pimple.correctNonOrthogonal())
     {
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index af6c779a0c..efebaff8b1 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,6 @@ Description
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
index 8400d24687..e6723f47b2 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
@@ -1,10 +1,7 @@
 {
     rAU = 1.0/UEqn.A();
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
-
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -30,15 +27,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - (mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, U, phiHbyA, rAUf);
 
     while (pimple.correctNonOrthogonal())
     {
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index 63d9a344e8..a341b64e12 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,6 @@ Description
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
index 19afacf2e1..24c292b870 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,6 @@ Description
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
diff --git a/applications/solvers/multiphase/interFoam/pEqn.H b/applications/solvers/multiphase/interFoam/pEqn.H
index 31982f4c1d..42cf70fce5 100644
--- a/applications/solvers/multiphase/interFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/pEqn.H
@@ -2,8 +2,7 @@
     volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
 
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
 
     surfaceScalarField phiHbyA
     (
@@ -24,15 +23,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, U, phiHbyA, rAUf, MRF);
 
     while (pimple.correctNonOrthogonal())
     {
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
index cf7ffd8874..2524965b28 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,6 @@ Description
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
index a1b9241fa5..f28bb8c2aa 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
@@ -1,10 +1,7 @@
 {
     rAU = 1.0/UEqn.A();
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
-
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -29,15 +26,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - (mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, U, phiHbyA, rAUf);
 
     Pair<tmp<volScalarField>> vDotP = mixture->vDotP();
     const volScalarField& vDotcP = vDotP[0]();
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index 003d9a58a0..3639bd4c4e 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,6 @@ Description
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
index 497a6e3d64..fd85d96714 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
@@ -1,10 +1,7 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
-
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -23,15 +20,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - (mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, U, phiHbyA, rAUf);
 
     Pair<tmp<volScalarField>> vDotP = mixture->vDotP();
     const volScalarField& vDotcP = vDotP[0]();
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
index 61cc90547d..437548bca9 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,6 @@ Description
 #include "pimpleControl.H"
 #include "IOMRFZoneList.H"
 #include "CorrectPhi.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C
index c93056f329..a247985a39 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,6 @@ Description
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index 4bc2f55c4e..7451a669b1 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,6 @@ Description
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
index 6a65b215b2..e182350114 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
@@ -1,8 +1,6 @@
 volScalarField rAU(1.0/UEqn().A());
 surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
+volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_gh));
 
 if (pimple.nCorrPISO() <= 1)
 {
@@ -19,15 +17,8 @@ surfaceScalarField phiHbyA
 MRF.makeRelative(phiHbyA);
 adjustPhi(phiHbyA, U, p_gh);
 
-// Update the fixedFluxPressure BCs to ensure flux consistency
-setSnGrad<fixedFluxPressureFvPatchScalarField>
-(
-    p_gh.boundaryField(),
-    (
-        phiHbyA.boundaryField()
-      - (mesh.Sf().boundaryField() & U.boundaryField())
-    )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-);
+// Update the pressure BCs to ensure flux consistency
+constrainPressure(p_gh, U, phiHbyA, rAUf);
 
 // Non-orthogonal pressure corrector loop
 while (pimple.correctNonOrthogonal())
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H
index 01f548ad16..04b187cf85 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H
@@ -1,9 +1,7 @@
 {
     rAU = 1.0/UEqn().A();
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn().H();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_gh));
 
     if (pimple.nCorrPISO() <= 1)
     {
@@ -26,15 +24,8 @@
         fvc::makeAbsolute(phiHbyA, U);
     }
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_gh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - (mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_gh, U, phiHbyA, rAUf);
 
     // Non-orthogonal pressure corrector loop
     while (pimple.correctNonOrthogonal())
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
index 9b1a8db083..0499a9c9d6 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,6 @@ Description
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
index 2db15eb830..8371a30800 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,6 @@ Description
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
index d5c48d47aa..a98129cc7e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,6 @@ Description
 
 #include "fvCFD.H"
 #include "multiphaseSystem.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 #include "pimpleControl.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
index 00672f2f01..0e5542672d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,6 @@ Description
 #include "fvCFD.H"
 #include "twoPhaseSystem.H"
 #include "phaseCompressibleTurbulenceModel.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 #include "pimpleControl.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
index 4a89f67d8f..870034570a 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
@@ -1,10 +1,7 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
-
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -20,15 +17,8 @@
 
     phiHbyA += phig;
 
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    setSnGrad<fixedFluxPressureFvPatchScalarField>
-    (
-        p_rgh.boundaryField(),
-        (
-            phiHbyA.boundaryField()
-          - (mesh.Sf().boundaryField() & U.boundaryField())
-        )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-    );
+    // Update the pressure BCs to ensure flux consistency
+    constrainPressure(p_rgh, U, phiHbyA, rAUf);
 
     while (pimple.correctNonOrthogonal())
     {
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index 298d5366ca..0d9b134739 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,6 @@ Description
 #include "incompressibleTwoPhaseMixture.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index 3027ae88b3..32dd1a59b6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,6 @@ Description
 #include "PhaseCompressibleTurbulenceModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
 #include "fixedValueFvsPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 4506679f7b..eda874fd02 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -138,6 +138,7 @@ $(derivedFvPatchFields)/externalCoupledMixed/externalCoupledMixedFvPatchFields.C
 $(derivedFvPatchFields)/fan/fanFvPatchFields.C
 $(derivedFvPatchFields)/fanPressure/fanPressureFvPatchScalarField.C
 $(derivedFvPatchFields)/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+$(derivedFvPatchFields)/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.C
 $(derivedFvPatchFields)/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.C
 $(derivedFvPatchFields)/fixedJump/fixedJumpFvPatchFields.C
 $(derivedFvPatchFields)/fixedJumpAMI/fixedJumpAMIFvPatchFields.C
@@ -394,6 +395,7 @@ finiteVolume/fvc/fvcReconstructMag.C
 
 general = cfdTools/general
 $(general)/findRefCell/findRefCell.C
+$(general)/constrainHbyA/constrainHbyA.C
 $(general)/adjustPhi/adjustPhi.C
 $(general)/bound/bound.C
 $(general)/CorrectPhi/correctUphiBCs.C
diff --git a/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C b/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C
new file mode 100644
index 0000000000..beb2c223e2
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "constrainHbyA.H"
+#include "volFields.H"
+#include "fixedFluxExtrapolatedPressureFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volVectorField> Foam::constrainHbyA
+(
+    const tmp<volVectorField>& tHbyA,
+    const volVectorField& U,
+    const volScalarField& p
+)
+{
+    tmp<volVectorField> tHbyANew;
+
+    if (tHbyA.isTmp())
+    {
+        volVectorField* HbyAPtr = tHbyA.ptr();
+        HbyAPtr->rename("HbyA");
+        tHbyANew = HbyAPtr;
+    }
+    else
+    {
+        tHbyANew = new volVectorField("HbyA", tHbyA);
+    }
+
+    volVectorField& HbyA = tHbyANew();
+
+    forAll(U.boundaryField(), patchi)
+    {
+        if
+        (
+           !U.boundaryField()[patchi].assignable()
+        && !isA<fixedFluxExtrapolatedPressureFvPatchScalarField>
+            (
+                p.boundaryField()[patchi]
+            )
+        )
+        {
+            HbyA.boundaryField()[patchi] = U.boundaryField()[patchi];
+        }
+    }
+
+    return tHbyANew;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.H b/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.H
new file mode 100644
index 0000000000..bc5a914757
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.H
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::constrainHbyA
+
+Description
+
+SourceFiles
+    constrainHbyA.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef constrainHbyA_H
+#define constrainHbyA_H
+
+#include "volFieldsFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+tmp<volVectorField> constrainHbyA
+(
+    const tmp<volVectorField>& tHbyA,
+    const volVectorField& U,
+    const volScalarField& p
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C
new file mode 100644
index 0000000000..c086d5f3ee
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "constrainPressure.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "geometricOneField.H"
+#include "fixedFluxPressureFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class RhoType, class RAUType, class MRFType>
+void Foam::constrainPressure
+(
+    volScalarField& p,
+    const RhoType& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phiHbyA,
+    const RAUType& rhorAU,
+    const MRFType& MRF
+)
+{
+    const fvMesh& mesh = p.mesh();
+    volScalarField::GeometricBoundaryField& pBf = p.boundaryField();
+
+    bool hasFixedFluxBCs = false;
+    forAll(pBf, patchi)
+    {
+        if (isA<fixedFluxPressureFvPatchScalarField>(pBf[patchi]))
+        {
+            hasFixedFluxBCs = true;
+            break;
+        }
+    }
+
+    if (hasFixedFluxBCs)
+    {
+        const surfaceScalarField::GeometricBoundaryField& phiHbyABf =
+            phiHbyA.boundaryField();
+        const typename RAUType::GeometricBoundaryField& rhorAUBf =
+            rhorAU.boundaryField();
+        const surfaceScalarField::GeometricBoundaryField& magSfBf =
+            mesh.magSf().boundaryField();
+
+        // Pre-compute tho relative flux for all patches: currently MRFZone does
+        // not support computing the relative flux for individual patches
+        FieldField<fvsPatchField, scalar> phiRelBf
+        (
+            MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
+        );
+
+        forAll(pBf, patchi)
+        {
+            if (isA<fixedFluxPressureFvPatchScalarField>(pBf[patchi]))
+            {
+                refCast<fixedFluxPressureFvPatchScalarField>(pBf[patchi])
+               .updateCoeffs
+                (
+                    (
+                        phiHbyABf[patchi]
+                      - rho.boundaryField()[patchi]*phiRelBf[patchi]
+                    )
+                   /(magSfBf[patchi]*rhorAUBf[patchi])
+                );
+            }
+        }
+    }
+}
+
+
+template<class RAUType>
+void Foam::constrainPressure
+(
+    volScalarField& p,
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phiHbyA,
+    const RAUType& rAU
+)
+{
+    constrainPressure(p, rho, U, phiHbyA, rAU, NullMRF());
+}
+
+
+template<class RAUType, class MRFType>
+void Foam::constrainPressure
+(
+    volScalarField& p,
+    const volVectorField& U,
+    const surfaceScalarField& phiHbyA,
+    const RAUType& rAU,
+    const MRFType& MRF
+)
+{
+    constrainPressure(p, geometricOneField(), U, phiHbyA, rAU, MRF);
+}
+
+
+template<class RAUType>
+void Foam::constrainPressure
+(
+    volScalarField& p,
+    const volVectorField& U,
+    const surfaceScalarField& phiHbyA,
+    const RAUType& rAU
+)
+{
+    constrainPressure(p, U, phiHbyA, rAU, NullMRF());
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H
new file mode 100644
index 0000000000..b3e522ee05
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::constrainPressure
+
+Description
+
+SourceFiles
+    constrainPressure.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef constrainPressure_H
+#define constrainPressure_H
+
+#include "volFieldsFwd.H"
+#include "surfaceFieldsFwd.H"
+#include "IOMRFZoneList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+/*---------------------------------------------------------------------------*\
+                           Class NullMRF Declaration
+\*---------------------------------------------------------------------------*/
+
+class NullMRF
+{
+public:
+
+    // Constructors
+
+        //- Construct null
+        NullMRF()
+        {}
+
+
+    // Member Functions
+
+        //- Return the argument unchanged
+        template<class Type>
+        inline const Type& relative(const Type& U) const
+        {
+            return U;
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class RhoType, class RAUType, class MRFType>
+void constrainPressure
+(
+    volScalarField& p,
+    const RhoType& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phiHbyA,
+    const RAUType& rhorAU,
+    const MRFType& MRF
+);
+
+template<class RAUType>
+void constrainPressure
+(
+    volScalarField& p,
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phiHbyA,
+    const RAUType& rhorAU
+);
+
+template<class RAUType, class MRFType>
+void constrainPressure
+(
+    volScalarField& p,
+    const volVectorField& U,
+    const surfaceScalarField& phiHbyA,
+    const RAUType& rAU,
+    const MRFType& MRF
+);
+
+template<class RAUType>
+void constrainPressure
+(
+    volScalarField& p,
+    const volVectorField& U,
+    const surfaceScalarField& phiHbyA,
+    const RAUType& rAU
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "constrainPressure.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/include/fvCFD.H b/src/finiteVolume/cfdTools/general/include/fvCFD.H
index d8eb111f58..bc21a17c42 100644
--- a/src/finiteVolume/cfdTools/general/include/fvCFD.H
+++ b/src/finiteVolume/cfdTools/general/include/fvCFD.H
@@ -12,6 +12,9 @@
 #include "uniformDimensionedFields.H"
 #include "calculatedFvPatchFields.H"
 #include "fixedValueFvPatchFields.H"
+#include "fixedFluxPressureFvPatchScalarField.H"
+#include "constrainHbyA.H"
+#include "constrainPressure.H"
 #include "adjustPhi.H"
 #include "findRefCell.H"
 #include "IOMRFZoneList.H"
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.C
new file mode 100644
index 0000000000..6fc0fd67cd
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.C
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "fixedFluxExtrapolatedPressureFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fixedFluxExtrapolatedPressureFvPatchScalarField::
+fixedFluxExtrapolatedPressureFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedFluxPressureFvPatchScalarField(p, iF)
+{}
+
+
+Foam::fixedFluxExtrapolatedPressureFvPatchScalarField::
+fixedFluxExtrapolatedPressureFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedFluxPressureFvPatchScalarField(p, iF, dict)
+{}
+
+
+Foam::fixedFluxExtrapolatedPressureFvPatchScalarField::
+fixedFluxExtrapolatedPressureFvPatchScalarField
+(
+    const fixedFluxExtrapolatedPressureFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedFluxPressureFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+Foam::fixedFluxExtrapolatedPressureFvPatchScalarField::
+fixedFluxExtrapolatedPressureFvPatchScalarField
+(
+    const fixedFluxExtrapolatedPressureFvPatchScalarField& wbppsf
+)
+:
+    fixedFluxPressureFvPatchScalarField(wbppsf)
+{}
+
+
+Foam::fixedFluxExtrapolatedPressureFvPatchScalarField::
+fixedFluxExtrapolatedPressureFvPatchScalarField
+(
+    const fixedFluxExtrapolatedPressureFvPatchScalarField& wbppsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedFluxPressureFvPatchScalarField(wbppsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        fixedFluxExtrapolatedPressureFvPatchScalarField
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H
new file mode 100644
index 0000000000..062e08b772
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::fixedFluxExtrapolatedPressureFvPatchScalarField
+
+Group
+    grpInletBoundaryConditions grpWallBoundaryConditions
+
+Description
+    This boundary condition sets the pressure gradient to the provided value
+    such that the flux on the boundary is that specified by the velocity
+    boundary condition.
+
+    Example of the boundary condition specification:
+    \verbatim
+    myPatch
+    {
+        type            fixedFluxExtrapolatedPressure;
+    }
+    \endverbatim
+
+SeeAlso
+    Foam::fixedGradientFvPatchField
+
+SourceFiles
+    fixedFluxExtrapolatedPressureFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedFluxExtrapolatedPressureFvPatchScalarFields_H
+#define fixedFluxExtrapolatedPressureFvPatchScalarFields_H
+
+#include "fixedFluxPressureFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+             Class fixedFluxExtrapolatedPressureFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class fixedFluxExtrapolatedPressureFvPatchScalarField
+:
+    public fixedFluxPressureFvPatchScalarField
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("fixedFluxExtrapolatedPressure");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        fixedFluxExtrapolatedPressureFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        fixedFluxExtrapolatedPressureFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  fixedFluxExtrapolatedPressureFvPatchScalarField onto a new patch
+        fixedFluxExtrapolatedPressureFvPatchScalarField
+        (
+            const fixedFluxExtrapolatedPressureFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        fixedFluxExtrapolatedPressureFvPatchScalarField
+        (
+            const fixedFluxExtrapolatedPressureFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new fixedFluxExtrapolatedPressureFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        fixedFluxExtrapolatedPressureFvPatchScalarField
+        (
+            const fixedFluxExtrapolatedPressureFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new fixedFluxExtrapolatedPressureFvPatchScalarField(*this, iF)
+            );
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
index 7e71c2ea5f..410ea095e7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
@@ -38,13 +38,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian((rho*nuEff),U) Gauss linear uncorrected;
-    laplacian(rhorAUf,p_rgh) Gauss linear uncorrected;
-    laplacian(alphaEff,h) Gauss linear uncorrected;
-    laplacian((rho*DkEff),k) Gauss linear uncorrected;
-    laplacian((rho*DepsilonEff),epsilon) Gauss linear uncorrected;
-    laplacian((rho*DomegaEff),omega) Gauss linear uncorrected;
+    default         Gauss linear uncorrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes
index f3462c0da0..569c83355b 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes
@@ -23,8 +23,6 @@ ddtSchemes
 gradSchemes
 {
     default         Gauss linear;
-    grad(p)         Gauss linear;
-    grad(U)         Gauss linear;
 }
 
 divSchemes
@@ -41,19 +39,12 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(nuEff,U) Gauss linear corrected;
-    laplacian(rAUf,p)  Gauss linear corrected;
-    laplacian(DkEff,k) Gauss linear corrected;
-    laplacian(DepsilonEff,epsilon) Gauss linear corrected;
-    laplacian(DREff,R) Gauss linear corrected;
-    laplacian(DnuTildaEff,nuTilda) Gauss linear corrected;
+    default         Gauss linear corrected;
 }
 
 interpolationSchemes
 {
     default         linear;
-    interpolate(U)  linear;
 }
 
 snGradSchemes

From 9cf419dc228e6905cf51bbc982c10f7902e5233b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 14 Feb 2016 10:44:34 +0000
Subject: [PATCH 193/447] 
 tutorials/multiphase/interFoam/ras/damBreakPorousBaffle: Use PIMPLE outer
 correctors to improve stability

---
 .../interFoam/ras/damBreakPorousBaffle/system/fvSolution      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
index e9177a9ac0..a44aca66b5 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
@@ -67,8 +67,8 @@ solvers
 PIMPLE
 {
     momentumPredictor   no;
-    nOuterCorrectors    1;
-    nCorrectors         3;
+    nOuterCorrectors    3;
+    nCorrectors         1;
     nNonOrthogonalCorrectors 0;
 }
 

From caf3c353d306b96fc3ecf4b12b9b754df6982476 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 14 Feb 2016 18:32:34 +0000
Subject: [PATCH 194/447] tutorials: Simplified the Allrun and Allclean scripts

---
 .../mdEquilibrationFoam/Allclean              |   30 -
 .../periodicCubeArgon/Allclean                |   14 +
 .../periodicCubeArgon/Allrun                  |   11 +
 .../periodicCubeWater/Allclean                |   14 +
 .../periodicCubeWater/Allrun                  |   11 +
 .../icoFoam/{ => cavity}/Allclean             |   11 +-
 .../icoFoam/{ => cavity}/Allrun               |    4 -
 .../icoFoam/cavity/{ => cavity}/0/U           |    0
 .../icoFoam/cavity/{ => cavity}/0/p           |    0
 .../{ => cavity}/constant/transportProperties |    0
 .../cavity/{ => cavity}/system/blockMeshDict  |    0
 .../cavity/{ => cavity}/system/controlDict    |    0
 .../cavity/{ => cavity}/system/fvSchemes      |    0
 .../cavity/{ => cavity}/system/fvSolution     |    0
 .../icoFoam/{ => cavity}/cavityClipped/0/U    |    0
 .../icoFoam/{ => cavity}/cavityClipped/0/p    |    0
 .../constant/transportProperties              |    0
 .../cavityClipped/system/blockMeshDict        |    0
 .../cavityClipped/system/controlDict          |    0
 .../cavityClipped/system/fvSchemes            |    0
 .../cavityClipped/system/fvSolution           |    0
 .../cavityClipped/system/mapFieldsDict        |    0
 .../icoFoam/{ => cavity}/cavityGrade/0/U      |    0
 .../icoFoam/{ => cavity}/cavityGrade/0/p      |    0
 .../cavityGrade/constant/transportProperties  |    0
 .../cavityGrade/system/blockMeshDict          |    0
 .../cavityGrade/system/controlDict            |    0
 .../{ => cavity}/cavityGrade/system/fvSchemes |    0
 .../cavityGrade/system/fvSolution             |    0
 .../cavityGrade/system/mapFieldsDict          |    0
 tutorials/multiphase/interFoam/laminar/Allrun |   61 -
 .../laminar/capillaryRise/0/alpha.water       | 8856 +++++++++++++++++
 .../interFoam/laminar/{ => damBreak}/Allclean |    4 +-
 .../{ras => laminar/damBreak}/Allrun          |    9 -
 .../laminar/damBreak/{ => damBreak}/0/U       |    0
 .../damBreak}/damBreak/0/alpha.water          |    0
 .../damBreak/{ => damBreak}/0/alpha.water.org |    0
 .../laminar/damBreak/{ => damBreak}/0/p_rgh   |    0
 .../laminar/damBreak/damBreak/Allclean        |   10 +
 .../laminar/damBreak/damBreak}/Allrun         |   16 +-
 .../{ => damBreak}/constant/dynamicMeshDict   |    0
 .../damBreak/{ => damBreak}/constant/g        |    0
 .../constant/transportProperties              |    0
 .../constant/turbulenceProperties             |    0
 .../{ => damBreak}/system/blockMeshDict       |    0
 .../{ => damBreak}/system/controlDict         |    0
 .../{ => damBreak}/system/decomposeParDict    |    0
 .../damBreak/{ => damBreak}/system/fvSchemes  |    0
 .../damBreak/{ => damBreak}/system/fvSolution |    0
 .../{ => damBreak}/system/setFieldsDict       |    0
 .../laminar/mixerVessel2D/0/alpha.water       | 3119 ++++++
 .../interFoam/ras/{ => damBreak}/Allclean     |   13 +-
 .../multiphase/interFoam/ras/damBreak/Allrun  |   42 +-
 .../interFoam/ras/damBreak/{ => damBreak}/0/U |    0
 .../0/alpha.water}                            |    0
 .../ras/damBreak/damBreak/0/alpha.water.org   |   51 +
 .../ras/damBreak/{ => damBreak}/0/epsilon     |    0
 .../interFoam/ras/damBreak/{ => damBreak}/0/k |    0
 .../ras/damBreak/{ => damBreak}/0/nuTilda     |    0
 .../ras/damBreak/{ => damBreak}/0/nut         |    0
 .../ras/damBreak/{ => damBreak}/0/p_rgh       |    0
 .../interFoam/ras/damBreak/damBreak/Allclean  |   10 +
 .../interFoam/ras/damBreak/damBreak/Allrun    |   14 +
 .../ras/damBreak/{ => damBreak}/constant/g    |    0
 .../constant/transportProperties              |    0
 .../constant/turbulenceProperties             |    0
 .../{ => damBreak}/system/blockMeshDict       |    0
 .../{ => damBreak}/system/controlDict         |    0
 .../{ => damBreak}/system/decomposeParDict    |    0
 .../damBreak/{ => damBreak}/system/fvSchemes  |    0
 .../damBreak/{ => damBreak}/system/fvSolution |    0
 .../{ => damBreak}/system/setFieldsDict       |    0
 .../ras/damBreakPorousBaffle/Allclean         |   10 +
 73 files changed, 12167 insertions(+), 143 deletions(-)
 delete mode 100755 tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allclean
 create mode 100755 tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
 create mode 100755 tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun
 create mode 100755 tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
 create mode 100755 tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun
 rename tutorials/incompressible/icoFoam/{ => cavity}/Allclean (71%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/Allrun (96%)
 rename tutorials/incompressible/icoFoam/cavity/{ => cavity}/0/U (100%)
 rename tutorials/incompressible/icoFoam/cavity/{ => cavity}/0/p (100%)
 rename tutorials/incompressible/icoFoam/cavity/{ => cavity}/constant/transportProperties (100%)
 rename tutorials/incompressible/icoFoam/cavity/{ => cavity}/system/blockMeshDict (100%)
 rename tutorials/incompressible/icoFoam/cavity/{ => cavity}/system/controlDict (100%)
 rename tutorials/incompressible/icoFoam/cavity/{ => cavity}/system/fvSchemes (100%)
 rename tutorials/incompressible/icoFoam/cavity/{ => cavity}/system/fvSolution (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityClipped/0/U (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityClipped/0/p (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityClipped/constant/transportProperties (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityClipped/system/blockMeshDict (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityClipped/system/controlDict (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityClipped/system/fvSchemes (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityClipped/system/fvSolution (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityClipped/system/mapFieldsDict (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityGrade/0/U (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityGrade/0/p (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityGrade/constant/transportProperties (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityGrade/system/blockMeshDict (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityGrade/system/controlDict (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityGrade/system/fvSchemes (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityGrade/system/fvSolution (100%)
 rename tutorials/incompressible/icoFoam/{ => cavity}/cavityGrade/system/mapFieldsDict (100%)
 delete mode 100755 tutorials/multiphase/interFoam/laminar/Allrun
 create mode 100644 tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water
 rename tutorials/multiphase/interFoam/laminar/{ => damBreak}/Allclean (75%)
 rename tutorials/multiphase/interFoam/{ras => laminar/damBreak}/Allrun (85%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/0/U (100%)
 rename tutorials/multiphase/interFoam/{ras => laminar/damBreak}/damBreak/0/alpha.water (100%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/0/alpha.water.org (100%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/0/p_rgh (100%)
 create mode 100755 tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean
 rename tutorials/{discreteMethods/molecularDynamics/mdEquilibrationFoam => multiphase/interFoam/laminar/damBreak/damBreak}/Allrun (53%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/constant/dynamicMeshDict (100%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/constant/g (100%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/constant/transportProperties (100%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/constant/turbulenceProperties (100%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/system/blockMeshDict (100%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/system/controlDict (100%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/system/decomposeParDict (100%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/system/fvSchemes (100%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/system/fvSolution (100%)
 rename tutorials/multiphase/interFoam/laminar/damBreak/{ => damBreak}/system/setFieldsDict (100%)
 create mode 100644 tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/alpha.water
 rename tutorials/multiphase/interFoam/ras/{ => damBreak}/Allclean (55%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/0/U (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{0/alpha.water.org => damBreak/0/alpha.water} (100%)
 create mode 100644 tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/alpha.water.org
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/0/epsilon (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/0/k (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/0/nuTilda (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/0/nut (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/0/p_rgh (100%)
 create mode 100755 tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean
 create mode 100755 tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/constant/g (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/constant/transportProperties (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/constant/turbulenceProperties (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/system/blockMeshDict (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/system/controlDict (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/system/decomposeParDict (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/system/fvSchemes (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/system/fvSolution (100%)
 rename tutorials/multiphase/interFoam/ras/damBreak/{ => damBreak}/system/setFieldsDict (100%)
 create mode 100755 tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean

diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allclean
deleted file mode 100755
index 57436cf0e0..0000000000
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allclean
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-(
-    cd periodicCubeArgon || exit
-
-    rm -rf 0/lagrangian 0/uniform
-    rm -f Ar-Ar
-    rm -f electrostatic
-    rm -f constant/idList
-    rm -rf constant/polyMesh/sets
-    cleanCase
-)
-
-
-(
-    cd periodicCubeWater || exit
-
-    rm -rf 0/lagrangian 0/uniform
-    rm -f O-O
-    rm -f electrostatic
-    rm -f constant/idList
-    rm -rf constant/polyMesh/sets
-    cleanCase
-)
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
new file mode 100755
index 0000000000..2c143aac73
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
@@ -0,0 +1,14 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0/lagrangian 0/uniform
+rm -f Ar-Ar
+rm -f electrostatic
+rm -f constant/idList
+rm -rf constant/polyMesh/sets
+cleanCase
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun
new file mode 100755
index 0000000000..80f6f3883e
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh
+runApplication mdInitialise
+runApplication `getApplication`
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
new file mode 100755
index 0000000000..f93c58ed3d
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
@@ -0,0 +1,14 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0/lagrangian 0/uniform
+rm -f O-O
+rm -f electrostatic
+rm -f constant/idList
+rm -rf constant/polyMesh/sets
+cleanCase
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun
new file mode 100755
index 0000000000..80f6f3883e
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh
+runApplication mdInitialise
+runApplication `getApplication`
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/icoFoam/Allclean b/tutorials/incompressible/icoFoam/cavity/Allclean
similarity index 71%
rename from tutorials/incompressible/icoFoam/Allclean
rename to tutorials/incompressible/icoFoam/cavity/Allclean
index 012a6bba34..c23389e81c 100755
--- a/tutorials/incompressible/icoFoam/Allclean
+++ b/tutorials/incompressible/icoFoam/cavity/Allclean
@@ -4,20 +4,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-keepCases="cavity cavityGrade cavityClipped elbow"
+keepCases="cavity cavityGrade cavityClipped"
 loseCases="cavityFine cavityHighRe"
 
 for caseName in $keepCases
 do
 (
     cd $caseName || exit
-
     foamCleanTutorials
-
-    if [ "$caseName" = elbow ]
-    then
-        rm -rf fluentInterface
-    fi
 )
 done
 
@@ -26,7 +20,4 @@ do
     removeCase $caseName
 done
 
-
-(cd elbow && ./Allclean)
-
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/icoFoam/Allrun b/tutorials/incompressible/icoFoam/cavity/Allrun
similarity index 96%
rename from tutorials/incompressible/icoFoam/Allrun
rename to tutorials/incompressible/icoFoam/cavity/Allrun
index a66f6fc671..032b71f2b8 100755
--- a/tutorials/incompressible/icoFoam/Allrun
+++ b/tutorials/incompressible/icoFoam/cavity/Allrun
@@ -86,8 +86,4 @@ do
     ( cd $caseName && runApplication `getApplication` )
 done
 
-
-# elbow case for testing Fluent-FOAM conversion tools
-(cd elbow && ./Allrun)
-
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/icoFoam/cavity/0/U b/tutorials/incompressible/icoFoam/cavity/cavity/0/U
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavity/0/U
rename to tutorials/incompressible/icoFoam/cavity/cavity/0/U
diff --git a/tutorials/incompressible/icoFoam/cavity/0/p b/tutorials/incompressible/icoFoam/cavity/cavity/0/p
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavity/0/p
rename to tutorials/incompressible/icoFoam/cavity/cavity/0/p
diff --git a/tutorials/incompressible/icoFoam/cavity/constant/transportProperties b/tutorials/incompressible/icoFoam/cavity/cavity/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavity/constant/transportProperties
rename to tutorials/incompressible/icoFoam/cavity/cavity/constant/transportProperties
diff --git a/tutorials/incompressible/icoFoam/cavity/system/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/cavity/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavity/system/blockMeshDict
rename to tutorials/incompressible/icoFoam/cavity/cavity/system/blockMeshDict
diff --git a/tutorials/incompressible/icoFoam/cavity/system/controlDict b/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavity/system/controlDict
rename to tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict
diff --git a/tutorials/incompressible/icoFoam/cavity/system/fvSchemes b/tutorials/incompressible/icoFoam/cavity/cavity/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavity/system/fvSchemes
rename to tutorials/incompressible/icoFoam/cavity/cavity/system/fvSchemes
diff --git a/tutorials/incompressible/icoFoam/cavity/system/fvSolution b/tutorials/incompressible/icoFoam/cavity/cavity/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavity/system/fvSolution
rename to tutorials/incompressible/icoFoam/cavity/cavity/system/fvSolution
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/0/U b/tutorials/incompressible/icoFoam/cavity/cavityClipped/0/U
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityClipped/0/U
rename to tutorials/incompressible/icoFoam/cavity/cavityClipped/0/U
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/0/p b/tutorials/incompressible/icoFoam/cavity/cavityClipped/0/p
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityClipped/0/p
rename to tutorials/incompressible/icoFoam/cavity/cavityClipped/0/p
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties b/tutorials/incompressible/icoFoam/cavity/cavityClipped/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties
rename to tutorials/incompressible/icoFoam/cavity/cavityClipped/constant/transportProperties
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityClipped/system/blockMeshDict
rename to tutorials/incompressible/icoFoam/cavity/cavityClipped/system/blockMeshDict
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/controlDict
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
rename to tutorials/incompressible/icoFoam/cavity/cavityClipped/system/controlDict
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes
rename to tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSchemes
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution
rename to tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSolution
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/mapFieldsDict b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/mapFieldsDict
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityClipped/system/mapFieldsDict
rename to tutorials/incompressible/icoFoam/cavity/cavityClipped/system/mapFieldsDict
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/0/U b/tutorials/incompressible/icoFoam/cavity/cavityGrade/0/U
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityGrade/0/U
rename to tutorials/incompressible/icoFoam/cavity/cavityGrade/0/U
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/0/p b/tutorials/incompressible/icoFoam/cavity/cavityGrade/0/p
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityGrade/0/p
rename to tutorials/incompressible/icoFoam/cavity/cavityGrade/0/p
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties b/tutorials/incompressible/icoFoam/cavity/cavityGrade/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties
rename to tutorials/incompressible/icoFoam/cavity/cavityGrade/constant/transportProperties
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityGrade/system/blockMeshDict
rename to tutorials/incompressible/icoFoam/cavity/cavityGrade/system/blockMeshDict
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/controlDict
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
rename to tutorials/incompressible/icoFoam/cavity/cavityGrade/system/controlDict
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes
rename to tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSchemes
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution
rename to tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSolution
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/mapFieldsDict b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/mapFieldsDict
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityGrade/system/mapFieldsDict
rename to tutorials/incompressible/icoFoam/cavity/cavityGrade/system/mapFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun
deleted file mode 100755
index c5b58c1513..0000000000
--- a/tutorials/multiphase/interFoam/laminar/Allrun
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-setDamBreakFine ()
-{
-    blockMeshDict="system/blockMeshDict"
-    controlDict="system/controlDict"
-    sed \
-    -e s/"23 8"/"46 10"/g \
-    -e s/"19 8"/"40 10"/g \
-    -e s/"23 42\(.*\) 1 1)"/"46 76\1 2 1)"/g \
-    -e s/"4 42\(.*\) 1 1)"/"4 76\1 2 1)"/g \
-    -e s/"19 42\(.*\) 1 1)"/"40 76\1 2 1)"/g \
-    $blockMeshDict > temp.$$
-    mv temp.$$ $blockMeshDict
-    sed \
-    -e s/"\(deltaT[ \t]*\) 0.001;"/"\1 5e-04;"/g \
-    -e s/"\(endTime[ \t]*\) 1;"/"\1 0.4;"/g \
-    $controlDict > temp.$$
-    mv temp.$$ $controlDict
-}
-
-# Do damBreak
-(
-    cd damBreak || exit
-
-    runApplication blockMesh
-    cp 0/alpha.water.org 0/alpha.water
-    runApplication setFields
-    runApplication `getApplication`
-)
-
-# Clone case
-cloneCase damBreak damBreakFine
-
-(
-    cd damBreakFine || exit
-
-    # Modify case
-    setDamBreakFine
-
-    # And execute
-    runApplication blockMesh
-    cp ../damBreak/0/alpha.water.org 0/alpha.water
-    runApplication setFields
-    runApplication decomposePar
-    runParallel `getApplication`
-    runApplication reconstructPar
-)
-
-# Do capillaryRise
-(cd capillaryRise && foamRunTutorials)
-
-# Do mixerVessel2D
-(cd mixerVessel2D && foamRunTutorials)
-
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water
new file mode 100644
index 0000000000..0cc6854ff5
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water
@@ -0,0 +1,8856 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+8000
+(
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+    atmosphere
+    {
+        type            zeroGradient;
+    }
+    walls
+    {
+        type            constantAlphaContactAngle;
+        theta0          45;
+        limit           gradient;
+        value           nonuniform List<scalar>
+800
+(
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+)
+;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/Allclean b/tutorials/multiphase/interFoam/laminar/damBreak/Allclean
similarity index 75%
rename from tutorials/multiphase/interFoam/laminar/Allclean
rename to tutorials/multiphase/interFoam/laminar/damBreak/Allclean
index d18e5ef574..28cb0ef1ea 100755
--- a/tutorials/multiphase/interFoam/laminar/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allclean
@@ -4,12 +4,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-keepCases="damBreak capillaryRise mixerVessel2D"
+keepCases="damBreak"
 loseCases="damBreakFine"
 
 for case in $keepCases
 do
-    (cd $case && foamCleanTutorials && rm -rf 0/alpha.water)
+    (cd $case && foamCleanTutorials)
 done
 
 for case in $loseCases
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
similarity index 85%
rename from tutorials/multiphase/interFoam/ras/Allrun
rename to tutorials/multiphase/interFoam/laminar/damBreak/Allrun
index 04439eec04..bd43fc4ecc 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
@@ -43,13 +43,4 @@ cloneCase damBreak damBreakFine
     runApplication reconstructPar
 )
 
-# Do damBreakPorousBaffle
-(cd damBreakPorousBaffle && foamRunTutorials)
-
-# Do weirOverflow
-(cd weirOverflow && foamRunTutorials)
-
-# Do waterChannel
-(cd waterChannel && foamRunTutorials)
-
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/U b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/0/U
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/U
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/alpha.water
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/alpha.water.org
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/alpha.water.org
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/p_rgh
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean
new file mode 100755
index 0000000000..92cf1ae4a7
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+cp 0/alpha.water.org 0/alpha.water
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
similarity index 53%
rename from tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
index 7221dc68db..5871e056f3 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
@@ -1,18 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-for caseName in periodicCubeArgon periodicCubeWater
-do
-(
-    cd $caseName || exit
+# Get application name
+application=`getApplication`
+
+runApplication blockMesh
+runApplication setFields
+runApplication $application
 
-    runApplication blockMesh
-    runApplication mdInitialise
-    runApplication `getApplication`
-)
-done
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/g b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/constant/g
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/alpha.water b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/alpha.water
new file mode 100644
index 0000000000..766d8c1462
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/alpha.water
@@ -0,0 +1,3119 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+3072
+(
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+)
+;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+    stator
+    {
+        type            zeroGradient;
+    }
+    front
+    {
+        type            empty;
+    }
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/Allclean b/tutorials/multiphase/interFoam/ras/damBreak/Allclean
similarity index 55%
rename from tutorials/multiphase/interFoam/ras/Allclean
rename to tutorials/multiphase/interFoam/ras/damBreak/Allclean
index 8b652373ba..28cb0ef1ea 100755
--- a/tutorials/multiphase/interFoam/ras/Allclean
+++ b/tutorials/multiphase/interFoam/ras/damBreak/Allclean
@@ -4,23 +4,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-keepCases="damBreak damBreakPorousBaffle weirOverflow waterChannel angledDuct"
+keepCases="damBreak"
 loseCases="damBreakFine"
 
 for case in $keepCases
 do
     (cd $case && foamCleanTutorials)
-
-    if [ "$case" = "damBreak" ]
-    then
-        cp $case/0/alpha.water.org $case/0/alpha.water
-    fi
-
-    if [ "$case" = "damBreakPorousBaffle" ]
-    then
-        cp $case/0/alpha.water.org $case/0/alpha.water
-    fi
-
 done
 
 for case in $loseCases
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
index 5871e056f3..bd43fc4ecc 100755
--- a/tutorials/multiphase/interFoam/ras/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
@@ -4,11 +4,43 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name
-application=`getApplication`
+setDamBreakFine ()
+{
+    blockMeshDict="system/blockMeshDict"
+    controlDict="system/controlDict"
+    sed \
+    -e s/"23 8"/"46 10"/g \
+    -e s/"19 8"/"40 10"/g \
+    -e s/"23 42\(.*\) 1 1)"/"46 76\1 2 1)"/g \
+    -e s/"4 42\(.*\) 1 1)"/"4 76\1 2 1)"/g \
+    -e s/"19 42\(.*\) 1 1)"/"40 76\1 2 1)"/g \
+    $blockMeshDict > temp.$$
+    mv temp.$$ $blockMeshDict
+    sed \
+    -e s/"\(deltaT[ \t]*\) 0.001;"/"\1 5e-04;"/g \
+    -e s/"\(endTime[ \t]*\) 1;"/"\1 0.4;"/g \
+    $controlDict > temp.$$
+    mv temp.$$ $controlDict
+}
 
-runApplication blockMesh
-runApplication setFields
-runApplication $application
+# Do damBreak
+(cd damBreak && foamRunTutorials)
+
+# Clone case
+cloneCase damBreak damBreakFine
+
+(
+    cd damBreakFine || exit
+
+    # Modify case
+    setDamBreakFine
+    cp ../damBreak/0/alpha.water.org 0/alpha.water
+    # And execute
+    runApplication blockMesh
+    runApplication setFields
+    runApplication decomposePar
+    runParallel `getApplication`
+    runApplication reconstructPar
+)
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/U b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/U
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/U
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/U
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/alpha.water
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/alpha.water.org b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/alpha.water.org
new file mode 100644
index 0000000000..b2319f1aa5
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/alpha.water.org
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+
+    rightWall
+    {
+        type            zeroGradient;
+    }
+
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/epsilon
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/epsilon
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/epsilon
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/k b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/k
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/k
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/k
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/nuTilda
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/nuTilda
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/nut b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/nut
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/nut
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/nut
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/p_rgh
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean
new file mode 100755
index 0000000000..92cf1ae4a7
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+cp 0/alpha.water.org 0/alpha.water
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun
new file mode 100755
index 0000000000..5871e056f3
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun
@@ -0,0 +1,14 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Get application name
+application=`getApplication`
+
+runApplication blockMesh
+runApplication setFields
+runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/g b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/constant/g
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/g
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/blockMeshDict b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/system/blockMeshDict
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/controlDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/fvSchemes
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/fvSolution
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
rename to tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean
new file mode 100755
index 0000000000..92cf1ae4a7
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+cp 0/alpha.water.org 0/alpha.water
+
+# ----------------------------------------------------------------- end-of-file

From 3faa7e2284d81eca56f9f0c1bd89fed89201f2d8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 14 Feb 2016 20:16:32 +0000
Subject: [PATCH 195/447] fixedMeanFvPatchField: Updated reading of "meanValue"
 Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1995

---
 .../fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
index 8f5d8f41ba..1637834c9f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
@@ -49,7 +49,7 @@ Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF, dict),
-    meanValue_(Function1<Type>::New(dict.lookup("meanValue"), dict))
+    meanValue_(Function1<Type>::New("meanValue", dict))
 {}
 
 

From cfa7678ba80c183c952b4da0390efb21a1aeedea Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 15 Feb 2016 15:49:05 +0000
Subject: [PATCH 196/447] foamRunTutorials: Rationalized support for the
 "-test" option RunFunctions: Added "isTest()" argument parsing function
 tutorials: Updated Allrun scripts to propagate the "-test" option tutorials:
 Removed the lower Alltest scripts and updated the Allrun to     use the
 "isTest()" function to handle test-specific operation

---
 bin/foamRunTutorials                          | 24 ++++++-------
 bin/tools/RunFunctions                        | 11 ++++++
 tutorials/combustion/chemFoam/gri/Allrun      |  3 +-
 tutorials/combustion/chemFoam/h2/Allrun       |  3 +-
 tutorials/combustion/chemFoam/ic8h18/Allrun   |  3 +-
 tutorials/combustion/chemFoam/nc7h16/Allrun   |  3 +-
 .../pisoFoam/les/motorBike/Allrun             | 13 ++++---
 .../pisoFoam/les/motorBike/Alltest            | 10 ------
 .../simpleFoam/turbineSiting/Allrun           |  2 +-
 tutorials/mesh/foamyHexMesh/Allrun            | 35 ++++++++++---------
 tutorials/mesh/foamyHexMesh/flange/Alltest    | 32 -----------------
 .../mesh/foamyHexMesh/mixerVessel/Alltest     |  9 -----
 tutorials/mesh/snappyHexMesh/Allrun           |  2 +-
 .../multiphase/cavitatingFoam/les/Allrun      |  4 +--
 14 files changed, 56 insertions(+), 98 deletions(-)
 delete mode 100755 tutorials/incompressible/pisoFoam/les/motorBike/Alltest
 delete mode 100755 tutorials/mesh/foamyHexMesh/flange/Alltest
 delete mode 100755 tutorials/mesh/foamyHexMesh/mixerVessel/Alltest

diff --git a/bin/foamRunTutorials b/bin/foamRunTutorials
index a2c33cfb8e..8f2325808f 100755
--- a/bin/foamRunTutorials
+++ b/bin/foamRunTutorials
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -94,16 +94,17 @@ do
     esac
 done
 
+passArgs=$(if $runTests; then echo "-test"; fi)
 
 # If an argument is supplied do not execute ./Allrun to avoid recursion
 if ! $skipFirst && $runTests && [ -f "./Alltest" ]
 then
     # Run a special test script.
-    ./Alltest
+    ./Alltest $passArgs
 elif ! $skipFirst && [ -f "./Allrun" ]
 then
     # Specialised script.
-    ./Allrun
+    ./Allrun $passArgs
 elif [ -d system ]
 then
     # Normal case.
@@ -120,20 +121,15 @@ else
             ( compileApplication $caseName )
         fi
     done
-    # Recurse to subdirectories
-    #for caseName in *
-    #do
-    #    if [ -d $caseName ]
-    #    then
-    #        ( cd $caseName && $thisScript )
-    #    fi
-    #done
     FOAM_TARGETS=$(for d in *; do [ -d "$d" ] && echo "$d"; done | xargs)
-    #$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$WM_SCHEDULER $thisScript"
 
-    passArgs=$(if $runTests; then echo "-test"; fi)
+    #$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs \
+    #      FOAM_TARGETS="$FOAM_TARGETS" \
+    #      FOAM_APP="$WM_SCHEDULER $thisScript" FOAM_ARGS="$passArgs"
 
-    $make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$thisScript" FOAM_ARGS="$passArgs"
+    $make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs \
+          FOAM_TARGETS="$FOAM_TARGETS" \
+          FOAM_APP="$thisScript" FOAM_ARGS="$passArgs"
 fi
 
 #------------------------------------------------------------------------------
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index b9240bb1ac..3c074c7267 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -28,6 +28,17 @@
 #     Miscellaneous functions for running tutorial cases
 #------------------------------------------------------------------------------
 
+isTest()
+{
+    for i in "$@"; do
+        if [ "$i" = "-test" ]
+        then
+            return 0
+        fi
+    done
+    return 1
+}
+
 getNumberOfProcessors()
 {
     expandDictionary system/decomposeParDict \
diff --git a/tutorials/combustion/chemFoam/gri/Allrun b/tutorials/combustion/chemFoam/gri/Allrun
index 8bc8e4c075..82ff17fe53 100755
--- a/tutorials/combustion/chemFoam/gri/Allrun
+++ b/tutorials/combustion/chemFoam/gri/Allrun
@@ -9,7 +9,6 @@ application=`getApplication`
 
 runApplication $application
 
-(cd validation && ./Allrun)
+(cd validation && ./Allrun $*)
 
 # ----------------------------------------------------------------- end-of-file
-
diff --git a/tutorials/combustion/chemFoam/h2/Allrun b/tutorials/combustion/chemFoam/h2/Allrun
index 8bc8e4c075..82ff17fe53 100755
--- a/tutorials/combustion/chemFoam/h2/Allrun
+++ b/tutorials/combustion/chemFoam/h2/Allrun
@@ -9,7 +9,6 @@ application=`getApplication`
 
 runApplication $application
 
-(cd validation && ./Allrun)
+(cd validation && ./Allrun $*)
 
 # ----------------------------------------------------------------- end-of-file
-
diff --git a/tutorials/combustion/chemFoam/ic8h18/Allrun b/tutorials/combustion/chemFoam/ic8h18/Allrun
index 8bc8e4c075..82ff17fe53 100755
--- a/tutorials/combustion/chemFoam/ic8h18/Allrun
+++ b/tutorials/combustion/chemFoam/ic8h18/Allrun
@@ -9,7 +9,6 @@ application=`getApplication`
 
 runApplication $application
 
-(cd validation && ./Allrun)
+(cd validation && ./Allrun $*)
 
 # ----------------------------------------------------------------- end-of-file
-
diff --git a/tutorials/combustion/chemFoam/nc7h16/Allrun b/tutorials/combustion/chemFoam/nc7h16/Allrun
index 8bc8e4c075..82ff17fe53 100755
--- a/tutorials/combustion/chemFoam/nc7h16/Allrun
+++ b/tutorials/combustion/chemFoam/nc7h16/Allrun
@@ -9,7 +9,6 @@ application=`getApplication`
 
 runApplication $application
 
-(cd validation && ./Allrun)
+(cd validation && ./Allrun $*)
 
 # ----------------------------------------------------------------- end-of-file
-
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/Allrun
index ebba3c5ff4..cc5a578966 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/Allrun
@@ -25,11 +25,14 @@ cloneParallelCase()
 # Do the Spalart-Allmaras steady-state case
 (cd motorBike && foamRunTutorials)
 
-# Clone the steady-state case to the LES case
-cloneParallelCase motorBike motorBikeLES
+if ! isTest $@
+then
+    # Clone the steady-state case to the LES case
+    cloneParallelCase motorBike motorBikeLES
 
-# Do the LES case
-cp lesFiles/Allrun motorBikeLES/
-(cd motorBikeLES && foamRunTutorials)
+    # Do the LES case
+    cp lesFiles/Allrun motorBikeLES/
+    (cd motorBikeLES && foamRunTutorials)
+fi
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/Alltest b/tutorials/incompressible/pisoFoam/les/motorBike/Alltest
deleted file mode 100755
index 97e6f48160..0000000000
--- a/tutorials/incompressible/pisoFoam/les/motorBike/Alltest
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Do the Spalart-Allmaras steady-state case
-(cd motorBike && foamRunTutorials)
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
index 310b8184e7..702759237d 100755
--- a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
@@ -16,7 +16,7 @@ runParallel snappyHexMesh -overwrite
 
 find . -type f -iname "*level*" -exec rm {} \;
 
-ls -d processor* | xargs -I {} cp -r 0.org ./{}/0 $1
+ls -d processor* | xargs -I {} cp -r 0.org ./{}/0
 
 runParallel topoSet
 runParallel `getApplication`
diff --git a/tutorials/mesh/foamyHexMesh/Allrun b/tutorials/mesh/foamyHexMesh/Allrun
index e33b67e647..5a6e534cbf 100755
--- a/tutorials/mesh/foamyHexMesh/Allrun
+++ b/tutorials/mesh/foamyHexMesh/Allrun
@@ -1,29 +1,32 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
+# Any cases that are links to solver test cases and are run when the Allrun
+# scripts of those solvers are run.  This script avoids meshing these cases
+# twice.
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 (
     cd blob || exit
-    ./Allrun
-)
-(
-    cd flange || exit
-    ./Allrun
+    ./Allrun $*
 )
 (
     cd simpleShapes || exit
-    ./Allrun
-)
-(
-    cd mixerVessel || exit
-    ./Allrun
+    ./Allrun $*
 )
 
-exit 0
-
-# Any cases that are links to solver test cases and are run when the Allrun
-# scripts of those solvers are run.
-
-# This dummy Allrun script avoids meshing these cases twice.
+if ! isTest $@
+then
+    (
+        cd flange || exit
+        ./Allrun $*
+    )
+    (
+        cd mixerVessel || exit
+        ./Allrun $*
+    )
+fi
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/mesh/foamyHexMesh/flange/Alltest b/tutorials/mesh/foamyHexMesh/flange/Alltest
deleted file mode 100755
index 6d4a154448..0000000000
--- a/tutorials/mesh/foamyHexMesh/flange/Alltest
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# copy flange surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
-
-cp system/controlDict system/controlDict.org
-
-sed -e s/"\(endTime[ \t]*\)\([0-9]*\);"/"\1 10;"/g \
-    -e s/"\(writeInterval[ \t]*\)\([0-9]*\);"/"\1 10;"/g \
-    system/controlDict.org > system/controlDict
-
-runApplication foamyHexMesh
-
-# Change collapseEdges to only do one iteration
-cp system/collapseDict system/collapseDict.org
-
-sed -e s/"\(maximumIterations[ \t]*\)\([0-9]*\);"/"\1 1;"/g \
-    system/collapseDict.org > system/collapseDict
-
-runApplication collapseEdges -latestTime -collapseFaces
-
-cp system/controlDict.org system/controlDict
-cp system/collapseDict.org system/collapseDict
-
-rm -f system/controlDict.org system/collapseDict.org
-
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Alltest b/tutorials/mesh/foamyHexMesh/mixerVessel/Alltest
deleted file mode 100755
index 56c0410d55..0000000000
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Alltest
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Do nothing for now.
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/mesh/snappyHexMesh/Allrun b/tutorials/mesh/snappyHexMesh/Allrun
index a035a98d0a..4a41dcfe2c 100755
--- a/tutorials/mesh/snappyHexMesh/Allrun
+++ b/tutorials/mesh/snappyHexMesh/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 (
     cd flange || exit
-    ./Allrun
+    ./Allrun $*
 )
 
 exit 0
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun
index e15cc1a1db..d00a7e4b5c 100755
--- a/tutorials/multiphase/cavitatingFoam/les/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/Allrun
@@ -3,12 +3,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 (
     cd throttle || exit
-    ./Allrun
+    ./Allrun $*
 )
 
 (
     cd throttle3D || exit
-    ./Allrun
+    ./Allrun $*
 )
 
 # ----------------------------------------------------------------- end-of-file

From 618bf48a61acacf8e44d9c5decc62e3e5bf1ecd6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 15 Feb 2016 15:52:33 +0000
Subject: [PATCH 197/447] MRFZone: Added patch-based "relative" function

---
 .../cfdTools/general/MRF/MRFZone.C            |  6 ++++
 .../cfdTools/general/MRF/MRFZone.H            | 13 +++++++
 .../cfdTools/general/MRF/MRFZoneList.C        | 18 ++++++++++
 .../cfdTools/general/MRF/MRFZoneList.H        |  8 +++++
 .../cfdTools/general/MRF/MRFZoneTemplates.C   | 36 ++++++++++++++++++-
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index c350d14a0c..0c902d6faa 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -453,6 +453,12 @@ void Foam::MRFZone::makeRelative(FieldField<fvsPatchField, scalar>& phi) const
 }
 
 
+void Foam::MRFZone::makeRelative(Field<scalar>& phi, const label patchi) const
+{
+    makeRelativeRhoFlux(oneField(), phi, patchi);
+}
+
+
 void Foam::MRFZone::makeRelative
 (
     const surfaceScalarField& rho,
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index 9054d20d33..1600ac4e79 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -129,6 +129,15 @@ class MRFZone
             FieldField<fvsPatchField, scalar>& phi
         ) const;
 
+        //- Make the given absolute mass/vol flux relative within the MRF region
+        template<class RhoFieldType>
+        void makeRelativeRhoFlux
+        (
+            const RhoFieldType& rho,
+            Field<scalar>& phi,
+            const label patchi
+        ) const;
+
         //- Make the given relative mass/vol flux absolute within the MRF region
         template<class RhoFieldType>
         void makeAbsoluteRhoFlux
@@ -226,6 +235,10 @@ public:
             //  within the MRF region
             void makeRelative(FieldField<fvsPatchField, scalar>& phi) const;
 
+            //- Make the given absolute patch flux relative
+            //  within the MRF region
+            void makeRelative(Field<scalar>& phi, const label patchi) const;
+
             //- Make the given absolute mass-flux relative within the MRF region
             void makeRelative
             (
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
index b9a64b2fb0..3b045fa22b 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
@@ -247,6 +247,24 @@ Foam::MRFZoneList::relative
 }
 
 
+Foam::tmp<Foam::Field<Foam::scalar>>
+Foam::MRFZoneList::relative
+(
+    const tmp<Field<scalar>>& phi,
+    const label patchi
+) const
+{
+    tmp<Field<scalar>> rphi(phi.ptr());
+
+    forAll(*this, i)
+    {
+        operator[](i).makeRelative(rphi(), patchi);
+    }
+
+    return rphi;
+}
+
+
 void Foam::MRFZoneList::makeRelative
 (
     const surfaceScalarField& rho,
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
index 3139e7e76b..fb36e689ea 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
@@ -142,6 +142,14 @@ public:
             const tmp<FieldField<fvsPatchField, scalar>>& tphi
         ) const;
 
+        //- Return the given absolute patch flux relative within
+        //  the MRF region
+        tmp<Field<scalar>> relative
+        (
+            const tmp<Field<scalar>>& tphi,
+            const label patchi
+        ) const;
+
         //- Make the given absolute mass-flux relative within the MRF region
         void makeRelative
         (
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
index ff056fb3b3..b4a59329df 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,6 +97,40 @@ void Foam::MRFZone::makeRelativeRhoFlux
 }
 
 
+template<class RhoFieldType>
+void Foam::MRFZone::makeRelativeRhoFlux
+(
+    const RhoFieldType& rho,
+    Field<scalar>& phi,
+    const label patchi
+) const
+{
+    const surfaceVectorField& Cf = mesh_.Cf();
+    const surfaceVectorField& Sf = mesh_.Sf();
+
+    const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_;
+
+    // Included patches
+    forAll(includedFaces_[patchi], i)
+    {
+        label patchFacei = includedFaces_[patchi][i];
+
+        phi[patchFacei] = 0.0;
+    }
+
+    // Excluded patches
+    forAll(excludedFaces_[patchi], i)
+    {
+        label patchFacei = excludedFaces_[patchi][i];
+
+        phi[patchFacei] -=
+            rho[patchFacei]
+          * (Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin_))
+          & Sf.boundaryField()[patchi][patchFacei];
+    }
+}
+
+
 template<class RhoFieldType>
 void Foam::MRFZone::makeAbsoluteRhoFlux
 (

From 4bb7f08e8ce3b20351f1864b3dcf42e7d2daa956 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 15 Feb 2016 15:53:04 +0000
Subject: [PATCH 198/447] constrainPressure: Updated to use the more efficient
 patch-based MRF::relative function

---
 .../constrainPressure/constrainPressure.C     | 57 +++++++------------
 .../constrainPressure/constrainPressure.H     |  7 +++
 2 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C
index c086d5f3ee..760a335465 100644
--- a/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C
+++ b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C
@@ -43,48 +43,35 @@ void Foam::constrainPressure
 )
 {
     const fvMesh& mesh = p.mesh();
+
     volScalarField::GeometricBoundaryField& pBf = p.boundaryField();
 
-    bool hasFixedFluxBCs = false;
+    const volVectorField::GeometricBoundaryField& UBf = U.boundaryField();
+    const surfaceScalarField::GeometricBoundaryField& phiHbyABf =
+        phiHbyA.boundaryField();
+    const typename RAUType::GeometricBoundaryField& rhorAUBf =
+        rhorAU.boundaryField();
+    const surfaceVectorField::GeometricBoundaryField& SfBf =
+        mesh.Sf().boundaryField();
+    const surfaceScalarField::GeometricBoundaryField& magSfBf =
+        mesh.magSf().boundaryField();
+
     forAll(pBf, patchi)
     {
         if (isA<fixedFluxPressureFvPatchScalarField>(pBf[patchi]))
         {
-            hasFixedFluxBCs = true;
-            break;
-        }
-    }
-
-    if (hasFixedFluxBCs)
-    {
-        const surfaceScalarField::GeometricBoundaryField& phiHbyABf =
-            phiHbyA.boundaryField();
-        const typename RAUType::GeometricBoundaryField& rhorAUBf =
-            rhorAU.boundaryField();
-        const surfaceScalarField::GeometricBoundaryField& magSfBf =
-            mesh.magSf().boundaryField();
-
-        // Pre-compute tho relative flux for all patches: currently MRFZone does
-        // not support computing the relative flux for individual patches
-        FieldField<fvsPatchField, scalar> phiRelBf
-        (
-            MRF.relative(mesh.Sf().boundaryField() & U.boundaryField())
-        );
-
-        forAll(pBf, patchi)
-        {
-            if (isA<fixedFluxPressureFvPatchScalarField>(pBf[patchi]))
-            {
-                refCast<fixedFluxPressureFvPatchScalarField>(pBf[patchi])
-               .updateCoeffs
+            refCast<fixedFluxPressureFvPatchScalarField>
+            (
+                pBf[patchi]
+            ).updateCoeffs
+            (
                 (
-                    (
-                        phiHbyABf[patchi]
-                      - rho.boundaryField()[patchi]*phiRelBf[patchi]
-                    )
-                   /(magSfBf[patchi]*rhorAUBf[patchi])
-                );
-            }
+                    phiHbyABf[patchi]
+                  - rho.boundaryField()[patchi]
+                   *MRF.relative(SfBf[patchi] & UBf[patchi], patchi)
+                )
+               /(magSfBf[patchi]*rhorAUBf[patchi])
+            );
         }
     }
 }
diff --git a/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H
index b3e522ee05..06359c8ad2 100644
--- a/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H
+++ b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H
@@ -68,6 +68,13 @@ public:
         {
             return U;
         }
+
+        //- Return the argument unchanged
+        template<class Type>
+        inline const Type& relative(const Type& U, const label patchi) const
+        {
+            return U;
+        }
 };
 
 

From d2d007f00ea0c9b3f8bda6cd77db04b8fdbf1a28 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 15 Feb 2016 16:36:58 +0000
Subject: [PATCH 199/447] foamRunTutorials: Removed redundant code and
 simplified

---
 bin/foamRunTutorials | 62 ++++++++------------------------------------
 1 file changed, 11 insertions(+), 51 deletions(-)

diff --git a/bin/foamRunTutorials b/bin/foamRunTutorials
index 8f2325808f..7aabb6c480 100755
--- a/bin/foamRunTutorials
+++ b/bin/foamRunTutorials
@@ -26,47 +26,15 @@
 #     foamRunTutorials
 #
 # Description
-#       Run either Allrun or blockMesh/application in current directory
-#       and all its subdirectories.
+#     Run either Allrun or blockMesh/application in current directory
+#     and all its subdirectories.
 #
 #------------------------------------------------------------------------------
 
-#------------------------------------------------------------------------------
-# Select the version of make to be used
-#------------------------------------------------------------------------------
-
-# normally use "make"
+# Normally use standard "make"
 make="make"
-runTests=false
-skipFirst=false
 
-## set WM_NCOMPPROCS automatically when both WM_HOSTS and WM_SCHEDULER are set
-#if [ -z "$WM_NCOMPPROCS" -a -n "$WM_HOSTS" -a -n "$WM_SCHEDULER" ]
-#then
-#    WM_NCOMPPROCS=$(wmakeScheduler -count)
-#    [ $? -eq 0 ] || unset WM_NCOMPPROCS
-#fi
-#
-#if [ "$WM_NCOMPPROCS" ]
-#then
-#    if [ "$WM_NCOMPPROCS" -gt 1 -a ! "$MAKEFLAGS" ]
-#    then
-#        lockDir=$HOME/.$WM_PROJECT/.wmake
-#
-#        if [ -d $lockDir ]
-#        then
-#            rm -f $lockDir/*
-#        else
-#            mkdir -p $lockDir
-#        fi
-#
-#        make="make --no-print-directory -j "$WM_NCOMPPROCS
-#    fi
-#fi
-
-
-
-# Source tutorial functions
+# Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 thisScript=$0
@@ -75,13 +43,14 @@ then
     thisScript="$PWD/$thisScript"
 fi
 
+skipFirst=false
 
-# parse options
+# Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     -t | -test)
-        runTests=true
+        passArgs="-test"
         shift
         ;;
     -s | -skipFirst)
@@ -94,20 +63,14 @@ do
     esac
 done
 
-passArgs=$(if $runTests; then echo "-test"; fi)
-
 # If an argument is supplied do not execute ./Allrun to avoid recursion
-if ! $skipFirst && $runTests && [ -f "./Alltest" ]
+if ! $skipFirst && [ -f "./Allrun" ]
 then
-    # Run a special test script.
-    ./Alltest $passArgs
-elif ! $skipFirst && [ -f "./Allrun" ]
-then
-    # Specialised script.
+    # Run specialised Allrun script.
     ./Allrun $passArgs
 elif [ -d system ]
 then
-    # Normal case.
+    # Run normal case.
     parentDir=`dirname $PWD`
     application=`getApplication`
     runApplication blockMesh
@@ -123,10 +86,7 @@ else
     done
     FOAM_TARGETS=$(for d in *; do [ -d "$d" ] && echo "$d"; done | xargs)
 
-    #$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs \
-    #      FOAM_TARGETS="$FOAM_TARGETS" \
-    #      FOAM_APP="$WM_SCHEDULER $thisScript" FOAM_ARGS="$passArgs"
-
+    # Run all cases which have not already been run
     $make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs \
           FOAM_TARGETS="$FOAM_TARGETS" \
           FOAM_APP="$thisScript" FOAM_ARGS="$passArgs"

From 0196822968ef777c990cffa86d6b5b54a6ff16ba Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 15 Feb 2016 18:00:20 +0000
Subject: [PATCH 200/447] MPPICFoam PackingModels: Implicit: Added limiting to
 the calculation of the correction flux.

Vastly reduces the scattering and churning behaviour of packed beds.

Development provided by Will Bainbridge <github.com/will-bainbridge>

See also http://www.openfoam.org/mantisbt/view.php?id=1994
---
 .../MPPIC/PackingModels/Implicit/Implicit.C   | 102 +++++++++++++++---
 .../MPPIC/PackingModels/Implicit/Implicit.H   |   5 +-
 .../constant/kinematicCloudProperties         |   1 +
 .../column/constant/kinematicCloudProperties  |   1 +
 .../cyclone/constant/kinematicCloudProperties |   1 +
 5 files changed, 93 insertions(+), 17 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
index 5cb2092818..ab2b457991 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
@@ -48,6 +48,7 @@ Foam::PackingModels::Implicit<CloudType>::Implicit
     ),
     phiCorrect_(NULL),
     uCorrect_(NULL),
+    applyLimiting_(this->coeffDict().lookup("applyLimiting")),
     applyGravity_(this->coeffDict().lookup("applyGravity")),
     alphaMin_(readScalar(this->coeffDict().lookup("alphaMin"))),
     rhoMin_(readScalar(this->coeffDict().lookup("rhoMin")))
@@ -66,6 +67,7 @@ Foam::PackingModels::Implicit<CloudType>::Implicit
     alpha_(cm.alpha_),
     phiCorrect_(cm.phiCorrect_()),
     uCorrect_(cm.uCorrect_()),
+    applyLimiting_(cm.applyLimiting_),
     applyGravity_(cm.applyGravity_),
     alphaMin_(cm.alphaMin_),
     rhoMin_(cm.rhoMin_)
@@ -102,6 +104,11 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
             (
                 cloudName + ":rhoAverage"
             );
+        const AveragingMethod<vector>& uAverage =
+            mesh.lookupObject<AveragingMethod<vector> >
+            (
+                cloudName + ":uAverage"
+            );
         const AveragingMethod<scalar>& uSqrAverage =
             mesh.lookupObject<AveragingMethod<scalar>>
             (
@@ -135,13 +142,6 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
         rho.internalField() = max(rhoAverage.internalField(), rhoMin_);
         rho.correctBoundaryConditions();
 
-        //Info << "       x: " << mesh.C().internalField().component(2) << endl;
-        //Info << "   alpha: " << alpha_.internalField() << endl;
-        //Info << "alphaOld: " << alpha_.oldTime().internalField() << endl;
-        //Info << "     rho: " << rho.internalField() << endl;
-        //Info << endl;
-
-
         // Stress field
         // ~~~~~~~~~~~~
 
@@ -172,6 +172,24 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
         tauPrime.correctBoundaryConditions();
 
 
+        // Gravity flux
+        // ~~~~~~~~~~~~
+
+        tmp<surfaceScalarField> phiGByA;
+
+        if (applyGravity_)
+        (
+            phiGByA = tmp<surfaceScalarField>
+            (
+                new surfaceScalarField
+                (
+                    "phiGByA",
+                    deltaT*(g & mesh.Sf())*fvc::interpolate(1.0 - rhoc/rho)
+                )
+            )
+        );
+
+
         // Implicit solution for the volume fraction
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -191,14 +209,7 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
 
         if (applyGravity_)
         {
-            surfaceScalarField
-                phiGByA
-                (
-                    "phiGByA",
-                    deltaT*(g & mesh.Sf())*fvc::interpolate(1.0 - rhoc/rho)
-                );
-
-            alphaEqn += fvm::div(phiGByA, alpha_);
+            alphaEqn += fvm::div(phiGByA(), alpha_);
         }
 
         alphaEqn.solve();
@@ -217,6 +228,67 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
             )
         );
 
+        // limit the correction flux
+        if (applyLimiting_)
+        {
+            volVectorField U
+            (
+                IOobject
+                (
+                    cloudName + ":U",
+                    this->owner().db().time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh,
+                dimensionedVector("zero", dimVelocity, vector::zero),
+                fixedValueFvPatchField<vector>::typeName
+            );
+            U.internalField() = uAverage.internalField();
+            U.correctBoundaryConditions();
+
+            surfaceScalarField phi
+            (
+                cloudName + ":phi",
+                linearInterpolate(U) & mesh.Sf()
+            );
+
+            if (applyGravity_)
+            {
+                phiCorrect_() -= phiGByA();
+            }
+
+            forAll(phiCorrect_(), faceI)
+            {
+                // Current and correction fluxes
+                const scalar phiCurr = phi[faceI];
+                scalar& phiCorr = phiCorrect_()[faceI];
+
+                // Don't limit if the correction is in the opposite direction to
+                // the flux. We need all the help we can get in this state.
+                if (phiCurr*phiCorr < 0)
+                {}
+
+                // If the correction and the flux are in the same direction then
+                // don't apply any more correction than is already present in
+                // the flux.
+                else if (phiCorr > 0)
+                {
+                    phiCorr = max(phiCorr - phiCurr, 0);
+                }
+                else
+                {
+                    phiCorr = min(phiCorr - phiCurr, 0);
+                }
+            }
+
+            if (applyGravity_)
+            {
+                phiCorrect_() += phiGByA();
+            }
+        }
+
         // correction velocity
         uCorrect_ = tmp<volVectorField>
         (
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
index 9f90dabcbf..dc31170004 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
@@ -58,8 +58,6 @@ class Implicit
 :
     public PackingModel<CloudType>
 {
-private:
-
     //- Private data
 
         //- Volume fraction field
@@ -71,6 +69,9 @@ private:
         //- Correction cell-centred velocity
         tmp<volVectorField> uCorrect_;
 
+        //- Flag to indicate whether implicit limiting is applied
+        Switch applyLimiting_;
+
         //- Flag to indicate whether gravity is applied
         Switch applyGravity_;
 
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
index fdb104bc2d..9f46325f60 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
@@ -148,6 +148,7 @@ subModels
     {
         alphaMin 0.0001;
         rhoMin 1.0;
+        applyLimiting true;
         applyGravity false;
         particleStressModel
         {
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
index f086e389ec..00d205137b 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
@@ -140,6 +140,7 @@ subModels
     {
         alphaMin 0.0001;
         rhoMin 1.0;
+        applyLimiting true;
         applyGravity true;
         particleStressModel
         {
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
index 78bac15385..d72fd63163 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
@@ -145,6 +145,7 @@ subModels
     {
         alphaMin 0.0001;
         rhoMin 1.0;
+        applyLimiting true;
         applyGravity false;
         particleStressModel
         {

From 350d03246e317ec331c3296bc68f0c978e77a623 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 15 Feb 2016 18:30:24 +0000
Subject: [PATCH 201/447] scripts: Reformat with consistent section separators

---
 .gitignore                                             |  2 --
 Allwmake                                               |  2 +-
 applications/Allwmake                                  |  2 +-
 .../solvers/compressible/rhoCentralFoam/Allwclean      |  2 +-
 .../solvers/compressible/rhoCentralFoam/Allwmake       |  2 +-
 .../solvers/multiphase/compressibleInterFoam/Allwclean |  2 +-
 .../solvers/multiphase/compressibleInterFoam/Allwmake  |  2 +-
 .../compressibleMultiphaseInterFoam/Allwclean          |  2 +-
 .../compressibleMultiphaseInterFoam/Allwmake           |  2 +-
 .../solvers/multiphase/driftFluxFoam/Allwclean         |  2 +-
 applications/solvers/multiphase/driftFluxFoam/Allwmake |  2 +-
 .../solvers/multiphase/interPhaseChangeFoam/Allwclean  |  2 +-
 .../solvers/multiphase/interPhaseChangeFoam/Allwmake   |  2 +-
 .../solvers/multiphase/multiphaseEulerFoam/Allwclean   |  2 +-
 .../solvers/multiphase/multiphaseEulerFoam/Allwmake    |  2 +-
 .../solvers/multiphase/multiphaseInterFoam/Allwclean   |  2 +-
 .../solvers/multiphase/multiphaseInterFoam/Allwmake    |  2 +-
 .../solvers/multiphase/reactingEulerFoam/Allwclean     |  2 +-
 .../solvers/multiphase/reactingEulerFoam/Allwmake      |  2 +-
 .../reactingMultiphaseEulerFoam/Allwclean              |  2 +-
 .../reactingMultiphaseEulerFoam/Allwmake               |  2 +-
 .../reactingTwoPhaseEulerFoam/Allwclean                |  2 +-
 .../reactingTwoPhaseEulerFoam/Allwmake                 |  2 +-
 .../solvers/multiphase/twoPhaseEulerFoam/Allwclean     |  2 +-
 .../solvers/multiphase/twoPhaseEulerFoam/Allwmake      |  2 +-
 applications/test/fieldMapping/pipe1D/Allrun           |  2 +-
 applications/test/hexRef8/block/Allrun                 |  2 +-
 applications/test/volField/cavity/Allrun               |  2 +-
 .../utilities/mesh/conversion/Optional/Allwmake        |  4 ++--
 applications/utilities/mesh/generation/Allwmake        |  2 +-
 .../utilities/mesh/generation/extrude2DMesh/Allwclean  |  2 +-
 .../utilities/mesh/generation/extrude2DMesh/Allwmake   |  2 +-
 .../utilities/mesh/generation/foamyMesh/Allwclean      |  2 +-
 .../utilities/mesh/generation/foamyMesh/Allwmake       |  2 +-
 .../foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake     |  2 +-
 .../utilities/mesh/manipulation/renumberMesh/Allwmake  |  2 +-
 .../utilities/mesh/manipulation/setSet/Allwmake        |  2 +-
 .../utilities/miscellaneous/foamHelp/Allwclean         |  2 +-
 applications/utilities/miscellaneous/foamHelp/Allwmake |  2 +-
 .../dataConversion/foamToTecplot360/Allwmake           |  2 +-
 .../postProcessing/graphics/PV3Readers/Allwclean       |  2 +-
 .../postProcessing/graphics/PV3Readers/Allwmake        |  2 +-
 .../graphics/PV3Readers/PV3FoamReader/Allwclean        |  2 +-
 .../graphics/PV3Readers/PV3FoamReader/Allwmake         |  2 +-
 .../graphics/PV3Readers/PV3blockMeshReader/Allwclean   |  2 +-
 .../graphics/PV3Readers/PV3blockMeshReader/Allwmake    |  2 +-
 .../postProcessing/graphics/PVReaders/Allwclean        |  2 +-
 .../postProcessing/graphics/PVReaders/Allwmake         |  2 +-
 .../graphics/PVReaders/PVFoamReader/Allwclean          |  2 +-
 .../graphics/PVReaders/PVFoamReader/Allwmake           |  2 +-
 .../graphics/PVReaders/PVblockMeshReader/Allwclean     |  2 +-
 .../graphics/PVReaders/PVblockMeshReader/Allwmake      |  2 +-
 .../postProcessing/graphics/ensightFoamReader/Allwmake |  2 +-
 .../utilities/preProcessing/wallFunctionTable/Allwmake |  2 +-
 bin/findEmptyMake                                      |  4 ++--
 bin/foamCleanPath                                      |  4 ++--
 bin/foamCopySettings                                   | 10 +++++-----
 bin/foamUpdateCaseFileHeader                           |  4 ++--
 bin/tools/doxyFilter-ignore.awk                        | 10 +++++-----
 bin/tools/doxyFilter-top.awk                           |  8 ++++----
 bin/tools/doxyFilter.awk                               | 10 +++++-----
 bin/tools/doxyFilter.sed                               |  6 +++---
 doc/Allwmake                                           |  2 +-
 doc/Doxygen/Allwmake                                   |  2 +-
 doc/tools/find-its                                     |  6 +++---
 doc/tools/find-trailingspace                           |  6 +++---
 etc/bashrc                                             |  2 +-
 etc/codeTemplates/foamScript                           |  4 ++--
 etc/config.csh/CGAL                                    |  2 +-
 etc/config.csh/aliases                                 |  2 +-
 etc/config.csh/ensight                                 |  2 +-
 etc/config.csh/example/compiler                        |  2 +-
 etc/config.csh/example/openmpi                         |  2 +-
 etc/config.csh/example/paraview                        |  2 +-
 etc/config.csh/example/prefs.csh                       |  2 +-
 etc/config.csh/mpi                                     |  2 +-
 etc/config.csh/paraview                                |  2 +-
 etc/config.csh/settings                                |  2 +-
 etc/config.csh/unset                                   |  2 +-
 etc/config.sh/CGAL                                     |  2 +-
 etc/config.sh/aliases                                  |  2 +-
 etc/config.sh/ensight                                  |  2 +-
 etc/config.sh/example/compiler                         |  2 +-
 etc/config.sh/example/openmpi                          |  2 +-
 etc/config.sh/example/paraview                         |  2 +-
 etc/config.sh/example/prefs.sh                         |  2 +-
 etc/config.sh/gperftools                               |  2 +-
 etc/config.sh/metis                                    |  2 +-
 etc/config.sh/mpi                                      |  2 +-
 etc/config.sh/paraview                                 |  2 +-
 etc/config.sh/scotch                                   |  2 +-
 etc/config.sh/settings                                 |  2 +-
 etc/config.sh/unset                                    |  2 +-
 etc/cshrc                                              |  2 +-
 etc/templates/axisymmetricJet/Allrun                   |  2 +-
 src/Allwmake                                           |  2 +-
 src/OSspecific/POSIX/Allwmake                          |  2 +-
 src/Pstream/Allwmake                                   |  2 +-
 src/TurbulenceModels/Allwmake                          |  2 +-
 src/conversion/Allwmake                                |  2 +-
 src/dummyThirdParty/Allwmake                           |  2 +-
 src/fvAgglomerationMethods/Allwmake                    |  2 +-
 src/lagrangian/Allwmake                                |  2 +-
 src/lagrangian/molecularDynamics/Allwmake              |  2 +-
 src/mesh/Allwmake                                      |  2 +-
 src/parallel/Allwmake                                  |  2 +-
 src/parallel/decompose/Allwmake                        |  2 +-
 src/parallel/decompose/AllwmakeLnInclude               |  2 +-
 src/parallel/decompose/metisDecomp/Allwmake            |  2 +-
 src/parallel/reconstruct/Allwmake                      |  2 +-
 src/postProcessing/Allwmake                            |  2 +-
 src/postProcessing/functionObjects/Allwmake            |  2 +-
 src/regionModels/Allwclean                             |  2 +-
 src/regionModels/Allwmake                              |  2 +-
 src/renumber/Allwmake                                  |  2 +-
 src/thermophysicalModels/Allwmake                      |  2 +-
 src/thermophysicalModels/properties/Allwmake           |  2 +-
 src/transportModels/Allwmake                           |  2 +-
 tutorials/Allclean                                     |  2 +-
 tutorials/Allrun                                       |  4 ++--
 tutorials/Alltest                                      |  4 ++--
 tutorials/DNS/dnsFoam/boxTurb16/Allclean               |  2 +-
 tutorials/DNS/dnsFoam/boxTurb16/Allrun                 |  2 +-
 tutorials/basic/laplacianFoam/flange/Allclean          |  2 +-
 tutorials/basic/laplacianFoam/flange/Allrun            |  2 +-
 tutorials/basic/potentialFoam/cylinder/Allclean        |  2 +-
 tutorials/basic/potentialFoam/cylinder/Allrun          |  2 +-
 tutorials/basic/potentialFoam/pitzDaily/Allclean       |  2 +-
 tutorials/basic/potentialFoam/pitzDaily/Allrun         |  2 +-
 .../PDRFoam/flamePropagationWithObstacles/Allclean     |  2 +-
 .../PDRFoam/flamePropagationWithObstacles/Allrun       |  2 +-
 tutorials/combustion/XiFoam/ras/Allclean               |  2 +-
 tutorials/combustion/XiFoam/ras/Allrun                 |  2 +-
 tutorials/combustion/chemFoam/gri/Allclean             |  2 +-
 tutorials/combustion/chemFoam/gri/Allrun               |  2 +-
 tutorials/combustion/chemFoam/gri/validation/Allrun    |  2 +-
 .../combustion/chemFoam/gri/validation/createGraph     |  2 +-
 tutorials/combustion/chemFoam/h2/Allclean              |  2 +-
 tutorials/combustion/chemFoam/h2/Allrun                |  2 +-
 tutorials/combustion/chemFoam/h2/validation/Allrun     |  2 +-
 .../combustion/chemFoam/h2/validation/createGraph      |  2 +-
 tutorials/combustion/chemFoam/ic8h18/Allclean          |  2 +-
 tutorials/combustion/chemFoam/ic8h18/Allrun            |  2 +-
 tutorials/combustion/chemFoam/ic8h18/validation/Allrun |  2 +-
 .../combustion/chemFoam/ic8h18/validation/createGraph  |  2 +-
 tutorials/combustion/chemFoam/nc7h16/Allclean          |  2 +-
 tutorials/combustion/chemFoam/nc7h16/Allrun            |  2 +-
 tutorials/combustion/chemFoam/nc7h16/validation/Allrun |  2 +-
 .../combustion/chemFoam/nc7h16/validation/createGraph  |  2 +-
 tutorials/combustion/engineFoam/kivaTest/Allclean      |  2 +-
 tutorials/combustion/engineFoam/kivaTest/Allrun        |  2 +-
 .../les/flameSpreadWaterSuppressionPanel/Allclean      |  2 +-
 .../les/flameSpreadWaterSuppressionPanel/Allrun        |  2 +-
 .../fireFoam/les/oppositeBurningPanels/Allclean        |  2 +-
 .../fireFoam/les/oppositeBurningPanels/Allrun          |  2 +-
 .../combustion/fireFoam/les/smallPoolFire2D/Allrun     |  2 +-
 .../combustion/fireFoam/les/smallPoolFire3D/Allrun     |  2 +-
 .../rhoCentralFoam/biconic25-55Run35/Allclean          |  2 +-
 .../rhoCentralFoam/biconic25-55Run35/Allrun            |  2 +-
 .../rhoCentralFoam/biconic25-55Run35/sampleCone        |  4 ++--
 .../compressible/rhoCentralFoam/shockTube/Allclean     |  2 +-
 tutorials/compressible/rhoCentralFoam/shockTube/Allrun |  2 +-
 .../rhoPimpleDyMFoam/annularThermalMixer/Allclean      |  2 +-
 .../rhoPimpleDyMFoam/annularThermalMixer/Allrun        |  2 +-
 .../rhoPorousSimpleFoam/angledDuctImplicit/Allrun      |  2 +-
 .../rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun  |  2 +-
 .../compressible/sonicFoam/laminar/shockTube/Allclean  |  2 +-
 .../compressible/sonicFoam/laminar/shockTube/Allrun    |  2 +-
 .../compressible/sonicFoam/ras/nacaAirfoil/Allclean    |  2 +-
 .../compressible/sonicFoam/ras/nacaAirfoil/Allrun      |  2 +-
 tutorials/compressible/sonicLiquidFoam/Allclean        |  2 +-
 tutorials/compressible/sonicLiquidFoam/Allrun          |  2 +-
 .../dsmcFoam/freeSpacePeriodic/Allclean                |  2 +-
 .../discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun  |  2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/Allclean  |  2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/Allrun    |  2 +-
 .../discreteMethods/dsmcFoam/supersonicCorner/Allclean |  2 +-
 .../discreteMethods/dsmcFoam/supersonicCorner/Allrun   |  2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean |  2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun   |  2 +-
 .../mdEquilibrationFoam/periodicCubeArgon/Allclean     |  2 +-
 .../mdEquilibrationFoam/periodicCubeArgon/Allrun       |  2 +-
 .../mdEquilibrationFoam/periodicCubeWater/Allclean     |  2 +-
 .../mdEquilibrationFoam/periodicCubeWater/Allrun       |  2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/Allclean       |  2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/Allrun         |  2 +-
 tutorials/electromagnetics/mhdFoam/hartmann/Allclean   |  2 +-
 tutorials/electromagnetics/mhdFoam/hartmann/Allrun     |  2 +-
 .../buoyantBoussinesqPimpleFoam/hotRoom/Allclean       |  2 +-
 .../buoyantBoussinesqPimpleFoam/hotRoom/Allrun         |  2 +-
 .../buoyantBoussinesqSimpleFoam/hotRoom/Allclean       |  2 +-
 .../buoyantBoussinesqSimpleFoam/hotRoom/Allrun         |  2 +-
 .../iglooWithFridges/Allrun                            |  2 +-
 .../heatTransfer/buoyantPimpleFoam/hotRoom/Allclean    |  2 +-
 .../heatTransfer/buoyantPimpleFoam/hotRoom/Allrun      |  2 +-
 .../buoyantSimpleFoam/buoyantCavity/Allclean           |  2 +-
 .../buoyantSimpleFoam/buoyantCavity/Allrun             |  2 +-
 .../buoyantSimpleFoam/circuitBoardCooling/Allclean     |  2 +-
 .../buoyantSimpleFoam/externalCoupledCavity/Allclean   |  2 +-
 .../buoyantSimpleFoam/externalCoupledCavity/Allrun     |  2 +-
 .../externalCoupledCavity/Allrun-parallel              |  2 +-
 .../buoyantSimpleFoam/externalCoupledCavity/Allrun.pre |  2 +-
 .../externalCoupledCavity/externalSolver               |  2 +-
 .../buoyantSimpleFoam/hotRadiationRoom/Allclean        |  2 +-
 .../buoyantSimpleFoam/hotRadiationRoom/Allrun          |  2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/Allclean   |  2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun     |  2 +-
 .../chtMultiRegionFoam/multiRegionHeater/Allclean      |  2 +-
 .../chtMultiRegionFoam/multiRegionHeater/Allrun        |  2 +-
 .../snappyMultiRegionHeater/Allclean                   |  2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/Allrun  |  2 +-
 .../multiRegionHeaterRadiation/Allclean                |  2 +-
 .../multiRegionHeaterRadiation/Allrun                  |  2 +-
 .../multiRegionHeaterRadiation/Allrun-parallel         |  2 +-
 .../multiRegionHeaterRadiation/Allrun.pre              |  2 +-
 tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun  |  2 +-
 .../incompressible/SRFPimpleFoam/rotor2D/makeMesh      |  2 +-
 .../boundaryFoam/boundaryWallFunctionsProfile/Allclean |  2 +-
 .../boundaryFoam/boundaryWallFunctionsProfile/Allrun   |  2 +-
 tutorials/incompressible/icoFoam/cavity/Allclean       |  2 +-
 tutorials/incompressible/icoFoam/cavity/Allrun         |  2 +-
 tutorials/incompressible/icoFoam/elbow/Allclean        |  2 +-
 tutorials/incompressible/icoFoam/elbow/Allrun          |  2 +-
 .../pimpleDyMFoam/mixerVesselAMI2D/Allrun              |  2 +-
 .../pimpleDyMFoam/mixerVesselAMI2D/makeMesh            |  2 +-
 .../incompressible/pimpleDyMFoam/wingMotion/Allrun     |  2 +-
 .../incompressible/pimpleFoam/TJunctionFan/Allclean    |  2 +-
 tutorials/incompressible/pimpleFoam/channel395/Allrun  |  2 +-
 .../incompressible/pimpleFoam/elipsekkLOmega/Allclean  |  2 +-
 .../incompressible/pimpleFoam/elipsekkLOmega/Allrun    |  2 +-
 .../pisoFoam/laminar/porousBlockage/Allrun             |  2 +-
 .../incompressible/pisoFoam/les/motorBike/Allclean     |  2 +-
 tutorials/incompressible/pisoFoam/les/motorBike/Allrun |  2 +-
 .../pisoFoam/les/motorBike/motorBike/Allclean          |  2 +-
 .../pisoFoam/les/motorBike/motorBike/Allrun            |  2 +-
 .../porousSimpleFoam/straightDuctImplicit/Allclean     |  2 +-
 .../porousSimpleFoam/straightDuctImplicit/Allrun       |  2 +-
 .../porousSimpleFoam/straightDuctImplicit/Allrun.pre   |  2 +-
 tutorials/incompressible/simpleFoam/airFoil2D/Allclean |  2 +-
 tutorials/incompressible/simpleFoam/airFoil2D/Allrun   |  2 +-
 .../incompressible/simpleFoam/mixerVessel2D/Allrun     |  2 +-
 .../incompressible/simpleFoam/mixerVessel2D/makeMesh   |  2 +-
 tutorials/incompressible/simpleFoam/motorBike/Allrun   |  2 +-
 .../incompressible/simpleFoam/pipeCyclic/Allclean      |  2 +-
 tutorials/incompressible/simpleFoam/pipeCyclic/Allrun  |  2 +-
 tutorials/incompressible/simpleFoam/rotorDisk/Allrun   |  2 +-
 .../incompressible/simpleFoam/turbineSiting/Allclean   |  2 +-
 .../incompressible/simpleFoam/turbineSiting/Allrun     |  2 +-
 .../simpleFoam/windAroundBuildings/Allclean            |  2 +-
 .../simpleFoam/windAroundBuildings/Allrun              |  2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/Allrun          |  2 +-
 .../coalChemistryFoam/simplifiedSiwek/Allrun           |  2 +-
 .../icoUncoupledKinematicParcelFoam/hopper/Allclean    |  2 +-
 .../icoUncoupledKinematicParcelFoam/hopper/Allrun      |  2 +-
 .../reactingParcelFilmFoam/cylinder/Allclean           |  2 +-
 .../reactingParcelFilmFoam/hotBoxes/Allclean           |  2 +-
 .../reactingParcelFilmFoam/rivuletPanel/Allclean       |  2 +-
 .../reactingParcelFilmFoam/splashPanel/Allclean        |  2 +-
 .../lagrangian/reactingParcelFoam/filter/Allclean      |  2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/Allrun  |  2 +-
 .../reactingParcelFoam/verticalChannel/Allclean        |  2 +-
 .../reactingParcelFoam/verticalChannel/Allrun          |  2 +-
 .../reactingParcelFoam/verticalChannelLTS/Allclean     |  2 +-
 .../simpleReactingParcelFoam/verticalChannel/Allclean  |  2 +-
 .../simpleReactingParcelFoam/verticalChannel/Allrun    |  2 +-
 tutorials/mesh/foamyHexMesh/Allrun                     |  2 +-
 tutorials/mesh/foamyHexMesh/blob/Allclean              |  2 +-
 tutorials/mesh/foamyHexMesh/blob/Allrun                |  2 +-
 tutorials/mesh/foamyHexMesh/blob/Allrun-parallel       |  2 +-
 tutorials/mesh/foamyHexMesh/flange/Allclean            |  2 +-
 tutorials/mesh/foamyHexMesh/flange/Allrun              |  2 +-
 tutorials/mesh/foamyHexMesh/flange/Allrun-parallel     |  2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/Allclean       |  2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/Allrun         |  2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre     |  2 +-
 .../mesh/foamyHexMesh/mixerVessel/Allrun-simulation    |  2 +-
 .../mixerVessel/constant/triSurface/surfaceProcess.sh  |  2 +-
 tutorials/mesh/foamyHexMesh/simpleShapes/Allclean      |  2 +-
 tutorials/mesh/foamyHexMesh/simpleShapes/Allrun        |  2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean          |  2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun            |  2 +-
 .../mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam   |  2 +-
 tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean   |  2 +-
 tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun     |  2 +-
 tutorials/mesh/foamyQuadMesh/square/Allclean           |  2 +-
 tutorials/mesh/foamyQuadMesh/square/Allrun             |  2 +-
 tutorials/mesh/snappyHexMesh/Allrun                    |  2 +-
 tutorials/mesh/snappyHexMesh/flange/Allclean           |  2 +-
 tutorials/multiphase/cavitatingFoam/les/Allrun         |  2 +-
 .../multiphase/cavitatingFoam/les/throttle/Allclean    |  2 +-
 .../multiphase/cavitatingFoam/les/throttle/Allrun      |  2 +-
 .../multiphase/cavitatingFoam/les/throttle3D/Allclean  |  2 +-
 .../multiphase/cavitatingFoam/les/throttle3D/Allrun    |  2 +-
 .../multiphase/cavitatingFoam/ras/throttle/Allclean    |  2 +-
 .../multiphase/cavitatingFoam/ras/throttle/Allrun      |  2 +-
 .../ras/sloshingTank2D/Allclean                        |  2 +-
 .../compressibleInterDyMFoam/ras/sloshingTank2D/Allrun |  2 +-
 .../laminar/depthCharge2D/Allclean                     |  2 +-
 .../compressibleInterFoam/laminar/depthCharge2D/Allrun |  2 +-
 .../laminar/depthCharge3D/Allclean                     |  2 +-
 .../compressibleInterFoam/laminar/depthCharge3D/Allrun |  2 +-
 .../laminar/damBreak4phase/Allclean                    |  2 +-
 .../laminar/damBreak4phase/Allrun                      |  2 +-
 .../multiphase/driftFluxFoam/ras/mixerVessel2D/Allrun  |  2 +-
 tutorials/multiphase/driftFluxFoam/ras/tank3D/Allclean |  2 +-
 tutorials/multiphase/driftFluxFoam/ras/tank3D/Allrun   |  2 +-
 tutorials/multiphase/interDyMFoam/ras/DTCHull/Allclean |  2 +-
 tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun   |  2 +-
 .../interDyMFoam/ras/damBreakWithObstacle/Allclean     |  2 +-
 .../interDyMFoam/ras/damBreakWithObstacle/Allrun       |  2 +-
 .../interDyMFoam/ras/floatingObject/Allclean           |  2 +-
 .../multiphase/interDyMFoam/ras/floatingObject/Allrun  |  2 +-
 .../interDyMFoam/ras/mixerVesselAMI/Allclean           |  2 +-
 .../multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun  |  2 +-
 .../interDyMFoam/ras/mixerVesselAMI/Allrun.pre         |  2 +-
 .../interDyMFoam/ras/sloshingTank2D/Allclean           |  2 +-
 .../multiphase/interDyMFoam/ras/sloshingTank2D/Allrun  |  2 +-
 .../interDyMFoam/ras/sloshingTank2D3DoF/Allclean       |  2 +-
 .../interDyMFoam/ras/sloshingTank2D3DoF/Allrun         |  2 +-
 .../interDyMFoam/ras/sloshingTank3D/Allclean           |  2 +-
 .../multiphase/interDyMFoam/ras/sloshingTank3D/Allrun  |  2 +-
 .../interDyMFoam/ras/sloshingTank3D3DoF/Allclean       |  2 +-
 .../interDyMFoam/ras/sloshingTank3D3DoF/Allrun         |  2 +-
 .../interDyMFoam/ras/sloshingTank3D6DoF/Allclean       |  2 +-
 .../interDyMFoam/ras/sloshingTank3D6DoF/Allrun         |  2 +-
 .../multiphase/interDyMFoam/ras/testTubeMixer/Allclean |  2 +-
 .../multiphase/interDyMFoam/ras/testTubeMixer/Allrun   |  2 +-
 .../multiphase/interFoam/laminar/capillaryRise/Allrun  |  2 +-
 .../multiphase/interFoam/laminar/damBreak/Allclean     |  2 +-
 tutorials/multiphase/interFoam/laminar/damBreak/Allrun |  2 +-
 .../interFoam/laminar/damBreak/damBreak/Allclean       |  2 +-
 .../interFoam/laminar/damBreak/damBreak/Allrun         |  2 +-
 .../multiphase/interFoam/laminar/mixerVessel2D/Allrun  |  2 +-
 .../multiphase/interFoam/les/nozzleFlow2D/Allclean     |  2 +-
 tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun |  2 +-
 tutorials/multiphase/interFoam/ras/DTCHull/Allclean    |  2 +-
 tutorials/multiphase/interFoam/ras/DTCHull/Allrun      |  2 +-
 tutorials/multiphase/interFoam/ras/damBreak/Allclean   |  2 +-
 tutorials/multiphase/interFoam/ras/damBreak/Allrun     |  2 +-
 .../interFoam/ras/damBreak/damBreak/Allclean           |  2 +-
 .../multiphase/interFoam/ras/damBreak/damBreak/Allrun  |  2 +-
 .../interFoam/ras/damBreakPorousBaffle/Allclean        |  2 +-
 .../interFoam/ras/damBreakPorousBaffle/Allrun          |  2 +-
 .../multiphase/interFoam/ras/waterChannel/Allmesh      |  2 +-
 tutorials/multiphase/interFoam/ras/waterChannel/Allrun |  2 +-
 .../interMixingFoam/laminar/damBreak/Allclean          |  2 +-
 .../multiphase/interMixingFoam/laminar/damBreak/Allrun |  2 +-
 .../interPhaseChangeFoam/cavitatingBullet/Allclean     |  2 +-
 .../interPhaseChangeFoam/cavitatingBullet/Allrun       |  2 +-
 .../multiphaseEulerFoam/damBreak4phase/Allclean        |  2 +-
 .../multiphaseEulerFoam/damBreak4phase/Allrun          |  2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/Allclean    |  2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/Allrun      |  2 +-
 .../multiphaseEulerFoam/mixerVessel2D/Allrun           |  2 +-
 .../laminar/mixerVesselAMI2D/Allrun                    |  2 +-
 .../laminar/mixerVesselAMI2D/makeMesh                  |  2 +-
 .../laminar/damBreak4phase/Allclean                    |  2 +-
 .../multiphaseInterFoam/laminar/damBreak4phase/Allrun  |  2 +-
 .../laminar/damBreak4phaseFine/Allclean                |  2 +-
 .../laminar/damBreak4phaseFine/Allrun                  |  2 +-
 .../multiphaseInterFoam/laminar/mixerVessel2D/Allclean |  2 +-
 .../multiphaseInterFoam/laminar/mixerVessel2D/Allrun   |  2 +-
 .../potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun  |  2 +-
 .../potentialFreeSurfaceFoam/oscillatingBox/Allrun     |  2 +-
 .../laminar/mixerVessel2D/Allrun                       |  2 +-
 .../laminar/mixerVessel2D/Allrun                       |  2 +-
 .../twoLiquidMixingFoam/lockExchange/Allclean          |  2 +-
 .../multiphase/twoLiquidMixingFoam/lockExchange/Allrun |  2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun     |  2 +-
 wmake/scripts/AllwmakeParseArguments                   |  4 ++--
 370 files changed, 399 insertions(+), 401 deletions(-)

diff --git a/.gitignore b/.gitignore
index 195dbe74ee..138a636d60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,5 +83,3 @@ doc/Doxygen/DTAGS
 
 # Ignore the test directory
 /tutorialsTest
-
-# end-of-file
diff --git a/Allwmake b/Allwmake
index e0dded16f0..cf49e407b7 100755
--- a/Allwmake
+++ b/Allwmake
@@ -43,4 +43,4 @@ then
 fi
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/Allwmake b/applications/Allwmake
index f23a233b64..2a922d6ae5 100755
--- a/applications/Allwmake
+++ b/applications/Allwmake
@@ -24,4 +24,4 @@ wmake -all utilities $*
 wmake -all solvers $*
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwclean b/applications/solvers/compressible/rhoCentralFoam/Allwclean
index 1a0374d96d..34bab5c449 100755
--- a/applications/solvers/compressible/rhoCentralFoam/Allwclean
+++ b/applications/solvers/compressible/rhoCentralFoam/Allwclean
@@ -6,4 +6,4 @@ wclean libso BCs
 wclean
 wclean rhoCentralDyMFoam
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwmake b/applications/solvers/compressible/rhoCentralFoam/Allwmake
index 5c4ed20c24..6595a83131 100755
--- a/applications/solvers/compressible/rhoCentralFoam/Allwmake
+++ b/applications/solvers/compressible/rhoCentralFoam/Allwmake
@@ -4,4 +4,4 @@ set -x
 
 (wmake libso BCs && wmake && wmake rhoCentralDyMFoam)
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwclean b/applications/solvers/multiphase/compressibleInterFoam/Allwclean
index 9339e372a3..0e26512420 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwclean
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwclean
@@ -6,4 +6,4 @@ wclean libso twoPhaseMixtureThermo
 wclean
 wclean compressibleInterDyMFoam
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwmake b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
index 835bf8346b..bb1b0dd691 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
@@ -6,4 +6,4 @@ wmake libso twoPhaseMixtureThermo
 wmake
 wmake compressibleInterDyMFoam
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean
index 7ccfc0d68f..628a70b516 100755
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean
@@ -5,4 +5,4 @@ set -x
 wclean libso multiphaseMixtureThermo
 wclean
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake
index 04e1ddbb1f..a92a8ae36b 100755
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake
@@ -5,4 +5,4 @@ set -x
 wmake libso multiphaseMixtureThermo
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/driftFluxFoam/Allwclean b/applications/solvers/multiphase/driftFluxFoam/Allwclean
index 4bb3b9406d..dcdca8527f 100755
--- a/applications/solvers/multiphase/driftFluxFoam/Allwclean
+++ b/applications/solvers/multiphase/driftFluxFoam/Allwclean
@@ -6,4 +6,4 @@ wclean libso mixtureViscosityModels
 wclean libso relativeVelocityModels
 wclean
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/driftFluxFoam/Allwmake b/applications/solvers/multiphase/driftFluxFoam/Allwmake
index ac51afd1d1..4d4db5f280 100755
--- a/applications/solvers/multiphase/driftFluxFoam/Allwmake
+++ b/applications/solvers/multiphase/driftFluxFoam/Allwmake
@@ -6,4 +6,4 @@ wmake libso mixtureViscosityModels
 wmake libso relativeVelocityModels
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean b/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean
index 0e33252d5c..bc351e27d8 100755
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean
@@ -6,4 +6,4 @@ wclean libso phaseChangeTwoPhaseMixtures
 wclean
 wclean interPhaseChangeDyMFoam
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
index 9a2a5c2bab..2f57fe3752 100755
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
@@ -6,4 +6,4 @@ wmake libso phaseChangeTwoPhaseMixtures
 wmake
 wmake interPhaseChangeDyMFoam
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean b/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean
index a75382c13c..6d174c19d9 100755
--- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean
@@ -6,4 +6,4 @@ wclean libso multiphaseSystem
 wclean libso interfacialModels
 wclean
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
index 84a99b7200..885d5ed2a0 100755
--- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
@@ -7,4 +7,4 @@ wmake libso multiphaseSystem
 wmake libso interfacialModels
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Allwclean b/applications/solvers/multiphase/multiphaseInterFoam/Allwclean
index 02819df96f..75d8939d31 100755
--- a/applications/solvers/multiphase/multiphaseInterFoam/Allwclean
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Allwclean
@@ -6,4 +6,4 @@ wclean libso multiphaseMixture
 wclean
 wclean multiphaseInterDyMFoam
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
index 745347676b..049217716c 100755
--- a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
@@ -6,4 +6,4 @@ wmake libso multiphaseMixture
 wmake
 wmake multiphaseInterDyMFoam
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/Allwclean
index 618570ccbb..5474c3349a 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/reactingEulerFoam/Allwclean
@@ -8,4 +8,4 @@ wclean libso interfacialCompositionModels
 reactingTwoPhaseEulerFoam/Allwclean
 reactingMultiphaseEulerFoam/Allwclean
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
index 91c6cd9491..c67ed9a196 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
@@ -10,4 +10,4 @@ wmake libso interfacialCompositionModels
 reactingTwoPhaseEulerFoam/Allwmake
 reactingMultiphaseEulerFoam/Allwmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean
index 93ee94face..983c20bdc1 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean
@@ -6,4 +6,4 @@ wclean libso multiphaseSystem
 wclean libso multiphaseCompressibleTurbulenceModels
 wclean
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
index c60b665df4..a18671b330 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
@@ -6,4 +6,4 @@ wmake libso multiphaseSystem
 wmake libso multiphaseCompressibleTurbulenceModels
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean
index 87e030a14a..59ec72ff10 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean
@@ -6,4 +6,4 @@ wclean libso twoPhaseSystem
 wclean libso twoPhaseCompressibleTurbulenceModels
 wclean
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
index d0e2fc63c7..44268bcb63 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
@@ -6,4 +6,4 @@ wmake libso twoPhaseSystem
 wmake libso twoPhaseCompressibleTurbulenceModels
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
index 8103dc7201..aec9873881 100755
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
@@ -7,4 +7,4 @@ wclean libso interfacialModels
 wclean libso phaseCompressibleTurbulenceModels
 wclean
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
index a4a7a60bd4..dc726c0806 100755
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
@@ -8,4 +8,4 @@ wmake libso interfacialModels
 wmake libso phaseCompressibleTurbulenceModels
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/test/fieldMapping/pipe1D/Allrun b/applications/test/fieldMapping/pipe1D/Allrun
index eb6e441abb..130ff26742 100755
--- a/applications/test/fieldMapping/pipe1D/Allrun
+++ b/applications/test/fieldMapping/pipe1D/Allrun
@@ -20,4 +20,4 @@ mv "log.$application" "log.$application-inflate"
 runApplication $application false
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/test/hexRef8/block/Allrun b/applications/test/hexRef8/block/Allrun
index 541ce85b6d..59757f310a 100755
--- a/applications/test/hexRef8/block/Allrun
+++ b/applications/test/hexRef8/block/Allrun
@@ -20,4 +20,4 @@ mv "log.$application" "log.$application-inflate"
 runApplication $application false
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/test/volField/cavity/Allrun b/applications/test/volField/cavity/Allrun
index 602fbc4f19..03255c4d13 100755
--- a/applications/test/volField/cavity/Allrun
+++ b/applications/test/volField/cavity/Allrun
@@ -14,4 +14,4 @@ runApplication blockMesh
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake
index bd253bbe9a..5de68c197b 100755
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Build optional components (eg, may depend on third-party libraries)
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 cd ${0%/*} || exit 1    # Run from this directory
 set -x
 
@@ -14,4 +14,4 @@ then
     wmake ccm26ToFoam
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake
index 686b1542e6..20a658ec8f 100755
--- a/applications/utilities/mesh/generation/Allwmake
+++ b/applications/utilities/mesh/generation/Allwmake
@@ -13,4 +13,4 @@ then
 fi
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/Allwclean b/applications/utilities/mesh/generation/extrude2DMesh/Allwclean
index 1f7114a111..48a8fb0d12 100755
--- a/applications/utilities/mesh/generation/extrude2DMesh/Allwclean
+++ b/applications/utilities/mesh/generation/extrude2DMesh/Allwclean
@@ -5,4 +5,4 @@ set -x
 wclean libso extrude2DMesh
 wclean
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/Allwmake b/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
index a56b144e29..e6514878d8 100755
--- a/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
+++ b/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
@@ -5,4 +5,4 @@ set -x
 wmake libso extrude2DMesh
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/generation/foamyMesh/Allwclean b/applications/utilities/mesh/generation/foamyMesh/Allwclean
index b30667b858..8fbad74784 100755
--- a/applications/utilities/mesh/generation/foamyMesh/Allwclean
+++ b/applications/utilities/mesh/generation/foamyMesh/Allwclean
@@ -10,4 +10,4 @@ wclean foamyHexMeshSurfaceSimplify
 wclean foamyHexMeshBackgroundMesh
 wclean cellSizeAndAlignmentGrid
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/generation/foamyMesh/Allwmake b/applications/utilities/mesh/generation/foamyMesh/Allwmake
index 189c5d1ed9..e49feb0370 100755
--- a/applications/utilities/mesh/generation/foamyMesh/Allwmake
+++ b/applications/utilities/mesh/generation/foamyMesh/Allwmake
@@ -11,4 +11,4 @@ wmake foamyHexMesh
 #wmake cellSizeAndAlignmentGrid
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
index 8d3e3840ef..0a6b103673 100755
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
@@ -7,4 +7,4 @@ then
     wmake
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
index 64641c22fd..9119e05f12 100755
--- a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
@@ -19,4 +19,4 @@ fi
 
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/manipulation/setSet/Allwmake b/applications/utilities/mesh/manipulation/setSet/Allwmake
index c651ba841f..5dbfd208ce 100755
--- a/applications/utilities/mesh/manipulation/setSet/Allwmake
+++ b/applications/utilities/mesh/manipulation/setSet/Allwmake
@@ -15,4 +15,4 @@ fi
 
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/miscellaneous/foamHelp/Allwclean b/applications/utilities/miscellaneous/foamHelp/Allwclean
index 01d5bfd9f3..68cf4d8151 100755
--- a/applications/utilities/miscellaneous/foamHelp/Allwclean
+++ b/applications/utilities/miscellaneous/foamHelp/Allwclean
@@ -5,4 +5,4 @@ wclean libso helpTypes
 wclean
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/miscellaneous/foamHelp/Allwmake b/applications/utilities/miscellaneous/foamHelp/Allwmake
index 2c999bf34b..ba37c5e418 100755
--- a/applications/utilities/miscellaneous/foamHelp/Allwmake
+++ b/applications/utilities/miscellaneous/foamHelp/Allwmake
@@ -5,4 +5,4 @@ wmake libso helpTypes
 wmake
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
index 8ef9158c5d..86a7c89e3a 100755
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
@@ -8,4 +8,4 @@ else
     wmake
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/Allwclean b/applications/utilities/postProcessing/graphics/PV3Readers/Allwclean
index ca689294d1..47add82a98 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/Allwclean
@@ -6,4 +6,4 @@ wclean libso vtkPV3Readers
 PV3blockMeshReader/Allwclean
 PV3FoamReader/Allwclean
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
index ae0915f268..5172a62ae3 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
@@ -26,4 +26,4 @@ case "$ParaView_VERSION" in
     ;;
 esac
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwclean b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwclean
index 6d052fb73d..7d374ba5ec 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwclean
@@ -8,4 +8,4 @@ rm -f $FOAM_LIBBIN/libPV3FoamReader* 2>/dev/null
 rm -rf PV3FoamReader/Make
 wclean libso vtkPV3Foam
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
index 93ce993d65..407f29b642 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
@@ -14,4 +14,4 @@ then
     )
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwclean b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwclean
index 4ce9a2a07f..1e6cdb695c 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwclean
@@ -8,4 +8,4 @@ rm -f $FOAM_LIBBIN/libPV3blockMeshReader*  2>/dev/null
 rm -rf PV3blockMeshReader/Make
 wclean libso vtkPV3blockMesh
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
index 09e76eac49..ad66b2b71f 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
@@ -14,4 +14,4 @@ then
     )
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
index ac21c736e2..0e2ae161c3 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
@@ -6,4 +6,4 @@ wclean libso vtkPVReaders
 PVblockMeshReader/Allwclean
 PVFoamReader/Allwclean
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
index 6108a18d81..ecba083285 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
@@ -26,4 +26,4 @@ case "$ParaView_VERSION" in
     ;;
 esac
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
index abe861cba0..59f8be2f21 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
@@ -8,4 +8,4 @@ rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null
 rm -rf PVFoamReader/Make
 wclean libso vtkPVFoam
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
index aff103a023..44af3551f1 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
@@ -14,4 +14,4 @@ then
     )
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
index a4ff9d233f..5401dfdd07 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
@@ -8,4 +8,4 @@ rm -f $FOAM_LIBBIN/libPVblockMeshReader*  2>/dev/null
 rm -rf PVblockMeshReader/Make
 wclean libso vtkPVblockMesh
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
index d0a7aa2091..ca9cb6105d 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
@@ -14,4 +14,4 @@ then
     )
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake b/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
index e033316861..4fe5a6e9e7 100755
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
@@ -3,4 +3,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 wmake libso
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/preProcessing/wallFunctionTable/Allwmake b/applications/utilities/preProcessing/wallFunctionTable/Allwmake
index c527fdf38f..0d1c099d1d 100755
--- a/applications/utilities/preProcessing/wallFunctionTable/Allwmake
+++ b/applications/utilities/preProcessing/wallFunctionTable/Allwmake
@@ -5,4 +5,4 @@ set -x
 wmake libso tabulatedWallFunction
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/bin/findEmptyMake b/bin/findEmptyMake
index 7ba3eda3d5..e0ac838ca8 100755
--- a/bin/findEmptyMake
+++ b/bin/findEmptyMake
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -79,4 +79,4 @@ do
     done
 
 done
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/bin/foamCleanPath b/bin/foamCleanPath
index c6f1147bf4..86a8c171fd 100755
--- a/bin/foamCleanPath
+++ b/bin/foamCleanPath
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -153,4 +153,4 @@ IFS="$oldIFS"
 ##DEBUG echo "output>$dirList<" 1>&2
 echo "$dirList"
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/bin/foamCopySettings b/bin/foamCopySettings
index f913f1212e..089dd2e08d 100755
--- a/bin/foamCopySettings
+++ b/bin/foamCopySettings
@@ -1,11 +1,11 @@
 #!/bin/sh
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
@@ -35,7 +35,7 @@
 # Note
 #     The foamCopySettings.rc (found with the ~OpenFOAM expansion) can be used
 #     to add any custom rsync options.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 Script=${0##*/}
 
 #------------------------------------------------------------------------------
@@ -148,4 +148,4 @@ do
     esac
 done
 
-# ------------------------------------------------------------------ end-of-file
+#------------------------------------------------------------------------------
diff --git a/bin/foamUpdateCaseFileHeader b/bin/foamUpdateCaseFileHeader
index 3f9ce5242a..cdaece6eb7 100755
--- a/bin/foamUpdateCaseFileHeader
+++ b/bin/foamUpdateCaseFileHeader
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -141,4 +141,4 @@ do
     fi
 done
 
-#------------------------------------------------------------------ end-of-file
+#------------------------------------------------------------------------------
diff --git a/bin/tools/doxyFilter-ignore.awk b/bin/tools/doxyFilter-ignore.awk
index 7be7595737..e06f5c2755 100644
--- a/bin/tools/doxyFilter-ignore.awk
+++ b/bin/tools/doxyFilter-ignore.awk
@@ -1,10 +1,10 @@
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
@@ -30,7 +30,7 @@
 #     - Surround the contents of an entire file with @cond / @endcond
 #       to skip documenting all classes/variables
 #
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 BEGIN {
    print "//! @file %filePath%"
    print "//! @cond OpenFOAMIgnoreAppDoxygen"
@@ -41,4 +41,4 @@ BEGIN {
 END {
    print "//! @endcond"
 }
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/bin/tools/doxyFilter-top.awk b/bin/tools/doxyFilter-top.awk
index bd81ede558..af9ba7331f 100644
--- a/bin/tools/doxyFilter-top.awk
+++ b/bin/tools/doxyFilter-top.awk
@@ -1,8 +1,8 @@
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -30,7 +30,7 @@
 #     - This is useful for application files in which only the first
 #       block documents the application itself.
 #
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 BEGIN {
     state = 0
 }
@@ -78,4 +78,4 @@ END {
     }
 }
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/bin/tools/doxyFilter.awk b/bin/tools/doxyFilter.awk
index e6d7226e82..f45cc776dd 100644
--- a/bin/tools/doxyFilter.awk
+++ b/bin/tools/doxyFilter.awk
@@ -1,10 +1,10 @@
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
@@ -39,7 +39,7 @@
 #         */
 #     The intermediate "/*! ... */" block is left-justified to handle
 #     possible verbatim text
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 
 BEGIN {
     state = 0
@@ -86,4 +86,4 @@ BEGIN {
     next
 }
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/bin/tools/doxyFilter.sed b/bin/tools/doxyFilter.sed
index e2aecb8b8d..845c39abbc 100644
--- a/bin/tools/doxyFilter.sed
+++ b/bin/tools/doxyFilter.sed
@@ -1,11 +1,11 @@
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Script
 #     doxyFilter.sed
 #
 # Description
 #     Transform human-readable tags such as 'Description' into the Doxygen
 #     equivalent
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 
 # new FSF address
 /^License/,/\*\//{
@@ -182,4 +182,4 @@ s#\\linebreak#<br>#g
 
 }
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/doc/Allwmake b/doc/Allwmake
index 76b8eee2ce..ba28b7955f 100755
--- a/doc/Allwmake
+++ b/doc/Allwmake
@@ -7,4 +7,4 @@ chmod a+rX $WM_PROJECT_DIR $WM_PROJECT_DIR/doc Doxygen
 
 Doxygen/Allwmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/doc/Doxygen/Allwmake b/doc/Doxygen/Allwmake
index 4b841f0c45..3784ac39a4 100755
--- a/doc/Doxygen/Allwmake
+++ b/doc/Doxygen/Allwmake
@@ -81,4 +81,4 @@ echo
 echo "Done doxygen"
 echo
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/doc/tools/find-its b/doc/tools/find-its
index 7f8996b32b..44c85130fb 100755
--- a/doc/tools/find-its
+++ b/doc/tools/find-its
@@ -1,5 +1,5 @@
 #!/bin/sh
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Script
 #     find-its
 #
@@ -8,10 +8,10 @@
 #     This contraction (== "it is") looks too much like "its" (possesive)
 #     and confuses non-native (and some native) English speakers.
 #
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 set -x
 cd $WM_PROJECT_DIR || exit 1
 
 git grep -e "it's"
 
-#------------------------------------------------------------------ end-of-file
+#------------------------------------------------------------------------------
diff --git a/doc/tools/find-trailingspace b/doc/tools/find-trailingspace
index a04ee94d46..a7bf8390f2 100755
--- a/doc/tools/find-trailingspace
+++ b/doc/tools/find-trailingspace
@@ -1,12 +1,12 @@
 #!/bin/bash
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Script
 #     find-trailingspace
 #
 # Description
 #     Search for files with trailing whitesapce
 #
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 set -x
 cd $WM_PROJECT_DIR || exit 1
 
@@ -14,4 +14,4 @@ tab=$'\t'
 
 git grep -c -E "[ $tab]+"'$' -- $@
 
-#------------------------------------------------------------------ end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index 632e1670fa..3517abfb69 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -250,4 +250,4 @@ fi
 unset cleaned foamClean foamInstall foamOldDirs
 unset _foamSource _foamEval
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/codeTemplates/foamScript b/etc/codeTemplates/foamScript
index 56f750e175..0c30f33715 100755
--- a/etc/codeTemplates/foamScript
+++ b/etc/codeTemplates/foamScript
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -29,4 +29,4 @@
 #
 #------------------------------------------------------------------------------
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/config.csh/CGAL b/etc/config.csh/CGAL
index 1627935ef3..0ec72b5e76 100644
--- a/etc/config.csh/CGAL
+++ b/etc/config.csh/CGAL
@@ -51,4 +51,4 @@ endif
 
 unset boost_version cgal_version
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.csh/aliases b/etc/config.csh/aliases
index d95bfb3b22..aff45a10e5 100644
--- a/etc/config.csh/aliases
+++ b/etc/config.csh/aliases
@@ -80,4 +80,4 @@ else
     alias foamSite 'cd $WM_PROJECT_INST_DIR/site'
 endif
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.csh/ensight b/etc/config.csh/ensight
index 5e9eda5a54..d8f1e8ac32 100644
--- a/etc/config.csh/ensight
+++ b/etc/config.csh/ensight
@@ -51,4 +51,4 @@ else
     unsetenv CEI_HOME
 endif
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.csh/example/compiler b/etc/config.csh/example/compiler
index 2eed7a3c04..b6c16c57ae 100644
--- a/etc/config.csh/example/compiler
+++ b/etc/config.csh/example/compiler
@@ -48,4 +48,4 @@ case Gcc45++0x:
     breaksw
 endsw
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/config.csh/example/openmpi b/etc/config.csh/example/openmpi
index 293475ff35..70dc5d69ca 100644
--- a/etc/config.csh/example/openmpi
+++ b/etc/config.csh/example/openmpi
@@ -33,4 +33,4 @@
 # Modified openmpi settings
 setenv FOAM_MPI openmpi-1.4.3
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/config.csh/example/paraview b/etc/config.csh/example/paraview
index 7c163df9c7..63d2e26682 100644
--- a/etc/config.csh/example/paraview
+++ b/etc/config.csh/example/paraview
@@ -43,4 +43,4 @@ if ( $status == 0 ) source $foamFile ParaView_VERSION=3.12.0
 
 unset foamFile
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.csh/example/prefs.csh b/etc/config.csh/example/prefs.csh
index c9db36cefe..c5e7cd7fa3 100644
--- a/etc/config.csh/example/prefs.csh
+++ b/etc/config.csh/example/prefs.csh
@@ -49,4 +49,4 @@
 # setenv WM_MPLIB SYSTEMOPENMPI
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index 867ac4c55d..34280a12c9 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -274,4 +274,4 @@ else
     setenv MPI_BUFFER_SIZE $minBufferSize
 endif
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index 33c89d6e43..3292f9724c 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -131,4 +131,4 @@ endif
 
 unset cleaned cmake paraviewInstDir paraviewPython
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index c99a55985f..499c3b5dc8 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -343,4 +343,4 @@ endsw
 unset minBufferSize
 unsetenv foamCompiler
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index efcd21ee3f..38bedd2874 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -191,4 +191,4 @@ unalias foam3rdParty
 unalias foamSite
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index 1d8949ba0c..5b6a32618c 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -54,4 +54,4 @@ fi
 
 unset boost_version cgal_version
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/aliases b/etc/config.sh/aliases
index 40d4c88e0e..44de3c70b5 100644
--- a/etc/config.sh/aliases
+++ b/etc/config.sh/aliases
@@ -86,4 +86,4 @@ else
     alias foamSite='cd $WM_PROJECT_INST_DIR/site'
 fi
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/ensight b/etc/config.sh/ensight
index 2ee772e77a..aea759741a 100644
--- a/etc/config.sh/ensight
+++ b/etc/config.sh/ensight
@@ -57,4 +57,4 @@ else
     unset CEI_HOME
 fi
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/example/compiler b/etc/config.sh/example/compiler
index a1238c9223..34658b8217 100644
--- a/etc/config.sh/example/compiler
+++ b/etc/config.sh/example/compiler
@@ -46,4 +46,4 @@ Gcc45 | Gcc45++0x)
     ;;
 esac
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/example/openmpi b/etc/config.sh/example/openmpi
index cd2acc320f..7fa099f841 100644
--- a/etc/config.sh/example/openmpi
+++ b/etc/config.sh/example/openmpi
@@ -33,4 +33,4 @@
 # Modified openmpi settings
 export FOAM_MPI=openmpi-1.4.3
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/example/paraview b/etc/config.sh/example/paraview
index f958f431e2..06caae46cc 100644
--- a/etc/config.sh/example/paraview
+++ b/etc/config.sh/example/paraview
@@ -43,4 +43,4 @@ foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o config.sh/paraview 2>/dev/nul
 
 unset foamFile
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/example/prefs.sh b/etc/config.sh/example/prefs.sh
index 2992298887..a378712af5 100644
--- a/etc/config.sh/example/prefs.sh
+++ b/etc/config.sh/example/prefs.sh
@@ -49,4 +49,4 @@
 # export WM_MPLIB=SYSTEMOPENMPI
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/gperftools b/etc/config.sh/gperftools
index 8a33c082da..0660463037 100644
--- a/etc/config.sh/gperftools
+++ b/etc/config.sh/gperftools
@@ -38,4 +38,4 @@ GPERFTOOLS_ARCH_PATH=$gperftools_install/$GPERFTOOLS_VERSION
 export PATH=$GPERFTOOLS_ARCH_PATH/bin:$PATH
 export LD_LIBRARY_PATH=$GPERFTOOLS_ARCH_PATH/lib:$LD_LIBRARY_PATH
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/metis b/etc/config.sh/metis
index 39e3d57602..69618dd27f 100644
--- a/etc/config.sh/metis
+++ b/etc/config.sh/metis
@@ -36,4 +36,4 @@
 export METIS_VERSION=metis-5.1.0
 export METIS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$METIS_VERSION
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index fc7b3b5176..f31c0018f6 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -267,4 +267,4 @@ then
 fi
 export MPI_BUFFER_SIZE
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 67ae5e8c45..f6cd6a8ce7 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -144,4 +144,4 @@ fi
 unset _foamParaviewEval
 unset cleaned cmake paraviewInstDir paraviewPython
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/scotch b/etc/config.sh/scotch
index beb4dd1f2e..68c242e6ab 100644
--- a/etc/config.sh/scotch
+++ b/etc/config.sh/scotch
@@ -36,4 +36,4 @@
 export SCOTCH_VERSION=scotch_6.0.3
 export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_LABEL_OPTION/$SCOTCH_VERSION
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index cd0fb0adf5..cdd3b21f20 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -365,4 +365,4 @@ esac
 #keep _foamAddPath _foamAddLib _foamAddMan
 unset foamCompiler minBufferSize
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index 11394486db..af44571f03 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -170,4 +170,4 @@ unalias foam3rdParty
 unalias foamSite
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/cshrc b/etc/cshrc
index 80c32cfa2b..dd31a33b99 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -238,4 +238,4 @@ endif
 unset cleaned foamClean foamInstall foamOldDirs
 unalias _foamSource
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/etc/templates/axisymmetricJet/Allrun b/etc/templates/axisymmetricJet/Allrun
index 2f68265be9..411484a5bf 100755
--- a/etc/templates/axisymmetricJet/Allrun
+++ b/etc/templates/axisymmetricJet/Allrun
@@ -11,4 +11,4 @@ runApplication extrudeMesh
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/Allwmake b/src/Allwmake
index 2a3d9b7b6f..f5e0c5c558 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -81,4 +81,4 @@ postProcessing/Allwmake $targetType $*
 wmake $targetType sixDoFRigidBodyMotion
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/OSspecific/POSIX/Allwmake b/src/OSspecific/POSIX/Allwmake
index 6cb776136e..bd5b6259b9 100755
--- a/src/OSspecific/POSIX/Allwmake
+++ b/src/OSspecific/POSIX/Allwmake
@@ -21,4 +21,4 @@ fi
 # make (non-shared by default) object
 wmake $targetType
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index 15961b2028..218eae9c3a 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/Allwmake
@@ -39,4 +39,4 @@ case "$WM_MPLIB" in
 esac
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/TurbulenceModels/Allwmake b/src/TurbulenceModels/Allwmake
index fb0c219f58..b37d9ac294 100755
--- a/src/TurbulenceModels/Allwmake
+++ b/src/TurbulenceModels/Allwmake
@@ -12,4 +12,4 @@ wmake $targetType compressible
 wmakeLnInclude phaseIncompressible
 wmakeLnInclude phaseCompressible
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/conversion/Allwmake b/src/conversion/Allwmake
index 125d78c5e4..9c20d87a75 100755
--- a/src/conversion/Allwmake
+++ b/src/conversion/Allwmake
@@ -8,4 +8,4 @@ set -x
 
 wmake $targetType
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/dummyThirdParty/Allwmake b/src/dummyThirdParty/Allwmake
index a819e77494..fed1e16fda 100755
--- a/src/dummyThirdParty/Allwmake
+++ b/src/dummyThirdParty/Allwmake
@@ -12,4 +12,4 @@ wmake $targetType metisDecomp
 wmake $targetType MGridGen
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
index f80a7e5ffd..f5cfa2cc5b 100755
--- a/src/fvAgglomerationMethods/Allwmake
+++ b/src/fvAgglomerationMethods/Allwmake
@@ -28,4 +28,4 @@ else
 fi
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake
index 909ec9f4ed..b1460c7db4 100755
--- a/src/lagrangian/Allwmake
+++ b/src/lagrangian/Allwmake
@@ -17,4 +17,4 @@ wmake $targetType coalCombustion
 
 molecularDynamics/Allwmake $targetType $*
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/lagrangian/molecularDynamics/Allwmake b/src/lagrangian/molecularDynamics/Allwmake
index 2020afcadc..b857206672 100755
--- a/src/lagrangian/molecularDynamics/Allwmake
+++ b/src/lagrangian/molecularDynamics/Allwmake
@@ -10,4 +10,4 @@ wmake $targetType potential
 wmake $targetType molecularMeasurements
 wmake $targetType molecule
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
index fef9e5c2bc..0b948da366 100755
--- a/src/mesh/Allwmake
+++ b/src/mesh/Allwmake
@@ -10,4 +10,4 @@ wmake $targetType autoMesh
 wmake $targetType blockMesh
 wmake $targetType extrudeModel
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/parallel/Allwmake b/src/parallel/Allwmake
index 97d62f0612..9976f017a6 100755
--- a/src/parallel/Allwmake
+++ b/src/parallel/Allwmake
@@ -11,4 +11,4 @@ reconstruct/Allwmake $targetType $*
 wmake $targetType distributed
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 4ce2aa27a6..c692633e50 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -67,4 +67,4 @@ wmake $targetType decompositionMethods
 
 wmake $targetType decompose
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/parallel/decompose/AllwmakeLnInclude b/src/parallel/decompose/AllwmakeLnInclude
index b2ee544686..4f42164094 100755
--- a/src/parallel/decompose/AllwmakeLnInclude
+++ b/src/parallel/decompose/AllwmakeLnInclude
@@ -7,4 +7,4 @@ wmakeLnInclude metisDecomp
 wmakeLnInclude scotchDecomp
 wmakeLnInclude ptscotchDecomp
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/parallel/decompose/metisDecomp/Allwmake b/src/parallel/decompose/metisDecomp/Allwmake
index 8259ce1436..d968333287 100755
--- a/src/parallel/decompose/metisDecomp/Allwmake
+++ b/src/parallel/decompose/metisDecomp/Allwmake
@@ -21,4 +21,4 @@ else
 fi
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/parallel/reconstruct/Allwmake b/src/parallel/reconstruct/Allwmake
index 4774eed052..ab8f2d4b84 100755
--- a/src/parallel/reconstruct/Allwmake
+++ b/src/parallel/reconstruct/Allwmake
@@ -8,4 +8,4 @@ set -x
 
 wmake $targetType reconstruct
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/postProcessing/Allwmake b/src/postProcessing/Allwmake
index 92daaa49f3..8b292497bd 100755
--- a/src/postProcessing/Allwmake
+++ b/src/postProcessing/Allwmake
@@ -11,4 +11,4 @@ wmake $targetType foamCalcFunctions
 
 functionObjects/Allwmake $targetType $*
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 535b8281c4..2110ced873 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -15,4 +15,4 @@ wmake $targetType jobControl
 wmake $targetType systemCall
 wmake $targetType utilities
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/regionModels/Allwclean b/src/regionModels/Allwclean
index 8297b201c0..94b0901855 100755
--- a/src/regionModels/Allwclean
+++ b/src/regionModels/Allwclean
@@ -10,4 +10,4 @@ wclean $makeType thermalBaffleModels
 wclean $makeType regionCoupling
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/regionModels/Allwmake b/src/regionModels/Allwmake
index 877c4b00c5..b9f85d1b27 100755
--- a/src/regionModels/Allwmake
+++ b/src/regionModels/Allwmake
@@ -14,4 +14,4 @@ wmake $targetType thermalBaffleModels
 wmake $targetType regionCoupling
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/renumber/Allwmake b/src/renumber/Allwmake
index 01200e712e..6cf33cff70 100755
--- a/src/renumber/Allwmake
+++ b/src/renumber/Allwmake
@@ -40,4 +40,4 @@ else
     echo
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index 0a4dfc8d35..1d987bb0db 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/Allwmake
@@ -24,4 +24,4 @@ wmake $targetType solidChemistryModel
 
 wmake $targetType radiation
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/thermophysicalModels/properties/Allwmake b/src/thermophysicalModels/properties/Allwmake
index 6ee093bc11..b8ec516416 100755
--- a/src/thermophysicalModels/properties/Allwmake
+++ b/src/thermophysicalModels/properties/Allwmake
@@ -12,4 +12,4 @@ wmake $targetType solidProperties
 wmake $targetType solidMixtureProperties
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake
index 1d9598d436..c580b5bbe7 100755
--- a/src/transportModels/Allwmake
+++ b/src/transportModels/Allwmake
@@ -13,4 +13,4 @@ wmake $targetType incompressible
 wmake $targetType compressible
 wmake $targetType immiscibleIncompressibleTwoPhaseMixture
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/Allclean b/tutorials/Allclean
index 6b290ed0eb..b66c19975f 100755
--- a/tutorials/Allclean
+++ b/tutorials/Allclean
@@ -13,4 +13,4 @@ foamCleanTutorials cases
 
 echo "--------"
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/Allrun b/tutorials/Allrun
index f0928d670a..6b600d4eb6 100755
--- a/tutorials/Allrun
+++ b/tutorials/Allrun
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -93,4 +93,4 @@ done
 
 find . -name "log.*" -exec cat {} \; >> logs
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/Alltest b/tutorials/Alltest
index e383f771fd..59cf18f3d0 100755
--- a/tutorials/Alltest
+++ b/tutorials/Alltest
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -238,4 +238,4 @@ do
     echo "" >> $SOLVERS_FILE
 done
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allclean b/tutorials/DNS/dnsFoam/boxTurb16/Allclean
index 0d748a1174..d3bb353195 100755
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allclean
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm -f 0/enstrophy
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allrun b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
index 72f7110e0f..26449db3a8 100755
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allrun
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
@@ -12,4 +12,4 @@ runApplication boxTurb
 runApplication $application
 runApplication enstrophy
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/basic/laplacianFoam/flange/Allclean b/tutorials/basic/laplacianFoam/flange/Allclean
index e6ee925bad..c9b3f9f8d4 100755
--- a/tutorials/basic/laplacianFoam/flange/Allclean
+++ b/tutorials/basic/laplacianFoam/flange/Allclean
@@ -8,4 +8,4 @@ cleanCase
 rm -rf EnSight Ensight Fieldview > /dev/null 2>&1
 rm -f constant/polyMesh/boundary > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun
index 840fbd30c0..89c210c48c 100755
--- a/tutorials/basic/laplacianFoam/flange/Allrun
+++ b/tutorials/basic/laplacianFoam/flange/Allrun
@@ -24,4 +24,4 @@ runApplication foamToEnsight
 runApplication foamToEnsightParts
 runApplication foamToVTK
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/basic/potentialFoam/cylinder/Allclean b/tutorials/basic/potentialFoam/cylinder/Allclean
index edd5fd5440..5734444f4e 100755
--- a/tutorials/basic/potentialFoam/cylinder/Allclean
+++ b/tutorials/basic/potentialFoam/cylinder/Allclean
@@ -8,4 +8,4 @@ rm -rf 0 > /dev/null 2>&1
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun
index 5f79f4c229..d8a1591738 100755
--- a/tutorials/basic/potentialFoam/cylinder/Allrun
+++ b/tutorials/basic/potentialFoam/cylinder/Allrun
@@ -11,4 +11,4 @@ runApplication blockMesh
 runApplication $application -withFunctionObjects -writePhi -writep
 runApplication streamFunction
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allclean b/tutorials/basic/potentialFoam/pitzDaily/Allclean
index edd5fd5440..5734444f4e 100755
--- a/tutorials/basic/potentialFoam/pitzDaily/Allclean
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allclean
@@ -8,4 +8,4 @@ rm -rf 0 > /dev/null 2>&1
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun
index ea05ecadcb..3383ef1dad 100755
--- a/tutorials/basic/potentialFoam/pitzDaily/Allrun
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun
@@ -11,4 +11,4 @@ runApplication blockMesh
 runApplication $application -writePhi -writep
 runApplication streamFunction
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean
index 3772d5150b..bfa08cad4b 100755
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean
@@ -13,4 +13,4 @@ rm -rf constant/polyMesh/points
 rm -rf constant/polyMesh/owner
 rm -rf constant/polyMesh/neighbour
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
index 67e2561bcc..e00af435e6 100755
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
@@ -16,4 +16,4 @@ runApplication PDRMesh -overwrite
 # Run
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/XiFoam/ras/Allclean b/tutorials/combustion/XiFoam/ras/Allclean
index ec88313ccf..edc01a252b 100755
--- a/tutorials/combustion/XiFoam/ras/Allclean
+++ b/tutorials/combustion/XiFoam/ras/Allclean
@@ -21,4 +21,4 @@ do
     removeCase $caseName
 done
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/XiFoam/ras/Allrun b/tutorials/combustion/XiFoam/ras/Allrun
index 7079a11fc6..e1db61c60c 100755
--- a/tutorials/combustion/XiFoam/ras/Allrun
+++ b/tutorials/combustion/XiFoam/ras/Allrun
@@ -51,4 +51,4 @@ cloneCase moriyoshiHomogeneous moriyoshiHomogeneousHydrogen
     runApplication `getApplication`
 )
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/gri/Allclean b/tutorials/combustion/chemFoam/gri/Allclean
index 24352b65b9..d1134cd3fc 100755
--- a/tutorials/combustion/chemFoam/gri/Allclean
+++ b/tutorials/combustion/chemFoam/gri/Allclean
@@ -8,5 +8,5 @@ cleanCase
 
 \rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
diff --git a/tutorials/combustion/chemFoam/gri/Allrun b/tutorials/combustion/chemFoam/gri/Allrun
index 82ff17fe53..62adab28f3 100755
--- a/tutorials/combustion/chemFoam/gri/Allrun
+++ b/tutorials/combustion/chemFoam/gri/Allrun
@@ -11,4 +11,4 @@ runApplication $application
 
 (cd validation && ./Allrun $*)
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/gri/validation/Allrun b/tutorials/combustion/chemFoam/gri/validation/Allrun
index ca399357b9..0720352189 100755
--- a/tutorials/combustion/chemFoam/gri/validation/Allrun
+++ b/tutorials/combustion/chemFoam/gri/validation/Allrun
@@ -9,6 +9,6 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 "    " $8 }' \
 
 ./createGraph
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
 
diff --git a/tutorials/combustion/chemFoam/gri/validation/createGraph b/tutorials/combustion/chemFoam/gri/validation/createGraph
index 9e97ecfd50..d0fb9cc013 100755
--- a/tutorials/combustion/chemFoam/gri/validation/createGraph
+++ b/tutorials/combustion/chemFoam/gri/validation/createGraph
@@ -21,5 +21,5 @@ gnuplot<<EOF
         "chemkinII" with lines title "Chemkin II" lt -1
 EOF
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
diff --git a/tutorials/combustion/chemFoam/h2/Allclean b/tutorials/combustion/chemFoam/h2/Allclean
index 24352b65b9..d1134cd3fc 100755
--- a/tutorials/combustion/chemFoam/h2/Allclean
+++ b/tutorials/combustion/chemFoam/h2/Allclean
@@ -8,5 +8,5 @@ cleanCase
 
 \rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
diff --git a/tutorials/combustion/chemFoam/h2/Allrun b/tutorials/combustion/chemFoam/h2/Allrun
index 82ff17fe53..62adab28f3 100755
--- a/tutorials/combustion/chemFoam/h2/Allrun
+++ b/tutorials/combustion/chemFoam/h2/Allrun
@@ -11,4 +11,4 @@ runApplication $application
 
 (cd validation && ./Allrun $*)
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/h2/validation/Allrun b/tutorials/combustion/chemFoam/h2/validation/Allrun
index ca399357b9..0720352189 100755
--- a/tutorials/combustion/chemFoam/h2/validation/Allrun
+++ b/tutorials/combustion/chemFoam/h2/validation/Allrun
@@ -9,6 +9,6 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 "    " $8 }' \
 
 ./createGraph
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
 
diff --git a/tutorials/combustion/chemFoam/h2/validation/createGraph b/tutorials/combustion/chemFoam/h2/validation/createGraph
index 0053df1a9b..bbb36218fa 100755
--- a/tutorials/combustion/chemFoam/h2/validation/createGraph
+++ b/tutorials/combustion/chemFoam/h2/validation/createGraph
@@ -21,5 +21,5 @@ gnuplot<<EOF
         "chemkinII" with lines title "Chemkin II" lt -1
 EOF
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
diff --git a/tutorials/combustion/chemFoam/ic8h18/Allclean b/tutorials/combustion/chemFoam/ic8h18/Allclean
index 24352b65b9..d1134cd3fc 100755
--- a/tutorials/combustion/chemFoam/ic8h18/Allclean
+++ b/tutorials/combustion/chemFoam/ic8h18/Allclean
@@ -8,5 +8,5 @@ cleanCase
 
 \rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
diff --git a/tutorials/combustion/chemFoam/ic8h18/Allrun b/tutorials/combustion/chemFoam/ic8h18/Allrun
index 82ff17fe53..62adab28f3 100755
--- a/tutorials/combustion/chemFoam/ic8h18/Allrun
+++ b/tutorials/combustion/chemFoam/ic8h18/Allrun
@@ -11,4 +11,4 @@ runApplication $application
 
 (cd validation && ./Allrun $*)
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/ic8h18/validation/Allrun b/tutorials/combustion/chemFoam/ic8h18/validation/Allrun
index ca399357b9..0720352189 100755
--- a/tutorials/combustion/chemFoam/ic8h18/validation/Allrun
+++ b/tutorials/combustion/chemFoam/ic8h18/validation/Allrun
@@ -9,6 +9,6 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 "    " $8 }' \
 
 ./createGraph
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
 
diff --git a/tutorials/combustion/chemFoam/ic8h18/validation/createGraph b/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
index 9019192823..4606eac7d3 100755
--- a/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
+++ b/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
@@ -21,5 +21,5 @@ gnuplot<<EOF
         "chemkinII" with lines title "Chemkin II" lt -1
 EOF
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
diff --git a/tutorials/combustion/chemFoam/nc7h16/Allclean b/tutorials/combustion/chemFoam/nc7h16/Allclean
index 24352b65b9..d1134cd3fc 100755
--- a/tutorials/combustion/chemFoam/nc7h16/Allclean
+++ b/tutorials/combustion/chemFoam/nc7h16/Allclean
@@ -8,5 +8,5 @@ cleanCase
 
 \rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
diff --git a/tutorials/combustion/chemFoam/nc7h16/Allrun b/tutorials/combustion/chemFoam/nc7h16/Allrun
index 82ff17fe53..62adab28f3 100755
--- a/tutorials/combustion/chemFoam/nc7h16/Allrun
+++ b/tutorials/combustion/chemFoam/nc7h16/Allrun
@@ -11,4 +11,4 @@ runApplication $application
 
 (cd validation && ./Allrun $*)
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/nc7h16/validation/Allrun b/tutorials/combustion/chemFoam/nc7h16/validation/Allrun
index ca399357b9..0720352189 100755
--- a/tutorials/combustion/chemFoam/nc7h16/validation/Allrun
+++ b/tutorials/combustion/chemFoam/nc7h16/validation/Allrun
@@ -9,6 +9,6 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 "    " $8 }' \
 
 ./createGraph
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
 
diff --git a/tutorials/combustion/chemFoam/nc7h16/validation/createGraph b/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
index ab1432022f..b2f8a4d945 100755
--- a/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
+++ b/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
@@ -21,5 +21,5 @@ gnuplot<<EOF
         "chemkinII" with lines title "Chemkin II" lt -1
 EOF
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
 
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allclean b/tutorials/combustion/engineFoam/kivaTest/Allclean
index 6be1f524b7..6904a7f0e6 100755
--- a/tutorials/combustion/engineFoam/kivaTest/Allclean
+++ b/tutorials/combustion/engineFoam/kivaTest/Allclean
@@ -12,4 +12,4 @@ rm -f constant/polyMesh/boundary > /dev/null 2>&1
 
 mv temp180 ./-180
 
-# ----------------------------------------------------------------- end-of-file
\ No newline at end of file
+#------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun
index 592be37ba2..e51b7da7c0 100755
--- a/tutorials/combustion/engineFoam/kivaTest/Allrun
+++ b/tutorials/combustion/engineFoam/kivaTest/Allrun
@@ -11,4 +11,4 @@ runApplication kivaToFoam -file otape17
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allclean b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allclean
index 2484a49705..8f51891b20 100755
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allclean
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allclean
@@ -11,4 +11,4 @@ rm -rf constant/pyrolysisRegion/polyMesh
 
 rm -rf system/pyrolysisRegion/filmRegion
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun
index 5fa5f4af67..6101e96371 100755
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun
@@ -38,4 +38,4 @@ runApplication `getApplication`
 
 paraFoam -touchAll
 
-# ----------------------------------------------------------------- end-of-file
\ No newline at end of file
+#------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean
index 083e3d7ca0..df17cd588d 100755
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean
@@ -10,4 +10,4 @@ rm -rf constant/panelRegion/polyMesh
 rm  -f 0/polyMesh/cellMap
 rm  -f constant/polyMesh/boundary
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
index 7b08d9dbdf..e5bcb245fa 100755
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
@@ -36,4 +36,4 @@ paraFoam -touch
 paraFoam -touch -region panelRegion
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
index 08baf65c0e..11ae4b0d7c 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
@@ -12,4 +12,4 @@ runApplication createPatch -overwrite
 # Run
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
index 1197f13ca7..81460ea389 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
@@ -14,4 +14,4 @@ runApplication decomposePar -force
 # Run
 runParallel $application
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean
index 04e56e55df..91996c46bb 100755
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean
@@ -8,4 +8,4 @@ cleanCase
 cleanSamples
 rm -rf constant/polyMesh/boundary
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun
index 3132569fc6..a1d7b7290c 100755
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun
@@ -31,4 +31,4 @@ rm $CONST/polyMesh/boundary.bak
 runApplication `getApplication`
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
index 0c23675f65..83c0bb6d46 100755
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
@@ -20,7 +20,7 @@ USAGE
     exit 1
 }
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 
 unset timeOpt
 
@@ -53,4 +53,4 @@ do
     cat ${d}/cone25_${FS} ${d}/cone55_${FS} ${d}/base_${FS} > ${d}/biconic_${FS}
 done
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
index 05bd98ba9d..416eb9a89d 100755
--- a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
@@ -9,4 +9,4 @@ cp -r 0.org 0
 cleanCase
 cleanSamples
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allrun b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun
index 1acad34122..7f1047e95d 100755
--- a/tutorials/compressible/rhoCentralFoam/shockTube/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun
@@ -8,4 +8,4 @@ runApplication blockMesh
 runApplication setFields
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean
index 80969a77de..cc15617bf6 100755
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean
@@ -9,4 +9,4 @@ rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
index 02ce7d2b4c..5bf2beb557 100755
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
@@ -21,4 +21,4 @@ cp -r 0.org 0
 
 runApplication $(getApplication)
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun
index a97e9a4aad..2a52698c04 100755
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun
@@ -11,4 +11,4 @@ application=`getApplication`
 runApplication blockMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
index a97e9a4aad..2a52698c04 100755
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
@@ -11,4 +11,4 @@ application=`getApplication`
 runApplication blockMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
index 8e6e3e6365..a0d99d7592 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
@@ -9,4 +9,4 @@ rm -rf 0
 cp -r 0.org 0
 cleanSamples
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
index 66596d4f92..20ffce0a15 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
@@ -12,4 +12,4 @@ runApplication $application
 runApplication foamCalc mag U
 runApplication sample
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allclean b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allclean
index edae5c37f5..972da44d34 100755
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allclean
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm -f constant/polyMesh/boundary > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
index 0df7881d40..b6157963be 100755
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
@@ -13,4 +13,4 @@ sed -i -e 's/symmetry\([)]*;\)/empty\1/' constant/polyMesh/boundary
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/sonicLiquidFoam/Allclean b/tutorials/compressible/sonicLiquidFoam/Allclean
index 4dbd59a53d..aa8cb7bc24 100755
--- a/tutorials/compressible/sonicLiquidFoam/Allclean
+++ b/tutorials/compressible/sonicLiquidFoam/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 removeCase decompressionTankFine
 foamCleanTutorials cases
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun
index 24f284adee..044fd34bfc 100755
--- a/tutorials/compressible/sonicLiquidFoam/Allrun
+++ b/tutorials/compressible/sonicLiquidFoam/Allrun
@@ -42,4 +42,4 @@ cloneCase decompressionTank decompressionTankFine
     runApplication `getApplication`
 )
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean
index 254de82611..36f3cdc151 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun
index 44ea02e029..120c352ecb 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun
@@ -8,4 +8,4 @@ runApplication blockMesh
 runApplication dsmcInitialise
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean
index 254de82611..36f3cdc151 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun
index 44ea02e029..120c352ecb 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun
@@ -8,4 +8,4 @@ runApplication blockMesh
 runApplication dsmcInitialise
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
index 254de82611..36f3cdc151 100755
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
index 8704a9b0cb..f502a72e59 100755
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
@@ -10,4 +10,4 @@ runParallel dsmcInitialise
 runParallel `getApplication`
 runApplication reconstructPar -noLagrangian
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
index 254de82611..36f3cdc151 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
index 7c0b454740..45c06e38e5 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
@@ -11,4 +11,4 @@ runParallel `getApplication`
 runApplication reconstructPar -noLagrangian
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
index 2c143aac73..9852503f2c 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
@@ -11,4 +11,4 @@ rm -f constant/idList
 rm -rf constant/polyMesh/sets
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun
index 80f6f3883e..4830eb007f 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun
@@ -8,4 +8,4 @@ runApplication blockMesh
 runApplication mdInitialise
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
index f93c58ed3d..ec56cfe28b 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
@@ -11,4 +11,4 @@ rm -f constant/idList
 rm -rf constant/polyMesh/sets
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun
index 80f6f3883e..4830eb007f 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun
@@ -8,4 +8,4 @@ runApplication blockMesh
 runApplication mdInitialise
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
index 8755dc7125..21cb83d5ac 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
@@ -8,4 +8,4 @@ rm -rf constant/polyMesh/sets
 rm -rf processor[0-9]
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
index 4cdfac76e0..9f9a93ff37 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
@@ -16,4 +16,4 @@ runParallel $application
 
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/Allclean b/tutorials/electromagnetics/mhdFoam/hartmann/Allclean
index 7c88a67bdc..a5e65c7d81 100755
--- a/tutorials/electromagnetics/mhdFoam/hartmann/Allclean
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 cleanSamples
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/Allrun b/tutorials/electromagnetics/mhdFoam/hartmann/Allrun
index 162944f130..bb8053763d 100755
--- a/tutorials/electromagnetics/mhdFoam/hartmann/Allrun
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/Allrun
@@ -12,4 +12,4 @@ runApplication $application
 runApplication foamCalc components U
 runApplication sample
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean
index 27aafbb5aa..be62031288 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm -f 0/T
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
index 8ca1b4cab6..0ecf4b2d13 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
@@ -11,4 +11,4 @@ cp 0/T.org 0/T
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean
index 27aafbb5aa..be62031288 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm -f 0/T
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
index 8ca1b4cab6..0ecf4b2d13 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
@@ -11,4 +11,4 @@ cp 0/T.org 0/T
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
index 8e4457d342..de3f6389f8 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
@@ -8,4 +8,4 @@ runApplication blockMesh
 runApplication snappyHexMesh -overwrite
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
index b26bcec9bb..6fe57d72bb 100755
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 cp 0/T.org 0/T
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
index 5871e056f3..0df95afd2e 100755
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
@@ -11,4 +11,4 @@ runApplication blockMesh
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
index 8de310cd2b..f436bc02bb 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
@@ -8,4 +8,4 @@ cleanCase
 rm -rf sets
 rm -f validation/*.eps
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
index 7e09552b26..740f3a5ed6 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
@@ -13,4 +13,4 @@ runApplication sample -latestTime
 
 ( cd validation && ./createGraphs )
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
index 0ec295ba7b..eabb05d8f4 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
@@ -9,4 +9,4 @@ rm -rf constant/baffle3DRegion
 rm -rf constant/polyMesh/boundary
 rm -rf 0
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allclean
index 871192082a..469b55885f 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allclean
@@ -11,4 +11,4 @@ rm -rf comms
 killall externalSolver > /dev/null 2>&1
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun
index ba2d933543..4327bbbc17 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun
@@ -11,4 +11,4 @@ runApplication $(getApplication) &
 ./externalSolver
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel
index 4c959ca647..e4ef2fce86 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel
@@ -13,4 +13,4 @@ runParallel $(getApplication) &
 ./externalSolver
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun.pre b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun.pre
index 0fca0f1d79..3a03bb1e87 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun.pre
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun.pre
@@ -8,4 +8,4 @@ runApplication blockMesh
 runApplication createExternalCoupledPatchGeometry T
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver
index 03c25c644a..d44aca2bef 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver
@@ -82,4 +82,4 @@ done
 log "done"
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allclean
index 10920439bb..6b45f82a41 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allclean
@@ -6,4 +6,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun
index 1533de82df..2d455d1fbc 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun
@@ -9,4 +9,4 @@ application=`getApplication`
 runApplication blockMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allclean
index 10920439bb..6b45f82a41 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allclean
@@ -6,4 +6,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun
index 1533de82df..2d455d1fbc 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun
@@ -9,4 +9,4 @@ application=`getApplication`
 runApplication blockMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
index b46db24de7..bf5077c90a 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
@@ -19,4 +19,4 @@ rm -rf constant/heater/polyMesh
 rm -rf constant/leftSolid/polyMesh
 rm -rf constant/rightSolid/polyMesh
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index d0bf0a098a..bd8074f33a 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -40,4 +40,4 @@ echo "creating files for paraview post-processing"
 echo
 paraFoam -touchAll
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
index 5dc7b1cfd9..f56be82da7 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
@@ -23,4 +23,4 @@ rm -rf constant/heater/polyMesh
 rm -rf constant/leftSolid/polyMesh
 rm -rf constant/rightSolid/polyMesh
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
index d53a286e73..b7e64e4525 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
@@ -45,4 +45,4 @@ echo "creating files for paraview post-processing"
 echo
 paraFoam -touchAll
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean
index 34e76f9ade..b23f6388c4 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean
@@ -32,4 +32,4 @@ rm -f constant/topAir/finalAgglom
 rm -f constant/topAir/globalFaceFaces
 rm -f constant/topAir/subMap
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
index bc2866e68b..9a15ba12db 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
@@ -33,4 +33,4 @@ echo "creating files for paraview post-processing"
 echo
 paraFoam -touchAll
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
index 34abacf4ba..29340be8b7 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
@@ -40,4 +40,4 @@ echo "creating files for paraview post-processing"
 echo
 paraFoam -touchAll
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
index 9ce6c565d5..ae1d9ff751 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
@@ -21,4 +21,4 @@ do
 done
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun b/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun
index 0c62ec6ec5..85523c3f63 100755
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun
@@ -9,4 +9,4 @@ application=`getApplication`
 ./makeMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh b/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh
index b0e33568ef..ea511db9f4 100755
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh
@@ -6,4 +6,4 @@ set -x
 m4 < system/blockMeshDict.m4 > system/blockMeshDict
 blockMesh > log.blockMesh 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean
index c4004d5fa5..9890874433 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean
@@ -9,4 +9,4 @@ cleanCase
 rm -rf logs
 rm -f *.eps yPlus_vs_uPlus
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
index 88c12b688b..a61f812ff4 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
@@ -73,4 +73,4 @@ EOF
 
 echo Done
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/icoFoam/cavity/Allclean b/tutorials/incompressible/icoFoam/cavity/Allclean
index c23389e81c..842bb7ced7 100755
--- a/tutorials/incompressible/icoFoam/cavity/Allclean
+++ b/tutorials/incompressible/icoFoam/cavity/Allclean
@@ -20,4 +20,4 @@ do
     removeCase $caseName
 done
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/icoFoam/cavity/Allrun b/tutorials/incompressible/icoFoam/cavity/Allrun
index 032b71f2b8..97f489d7f8 100755
--- a/tutorials/incompressible/icoFoam/cavity/Allrun
+++ b/tutorials/incompressible/icoFoam/cavity/Allrun
@@ -86,4 +86,4 @@ do
     ( cd $caseName && runApplication `getApplication` )
 done
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/icoFoam/elbow/Allclean b/tutorials/incompressible/icoFoam/elbow/Allclean
index e44a03c204..f2da619e3d 100755
--- a/tutorials/incompressible/icoFoam/elbow/Allclean
+++ b/tutorials/incompressible/icoFoam/elbow/Allclean
@@ -8,4 +8,4 @@ rm -f constant/polyMesh/boundary > /dev/null 2>&1
 rm -rf fluentInterface
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/icoFoam/elbow/Allrun b/tutorials/incompressible/icoFoam/elbow/Allrun
index 093641823a..60c5cad943 100755
--- a/tutorials/incompressible/icoFoam/elbow/Allrun
+++ b/tutorials/incompressible/icoFoam/elbow/Allrun
@@ -12,4 +12,4 @@ runApplication "$application"
 runApplication foamMeshToFluent
 runApplication foamDataToFluent
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
index 19debb7a09..ebb4061015 100755
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
@@ -13,4 +13,4 @@ runApplication decomposePar
 runParallel $application
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/makeMesh b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/makeMesh
index adf298d6f3..bcb12c0e9a 100755
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/makeMesh
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/makeMesh
@@ -10,4 +10,4 @@ runApplication blockMesh
 
 runApplication topoSet
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
index c0443867ad..997bdd6cfb 100755
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun
@@ -27,4 +27,4 @@ runApplication decomposePar
 runParallel `getApplication`
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/Allclean b/tutorials/incompressible/pimpleFoam/TJunctionFan/Allclean
index 4e8a5b29fd..61edfb3032 100755
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/Allclean
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm -rf 0
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/channel395/Allrun b/tutorials/incompressible/pimpleFoam/channel395/Allrun
index 340e3e1ef8..989291cfdd 100755
--- a/tutorials/incompressible/pimpleFoam/channel395/Allrun
+++ b/tutorials/incompressible/pimpleFoam/channel395/Allrun
@@ -19,4 +19,4 @@ runApplication reconstructPar
 
 runApplication postChannel
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean
index 10920439bb..6b45f82a41 100755
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean
@@ -6,4 +6,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
index 138bb82e89..c82525b2f1 100755
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
@@ -23,4 +23,4 @@ runApplication topoSet
 runApplication createPatch -overwrite
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
index a72c18a9dd..a651bf5d0e 100755
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
@@ -12,4 +12,4 @@ runApplication topoSet
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/Allclean b/tutorials/incompressible/pisoFoam/les/motorBike/Allclean
index e4b31c3740..5521d49681 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/Allclean
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/Allclean
@@ -8,4 +8,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 rm -rf motorBikeLES
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/Allrun
index cc5a578966..15e3932e9e 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/Allrun
@@ -35,4 +35,4 @@ then
     (cd motorBikeLES && foamRunTutorials)
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allclean b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allclean
index cdb4fd6182..a48c67fbef 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allclean
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allclean
@@ -14,4 +14,4 @@ cleanCase
 # Reset decomposeParDict
 cp system/decomposeParDict.hierarchical system/decomposeParDict
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
index dba0d829ff..b24684ca2a 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
@@ -27,4 +27,4 @@ runParallel potentialFoam -initialiseUBCs
 
 runParallel `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean
index 5aaa172c9c..f7e384215e 100755
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean
@@ -11,4 +11,4 @@ rm constant/polyMesh/boundary > /dev/null 2>&1
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun
index be37465889..f3df037202 100755
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun
@@ -8,4 +8,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
index a6ca09c210..eff1c822a7 100755
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
@@ -28,4 +28,4 @@ latestTime=`foamInfoExec -latestTime`
 # Clean up intermediate meshes
 \rm -r [1-9]*
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
index b77d47d991..c89fe3143e 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
@@ -6,4 +6,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 rm -rf *[1-9]*
 rm -f log.* 2>/dev/null
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
index 81444e70c8..2718173247 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
@@ -8,4 +8,4 @@ application=`getApplication`
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun b/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
index 0c62ec6ec5..85523c3f63 100755
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
@@ -9,4 +9,4 @@ application=`getApplication`
 ./makeMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh b/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh
index afad253d6e..5cd24a5528 100755
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh
@@ -8,4 +8,4 @@ m4 < system/blockMeshDict.m4 > system/blockMeshDict
 
 runApplication blockMesh
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index 9cdfeebbf4..39b3f3785b 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -27,4 +27,4 @@ runParallel $(getApplication)
 runApplication reconstructParMesh -constant
 runApplication reconstructPar -latestTime
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean b/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean
index edd5fd5440..5734444f4e 100755
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean
@@ -8,4 +8,4 @@ rm -rf 0 > /dev/null 2>&1
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
index dede11e268..8d9f834d23 100755
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
@@ -18,4 +18,4 @@ runParallel $application
 
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/Allrun b/tutorials/incompressible/simpleFoam/rotorDisk/Allrun
index 8a5b1de58c..14d69c2a9a 100755
--- a/tutorials/incompressible/simpleFoam/rotorDisk/Allrun
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/Allrun
@@ -12,4 +12,4 @@ runApplication createPatch -overwrite
 
 runApplication $(getApplication)
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean
index ddc37ada43..aae8b75f80 100755
--- a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean
@@ -11,4 +11,4 @@ cleanCase
 # Remove decomposeParDict
 rm -f system/decomposeParDict
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
index 702759237d..c8ff7fbe9d 100755
--- a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
@@ -24,4 +24,4 @@ runParallel `getApplication`
 runApplication reconstructParMesh -constant
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
index 3427112d73..baa135b1d4 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
@@ -10,4 +10,4 @@ rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/buildings.eMesh > /dev/null 2>&1
 rm -f constant/polyMesh/boundary > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
index 1e6e2f7318..753dd9c942 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
@@ -11,4 +11,4 @@ runApplication snappyHexMesh -overwrite
 
 runApplication $(getApplication)
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/Allrun b/tutorials/lagrangian/MPPICFoam/cyclone/Allrun
index 20831ede74..8af86abdc3 100755
--- a/tutorials/lagrangian/MPPICFoam/cyclone/Allrun
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/Allrun
@@ -15,4 +15,4 @@ runApplication decomposePar
 
 runParallel MPPICFoam
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
index 73f7cc98e6..b11e5980cf 100755
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
@@ -14,4 +14,4 @@ runApplication topoSet
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
index 0617cfbbf8..7e66459137 100755
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
@@ -11,4 +11,4 @@ cd ../hopperEmptying
 cleanCase
 rm -rf 0
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
index c9e57d4e6f..6a0667ccb8 100755
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
@@ -20,4 +20,4 @@ runApplication decomposePar
 runParallel `getApplication`
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
index 0f11ae6d52..7725643435 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
@@ -10,4 +10,4 @@ rm -rf constant/wallFilmRegion
 rm -rf 0
 rm -f *.obj
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
index 0bac6f8f84..db95457745 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
@@ -11,4 +11,4 @@ rm -rf constant/wallFilmRegion
 rm -rf 0
 rm -f *.obj
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
index 0f11ae6d52..7725643435 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
@@ -10,4 +10,4 @@ rm -rf constant/wallFilmRegion
 rm -rf 0
 rm -f *.obj
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
index 0f11ae6d52..7725643435 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
@@ -10,4 +10,4 @@ rm -rf constant/wallFilmRegion
 rm -rf 0
 rm -f *.obj
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
index 1a895d9027..a298a17347 100755
--- a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
@@ -15,4 +15,4 @@ rm -rf postProcessing
 # copy 0.org to 0
 cp -r 0.org 0
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun
index ada691c0d4..5163ff42ca 100755
--- a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun
@@ -17,4 +17,4 @@ runApplication createBaffles -overwrite
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
index b2a7c0da6f..df77730bc3 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
@@ -9,4 +9,4 @@ rm -rf 0 *[1-9]* processor* postProcessing
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun
index 01c85119b1..35dc16c075 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun
@@ -17,4 +17,4 @@ rm -f 0/phi
 # run the solver
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean
index 6fab2f86da..f0cffd5b25 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean
@@ -13,4 +13,4 @@ cp -r 0.org 0
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
index 0dfbfeaff9..fa0d0929d9 100755
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
@@ -12,4 +12,4 @@ cp -r 0.org 0
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
index 03f2f3a086..94c17f61f5 100755
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
@@ -16,4 +16,4 @@ rm -f 0/phi
 
 runApplication $(getApplication)
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/Allrun b/tutorials/mesh/foamyHexMesh/Allrun
index 5a6e534cbf..93da24214e 100755
--- a/tutorials/mesh/foamyHexMesh/Allrun
+++ b/tutorials/mesh/foamyHexMesh/Allrun
@@ -29,4 +29,4 @@ then
     )
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allclean b/tutorials/mesh/foamyHexMesh/blob/Allclean
index d93d01fea6..7563c7a99b 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allclean
+++ b/tutorials/mesh/foamyHexMesh/blob/Allclean
@@ -24,4 +24,4 @@ rm -rf snapToSurface?.obj > /dev/null 2>&1
 rm -rf tetsToSnapTo.obj > /dev/null 2>&1
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun b/tutorials/mesh/foamyHexMesh/blob/Allrun
index a1a4c2efd7..5b36f0de08 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun
@@ -18,4 +18,4 @@ mv log.collapseEdges log.collapseFaceSet
 runApplication checkMesh -latestTime -allGeometry -allTopology
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
index 21ff27d064..bcc119f240 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
@@ -23,4 +23,4 @@ runParallel checkMesh -latestTime -allTopology -allGeometry
 runApplication reconstructParMesh -latestTime
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allclean b/tutorials/mesh/foamyHexMesh/flange/Allclean
index 889d63dbda..2ceecfe1f9 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allclean
+++ b/tutorials/mesh/foamyHexMesh/flange/Allclean
@@ -21,4 +21,4 @@ rm -r *.obj > /dev/null 2>&1
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun b/tutorials/mesh/foamyHexMesh/flange/Allrun
index 590de20db9..fff3c12977 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allrun
+++ b/tutorials/mesh/foamyHexMesh/flange/Allrun
@@ -18,4 +18,4 @@ mv log.collapseEdges log.collapseFaceSet
 runApplication checkMesh -latestTime -allGeometry -allTopology
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
index 318a2381eb..bd04a36575 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
@@ -24,4 +24,4 @@ runParallel checkMesh -latestTime -allTopology -allGeometry
 runApplication reconstructParMesh -latestTime
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean b/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean
index 91fe865dee..55c1a652c2 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean
@@ -21,4 +21,4 @@ cleanCase
 \rm -f constant/backgroundMeshDecomposition/polyMesh/points
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun
index 846609a59e..b66c25a9a4 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun
@@ -10,4 +10,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Run simulation
 ./Allrun-simulation
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
index 93db043a8f..58e149a749 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
@@ -103,4 +103,4 @@ runApplication reconstructParMesh -latestTime
 \rm -rf 101
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
index 8b331ca9cd..69e6c8f61e 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
@@ -34,4 +34,4 @@ runParallel $application
 runApplication reconstructPar -noFunctionObjects
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/triSurface/surfaceProcess.sh b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/triSurface/surfaceProcess.sh
index 95ae932c0c..a030e20758 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/triSurface/surfaceProcess.sh
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/triSurface/surfaceProcess.sh
@@ -31,4 +31,4 @@ surfaceCheck stirrer_baffles.stl
 \mv stirrer_baffles_0.obj stirrer_baffles_plate.obj
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
index 5e7012aaeb..66229e46ca 100755
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
@@ -19,4 +19,4 @@ rm -rf 0/
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
index 3b172cb321..c0d7aab678 100755
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
@@ -28,4 +28,4 @@ mv log.collapseEdges log.collapseFaceSet
 runApplication collapseEdges -latestTime -collapseFaces
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean
index 16e19b4e2f..ab8099c649 100755
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean
@@ -12,4 +12,4 @@ rm -rf MeshedSurface.obj > /dev/null 2>&1
 cleanCase
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun
index 984c12f925..8653b499f5 100755
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun
@@ -17,4 +17,4 @@ runApplication extrude2DMesh -overwrite polyMesh2D
 runApplication checkMesh -allGeometry -allTopology -constant -noZero
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
index 2937f5ae7d..8ab7ec8251 100755
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
@@ -12,4 +12,4 @@ runParallel rhoCentralFoam
 runApplication reconstructPar
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean
index ff6b5a8a2f..3a0c222993 100755
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean
@@ -13,4 +13,4 @@ rm -rf MeshedSurface.obj > /dev/null 2>&1
 cleanCase
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun
index 6fb3f8d5d0..150693b9fe 100755
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun
@@ -10,4 +10,4 @@ runApplication extrude2DMesh -overwrite MeshedSurface
 runApplication checkMesh -allGeometry -allTopology -constant -noZero
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/square/Allclean b/tutorials/mesh/foamyQuadMesh/square/Allclean
index 44c35cfccb..d8936babb0 100755
--- a/tutorials/mesh/foamyQuadMesh/square/Allclean
+++ b/tutorials/mesh/foamyQuadMesh/square/Allclean
@@ -13,4 +13,4 @@ rm -rf MeshedSurface*.obj > /dev/null 2>&1
 cleanCase
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/square/Allrun b/tutorials/mesh/foamyQuadMesh/square/Allrun
index 186fe93656..26543eaac4 100755
--- a/tutorials/mesh/foamyQuadMesh/square/Allrun
+++ b/tutorials/mesh/foamyQuadMesh/square/Allrun
@@ -10,4 +10,4 @@ runApplication extrude2DMesh -overwrite polyMesh2D
 runApplication checkMesh -allGeometry -allTopology -constant -noZero
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/snappyHexMesh/Allrun b/tutorials/mesh/snappyHexMesh/Allrun
index 4a41dcfe2c..0b5770d029 100755
--- a/tutorials/mesh/snappyHexMesh/Allrun
+++ b/tutorials/mesh/snappyHexMesh/Allrun
@@ -14,4 +14,4 @@ exit 0
 
 # This dummy Allrun script avoids meshing these cases twice.
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/snappyHexMesh/flange/Allclean b/tutorials/mesh/snappyHexMesh/flange/Allclean
index 3075372076..abcfd9e6e6 100755
--- a/tutorials/mesh/snappyHexMesh/flange/Allclean
+++ b/tutorials/mesh/snappyHexMesh/flange/Allclean
@@ -15,4 +15,4 @@ rm -f constant/polyMesh/boundary
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun
index d00a7e4b5c..e0ffdffe18 100755
--- a/tutorials/multiphase/cavitatingFoam/les/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/Allrun
@@ -11,4 +11,4 @@ cd ${0%/*} || exit 1    # Run from this directory
     ./Allrun $*
 )
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/les/throttle/Allclean
index 5a37749d80..57c93208bc 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/Allclean
@@ -9,4 +9,4 @@ rm -rf 0/polyMesh > /dev/null 2>&1
 rm system/topoSetDict > /dev/null 2>&1
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
index 69a82ea552..d0b7026c3a 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
@@ -29,4 +29,4 @@ runApplication blockMesh
 refineMeshByCellSet 1 2 3
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
index b4be099821..d1fd91d5d3 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
@@ -10,4 +10,4 @@ rm system/topoSetDict > /dev/null 2>&1
 rm -rf processor[0-9] > /dev/null 2>&1
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
index 90e7cb6685..fb55f327c6 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
@@ -37,4 +37,4 @@ runApplication decomposePar
 runParallel $application
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
index 5a37749d80..57c93208bc 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
@@ -9,4 +9,4 @@ rm -rf 0/polyMesh > /dev/null 2>&1
 rm system/topoSetDict > /dev/null 2>&1
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
index 8cfe49094a..4f68fa57c2 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
@@ -28,4 +28,4 @@ runApplication blockMesh
 refineMeshByCellSet 1 2 3
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allclean b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allclean
index f47e555ded..b2105c21b3 100755
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allclean
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allclean
@@ -5,4 +5,4 @@ foamCleanTutorials cases
 rm -rf 0/alpha.water 0/alpha.water.gz 0/T.air.gz 0/T.water.gz \
     probes wallPressure pRefProbe
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun
index 9c160cce7d..d527e2ed86 100755
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun
@@ -10,4 +10,4 @@ cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
index 7ac8041872..caaf799f71 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
@@ -8,4 +8,4 @@ cleanCase
 
 \rm -rf 0
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
index c481d2eff2..5040c29590 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun
@@ -9,4 +9,4 @@ cp -r 0.org 0
 runApplication setFields
 runApplication $(getApplication)
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
index 61b2d9ae0e..b5350d676a 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
@@ -9,4 +9,4 @@ cleanCase
 \rm -rf 0
 rm -rf processor*
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
index 12e3b0b662..4e091494f6 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun
@@ -11,4 +11,4 @@ runApplication decomposePar
 runParallel $(getApplication)
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean
index 7ac8041872..caaf799f71 100755
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean
@@ -8,4 +8,4 @@ cleanCase
 
 \rm -rf 0
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
index 81cae15eab..b275240a50 100755
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
@@ -14,4 +14,4 @@ runApplication blockMesh
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/Allrun b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/Allrun
index 349ea685ea..66c1631fd3 100755
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/Allrun
@@ -9,4 +9,4 @@ application=`getApplication`
 runApplication ./makeMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allclean b/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allclean
index b77d47d991..c89fe3143e 100755
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allclean
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allclean
@@ -6,4 +6,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 rm -rf *[1-9]*
 rm -f log.* 2>/dev/null
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allrun b/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allrun
index 81444e70c8..2718173247 100755
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allrun
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allrun
@@ -8,4 +8,4 @@ application=`getApplication`
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allclean b/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allclean
index 53120b9c37..ae1cd80480 100755
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allclean
@@ -14,4 +14,4 @@ cleanCase
 \rm -rf 0 > /dev/null 2>&1
 \rm system/topoSetDict > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun b/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
index a0a9420e31..636c425d4c 100755
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
@@ -45,4 +45,4 @@ runParallel $(getApplication)
 
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean
index e87f782c61..d1295e344e 100755
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean
@@ -9,4 +9,4 @@ rm -rf 0 > /dev/null 2>&1
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
index 26d91e25b7..0424df0e63 100755
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
@@ -12,4 +12,4 @@ runApplication subsetMesh -overwrite c0 -patch walls
 runApplication setFields
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean
index edd5fd5440..5734444f4e 100755
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean
@@ -8,4 +8,4 @@ rm -rf 0 > /dev/null 2>&1
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
index a5514c147a..62915ff2cf 100755
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
@@ -14,4 +14,4 @@ cp -r 0.org 0 > /dev/null 2>&1
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allclean b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allclean
index b5494c69fb..bd23e0cde8 100755
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allclean
@@ -10,4 +10,4 @@ cleanCase
 \rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 \rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun
index dff104f777..da8fc430fe 100755
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun
@@ -18,4 +18,4 @@ runParallel $application
 # Reconstruct
 runApplication reconstructPar -noFunctionObjects
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun.pre b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun.pre
index c27ee3a94d..94f5661673 100755
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun.pre
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun.pre
@@ -25,4 +25,4 @@ runApplication createPatch -overwrite
 # Initialize alpha
 runApplication setFields
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
index c1400c13fd..dc74ee4df5 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
@@ -4,4 +4,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 foamCleanTutorials cases
 rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
index 9c160cce7d..d527e2ed86 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
@@ -10,4 +10,4 @@ cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
index c1400c13fd..dc74ee4df5 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
@@ -4,4 +4,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 foamCleanTutorials cases
 rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
index 9c160cce7d..d527e2ed86 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
@@ -10,4 +10,4 @@ cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
index c1400c13fd..dc74ee4df5 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
@@ -4,4 +4,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 foamCleanTutorials cases
 rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
index 9c160cce7d..d527e2ed86 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
@@ -10,4 +10,4 @@ cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
index c1400c13fd..dc74ee4df5 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
@@ -4,4 +4,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 foamCleanTutorials cases
 rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
index 9c160cce7d..d527e2ed86 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
@@ -10,4 +10,4 @@ cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
index c1400c13fd..dc74ee4df5 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
@@ -4,4 +4,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 foamCleanTutorials cases
 rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
index 9c160cce7d..d527e2ed86 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
@@ -10,4 +10,4 @@ cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
index aff960b192..8c9c9abaac 100755
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm -rf 0/alpha.water
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
index dfdfff0c76..f49fa8dbc4 100755
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
@@ -9,4 +9,4 @@ cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
index 114fb01b66..9a17d2d525 100755
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
@@ -11,4 +11,4 @@ cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/Allclean b/tutorials/multiphase/interFoam/laminar/damBreak/Allclean
index 28cb0ef1ea..efbd66e1c2 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allclean
@@ -17,4 +17,4 @@ do
     removeCase $case
 done
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
index bd43fc4ecc..125f1aa53b 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
@@ -43,4 +43,4 @@ cloneCase damBreak damBreakFine
     runApplication reconstructPar
 )
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean
index 92cf1ae4a7..901c358b37 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 cp 0/alpha.water.org 0/alpha.water
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
index 5871e056f3..0df95afd2e 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
@@ -11,4 +11,4 @@ runApplication blockMesh
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
index 4063d3c471..c0a3a7154e 100755
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
@@ -11,4 +11,4 @@ cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean
index c8b7ab35d7..473383859a 100755
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm system/topoSetDict > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
index b775b2a481..3c04c72a4e 100755
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
@@ -33,4 +33,4 @@ done
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/Allclean b/tutorials/multiphase/interFoam/ras/DTCHull/Allclean
index 53120b9c37..ae1cd80480 100755
--- a/tutorials/multiphase/interFoam/ras/DTCHull/Allclean
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/Allclean
@@ -14,4 +14,4 @@ cleanCase
 \rm -rf 0 > /dev/null 2>&1
 \rm system/topoSetDict > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/Allrun b/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
index a0a9420e31..636c425d4c 100755
--- a/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
@@ -45,4 +45,4 @@ runParallel $(getApplication)
 
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/Allclean b/tutorials/multiphase/interFoam/ras/damBreak/Allclean
index 28cb0ef1ea..efbd66e1c2 100755
--- a/tutorials/multiphase/interFoam/ras/damBreak/Allclean
+++ b/tutorials/multiphase/interFoam/ras/damBreak/Allclean
@@ -17,4 +17,4 @@ do
     removeCase $case
 done
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
index bd43fc4ecc..125f1aa53b 100755
--- a/tutorials/multiphase/interFoam/ras/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
@@ -43,4 +43,4 @@ cloneCase damBreak damBreakFine
     runApplication reconstructPar
 )
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean
index 92cf1ae4a7..901c358b37 100755
--- a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean
+++ b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 cp 0/alpha.water.org 0/alpha.water
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun
index 5871e056f3..0df95afd2e 100755
--- a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun
@@ -11,4 +11,4 @@ runApplication blockMesh
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean
index 92cf1ae4a7..901c358b37 100755
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 cp 0/alpha.water.org 0/alpha.water
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
index dd94803832..a3c43a6c31 100755
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
@@ -14,4 +14,4 @@ runApplication createBaffles -overwrite
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allmesh b/tutorials/multiphase/interFoam/ras/waterChannel/Allmesh
index 9cb847c02d..2fcc7a8f5f 100755
--- a/tutorials/multiphase/interFoam/ras/waterChannel/Allmesh
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allmesh
@@ -17,4 +17,4 @@ while [ "$i" -lt 3 ] ; do
     i=`expr $i + 1`
 done
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allrun b/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
index 3bf622c771..eccd6c9252 100755
--- a/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
@@ -13,4 +13,4 @@ runApplication setFields
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean
index d77f37fb6d..af7604fd46 100755
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean
@@ -5,4 +5,4 @@ foamCleanTutorials cases
 rm -rf alpha.air alpha.other alpha.water \
     alpha.air.gz alpha.other.gz  alpha.water.gz
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun
index 7db9693970..9ce3033132 100755
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun
@@ -11,4 +11,4 @@ cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean
index 2bc59d1fe3..b6885c65f1 100755
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean
@@ -12,4 +12,4 @@ rm -rf 0
 
 cleanCase
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
index 56a77537ec..dc60517665 100755
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
@@ -21,4 +21,4 @@ runApplication potentialFoam -pName p_rgh
 # Run the solver
 runApplication `getApplication`
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean
index 7ac8041872..caaf799f71 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean
@@ -8,4 +8,4 @@ cleanCase
 
 \rm -rf 0
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun
index 81cae15eab..b275240a50 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun
@@ -14,4 +14,4 @@ runApplication blockMesh
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean
index 7ac8041872..caaf799f71 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean
@@ -8,4 +8,4 @@ cleanCase
 
 \rm -rf 0
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
index 623d0fe4a6..6103dad628 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
@@ -16,4 +16,4 @@ runApplication decomposePar
 runParallel $application
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
index 349ea685ea..66c1631fd3 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
@@ -9,4 +9,4 @@ application=`getApplication`
 runApplication ./makeMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
index a597dd3cae..d7ecd3dbdc 100755
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
@@ -17,4 +17,4 @@ runApplication setFields
 #runParallel $application
 #runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh
index adf298d6f3..bcb12c0e9a 100755
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh
@@ -10,4 +10,4 @@ runApplication blockMesh
 
 runApplication topoSet
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean
index 7ac8041872..caaf799f71 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean
@@ -8,4 +8,4 @@ cleanCase
 
 \rm -rf 0
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun
index 81cae15eab..b275240a50 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun
@@ -14,4 +14,4 @@ runApplication blockMesh
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean
index 7ac8041872..caaf799f71 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean
@@ -8,4 +8,4 @@ cleanCase
 
 \rm -rf 0
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
index 757afdd11a..b92d6cc19a 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
@@ -15,4 +15,4 @@ runApplication decomposePar
 runParallel $application
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean
index 5d6fa341eb..e62451c67f 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean
@@ -7,4 +7,4 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 rm 0/alphas > /dev/null 2>&1
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
index 349ea685ea..66c1631fd3 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
@@ -9,4 +9,4 @@ application=`getApplication`
 runApplication ./makeMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
index 4c515c1983..0e00b6b1a3 100755
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
@@ -18,4 +18,4 @@ cp -r 0.org 0 > /dev/null 2>&1
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun
index afc73e32a7..6514e8598b 100755
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun
@@ -14,4 +14,4 @@ cp -r 0.org 0 > /dev/null 2>&1
 
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
index 349ea685ea..66c1631fd3 100755
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
@@ -9,4 +9,4 @@ application=`getApplication`
 runApplication ./makeMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
index 349ea685ea..66c1631fd3 100755
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
@@ -9,4 +9,4 @@ application=`getApplication`
 runApplication ./makeMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean
index 7ac8041872..caaf799f71 100755
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean
@@ -8,4 +8,4 @@ cleanCase
 
 \rm -rf 0
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun
index 81cae15eab..b275240a50 100755
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun
@@ -14,4 +14,4 @@ runApplication blockMesh
 runApplication setFields
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
index 349ea685ea..66c1631fd3 100755
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
@@ -9,4 +9,4 @@ application=`getApplication`
 runApplication ./makeMesh
 runApplication $application
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/wmake/scripts/AllwmakeParseArguments b/wmake/scripts/AllwmakeParseArguments
index 5ed59576ba..433efafd52 100644
--- a/wmake/scripts/AllwmakeParseArguments
+++ b/wmake/scripts/AllwmakeParseArguments
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -167,4 +167,4 @@ fi
 unset Script usage setWM_NCOMPPROCS
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------

From caed25f447319e7be119e2430f28577992a7c52e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 15 Feb 2016 20:53:21 +0000
Subject: [PATCH 202/447] Code templates: Updated headers

---
 etc/codeTemplates/BC/BC.C                        | 2 +-
 etc/codeTemplates/BC/BC.H                        | 2 +-
 etc/codeTemplates/BC/BCs.C                       | 2 +-
 etc/codeTemplates/BC/BCs.H                       | 2 +-
 etc/codeTemplates/BC/BCsFwd.H                    | 2 +-
 etc/codeTemplates/app/app.C                      | 2 +-
 etc/codeTemplates/source/_Template.C             | 2 +-
 etc/codeTemplates/source/_Template.H             | 2 +-
 etc/codeTemplates/source/_TemplateApp.C          | 2 +-
 etc/codeTemplates/source/_TemplateI.H            | 2 +-
 etc/codeTemplates/source/_TemplateIO.C           | 2 +-
 etc/codeTemplates/template/_TemplateTemplate.C   | 2 +-
 etc/codeTemplates/template/_TemplateTemplate.H   | 2 +-
 etc/codeTemplates/template/_TemplateTemplateI.H  | 2 +-
 etc/codeTemplates/template/_TemplateTemplateIO.C | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index 8095873f5a..7163b87aa3 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H
index 27e5ac12dd..8dc2e49a75 100644
--- a/etc/codeTemplates/BC/BC.H
+++ b/etc/codeTemplates/BC/BC.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/BC/BCs.C b/etc/codeTemplates/BC/BCs.C
index 09efcccb66..a0b084933a 100644
--- a/etc/codeTemplates/BC/BCs.C
+++ b/etc/codeTemplates/BC/BCs.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/BC/BCs.H b/etc/codeTemplates/BC/BCs.H
index fee1a95c9f..bbd112ed9d 100644
--- a/etc/codeTemplates/BC/BCs.H
+++ b/etc/codeTemplates/BC/BCs.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/BC/BCsFwd.H b/etc/codeTemplates/BC/BCsFwd.H
index 366deb6009..4c600dd7eb 100644
--- a/etc/codeTemplates/BC/BCsFwd.H
+++ b/etc/codeTemplates/BC/BCsFwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/app/app.C b/etc/codeTemplates/app/app.C
index 911ba7c7de..2ed97537f6 100644
--- a/etc/codeTemplates/app/app.C
+++ b/etc/codeTemplates/app/app.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/source/_Template.C b/etc/codeTemplates/source/_Template.C
index a7005f5a20..6812cbdf16 100644
--- a/etc/codeTemplates/source/_Template.C
+++ b/etc/codeTemplates/source/_Template.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/source/_Template.H b/etc/codeTemplates/source/_Template.H
index 79343cc903..d2cbe47d0b 100644
--- a/etc/codeTemplates/source/_Template.H
+++ b/etc/codeTemplates/source/_Template.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/source/_TemplateApp.C b/etc/codeTemplates/source/_TemplateApp.C
index 36dfe222d9..80c562cbdb 100644
--- a/etc/codeTemplates/source/_TemplateApp.C
+++ b/etc/codeTemplates/source/_TemplateApp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/source/_TemplateI.H b/etc/codeTemplates/source/_TemplateI.H
index 4ad835f082..eca8d9ea3b 100644
--- a/etc/codeTemplates/source/_TemplateI.H
+++ b/etc/codeTemplates/source/_TemplateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/source/_TemplateIO.C b/etc/codeTemplates/source/_TemplateIO.C
index 155f05eabe..d07fc0d3f3 100644
--- a/etc/codeTemplates/source/_TemplateIO.C
+++ b/etc/codeTemplates/source/_TemplateIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/template/_TemplateTemplate.C b/etc/codeTemplates/template/_TemplateTemplate.C
index 5603c4959e..63b895032b 100644
--- a/etc/codeTemplates/template/_TemplateTemplate.C
+++ b/etc/codeTemplates/template/_TemplateTemplate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/template/_TemplateTemplate.H b/etc/codeTemplates/template/_TemplateTemplate.H
index e070d3d6fb..8fee2df3ef 100644
--- a/etc/codeTemplates/template/_TemplateTemplate.H
+++ b/etc/codeTemplates/template/_TemplateTemplate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/template/_TemplateTemplateI.H b/etc/codeTemplates/template/_TemplateTemplateI.H
index 687d269a90..eca8d9ea3b 100644
--- a/etc/codeTemplates/template/_TemplateTemplateI.H
+++ b/etc/codeTemplates/template/_TemplateTemplateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/etc/codeTemplates/template/_TemplateTemplateIO.C b/etc/codeTemplates/template/_TemplateTemplateIO.C
index 8a5e6e56c4..c60b5be8b8 100644
--- a/etc/codeTemplates/template/_TemplateTemplateIO.C
+++ b/etc/codeTemplates/template/_TemplateTemplateIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 154fb5012f64e9e8cbf97b20070ea001ed487179 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 16 Feb 2016 08:48:02 +0000
Subject: [PATCH 203/447] etc/config.sh/paraview: Reformatted Patch provided by
 Bruno Santos See http://www.openfoam.org/mantisbt/view.php?id=1232

---
 etc/config.sh/paraview | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index f6cd6a8ce7..c686b32702 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -34,11 +34,16 @@
 #------------------------------------------------------------------------------
 
 # clean the PATH
-cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"` && PATH="$cleaned"
+cleaned=$($WM_PROJECT_DIR/bin/foamCleanPath "$PATH" \
+        "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- \
+        $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-" \
+        ) \
+        && PATH="$cleaned"
 
 # determine the cmake to be used
 unset CMAKE_HOME
-for cmake in cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 cmake-2.8.1
+for cmake in cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 \
+             cmake-2.8.1
 do
     cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
     if [ -r $cmake ]
@@ -88,7 +93,8 @@ case "$ParaView_VERSION" in
 
 [0-9]*)
     # extract major from the version
-    ParaView_MAJOR=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
+    ParaView_MAJOR=$(echo $ParaView_VERSION | \
+                   sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/')
     ;;
 esac
 export ParaView_VERSION ParaView_MAJOR

From e77938ac02a9a23384725419f83429067cd32b24 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 17 Feb 2016 10:48:30 +0000
Subject: [PATCH 204/447] thermophysicalModels: Added support for thermodynamic
 departure functions

---
 .../equationOfState/Boussinesq/Boussinesq.H   |  6 +++++
 .../equationOfState/Boussinesq/BoussinesqI.H  | 14 ++++++++++++
 .../PengRobinsonGas/PengRobinsonGas.H         |  6 +++++
 .../PengRobinsonGas/PengRobinsonGasI.H        | 14 ++++++++++++
 .../adiabaticPerfectFluid.H                   |  6 +++++
 .../adiabaticPerfectFluidI.H                  | 22 +++++++++++++++++++
 .../icoPolynomial/icoPolynomial.H             |  6 +++++
 .../icoPolynomial/icoPolynomialI.H            | 22 +++++++++++++++++++
 .../incompressiblePerfectGas.H                |  6 +++++
 .../incompressiblePerfectGasI.H               | 22 +++++++++++++++++++
 .../specie/equationOfState/linear/linear.H    |  6 +++++
 .../specie/equationOfState/linear/linearI.H   | 14 ++++++++++++
 .../perfectFluid/perfectFluid.H               |  6 +++++
 .../perfectFluid/perfectFluidI.H              | 14 ++++++++++++
 .../equationOfState/perfectGas/perfectGas.H   |  6 +++++
 .../equationOfState/perfectGas/perfectGasI.H  | 14 ++++++++++++
 .../equationOfState/rhoConst/rhoConst.H       |  6 +++++
 .../equationOfState/rhoConst/rhoConstI.H      | 14 ++++++++++++
 .../specie/thermo/eConst/eConstThermoI.H      |  6 ++---
 .../specie/thermo/hConst/hConstThermoI.H      |  6 ++---
 .../thermo/hPolynomial/hPolynomialThermoI.H   |  4 ++--
 .../specie/thermo/hPower/hPowerThermoI.H      |  5 +++--
 .../thermo/hRefConst/hRefConstThermoI.H       |  6 ++---
 .../specie/thermo/janaf/janafThermoI.H        |  7 ++++--
 24 files changed, 223 insertions(+), 15 deletions(-)

diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
index 464f829239..7cd491fde7 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
@@ -173,6 +173,12 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
+            //- Return enthalpy departure [J/kmol]
+            inline scalar h(const scalar p, const scalar T) const;
+
+            //- Return cp departure [J/(kmol K]
+            inline scalar cp(scalar p, scalar T) const;
+
             //- Return entropy [J/(kmol K)]
             inline scalar s(const scalar p, const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
index 27a729211c..2d68984738 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
@@ -120,6 +120,20 @@ inline Foam::scalar Foam::Boussinesq<Specie>::rho
 }
 
 
+template<class Specie>
+inline Foam::scalar Foam::Boussinesq<Specie>::h(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::Boussinesq<Specie>::cp(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
 template<class Specie>
 inline Foam::scalar Foam::Boussinesq<Specie>::s
 (
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
index 8a24f6e104..cb55086c48 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
@@ -168,6 +168,12 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
+            //- Return enthalpy departure [J/kmol]
+            inline scalar h(const scalar p, const scalar T) const;
+
+            //- Return cp departure [J/(kmol K]
+            inline scalar cp(scalar p, scalar T) const;
+
             //- Return entropy [J/(kmol K)]
             inline scalar s(const scalar p, const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
index c69829d9a6..45ccf67cd9 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
@@ -116,6 +116,20 @@ inline Foam::scalar Foam::PengRobinsonGas<Specie>::rho
 }
 
 
+template<class Specie>
+inline Foam::scalar Foam::PengRobinsonGas<Specie>::h(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::PengRobinsonGas<Specie>::cp(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
 template<class Specie>
 inline Foam::scalar Foam::PengRobinsonGas<Specie>::s
 (
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
index 3b391410ce..b270ccab4b 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
@@ -167,6 +167,12 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
+            //- Return enthalpy departure [J/kmol]
+            inline scalar h(const scalar p, const scalar T) const;
+
+            //- Return cp departure [J/(kmol K]
+            inline scalar cp(scalar p, scalar T) const;
+
             //- Return entropy [J/(kmol K)]
             inline scalar s(const scalar p, const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
index a2f02cdd95..87adcdad2b 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
@@ -111,6 +111,28 @@ inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::rho
 }
 
 
+template<class Specie>
+inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::h
+(
+    scalar p,
+    scalar T
+) const
+{
+    return 0;
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::cp
+(
+    scalar p,
+    scalar T
+) const
+{
+    return 0;
+}
+
+
 template<class Specie>
 inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::s
 (
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
index 44eb86ffbd..e4345e2f4e 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
@@ -155,6 +155,12 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
+            //- Return enthalpy departure [J/kmol]
+            inline scalar h(const scalar p, const scalar T) const;
+
+            //- Return cp departure [J/(kmol K]
+            inline scalar cp(scalar p, scalar T) const;
+
             //- Return entropy [J/(kmol K)]
             inline scalar s(const scalar p, const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
index c5302e1828..03d087c74f 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
@@ -110,6 +110,28 @@ inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::rho
 }
 
 
+template<class Specie, int PolySize>
+inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::h
+(
+    scalar p,
+    scalar T
+) const
+{
+    return 0;
+}
+
+
+template<class Specie, int PolySize>
+inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::cp
+(
+    scalar p,
+    scalar T
+) const
+{
+    return 0;
+}
+
+
 template<class Specie, int PolySize>
 inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::s
 (
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
index 922466d740..30c6ea1b4d 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
@@ -158,6 +158,12 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
+            //- Return enthalpy departure [J/kmol]
+            inline scalar h(const scalar p, const scalar T) const;
+
+            //- Return cp departure [J/(kmol K]
+            inline scalar cp(scalar p, scalar T) const;
+
             //- Return entropy [J/(kmol K)]
             inline scalar s(const scalar p, const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
index 3281e2e613..8816c9f317 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
@@ -114,6 +114,28 @@ inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::rho
 }
 
 
+template<class Specie>
+inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::h
+(
+    scalar p,
+    scalar T
+) const
+{
+    return 0;
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::cp
+(
+    scalar p,
+    scalar T
+) const
+{
+    return 0;
+}
+
+
 template<class Specie>
 inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::s
 (
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.H b/src/thermophysicalModels/specie/equationOfState/linear/linear.H
index acdbda0134..1236cac125 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linear.H
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.H
@@ -156,6 +156,12 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
+            //- Return enthalpy departure [J/kmol]
+            inline scalar h(const scalar p, const scalar T) const;
+
+            //- Return cp departure [J/(kmol K]
+            inline scalar cp(scalar p, scalar T) const;
+
             //- Return entropy [J/(kmol K)]
             inline scalar s(const scalar p, const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
index 225957173e..701ccc3c7c 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
@@ -92,6 +92,20 @@ inline Foam::scalar Foam::linear<Specie>::rho(scalar p, scalar T) const
 }
 
 
+template<class Specie>
+inline Foam::scalar Foam::linear<Specie>::h(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::linear<Specie>::cp(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
 template<class Specie>
 inline Foam::scalar Foam::linear<Specie>::s(scalar p, scalar T) const
 {
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
index fcd1b373f3..16d346f1c1 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
@@ -155,6 +155,12 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
+            //- Return enthalpy departure [J/kmol]
+            inline scalar h(const scalar p, const scalar T) const;
+
+            //- Return cp departure [J/(kmol K]
+            inline scalar cp(scalar p, scalar T) const;
+
             //- Return entropy [J/(kmol K)]
             inline scalar s(const scalar p, const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
index 8d988eb7a6..f58bcaaed6 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
@@ -100,6 +100,20 @@ inline Foam::scalar Foam::perfectFluid<Specie>::rho(scalar p, scalar T) const
 }
 
 
+template<class Specie>
+inline Foam::scalar Foam::perfectFluid<Specie>::h(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::perfectFluid<Specie>::cp(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
 template<class Specie>
 inline Foam::scalar Foam::perfectFluid<Specie>::s(scalar p, scalar T) const
 {
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
index 986eecce70..4b5611bee3 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
@@ -139,6 +139,12 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
+            //- Return enthalpy departure [J/kmol]
+            inline scalar h(const scalar p, const scalar T) const;
+
+            //- Return cp departure [J/(kmol K]
+            inline scalar cp(scalar p, scalar T) const;
+
             //- Return entropy [J/(kmol K)]
             inline scalar s(const scalar p, const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
index bfe0301ce7..94e0c500ff 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
@@ -82,6 +82,20 @@ inline Foam::scalar Foam::perfectGas<Specie>::rho(scalar p, scalar T) const
 }
 
 
+template<class Specie>
+inline Foam::scalar Foam::perfectGas<Specie>::h(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::perfectGas<Specie>::cp(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
 template<class Specie>
 inline Foam::scalar Foam::perfectGas<Specie>::s(scalar p, scalar T) const
 {
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
index 98f2547123..5c654d000d 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
@@ -141,6 +141,12 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
+            //- Return enthalpy departure [J/kmol]
+            inline scalar h(const scalar p, const scalar T) const;
+
+            //- Return cp departure [J/(kmol K]
+            inline scalar cp(scalar p, scalar T) const;
+
             //- Return entropy [J/(kmol K)]
             inline scalar s(const scalar p, const scalar T) const;
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
index 600b668794..09f884b8b7 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
@@ -78,6 +78,20 @@ inline Foam::scalar Foam::rhoConst<Specie>::rho(scalar p, scalar T) const
 }
 
 
+template<class Specie>
+inline Foam::scalar Foam::rhoConst<Specie>::h(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::rhoConst<Specie>::cp(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
 template<class Specie>
 inline Foam::scalar Foam::rhoConst<Specie>::s(scalar p, scalar T) const
 {
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
index f16ca49759..2c6bda1a69 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
@@ -106,7 +106,7 @@ inline Foam::scalar Foam::eConstThermo<EquationOfState>::cp
     const scalar T
 ) const
 {
-    return Cv_ + this->cpMcv(p, T);
+    return Cv_ + this->cpMcv(p, T) + EquationOfState::cp(p, T);
 }
 
 
@@ -117,7 +117,7 @@ inline Foam::scalar Foam::eConstThermo<EquationOfState>::ha
     const scalar T
 ) const
 {
-    return cp(p, T)*T + Hf_;
+    return cp(p, T)*T + Hf_ + EquationOfState::h(p, T);
 }
 
 
@@ -128,7 +128,7 @@ inline Foam::scalar Foam::eConstThermo<EquationOfState>::hs
     const scalar T
 ) const
 {
-    return cp(p, T)*T;
+    return cp(p, T)*T + EquationOfState::h(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
index 7ca5b48044..1367c7c426 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
@@ -106,7 +106,7 @@ inline Foam::scalar Foam::hConstThermo<EquationOfState>::cp
     const scalar T
 ) const
 {
-    return Cp_;
+    return Cp_ + EquationOfState::cp(p, T);
 }
 
 
@@ -116,7 +116,7 @@ inline Foam::scalar Foam::hConstThermo<EquationOfState>::ha
     const scalar p, const scalar T
 ) const
 {
-    return Cp_*T + Hf_;
+    return Cp_*T + Hf_ + EquationOfState::h(p, T);
 }
 
 
@@ -126,7 +126,7 @@ inline Foam::scalar Foam::hConstThermo<EquationOfState>::hs
     const scalar p, const scalar T
 ) const
 {
-    return Cp_*T;
+    return Cp_*T + EquationOfState::h(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
index 4e8c91f688..7cef8ce2b5 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
@@ -98,7 +98,7 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::cp
     const scalar p, const scalar T
 ) const
 {
-    return CpCoeffs_.value(T);
+    return CpCoeffs_.value(T) + EquationOfState::cp(p, T);
 }
 
 
@@ -108,7 +108,7 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::ha
     const scalar p, const scalar T
 ) const
 {
-    return hCoeffs_.value(T);
+    return hCoeffs_.value(T) + EquationOfState::h(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
index 8f4094d975..c9114a1dd8 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
@@ -130,7 +130,7 @@ inline Foam::scalar Foam::hPowerThermo<EquationOfState>::cp
     const scalar p, const scalar T
 ) const
 {
-    return c0_*pow(T/Tref_, n0_);
+    return c0_*pow(T/Tref_, n0_) + EquationOfState::cp(p, T);
 }
 
 
@@ -151,7 +151,8 @@ inline Foam::scalar Foam::hPowerThermo<EquationOfState>::hs
 ) const
 {
     return
-        c0_*(pow(T, n0_ + 1) - pow(Tstd, n0_ + 1))/(pow(Tref_, n0_)*(n0_ + 1));
+        c0_*(pow(T, n0_ + 1) - pow(Tstd, n0_ + 1))/(pow(Tref_, n0_)*(n0_ + 1))
+      + EquationOfState::h(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
index b25d5f0f73..29bd2c9753 100644
--- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
@@ -112,7 +112,7 @@ inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::cp
     const scalar T
 ) const
 {
-    return Cp_;
+    return Cp_ + EquationOfState::cp(p, T);
 }
 
 
@@ -122,7 +122,7 @@ inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::ha
     const scalar p, const scalar T
 ) const
 {
-    return Cp_*(T-Tref_) + Href_ + Hf_;
+    return Cp_*(T-Tref_) + Href_ + Hf_ + EquationOfState::h(p, T);
 }
 
 
@@ -132,7 +132,7 @@ inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::hs
     const scalar p, const scalar T
 ) const
 {
-    return Cp_*(T-Tref_) + Href_ ;
+    return Cp_*(T-Tref_) + Href_ + EquationOfState::h(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
index 18f9d7cc73..256859ef9c 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
@@ -162,7 +162,9 @@ inline Foam::scalar Foam::janafThermo<EquationOfState>::cp
 ) const
 {
     const coeffArray& a = coeffs(T);
-    return RR*((((a[4]*T + a[3])*T + a[2])*T + a[1])*T + a[0]);
+    return
+        RR*((((a[4]*T + a[3])*T + a[2])*T + a[1])*T + a[0])
+      + EquationOfState::cp(p, T);
 }
 
 
@@ -178,7 +180,8 @@ inline Foam::scalar Foam::janafThermo<EquationOfState>::ha
     (
         ((((a[4]/5.0*T + a[3]/4.0)*T + a[2]/3.0)*T + a[1]/2.0)*T + a[0])*T
       + a[5]
-    );
+    )
+  + EquationOfState::h(p, T);
 }
 
 

From 6a5d0b57cab8e226a67e2414f7c179a1ad9bc157 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 17 Feb 2016 10:53:57 +0000
Subject: [PATCH 205/447] Updated headers

---
 .../adiabaticPerfectFluid/adiabaticPerfectFluid.H               | 2 +-
 src/thermophysicalModels/specie/equationOfState/linear/linear.H | 2 +-
 .../specie/equationOfState/perfectFluid/perfectFluid.H          | 2 +-
 .../specie/equationOfState/perfectGas/perfectGas.H              | 2 +-
 .../specie/equationOfState/rhoConst/rhoConst.H                  | 2 +-
 src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
index b270ccab4b..72b273ae05 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.H b/src/thermophysicalModels/specie/equationOfState/linear/linear.H
index 1236cac125..f023bf5d56 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linear.H
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
index 16d346f1c1..45409b6278 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
index 4b5611bee3..75883f13d9 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
index 5c654d000d..b9d0ddb54c 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
index 256859ef9c..b3fd676a29 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From c6eb7091d6da8ae1eada18f16bb4e15a054a33b6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 17 Feb 2016 15:17:52 +0000
Subject: [PATCH 206/447] PengRobinsonGas: Added thermodynamic departure
 functions

---
 .../PengRobinsonGas/PengRobinsonGas.H         |   2 +-
 .../PengRobinsonGas/PengRobinsonGasI.H        | 124 +++++++++++++-----
 2 files changed, 92 insertions(+), 34 deletions(-)

diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
index cb55086c48..37099a8e6c 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014  OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
index 45ccf67cd9..dc2ed305b4 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014  OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,22 +111,58 @@ inline Foam::scalar Foam::PengRobinsonGas<Specie>::rho
     scalar T
 ) const
 {
-    scalar z = Z(p, T);
-    return p/(z*this->R()*T);
+    scalar Z = this->Z(p, T);
+    return p/(Z*this->R()*T);
 }
 
 
 template<class Specie>
 inline Foam::scalar Foam::PengRobinsonGas<Specie>::h(scalar p, scalar T) const
 {
-    return 0;
+    scalar Pr = p/Pc_;
+    scalar Tr = T/Tc_;
+    scalar B = 0.07780*Pr/Tr;
+    scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
+    scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
+
+    scalar Z = this->Z(p, T);
+
+    return
+        RR*Tc_
+       *(
+           Tr*(Z - 1)
+         - 2.078*(1 + kappa)*sqrt(alpha)
+          *log((Z + 2.414*B)/(Z - 0.414*B))
+        );
 }
 
 
 template<class Specie>
 inline Foam::scalar Foam::PengRobinsonGas<Specie>::cp(scalar p, scalar T) const
 {
-    return 0;
+    scalar Tr = T/Tc_;
+    scalar a = 0.45724*sqr(RR*Tc_)/Pc_;
+    scalar b = 0.07780*RR*Tc_/Pc_;
+    scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
+    scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
+
+    scalar A = a*alpha*p/sqr(RR*T);
+    scalar B = b*p/(RR*T);
+
+    scalar Z = this->Z(p, T);
+
+    scalar ap = kappa*a*(kappa/Tc_ - (1 + kappa)/sqrt(T*Tc_));
+    scalar app = kappa*a*(1 + kappa)/(2*sqrt(pow3(T)*Tc_));
+
+    scalar M = (sqr(Z) + 2*B*Z - sqr(B))/(Z - B);
+    scalar N = ap*B/(b*RR);
+
+    const scalar root2 = sqrt(2.0);
+
+    return
+        app*(T/(2*root2*b))*log((Z + (root2 + 1)*B)/(Z - (root2 - 1)*B))
+      + RR*sqr(M - N)/(sqr(M) - 2*A*(Z + B))
+      - RR;
 }
 
 
@@ -137,9 +173,21 @@ inline Foam::scalar Foam::PengRobinsonGas<Specie>::s
     scalar T
 ) const
 {
-    //***HGW This is the expression for a perfect gas
-    // Need to add the entropy defect for Peng-Robinson
-    return -RR*log(p/Pstd);
+    scalar Pr = p/Pc_;
+    scalar Tr = T/Tc_;
+    scalar B = 0.07780*Pr/Tr;
+    scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
+
+    scalar Z = this->Z(p, T);
+
+    return
+      - RR*log(p/Pstd)
+      + RR
+       *(
+           log(Z - B)
+         - 2.078*kappa*((1 + kappa)/sqrt(Tr) - kappa)
+          *log((Z + 2.414*B)/(Z - 0.414*B))
+        );
 }
 
 
@@ -150,8 +198,9 @@ inline Foam::scalar Foam::PengRobinsonGas<Specie>::psi
     scalar T
 ) const
 {
-    scalar z = Z(p, T);
-    return 1.0/(z*this->R()*T);
+    scalar Z = this->Z(p, T);
+
+    return 1.0/(Z*this->R()*T);
 }
 
 
@@ -162,46 +211,40 @@ inline Foam::scalar Foam::PengRobinsonGas<Specie>::Z
     scalar T
 ) const
 {
-    scalar a = 0.45724*sqr(this->R())*sqr(Tc_)/Pc_;
-    scalar b = 0.07780*this->R()*Tc_/Pc_;
     scalar Tr = T/Tc_;
+    scalar a = 0.45724*sqr(RR*Tc_)/Pc_;
+    scalar b = 0.07780*RR*Tc_/Pc_;
+    scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
+    scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
 
-    scalar alpha =
-        sqr
-        (
-            1.0
-          + (0.37464 + 1.54226*omega_- 0.26992*sqr(omega_))
-          * (1.0 - sqrt(Tr))
-        );
+    scalar A = a*alpha*p/sqr(RR*T);
+    scalar B = b*p/(RR*T);
 
-    scalar B = b*p/(this->R()*T);
-    scalar A = a*alpha*p/sqr(this->R()*T);
-
-    scalar a2 = B - 1.0;
-    scalar a1 = A - 2.0*B - 3.0*sqr(B);
+    scalar a2 = B - 1;
+    scalar a1 = A - 2*B - 3*sqr(B);
     scalar a0 = -A*B + sqr(B) + pow3(B);
 
-    scalar Q = (3.0*a1 - a2*a2)/9.0;
-    scalar Rl = (9.0*a2*a1 - 27.0*a0 - 2.0*a2*a2*a2)/54;
+    scalar Q = (3*a1 - a2*a2)/9.0;
+    scalar Rl = (9*a2*a1 - 27*a0 - 2*a2*a2*a2)/54.0;
 
     scalar Q3 = Q*Q*Q;
     scalar D = Q3 + Rl*Rl;
 
-    scalar root = -1.0;
+    scalar root = -1;
 
-    if (D <= 0.0)
+    if (D <= 0)
     {
         scalar th = ::acos(Rl/sqrt(-Q3));
-        scalar qm = 2.0*sqrt(-Q);
+        scalar qm = 2*sqrt(-Q);
         scalar r1 = qm*cos(th/3.0) - a2/3.0;
-        scalar r2 = qm*cos((th + 2.0*constant::mathematical::pi)/3.0) - a2/3.0;
-        scalar r3 = qm*cos((th + 4.0*constant::mathematical::pi)/3.0) - a2/3.0;
+        scalar r2 = qm*cos((th + 2*constant::mathematical::pi)/3.0) - a2/3.0;
+        scalar r3 = qm*cos((th + 4*constant::mathematical::pi)/3.0) - a2/3.0;
 
         root = max(r1, max(r2, r3));
     }
     else
     {
-        // one root is real
+        // One root is real
         scalar D05 = sqrt(D);
         scalar S = pow(Rl + D05, 1.0/3.0);
         scalar Tl = 0;
@@ -228,7 +271,22 @@ inline Foam::scalar Foam::PengRobinsonGas<Specie>::cpMcv
     scalar T
 ) const
 {
-    return RR*Z(p, T);
+    scalar Tr = T/Tc_;
+    scalar a = 0.45724*sqr(RR*Tc_)/Pc_;
+    scalar b = 0.07780*RR*Tc_/Pc_;
+    scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
+    scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
+
+    scalar A = alpha*a*p/sqr(RR*T);
+    scalar B = b*p/(RR*T);
+
+    scalar Z = this->Z(p, T);
+
+    scalar ap = kappa*a*(kappa/Tc_ - (1 + kappa)/sqrt(T*Tc_));
+    scalar M = (sqr(Z) + 2*B*Z - sqr(B))/(Z - B);
+    scalar N = ap*B/(b*RR);
+
+    return RR*sqr(M - N)/(sqr(M) - 2*A*(Z + B));
 }
 
 

From aa81dee52d5985cf303c1d9d188638cac4320563 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 18 Feb 2016 08:27:21 +0000
Subject: [PATCH 207/447] sprayEngineFoam: Corrected included pEqn.H Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=2000

---
 .../solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
index 69fd826ce6..5cc555e27f 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
-    -I.. \
     -I../sprayDyMFoam \
+    -I.. \
     -I../../reactingParcelFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \

From f8aa84e5c1d30904e943a8eb89dc4c56a0513e83 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 18 Feb 2016 21:15:57 +0000
Subject: [PATCH 208/447] 
 tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff: Updated
 for change in U boundary condition update order

---
 .../angledDuctExplicitFixedCoeff/system/fvSolution            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
index 3e5f185454..22580533ed 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
@@ -57,7 +57,7 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    rhoMin          0.5;
+    rhoMin          0.4;
     rhoMax          1.5;
 
     residualControl
@@ -66,7 +66,7 @@ SIMPLE
         U               1e-4;
         e               1e-3;
 
-        // possibly check turbulence fields
+        // Possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;
     }
 }

From 9162fedfc468050fe6bf738c915ef5c849aa1440 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 18 Feb 2016 21:18:54 +0000
Subject: [PATCH 209/447] chemFoam: use default (empty) BCs for U rather than
 inheriting from p

---
 applications/solvers/combustion/chemFoam/createFields.H | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H
index ae5d54fc58..698ca98463 100644
--- a/applications/solvers/combustion/chemFoam/createFields.H
+++ b/applications/solvers/combustion/chemFoam/createFields.H
@@ -80,8 +80,7 @@
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionedVector("zero", dimVelocity, vector::zero),
-        p.boundaryField().types()
+        dimensionedVector("zero", dimVelocity, vector::zero)
     );
 
     #include "createPhi.H"

From 8b71babfdd3a479206d3b3f5edf9bb473e77cc4b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 18 Feb 2016 21:26:25 +0000
Subject: [PATCH 210/447] interFoam, interMixingFoam, interPhaseChangeFoam:
 construct rho with calculated BCs

Avoids problems with inherited complex BCs for which the controlling
fields and parameters are not initialized.
---
 applications/solvers/multiphase/interFoam/createFields.H       | 3 +--
 .../multiphase/interFoam/interMixingFoam/createFields.H        | 3 +--
 .../solvers/multiphase/interPhaseChangeFoam/createFields.H     | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index c3e65f24e3..e4891edba5 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -49,8 +49,7 @@ volScalarField rho
         mesh,
         IOobject::READ_IF_PRESENT
     ),
-    alpha1*rho1 + alpha2*rho2,
-    alpha1.boundaryField().types()
+    alpha1*rho1 + alpha2*rho2
 );
 rho.oldTime();
 
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
index 59180b8723..4d9f0e7f01 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
@@ -50,8 +50,7 @@ volScalarField rho
         mesh,
         IOobject::READ_IF_PRESENT
     ),
-    alpha1*rho1 + alpha2*rho2 + alpha3*rho3,
-    alpha1.boundaryField().types()
+    alpha1*rho1 + alpha2*rho2 + alpha3*rho3
 );
 rho.oldTime();
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
index dc0491bd03..bb336f16c0 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
@@ -51,8 +51,7 @@ volScalarField rho
         mesh,
         IOobject::READ_IF_PRESENT
     ),
-    alpha1*rho1 + alpha2*rho2,
-    alpha1.boundaryField().types()
+    alpha1*rho1 + alpha2*rho2
 );
 rho.oldTime();
 

From e12e1b172d75b93a36820d2a0378b8ab149aa352 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 19 Feb 2016 12:19:32 +0000
Subject: [PATCH 211/447] tutorials/.*/bubbleColumn: Corrected name of
 temperature fields Resolves bug-report
 http://openfoam.org/mantisbt/view.php?id=2003

---
 .../reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air    | 2 +-
 .../reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water  | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.air      | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.water    | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air  | 2 +-
 .../laminar/bubbleColumnIATE/0/T.water                          | 2 +-
 .../multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.air   | 2 +-
 .../multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.water | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air
index 9c0fd4206c..f704d27aa3 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      Tair;
+    object      T.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water
index e592c501d5..3c62df75d0 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      Twater;
+    object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
index 9c0fd4206c..f704d27aa3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      Tair;
+    object      T.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
index e592c501d5..3c62df75d0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      Twater;
+    object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air
index 9c0fd4206c..f704d27aa3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      Tair;
+    object      T.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water
index 1cfd38f926..d19f29f191 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      Twater;
+    object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
index 9c0fd4206c..f704d27aa3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      Tair;
+    object      T.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
index e592c501d5..3c62df75d0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      Twater;
+    object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From 46df3ab4561efe663a1096905c5e90d78d65417c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 19 Feb 2016 13:26:41 +0000
Subject: [PATCH 212/447] kineticTheoryModel: Corrected handling of the SuSp
 term in the Theta equation Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2002

---
 .../kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C | 2 +-
 .../kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 43ad071962..9f436cd5a0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -434,7 +434,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
             )
           - fvm::laplacian(kappa_, Theta_, "laplacian(kappa,Theta)")
          ==
-            fvm::SuSp(-((PsCoeff*I) && gradU), Theta_)
+          - fvm::SuSp((PsCoeff*I) && gradU, Theta_)
           + (tau && gradU)
           + fvm::Sp(-gammaCoeff, Theta_)
           + fvm::Sp(-J1, Theta_)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index f07624c001..de35e7900b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -437,7 +437,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
             )
           - fvm::laplacian(kappa_, Theta_, "laplacian(kappa,Theta)")
          ==
-            fvm::SuSp(-((PsCoeff*I) && gradU), Theta_)
+          - fvm::SuSp((PsCoeff*I) && gradU, Theta_)
           + (tau && gradU)
           + fvm::Sp(-gammaCoeff, Theta_)
           + fvm::Sp(-J1, Theta_)

From 979e1ee191aa16c3e60ab164e1fe626af40e4ceb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 19 Feb 2016 15:13:52 +0000
Subject: [PATCH 213/447] tutorials/combustion/reactingFoam: ras -> laminar

---
 .../reactingFoam/{ras => laminar}/counterFlowFlame2D/0/CH4        | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2D/0/CO2        | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2D/0/H2O        | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2D/0/N2         | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2D/0/O2         | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2D/0/T          | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2D/0/U          | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2D/0/Ydefault   | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2D/0/alphat     | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2D/0/p          | 0
 .../counterFlowFlame2D/constant/chemistryProperties               | 0
 .../counterFlowFlame2D/constant/combustionProperties              | 0
 .../{ras => laminar}/counterFlowFlame2D/constant/reactions        | 0
 .../counterFlowFlame2D/constant/thermo.compressibleGas            | 0
 .../counterFlowFlame2D/constant/thermophysicalProperties          | 0
 .../counterFlowFlame2D/constant/turbulenceProperties              | 0
 .../{ras => laminar}/counterFlowFlame2D/system/blockMeshDict      | 0
 .../{ras => laminar}/counterFlowFlame2D/system/controlDict        | 0
 .../{ras => laminar}/counterFlowFlame2D/system/fvSchemes          | 0
 .../{ras => laminar}/counterFlowFlame2D/system/fvSolution         | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/CH4     | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/CO2     | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/H2O     | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/N2      | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/O2      | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/T       | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/U       | 0
 .../{ras => laminar}/counterFlowFlame2DLTS/0/Ydefault             | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/alphat  | 0
 .../reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/p       | 0
 .../counterFlowFlame2DLTS/constant/chemistryProperties            | 0
 .../counterFlowFlame2DLTS/constant/combustionProperties           | 0
 .../{ras => laminar}/counterFlowFlame2DLTS/constant/reactions     | 0
 .../counterFlowFlame2DLTS/constant/thermo.compressibleGas         | 0
 .../counterFlowFlame2DLTS/constant/thermophysicalProperties       | 0
 .../counterFlowFlame2DLTS/constant/turbulenceProperties           | 0
 .../{ras => laminar}/counterFlowFlame2DLTS/system/blockMeshDict   | 0
 .../{ras => laminar}/counterFlowFlame2DLTS/system/controlDict     | 0
 .../{ras => laminar}/counterFlowFlame2DLTS/system/fvSchemes       | 0
 .../{ras => laminar}/counterFlowFlame2DLTS/system/fvSolution      | 0
 40 files changed, 0 insertions(+), 0 deletions(-)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/0/CH4 (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/0/CO2 (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/0/H2O (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/0/N2 (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/0/O2 (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/0/T (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/0/U (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/0/Ydefault (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/0/alphat (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/0/p (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/constant/chemistryProperties (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/constant/combustionProperties (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/constant/reactions (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/constant/thermo.compressibleGas (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/constant/thermophysicalProperties (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/constant/turbulenceProperties (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/system/blockMeshDict (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/system/controlDict (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/system/fvSchemes (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2D/system/fvSolution (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/CH4 (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/CO2 (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/H2O (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/N2 (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/O2 (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/T (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/U (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/Ydefault (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/alphat (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/0/p (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/constant/chemistryProperties (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/constant/combustionProperties (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/constant/reactions (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/constant/thermo.compressibleGas (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/constant/thermophysicalProperties (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/constant/turbulenceProperties (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/system/blockMeshDict (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/system/controlDict (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/system/fvSchemes (100%)
 rename tutorials/combustion/reactingFoam/{ras => laminar}/counterFlowFlame2DLTS/system/fvSolution (100%)

diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CH4
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CH4
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CO2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CO2
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CO2
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CO2
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/H2O b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/H2O
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/H2O
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/H2O
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/N2
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/N2
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/O2
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/O2
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/T
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/T
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/U
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/U
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/Ydefault
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/Ydefault
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/alphat
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/alphat
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/chemistryProperties
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/chemistryProperties
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/combustionProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/combustionProperties
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/combustionProperties
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/combustionProperties
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/reactions
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/reactions
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/blockMeshDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/blockMeshDict
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/blockMeshDict
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSchemes
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSchemes
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CH4 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CH4
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CH4
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CH4
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CO2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CO2
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CO2
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CO2
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/H2O b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/H2O
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/H2O
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/H2O
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/N2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/N2
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/N2
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/N2
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/O2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/O2
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/O2
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/O2
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/T b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/T
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/T
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/T
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/U b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/U
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/U
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/U
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/Ydefault b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/Ydefault
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/Ydefault
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/Ydefault
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/alphat b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/alphat
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/alphat
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/alphat
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/p
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/chemistryProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/chemistryProperties
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/chemistryProperties
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/chemistryProperties
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/combustionProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/combustionProperties
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/combustionProperties
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/combustionProperties
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/reactions b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/reactions
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/reactions
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/reactions
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermo.compressibleGas
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermo.compressibleGas
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermo.compressibleGas
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermophysicalProperties
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermophysicalProperties
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/turbulenceProperties
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/turbulenceProperties
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/turbulenceProperties
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/blockMeshDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/blockMeshDict
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/blockMeshDict
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/controlDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/controlDict
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/controlDict
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/controlDict
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSchemes b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSchemes
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSchemes
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSchemes
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSolution
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSolution
rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSolution

From 99a10ecea60b55e1f219edabb8dd8ae84cabaf6b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 20 Feb 2016 22:44:37 +0000
Subject: [PATCH 214/447] Boundary conditions: Added
 extrapolatedCalculatedFvPatchField

To be used instead of zeroGradientFvPatchField for temporary fields for
which zero-gradient extrapolation is use to evaluate the boundary field
but avoiding fields derived from temporary field using field algebra
inheriting the zeroGradient boundary condition by the reuse of the
temporary field storage.

zeroGradientFvPatchField should not be used as the default patch field
for any temporary fields and should be avoided for non-temporary fields
except where it is clearly appropriate;
extrapolatedCalculatedFvPatchField and calculatedFvPatchField are
generally more suitable defaults depending on the manner in which the
boundary values are specified or evaluated.

The entire OpenFOAM-dev code-base has been updated following the above
recommendations.

Henry G. Weller
CFD Direct
---
 .../basicXiSubXiEq/basicXiSubXiEq.C           |  63 ++---
 .../XiGModels/basicXiSubG/basicXiSubG.C       |  27 +-
 .../PDRModels/dragModels/basic/basic.C        |   9 +-
 .../XiModels/XiEqModels/XiEqModel/XiEqModel.C |  40 ++-
 .../rhoCentralDyMFoam/rhoCentralDyMFoam.C     |   3 +-
 .../rhoCentralFoam/rhoCentralFoam.C           |   3 +-
 .../multiphaseMixtureThermo.C                 |   7 +-
 .../multiphaseSystem/multiphaseSystem.C       |   7 +-
 .../multiphaseMixture/multiphaseMixture.C     |   7 +-
 .../dragModels/segregated/segregated.C        |   3 +-
 .../HeatAndMassTransferPhaseSystem.C          |   3 +-
 .../InertPhaseModel/InertPhaseModel.C         |   5 +-
 .../multiphaseSystem/multiphaseSystem.C       |   7 +-
 .../reactingTwoPhaseEulerFoam/Make/options    |   2 +-
 .../dragModels/segregated/segregated.C        |   3 +-
 .../readMechanicalProperties.H                |   9 +-
 .../readThermalProperties.H                   |   9 +-
 .../decomposePar/decomposePar.C               |   3 +-
 .../redistributePar/redistributePar.C         |  12 +-
 .../postProcessing/velocityField/Co/Co.C      |   3 +-
 .../Lists/CompactListList/CompactListList.C   |   6 +-
 .../Lists/CompactListList/CompactListList.H   |   2 +-
 src/OpenFOAM/containers/Lists/List/List.C     |  50 +---
 src/OpenFOAM/containers/Lists/List/List.H     |   2 +-
 src/OpenFOAM/containers/Lists/List/ListIO.C   |   5 +-
 .../containers/Lists/PtrList/PtrList.C        |  15 +-
 .../containers/Lists/PtrList/PtrList.H        |   2 +-
 .../containers/Lists/UPtrList/UPtrList.C      |   4 +-
 .../containers/Lists/UPtrList/UPtrList.H      |   2 +-
 .../DimensionedField/DimensionedField.C       |  14 +-
 .../DimensionedField/DimensionedField.H       |   6 +-
 .../FieldFields/FieldField/FieldField.C       |   7 +-
 .../FieldFields/FieldField/FieldField.H       |   2 +-
 .../FieldField/FieldFieldReuseFunctions.H     |  12 +-
 src/OpenFOAM/fields/Fields/Field/Field.C      |   6 +-
 src/OpenFOAM/fields/Fields/Field/Field.H      |   2 +-
 .../fields/Fields/Field/FieldReuseFunctions.H |  15 +-
 .../GeometricFieldReuseFunctions.H            | 230 +++++++++++-------
 .../pointPatchField/pointPatchField.H         |   7 +-
 .../matrices/LduMatrix/LduMatrix/LduMatrix.C  |   6 +-
 .../matrices/LduMatrix/LduMatrix/LduMatrix.H  |   2 +-
 .../matrices/lduMatrix/lduMatrix/lduMatrix.C  |   6 +-
 .../matrices/lduMatrix/lduMatrix/lduMatrix.H  |   2 +-
 src/OpenFOAM/memory/autoPtr/autoPtr.H         |   4 +-
 src/OpenFOAM/memory/autoPtr/autoPtrI.H        |   6 +-
 src/OpenFOAM/memory/tmp/tmp.H                 |   3 +-
 src/OpenFOAM/memory/tmp/tmpI.H                |   6 +-
 .../meshes/lduMesh/lduPrimitiveMesh.C         |   8 +-
 .../meshes/lduMesh/lduPrimitiveMesh.H         |   4 +-
 .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.C |  50 ++--
 .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.H |   4 +-
 .../mapPolyMesh/mapSubsetMesh/mapSubsetMesh.H |   4 +-
 .../PrimitivePatch/PrimitivePatch.C           |   6 +-
 .../PrimitivePatch/PrimitivePatch.H           |   2 +-
 src/combustionModels/laminar/laminar.C        |   8 +-
 .../noCombustion/noCombustion.C               |   8 +-
 .../singleStepCombustion.C                    |   3 +-
 src/finiteVolume/Make/files                   |   1 +
 .../cfdTools/general/CorrectPhi/CorrectPhi.C  |   3 +-
 .../cfdTools/general/MRF/MRFZoneList.C        | 112 +++++++--
 .../cfdTools/general/include/createRDeltaT.H  |   2 +-
 .../cfdTools/general/include/fvCFD.H          |   2 +
 .../basic/calculated/calculatedFvPatchField.C |  34 +--
 .../extrapolatedCalculatedFvPatchField.C      | 112 +++++++++
 .../extrapolatedCalculatedFvPatchField.H      | 165 +++++++++++++
 .../extrapolatedCalculatedFvPatchFields.C     |  44 ++++
 .../extrapolatedCalculatedFvPatchFields.H     |  49 ++++
 .../extrapolatedCalculatedFvPatchFieldsFwd.H  |  50 ++++
 .../fvPatchFields/fvPatchField/fvPatchField.H |   4 +
 .../fvsPatchField/fvsPatchField.H             |   4 +
 .../CoEulerDdtScheme/CoEulerDdtScheme.C       |   2 +-
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C  |   2 +-
 .../finiteVolume/fvc/fvcCellReduce.C          |   4 +-
 .../finiteVolume/fvc/fvcReconstruct.C         |   4 +-
 .../finiteVolume/fvc/fvcReconstructMag.C      |   6 +-
 .../finiteVolume/fvc/fvcSimpleReconstruct.C   |   4 +-
 .../finiteVolume/fvc/fvcSurfaceIntegrate.C    |   6 +-
 .../LeastSquaresGrad/LeastSquaresGrad.C       |   4 +-
 .../gradSchemes/gaussGrad/gaussGrad.C         |   4 +-
 .../leastSquaresGrad/leastSquaresGrad.C       |   4 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            |  10 +-
 .../fvScalarMatrix/fvScalarMatrix.C           |   8 +-
 .../schemes/cellCoBlended/cellCoBlended.H     |   4 +-
 .../outletStabilised/outletStabilised.H       |   1 +
 .../solidificationMeltingSource.C             |   5 +-
 .../genericFvPatchField/genericFvPatchField.C |   8 +-
 .../KinematicCloud/KinematicCloudI.H          |   4 +-
 .../MPPIC/AveragingMethods/Basic/Basic.C      |   1 +
 .../MPPIC/PackingModels/Implicit/Implicit.C   |  15 +-
 .../meshRefinement/meshRefinement.C           |   4 +-
 .../utilities/CourantNo/CourantNo.C           |   3 +-
 .../blendingFactor/blendingFactorTemplates.C  |   1 +
 .../reactingOneDim/reactingOneDim.C           |   3 -
 .../kinematicSingleLayerI.H                   |  11 +-
 .../constantFilmThermo/constantFilmThermo.C   |  13 +-
 .../liquidFilmThermo/liquidFilmThermo.C       |  13 +-
 .../filmTurbulenceModel/laminar/laminar.C     |   6 +-
 .../constantRadiation/constantRadiation.C     |   6 +-
 .../noRadiation/noRadiation.C                 |   6 +-
 .../primaryRadiation/primaryRadiation.C       |   6 +-
 .../standardRadiation/standardRadiation.C     |   5 +-
 .../constantHeatTransfer.C                    |   6 +-
 .../thermoSingleLayer/thermoSingleLayerI.H    |   8 +-
 .../chemistryModel/chemistryModel.C           |  10 +-
 .../greyMeanAbsorptionEmission.C              |   4 +-
 .../greyMeanSolidAbsorptionEmission.C         |   4 +-
 .../pyrolysisChemistryModel.C                 |   8 +-
 .../solidChemistryModel/solidChemistryModel.C |   9 +-
 src/triSurface/triSurface/triSurface.C        |   4 +-
 src/triSurface/triSurface/triSurface.H        |   2 +-
 110 files changed, 1004 insertions(+), 552 deletions(-)
 create mode 100644 src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
 create mode 100644 src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
 create mode 100644 src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.C
 create mode 100644 src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.H
 create mode 100644 src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFieldsFwd.H

diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
index 9e507b5f92..06c3c5537c 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicXiSubXiEq.H"
-#include "zeroGradientFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -93,59 +92,43 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::basicSubGrid::XiEq() const
 
     const scalarField Cw = pow(mesh.V(), 2.0/3.0);
 
-    tmp<volScalarField> tN
+    volScalarField N
     (
-        new volScalarField
+        IOobject
         (
-            IOobject
-            (
-                "tN",
-                mesh.time().constant(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
+            "N",
+            mesh.time().constant(),
             mesh,
-            dimensionedScalar("zero", Nv.dimensions(), 0.0),
-            zeroGradientFvPatchVectorField::typeName
-        )
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("zero", Nv.dimensions(), 0.0)
     );
-
-    volScalarField& N = tN();
-
     N.internalField() = Nv.internalField()*Cw;
 
-    tmp<volSymmTensorField> tns
+    volSymmTensorField ns
     (
-        new volSymmTensorField
+        IOobject
         (
-            IOobject
-            (
-                "tns",
-                U.mesh().time().timeName(),
-                U.mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
+            "ns",
+            U.mesh().time().timeName(),
             U.mesh(),
-            dimensionedSymmTensor
-            (
-                "zero",
-                nsv.dimensions(),
-                pTraits<symmTensor>::zero
-            ),
-             zeroGradientFvPatchSymmTensorField::typeName
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        U.mesh(),
+        dimensionedSymmTensor
+        (
+            "zero",
+            nsv.dimensions(),
+            pTraits<symmTensor>::zero
         )
     );
-
-    volSymmTensorField& ns = tns();
-
     ns.internalField() = nsv.internalField()*Cw;
 
     volScalarField n(max(N - (Uhat & ns & Uhat), scalar(1e-4)));
-
     volScalarField b((Uhat & B_ & Uhat)/sqrt(n));
-
     volScalarField up(sqrt((2.0/3.0)*turbulence_.k()));
 
     volScalarField XiSubEq
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
index 928c424191..fe96d0bfe7 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicXiSubG.H"
-#include "zeroGradientFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -74,29 +73,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiGModels::basicSubGrid::G() const
     volScalarField& Gtot = tGtot();
 
     const scalarField Cw = pow(Su_.mesh().V(), 2.0/3.0);
-
-    tmp<volScalarField> tN
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "tN",
-                Su_.mesh().time().timeName(),
-                Su_.mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE,
-                false
-            ),
-            Su_.mesh(),
-            dimensionedScalar("zero", Nv.dimensions(), 0.0),
-            zeroGradientFvPatchVectorField::typeName
-        )
-    );
-
-    volScalarField& N = tN();
-
-    N.internalField() = Nv.internalField()*Cw;
+    scalarField N(Nv.internalField()*Cw);
 
     forAll(N, celli)
     {
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
index 9fd96b2033..7454b2f7ee 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basic.H"
-#include "zeroGradientFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -110,8 +109,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::PDRDragModels::basic::Dcu() const
                 "zero",
                 dimMass/dimTime/pow(dimLength, 3),
                 pTraits<symmTensor>::zero
-            ),
-            zeroGradientFvPatchSymmTensorField::typeName
+            )
         )
     );
 
@@ -145,8 +143,7 @@ Foam::tmp<Foam::volScalarField> Foam::PDRDragModels::basic::Gk() const
                 IOobject::NO_WRITE
             ),
             U_.mesh(),
-            dimensionedScalar("zero", dimMass/dimLength/pow(dimTime, 3), 0.0),
-            zeroGradientFvPatchVectorField::typeName
+            dimensionedScalar("zero", dimMass/dimLength/pow(dimTime, 3), 0.0)
         )
     );
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
index 4d1c8c11fd..59f5c81bd3 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "XiEqModel.H"
-#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -111,39 +110,30 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
                 false
             ),
             mesh,
-            dimensionedScalar("zero", Nv.dimensions(), 0.0),
-            zeroGradientFvPatchVectorField::typeName
+            dimensionedScalar("zero", Nv.dimensions(), 0.0)
         )
     );
-
     volScalarField& N = tN();
-
     N.internalField() = Nv.internalField()*pow(mesh.V(), 2.0/3.0);
 
-    tmp<volSymmTensorField> tns
+    volSymmTensorField ns
     (
-        new volSymmTensorField
+        IOobject
         (
-            IOobject
-            (
-                "tns",
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
+            "tns",
+            mesh.time().timeName(),
             mesh,
-            dimensionedSymmTensor
-            (
-                "zero",
-                nsv.dimensions(),
-                pTraits<symmTensor>::zero
-            )
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimensionedSymmTensor
+        (
+            "zero",
+            nsv.dimensions(),
+            pTraits<symmTensor>::zero
         )
     );
-
-    volSymmTensorField& ns = tns();
-
     ns.internalField() = nsv.internalField()*pow(mesh.V(), 2.0/3.0);
 
     const volVectorField Uhat
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
index 922aa72a95..a9fa5559b8 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,6 @@ Description
 #include "dynamicFvMesh.H"
 #include "psiThermo.H"
 #include "turbulentFluidThermoModel.H"
-#include "zeroGradientFvPatchFields.H"
 #include "fixedRhoFvPatchScalarField.H"
 #include "directionInterpolate.H"
 #include "motionSolver.H"
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index 7b85b5b11b..841c9a5162 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,6 @@ Description
 #include "fvCFD.H"
 #include "psiThermo.H"
 #include "turbulentFluidThermoModel.H"
-#include "zeroGradientFvPatchFields.H"
 #include "fixedRhoFvPatchScalarField.H"
 #include "directionInterpolate.H"
 #include "localEulerDdtScheme.H"
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index 55af594283..5730273383 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,8 +59,6 @@ void Foam::multiphaseMixtureThermo::calcAlphas()
         alphas_ += level*phase();
         level += 1.0;
     }
-
-    alphas_.correctBoundaryConditions();
 }
 
 
@@ -104,8 +102,7 @@ Foam::multiphaseMixtureThermo::multiphaseMixtureThermo
             IOobject::AUTO_WRITE
         ),
         mesh_,
-        dimensionedScalar("alphas", dimless, 0.0),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar("alphas", dimless, 0.0)
     ),
 
     sigmas_(lookup("sigmas")),
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index d0cd5c9b18..6755e96ecb 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,8 +54,6 @@ void Foam::multiphaseSystem::calcAlphas()
         alphas_ += level*iter();
         level += 1.0;
     }
-
-    alphas_.correctBoundaryConditions();
 }
 
 
@@ -417,8 +415,7 @@ Foam::multiphaseSystem::multiphaseSystem
             IOobject::AUTO_WRITE
         ),
         mesh_,
-        dimensionedScalar("alphas", dimless, 0.0),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar("alphas", dimless, 0.0)
     ),
 
     sigmas_(lookup("sigmas")),
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index 1bbd3177af..27f0f51c35 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,8 +52,6 @@ void Foam::multiphaseMixture::calcAlphas()
         alphas_ += level*iter();
         level += 1.0;
     }
-
-    alphas_.correctBoundaryConditions();
 }
 
 
@@ -108,8 +106,7 @@ Foam::multiphaseMixture::multiphaseMixture
             IOobject::AUTO_WRITE
         ),
         mesh_,
-        dimensionedScalar("alphas", dimless, 0.0),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar("alphas", dimless, 0.0)
     ),
 
     nu_
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
index 00ca3d49ee..ed45643189 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 #include "phasePair.H"
 #include "fvcGrad.H"
 #include "surfaceInterpolate.H"
+#include "zeroGradientFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
index 3db07ef804..03c26c89dc 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,7 @@ License
 #include "fvcDiv.H"
 #include "fvmSup.H"
 #include "fvMatrix.H"
+#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C
index ba5e90459b..bd4dda226f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,8 +78,7 @@ Foam::InertPhaseModel<BasePhaseModel>::Sh() const
                 this->mesh()
             ),
             this->mesh(),
-            dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0)
         )
     );
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 2ec0b15907..a9de2e6d55 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,8 +64,6 @@ void Foam::multiphaseSystem::calcAlphas()
         alphas_ += level*phases()[i];
         level += 1.0;
     }
-
-    alphas_.correctBoundaryConditions();
 }
 
 
@@ -506,8 +504,7 @@ Foam::multiphaseSystem::multiphaseSystem
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedScalar("alphas", dimless, 0.0),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar("alphas", dimless, 0.0)
     ),
 
     cAlphas_(lookup("interfaceCompression")),
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
index 5216efaa9c..622878cc52 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -ggdb3 \
     -ItwoPhaseSystem/lnInclude \
     -I../phaseSystems/lnInclude \
     -I../interfacialModels/lnInclude \
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
index ca0a145f5b..079b5d187b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 #include "phasePair.H"
 #include "fvcGrad.H"
 #include "surfaceInterpolate.H"
+#include "zeroGradientFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
index eca43adbf7..a912d80e07 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
@@ -41,8 +41,7 @@
                     "rho",
                     dimMass/dimVolume,
                     rhoValue
-                ),
-                zeroGradientFvPatchField<scalar>::typeName
+                )
             )
         );
     }
@@ -97,8 +96,7 @@
                     "Erho",
                     dimMass/dimLength/sqr(dimTime),
                     rhoEValue
-                ),
-                zeroGradientFvPatchField<scalar>::typeName
+                )
             )
         );
     }
@@ -152,8 +150,7 @@
                     "nu",
                     dimless,
                     nuValue
-                ),
-                zeroGradientFvPatchField<scalar>::typeName
+                )
             )
         );
     }
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
index 45327c2b4b..0c90a88532 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
@@ -75,8 +75,7 @@ if (thermalStress)
                     "C",
                     dimensionSet(0, 2, -2 , -1, 0),
                     CValue
-                ),
-                zeroGradientFvPatchField<scalar>::typeName
+                )
             )
         );
 
@@ -131,8 +130,7 @@ if (thermalStress)
                     "rhoK",
                     dimensionSet(1, 1, -3 , -1, 0),
                     rhoKValue
-                ),
-                zeroGradientFvPatchField<scalar>::typeName
+                )
             )
         );
 
@@ -188,8 +186,7 @@ if (thermalStress)
                     "alpha",
                     inv(dimTemperature),
                     alphaValue
-                ),
-                zeroGradientFvPatchField<scalar>::typeName
+                )
             )
         );
     }
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 6f973fb661..1e5db003e8 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -398,8 +398,7 @@ int main(int argc, char *argv[])
                         IOobject::AUTO_WRITE
                     ),
                     mesh,
-                    dimensionedScalar("cellDist", dimless, 0),
-                    zeroGradientFvPatchScalarField::typeName
+                    dimensionedScalar("cellDist", dimless, 0)
                 );
 
                 forAll(procIds, celli)
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 92afcdbaec..cd1b0c4380 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -236,20 +236,18 @@ void writeDecomposition
             false                   // do not register
         ),
         mesh,
-        dimensionedScalar(name, dimless, -1),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(name, dimless, -1)
     );
 
     forAll(procCells, cI)
     {
         procCells[cI] = decomp[cI];
     }
+
     procCells.write();
 }
 
 
-// Read vol or surface fields
-//template<class T, class Mesh>
 template<class GeoField>
 void readFields
 (
@@ -260,12 +258,12 @@ void readFields
     PtrList<GeoField>& fields
 )
 {
-    //typedef GeometricField<T, fvPatchField, Mesh> fldType;
-
     // Get my objects of type
     IOobjectList objects(allObjects.lookupClass(GeoField::typeName));
+
     // Check that we all have all objects
     wordList objectNames = objects.toc();
+
     // Get master names
     wordList masterNames(objectNames);
     Pstream::scatter(masterNames);
diff --git a/applications/utilities/postProcessing/velocityField/Co/Co.C b/applications/utilities/postProcessing/velocityField/Co/Co.C
index 03718ef523..110c39b415 100644
--- a/applications/utilities/postProcessing/velocityField/Co/Co.C
+++ b/applications/utilities/postProcessing/velocityField/Co/Co.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,7 @@ Description
 
 #include "calc.H"
 #include "fvc.H"
+#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 164069d2fa..4cdf0ac325 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
@@ -113,12 +113,12 @@ template<class T, class Container>
 Foam::CompactListList<T, Container>::CompactListList
 (
     CompactListList<T, Container>& lst,
-    bool reUse
+    bool reuse
 )
 :
     size_(lst.size()),
-    offsets_(lst.offsets_, reUse),
-    m_(lst.m_, reUse)
+    offsets_(lst.offsets_, reuse),
+    m_(lst.m_, reuse)
 {}
 
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index 5cfa0a07f2..91c6b98fec 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -123,7 +123,7 @@ public:
         explicit CompactListList(const Xfer<CompactListList<T, Container>>&);
 
         //- Construct as copy or re-use as specified.
-        CompactListList(CompactListList<T, Container>&, bool reUse);
+        CompactListList(CompactListList<T, Container>&, bool reuse);
 
         //- Construct from Istream.
         CompactListList(Istream&);
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index cd766c8ed1..134bd4f04a 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -34,11 +34,8 @@ License
 #include "BiIndirectList.H"
 #include "contiguous.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
-// Construct with length specified
 template<class T>
 Foam::List<T>::List(const label s)
 :
@@ -58,7 +55,6 @@ Foam::List<T>::List(const label s)
 }
 
 
-// Construct with length and single value specified
 template<class T>
 Foam::List<T>::List(const label s, const T& a)
 :
@@ -83,7 +79,6 @@ Foam::List<T>::List(const label s, const T& a)
 }
 
 
-// Construct as copy
 template<class T>
 Foam::List<T>::List(const List<T>& a)
 :
@@ -93,13 +88,13 @@ Foam::List<T>::List(const List<T>& a)
     {
         this->v_ = new T[this->size_];
 
-#       ifdef USEMEMCPY
+        #ifdef USEMEMCPY
         if (contiguous<T>())
         {
             memcpy(this->v_, a.v_, this->byteSize());
         }
         else
-#       endif
+        #endif
         {
             List_ACCESS(T, (*this), vp);
             List_CONST_ACCESS(T, a, ap);
@@ -111,7 +106,6 @@ Foam::List<T>::List(const List<T>& a)
 }
 
 
-// Construct by transferring the parameter contents
 template<class T>
 Foam::List<T>::List(const Xfer<List<T>>& lst)
 {
@@ -119,13 +113,12 @@ Foam::List<T>::List(const Xfer<List<T>>& lst)
 }
 
 
-// Construct as copy or re-use as specified.
 template<class T>
-Foam::List<T>::List(List<T>& a, bool reUse)
+Foam::List<T>::List(List<T>& a, bool reuse)
 :
     UList<T>(NULL, a.size_)
 {
-    if (reUse)
+    if (reuse)
     {
         this->v_ = a.v_;
         a.v_ = 0;
@@ -135,13 +128,13 @@ Foam::List<T>::List(List<T>& a, bool reUse)
     {
         this->v_ = new T[this->size_];
 
-#       ifdef USEMEMCPY
+        #ifdef USEMEMCPY
         if (contiguous<T>())
         {
             memcpy(this->v_, a.v_, this->byteSize());
         }
         else
-#       endif
+        #endif
         {
             List_ACCESS(T, (*this), vp);
             List_CONST_ACCESS(T, a, ap);
@@ -153,7 +146,6 @@ Foam::List<T>::List(List<T>& a, bool reUse)
 }
 
 
-// Construct as subset
 template<class T>
 Foam::List<T>::List(const UList<T>& a, const labelUList& map)
 :
@@ -173,7 +165,6 @@ Foam::List<T>::List(const UList<T>& a, const labelUList& map)
 }
 
 
-// Construct given start and end iterators.
 template<class T>
 template<class InputIterator>
 Foam::List<T>::List(InputIterator first, InputIterator last)
@@ -205,7 +196,6 @@ Foam::List<T>::List(InputIterator first, InputIterator last)
 }
 
 
-// Construct as copy of FixedList<T, Size>
 template<class T>
 template<unsigned Size>
 Foam::List<T>::List(const FixedList<T, Size>& lst)
@@ -224,7 +214,6 @@ Foam::List<T>::List(const FixedList<T, Size>& lst)
 }
 
 
-// Construct as copy of PtrList<T>
 template<class T>
 Foam::List<T>::List(const PtrList<T>& lst)
 :
@@ -242,7 +231,6 @@ Foam::List<T>::List(const PtrList<T>& lst)
 }
 
 
-// Construct as copy of SLList<T>
 template<class T>
 Foam::List<T>::List(const SLList<T>& lst)
 :
@@ -266,7 +254,6 @@ Foam::List<T>::List(const SLList<T>& lst)
 }
 
 
-// Construct as copy of UIndirectList<T>
 template<class T>
 Foam::List<T>::List(const UIndirectList<T>& lst)
 :
@@ -284,7 +271,6 @@ Foam::List<T>::List(const UIndirectList<T>& lst)
 }
 
 
-// Construct as copy of BiIndirectList<T>
 template<class T>
 Foam::List<T>::List(const BiIndirectList<T>& lst)
 :
@@ -304,7 +290,6 @@ Foam::List<T>::List(const BiIndirectList<T>& lst)
 
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
-// Destroy list elements
 template<class T>
 Foam::List<T>::~List()
 {
@@ -334,13 +319,13 @@ void Foam::List<T>::setSize(const label newSize)
             {
                 label i = min(this->size_, newSize);
 
-#               ifdef USEMEMCPY
+                #ifdef USEMEMCPY
                 if (contiguous<T>())
                 {
                     memcpy(nv, this->v_, i*sizeof(T));
                 }
                 else
-#               endif
+                #endif
                 {
                     T* vv = &this->v_[i];
                     T* av = &nv[i];
@@ -384,8 +369,6 @@ void Foam::List<T>::clear()
 }
 
 
-// Transfer the contents of the argument List into this List
-// and annul the argument list
 template<class T>
 void Foam::List<T>::transfer(List<T>& a)
 {
@@ -398,25 +381,21 @@ void Foam::List<T>::transfer(List<T>& a)
 }
 
 
-// Transfer the contents of the argument DynamicList into this List
-// and annul the argument list
 template<class T>
 template<unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 void Foam::List<T>::transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>& a)
 {
-    // shrink the allocated space to the number of elements used
+    // Shrink the allocated space to the number of elements used
     a.shrink();
     transfer(static_cast<List<T>&>(a));
     a.clearStorage();
 }
 
 
-// Transfer the contents of the argument SortableList into this List
-// and annul the argument list
 template<class T>
 void Foam::List<T>::transfer(SortableList<T>& a)
 {
-    // shrink away the sort indices
+    // Shrink away the sort indices
     a.shrink();
     transfer(static_cast<List<T>&>(a));
 }
@@ -424,7 +403,6 @@ void Foam::List<T>::transfer(SortableList<T>& a)
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-// Assignment to UList operator. Takes linear time.
 template<class T>
 void Foam::List<T>::operator=(const UList<T>& a)
 {
@@ -438,13 +416,13 @@ void Foam::List<T>::operator=(const UList<T>& a)
 
     if (this->size_)
     {
-#       ifdef USEMEMCPY
+        #ifdef USEMEMCPY
         if (contiguous<T>())
         {
             memcpy(this->v_, a.v_, this->byteSize());
         }
         else
-#       endif
+        #endif
         {
             List_ACCESS(T, (*this), vp);
             List_CONST_ACCESS(T, a, ap);
@@ -456,7 +434,6 @@ void Foam::List<T>::operator=(const UList<T>& a)
 }
 
 
-// Assignment operator. Takes linear time.
 template<class T>
 void Foam::List<T>::operator=(const List<T>& a)
 {
@@ -471,7 +448,6 @@ void Foam::List<T>::operator=(const List<T>& a)
 }
 
 
-// Assignment operator. Takes linear time.
 template<class T>
 void Foam::List<T>::operator=(const SLList<T>& lst)
 {
@@ -499,7 +475,6 @@ void Foam::List<T>::operator=(const SLList<T>& lst)
 }
 
 
-// Assignment operator. Takes linear time.
 template<class T>
 void Foam::List<T>::operator=(const UIndirectList<T>& lst)
 {
@@ -518,7 +493,6 @@ void Foam::List<T>::operator=(const UIndirectList<T>& lst)
 }
 
 
-// Assignment operator. Takes linear time.
 template<class T>
 void Foam::List<T>::operator=(const BiIndirectList<T>& lst)
 {
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index ba1e75ad1f..4f8859e32c 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -112,7 +112,7 @@ public:
         List(const Xfer<List<T>>&);
 
         //- Construct as copy or re-use as specified.
-        List(List<T>&, bool reUse);
+        List(List<T>&, bool reuse);
 
         //- Construct as subset.
         List(const UList<T>&, const labelUList& mapAddressing);
diff --git a/src/OpenFOAM/containers/Lists/List/ListIO.C b/src/OpenFOAM/containers/Lists/List/ListIO.C
index 97d338470b..1ac3ecc919 100644
--- a/src/OpenFOAM/containers/Lists/List/ListIO.C
+++ b/src/OpenFOAM/containers/Lists/List/ListIO.C
@@ -31,7 +31,6 @@ License
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-// Construct from Istream
 template<class T>
 Foam::List<T>::List(Istream& is)
 :
@@ -173,12 +172,12 @@ Foam::List<T> Foam::readList(Istream& is)
                 << exit(FatalIOError);
         }
 
-        // read via a singly-linked list
+        // Read via a singly-linked list
         L = SLList<T>(is);
     }
     else
     {
-        // create list with a single item
+        // Create list with a single item
         L.setSize(1);
 
         is >> L[0];
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
index 0101d481e6..2fdafcbb74 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
@@ -77,20 +77,11 @@ Foam::PtrList<T>::PtrList(const Xfer<PtrList<T>>& lst)
 
 
 template<class T>
-Foam::PtrList<T>::PtrList(PtrList<T>& a, bool reUse)
+Foam::PtrList<T>::PtrList(PtrList<T>& a, bool reuse)
 :
-    ptrs_(a.size())
+    ptrs_(a.ptrs_, reuse)
 {
-    if (reUse)
-    {
-        forAll(*this, i)
-        {
-            ptrs_[i] = a.ptrs_[i];
-            a.ptrs_[i] = NULL;
-        }
-        a.setSize(0);
-    }
-    else
+    if (!reuse)
     {
         forAll(*this, i)
         {
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index 68bf3a7157..d412270b13 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -161,7 +161,7 @@ public:
         PtrList(const Xfer<PtrList<T>>&);
 
         //- Construct as copy or re-use as specified.
-        PtrList(PtrList<T>&, bool reUse);
+        PtrList(PtrList<T>&, bool reuse);
 
         //- Construct as copy of SLPtrList<T>
         explicit PtrList(const SLPtrList<T>&);
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
index 3a6a7c2d96..0936f9ac0d 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
@@ -51,9 +51,9 @@ Foam::UPtrList<T>::UPtrList(const Xfer<UPtrList<T>>& lst)
 
 
 template<class T>
-Foam::UPtrList<T>::UPtrList(UPtrList<T>& a, bool reUse)
+Foam::UPtrList<T>::UPtrList(UPtrList<T>& a, bool reuse)
 :
-    ptrs_(a.ptrs_, reUse)
+    ptrs_(a.ptrs_, reuse)
 {}
 
 
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
index 02aee9f141..36cdc80fbc 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
@@ -113,7 +113,7 @@ public:
         UPtrList(const Xfer<UPtrList<T>>&);
 
         //- Construct as copy or re-use as specified.
-        UPtrList(UPtrList<T>&, bool reUse);
+        UPtrList(UPtrList<T>&, bool reuse);
 
 
     // Member functions
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index 27c2948c2f..d7ee58eb21 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -131,11 +131,11 @@ template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
 (
     DimensionedField<Type, GeoMesh>& df,
-    bool reUse
+    bool reuse
 )
 :
-    regIOobject(df, reUse),
-    Field<Type>(df, reUse),
+    regIOobject(df, reuse),
+    Field<Type>(df, reuse),
     mesh_(df.mesh_),
     dimensions_(df.dimensions_)
 {}
@@ -194,11 +194,11 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 (
     const IOobject& io,
     DimensionedField<Type, GeoMesh>& df,
-    bool reUse
+    bool reuse
 )
 :
     regIOobject(io, df),
-    Field<Type>(df, reUse),
+    Field<Type>(df, reuse),
     mesh_(df.mesh_),
     dimensions_(df.dimensions_)
 {}
@@ -223,11 +223,11 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 (
     const word& newName,
     DimensionedField<Type, GeoMesh>& df,
-    bool reUse
+    bool reuse
 )
 :
     regIOobject(newName, df, true),
-    Field<Type>(df, reUse),
+    Field<Type>(df, reuse),
     mesh_(df.mesh_),
     dimensions_(df.dimensions_)
 {}
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index 81817fdeba..f90f9bfe25 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -159,7 +159,7 @@ public:
         DimensionedField
         (
             DimensionedField<Type, GeoMesh>&,
-            bool reUse
+            bool reuse
         );
 
         //- Construct by transferring the DimensionedField
@@ -188,7 +188,7 @@ public:
         (
             const IOobject&,
             DimensionedField<Type, GeoMesh>&,
-            bool reUse
+            bool reuse
         );
 
         //- Construct as copy resetting name
@@ -203,7 +203,7 @@ public:
         (
             const word& newName,
             DimensionedField<Type, GeoMesh>&,
-            bool reUse
+            bool reuse
         );
 
         //- Construct by transferring the DimensionedField with a new name
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index 21fc405c8b..fba85680a4 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -143,10 +143,10 @@ FieldField<Field, Type>::FieldField(const FieldField<Field, Type>& f)
 
 
 template<template<class> class Field, class Type>
-FieldField<Field, Type>::FieldField(FieldField<Field, Type>& f, bool reUse)
+FieldField<Field, Type>::FieldField(FieldField<Field, Type>& f, bool reuse)
 :
     refCount(),
-    PtrList<Field<Type>>(f, reUse)
+    PtrList<Field<Type>>(f, reuse)
 {}
 
 
@@ -157,7 +157,6 @@ FieldField<Field, Type>::FieldField(const PtrList<Field<Type>>& tl)
 {}
 
 
-// Construct as copy of tmp<FieldField>
 #ifndef NoConstructFromTmp
 template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type>>& tf)
@@ -168,7 +167,7 @@ FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type>>& tf)
         tf.isTmp()
     )
 {
-    const_cast<FieldField<Field, Type>&>(tf()).resetRefCount();
+    tf.clear();
 }
 #endif
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
index 3c1134e207..e63201e5b8 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
@@ -102,7 +102,7 @@ public:
         FieldField(const FieldField<Field, Type>&);
 
         //- Construct as copy or re-use as specified.
-        FieldField(FieldField<Field, Type>&, bool reUse);
+        FieldField(FieldField<Field, Type>&, bool reuse);
 
         //- Construct as copy of a PtrList<Field, Type>
         FieldField(const PtrList<Field<Type>>&);
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
index b941bee749..3e7b3fe665 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
@@ -63,7 +63,8 @@ public:
 
     static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, TypeR>>& tf1
+        const tmp<FieldField<Field, TypeR>>& tf1,
+        const bool initRet = false
     )
     {
         if (tf1.isTmp())
@@ -72,10 +73,17 @@ public:
         }
         else
         {
-            return tmp<FieldField<Field, TypeR>>
+            tmp<FieldField<Field, TypeR>> rtf
             (
                 FieldField<Field, TypeR>::NewCalculatedType(tf1())
             );
+
+            if (initRet)
+            {
+                rtf() = tf1();
+            }
+
+            return rtf;
         }
     }
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 73dbc688c1..e3f17b61a1 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -202,9 +202,9 @@ Foam::Field<Type>::Field(const Field<Type>& f)
 
 
 template<class Type>
-Foam::Field<Type>::Field(Field<Type>& f, bool reUse)
+Foam::Field<Type>::Field(Field<Type>& f, bool reuse)
 :
-    List<Type>(f, reUse)
+    List<Type>(f, reuse)
 {}
 
 
@@ -236,7 +236,7 @@ Foam::Field<Type>::Field(const tmp<Field<Type>>& tf)
 :
     List<Type>(const_cast<Field<Type>&>(tf()), tf.isTmp())
 {
-    const_cast<Field<Type>&>(tf()).resetRefCount();
+    tf.clear();
 }
 #endif
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 678dd3c772..fd8a849c1d 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -205,7 +205,7 @@ public:
         Field(const Field<Type>&);
 
         //- Construct as copy or re-use as specified.
-        Field(Field<Type>&, bool reUse);
+        Field(Field<Type>&, bool reuse);
 
         //- Construct by transferring the Field contents
         Field(const Xfer<Field<Type>>&);
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
index 35c5a5c16d..1d3c39859c 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
@@ -55,7 +55,11 @@ class reuseTmp<TypeR, TypeR>
 {
 public:
 
-    static tmp<Field<TypeR>> New(const tmp<Field<TypeR>>& tf1)
+    static tmp<Field<TypeR>> New
+    (
+        const tmp<Field<TypeR>>& tf1,
+        const bool initRet = false
+    )
     {
         if (tf1.isTmp())
         {
@@ -63,7 +67,14 @@ public:
         }
         else
         {
-            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
+            tmp<Field<TypeR>> rtf(new Field<TypeR>(tf1().size()));
+
+            if (initRet)
+            {
+                rtf() = tf1();
+            }
+
+            return rtf;
         }
     }
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
index 06970c3c67..563dc9b193 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
@@ -33,6 +33,48 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+template
+<
+    class Type,
+    template<class> class PatchField,
+    class GeoMesh
+>
+bool reusable(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
+{
+    if (tgf.isTmp())
+    {
+        if (GeometricField<Type, PatchField, GeoMesh>::debug)
+        {
+            const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
+            const typename GeometricField<Type, PatchField, GeoMesh>::
+                GeometricBoundaryField& gbf = gf.boundaryField();
+
+            forAll(gbf, patchi)
+            {
+                if
+                (
+                    !polyPatch::constraintType(gbf[patchi].patch().type())
+                 && !isA<typename PatchField<Type>::Calculated>(gbf[patchi])
+                )
+                {
+                    WarningInFunction
+                        << "Attempt to reuse temporary with non-reusable BC "
+                        << gbf[patchi].type() << endl;
+
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
 template
 <
     class TypeR,
@@ -46,12 +88,12 @@ public:
 
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        const GeometricField<Type1, PatchField, GeoMesh>& df1 = tdf1();
+        const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();
 
         return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
         (
@@ -60,10 +102,10 @@ public:
                 IOobject
                 (
                     name,
-                    df1.instance(),
-                    df1.db()
+                    gf1.instance(),
+                    gf1.db()
                 ),
-                df1.mesh(),
+                gf1.mesh(),
                 dimensions
             )
         );
@@ -71,10 +113,10 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1
     )
     {
-        tdf1.clear();
+        tgf1.clear();
     }
 };
 
@@ -86,47 +128,55 @@ public:
 
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
         const word& name,
-        const dimensionSet& dimensions
+        const dimensionSet& dimensions,
+        const bool initRet = false
     )
     {
-        GeometricField<TypeR, PatchField, GeoMesh>& df1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tdf1());
+        GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
 
-        if (tdf1.isTmp())
+        if (reusable(tgf1))
         {
-            df1.rename(name);
-            df1.dimensions().reset(dimensions);
-            return tdf1;
+            gf1.rename(name);
+            gf1.dimensions().reset(dimensions);
+            return tgf1;
         }
         else
         {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
+            tmp<GeometricField<TypeR, PatchField, GeoMesh>> rtgf
             (
                 new GeometricField<TypeR, PatchField, GeoMesh>
                 (
                     IOobject
                     (
                         name,
-                        df1.instance(),
-                        df1.db()
+                        gf1.instance(),
+                        gf1.db()
                     ),
-                    df1.mesh(),
+                    gf1.mesh(),
                     dimensions
                 )
             );
+
+            if (initRet)
+            {
+                rtgf() == tgf1();
+            }
+
+            return rtgf;
         }
     }
 
     static void clear
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1
     )
     {
-        if (tdf1.isTmp())
+        if (reusable(tgf1))
         {
-            tdf1.ptr();
+            tgf1.ptr();
         }
     }
 };
@@ -147,13 +197,13 @@ public:
 
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2,
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        const GeometricField<Type1, PatchField, GeoMesh>& df1 = tdf1();
+        const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();
 
         return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
         (
@@ -162,10 +212,10 @@ public:
                 IOobject
                 (
                     name,
-                    df1.instance(),
-                    df1.db()
+                    gf1.instance(),
+                    gf1.db()
                 ),
-                df1.mesh(),
+                gf1.mesh(),
                 dimensions
             )
         );
@@ -173,12 +223,12 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2
     )
     {
-        tdf1.clear();
-        tdf2.clear();
+        tgf1.clear();
+        tgf2.clear();
     }
 };
 
@@ -198,21 +248,21 @@ public:
 
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2,
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        const GeometricField<Type1, PatchField, GeoMesh>& df1 = tdf1();
-        GeometricField<TypeR, PatchField, GeoMesh>& df2 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tdf2());
+        const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();
+        GeometricField<TypeR, PatchField, GeoMesh>& gf2 =
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf2());
 
-        if (tdf2.isTmp())
+        if (reusable(tgf2))
         {
-            df2.rename(name);
-            df2.dimensions().reset(dimensions);
-            return tdf2;
+            gf2.rename(name);
+            gf2.dimensions().reset(dimensions);
+            return tgf2;
         }
         else
         {
@@ -223,10 +273,10 @@ public:
                     IOobject
                     (
                         name,
-                        df1.instance(),
-                        df1.db()
+                        gf1.instance(),
+                        gf1.db()
                     ),
-                    df1.mesh(),
+                    gf1.mesh(),
                     dimensions
                 )
             );
@@ -235,14 +285,14 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf2
     )
     {
-        tdf1.clear();
-        if (tdf2.isTmp())
+        tgf1.clear();
+        if (reusable(tgf2))
         {
-            tdf2.ptr();
+            tgf2.ptr();
         }
     }
 };
@@ -261,20 +311,20 @@ public:
 
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        GeometricField<TypeR, PatchField, GeoMesh>& df1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tdf1());
+        GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
 
-        if (tdf1.isTmp())
+        if (reusable(tgf1))
         {
-            df1.rename(name);
-            df1.dimensions().reset(dimensions);
-            return tdf1;
+            gf1.rename(name);
+            gf1.dimensions().reset(dimensions);
+            return tgf1;
         }
         else
         {
@@ -285,10 +335,10 @@ public:
                     IOobject
                     (
                         name,
-                        df1.instance(),
-                        df1.db()
+                        gf1.instance(),
+                        gf1.db()
                     ),
-                    df1.mesh(),
+                    gf1.mesh(),
                     dimensions
                 )
             );
@@ -297,15 +347,15 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2
     )
     {
-        if (tdf1.isTmp())
+        if (reusable(tgf1))
         {
-            tdf1.ptr();
+            tgf1.ptr();
         }
-        tdf2.clear();
+        tgf2.clear();
     }
 };
 
@@ -317,28 +367,28 @@ public:
 
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        GeometricField<TypeR, PatchField, GeoMesh>& df1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tdf1());
-        GeometricField<TypeR, PatchField, GeoMesh>& df2 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tdf2());
+        GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+        GeometricField<TypeR, PatchField, GeoMesh>& gf2 =
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf2());
 
-        if (tdf1.isTmp())
+        if (reusable(tgf1))
         {
-            df1.rename(name);
-            df1.dimensions().reset(dimensions);
-            return tdf1;
+            gf1.rename(name);
+            gf1.dimensions().reset(dimensions);
+            return tgf1;
         }
-        else if (tdf2.isTmp())
+        else if (reusable(tgf2))
         {
-            df2.rename(name);
-            df2.dimensions().reset(dimensions);
-            return tdf2;
+            gf2.rename(name);
+            gf2.dimensions().reset(dimensions);
+            return tgf2;
         }
         else
         {
@@ -349,10 +399,10 @@ public:
                     IOobject
                     (
                         name,
-                        df1.instance(),
-                        df1.db()
+                        gf1.instance(),
+                        gf1.db()
                     ),
-                    df1.mesh(),
+                    gf1.mesh(),
                     dimensions
                 )
             );
@@ -361,19 +411,19 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf2
     )
     {
-        if (tdf1.isTmp())
+        if (reusable(tgf1))
         {
-            tdf1.ptr();
-            tdf2.clear();
+            tgf1.ptr();
+            tgf2.clear();
         }
-        else if (tdf2.isTmp())
+        else if (reusable(tgf2))
         {
-            tdf1.clear();
-            tdf2.ptr();
+            tgf1.clear();
+            tgf2.ptr();
         }
     }
 };
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index ba296fb124..bf77b43ac9 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -63,6 +63,9 @@ class pointMesh;
 template<class Type>
 class pointPatchField;
 
+template<class Type>
+class calculatedPointPatchField;
+
 template<class Type>
 Ostream& operator<<
 (
@@ -99,6 +102,7 @@ class pointPatchField
 public:
 
     typedef pointPatch Patch;
+    typedef calculatedPointPatchField<Type> Calculated;
 
 
     //- Runtime type information
@@ -239,8 +243,7 @@ public:
             const dictionary&
         );
 
-
-        //- Return a pointer to a new CalculatedpointPatchField created on
+        //- Return a pointer to a new calculatedPointPatchField created on
         //  freestore without setting patchField values
         template<class Type2>
         static autoPtr<pointPatchField<Type>>
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
index 8c3d6a79c2..aa50c4def3 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ Foam::LduMatrix<Type, DType, LUType>::LduMatrix(const LduMatrix& A)
 
 
 template<class Type, class DType, class LUType>
-Foam::LduMatrix<Type, DType, LUType>::LduMatrix(LduMatrix& A, bool reUse)
+Foam::LduMatrix<Type, DType, LUType>::LduMatrix(LduMatrix& A, bool reuse)
 :
     lduMesh_(A.lduMesh_),
     diagPtr_(NULL),
@@ -88,7 +88,7 @@ Foam::LduMatrix<Type, DType, LUType>::LduMatrix(LduMatrix& A, bool reUse)
     interfacesUpper_(0),
     interfacesLower_(0)
 {
-    if (reUse)
+    if (reuse)
     {
         if (A.diagPtr_)
         {
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
index 22b740c4de..55081e89a5 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
@@ -470,7 +470,7 @@ public:
         LduMatrix(const LduMatrix<Type, DType, LUType>&);
 
         //- Construct as copy or re-use as specified.
-        LduMatrix(LduMatrix<Type, DType, LUType>&, bool reUse);
+        LduMatrix(LduMatrix<Type, DType, LUType>&, bool reuse);
 
         //- Construct given an LDU addressed mesh and an Istream
         //  from which the coefficients are read
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
index 1f22e238e0..8de7395626 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,14 +70,14 @@ Foam::lduMatrix::lduMatrix(const lduMatrix& A)
 }
 
 
-Foam::lduMatrix::lduMatrix(lduMatrix& A, bool reUse)
+Foam::lduMatrix::lduMatrix(lduMatrix& A, bool reuse)
 :
     lduMesh_(A.lduMesh_),
     lowerPtr_(NULL),
     diagPtr_(NULL),
     upperPtr_(NULL)
 {
-    if (reUse)
+    if (reuse)
     {
         if (A.lowerPtr_)
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 43566e164f..5d5d62fd48 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -521,7 +521,7 @@ public:
         lduMatrix(const lduMatrix&);
 
         //- Construct as copy or re-use as specified.
-        lduMatrix(lduMatrix&, bool reUse);
+        lduMatrix(lduMatrix&, bool reuse);
 
         //- Construct given an LDU addressed mesh and an Istream
         //  from which the coefficients are read
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtr.H b/src/OpenFOAM/memory/autoPtr/autoPtr.H
index c3ea064fb1..748975b5cf 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtr.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtr.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ public:
 
         //- Construct either by transferring pointer or cloning. Should
         //  only be called with type that supports cloning.
-        inline autoPtr(const autoPtr<T>&, const bool reUse);
+        inline autoPtr(const autoPtr<T>&, const bool reuse);
 
 
     //- Destructor, delete object if pointer is not NULL
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtrI.H b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
index 961456e5b8..ef199ca20c 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtrI.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,9 +45,9 @@ inline Foam::autoPtr<T>::autoPtr(const autoPtr<T>& ap)
 
 
 template<class T>
-inline Foam::autoPtr<T>::autoPtr(const autoPtr<T>& ap, const bool reUse)
+inline Foam::autoPtr<T>::autoPtr(const autoPtr<T>& ap, const bool reuse)
 {
-    if (reUse)
+    if (reuse)
     {
         ptr_ = ap.ptr_;
         ap.ptr_ = 0;
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 783d06feb8..24700bfad4 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -100,7 +100,8 @@ public:
 
         // Edit
 
-            //- Return tmp pointer for reuse
+            //- Return tmp pointer for reuse.
+            //  Returns a clone if the object is not a temporary
             inline T* ptr() const;
 
             //- If object pointer points to valid object:
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index 4f3ae9c662..490ac76e3f 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------------------------------------------r-------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -171,7 +171,7 @@ inline T* Foam::tmp<T>::ptr() const
 template<class T>
 inline void Foam::tmp<T>::clear() const
 {
-    if (isTmp_ && ptr_)  // skip this bit:  && ptr_->okToDelete())
+    if (isTmp_ && ptr_)  // Skip this bit:  && ptr_->okToDelete())
     {
         delete ptr_;
         ptr_ = 0;
@@ -326,7 +326,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
         }
 
         ptr_ = t.ptr_;
-        t.ptr_ = 0;
+        const_cast<tmp<T>&>(t).ptr_ = 0;
         ptr_->resetRefCount();
     }
     else
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
index 13731a858b..bdd4dbe09f 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,12 +206,12 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
     labelList& l,
     labelList& u,
     const label comm,
-    bool reUse
+    bool reuse
 )
 :
     lduAddressing(nCells),
-    lowerAddr_(l, reUse),
-    upperAddr_(u, reUse),
+    lowerAddr_(l, reuse),
+    upperAddr_(u, reuse),
     comm_(comm)
 {}
 
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
index 5bd7901c8b..e94850f4bd 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ public:
             labelList& l,
             labelList& u,
             const label comm,
-            bool reUse
+            bool reuse
         );
 
         //- Add interfaces to a mesh constructed without
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
index ddf90970ff..48d857b05e 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,38 +143,38 @@ Foam::mapPolyMesh::mapPolyMesh
     labelList& oldPatchStarts,
     labelList& oldPatchNMeshPoints,
     autoPtr<scalarField>& oldCellVolumesPtr,
-    const bool reUse
+    const bool reuse
 )
 :
     mesh_(mesh),
     nOldPoints_(nOldPoints),
     nOldFaces_(nOldFaces),
     nOldCells_(nOldCells),
-    pointMap_(pointMap, reUse),
-    pointsFromPointsMap_(pointsFromPoints, reUse),
-    faceMap_(faceMap, reUse),
-    facesFromPointsMap_(facesFromPoints, reUse),
-    facesFromEdgesMap_(facesFromEdges, reUse),
-    facesFromFacesMap_(facesFromFaces, reUse),
-    cellMap_(cellMap, reUse),
-    cellsFromPointsMap_(cellsFromPoints, reUse),
-    cellsFromEdgesMap_(cellsFromEdges, reUse),
-    cellsFromFacesMap_(cellsFromFaces, reUse),
-    cellsFromCellsMap_(cellsFromCells, reUse),
-    reversePointMap_(reversePointMap, reUse),
-    reverseFaceMap_(reverseFaceMap, reUse),
-    reverseCellMap_(reverseCellMap, reUse),
+    pointMap_(pointMap, reuse),
+    pointsFromPointsMap_(pointsFromPoints, reuse),
+    faceMap_(faceMap, reuse),
+    facesFromPointsMap_(facesFromPoints, reuse),
+    facesFromEdgesMap_(facesFromEdges, reuse),
+    facesFromFacesMap_(facesFromFaces, reuse),
+    cellMap_(cellMap, reuse),
+    cellsFromPointsMap_(cellsFromPoints, reuse),
+    cellsFromEdgesMap_(cellsFromEdges, reuse),
+    cellsFromFacesMap_(cellsFromFaces, reuse),
+    cellsFromCellsMap_(cellsFromCells, reuse),
+    reversePointMap_(reversePointMap, reuse),
+    reverseFaceMap_(reverseFaceMap, reuse),
+    reverseCellMap_(reverseCellMap, reuse),
     flipFaceFlux_(flipFaceFlux),
-    patchPointMap_(patchPointMap, reUse),
-    pointZoneMap_(pointZoneMap, reUse),
-    faceZonePointMap_(faceZonePointMap, reUse),
-    faceZoneFaceMap_(faceZoneFaceMap, reUse),
-    cellZoneMap_(cellZoneMap, reUse),
-    preMotionPoints_(preMotionPoints, reUse),
+    patchPointMap_(patchPointMap, reuse),
+    pointZoneMap_(pointZoneMap, reuse),
+    faceZonePointMap_(faceZonePointMap, reuse),
+    faceZoneFaceMap_(faceZoneFaceMap, reuse),
+    cellZoneMap_(cellZoneMap, reuse),
+    preMotionPoints_(preMotionPoints, reuse),
     oldPatchSizes_(oldPatchStarts.size()),
-    oldPatchStarts_(oldPatchStarts, reUse),
-    oldPatchNMeshPoints_(oldPatchNMeshPoints, reUse),
-    oldCellVolumesPtr_(oldCellVolumesPtr, reUse)
+    oldPatchStarts_(oldPatchStarts, reuse),
+    oldPatchNMeshPoints_(oldPatchNMeshPoints, reuse),
+    oldCellVolumesPtr_(oldCellVolumesPtr, reuse)
 {
     if (oldPatchStarts_.size() > 0)
     {
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
index e81de98eb7..33ef923403 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -349,7 +349,7 @@ public:
             labelList& oldPatchStarts,
             labelList& oldPatchNMeshPoints,
             autoPtr<scalarField>& oldCellVolumesPtr,
-            const bool reUse
+            const bool reuse
         );
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapSubsetMesh/mapSubsetMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapSubsetMesh/mapSubsetMesh.H
index d85063422d..ff8ea1f265 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapSubsetMesh/mapSubsetMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapSubsetMesh/mapSubsetMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ public:
             const label exposedPatchID,
             labelList& oldPatchStarts,
             labelList& oldPatchNMeshPoints,
-            const bool reUse
+            const bool reuse
         );
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
index ade55ed719..6fb9994e4d 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
@@ -111,11 +111,11 @@ PrimitivePatch
 (
     FaceList<Face>& faces,
     Field<PointType>& points,
-    const bool reUse
+    const bool reuse
 )
 :
-    FaceList<Face>(faces, reUse),
-    points_(points, reUse),
+    FaceList<Face>(faces, reuse),
+    points_(points, reuse),
     edgesPtr_(NULL),
     nInternalEdges_(-1),
     boundaryPointsPtr_(NULL),
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
index 9137ed673f..0d7f235d84 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
@@ -255,7 +255,7 @@ public:
         (
             FaceList<Face>& faces,
             Field<PointType>& points,
-            const bool reUse
+            const bool reuse
         );
 
         //- Construct as copy
diff --git a/src/combustionModels/laminar/laminar.C b/src/combustionModels/laminar/laminar.C
index 069e9b588a..d53a859a73 100644
--- a/src/combustionModels/laminar/laminar.C
+++ b/src/combustionModels/laminar/laminar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -151,8 +151,7 @@ Foam::combustionModels::laminar<Type>::dQ() const
                 false
             ),
             this->mesh(),
-            dimensionedScalar("dQ", dimEnergy/dimTime, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
         )
     );
 
@@ -183,8 +182,7 @@ Foam::combustionModels::laminar<Type>::Sh() const
                 false
             ),
             this->mesh(),
-            dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0)
         )
     );
 
diff --git a/src/combustionModels/noCombustion/noCombustion.C b/src/combustionModels/noCombustion/noCombustion.C
index 838edd169c..f594775917 100644
--- a/src/combustionModels/noCombustion/noCombustion.C
+++ b/src/combustionModels/noCombustion/noCombustion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,8 +90,7 @@ Foam::combustionModels::noCombustion<CombThermoType>::dQ() const
                 false
             ),
             this->mesh(),
-            dimensionedScalar("dQ", dimEnergy/dimTime, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
         )
     );
 
@@ -117,8 +116,7 @@ Foam::combustionModels::noCombustion<CombThermoType>::Sh() const
                 false
             ),
             this->mesh(),
-            dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0)
         )
     );
 
diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.C b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
index 9441984861..ba586bc1cd 100644
--- a/src/combustionModels/singleStepCombustion/singleStepCombustion.C
+++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
@@ -154,8 +154,7 @@ singleStepCombustion<CombThermoType, ThermoType>::dQ() const
                 false
             ),
             this->mesh_,
-            dimensionedScalar("dQ", dimEnergy/dimTime, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
         )
     );
 
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index eda874fd02..f94219df92 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -99,6 +99,7 @@ $(fvPatchFields)/fvPatchField/fvPatchFields.C
 basicFvPatchFields = $(fvPatchFields)/basic
 $(basicFvPatchFields)/basicSymmetry/basicSymmetryFvPatchScalarField.C
 $(basicFvPatchFields)/calculated/calculatedFvPatchFields.C
+$(basicFvPatchFields)/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.C
 $(basicFvPatchFields)/coupled/coupledFvPatchFields.C
 $(basicFvPatchFields)/directionMixed/directionMixedFvPatchFields.C
 $(basicFvPatchFields)/fixedGradient/fixedGradientFvPatchFields.C
diff --git a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
index c6cdff20c5..f0fd91f4ba 100644
--- a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
+++ b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ License
 #include "fvmLaplacian.H"
 #include "fvcDiv.H"
 #include "fixedValueFvPatchFields.H"
+#include "zeroGradientFvPatchFields.H"
 #include "adjustPhi.H"
 #include "fvcMeshPhi.H"
 #include "pimpleControl.H"
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
index 3b045fa22b..89b9e85470 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
@@ -221,47 +221,93 @@ void Foam::MRFZoneList::makeRelative(surfaceScalarField& phi) const
 
 Foam::tmp<Foam::surfaceScalarField> Foam::MRFZoneList::relative
 (
-    const tmp<surfaceScalarField>& phi
+    const tmp<surfaceScalarField>& tphi
 ) const
 {
-    tmp<surfaceScalarField> rphi(phi.ptr());
-    makeRelative(rphi());
-    return rphi;
+    if (size())
+    {
+        tmp<surfaceScalarField> rphi
+        (
+            reuseTmpGeometricField<scalar, scalar, fvsPatchField, surfaceMesh>
+            ::New
+            (
+                tphi,
+                "relative(" + tphi().name() + ')',
+                tphi().dimensions(),
+                true
+            )
+        );
+
+        makeRelative(rphi());
+
+        reuseTmpGeometricField<scalar, scalar, fvsPatchField, surfaceMesh>
+        ::clear(tphi);
+
+        return rphi;
+    }
+    else
+    {
+        return tmp<surfaceScalarField>(tphi, true);
+    }
 }
 
 
 Foam::tmp<Foam::FieldField<Foam::fvsPatchField, Foam::scalar>>
 Foam::MRFZoneList::relative
 (
-    const tmp<FieldField<fvsPatchField, scalar>>& phi
+    const tmp<FieldField<fvsPatchField, scalar>>& tphi
 ) const
 {
-    tmp<FieldField<fvsPatchField, scalar>> rphi(phi.ptr());
-
-    forAll(*this, i)
+    if (size())
     {
-        operator[](i).makeRelative(rphi());
-    }
+        tmp<FieldField<fvsPatchField, scalar>> rphi
+        (
+            reuseTmpFieldField<fvsPatchField, scalar, scalar>::New(tphi, true)
+        );
 
-    return rphi;
+        forAll(*this, i)
+        {
+            operator[](i).makeRelative(rphi());
+        }
+
+        reuseTmpFieldField<fvsPatchField, scalar, scalar>::clear(tphi);
+
+        return rphi;
+    }
+    else
+    {
+        return tmp<FieldField<fvsPatchField, scalar>>(tphi, true);
+    }
 }
 
 
 Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::MRFZoneList::relative
 (
-    const tmp<Field<scalar>>& phi,
+    const tmp<Field<scalar>>& tphi,
     const label patchi
 ) const
 {
-    tmp<Field<scalar>> rphi(phi.ptr());
-
-    forAll(*this, i)
+    if (size())
     {
-        operator[](i).makeRelative(rphi(), patchi);
-    }
+        tmp<Field<scalar>> rphi
+        (
+            reuseTmp<scalar, scalar>::New(tphi, true)
+        );
 
-    return rphi;
+        forAll(*this, i)
+        {
+            operator[](i).makeRelative(rphi(), patchi);
+        }
+
+        reuseTmp<scalar, scalar>::clear(tphi);
+
+        return rphi;
+    }
+    else
+    {
+        return tmp<Field<scalar>>(tphi, true);
+    }
 }
 
 
@@ -298,12 +344,34 @@ void Foam::MRFZoneList::makeAbsolute(surfaceScalarField& phi) const
 
 Foam::tmp<Foam::surfaceScalarField> Foam::MRFZoneList::absolute
 (
-    const tmp<surfaceScalarField>& phi
+    const tmp<surfaceScalarField>& tphi
 ) const
 {
-    tmp<surfaceScalarField> rphi(phi.ptr());
-    makeAbsolute(rphi());
-    return rphi;
+    if (size())
+    {
+        tmp<surfaceScalarField> rphi
+        (
+            reuseTmpGeometricField<scalar, scalar, fvsPatchField, surfaceMesh>
+            ::New
+            (
+                tphi,
+                "absolute(" + tphi().name() + ')',
+                tphi().dimensions(),
+                true
+            )
+        );
+
+        makeAbsolute(rphi());
+
+        reuseTmpGeometricField<scalar, scalar, fvsPatchField, surfaceMesh>
+        ::clear(tphi);
+
+        return rphi;
+    }
+    else
+    {
+        return tmp<surfaceScalarField>(tphi, true);
+    }
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/include/createRDeltaT.H b/src/finiteVolume/cfdTools/general/include/createRDeltaT.H
index 5d24e2f78c..9553e0c365 100644
--- a/src/finiteVolume/cfdTools/general/include/createRDeltaT.H
+++ b/src/finiteVolume/cfdTools/general/include/createRDeltaT.H
@@ -20,7 +20,7 @@ if (LTS)
             ),
             mesh,
             dimensionedScalar("one", dimless/dimTime, 1),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 }
diff --git a/src/finiteVolume/cfdTools/general/include/fvCFD.H b/src/finiteVolume/cfdTools/general/include/fvCFD.H
index bc21a17c42..f539b0a004 100644
--- a/src/finiteVolume/cfdTools/general/include/fvCFD.H
+++ b/src/finiteVolume/cfdTools/general/include/fvCFD.H
@@ -11,7 +11,9 @@
 #include "linear.H"
 #include "uniformDimensionedFields.H"
 #include "calculatedFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 #include "fixedValueFvPatchFields.H"
+#include "zeroGradientFvPatchFields.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 #include "constrainHbyA.H"
 #include "constrainPressure.H"
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
index 1b4018776d..a7b003dd03 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
@@ -48,19 +48,6 @@ Foam::calculatedFvPatchField<Type>::calculatedFvPatchField
 {}
 
 
-template<class Type>
-Foam::calculatedFvPatchField<Type>::calculatedFvPatchField
-(
-    const calculatedFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fvPatchField<Type>(ptf, p, iF, mapper)
-{}
-
-
 template<class Type>
 Foam::calculatedFvPatchField<Type>::calculatedFvPatchField
 (
@@ -74,6 +61,19 @@ Foam::calculatedFvPatchField<Type>::calculatedFvPatchField
 {}
 
 
+template<class Type>
+Foam::calculatedFvPatchField<Type>::calculatedFvPatchField
+(
+    const calculatedFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
 template<class Type>
 Foam::calculatedFvPatchField<Type>::calculatedFvPatchField
 (
@@ -154,7 +154,7 @@ Foam::calculatedFvPatchField<Type>::valueInternalCoeffs
         << " in file " << this->dimensionedInternalField().objectPath()
         << "\n    You are probably trying to solve for a field with a "
            "default boundary condition."
-        << exit(FatalError);
+        << abort(FatalError);
 
     return *this;
 }
@@ -174,7 +174,7 @@ Foam::calculatedFvPatchField<Type>::valueBoundaryCoeffs
         << " in file " << this->dimensionedInternalField().objectPath()
         << "\n    You are probably trying to solve for a field with a "
            "default boundary condition."
-        << exit(FatalError);
+        << abort(FatalError);
 
     return *this;
 }
@@ -191,7 +191,7 @@ Foam::calculatedFvPatchField<Type>::gradientInternalCoeffs() const
         << " in file " << this->dimensionedInternalField().objectPath()
         << "\n    You are probably trying to solve for a field with a "
            "default boundary condition."
-        << exit(FatalError);
+        << abort(FatalError);
 
     return *this;
 }
@@ -208,7 +208,7 @@ Foam::calculatedFvPatchField<Type>::gradientBoundaryCoeffs() const
         << " in file " << this->dimensionedInternalField().objectPath()
         << "\n    You are probably trying to solve for a field with a "
            "default boundary condition."
-        << exit(FatalError);
+        << abort(FatalError);
 
     return *this;
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
new file mode 100644
index 0000000000..3d15434880
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "extrapolatedCalculatedFvPatchField.H"
+#include "fvPatchFieldMapper.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::extrapolatedCalculatedFvPatchField<Type>::
+extrapolatedCalculatedFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    calculatedFvPatchField<Type>(p, iF)
+{}
+
+
+template<class Type>
+Foam::extrapolatedCalculatedFvPatchField<Type>::
+extrapolatedCalculatedFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict,
+    const bool valueRequired
+)
+:
+    calculatedFvPatchField<Type>(p, iF, dict, valueRequired)
+{}
+
+
+template<class Type>
+Foam::extrapolatedCalculatedFvPatchField<Type>::
+extrapolatedCalculatedFvPatchField
+(
+    const extrapolatedCalculatedFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    calculatedFvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+Foam::extrapolatedCalculatedFvPatchField<Type>::
+extrapolatedCalculatedFvPatchField
+(
+    const extrapolatedCalculatedFvPatchField<Type>& ptf
+)
+:
+    calculatedFvPatchField<Type>(ptf)
+{}
+
+
+template<class Type>
+Foam::extrapolatedCalculatedFvPatchField<Type>::
+extrapolatedCalculatedFvPatchField
+(
+    const extrapolatedCalculatedFvPatchField<Type>& ptf,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    calculatedFvPatchField<Type>(ptf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::extrapolatedCalculatedFvPatchField<Type>::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    if (!this->updated())
+    {
+        this->updateCoeffs();
+    }
+
+    calculatedFvPatchField<Type>::operator==(this->patchInternalField());
+    calculatedFvPatchField<Type>::evaluate();
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
new file mode 100644
index 0000000000..0003baac0e
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
@@ -0,0 +1,165 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::extrapolatedCalculatedFvPatchField
+
+Group
+    grpGenericBoundaryConditions
+
+Description
+    This boundary condition applies a zero-gradient condition from the patch
+    internal field onto the patch faces when \c evaluated but may also be
+    assigned.  \c snGrad returns the patch gradient evaluated from the current
+    internal and patch field values rather than returning zero.
+
+    \heading Patch usage
+
+    Example of the boundary condition specification:
+    \verbatim
+    myPatch
+    {
+        type            extrapolatedCalculated;
+    }
+    \endverbatim
+
+SourceFiles
+    extrapolatedCalculatedFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef extrapolatedCalculatedFvPatchField_H
+#define extrapolatedCalculatedFvPatchField_H
+
+#include "calculatedFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class extrapolatedCalculatedFvPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class extrapolatedCalculatedFvPatchField
+:
+    public calculatedFvPatchField<Type>
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("extrapolatedCalculated");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        extrapolatedCalculatedFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        extrapolatedCalculatedFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const dictionary&,
+            const bool valueRequired=false
+        );
+
+        //- Construct by mapping given patchField<Type> onto a new patch
+        extrapolatedCalculatedFvPatchField
+        (
+            const extrapolatedCalculatedFvPatchField<Type>&,
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        extrapolatedCalculatedFvPatchField
+        (
+            const extrapolatedCalculatedFvPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<Type>> clone() const
+        {
+            return tmp<fvPatchField<Type>>
+            (
+                new extrapolatedCalculatedFvPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        extrapolatedCalculatedFvPatchField
+        (
+            const extrapolatedCalculatedFvPatchField<Type>&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<Type>> clone
+        (
+            const DimensionedField<Type, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<Type>>
+            (
+                new extrapolatedCalculatedFvPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Evaluate the patch field
+            virtual void evaluate
+            (
+                const Pstream::commsTypes commsType=Pstream::blocking
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "extrapolatedCalculatedFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.C
new file mode 100644
index 0000000000..e09d457b8f
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.C
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "extrapolatedCalculatedFvPatchFields.H"
+#include "fvPatchFields.H"
+#include "volMesh.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePatchFields(extrapolatedCalculated);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.H
new file mode 100644
index 0000000000..ec38e37749
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef extrapolatedCalculatedFvPatchFields_H
+#define extrapolatedCalculatedFvPatchFields_H
+
+#include "extrapolatedCalculatedFvPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeFieldTypedefs(extrapolatedCalculated);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFieldsFwd.H
new file mode 100644
index 0000000000..6f1a89d2f1
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFieldsFwd.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef extrapolatedCalculatedFvPatchFieldsFwd_H
+#define extrapolatedCalculatedFvPatchFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class extrapolatedCalculatedFvPatchField;
+
+makePatchTypeFieldTypedefs(extrapolatedCalculated);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index ffed3dd1fd..05f2391b6f 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -65,6 +65,9 @@ class volMesh;
 template<class Type>
 class fvPatchField;
 
+template<class Type>
+class calculatedFvPatchField;
+
 template<class Type>
 class fvMatrix;
 
@@ -106,6 +109,7 @@ class fvPatchField
 public:
 
     typedef fvPatch Patch;
+    typedef calculatedFvPatchField<Type> Calculated;
 
 
     //- Runtime type information
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 0a41d83c1b..96240cd17d 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -65,6 +65,9 @@ class surfaceMesh;
 template<class Type>
 class fvsPatchField;
 
+template<class Type>
+class calculatedFvsPatchField;
+
 template<class Type>
 Ostream& operator<<(Ostream&, const fvsPatchField<Type>&);
 
@@ -90,6 +93,7 @@ class fvsPatchField
 public:
 
     typedef fvPatch Patch;
+    typedef calculatedFvsPatchField<Type> Calculated;
 
 
     //- Runtime type information
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index 89a997ba17..f45c34dfce 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -57,7 +57,7 @@ tmp<volScalarField> CoEulerDdtScheme<Type>::CorDeltaT() const
             ),
             mesh(),
             dimensionedScalar("CorDeltaT", cofrDeltaT.dimensions(), 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index a48cd0004e..ea87426041 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -107,7 +107,7 @@ tmp<volScalarField> SLTSDdtScheme<Type>::SLrDeltaT() const
             ),
             mesh(),
             dimensionedScalar("rDeltaT", dimless/dimTime, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
index 55a0c92e95..3ec972fc2a 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
@@ -27,7 +27,7 @@ License
 #include "fvMesh.H"
 #include "volFields.H"
 #include "surfaceFields.H"
-#include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,7 +66,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
             ),
             mesh,
             dimensioned<Type>("0", ssf.dimensions(), pTraits<Type>::zero),
-            zeroGradientFvPatchField<Type>::typeName
+            extrapolatedCalculatedFvPatchField<Type>::typeName
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
index 9efe428b49..9b2f375b08 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
@@ -28,7 +28,7 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "fvcSurfaceIntegrate.H"
-#include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -74,7 +74,7 @@ reconstruct
                 IOobject::NO_WRITE
             ),
             inv(surfaceSum(SfHat*mesh.Sf()))&surfaceSum(SfHat*ssf),
-            zeroGradientFvPatchField<GradType>::typeName
+            extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
index 63c03590ca..2b8c34a41b 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ License
 #include "fvMesh.H"
 #include "volFields.H"
 #include "surfaceFields.H"
-#include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -72,7 +72,7 @@ tmp<volScalarField> reconstructMag(const surfaceScalarField& ssf)
                 ssf.dimensions()/dimArea,
                 scalar(0)
             ),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
index 0c9e6c0b73..6c97f1afd2 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
@@ -25,7 +25,7 @@ License
 
 #include "fvcReconstruct.H"
 #include "fvMesh.H"
-#include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -81,7 +81,7 @@ reconstruct
                 ssf.dimensions()/dimArea,
                 pTraits<GradType>::zero
             ),
-            zeroGradientFvPatchField<GradType>::typeName
+            extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
index b2c638fe2a..ccf92f56c0 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
@@ -25,7 +25,7 @@ License
 
 #include "fvcSurfaceIntegrate.H"
 #include "fvMesh.H"
-#include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -104,7 +104,7 @@ surfaceIntegrate
                 ssf.dimensions()/dimVol,
                 pTraits<Type>::zero
             ),
-            zeroGradientFvPatchField<Type>::typeName
+            extrapolatedCalculatedFvPatchField<Type>::typeName
         )
     );
     GeometricField<Type, fvPatchField, volMesh>& vf = tvf();
@@ -155,7 +155,7 @@ surfaceSum
             ),
             mesh,
             dimensioned<Type>("0", ssf.dimensions(), pTraits<Type>::zero),
-            zeroGradientFvPatchField<Type>::typeName
+            extrapolatedCalculatedFvPatchField<Type>::typeName
         )
     );
     GeometricField<Type, fvPatchField, volMesh>& vf = tvf();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
index dc04fd0f34..26b582f77b 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
@@ -28,7 +28,7 @@ License
 #include "gaussGrad.H"
 #include "fvMesh.H"
 #include "volMesh.H"
-#include "zeroGradientFvPatchField.H"
+#include "extrapolatedCalculatedFvPatchField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,7 +77,7 @@ Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
                 vtf.dimensions()/dimLength,
                 pTraits<GradType>::zero
             ),
-            zeroGradientFvPatchField<GradType>::typeName
+            extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
     );
     GeometricField<GradType, fvPatchField, volMesh>& lsGrad = tlsGrad();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
index 73fed99ca5..a70e53f5a1 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "gaussGrad.H"
-#include "zeroGradientFvPatchField.H"
+#include "extrapolatedCalculatedFvPatchField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -67,7 +67,7 @@ Foam::fv::gaussGrad<Type>::gradf
                 ssf.dimensions()/dimLength,
                 pTraits<GradType>::zero
             ),
-            zeroGradientFvPatchField<GradType>::typeName
+            extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
     );
     GeometricField<GradType, fvPatchField, volMesh>& gGrad = tgGrad();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
index 954ea3f85e..fa80a08567 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
@@ -30,7 +30,7 @@ License
 #include "volMesh.H"
 #include "surfaceMesh.H"
 #include "GeometricField.H"
-#include "zeroGradientFvPatchField.H"
+#include "extrapolatedCalculatedFvPatchField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -73,7 +73,7 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
                 vsf.dimensions()/dimLength,
                 pTraits<GradType>::zero
             ),
-            zeroGradientFvPatchField<GradType>::typeName
+            extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
     );
     GeometricField<GradType, fvPatchField, volMesh>& lsGrad = tlsGrad();
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 91dd8e2347..7fb437976b 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -26,7 +26,7 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "calculatedFvPatchFields.H"
-#include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 #include "coupledFvPatchFields.H"
 #include "UIndirectList.H"
 
@@ -739,7 +739,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::A() const
             ),
             psi_.mesh(),
             dimensions_/psi_.dimensions()/dimVol,
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
@@ -768,7 +768,7 @@ Foam::fvMatrix<Type>::H() const
             ),
             psi_.mesh(),
             dimensions_/dimVol,
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
     GeometricField<Type, fvPatchField, volMesh>& Hphi = tHphi();
@@ -830,7 +830,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::H1() const
             ),
             psi_.mesh(),
             dimensions_/(dimVol*psi_.dimensions()),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
     volScalarField& H1_ = tH1();
@@ -2274,7 +2274,7 @@ Foam::operator&
             ),
             psi.mesh(),
             M.dimensions()/dimVol,
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
     GeometricField<Type, fvPatchField, volMesh>& Mphi = tMphi();
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
index 8dc91d4d17..7effdd1ef5 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fvScalarMatrix.H"
-#include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -224,7 +224,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Foam::scalar>::H() const
             ),
             psi_.mesh(),
             dimensions_/dimVol,
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
     volScalarField& Hphi = tHphi();
@@ -256,7 +256,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Foam::scalar>::H1() const
             ),
             psi_.mesh(),
             dimensions_/(dimVol*psi_.dimensions()),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
     volScalarField& H1_ = tH1();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
index 7bfc88dce6..fbeb1eef1a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@@ -73,7 +73,7 @@ SourceFiles
 #include "surfaceInterpolationScheme.H"
 #include "blendedSchemeBase.H"
 #include "surfaceInterpolate.H"
-#include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 #include "fvcSurfaceIntegrate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -230,7 +230,7 @@ public:
                 ),
                 mesh,
                 dimensionedScalar("Co", dimless, 0),
-                zeroGradientFvPatchScalarField::typeName
+                extrapolatedCalculatedFvPatchScalarField::typeName
             );
 
             scalarField sumPhi
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
index cecbcff033..49a70b7001 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
@@ -44,6 +44,7 @@ SourceFiles
 #include "skewCorrectionVectors.H"
 #include "linear.H"
 #include "gaussGrad.H"
+#include "zeroGradientFvPatchField.H"
 #include "mixedFvPatchField.H"
 #include "directionMixedFvPatchField.H"
 
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index f7ce048afa..5ed89df046 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,6 +28,7 @@ License
 #include "basicThermo.H"
 #include "uniformDimensionedFields.H"
 #include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 #include "geometricOneField.H"
 
@@ -103,7 +104,7 @@ Foam::fv::solidificationMeltingSource::Cp() const
                             dimEnergy/dimMass/dimTemperature,
                             CpRef
                         ),
-                        zeroGradientFvPatchScalarField::typeName
+                        extrapolatedCalculatedFvPatchScalarField::typeName
                     )
                 );
             }
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 298eb67787..374aa5eac6 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -702,7 +702,7 @@ Foam::genericFvPatchField<Type>::valueInternalCoeffs
         << " in file " << this->dimensionedInternalField().objectPath()
         << "\n    You are probably trying to solve for a field with a "
            "generic boundary condition."
-        << exit(FatalError);
+        << abort(FatalError);
 
     return *this;
 }
@@ -723,7 +723,7 @@ Foam::genericFvPatchField<Type>::valueBoundaryCoeffs
         << " in file " << this->dimensionedInternalField().objectPath()
         << "\n    You are probably trying to solve for a field with a "
            "generic boundary condition."
-        << exit(FatalError);
+        << abort(FatalError);
 
     return *this;
 }
@@ -741,7 +741,7 @@ Foam::genericFvPatchField<Type>::gradientInternalCoeffs() const
         << " in file " << this->dimensionedInternalField().objectPath()
         << "\n    You are probably trying to solve for a field with a "
            "generic boundary condition."
-        << exit(FatalError);
+        << abort(FatalError);
 
     return *this;
 }
@@ -758,7 +758,7 @@ Foam::genericFvPatchField<Type>::gradientBoundaryCoeffs() const
         << " in file " << this->dimensionedInternalField().objectPath()
         << "\n    You are probably trying to solve for a field with a "
            "generic boundary condition."
-        << exit(FatalError);
+        << abort(FatalError);
 
     return *this;
 }
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index ced4c77f1f..3ed9040875 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -470,7 +470,7 @@ Foam::KinematicCloud<CloudType>::vDotSweep() const
             ),
             mesh_,
             dimensionedScalar("zero", dimless/dimTime, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
@@ -509,7 +509,7 @@ Foam::KinematicCloud<CloudType>::theta() const
             ),
             mesh_,
             dimensionedScalar("zero", dimless, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
index c01ae46a01..97bbb7b9b5 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "Basic.H"
+#include "zeroGradientFvPatchField.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
index ab2b457991..73a72f5540 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
@@ -30,6 +30,7 @@ License
 #include "fvmLaplacian.H"
 #include "fvcReconstruct.H"
 #include "volPointInterpolation.H"
+#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -43,8 +44,17 @@ Foam::PackingModels::Implicit<CloudType>::Implicit
     PackingModel<CloudType>(dict, owner, typeName),
     alpha_
     (
-        this->owner().name() + ":alpha",
-        this->owner().theta()
+        IOobject
+        (
+            this->owner().name() + ":alpha",
+            this->owner().db().time().timeName(),
+            this->owner().mesh(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        this->owner().mesh(),
+        dimensionedScalar("zero", dimless, 0.0),
+        zeroGradientFvPatchScalarField::typeName
     ),
     phiCorrect_(NULL),
     uCorrect_(NULL),
@@ -53,6 +63,7 @@ Foam::PackingModels::Implicit<CloudType>::Implicit
     alphaMin_(readScalar(this->coeffDict().lookup("alphaMin"))),
     rhoMin_(readScalar(this->coeffDict().lookup("rhoMin")))
 {
+    alpha_ = this->owner().theta();
     alpha_.oldTime();
 }
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 868e7cce3f..b84da4a752 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -54,7 +54,6 @@ License
 #include "Random.H"
 #include "searchableSurfaces.H"
 #include "treeBoundBox.H"
-#include "zeroGradientFvPatchFields.H"
 #include "fvMeshTools.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -2789,8 +2788,7 @@ void Foam::meshRefinement::dumpRefinementLevel() const
                 false
             ),
             mesh_,
-            dimensionedScalar("zero", dimless, 0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("zero", dimless, 0)
         );
 
         const labelList& cellLevel = meshCutter_.cellLevel();
diff --git a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
index 89506ebc96..ec56dcc94b 100644
--- a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
+++ b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,7 @@ License
 #include "CourantNo.H"
 #include "surfaceFields.H"
 #include "fvcSurfaceIntegrate.H"
+#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C
index a9b3121f4b..a2275cf5f0 100644
--- a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C
@@ -26,6 +26,7 @@ License
 #include "gaussConvectionScheme.H"
 #include "blendedSchemeBase.H"
 #include "fvcCellReduce.H"
+#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
index ae118fa10a..501f4aa64c 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
@@ -25,7 +25,6 @@ License
 
 #include "reactingOneDim.H"
 #include "addToRunTimeSelectionTable.H"
-#include "zeroGradientFvPatchFields.H"
 #include "surfaceInterpolate.H"
 #include "fvm.H"
 #include "fvcDiv.H"
@@ -464,8 +463,6 @@ reactingOneDim::reactingOneDim
             IOobject::AUTO_WRITE
         ),
         regionMesh()
-        //dimensionedScalar("zero", dimEnergy/dimArea/dimTime, 0.0),
-        //zeroGradientFvPatchVectorField::typeName
     ),
 
     lostSolidMass_(dimensionedScalar("zero", dimMass, 0.0)),
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
index 39c95ba8cd..3c0bd597f2 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -223,8 +223,7 @@ inline tmp<volScalarField> kinematicSingleLayer::gNorm() const
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            g_ & nHat(),
-            zeroGradientFvPatchScalarField::typeName
+            g_ & nHat()
         )
     );
 
@@ -246,8 +245,7 @@ inline tmp<volScalarField> kinematicSingleLayer::gNormClipped() const
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            g_ & nHat(),
-            zeroGradientFvPatchScalarField::typeName
+            g_ & nHat()
         )
     );
 
@@ -272,8 +270,7 @@ inline tmp<volVectorField> kinematicSingleLayer::gTan() const
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            g_ - nHat()*gNorm(),
-            zeroGradientFvPatchVectorField::typeName
+            g_ - nHat()*gNorm()
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
index 6e964ac37d..cc53371852 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "constantFilmThermo.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -270,7 +271,7 @@ tmp<volScalarField> constantFilmThermo::rho() const
             ),
             owner().regionMesh(),
             dimensionedScalar("0", dimDensity, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
@@ -297,7 +298,7 @@ tmp<volScalarField> constantFilmThermo::mu() const
             ),
             owner().regionMesh(),
             dimensionedScalar("0", dimPressure*dimTime, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
@@ -324,7 +325,7 @@ tmp<volScalarField> constantFilmThermo::sigma() const
             ),
             owner().regionMesh(),
             dimensionedScalar("0", dimMass/sqr(dimTime), 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
@@ -351,7 +352,7 @@ tmp<volScalarField> constantFilmThermo::Cp() const
             ),
             owner().regionMesh(),
             dimensionedScalar("0", dimEnergy/dimMass/dimTemperature, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
@@ -378,7 +379,7 @@ tmp<volScalarField> constantFilmThermo::kappa() const
             ),
             owner().regionMesh(),
             dimensionedScalar("0", dimPower/dimLength/dimTemperature, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
index c846a98d58..59b5713617 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 #include "demandDrivenData.H"
 #include "thermoSingleLayer.H"
 #include "SLGThermo.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -250,7 +251,7 @@ tmp<volScalarField> liquidFilmThermo::rho() const
             ),
             owner().regionMesh(),
             dimensionedScalar("0", dimDensity, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
@@ -298,7 +299,7 @@ tmp<volScalarField> liquidFilmThermo::mu() const
             ),
             owner().regionMesh(),
             dimensionedScalar("0", dimPressure*dimTime, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
@@ -346,7 +347,7 @@ tmp<volScalarField> liquidFilmThermo::sigma() const
             ),
             owner().regionMesh(),
             dimensionedScalar("0", dimMass/sqr(dimTime), 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
@@ -394,7 +395,7 @@ tmp<volScalarField> liquidFilmThermo::Cp() const
             ),
             owner().regionMesh(),
             dimensionedScalar("0", dimEnergy/dimMass/dimTemperature, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
@@ -442,7 +443,7 @@ tmp<volScalarField> liquidFilmThermo::kappa() const
             ),
             owner().regionMesh(),
             dimensionedScalar("0", dimPower/dimLength/dimTemperature, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
index 6b015cd800..df7ccf0845 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 #include "volFields.H"
 #include "fvmSup.H"
 #include "kinematicSingleLayer.H"
-#include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -84,7 +84,7 @@ tmp<volVectorField> laminar::Us() const
             ),
             owner_.regionMesh(),
             dimensionedVector("zero", dimVelocity, vector::zero),
-            zeroGradientFvPatchVectorField::typeName
+            extrapolatedCalculatedFvPatchVectorField::typeName
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
index 5d82ba0853..4f5c60f145 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "constantRadiation.H"
 #include "volFields.H"
-#include "zeroGradientFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -117,8 +116,7 @@ tmp<volScalarField> constantRadiation::Shs()
                 IOobject::NO_WRITE
             ),
             owner().regionMesh(),
-            dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0)
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
index ce200ee3c5..e46dd872e4 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,6 @@ License
 #include "noRadiation.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
-#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -89,8 +88,7 @@ tmp<volScalarField> noRadiation::Shs()
                 IOobject::NO_WRITE
             ),
             owner().regionMesh(),
-            dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0)
         )
     );
 }
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
index 21b982073c..b653ee4638 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "primaryRadiation.H"
 #include "volFields.H"
-#include "zeroGradientFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -104,8 +103,7 @@ tmp<volScalarField> primaryRadiation::Shs()
                 IOobject::NO_WRITE
             ),
             owner().regionMesh(),
-            dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0)
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
index 14c2a3bfd8..3505f9c8a0 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,8 +120,7 @@ tmp<volScalarField> standardRadiation::Shs()
                 IOobject::NO_WRITE
             ),
             owner().regionMesh(),
-            dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0)
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
index 924aee7087..78769a9bdc 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,6 @@ License
 #include "constantHeatTransfer.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
-#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -96,8 +95,7 @@ tmp<volScalarField> constantHeatTransfer::h() const
                 "c0",
                 dimEnergy/dimTime/sqr(dimLength)/dimTemperature,
                 c0_
-            ),
-            zeroGradientFvPatchScalarField::typeName
+            )
         )
     );
 }
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
index edcef99677..223254c38e 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,8 +73,7 @@ inline tmp<volScalarField> thermoSingleLayer::hs
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            Cp_*(T - (dimensionedScalar("Tstd", dimTemperature, 298.15))),
-            zeroGradientFvPatchScalarField::typeName
+            Cp_*(T - (dimensionedScalar("Tstd", dimTemperature, 298.15)))
         )
     );
 }
@@ -97,8 +96,7 @@ inline tmp<volScalarField> thermoSingleLayer::T
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            hs/Cp_ + dimensionedScalar("Tstd", dimTemperature, 298.15),
-            zeroGradientFvPatchScalarField::typeName
+            hs/Cp_ + dimensionedScalar("Tstd", dimTemperature, 298.15)
         )
     );
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index 92f1db6b87..ee7a8974d6 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -26,6 +26,7 @@ License
 #include "chemistryModel.H"
 #include "reactingMixture.H"
 #include "UniformField.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -495,7 +496,7 @@ Foam::chemistryModel<CompType, ThermoType>::tc() const
             ),
             this->mesh(),
             dimensionedScalar("zero", dimTime, SMALL),
-            zeroGradientFvPatchScalarField::typeName
+            extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
 
@@ -563,12 +564,10 @@ Foam::chemistryModel<CompType, ThermoType>::Sh() const
                 false
             ),
             this->mesh_,
-            dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0)
         )
     );
 
-
     if (this->chemistry_)
     {
         scalarField& Sh = tSh();
@@ -605,8 +604,7 @@ Foam::chemistryModel<CompType, ThermoType>::dQ() const
                 false
             ),
             this->mesh_,
-            dimensionedScalar("dQ", dimEnergy/dimTime, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
         )
     );
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index ef0ab32012..208425212f 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -26,7 +26,7 @@ License
 #include "greyMeanAbsorptionEmission.H"
 #include "addToRunTimeSelectionTable.H"
 #include "unitConversion.H"
-#include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 #include "basicSpecieMixture.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -209,7 +209,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
             ),
             mesh(),
             dimensionedScalar("a", dimless/dimLength, 0.0),
-            zeroGradientFvPatchVectorField::typeName
+            extrapolatedCalculatedFvPatchVectorField::typeName
         )
     );
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
index 2ab1931029..d3da12eb59 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@@ -26,7 +26,7 @@ License
 #include "greyMeanSolidAbsorptionEmission.H"
 #include "addToRunTimeSelectionTable.H"
 #include "unitConversion.H"
-#include "zeroGradientFvPatchFields.H"
+#include "extrapolatedCalculatedFvPatchFields.H"
 
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -158,7 +158,7 @@ calc(const label propertyId) const
             ),
             mesh(),
             dimensionedScalar("a", dimless/dimLength, 0.0),
-            zeroGradientFvPatchVectorField::typeName
+            extrapolatedCalculatedFvPatchVectorField::typeName
         )
     );
 
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index 1973259531..efa78b4e14 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -619,7 +619,6 @@ Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::gasHs
     const label index
 ) const
 {
-
     tmp<volScalarField> tHs
     (
         new volScalarField
@@ -634,8 +633,7 @@ Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::gasHs
                 false
             ),
             this->mesh_,
-            dimensionedScalar("zero", dimEnergy/dimMass, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("zero", dimEnergy/dimMass, 0.0)
         )
     );
 
@@ -664,4 +662,6 @@ void Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::solve
 {
     NotImplemented;
 }
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
index e39f1f6352..07cc0c3ae3 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "solidChemistryModel.H"
 #include "reactingMixture.H"
-#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -131,8 +130,7 @@ Foam::solidChemistryModel<CompType, SolidThermo>::Sh() const
                 false
             ),
             this->mesh_,
-            dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0)
         )
     );
 
@@ -172,8 +170,7 @@ Foam::solidChemistryModel<CompType, SolidThermo>::dQ() const
                 false
             ),
             this->mesh_,
-            dimensionedScalar("dQ", dimEnergy/dimTime, 0.0),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
         )
     );
 
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index 1a834edad8..7946ae338f 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -620,10 +620,10 @@ Foam::triSurface::triSurface
     List<labelledTri>& triangles,
     const geometricSurfacePatchList& patches,
     pointField& points,
-    const bool reUse
+    const bool reuse
 )
 :
-    ParentType(triangles, points, reUse),
+    ParentType(triangles, points, reuse),
     patches_(patches),
     sortedEdgeFacesPtr_(NULL),
     edgeOwnerPtr_(NULL)
diff --git a/src/triSurface/triSurface/triSurface.H b/src/triSurface/triSurface/triSurface.H
index 89d5461d21..1d8629f360 100644
--- a/src/triSurface/triSurface/triSurface.H
+++ b/src/triSurface/triSurface/triSurface.H
@@ -259,7 +259,7 @@ public:
             List<labelledTri>&,
             const geometricSurfacePatchList&,
             pointField&,
-            const bool reUse
+            const bool reuse
         );
 
         //- Construct from triangles, patches, points.

From 96b0f62d04b716d010fe6a47e0141edbbba96d89 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 21 Feb 2016 09:03:39 +0000
Subject: [PATCH 215/447] surfaceCoarsen: Changed List<::... to List< ::... for
 gcc-4.5

---
 .../utilities/surface/surfaceCoarsen/surfaceCoarsen.C       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
index 1ab971475e..349b483882 100644
--- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
+++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
@@ -95,8 +95,8 @@ int main(int argc, char *argv[])
     Info<< endl;
 
 
-    ::List<::Vector> vert;     // global list of vertices
-    ::List<::tridata> tri;     // global list of triangles
+    ::List< ::Vector> vert;     // global list of vertices
+    ::List< ::tridata> tri;     // global list of triangles
 
 
     // Convert triSurface to progmesh format. Note: can use global point
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
     ::ProgressiveMesh(vert,tri,collapse_map,permutation);
 
     // rearrange the vertex list
-    ::List<::Vector> temp_list;
+    ::List< ::Vector> temp_list;
     for (int i=0;i<vert.num;i++)
     {
         temp_list.Add(vert[i]);

From 15b7e87da76e1e9042147695042383210e28d784 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 22 Feb 2016 16:23:21 +0000
Subject: [PATCH 216/447] tmp: Updated to store and preserve the const-ness of
 the reference to a constant object

This change requires that the de-reference operator '()' returns a
const-reference to the object stored irrespective of the const-ness of
object stored and the new member function 'ref()' is provided to return
an non-const reference to stored object which throws a fatal error if the
stored object is const.

In order to smooth the transition to this new safer 'tmp' the now
deprecated and unsafe non-const de-reference operator '()' is still
provided by default but may be switched-off with the compilation switch
'CONST_TMP'.

The main OpenFOAM library has already been upgraded and '-DCONST_TMP'
option specified in the 'options' file to switch to the new 'tmp'
behavior.  The rest of OpenFOAM-dev will be upgraded over the following
few weeks.

Henry G. Weller
CFD Direct
---
 .../BlendedInterfacialModel.C                 |   4 +-
 src/OpenFOAM/Make/options                     |   2 +-
 src/OpenFOAM/fields/Fields/Field/Field.C      |   2 +-
 .../fields/Fields/Field/FieldFunctions.C      |  52 ++---
 .../fields/Fields/Field/FieldFunctionsM.C     |  40 ++--
 .../fields/Fields/Field/FieldReuseFunctions.H |   2 +-
 .../fields/Fields/scalarField/scalarField.C   |   8 +-
 .../Fields/symmTensorField/symmTensorField.C  |   4 +-
 .../symmTransformField/symmTransformField.C   |  12 +-
 .../fields/Fields/tensorField/tensorField.C   |   6 +-
 .../Fields/transformField/transformField.C    |  10 +-
 .../transformField/transformFieldTemplates.C  |  12 +-
 .../LduMatrix/LduMatrix/LduMatrixATmul.C      |   2 +-
 .../processorLduInterfaceTemplates.C          |   4 +-
 .../lduMatrix/lduMatrix/lduMatrixATmul.C      |   6 +-
 .../pairGAMGAgglomerate.C                     |   4 +-
 .../procFacesGAMGProcAgglomeration.C          |   2 +-
 .../interfaces/GAMGInterface/GAMGInterface.C  |   4 +-
 .../GAMGInterface/GAMGInterfaceTemplates.C    |   2 +-
 .../cyclicGAMGInterface/cyclicGAMGInterface.C |   2 +-
 src/OpenFOAM/memory/tmp/tmp.H                 |  32 ++-
 src/OpenFOAM/memory/tmp/tmpI.H                | 193 +++++++++++++-----
 src/OpenFOAM/meshes/boundBox/boundBox.C       |   4 +-
 src/OpenFOAM/meshes/meshShapes/face/face.C    |   4 +-
 .../polyMesh/polyMeshCheck/polyMeshCheck.C    |  10 +-
 .../polyMesh/polyMeshCheck/polyMeshTools.C    |  10 +-
 .../polyPatches/polyPatch/polyPatch.C         |   4 +-
 .../meshes/primitiveMesh/primitiveMesh.C      |   4 +-
 .../primitiveMeshCheck/primitiveMeshTools.C   |  10 +-
 .../meshes/treeBoundBox/treeBoundBox.C        |   5 +-
 .../functions/Function1/Function1/Function1.C |   4 +-
 .../functions/Function1/Table/TableBase.C     |   4 +-
 .../DispersionRASModel/DispersionRASModel.C   |   6 +-
 .../BrownianMotion/BrownianMotionForce.C      |   4 +-
 34 files changed, 291 insertions(+), 183 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
index 64d2e63ae8..3cb567273f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -36,13 +36,13 @@ void Foam::BlendedInterfacialModel<ModelType>::correctFixedFluxBCs
     GeometricField& field
 ) const
 {
-    forAll(phase1_.phi()->boundaryField(), patchI)
+    forAll(phase1_.phi()().boundaryField(), patchI)
     {
         if
         (
             isA<fixedValueFvsPatchScalarField>
             (
-                phase1_.phi()->boundaryField()[patchI]
+                phase1_.phi()().boundaryField()[patchI]
             )
         )
         {
diff --git a/src/OpenFOAM/Make/options b/src/OpenFOAM/Make/options
index b1cc1a2d10..9543b9ae27 100644
--- a/src/OpenFOAM/Make/options
+++ b/src/OpenFOAM/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -I$(OBJECTS_DIR)
+EXE_INC = -DCONST_TMP -I$(OBJECTS_DIR)
 
 LIB_LIBS = \
     $(FOAM_LIBBIN)/libOSspecific.o \
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index e3f17b61a1..9f8f3da081 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -564,7 +564,7 @@ Foam::Field<Type>::component
 ) const
 {
     tmp<Field<cmptType>> Component(new Field<cmptType>(this->size()));
-    ::Foam::component(Component(), *this, d);
+    ::Foam::component(Component.ref(), *this, d);
     return Component;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index c581ba2362..f927266195 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -87,7 +87,7 @@ pow
     (
         new Field<powProductType>(f.size())
     );
-    pow<Type, r>(tRes(), f);
+    pow<Type, r>(tRes.ref(), f);
     return tRes;
 }
 
@@ -101,7 +101,7 @@ pow
 {
     typedef typename powProduct<Type, r>::type powProductType;
     tmp<Field<powProductType>> tRes = reuseTmp<powProductType, Type>::New(tf);
-    pow<Type, r>(tRes(), tf());
+    pow<Type, r>(tRes.ref(), tf());
     reuseTmp<powProductType, Type>::clear(tf);
     return tRes;
 }
@@ -127,7 +127,7 @@ sqr(const UList<Type>& f)
     (
         new Field<outerProductType>(f.size())
     );
-    sqr(tRes(), f);
+    sqr(tRes.ref(), f);
     return tRes;
 }
 
@@ -138,7 +138,7 @@ sqr(const tmp<Field<Type>>& tf)
     typedef typename outerProduct<Type, Type>::type outerProductType;
     tmp<Field<outerProductType>> tRes =
         reuseTmp<outerProductType, Type>::New(tf);
-    sqr(tRes(), tf());
+    sqr(tRes.ref(), tf());
     reuseTmp<outerProductType, Type>::clear(tf);
     return tRes;
 }
@@ -154,7 +154,7 @@ template<class Type>
 tmp<Field<scalar>> magSqr(const UList<Type>& f)
 {
     tmp<Field<scalar>> tRes(new Field<scalar>(f.size()));
-    magSqr(tRes(), f);
+    magSqr(tRes.ref(), f);
     return tRes;
 }
 
@@ -162,7 +162,7 @@ template<class Type>
 tmp<Field<scalar>> magSqr(const tmp<Field<Type>>& tf)
 {
     tmp<Field<scalar>> tRes = reuseTmp<scalar, Type>::New(tf);
-    magSqr(tRes(), tf());
+    magSqr(tRes.ref(), tf());
     reuseTmp<scalar, Type>::clear(tf);
     return tRes;
 }
@@ -178,7 +178,7 @@ template<class Type>
 tmp<Field<scalar>> mag(const UList<Type>& f)
 {
     tmp<Field<scalar>> tRes(new Field<scalar>(f.size()));
-    mag(tRes(), f);
+    mag(tRes.ref(), f);
     return tRes;
 }
 
@@ -186,7 +186,7 @@ template<class Type>
 tmp<Field<scalar>> mag(const tmp<Field<Type>>& tf)
 {
     tmp<Field<scalar>> tRes = reuseTmp<scalar, Type>::New(tf);
-    mag(tRes(), tf());
+    mag(tRes.ref(), tf());
     reuseTmp<scalar, Type>::clear(tf);
     return tRes;
 }
@@ -204,7 +204,7 @@ tmp<Field<typename Field<Type>::cmptType>> cmptMax(const UList<Type>& f)
 {
     typedef typename Field<Type>::cmptType cmptType;
     tmp<Field<cmptType>> tRes(new Field<cmptType>(f.size()));
-    cmptMax(tRes(), f);
+    cmptMax(tRes.ref(), f);
     return tRes;
 }
 
@@ -213,7 +213,7 @@ tmp<Field<typename Field<Type>::cmptType>> cmptMax(const tmp<Field<Type>>& tf)
 {
     typedef typename Field<Type>::cmptType cmptType;
     tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
-    cmptMax(tRes(), tf());
+    cmptMax(tRes.ref(), tf());
     reuseTmp<cmptType, Type>::clear(tf);
     return tRes;
 }
@@ -231,7 +231,7 @@ tmp<Field<typename Field<Type>::cmptType>> cmptMin(const UList<Type>& f)
 {
     typedef typename Field<Type>::cmptType cmptType;
     tmp<Field<cmptType>> tRes(new Field<cmptType>(f.size()));
-    cmptMin(tRes(), f);
+    cmptMin(tRes.ref(), f);
     return tRes;
 }
 
@@ -240,7 +240,7 @@ tmp<Field<typename Field<Type>::cmptType>> cmptMin(const tmp<Field<Type>>& tf)
 {
     typedef typename Field<Type>::cmptType cmptType;
     tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
-    cmptMin(tRes(), tf());
+    cmptMin(tRes.ref(), tf());
     reuseTmp<cmptType, Type>::clear(tf);
     return tRes;
 }
@@ -258,7 +258,7 @@ tmp<Field<typename Field<Type>::cmptType>> cmptAv(const UList<Type>& f)
 {
     typedef typename Field<Type>::cmptType cmptType;
     tmp<Field<cmptType>> tRes(new Field<cmptType>(f.size()));
-    cmptAv(tRes(), f);
+    cmptAv(tRes.ref(), f);
     return tRes;
 }
 
@@ -267,7 +267,7 @@ tmp<Field<typename Field<Type>::cmptType>> cmptAv(const tmp<Field<Type>>& tf)
 {
     typedef typename Field<Type>::cmptType cmptType;
     tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
-    cmptAv(tRes(), tf());
+    cmptAv(tRes.ref(), tf());
     reuseTmp<cmptType, Type>::clear(tf);
     return tRes;
 }
@@ -283,7 +283,7 @@ template<class Type>
 tmp<Field<Type>> cmptMag(const UList<Type>& f)
 {
     tmp<Field<Type>> tRes(new Field<Type>(f.size()));
-    cmptMag(tRes(), f);
+    cmptMag(tRes.ref(), f);
     return tRes;
 }
 
@@ -291,7 +291,7 @@ template<class Type>
 tmp<Field<Type>> cmptMag(const tmp<Field<Type>>& tf)
 {
     tmp<Field<Type>> tRes = reuseTmp<Type, Type>::New(tf);
-    cmptMag(tRes(), tf());
+    cmptMag(tRes.ref(), tf());
     reuseTmp<Type, Type>::clear(tf);
     return tRes;
 }
@@ -653,7 +653,7 @@ operator Op(const UList<Type1>& f1, const UList<Type2>& f2)                    \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
     tmp<Field<productType>> tRes(new Field<productType>(f1.size()));           \
-    OpFunc(tRes(), f1, f2);                                                    \
+    OpFunc(tRes.ref(), f1, f2);                                                \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -663,7 +663,7 @@ operator Op(const UList<Type1>& f1, const tmp<Field<Type2>>& tf2)              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
     tmp<Field<productType>> tRes = reuseTmp<productType, Type2>::New(tf2);     \
-    OpFunc(tRes(), f1, tf2());                                                 \
+    OpFunc(tRes.ref(), f1, tf2());                                             \
     reuseTmp<productType, Type2>::clear(tf2);                                  \
     return tRes;                                                               \
 }                                                                              \
@@ -674,7 +674,7 @@ operator Op(const tmp<Field<Type1>>& tf1, const UList<Type2>& f2)              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
     tmp<Field<productType>> tRes = reuseTmp<productType, Type1>::New(tf1);     \
-    OpFunc(tRes(), tf1(), f2);                                                 \
+    OpFunc(tRes.ref(), tf1(), f2);                                             \
     reuseTmp<productType, Type1>::clear(tf1);                                  \
     return tRes;                                                               \
 }                                                                              \
@@ -686,7 +686,7 @@ operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2)        \
     typedef typename product<Type1, Type2>::type productType;                  \
     tmp<Field<productType>> tRes =                                             \
         reuseTmpTmp<productType, Type1, Type1, Type2>::New(tf1, tf2);          \
-    OpFunc(tRes(), tf1(), tf2());                                              \
+    OpFunc(tRes.ref(), tf1(), tf2());                                          \
     reuseTmpTmp<productType, Type1, Type1, Type2>::clear(tf1, tf2);            \
     return tRes;                                                               \
 }                                                                              \
@@ -701,7 +701,7 @@ void OpFunc                                                                    \
 {                                                                              \
     typedef typename product<Type, Form>::type productType;                    \
     TFOR_ALL_F_OP_F_OP_S                                                       \
-        (productType, res, =,Type, f1, Op, Form, static_cast<const Form&>(vs))\
+        (productType, res, =,Type, f1, Op, Form, static_cast<const Form&>(vs)) \
 }                                                                              \
                                                                                \
 template<class Type, class Form, class Cmpt, int nCmpt>                        \
@@ -710,7 +710,7 @@ operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs)     \
 {                                                                              \
     typedef typename product<Type, Form>::type productType;                    \
     tmp<Field<productType>> tRes(new Field<productType>(f1.size()));           \
-    OpFunc(tRes(), f1, static_cast<const Form&>(vs));                          \
+    OpFunc(tRes.ref(), f1, static_cast<const Form&>(vs));                      \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -724,7 +724,7 @@ operator Op                                                                    \
 {                                                                              \
     typedef typename product<Type, Form>::type productType;                    \
     tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);      \
-    OpFunc(tRes(), tf1(), static_cast<const Form&>(vs));                       \
+    OpFunc(tRes.ref(), tf1(), static_cast<const Form&>(vs));                   \
     reuseTmp<productType, Type>::clear(tf1);                                   \
     return tRes;                                                               \
 }                                                                              \
@@ -739,7 +739,7 @@ void OpFunc                                                                    \
 {                                                                              \
     typedef typename product<Form, Type>::type productType;                    \
     TFOR_ALL_F_OP_S_OP_F                                                       \
-        (productType, res, =,Form,static_cast<const Form&>(vs), Op, Type, f1) \
+        (productType, res, =,Form,static_cast<const Form&>(vs), Op, Type, f1)  \
 }                                                                              \
                                                                                \
 template<class Form, class Cmpt, int nCmpt, class Type>                        \
@@ -748,7 +748,7 @@ operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1)     \
 {                                                                              \
     typedef typename product<Form, Type>::type productType;                    \
     tmp<Field<productType>> tRes(new Field<productType>(f1.size()));           \
-    OpFunc(tRes(), static_cast<const Form&>(vs), f1);                          \
+    OpFunc(tRes.ref(), static_cast<const Form&>(vs), f1);                      \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -761,7 +761,7 @@ operator Op                                                                    \
 {                                                                              \
     typedef typename product<Form, Type>::type productType;                    \
     tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);      \
-    OpFunc(tRes(), static_cast<const Form&>(vs), tf1());                       \
+    OpFunc(tRes.ref(), static_cast<const Form&>(vs), tf1());                   \
     reuseTmp<productType, Type>::clear(tf1);                                   \
     return tRes;                                                               \
 }
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
index e9b20528f3..c4a7ff6c03 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
@@ -40,7 +40,7 @@ TEMPLATE                                                                       \
 tmp<Field<ReturnType>> Func(const UList<Type>& f)                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f.size()));              \
-    Func(tRes(), f);                                                           \
+    Func(tRes.ref(), f);                                                       \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -48,7 +48,7 @@ TEMPLATE                                                                       \
 tmp<Field<ReturnType>> Func(const tmp<Field<Type>>& tf)                        \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);         \
-    Func(tRes(), tf());                                                        \
+    Func(tRes.ref(), tf());                                                    \
     reuseTmp<ReturnType, Type>::clear(tf);                                     \
     return tRes;                                                               \
 }
@@ -68,7 +68,7 @@ TEMPLATE                                                                       \
 tmp<Field<ReturnType>> operator Op(const UList<Type>& f)                       \
 {                                                                              \
     tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f.size()));              \
-    OpFunc(tRes(), f);                                                         \
+    OpFunc(tRes.ref(), f);                                                     \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -76,7 +76,7 @@ TEMPLATE                                                                       \
 tmp<Field<ReturnType>> operator Op(const tmp<Field<Type>>& tf)                 \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);         \
-    OpFunc(tRes(), tf());                                                      \
+    OpFunc(tRes.ref(), tf());                                                  \
     reuseTmp<ReturnType, Type>::clear(tf);                                     \
     return tRes;                                                               \
 }
@@ -108,7 +108,7 @@ tmp<Field<ReturnType>> Func                                                    \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));             \
-    Func(tRes(), f1, f2);                                                      \
+    Func(tRes.ref(), f1, f2);                                                  \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -120,7 +120,7 @@ tmp<Field<ReturnType>> Func                                                    \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
-    Func(tRes(), f1, tf2());                                                   \
+    Func(tRes.ref(), f1, tf2());                                               \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
     return tRes;                                                               \
 }                                                                              \
@@ -133,7 +133,7 @@ tmp<Field<ReturnType>> Func                                                    \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
-    Func(tRes(), tf1(), f2);                                                   \
+    Func(tRes.ref(), tf1(), f2);                                               \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
     return tRes;                                                               \
 }                                                                              \
@@ -147,7 +147,7 @@ tmp<Field<ReturnType>> Func                                                    \
 {                                                                              \
     tmp<Field<ReturnType>> tRes =                                              \
         reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);           \
-    Func(tRes(), tf1(), tf2());                                                \
+    Func(tRes.ref(), tf1(), tf2());                                            \
     reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);             \
     return tRes;                                                               \
 }
@@ -179,7 +179,7 @@ tmp<Field<ReturnType>> Func                                                    \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f2.size()));             \
-    Func(tRes(), s1, f2);                                                      \
+    Func(tRes.ref(), s1, f2);                                                  \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -191,7 +191,7 @@ tmp<Field<ReturnType>> Func                                                    \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
-    Func(tRes(), s1, tf2());                                                   \
+    Func(tRes.ref(), s1, tf2());                                               \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
     return tRes;                                                               \
 }
@@ -221,7 +221,7 @@ tmp<Field<ReturnType>> Func                                                    \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));             \
-    Func(tRes(), f1, s2);                                                      \
+    Func(tRes.ref(), f1, s2);                                                  \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -233,7 +233,7 @@ tmp<Field<ReturnType>> Func                                                    \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
-    Func(tRes(), tf1(), s2);                                                   \
+    Func(tRes.ref(), tf1(), s2);                                               \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
     return tRes;                                                               \
 }
@@ -267,7 +267,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));             \
-    OpFunc(tRes(), f1, f2);                                                    \
+    OpFunc(tRes.ref(), f1, f2);                                                \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -279,7 +279,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
-    OpFunc(tRes(), f1, tf2());                                                 \
+    OpFunc(tRes.ref(), f1, tf2());                                             \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
     return tRes;                                                               \
 }                                                                              \
@@ -292,7 +292,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
-    OpFunc(tRes(), tf1(), f2);                                                 \
+    OpFunc(tRes.ref(), tf1(), f2);                                             \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
     return tRes;                                                               \
 }                                                                              \
@@ -306,7 +306,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 {                                                                              \
     tmp<Field<ReturnType>> tRes =                                              \
         reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);           \
-    OpFunc(tRes(), tf1(), tf2());                                              \
+    OpFunc(tRes.ref(), tf1(), tf2());                                          \
     reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);             \
     return tRes;                                                               \
 }
@@ -335,7 +335,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f2.size()));             \
-    OpFunc(tRes(), s1, f2);                                                    \
+    OpFunc(tRes.ref(), s1, f2);                                                \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -347,7 +347,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
-    OpFunc(tRes(), s1, tf2());                                                 \
+    OpFunc(tRes.ref(), s1, tf2());                                             \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
     return tRes;                                                               \
 }
@@ -374,7 +374,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));             \
-    OpFunc(tRes(), f1, s2);                                                    \
+    OpFunc(tRes.ref(), f1, s2);                                                \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -386,7 +386,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 )                                                                              \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
-    OpFunc(tRes(), tf1(), s2);                                                 \
+    OpFunc(tRes.ref(), tf1(), s2);                                             \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
     return tRes;                                                               \
 }
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
index 1d3c39859c..8bceb6885a 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
@@ -71,7 +71,7 @@ public:
 
             if (initRet)
             {
-                rtf() = tf1();
+                rtf.ref() = tf1();
             }
 
             return rtf;
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
index 654a2b4f3d..875e610cb7 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
@@ -74,14 +74,14 @@ void stabilise(scalarField& res, const UList<scalar>& sf, const scalar s)
 tmp<scalarField> stabilise(const UList<scalar>& sf, const scalar s)
 {
     tmp<scalarField> tRes(new scalarField(sf.size()));
-    stabilise(tRes(), sf, s);
+    stabilise(tRes.ref(), sf, s);
     return tRes;
 }
 
 tmp<scalarField> stabilise(const tmp<scalarField>& tsf, const scalar s)
 {
     tmp<scalarField> tRes = reuseTmp<scalar, scalar>::New(tsf);
-    stabilise(tRes(), tsf(), s);
+    stabilise(tRes.ref(), tsf(), s);
     reuseTmp<scalar, scalar>::clear(tsf);
     return tRes;
 }
@@ -173,14 +173,14 @@ void func(scalarField& res, const int n, const UList<scalar>& sf)              \
 tmp<scalarField> func(const int n, const UList<scalar>& sf)                    \
 {                                                                              \
     tmp<scalarField> tRes(new scalarField(sf.size()));                         \
-    func(tRes(), n, sf);                                                       \
+    func(tRes.ref(), n, sf);                                                   \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
 tmp<scalarField> func(const int n, const tmp<scalarField>& tsf)                \
 {                                                                              \
     tmp<scalarField> tRes = reuseTmp<scalar, scalar>::New(tsf);                \
-    func(tRes(), n, tsf());                                                    \
+    func(tRes.ref(), n, tsf());                                                \
     reuseTmp<scalar, scalar>::clear(tsf);                                      \
     return tRes;                                                               \
 }
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
index f99fcb5e6a..6304130a71 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
@@ -108,14 +108,14 @@ void inv(Field<symmTensor>& tf, const UList<symmTensor>& tf1)
 tmp<symmTensorField> inv(const UList<symmTensor>& tf)
 {
     tmp<symmTensorField> result(new symmTensorField(tf.size()));
-    inv(result(), tf);
+    inv(result.ref(), tf);
     return result;
 }
 
 tmp<symmTensorField> inv(const tmp<symmTensorField>& tf)
 {
     tmp<symmTensorField> tRes = reuseTmp<symmTensor, symmTensor>::New(tf);
-    inv(tRes(), tf());
+    inv(tRes.ref(), tf());
     reuseTmp<symmTensor, symmTensor>::clear(tf);
     return tRes;
 }
diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
index ab8f395201..1b6c52bb14 100644
--- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
+++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
@@ -63,7 +63,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
-    transform(tranf(), trf, tf);
+    transform(tranf.ref(), trf, tf);
     return tranf;
 }
 
@@ -76,7 +76,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
-    transform(tranf(), trf, ttf());
+    transform(tranf.ref(), trf, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
 }
@@ -90,7 +90,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
-    transform(tranf(), ttrf(), tf);
+    transform(tranf.ref(), ttrf(), tf);
     ttrf.clear();
     return tranf;
 }
@@ -104,7 +104,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
-    transform(tranf(), ttrf(), ttf());
+    transform(tranf.ref(), ttrf(), ttf());
     reuseTmp<Type, Type>::clear(ttf);
     ttrf.clear();
     return tranf;
@@ -131,7 +131,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf(new Field<Type>(tf.size()));
-    transform(tranf(), t, tf);
+    transform(tranf.ref(), t, tf);
     return tranf;
 }
 
@@ -144,7 +144,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
-    transform(tranf(), t, ttf());
+    transform(tranf.ref(), t, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
 }
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
index 91197660f6..a85f6052ea 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
@@ -106,14 +106,14 @@ void inv(Field<tensor>& tf, const UList<tensor>& tf1)
 tmp<tensorField> inv(const UList<tensor>& tf)
 {
     tmp<tensorField> result(new tensorField(tf.size()));
-    inv(result(), tf);
+    inv(result.ref(), tf);
     return result;
 }
 
 tmp<tensorField> inv(const tmp<tensorField>& tf)
 {
     tmp<tensorField> tRes = reuseTmp<tensor, tensor>::New(tf);
-    inv(tRes(), tf());
+    inv(tRes.ref(), tf());
     reuseTmp<tensor, tensor>::clear(tf);
     return tRes;
 }
@@ -132,7 +132,7 @@ tmp<Field<tensor>> transformFieldMask<tensor>
 )
 {
     tmp<tensorField> tRes(new tensorField(stf.size()));
-    tensorField& res = tRes();
+    tensorField& res = tRes.ref();
     TFOR_ALL_F_OP_F(tensor, res, =, symmTensor, stf)
     return tRes;
 }
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformField.C b/src/OpenFOAM/fields/Fields/transformField/transformField.C
index 362ef156ca..d548c90260 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformField.C
+++ b/src/OpenFOAM/fields/Fields/transformField/transformField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Foam::tmp<Foam::vectorField> Foam::transform
 )
 {
     tmp<vectorField > tranf(new vectorField(tf.size()));
-    transform(tranf(), q, tf);
+    transform(tranf.ref(), q, tf);
     return tranf;
 }
 
@@ -60,7 +60,7 @@ Foam::tmp<Foam::vectorField> Foam::transform
 )
 {
     tmp<vectorField > tranf = reuseTmp<vector, vector>::New(ttf);
-    transform(tranf(), q, ttf());
+    transform(tranf.ref(), q, ttf());
     reuseTmp<vector, vector>::clear(ttf);
     return tranf;
 }
@@ -106,7 +106,7 @@ Foam::tmp<Foam::vectorField> Foam::transform
 )
 {
     tmp<vectorField > tranf(new vectorField(tf.size()));
-    transform(tranf(), tr, tf);
+    transform(tranf.ref(), tr, tf);
     return tranf;
 }
 
@@ -118,7 +118,7 @@ Foam::tmp<Foam::vectorField> Foam::transform
 )
 {
     tmp<vectorField > tranf = reuseTmp<vector, vector>::New(ttf);
-    transform(tranf(), tr, ttf());
+    transform(tranf.ref(), tr, ttf());
     reuseTmp<vector, vector>::clear(ttf);
     return tranf;
 }
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C b/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
index 792df9ce10..985054bede 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
+++ b/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
@@ -63,7 +63,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
-    transform(tranf(), trf, tf);
+    transform(tranf.ref(), trf, tf);
     return tranf;
 }
 
@@ -76,7 +76,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
-    transform(tranf(), trf, ttf());
+    transform(tranf.ref(), trf, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
 }
@@ -90,7 +90,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
-    transform(tranf(), ttrf(), tf);
+    transform(tranf.ref(), ttrf(), tf);
     ttrf.clear();
     return tranf;
 }
@@ -104,7 +104,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
-    transform(tranf(), ttrf(), ttf());
+    transform(tranf.ref(), ttrf(), ttf());
     reuseTmp<Type, Type>::clear(ttf);
     ttrf.clear();
     return tranf;
@@ -131,7 +131,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf(new Field<Type>(tf.size()));
-    transform(tranf(), t, tf);
+    transform(tranf.ref(), t, tf);
     return tranf;
 }
 
@@ -144,7 +144,7 @@ tmp<Field<Type>> transform
 )
 {
     tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
-    transform(tranf(), t, ttf());
+    transform(tranf.ref(), t, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
 }
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
index 73a0af2c66..4c06f84e21 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
@@ -286,7 +286,7 @@ Foam::tmp<Foam::Field<Type>> Foam::LduMatrix<Type, DType, LUType>::residual
 ) const
 {
     tmp<Field<Type>> trA(new Field<Type>(psi.size()));
-    residual(trA(), psi);
+    residual(trA.ref(), psi);
     return trA;
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
index bcbc3385f8..8ba519430a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
@@ -126,7 +126,7 @@ Foam::tmp<Foam::Field<Type>> Foam::processorLduInterface::receive
 ) const
 {
     tmp<Field<Type>> tf(new Field<Type>(size));
-    receive(commsType, tf());
+    receive(commsType, tf.ref());
     return tf;
 }
 
@@ -268,7 +268,7 @@ Foam::tmp<Foam::Field<Type>> Foam::processorLduInterface::compressedReceive
 ) const
 {
     tmp<Field<Type>> tf(new Field<Type>(size));
-    compressedReceive(commsType, tf());
+    compressedReceive(commsType, tf.ref());
     return tf;
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
index aa6230ca19..537746ed20 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -290,7 +290,7 @@ Foam::tmp<Foam::scalarField> Foam::lduMatrix::residual
 ) const
 {
     tmp<scalarField> trA(new scalarField(psi.size()));
-    residual(trA(), psi, source, interfaceBouCoeffs, interfaces, cmpt);
+    residual(trA.ref(), psi, source, interfaceBouCoeffs, interfaces, cmpt);
     return trA;
 }
 
@@ -304,7 +304,7 @@ Foam::tmp<Foam::scalarField > Foam::lduMatrix::H1() const
 
     if (lowerPtr_ || upperPtr_)
     {
-        scalarField& H1_ = tH1();
+        scalarField& H1_ = tH1.ref();
 
         scalar* __restrict__ H1Ptr = H1_.begin();
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
index 508c0c3f94..bf4c695bda 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -181,7 +181,7 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
     // go through the faces and create clusters
 
     tmp<labelField> tcoarseCellMap(new labelField(nFineCells, -1));
-    labelField& coarseCellMap = tcoarseCellMap();
+    labelField& coarseCellMap = tcoarseCellMap.ref();
 
     nCoarseCells = 0;
     label celli;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index c34040c27d..31eb6fdc88 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -166,7 +166,7 @@ Foam::procFacesGAMGProcAgglomeration::processorAgglomeration
     );
 
     tmp<labelField> tfineToCoarse(new labelField(0));
-    labelField& fineToCoarse = tfineToCoarse();
+    labelField& fineToCoarse = tfineToCoarse.ref();
 
     if (singleCellMeshPtr.valid())
     {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
index cd30d03c75..2151fa3005 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ Foam::tmp<Foam::scalarField> Foam::GAMGInterface::agglomerateCoeffs
 ) const
 {
     tmp<scalarField> tcoarseCoeffs(new scalarField(size(), 0.0));
-    scalarField& coarseCoeffs = tcoarseCoeffs();
+    scalarField& coarseCoeffs = tcoarseCoeffs.ref();
 
     if (fineCoeffs.size() != faceRestrictAddressing_.size())
     {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
index 2f55a362ee..bcf21c1dd3 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
@@ -34,7 +34,7 @@ Foam::tmp<Foam::Field<Type>> Foam::GAMGInterface::interfaceInternalField
 ) const
 {
     tmp<Field<Type>> tresult(new Field<Type>(size()));
-    interfaceInternalField(iF, tresult());
+    interfaceInternalField(iF, tresult.ref());
     return tresult;
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 94e3e03dc9..7f884c205b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -182,7 +182,7 @@ Foam::tmp<Foam::labelField> Foam::cyclicGAMGInterface::internalFieldTransfer
     const labelUList& nbrFaceCells = nbr.faceCells();
 
     tmp<labelField> tpnf(new labelField(size()));
-    labelField& pnf = tpnf();
+    labelField& pnf = tpnf.ref();
 
     forAll(pnf, facei)
     {
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 24700bfad4..a842500af4 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -52,15 +52,20 @@ class tmp
 {
     // Private data
 
-        //- Flag for whether object is a temporary or a constant object
-        bool isTmp_;
+        //- Object types
+        enum type
+        {
+            TMP,
+            REF,
+            CONST_REF
+        };
 
-        //- Pointer to temporary object
+        //- Type of object
+        type type_;
+
+        //- Pointer to object
         mutable T* ptr_;
 
-        //- Const reference to constant object
-        const T& ref_;
-
 
 public:
 
@@ -69,9 +74,15 @@ public:
         //- Store object pointer
         inline explicit tmp(T* = 0);
 
+        //- Store object rvalue reference
+        inline tmp(T&&);
+
         //- Store object const reference
         inline tmp(const T&);
 
+        //- Construct copy and increment reference count
+        inline tmp(tmp<T>&&);
+
         //- Construct copy and increment reference count
         inline tmp(const tmp<T>&);
 
@@ -100,6 +111,10 @@ public:
 
         // Edit
 
+            //- Return non-const reference or generate a fatal error
+            //  if the object is const.
+            inline T& ref();
+
             //- Return tmp pointer for reuse.
             //  Returns a clone if the object is not a temporary
             inline T* ptr() const;
@@ -111,8 +126,11 @@ public:
 
     // Member operators
 
-        //- Dereference operator
+        #ifndef CONST_TMP
+        //- Deprecated non-const dereference operator.
+        //  Use ref() where non-const access is required
         inline T& operator()();
+        #endif
 
         //- Const dereference operator
         inline const T& operator()() const;
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index 490ac76e3f..bb6fdbe902 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -31,29 +31,34 @@ License
 template<class T>
 inline Foam::tmp<T>::tmp(T* tPtr)
 :
-    isTmp_(true),
-    ptr_(tPtr),
-    ref_(*tPtr)
+    type_(TMP),
+    ptr_(tPtr)
+{}
+
+
+template<class T>
+inline Foam::tmp<T>::tmp(T&& tRef)
+:
+    type_(REF),
+    ptr_(&tRef)
 {}
 
 
 template<class T>
 inline Foam::tmp<T>::tmp(const T& tRef)
 :
-    isTmp_(false),
-    ptr_(0),
-    ref_(tRef)
+    type_(CONST_REF),
+    ptr_(const_cast<T*>(&tRef))
 {}
 
 
 template<class T>
-inline Foam::tmp<T>::tmp(const tmp<T>& t)
+inline Foam::tmp<T>::tmp(tmp<T>&& t)
 :
-    isTmp_(t.isTmp_),
-    ptr_(t.ptr_),
-    ref_(t.ref_)
+    type_(t.type_),
+    ptr_(t.ptr_)
 {
-    if (isTmp_)
+    if (isTmp())
     {
         if (ptr_)
         {
@@ -62,7 +67,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t)
         else
         {
             FatalErrorInFunction
-                << "attempted copy of a deallocated temporary"
+                << "Attempted copy of a deallocated temporary"
                 << " of type " << typeid(T).name()
                 << abort(FatalError);
         }
@@ -70,14 +75,40 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t)
 }
 
 
+template<class T>
+inline Foam::tmp<T>::tmp(const tmp<T>& t)
+:
+    type_(t.type_),
+    ptr_(t.ptr_)
+{
+    if (isTmp())
+    {
+        if (ptr_)
+        {
+            ptr_->operator++();
+        }
+        else
+        {
+            FatalErrorInFunction
+                << "Attempted copy of a deallocated temporary"
+                << " of type " << typeid(T).name()
+                << abort(FatalError);
+        }
+    }
+    else if (type_ == REF)
+    {
+        type_ = CONST_REF;
+    }
+}
+
+
 template<class T>
 inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
 :
-    isTmp_(t.isTmp_),
-    ptr_(t.ptr_),
-    ref_(t.ref_)
+    type_(t.type_),
+    ptr_(t.ptr_)
 {
-    if (isTmp_)
+    if (isTmp())
     {
         if (allowTransfer)
         {
@@ -92,7 +123,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
             else
             {
                 FatalErrorInFunction
-                    << "attempted copy of a deallocated temporary"
+                    << "Attempted copy of a deallocated temporary"
                     << " of type " << typeid(T).name()
                     << abort(FatalError);
             }
@@ -104,7 +135,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
 template<class T>
 inline Foam::tmp<T>::~tmp()
 {
-    if (isTmp_ && ptr_)
+    if (isTmp() && ptr_)
     {
         if (ptr_->okToDelete())
         {
@@ -124,33 +155,60 @@ inline Foam::tmp<T>::~tmp()
 template<class T>
 inline bool Foam::tmp<T>::isTmp() const
 {
-    return isTmp_;
+    return type_ == TMP;
 }
 
 
 template<class T>
 inline bool Foam::tmp<T>::empty() const
 {
-    return (isTmp_ && !ptr_);
+    return (isTmp() && !ptr_);
 }
 
 
 template<class T>
 inline bool Foam::tmp<T>::valid() const
 {
-    return (!isTmp_ || (isTmp_ && ptr_));
+    return (!isTmp() || (isTmp() && ptr_));
+}
+
+
+template<class T>
+inline T& Foam::tmp<T>::ref()
+{
+    if (type_ == TMP)
+    {
+        if (!ptr_)
+        {
+            FatalErrorInFunction
+                << "Temporary of type " << typeid(T).name() << " deallocated"
+                << abort(FatalError);
+        }
+
+        return *ptr_;
+    }
+    else if (type_ == REF)
+    {
+        return *ptr_;
+    }
+    else
+    {
+        FatalErrorInFunction << "Const object cast to non-const"
+            << abort(FatalError);
+        return *ptr_;
+    }
 }
 
 
 template<class T>
 inline T* Foam::tmp<T>::ptr() const
 {
-    if (isTmp_)
+    if (isTmp())
     {
          if (!ptr_)
          {
              FatalErrorInFunction
-                 << "temporary of type " << typeid(T).name() << " deallocated"
+                 << "Temporary of type " << typeid(T).name() << " deallocated"
                  << abort(FatalError);
          }
 
@@ -163,7 +221,7 @@ inline T* Foam::tmp<T>::ptr() const
     }
     else
     {
-        return new T(ref_);
+        return new T(*ptr_);
     }
 }
 
@@ -171,7 +229,7 @@ inline T* Foam::tmp<T>::ptr() const
 template<class T>
 inline void Foam::tmp<T>::clear() const
 {
-    if (isTmp_ && ptr_)  // Skip this bit:  && ptr_->okToDelete())
+    if (isTmp() && ptr_)  // Skip this bit:  && ptr_->okToDelete())
     {
         delete ptr_;
         ptr_ = 0;
@@ -181,15 +239,16 @@ inline void Foam::tmp<T>::clear() const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
+#ifndef CONST_TMP
 template<class T>
 inline T& Foam::tmp<T>::operator()()
 {
-    if (isTmp_)
+    if (type_ == TMP)
     {
         if (!ptr_)
         {
             FatalErrorInFunction
-                << "temporary of type " << typeid(T).name() << " deallocated"
+                << "Temporary of type " << typeid(T).name() << " deallocated"
                 << abort(FatalError);
         }
 
@@ -197,28 +256,23 @@ inline T& Foam::tmp<T>::operator()()
     }
     else
     {
-        // Note: const is cast away!
-        // Perhaps there should be two refs, one for const and one for non const
-        // and if the ref is actually const then you cannot return it here.
-        //
-        // Another possibility would be to store a const ref and a flag to say
-        // whether the tmp was constructed with a const or a non-const argument.
-        //
-        // eg, enum refType { POINTER = 0, REF = 1, CONSTREF = 2 };
-        return const_cast<T&>(ref_);
+        // Const-ness is automatically cast-away which is why this operator is
+        // deprecated.  Use ref() where non-const access is required.
+        return *ptr_;
     }
 }
+#endif
 
 
 template<class T>
 inline const T& Foam::tmp<T>::operator()() const
 {
-    if (isTmp_)
+    if (type_ == TMP)
     {
         if (!ptr_)
         {
             FatalErrorInFunction
-                << "temporary of type " << typeid(T).name() << " deallocated"
+                << "Temporary of type " << typeid(T).name() << " deallocated"
                 << abort(FatalError);
         }
 
@@ -226,7 +280,8 @@ inline const T& Foam::tmp<T>::operator()() const
     }
     else
     {
-        return ref_;
+        // Return const reference
+        return *ptr_;
     }
 }
 
@@ -241,20 +296,26 @@ inline Foam::tmp<T>::operator const T&() const
 template<class T>
 inline T* Foam::tmp<T>::operator->()
 {
-    if (isTmp_)
+    if (isTmp())
     {
          if (!ptr_)
          {
              FatalErrorInFunction
-                 << "temporary of type " << typeid(T).name() << " deallocated"
+                 << "Temporary of type " << typeid(T).name() << " deallocated"
                  << abort(FatalError);
          }
 
          return ptr_;
     }
+    else if (type_ == REF)
+    {
+        return ptr_;
+    }
     else
     {
-        return &const_cast<T&>(ref_);
+        FatalErrorInFunction << "Const object cast to non-const"
+            << abort(FatalError);
+        return ptr_;
     }
 }
 
@@ -262,14 +323,28 @@ inline T* Foam::tmp<T>::operator->()
 template<class T>
 inline const T* Foam::tmp<T>::operator->() const
 {
-    return const_cast<tmp<T>&>(*this).operator->();
+    if (isTmp())
+    {
+         if (!ptr_)
+         {
+             FatalErrorInFunction
+                 << "Temporary of type " << typeid(T).name() << " deallocated"
+                 << abort(FatalError);
+         }
+
+         return ptr_;
+    }
+    else
+    {
+        return ptr_;
+    }
 }
 
 
 template<class T>
 inline void Foam::tmp<T>::operator=(T* tPtr)
 {
-    if (isTmp_ && ptr_)
+    if (isTmp() && ptr_)
     {
         if (ptr_->okToDelete())
         {
@@ -282,12 +357,12 @@ inline void Foam::tmp<T>::operator=(T* tPtr)
         }
     }
 
-    isTmp_ = true;
+    type_ = TMP;
 
     if (!tPtr)
     {
         FatalErrorInFunction
-            << "attempted copy of a deallocated temporary"
+            << "Attempted copy of a deallocated temporary"
             << " of type " << typeid(T).name()
             << abort(FatalError);
     }
@@ -300,7 +375,7 @@ inline void Foam::tmp<T>::operator=(T* tPtr)
 template<class T>
 inline void Foam::tmp<T>::operator=(const tmp<T>& t)
 {
-    if (isTmp_ && ptr_)
+    if (isTmp() && ptr_)
     {
         if (ptr_->okToDelete())
         {
@@ -313,14 +388,14 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
         }
     }
 
-    if (t.isTmp_)
+    if (t.isTmp())
     {
-        isTmp_ = true;
+        type_ = TMP;
 
         if (!t.ptr_)
         {
             FatalErrorInFunction
-                << "attempted assignment to a deallocated temporary"
+                << "Attempted assignment to a deallocated temporary"
                 << " of type " << typeid(T).name()
                 << abort(FatalError);
         }
@@ -332,11 +407,27 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
     else
     {
         FatalErrorInFunction
-            << "attempted assignment to a const reference to constant object"
+            << "Attempted assignment to a const reference to constant object"
             << " of type " << typeid(T).name()
             << abort(FatalError);
     }
 }
 
 
+//- Return the const reference of the non-const reference argument
+template<typename T>
+inline const T& Const(T& t)
+{
+    return t;
+}
+
+
+//- Return the const reference of the non-const rvalue reference argument
+template<typename T>
+inline const T& Const(T&& t)
+{
+    return t;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.C b/src/OpenFOAM/meshes/boundBox/boundBox.C
index 168d43c342..e75389a6f0 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.C
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,7 +149,7 @@ Foam::boundBox::boundBox
 Foam::tmp<Foam::pointField> Foam::boundBox::points() const
 {
     tmp<pointField> tPts = tmp<pointField>(new pointField(8));
-    pointField& pt = tPts();
+    pointField& pt = tPts.ref();
 
     pt[0] = min_;                                   // min-x, min-y, min-z
     pt[1] = point(max_.x(), min_.y(), min_.z());    // max-x, min-y, min-z
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index b4dd451c90..4e9abeb033 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ Foam::tmp<Foam::vectorField>
 Foam::face::calcEdges(const pointField& points) const
 {
     tmp<vectorField> tedges(new vectorField(size()));
-    vectorField& edges = tedges();
+    vectorField& edges = tedges.ref();
 
     forAll(*this, i)
     {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
index e75191e340..302afd7b49 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
@@ -55,7 +55,7 @@ bool Foam::polyMesh::checkFaceOrthogonality
         fAreas,
         cellCtrs
     );
-    const scalarField& ortho = tortho();
+    const scalarField& ortho = tortho.ref();
 
     // Severe nonorthogonality threshold
     const scalar severeNonorthogonalityThreshold =
@@ -197,7 +197,7 @@ bool Foam::polyMesh::checkFaceSkewness
         fAreas,
         cellCtrs
     );
-    const scalarField& skew = tskew();
+    const scalarField& skew = tskew.ref();
 
     scalar maxSkew = max(skew);
     label nWarnSkew = 0;
@@ -426,7 +426,7 @@ bool Foam::polyMesh::checkCellDeterminant
         faceAreas,
         syncTools::getInternalOrCoupledFaces(*this)
     );
-    scalarField& cellDeterminant = tcellDeterminant();
+    scalarField& cellDeterminant = tcellDeterminant.ref();
 
 
     label nErrorCells = 0;
@@ -508,7 +508,7 @@ bool Foam::polyMesh::checkFaceWeight
         fAreas,
         cellCtrs
     );
-    scalarField& faceWght = tfaceWght();
+    scalarField& faceWght = tfaceWght.ref();
 
 
     label nErrorFaces = 0;
@@ -595,7 +595,7 @@ bool Foam::polyMesh::checkVolRatio
     }
 
     tmp<scalarField> tvolRatio = polyMeshTools::volRatio(*this, cellVols);
-    scalarField& volRatio = tvolRatio();
+    scalarField& volRatio = tvolRatio.ref();
 
 
     label nErrorFaces = 0;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C
index 4945eb0b09..3cde2db292 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::tmp<Foam::scalarField> Foam::polyMeshTools::faceOrthogonality
     const polyBoundaryMesh& pbm = mesh.boundaryMesh();
 
     tmp<scalarField> tortho(new scalarField(mesh.nFaces(), 1.0));
-    scalarField& ortho = tortho();
+    scalarField& ortho = tortho.ref();
 
     // Internal faces
     forAll(nei, faceI)
@@ -100,7 +100,7 @@ Foam::tmp<Foam::scalarField> Foam::polyMeshTools::faceSkewness
     const polyBoundaryMesh& pbm = mesh.boundaryMesh();
 
     tmp<scalarField> tskew(new scalarField(mesh.nFaces()));
-    scalarField& skew = tskew();
+    scalarField& skew = tskew.ref();
 
     forAll(nei, faceI)
     {
@@ -184,7 +184,7 @@ Foam::tmp<Foam::scalarField> Foam::polyMeshTools::faceWeights
     const polyBoundaryMesh& pbm = mesh.boundaryMesh();
 
     tmp<scalarField> tweight(new scalarField(mesh.nFaces(), 1.0));
-    scalarField& weight = tweight();
+    scalarField& weight = tweight.ref();
 
     // Internal faces
     forAll(nei, faceI)
@@ -240,7 +240,7 @@ Foam::tmp<Foam::scalarField> Foam::polyMeshTools::volRatio
     const polyBoundaryMesh& pbm = mesh.boundaryMesh();
 
     tmp<scalarField> tratio(new scalarField(mesh.nFaces(), 1.0));
-    scalarField& ratio = tratio();
+    scalarField& ratio = tratio.ref();
 
     // Internal faces
     forAll(nei, faceI)
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index d7508c3d94..fcfb9d6c64 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -297,7 +297,7 @@ const Foam::vectorField::subField Foam::polyPatch::faceAreas() const
 Foam::tmp<Foam::vectorField> Foam::polyPatch::faceCellCentres() const
 {
     tmp<vectorField> tcc(new vectorField(size()));
-    vectorField& cc = tcc();
+    vectorField& cc = tcc.ref();
 
     // get reference to global cell centres
     const vectorField& gcc = boundaryMesh_.mesh().cellCentres();
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
index 0e5beeeb03..a55421d5e8 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -320,7 +320,7 @@ Foam::tmp<Foam::scalarField> Foam::primitiveMesh::movePoints
     const faceList& f = faces();
 
     tmp<scalarField> tsweptVols(new scalarField(f.size()));
-    scalarField& sweptVols = tsweptVols();
+    scalarField& sweptVols = tsweptVols.ref();
 
     forAll(f, faceI)
     {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
index 2845ca262b..6f8b8b83f4 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
@@ -130,7 +130,7 @@ Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::faceOrthogonality
     const labelList& nei = mesh.faceNeighbour();
 
     tmp<scalarField> tortho(new scalarField(mesh.nInternalFaces()));
-    scalarField& ortho = tortho();
+    scalarField& ortho = tortho.ref();
 
     // Internal faces
     forAll(nei, faceI)
@@ -160,7 +160,7 @@ Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::faceSkewness
     const labelList& nei = mesh.faceNeighbour();
 
     tmp<scalarField> tskew(new scalarField(mesh.nFaces()));
-    scalarField& skew = tskew();
+    scalarField& skew = tskew.ref();
 
     forAll(nei, faceI)
     {
@@ -345,7 +345,7 @@ Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::faceConcavity
     faceNormals /= mag(faceNormals) + ROOTVSMALL;
 
     tmp<scalarField> tfaceAngles(new scalarField(mesh.nFaces()));
-    scalarField& faceAngles = tfaceAngles();
+    scalarField& faceAngles = tfaceAngles.ref();
 
 
     forAll(fcs, faceI)
@@ -416,7 +416,7 @@ Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::faceFlatness
     scalarField magAreas(mag(faceAreas));
 
     tmp<scalarField> tfaceFlatness(new scalarField(mesh.nFaces(), 1.0));
-    scalarField& faceFlatness = tfaceFlatness();
+    scalarField& faceFlatness = tfaceFlatness.ref();
 
 
     forAll(fcs, faceI)
@@ -474,7 +474,7 @@ Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::cellDeterminant
     }
 
     tmp<scalarField> tcellDeterminant(new scalarField(mesh.nCells()));
-    scalarField& cellDeterminant = tcellDeterminant();
+    scalarField& cellDeterminant = tcellDeterminant.ref();
 
     const cellList& c = mesh.cells();
 
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
index 9dfb3e9094..766aa50727 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,8 +163,7 @@ Foam::treeBoundBox::treeBoundBox
 Foam::tmp<Foam::pointField> Foam::treeBoundBox::points() const
 {
     tmp<pointField> tPts = tmp<pointField>(new pointField(8));
-
-    pointField& points = tPts();
+    pointField& points = tPts.ref();
 
     forAll(points, octant)
     {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index b65c908f67..5b7cdafc0f 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -92,7 +92,7 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::value
 ) const
 {
     tmp<Field<Type>> tfld(new Field<Type>(x.size()));
-    Field<Type>& fld = tfld();
+    Field<Type>& fld = tfld.ref();
 
     forAll(x, i)
     {
@@ -110,7 +110,7 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::integrate
 ) const
 {
     tmp<Field<Type>> tfld(new Field<Type>(x1.size()));
-    Field<Type>& fld = tfld();
+    Field<Type>& fld = tfld.ref();
 
     forAll(x1, i)
     {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 0d38c9f049..8217c6ca18 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -380,7 +380,7 @@ template<class Type>
 Foam::tmp<Foam::scalarField> Foam::Function1Types::TableBase<Type>::x() const
 {
     tmp<scalarField> tfld(new scalarField(table_.size(), 0.0));
-    scalarField& fld = tfld();
+    scalarField& fld = tfld.ref();
 
     forAll(table_, i)
     {
@@ -395,7 +395,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::Function1Types::TableBase<Type>::y() const
 {
     tmp<Field<Type>> tfld(new Field<Type>(table_.size(), pTraits<Type>::zero));
-    Field<Type>& fld = tfld();
+    Field<Type>& fld = tfld.ref();
 
     forAll(table_, i)
     {
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index b86451b145..cccba17a2c 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,7 +147,7 @@ void Foam::DispersionRASModel<CloudType>::cacheFields(const bool store)
         }
         else
         {
-            kPtr_ = tk.operator->();
+            kPtr_ = &tk();
             ownK_ = false;
         }
 
@@ -159,7 +159,7 @@ void Foam::DispersionRASModel<CloudType>::cacheFields(const bool store)
         }
         else
         {
-            epsilonPtr_ = tepsilon.operator->();
+            epsilonPtr_ = &tepsilon();
             ownEpsilon_ = false;
         }
     }
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index 563ab8c736..4c2059e0a9 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,7 +139,7 @@ void Foam::BrownianMotionForce<CloudType>::cacheFields(const bool store)
             }
             else
             {
-                kPtr_ = tk.operator->();
+                kPtr_ = &tk();
                 ownK_ = false;
             }
         }

From 5a74397fe47a0c3acb8b37165de16882842757ed Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 22 Feb 2016 17:06:18 +0000
Subject: [PATCH 217/447] refineMesh: Added customizable direction fields to
 multiDirRefinement Contribution provided by Bruno Santos Resolves feature
 request http://www.openfoam.org/mantisbt/view.php?id=2004

---
 .../manipulation/refineMesh/refineMeshDict    |  15 +-
 src/dynamicMesh/meshCut/cellCuts/cellCuts.C   |  14 +-
 .../meshCut/directions/directions.C           |  61 ++++---
 .../meshCut/directions/directions.H           |  10 +-
 .../mesh/refineMesh/refineFieldDirs/Allclean  |  11 ++
 .../mesh/refineMesh/refineFieldDirs/Allrun    |  54 ++++++
 .../calcRadiusField/Make/files                |   3 +
 .../calcRadiusField/Make/options              |   5 +
 .../calcRadiusField/calcRadiusField.C         | 164 ++++++++++++++++++
 .../refineFieldDirs/system/blockMeshDict      |  98 +++++++++++
 .../refineFieldDirs/system/controlDict        |  55 ++++++
 .../refineFieldDirs/system/fvSchemes          |  48 +++++
 .../refineFieldDirs/system/fvSolution         |  23 +++
 .../system/refineMeshDict.range1              |  63 +++++++
 .../system/refineMeshDict.range2              |  63 +++++++
 .../system/refineMeshDict.range3              |  63 +++++++
 .../system/refineMeshDict.tier1               |  60 +++++++
 .../system/refineMeshDict.tier2               |  60 +++++++
 .../system/refineMeshDict.tier3               |  60 +++++++
 .../system/refineMeshDict.tier4               |  60 +++++++
 .../system/refineMeshDict.tier5               |  60 +++++++
 .../system/refineMeshDict.tier6               |  60 +++++++
 .../refineFieldDirs/system/topoSetDict.range1 |  34 ++++
 .../refineFieldDirs/system/topoSetDict.range2 |  34 ++++
 .../refineFieldDirs/system/topoSetDict.range3 |  34 ++++
 .../refineFieldDirs/system/topoSetDict.tier1  |  34 ++++
 .../refineFieldDirs/system/topoSetDict.tier2  |  34 ++++
 .../refineFieldDirs/system/topoSetDict.tier3  |  34 ++++
 .../refineFieldDirs/system/topoSetDict.tier4  |  34 ++++
 .../refineFieldDirs/system/topoSetDict.tier5  |  34 ++++
 .../refineFieldDirs/system/topoSetDict.tier6  |  34 ++++
 31 files changed, 1381 insertions(+), 35 deletions(-)
 create mode 100755 tutorials/mesh/refineMesh/refineFieldDirs/Allclean
 create mode 100755 tutorials/mesh/refineMesh/refineFieldDirs/Allrun
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/Make/files
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/Make/options
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/fvSchemes
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/fvSolution
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
 create mode 100644 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6

diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
index 56601744c8..3d075cdbd8 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
@@ -22,8 +22,12 @@ set c0;
 //   x,y,z axis. Specify in globalCoeffs section below.
 // - patchLocal : coordinate system different for every cell. Specify in
 //   patchLocalCoeffs section below.
+// - fieldBased : uses the list of field names from the directions list for
+//   selecting the directions to cut. Meant to be used with geometricCut, but
+//   can also be used with useHexTopology.
 coordinateSystem global;
 //coordinateSystem patchLocal;
+//coordinateSystem fieldBased;
 
 // .. and its coefficients. x,y in this case. (normal direction is calculated
 // as tan1^tan2)
@@ -39,7 +43,7 @@ patchLocalCoeffs
     tan1 (1 0 0);
 }
 
-// List of directions to refine
+// List of directions to refine, if global or patchLocal
 directions
 (
     tan1
@@ -47,6 +51,15 @@ directions
     normal
 );
 
+// List of directions to refine, if "fieldBased". Keep in mind that these
+// fields must be of type "vectorField", not "volVectorField".
+//directions
+//(
+//    radialDirectionFieldName
+//    angularDirectionFieldName
+//    heightDirectionFieldName
+//);
+
 // Whether to use hex topology. This will
 // - if patchLocal: all cells on selected patch should be hex
 // - split all hexes in 2x2x2 through the middle of edges.
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index 0d5d96ec71..388a9f2ff5 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -38,7 +38,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(cellCuts, 0);
+    defineTypeNameAndDebug(cellCuts, 0);
 }
 
 
@@ -120,7 +120,7 @@ void Foam::cellCuts::writeUncutOBJ
     const label cellI
 ) const
 {
-    //- Cell edges
+    // Cell edges
     OFstream cutsStream(dir / "cell_" + name(cellI) + ".obj");
 
     Pout<< "Writing cell for time " <<  mesh().time().timeName()
@@ -135,7 +135,7 @@ void Foam::cellCuts::writeUncutOBJ
         labelList(1, cellI)
     );
 
-    //- Loop cutting cell in two
+    // Loop cutting cell in two
     OFstream cutStream(dir / "cellCuts_" + name(cellI) + ".obj");
 
     Pout<< "Writing raw cuts on cell for time " <<  mesh().time().timeName()
@@ -180,7 +180,7 @@ void Foam::cellCuts::writeOBJ
     const labelList& anchors
 ) const
 {
-    //- Cell edges
+    // Cell edges
     OFstream cutsStream(dir / "cell_" + name(cellI) + ".obj");
 
     Pout<< "Writing cell for time " <<  mesh().time().timeName()
@@ -196,7 +196,7 @@ void Foam::cellCuts::writeOBJ
     );
 
 
-    //- Loop cutting cell in two
+    // Loop cutting cell in two
     OFstream loopStream(dir / "cellLoop_" + name(cellI) + ".obj");
 
     Pout<< "Writing loop for time " <<  mesh().time().timeName()
@@ -207,7 +207,7 @@ void Foam::cellCuts::writeOBJ
     writeOBJ(loopStream, loopPoints, vertI);
 
 
-    //- Anchors for cell
+    // Anchors for cell
     OFstream anchorStream(dir / "anchors_" + name(cellI) + ".obj");
 
     Pout<< "Writing anchors for time " <<  mesh().time().timeName()
@@ -2240,7 +2240,7 @@ void Foam::cellCuts::setFromCellCutter
 
                 WarningInFunction
                     << "Found loop on cell " << cellI
-                    << " that resulted in an unexpected bad cut."
+                    << " that resulted in an unexpected bad cut." << nl
                     << "    Suggestions:" << nl
                     << "      - Turn on the debug switch for 'cellCuts' to get"
                     << " geometry files that identify this cell." << nl
diff --git a/src/dynamicMesh/meshCut/directions/directions.C b/src/dynamicMesh/meshCut/directions/directions.C
index d2b6aa683e..c217f30042 100644
--- a/src/dynamicMesh/meshCut/directions/directions.C
+++ b/src/dynamicMesh/meshCut/directions/directions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,13 +57,12 @@ const Foam::NamedEnum<Foam::directions::directionType, 3>
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// For debugging
 void Foam::directions::writeOBJ(Ostream& os, const point& pt)
 {
     os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
 }
 
-// For debugging
+
 void Foam::directions::writeOBJ
 (
     Ostream& os,
@@ -81,7 +80,6 @@ void Foam::directions::writeOBJ
 }
 
 
-// Dump to file.
 void Foam::directions::writeOBJ
 (
     const fileName& fName,
@@ -137,7 +135,6 @@ void Foam::directions::check2D
 }
 
 
-// Get direction on all cells
 Foam::vectorField Foam::directions::propagateDirection
 (
     const polyMesh& mesh,
@@ -283,34 +280,35 @@ Foam::directions::directions
     List<vectorField>(wordList(dict.lookup("directions")).size())
 {
     const wordList wantedDirs(dict.lookup("directions"));
+    const word coordSystem(dict.lookup("coordinateSystem"));
 
     bool wantNormal = false;
     bool wantTan1 = false;
     bool wantTan2 = false;
+    label nDirs = 0;
 
-    forAll(wantedDirs, i)
+    if (coordSystem != "fieldBased")
     {
-        directionType wantedDir = directionTypeNames_[wantedDirs[i]];
+        forAll(wantedDirs, i)
+        {
+            directionType wantedDir = directionTypeNames_[wantedDirs[i]];
 
-        if (wantedDir == NORMAL)
-        {
-            wantNormal = true;
-        }
-        else if (wantedDir == TAN1)
-        {
-            wantTan1 = true;
-        }
-        else if (wantedDir == TAN2)
-        {
-            wantTan2 = true;
+            if (wantedDir == NORMAL)
+            {
+                wantNormal = true;
+            }
+            else if (wantedDir == TAN1)
+            {
+                wantTan1 = true;
+            }
+            else if (wantedDir == TAN2)
+            {
+                wantTan2 = true;
+            }
         }
     }
 
 
-    label nDirs = 0;
-
-    const word coordSystem(dict.lookup("coordinateSystem"));
-
     if (coordSystem == "global")
     {
         const dictionary& globalDict = dict.subDict("globalCoeffs");
@@ -424,12 +422,29 @@ Foam::directions::directions
             this->operator[](nDirs++) = tan2Dirs;
         }
     }
+    else if (coordSystem == "fieldBased")
+    {
+        forAll(wantedDirs, i)
+        {
+            operator[](nDirs++) =
+                vectorIOField
+                (
+                    IOobject
+                    (
+                        mesh.instance()/wantedDirs[i],
+                        mesh,
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE
+                    )
+                );
+        }
+    }
     else
     {
         FatalErrorInFunction
             << "Unknown coordinate system "
             << coordSystem << endl
-            << "Known types are global and patchLocal"
+            << "Known types are global, patchLocal and fieldBased"
             << exit(FatalError);
     }
 }
diff --git a/src/dynamicMesh/meshCut/directions/directions.H b/src/dynamicMesh/meshCut/directions/directions.H
index 8fc4d26aec..0a16672e56 100644
--- a/src/dynamicMesh/meshCut/directions/directions.H
+++ b/src/dynamicMesh/meshCut/directions/directions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,8 @@ Description
 
     Used in splitting cells.
     Either all cells have similar refinement direction ('global') or
-    direction is dependent on local cell geometry. Controlled by dictionary.
+    direction is dependent on local cell geometry, or loads selected fields
+    by name ('fieldBased'). Controlled by dictionary.
 
 SourceFiles
     directions.C
@@ -65,7 +66,9 @@ class directions
 :
     public List<vectorField>
 {
+
 public:
+
     // Data types
 
         //- Enumeration listing the possible coordinate directions.
@@ -76,6 +79,7 @@ public:
             NORMAL
         };
 
+
 private:
 
         static const NamedEnum<directionType, 3> directionTypeNames_;
@@ -83,7 +87,6 @@ private:
 
     // Private Member Functions
 
-
         //- For debugging. Write point coordinate.
         static void writeOBJ(Ostream& os, const point& pt);
 
@@ -141,7 +144,6 @@ public:
             const dictionary& dict,
             const twoDPointCorrector* correct2DPtr = NULL
         );
-
 };
 
 
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/Allclean b/tutorials/mesh/refineMesh/refineFieldDirs/Allclean
new file mode 100755
index 0000000000..5734444f4e
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/Allclean
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0 > /dev/null 2>&1
+
+cleanCase
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/Allrun b/tutorials/mesh/refineMesh/refineFieldDirs/Allrun
new file mode 100755
index 0000000000..3498d6b3bb
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/Allrun
@@ -0,0 +1,54 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+wmake calcRadiusField
+wclean calcRadiusField
+
+runApplication blockMesh
+
+##### Procedure for special refinement over Z
+
+# We need the 0 folder to exist for these steps
+mkdir 0
+
+# Refine over Z, in 6 passes
+for index in 1 2 3 4 5 6; do
+
+  runApplication calcRadiusField
+  mv log.calcRadiusField log.calcRadiusField.tier$index
+
+  runApplication topoSet -dict system/topoSetDict.tier$index
+  mv log.topoSet log.topoSet.tier$index
+
+  ## foamToVTK -cellSet tier$index
+
+  runApplication refineMesh -dict system/refineMeshDict.tier$index -overwrite
+  mv log.refineMesh log.refineMesh.tier$index
+
+  rm -r 0/*
+
+done
+
+# Refine over cylindrical coordinates, in 3 passes
+for index in 1 2 3; do
+
+  runApplication calcRadiusField -calcDirections
+  mv log.calcRadiusField log.calcRadiusField.range$index
+
+  runApplication topoSet -dict system/topoSetDict.range$index
+  mv log.topoSet log.topoSet.range$index
+
+  ## foamToVTK -cellSet tier$index
+
+  runApplication refineMesh -dict system/refineMeshDict.range$index \
+      -overwrite
+  mv log.refineMesh log.refineMesh.range$index
+
+  rm -r 0/*
+
+done
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/Make/files b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/Make/files
new file mode 100644
index 0000000000..70a9508ff5
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/Make/files
@@ -0,0 +1,3 @@
+calcRadiusField.C
+
+EXE = $(FOAM_USER_APPBIN)/calcRadiusField
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/Make/options b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/Make/options
new file mode 100644
index 0000000000..fa15f12452
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+EXE_LIBS = \
+    -lfiniteVolume
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
new file mode 100644
index 0000000000..a607777d03
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is derived from 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
+    Write the volScalarField "radiusFieldXY" that has the distance to the
+    origin over X,Y.
+
+    And also write the direction fields based on the option "-calcDirections".
+    The resulting fields are:
+      - radialDirection
+      - angularDirection
+      - heightDirection
+
+    Derived from:
+      $FOAM_UTILITIES/postProcessing/miscellaneous/writeCellCentres
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "timeSelector.H"
+#include "Time.H"
+#include "fvMesh.H"
+#include "vectorIOField.H"
+#include "volFields.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    timeSelector::addOptions();
+    #include "addRegionOption.H"
+
+    argList::addBoolOption
+    (
+        "calcDirections",
+        "calculate the direction fields as well"
+    );
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+
+    instantList timeDirs = timeSelector::select0(runTime, args);
+    const bool calcDirections = args.optionFound("calcDirections");
+
+    #include "createNamedMesh.H"
+
+    forAll(timeDirs, timeI)
+    {
+        runTime.setTime(timeDirs[timeI], timeI);
+
+        Info<< "Time = " << runTime.timeName() << endl;
+
+        // Check for new mesh
+        mesh.readUpdate();
+
+        Info<< "Writing radius field over X,Y in "
+            <<  runTime.timeName() << endl;
+
+        volScalarField radiusFieldXY
+        (
+            IOobject
+            (
+                "radiusFieldXY",
+                runTime.timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            sqrt
+            (
+                mesh.C().component(0)*mesh.C().component(0)
+              + mesh.C().component(1)*mesh.C().component(1)
+            )
+        );
+        radiusFieldXY.write();
+
+
+        if(calcDirections)
+        {
+
+            vectorIOField radialDirection
+            (
+                IOobject
+                (
+                    "radialDirection",
+                    runTime.timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh.C()/magSqr(mesh.C())
+            );
+            radialDirection.replace(vector::Z, scalar(0.0));
+            radialDirection /= sqrt(magSqr(radialDirection));
+            radialDirection.write();
+
+
+            const tensor transform2Tangencial
+            (
+                0, -1, 0,
+                1,  0, 0,
+                0,  0, 1
+            );
+            vectorIOField angularDirection
+            (
+                IOobject
+                (
+                    "angularDirection",
+                    runTime.timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                transform2Tangencial & mesh.C()
+            );
+            angularDirection.replace(vector::Z, scalar(0.0));
+            angularDirection /= sqrt(magSqr(angularDirection));
+            angularDirection.write();
+
+            vectorIOField heightDirection
+            (
+                IOobject
+                (
+                    "heightDirection",
+                    runTime.timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                radialDirection ^ angularDirection
+            );
+            heightDirection.write();
+        }
+    }
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict b/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict
new file mode 100644
index 0000000000..cf3f3d5bdf
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict
@@ -0,0 +1,98 @@
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant/polyMesh";
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+/*
+
+ A ------------------------------- B
+  /  H                          /
+ C\                            /
+     \                        /
+        \                    /
+           \                /     G
+              \            /
+                 \        /
+                    \    /
+                       \/
+                         D
+*/
+
+Ax  0.438912;    Ay  0.000000;
+Bx  18.28800;    By  0.000000;
+Cx  0.310358;    Cy  -0.310358;
+Dx  12.931569;   Dy  -12.931569;
+
+Hx  0.405502;    Hy  -0.167964;
+Gx  16.895909;   Gy  -6.998515;
+
+Z_DB_low  -0.88706;
+Z_AC_low  -1.07;
+Z_high  4.39208;
+
+vertices
+(
+   ($Cx  $Cy  $Z_AC_low)  //0
+   ($Dx  $Dy  $Z_DB_low)  //1
+   ($Bx  $By  $Z_DB_low)  //2
+   ($Ax  $Ay  $Z_AC_low)  //3
+   ($Cx  $Cy  $Z_high)    //4
+   ($Dx  $Dy  $Z_high)    //5
+   ($Bx  $By  $Z_high)    //6
+   ($Ax  $Ay  $Z_high)    //7
+);
+
+blocks
+(
+   hex (0 1 2 3 4 5 6 7)    (47 10 4) simpleGrading (41.6669 1 1)
+);
+
+edges
+(
+  arc 0 3 ($Hx $Hy $Z_AC_low)
+  arc 4 7 ($Hx $Hy $Z_high)
+
+  arc 1 2 ($Gx $Gy $Z_DB_low)
+  arc 5 6 ($Gx $Gy $Z_high)
+);
+
+patches
+(
+   patch maxX
+   (
+       (1 2 6 5)
+   )
+   patch minX
+   (
+       (0 4 7 3)
+   )
+   patch maxY
+   (
+       (3 7 6 2)
+   )
+   patch minY
+   (
+       (1 5 4 0)
+   )
+   patch maxZ
+   (
+       (4 5 6 7)
+   )
+   patch minZ
+   (
+       (0 3 2 1)
+   )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict b/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
new file mode 100644
index 0000000000..ad9c76e9fc
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     potentialFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         1000;
+
+deltaT          1.0;
+
+writeControl    runTime;
+
+writeInterval   1;
+
+purgeWrite      0;
+
+
+//- Uncomment to have regular (every 2 hours of run time) restart files
+//secondaryWriteControl    cpuTime; // runtime
+//secondaryWriteInterval   7200;    // seconds
+//secondaryPurgeWrite      1;       // keep all but last dump
+
+
+writeFormat     binary;
+
+writePrecision  8;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   8;
+
+runTimeModifiable yes;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSchemes b/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSchemes
new file mode 100644
index 0000000000..f2b1c3d1e5
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSchemes
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         none;
+}
+
+gradSchemes
+{
+    default         none;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default         none;
+}
+
+interpolationSchemes
+{
+    default         none;
+}
+
+snGradSchemes
+{
+    default         none;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSolution b/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSolution
new file mode 100644
index 0000000000..0730d033cc
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSolution
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1
new file mode 100644
index 0000000000..ff26028fb8
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1
@@ -0,0 +1,63 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      refineMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Cells to refine; name of cell set
+set range1;
+
+// Type of coordinate system:
+// - global : coordinate system same for every cell. Usually aligned with
+//   x,y,z axis. Specify in globalCoeffs section below.
+// - patchLocal : coordinate system different for every cell. Specify in
+//   patchLocalCoeffs section below.
+//coordinateSystem global;
+//coordinateSystem patchLocal;
+coordinateSystem fieldBased;
+
+// .. and its coefficients. x,y in this case. (normal direction is calculated
+// as tan1^tan2)
+globalCoeffs
+{
+    tan1 (1 0 0);
+    tan2 (0 1 0);
+}
+
+patchLocalCoeffs
+{
+    patch maxX;  // Normal direction is facenormal of zero'th face of patch
+    tan1 (1 -1 0);
+}
+
+// List of directions to refine
+directions
+(
+    radialDirection
+    angularDirection
+    heightDirection
+);
+
+// Whether to use hex topology. This will
+// - if patchLocal: all cells on selected patch should be hex
+// - split all hexes in 2x2x2 through the middle of edges.
+useHexTopology  false;
+
+// Cut purely geometric (will cut hexes through vertices) or take topology
+// into account. Incompatible with useHexTopology
+geometricCut    true;
+
+// Write meshes from intermediate steps
+writeMesh       false;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2
new file mode 100644
index 0000000000..ff26028fb8
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2
@@ -0,0 +1,63 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      refineMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Cells to refine; name of cell set
+set range1;
+
+// Type of coordinate system:
+// - global : coordinate system same for every cell. Usually aligned with
+//   x,y,z axis. Specify in globalCoeffs section below.
+// - patchLocal : coordinate system different for every cell. Specify in
+//   patchLocalCoeffs section below.
+//coordinateSystem global;
+//coordinateSystem patchLocal;
+coordinateSystem fieldBased;
+
+// .. and its coefficients. x,y in this case. (normal direction is calculated
+// as tan1^tan2)
+globalCoeffs
+{
+    tan1 (1 0 0);
+    tan2 (0 1 0);
+}
+
+patchLocalCoeffs
+{
+    patch maxX;  // Normal direction is facenormal of zero'th face of patch
+    tan1 (1 -1 0);
+}
+
+// List of directions to refine
+directions
+(
+    radialDirection
+    angularDirection
+    heightDirection
+);
+
+// Whether to use hex topology. This will
+// - if patchLocal: all cells on selected patch should be hex
+// - split all hexes in 2x2x2 through the middle of edges.
+useHexTopology  false;
+
+// Cut purely geometric (will cut hexes through vertices) or take topology
+// into account. Incompatible with useHexTopology
+geometricCut    true;
+
+// Write meshes from intermediate steps
+writeMesh       false;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3
new file mode 100644
index 0000000000..ff26028fb8
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3
@@ -0,0 +1,63 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      refineMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Cells to refine; name of cell set
+set range1;
+
+// Type of coordinate system:
+// - global : coordinate system same for every cell. Usually aligned with
+//   x,y,z axis. Specify in globalCoeffs section below.
+// - patchLocal : coordinate system different for every cell. Specify in
+//   patchLocalCoeffs section below.
+//coordinateSystem global;
+//coordinateSystem patchLocal;
+coordinateSystem fieldBased;
+
+// .. and its coefficients. x,y in this case. (normal direction is calculated
+// as tan1^tan2)
+globalCoeffs
+{
+    tan1 (1 0 0);
+    tan2 (0 1 0);
+}
+
+patchLocalCoeffs
+{
+    patch maxX;  // Normal direction is facenormal of zero'th face of patch
+    tan1 (1 -1 0);
+}
+
+// List of directions to refine
+directions
+(
+    radialDirection
+    angularDirection
+    heightDirection
+);
+
+// Whether to use hex topology. This will
+// - if patchLocal: all cells on selected patch should be hex
+// - split all hexes in 2x2x2 through the middle of edges.
+useHexTopology  false;
+
+// Cut purely geometric (will cut hexes through vertices) or take topology
+// into account. Incompatible with useHexTopology
+geometricCut    true;
+
+// Write meshes from intermediate steps
+writeMesh       false;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1
new file mode 100644
index 0000000000..faac958e4f
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      refineMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Cells to refine; name of cell set
+set tier1;
+
+// Type of coordinate system:
+// - global : coordinate system same for every cell. Usually aligned with
+//   x,y,z axis. Specify in globalCoeffs section below.
+// - patchLocal : coordinate system different for every cell. Specify in
+//   patchLocalCoeffs section below.
+coordinateSystem global;
+//coordinateSystem patchLocal;
+
+// .. and its coefficients. x,y in this case. (normal direction is calculated
+// as tan1^tan2)
+globalCoeffs
+{
+    tan1 (1 0 0);
+    tan2 (0 1 0);
+}
+
+patchLocalCoeffs
+{
+    patch outside;  // Normal direction is facenormal of zero'th face of patch
+    tan1 (1 0 0);
+}
+
+// List of directions to refine
+directions
+(
+    normal
+);
+
+// Whether to use hex topology. This will
+// - if patchLocal: all cells on selected patch should be hex
+// - split all hexes in 2x2x2 through the middle of edges.
+useHexTopology  false;
+
+// Cut purely geometric (will cut hexes through vertices) or take topology
+// into account. Incompatible with useHexTopology
+geometricCut    true;
+
+// Write meshes from intermediate steps
+writeMesh       false;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2
new file mode 100644
index 0000000000..34c3f546ac
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      refineMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Cells to refine; name of cell set
+set tier2;
+
+// Type of coordinate system:
+// - global : coordinate system same for every cell. Usually aligned with
+//   x,y,z axis. Specify in globalCoeffs section below.
+// - patchLocal : coordinate system different for every cell. Specify in
+//   patchLocalCoeffs section below.
+coordinateSystem global;
+//coordinateSystem patchLocal;
+
+// .. and its coefficients. x,y in this case. (normal direction is calculated
+// as tan1^tan2)
+globalCoeffs
+{
+    tan1 (1 0 0);
+    tan2 (0 1 0);
+}
+
+patchLocalCoeffs
+{
+    patch outside;  // Normal direction is facenormal of zero'th face of patch
+    tan1 (1 0 0);
+}
+
+// List of directions to refine
+directions
+(
+    normal
+);
+
+// Whether to use hex topology. This will
+// - if patchLocal: all cells on selected patch should be hex
+// - split all hexes in 2x2x2 through the middle of edges.
+useHexTopology  false;
+
+// Cut purely geometric (will cut hexes through vertices) or take topology
+// into account. Incompatible with useHexTopology
+geometricCut    true;
+
+// Write meshes from intermediate steps
+writeMesh       false;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3
new file mode 100644
index 0000000000..1b5c596593
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      refineMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Cells to refine; name of cell set
+set tier3;
+
+// Type of coordinate system:
+// - global : coordinate system same for every cell. Usually aligned with
+//   x,y,z axis. Specify in globalCoeffs section below.
+// - patchLocal : coordinate system different for every cell. Specify in
+//   patchLocalCoeffs section below.
+coordinateSystem global;
+//coordinateSystem patchLocal;
+
+// .. and its coefficients. x,y in this case. (normal direction is calculated
+// as tan1^tan2)
+globalCoeffs
+{
+    tan1 (1 0 0);
+    tan2 (0 1 0);
+}
+
+patchLocalCoeffs
+{
+    patch outside;  // Normal direction is facenormal of zero'th face of patch
+    tan1 (1 0 0);
+}
+
+// List of directions to refine
+directions
+(
+    normal
+);
+
+// Whether to use hex topology. This will
+// - if patchLocal: all cells on selected patch should be hex
+// - split all hexes in 2x2x2 through the middle of edges.
+useHexTopology  false;
+
+// Cut purely geometric (will cut hexes through vertices) or take topology
+// into account. Incompatible with useHexTopology
+geometricCut    true;
+
+// Write meshes from intermediate steps
+writeMesh       false;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4
new file mode 100644
index 0000000000..0acb9aff24
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      refineMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Cells to refine; name of cell set
+set tier4;
+
+// Type of coordinate system:
+// - global : coordinate system same for every cell. Usually aligned with
+//   x,y,z axis. Specify in globalCoeffs section below.
+// - patchLocal : coordinate system different for every cell. Specify in
+//   patchLocalCoeffs section below.
+coordinateSystem global;
+//coordinateSystem patchLocal;
+
+// .. and its coefficients. x,y in this case. (normal direction is calculated
+// as tan1^tan2)
+globalCoeffs
+{
+    tan1 (1 0 0);
+    tan2 (0 1 0);
+}
+
+patchLocalCoeffs
+{
+    patch outside;  // Normal direction is facenormal of zero'th face of patch
+    tan1 (1 0 0);
+}
+
+// List of directions to refine
+directions
+(
+    normal
+);
+
+// Whether to use hex topology. This will
+// - if patchLocal: all cells on selected patch should be hex
+// - split all hexes in 2x2x2 through the middle of edges.
+useHexTopology  false;
+
+// Cut purely geometric (will cut hexes through vertices) or take topology
+// into account. Incompatible with useHexTopology
+geometricCut    true;
+
+// Write meshes from intermediate steps
+writeMesh       false;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5
new file mode 100644
index 0000000000..ee34691d17
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      refineMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Cells to refine; name of cell set
+set tier5;
+
+// Type of coordinate system:
+// - global : coordinate system same for every cell. Usually aligned with
+//   x,y,z axis. Specify in globalCoeffs section below.
+// - patchLocal : coordinate system different for every cell. Specify in
+//   patchLocalCoeffs section below.
+coordinateSystem global;
+//coordinateSystem patchLocal;
+
+// .. and its coefficients. x,y in this case. (normal direction is calculated
+// as tan1^tan2)
+globalCoeffs
+{
+    tan1 (1 0 0);
+    tan2 (0 1 0);
+}
+
+patchLocalCoeffs
+{
+    patch outside;  // Normal direction is facenormal of zero'th face of patch
+    tan1 (1 0 0);
+}
+
+// List of directions to refine
+directions
+(
+    normal
+);
+
+// Whether to use hex topology. This will
+// - if patchLocal: all cells on selected patch should be hex
+// - split all hexes in 2x2x2 through the middle of edges.
+useHexTopology  false;
+
+// Cut purely geometric (will cut hexes through vertices) or take topology
+// into account. Incompatible with useHexTopology
+geometricCut    true;
+
+// Write meshes from intermediate steps
+writeMesh       false;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6
new file mode 100644
index 0000000000..d4f4ae1671
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      refineMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Cells to refine; name of cell set
+set tier6;
+
+// Type of coordinate system:
+// - global : coordinate system same for every cell. Usually aligned with
+//   x,y,z axis. Specify in globalCoeffs section below.
+// - patchLocal : coordinate system different for every cell. Specify in
+//   patchLocalCoeffs section below.
+coordinateSystem global;
+//coordinateSystem patchLocal;
+
+// .. and its coefficients. x,y in this case. (normal direction is calculated
+// as tan1^tan2)
+globalCoeffs
+{
+    tan1 (1 0 0);
+    tan2 (0 1 0);
+}
+
+patchLocalCoeffs
+{
+    patch outside;  // Normal direction is facenormal of zero'th face of patch
+    tan1 (1 0 0);
+}
+
+// List of directions to refine
+directions
+(
+    normal
+);
+
+// Whether to use hex topology. This will
+// - if patchLocal: all cells on selected patch should be hex
+// - split all hexes in 2x2x2 through the middle of edges.
+useHexTopology  false;
+
+// Cut purely geometric (will cut hexes through vertices) or take topology
+// into account. Incompatible with useHexTopology
+geometricCut    true;
+
+// Write meshes from intermediate steps
+writeMesh       false;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
new file mode 100644
index 0000000000..1d9db272f8
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+actions
+(
+    {
+        name    range1;
+        type    cellSet;
+        action  new;
+        source fieldToCell;
+        sourceInfo
+        {
+          fieldName   radiusFieldXY;
+          min         13.36;
+          max         18.47;
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
new file mode 100644
index 0000000000..f6e959b970
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+actions
+(
+    {
+        name    range1;
+        type    cellSet;
+        action  new;
+        source fieldToCell;
+        sourceInfo
+        {
+          fieldName   radiusFieldXY;
+          min         7.00;
+          max         18.47;
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
new file mode 100644
index 0000000000..fc5c60d4f0
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+actions
+(
+    {
+        name    range1;
+        type    cellSet;
+        action  new;
+        source fieldToCell;
+        sourceInfo
+        {
+          fieldName   radiusFieldXY;
+          min         3.67;
+          max         18.47;
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
new file mode 100644
index 0000000000..0e43a02c4b
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+actions
+(
+    {
+        name    tier1;
+        type    cellSet;
+        action  new;
+        source fieldToCell;
+        sourceInfo
+        {
+          fieldName   radiusFieldXY;
+          min         0.0;
+          max         0.64;
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
new file mode 100644
index 0000000000..43f5306312
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+actions
+(
+    {
+        name    tier2;
+        type    cellSet;
+        action  new;
+        source fieldToCell;
+        sourceInfo
+        {
+          fieldName   radiusFieldXY;
+          min         0.0;
+          max         1.03;
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
new file mode 100644
index 0000000000..d2dce29215
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+actions
+(
+    {
+        name    tier3;
+        type    cellSet;
+        action  new;
+        source fieldToCell;
+        sourceInfo
+        {
+          fieldName   radiusFieldXY;
+          min         0.0;
+          max         1.94;
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
new file mode 100644
index 0000000000..2b48e33e15
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+actions
+(
+    {
+        name    tier4;
+        type    cellSet;
+        action  new;
+        source fieldToCell;
+        sourceInfo
+        {
+          fieldName   radiusFieldXY;
+          min         0.0;
+          max         3.67;
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
new file mode 100644
index 0000000000..2cb4dddf6f
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+actions
+(
+    {
+        name    tier5;
+        type    cellSet;
+        action  new;
+        source fieldToCell;
+        sourceInfo
+        {
+          fieldName   radiusFieldXY;
+          min         0.0;
+          max         7.00;
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
new file mode 100644
index 0000000000..751a78b764
--- /dev/null
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+actions
+(
+    {
+        name    tier6;
+        type    cellSet;
+        action  new;
+        source fieldToCell;
+        sourceInfo
+        {
+          fieldName   radiusFieldXY;
+          min         0.0;
+          max         13.36;
+        }
+    }
+);
+
+// ************************************************************************* //

From c02bf70ea737f93e2280c144e25777364bf578ff Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 24 Feb 2016 12:47:36 +0000
Subject: [PATCH 218/447] tmp: Improved reference count checks to provide
 better error diagnostics in case of tmp misuse.

Simplified tmp reuse pattern in field algebra to use tmp copy and
assignment rather than the complex delayed call to 'ptr()'.

Removed support for unused non-const 'REF' storage of non-tmp objects due to C++
limitation in constructor overloading: if both tmp(T&) and tmp(const T&)
constructors are provided resolution is ambiguous.

The turbulence libraries have been upgraded and '-DCONST_TMP' option
specified in the 'options' file to switch to the new 'tmp' behavior.
---
 .../DPMFoam/DPMTurbulenceModels/Make/options  |   2 +-
 .../MomentumTransferPhaseSystem.C             |   2 +-
 .../Make/options                              |   2 +-
 .../Make/options                              |   2 +-
 ...ayatillekeWallFunctionFvPatchScalarField.C |   6 +-
 .../Schaeffer/SchaefferFrictionalStress.C     |   4 +-
 .../kineticTheoryModel/kineticTheoryModel.C   |   3 +-
 .../phasePressureModel/phasePressureModel.C   |   5 +-
 .../Make/options                              |   2 +-
 .../Schaeffer/SchaefferFrictionalStress.C     |   4 +-
 .../kineticTheoryModel/kineticTheoryModel.C   |   3 +-
 .../phasePressureModel/phasePressureModel.C   |   5 +-
 src/OpenFOAM/db/IOstreams/token/tokenI.H      |   4 +-
 .../DimensionedFieldFunctions.C               |  16 +-
 .../DimensionedFieldFunctionsM.C              |  40 ++---
 .../DimensionedFieldReuseFunctions.H          |  27 +---
 .../DimensionedScalarField.C                  |  40 ++---
 .../FieldFields/FieldField/FieldField.C       |   4 +-
 .../FieldField/FieldFieldFunctions.C          |  50 +++---
 .../FieldField/FieldFieldFunctionsM.C         |  40 ++---
 .../FieldField/FieldFieldReuseFunctions.H     |  29 +---
 src/OpenFOAM/fields/Fields/Field/Field.C      |   5 +-
 .../fields/Fields/Field/FieldReuseFunctions.H |  27 +---
 .../GeometricField/GeometricField.C           |   8 +-
 .../GeometricField/GeometricFieldFunctions.C  |  38 ++---
 .../GeometricField/GeometricFieldFunctionsM.C |  44 +++---
 .../GeometricFieldReuseFunctions.H            |  29 +---
 .../GeometricScalarField.C                    |  40 ++---
 .../SlicedGeometricField.C                    |   6 +-
 .../lduMatrix/lduMatrix/lduMatrixTemplates.C  |   4 +-
 src/OpenFOAM/memory/refCount/refCount.H       |   6 +-
 src/OpenFOAM/memory/tmp/tmp.H                 |   9 +-
 src/OpenFOAM/memory/tmp/tmpI.H                |  96 ++++-------
 .../compressible/Make/options                 |   2 +-
 .../thermalBaffle1DFvPatchScalarField.C       |   6 +-
 ...tureCoupledBaffleMixedFvPatchScalarField.C |  12 +-
 .../incompressible/Make/options               |   2 +-
 .../RAS/LamBremhorstKE/LamBremhorstKE.C       |   8 +-
 .../RAS/LienCubicKE/LienCubicKE.C             |   8 +-
 .../RAS/LienLeschziner/LienLeschziner.C       |   8 +-
 .../RAS/ShihQuadraticKE/ShihQuadraticKE.C     |   8 +-
 .../RAS/kkLOmega/kkLOmega.C                   |  14 +-
 .../RAS/qZeta/qZeta.C                         |   6 +-
 .../RAS/mixtureKEpsilon/mixtureKEpsilon.C     |  14 +-
 .../DeardorffDiffStress/DeardorffDiffStress.C |   6 +-
 .../LES/LESdeltas/IDDESDelta/IDDESDelta.C     |   4 +-
 .../LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C   |  27 +---
 .../anisotropicFilter/anisotropicFilter.C     |   6 +-
 .../SpalartAllmarasDDES/SpalartAllmarasDDES.C |   4 +-
 .../SpalartAllmarasDES/SpalartAllmarasDES.C   |  10 +-
 .../LES/dynamicKEqn/dynamicKEqn.C             |   6 +-
 .../turbulenceModels/LES/kEqn/kEqn.C          |   6 +-
 .../turbulenceModels/Make/options             |   2 +-
 .../turbulenceModels/RAS/LRR/LRR.C            |  12 +-
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.C     |  10 +-
 .../RAS/RNGkEpsilon/RNGkEpsilon.C             |  10 +-
 .../turbulenceModels/RAS/SSG/SSG.C            |  10 +-
 .../RAS/SpalartAllmaras/SpalartAllmaras.C     |   4 +-
 .../turbulenceModels/RAS/kEpsilon/kEpsilon.C  |  10 +-
 .../turbulenceModels/RAS/kOmega/kOmega.C      |  10 +-
 .../RAS/kOmegaSST/kOmegaSST.C                 |  12 +-
 .../RAS/realizableKE/realizableKE.C           |  10 +-
 .../turbulenceModels/RAS/v2f/v2f.C            |  18 +--
 .../ReynoldsStress/ReynoldsStress.C           |   2 +-
 .../nutURoughWallFunctionFvPatchScalarField.C |   8 +-
 ...tUSpaldingWallFunctionFvPatchScalarField.C |   4 +-
 ...UTabulatedWallFunctionFvPatchScalarField.C |   4 +-
 .../nutUWallFunctionFvPatchScalarField.C      |   8 +-
 ...tkAtmRoughWallFunctionFvPatchScalarField.C |   4 +-
 .../nutkRoughWallFunctionFvPatchScalarField.C |   4 +-
 .../nutkWallFunctionFvPatchScalarField.C      |   4 +-
 .../nonlinearEddyViscosity.C                  |   6 +-
 src/finiteVolume/Make/options                 |   2 +-
 .../cfdTools/general/MRF/MRFZoneList.C        |  10 +-
 .../general/SRF/SRFModel/SRFModel/SRFModel.C  |   6 +-
 .../general/constrainHbyA/constrainHbyA.C     |   7 +-
 .../general/fvOptions/fvOptionListTemplates.C |   6 +-
 .../porosityModel/porosityModel.C             |   4 +-
 .../constraint/cyclic/cyclicFvPatchField.C    |   2 +-
 .../cyclicACMI/cyclicACMIFvPatchField.C       |   2 +-
 .../cyclicAMI/cyclicAMIFvPatchField.C         |   2 +-
 .../jumpCyclic/jumpCyclicFvPatchField.C       |   2 +-
 .../mappedField/mappedPatchFieldBase.C        |   2 +-
 .../fvPatchField/fvPatchFieldNew.C            |   2 +-
 .../gaussConvectionScheme.C                   |   4 +-
 .../EulerD2dt2Scheme/EulerD2dt2Scheme.C       |   6 +-
 .../CoEulerDdtScheme/CoEulerDdtScheme.C       |  12 +-
 .../CrankNicolsonDdtScheme.C                  |  10 +-
 .../EulerDdtScheme/EulerDdtScheme.C           |  10 +-
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C  |  12 +-
 .../backwardDdtScheme/backwardDdtScheme.C     |  10 +-
 .../boundedDdtScheme/boundedDdtScheme.C       |  30 ++--
 .../ddtSchemes/ddtScheme/ddtScheme.C          |   2 +-
 .../localEulerDdtScheme/localEulerDdtScheme.C |  10 +-
 .../gaussDivScheme/gaussDivScheme.C           |   4 +-
 .../finiteVolume/fvc/fvcAverage.C             |   3 +-
 src/finiteVolume/finiteVolume/fvc/fvcDdt.C    |  18 +--
 src/finiteVolume/finiteVolume/fvc/fvcDiv.C    |   4 +-
 .../finiteVolume/fvc/fvcLaplacian.C           |   6 +-
 .../finiteVolume/fvc/fvcMagSqrGradGrad.C      |   3 +-
 .../finiteVolume/fvc/fvcMeshPhi.C             |   8 +-
 .../finiteVolume/fvc/fvcReconstructMag.C      |   5 +-
 .../finiteVolume/fvc/fvcSurfaceIntegrate.C    |   4 +-
 src/finiteVolume/finiteVolume/fvm/fvmDdt.C    |   8 +-
 .../finiteVolume/fvm/fvmLaplacian.C           |   4 +-
 src/finiteVolume/finiteVolume/fvm/fvmSup.C    |   8 +-
 .../LeastSquaresGrad/LeastSquaresGrad.C       |   2 +-
 .../gradSchemes/fourthGrad/fourthGrad.C       |   2 +-
 .../gradSchemes/gaussGrad/gaussGrad.C         |   4 +-
 .../leastSquaresGrad/leastSquaresGrad.C       |   2 +-
 .../cellLimitedGrad/cellLimitedGrads.C        |   6 +-
 .../cellMDLimitedGrad/cellMDLimitedGrads.C    |   6 +-
 .../faceLimitedGrad/faceLimitedGrads.C        |   6 +-
 .../faceMDLimitedGrad/faceMDLimitedGrads.C    |   6 +-
 .../gaussLaplacianScheme.C                    |  15 +-
 .../gaussLaplacianSchemes.C                   |   7 +-
 .../CentredFitSnGrad/CentredFitSnGradScheme.H |   2 +-
 .../correctedSnGrad/correctedSnGrad.C         |   4 +-
 .../faceCorrectedSnGrad/faceCorrectedSnGrad.C |   6 +-
 .../snGradSchemes/snGradScheme/snGradScheme.C |   4 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            | 149 +++++++++---------
 .../fvScalarMatrix/fvScalarMatrix.C           |   6 +-
 .../extendedCellToFaceStencilTemplates.C      |   2 +-
 ...extendedUpwindCellToFaceStencilTemplates.C |   2 +-
 .../extendedFaceToCellStencilTemplates.C      |   2 +-
 src/finiteVolume/fvMesh/fvMesh.C              |   2 +-
 src/finiteVolume/fvMesh/fvMeshGeometry.C      |   2 +-
 .../constraint/cyclic/cyclicFvPatch.C         |   4 +-
 .../constraint/cyclicACMI/cyclicACMIFvPatch.C |   4 +-
 .../constraint/cyclicAMI/cyclicAMIFvPatch.C   |   4 +-
 .../fvMesh/fvPatches/fvPatch/fvPatch.C        |   4 +-
 .../fvPatches/fvPatch/fvPatchTemplates.C      |   2 +-
 .../Poisson/PoissonPatchDistMethod.C          |   5 +-
 .../fvMesh/wallDist/wallDist/wallDist.C       |   6 +-
 .../LimitedScheme/LimitedScheme.C             |   2 +-
 .../limitedSchemes/PhiScheme/PhiScheme.C      |   4 +-
 .../limitedSurfaceInterpolationScheme.C       |   2 +-
 .../schemes/clippedLinear/clippedLinear.H     |   5 +-
 .../schemes/cubic/cubic.H                     |   3 +-
 .../schemes/linearUpwind/linearUpwind.C       |   2 +-
 .../schemes/linearUpwind/linearUpwindV.C      |   2 +-
 .../schemes/localMax/localMax.H               |   2 +-
 .../schemes/localMin/localMin.H               |   2 +-
 .../schemes/midPoint/midPoint.H               |   4 +-
 .../outletStabilised/outletStabilised.H       |   4 +-
 .../schemes/pointLinear/pointLinear.C         |   4 +-
 .../schemes/reverseLinear/reverseLinear.H     |   5 +-
 .../schemes/skewCorrected/skewCorrected.H     |   2 +-
 .../surfaceInterpolationScheme.C              |   8 +-
 .../volPointInterpolate.C                     |   4 +-
 .../AMIInterpolation/AMIInterpolation.C       |   4 +-
 ...pointToPointPlanarInterpolationTemplates.C |   2 +-
 152 files changed, 677 insertions(+), 789 deletions(-)

diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options
index 902afe59e4..bd9cbcb613 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels \
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index c789d365b7..6ea8dadf59 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -201,7 +201,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Kd
         {
             if (phase1 == &phase)
             {
-                tKd() += K;
+                tKd.ref() += K;
             }
 
             Swap(phase1, phase2);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
index 5bdb4cea14..ec5ca1596d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I../multiphaseSystem/lnInclude \
     -I../../phaseSystems/lnInclude \
     -I../../interfacialModels/lnInclude\
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
index 3c3db948dd..46e46e4599 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I../twoPhaseSystem/lnInclude \
     -I../../phaseSystems/lnInclude \
     -I../../interfacialModels/lnInclude\
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
index 0d4a1128c0..996f96cecf 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::yPlusTherm
 ) const
 {
     tmp<scalarField> typsf(new scalarField(this->size()));
-    scalarField& ypsf = typsf();
+    scalarField& ypsf = typsf.ref();
 
     forAll(ypsf, faceI)
     {
@@ -197,7 +197,7 @@ alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::calcAlphat
     scalarField yPlusTherm(this->yPlusTherm(P, Prat));
 
     tmp<scalarField> talphatConv(new scalarField(this->size()));
-    scalarField& alphatConv = talphatConv();
+    scalarField& alphatConv = talphatConv.ref();
 
     // Populate boundary values
     forAll(alphatConv, faceI)
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index 4a0d2290d1..b88ec0923a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
         )
     );
 
-    volScalarField& nuf = tnu();
+    volScalarField& nuf = tnu.ref();
 
     forAll(D, celli)
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 9f436cd5a0..f3b7d5da14 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -273,7 +273,8 @@ Foam::RASModels::kineticTheoryModel::pPrime() const
         )
     );
 
-    volScalarField::GeometricBoundaryField& bpPrime = tpPrime().boundaryField();
+    volScalarField::GeometricBoundaryField& bpPrime =
+        tpPrime.ref().boundaryField();
 
     forAll(bpPrime, patchi)
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index c4ce9a7583..a9eb50af35 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -164,7 +164,8 @@ Foam::RASModels::phasePressureModel::pPrime() const
         )
     );
 
-    volScalarField::GeometricBoundaryField& bpPrime = tpPrime().boundaryField();
+    volScalarField::GeometricBoundaryField& bpPrime =
+        tpPrime.ref().boundaryField();
 
     forAll(bpPrime, patchi)
     {
@@ -192,7 +193,7 @@ Foam::RASModels::phasePressureModel::pPrimef() const
     );
 
    surfaceScalarField::GeometricBoundaryField& bpPrime =
-       tpPrime().boundaryField();
+       tpPrime.ref().boundaryField();
 
     forAll(bpPrime, patchi)
     {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
index 84786bdc5d..58f3051b4d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I../twoPhaseSystem/lnInclude \
     -I../interfacialModels/lnInclude\
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index 4a0d2290d1..b88ec0923a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
         )
     );
 
-    volScalarField& nuf = tnu();
+    volScalarField& nuf = tnu.ref();
 
     forAll(D, celli)
     {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index de35e7900b..6a5a474b34 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -278,7 +278,8 @@ Foam::RASModels::kineticTheoryModel::pPrime() const
         )
     );
 
-    volScalarField::GeometricBoundaryField& bpPrime = tpPrime().boundaryField();
+    volScalarField::GeometricBoundaryField& bpPrime =
+        tpPrime.ref().boundaryField();
 
     forAll(bpPrime, patchi)
     {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index 47364ab10d..3c8b16027f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -170,7 +170,8 @@ Foam::RASModels::phasePressureModel::pPrime() const
         )
     );
 
-    volScalarField::GeometricBoundaryField& bpPrime = tpPrime().boundaryField();
+    volScalarField::GeometricBoundaryField& bpPrime =
+        tpPrime.ref().boundaryField();
 
     forAll(bpPrime, patchi)
     {
@@ -198,7 +199,7 @@ Foam::RASModels::phasePressureModel::pPrimef() const
     );
 
    surfaceScalarField::GeometricBoundaryField& bpPrime =
-       tpPrime().boundaryField();
+       tpPrime.ref().boundaryField();
 
     forAll(bpPrime, patchi)
     {
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenI.H b/src/OpenFOAM/db/IOstreams/token/tokenI.H
index 6d34249a61..d2d9a39d7e 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenI.H
+++ b/src/OpenFOAM/db/IOstreams/token/tokenI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ inline void token::clear()
     }
     else if (type_ == COMPOUND)
     {
-        if (compoundTokenPtr_->okToDelete())
+        if (compoundTokenPtr_->unique())
         {
             delete compoundTokenPtr_;
         }
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
index 678d42875f..c5fffefcb8 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
@@ -390,7 +390,7 @@ operator op                                                                    \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::opFunc(tRes().field(), df1.field(), df2.field());                    \
+    Foam::opFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -415,7 +415,7 @@ operator op                                                                    \
             df1.dimensions() op df2.dimensions()                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tRes().field(), df1.field(), df2.field());                    \
+    Foam::opFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
     reuseTmpDimensionedField<productType, Type2, GeoMesh>::clear(tdf2);        \
                                                                                \
@@ -442,7 +442,7 @@ operator op                                                                    \
             df1.dimensions() op df2.dimensions()                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tRes().field(), df1.field(), df2.field());                    \
+    Foam::opFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
     reuseTmpDimensionedField<productType, Type1, GeoMesh>::clear(tdf1);        \
                                                                                \
@@ -472,7 +472,7 @@ operator op                                                                    \
             df1.dimensions() op df2.dimensions()                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tRes().field(), df1.field(), df2.field());                    \
+    Foam::opFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
     reuseTmpTmpDimensionedField                                                \
         <productType, Type1, Type1, Type2, GeoMesh>::clear(tdf1, tdf2);        \
@@ -505,7 +505,7 @@ operator op                                                                    \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::opFunc(tRes().field(), df1.field(), dvs.value());                    \
+    Foam::opFunc(tRes.ref().field(), df1.field(), dvs.value());                \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -542,7 +542,7 @@ operator op                                                                    \
             df1.dimensions() op dvs.dimensions()                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tRes().field(), df1.field(), dvs.value());                    \
+    Foam::opFunc(tRes.ref().field(), df1.field(), dvs.value());                \
                                                                                \
     reuseTmpDimensionedField<productType, Type, GeoMesh>::clear(tdf1);         \
                                                                                \
@@ -585,7 +585,7 @@ operator op                                                                    \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::opFunc(tRes().field(), dvs.value(), df1.field());                    \
+    Foam::opFunc(tRes.ref().field(), dvs.value(), df1.field());                \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -621,7 +621,7 @@ operator op                                                                    \
             dvs.dimensions() op df1.dimensions()                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tRes().field(), dvs.value(), df1.field());                    \
+    Foam::opFunc(tRes.ref().field(), dvs.value(), df1.field());                \
                                                                                \
     reuseTmpDimensionedField<productType, Type, GeoMesh>::clear(tdf1);         \
                                                                                \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
index 4fe75afd3f..743ea0de38 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
@@ -50,7 +50,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Func(tRes().field(), df1.field());                                         \
+    Func(tRes.ref().field(), df1.field());                                     \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -73,7 +73,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Func(tRes().field(), df1.field());                                         \
+    Func(tRes.ref().field(), df1.field());                                     \
                                                                                \
     reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
                                                                                \
@@ -106,7 +106,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes().field(), df1.field());                                 \
+    Foam::OpFunc(tRes.ref().field(), df1.field());                             \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -129,7 +129,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes().field(), df1.field());                                 \
+    Foam::OpFunc(tRes.ref().field(), df1.field());                             \
                                                                                \
     reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
                                                                                \
@@ -163,7 +163,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Func(tRes().field(), df1.field(), df2.field());                            \
+    Func(tRes.ref().field(), df1.field(), df2.field());                        \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -187,7 +187,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Func(tRes().field(), df1.field(), df2.field());                            \
+    Func(tRes.ref().field(), df1.field(), df2.field());                        \
                                                                                \
     reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
                                                                                \
@@ -213,7 +213,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Func(tRes().field(), df1.field(), df2.field());                            \
+    Func(tRes.ref().field(), df1.field(), df2.field());                        \
                                                                                \
     reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
                                                                                \
@@ -242,7 +242,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Func(tRes().field(), df1.field(), df2.field());                            \
+    Func(tRes.ref().field(), df1.field(), df2.field());                        \
                                                                                \
     reuseTmpTmpDimensionedField<ReturnType, Type1, Type1, Type2, GeoMesh>      \
     ::clear(tdf1, tdf2);                                                       \
@@ -277,7 +277,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Func(tRes().field(), dt1.value(), df2.field());                            \
+    Func(tRes.ref().field(), dt1.value(), df2.field());                        \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -312,7 +312,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Func(tRes().field(), dt1.value(), df2.field());                            \
+    Func(tRes.ref().field(), dt1.value(), df2.field());                        \
                                                                                \
     reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
                                                                                \
@@ -354,7 +354,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Func(tRes().field(), df1.field(), dt2.value());                            \
+    Func(tRes.ref().field(), df1.field(), dt2.value());                        \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -389,7 +389,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Func(tRes().field(), df1.field(), dt2.value());                            \
+    Func(tRes.ref().field(), df1.field(), dt2.value());                        \
                                                                                \
     reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
                                                                                \
@@ -438,7 +438,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                    \
+    Foam::OpFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -462,7 +462,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                    \
+    Foam::OpFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
     reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
                                                                                \
@@ -488,7 +488,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                    \
+    Foam::OpFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
     reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
                                                                                \
@@ -517,7 +517,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes().field(), df1.field(), df2.field());                    \
+    Foam::OpFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
     reuseTmpTmpDimensionedField<ReturnType, Type1, Type1, Type2, GeoMesh>::    \
         clear(tdf1, tdf2);                                                     \
@@ -552,7 +552,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes().field(), dt1.value(), df2.field());                    \
+    Foam::OpFunc(tRes.ref().field(), dt1.value(), df2.field());                \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -587,7 +587,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes().field(), dt1.value(), tdf2().field());                 \
+    Foam::OpFunc(tRes.ref().field(), dt1.value(), tdf2().field());             \
                                                                                \
     reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
                                                                                \
@@ -629,7 +629,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes().field(), df1.field(), dt2.value());                    \
+    Foam::OpFunc(tRes.ref().field(), df1.field(), dt2.value());                \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -664,7 +664,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes().field(), tdf1().field(), dt2.value());                 \
+    Foam::OpFunc(tRes.ref().field(), tdf1().field(), dt2.value());             \
                                                                                \
     reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
                                                                                \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
index 2df208e96e..b56adf3805 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
@@ -112,10 +112,7 @@ public:
 
     static void clear(const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1)
     {
-        if (tdf1.isTmp())
-        {
-            tdf1.ptr();
-        }
+        tdf1.clear();
     }
 };
 
@@ -212,10 +209,7 @@ public:
     )
     {
         tdf1.clear();
-        if (tdf2.isTmp())
-        {
-            tdf2.ptr();
-        }
+        tdf2.clear();
     }
 };
 
@@ -267,10 +261,7 @@ public:
         const tmp<DimensionedField<Type2, GeoMesh>>& tdf2
     )
     {
-        if (tdf1.isTmp())
-        {
-            tdf1.ptr();
-        }
+        tdf1.clear();
         tdf2.clear();
     }
 };
@@ -331,16 +322,8 @@ public:
         const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2
     )
     {
-        if (tdf1.isTmp())
-        {
-            tdf1.ptr();
-            tdf2.clear();
-        }
-        else if (tdf2.isTmp())
-        {
-            tdf1.clear();
-            tdf2.ptr();
-        }
+        tdf1.clear();
+        tdf2.clear();
     }
 };
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
index 238f230daa..f8e3c8047e 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
@@ -57,7 +57,7 @@ tmp<DimensionedField<scalar, GeoMesh>> stabilise
         )
     );
 
-    stabilise(tRes().field(), dsf.field(), ds.value());
+    stabilise(tRes.ref().field(), dsf.field(), ds.value());
 
     return tRes;
 }
@@ -80,7 +80,7 @@ tmp<DimensionedField<scalar, GeoMesh>> stabilise
             dsf.dimensions() + ds.dimensions()
         );
 
-    stabilise(tRes().field(), dsf.field(), ds.value());
+    stabilise(tRes.ref().field(), dsf.field(), ds.value());
 
     reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);
 
@@ -126,7 +126,7 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
         )
     );
 
-    pow(tPow().field(), dsf1.field(), dsf2.field());
+    pow(tPow.ref().field(), dsf1.field(), dsf2.field());
 
     return tPow;
 }
@@ -153,7 +153,7 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
             )
         );
 
-    pow(tPow().field(), dsf1.field(), dsf2.field());
+    pow(tPow.ref().field(), dsf1.field(), dsf2.field());
 
     reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf1);
 
@@ -182,7 +182,7 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
             )
         );
 
-    pow(tPow().field(), dsf1.field(), dsf2.field());
+    pow(tPow.ref().field(), dsf1.field(), dsf2.field());
 
     reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf2);
 
@@ -213,7 +213,7 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
             )
         );
 
-    pow(tPow().field(), dsf1.field(), dsf2.field());
+    pow(tPow.ref().field(), dsf1.field(), dsf2.field());
 
     reuseTmpTmpDimensionedField<scalar, scalar, scalar, scalar, GeoMesh>::clear
     (
@@ -247,7 +247,7 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
         )
     );
 
-    pow(tPow().field(), dsf.field(), ds.value());
+    pow(tPow.ref().field(), dsf.field(), ds.value());
 
     return tPow;
 }
@@ -269,7 +269,7 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
             pow(dsf.dimensions(), ds)
         );
 
-    pow(tPow().field(), dsf.field(), ds.value());
+    pow(tPow.ref().field(), dsf.field(), ds.value());
 
     reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);
 
@@ -319,7 +319,7 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
         )
     );
 
-    pow(tPow().field(), ds.value(), dsf.field());
+    pow(tPow.ref().field(), ds.value(), dsf.field());
 
     return tPow;
 }
@@ -342,7 +342,7 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
             pow(ds, dsf.dimensions())
         );
 
-    pow(tPow().field(), ds.value(), dsf.field());
+    pow(tPow.ref().field(), ds.value(), dsf.field());
 
     reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);
 
@@ -394,7 +394,7 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
         )
     );
 
-    atan2(tAtan2().field(), dsf1.field(), dsf2.field());
+    atan2(tAtan2.ref().field(), dsf1.field(), dsf2.field());
 
     return tAtan2;
 }
@@ -417,7 +417,7 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
             atan2(dsf1.dimensions(), dsf2.dimensions())
         );
 
-    atan2(tAtan2().field(), dsf1.field(), dsf2.field());
+    atan2(tAtan2.ref().field(), dsf1.field(), dsf2.field());
 
     reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf1);
 
@@ -442,7 +442,7 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
             atan2(dsf1.dimensions(), dsf2.dimensions())
         );
 
-    atan2(tAtan2().field(), dsf1.field(), dsf2.field());
+    atan2(tAtan2.ref().field(), dsf1.field(), dsf2.field());
 
     reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf2);
 
@@ -469,7 +469,7 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
             atan2(dsf1.dimensions(), dsf2.dimensions())
         );
 
-    atan2(tAtan2().field(), dsf1.field(), dsf2.field());
+    atan2(tAtan2.ref().field(), dsf1.field(), dsf2.field());
 
     reuseTmpTmpDimensionedField<scalar, scalar, scalar, scalar, GeoMesh>::clear
     (
@@ -503,7 +503,7 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
         )
     );
 
-    atan2(tAtan2().field(), dsf.field(), ds.value());
+    atan2(tAtan2.ref().field(), dsf.field(), ds.value());
 
     return tAtan2;
 }
@@ -525,7 +525,7 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
             atan2(dsf.dimensions(), ds)
         );
 
-    atan2(tAtan2().field(), dsf.field(), ds.value());
+    atan2(tAtan2.ref().field(), dsf.field(), ds.value());
 
     reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);
 
@@ -575,7 +575,7 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
         )
     );
 
-    atan2(tAtan2().field(), ds.value(), dsf.field());
+    atan2(tAtan2.ref().field(), ds.value(), dsf.field());
 
     return tAtan2;
 }
@@ -598,7 +598,7 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
             atan2(ds, dsf.dimensions())
         );
 
-    atan2(tAtan2().field(), ds.value(), dsf.field());
+    atan2(tAtan2.ref().field(), ds.value(), dsf.field());
 
     reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);
 
@@ -698,7 +698,7 @@ tmp<DimensionedField<scalar, GeoMesh>> func                                    \
         )                                                                      \
     );                                                                         \
                                                                                \
-    func(tFunc().field(), n, dsf.field());                                     \
+    func(tFunc.ref().field(), n, dsf.field());                                 \
                                                                                \
     return tFunc;                                                              \
 }                                                                              \
@@ -729,7 +729,7 @@ tmp<DimensionedField<scalar, GeoMesh>> func                                    \
         )                                                                      \
     );                                                                         \
                                                                                \
-    func(tFunc().field(), n, dsf.field());                                     \
+    func(tFunc.ref().field(), n, dsf.field());                                 \
                                                                                \
     reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);            \
                                                                                \
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index fba85680a4..c26bdd03ac 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -232,7 +232,7 @@ FieldField<Field, Type>::component
             NewCalculatedType(*this)
     );
 
-    ::Foam::component(Component(), *this, d);
+    ::Foam::component(Component.ref(), *this, d);
 
     return Component;
 }
@@ -274,7 +274,7 @@ tmp<FieldField<Field, Type>> FieldField<Field, Type>::T() const
         FieldField<Field, Type>::NewCalculatedType(*this)
     );
 
-    ::Foam::T(transpose(), *this);
+    ::Foam::T(transpose.ref(), *this);
     return transpose;
 }
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index 02219f4243..1b705e2b8d 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -86,7 +86,7 @@ pow
     (
         FieldField<Field, powProductType>::NewCalculatedType(f)
     );
-    pow<Type, r>(tRes(), f);
+    pow<Type, r>(tRes.ref(), f);
     return tRes;
 }
 
@@ -102,7 +102,7 @@ pow
     (
         reuseTmpFieldField<Field, powProductType, Type>::New(tf)
     );
-    pow<Type, r>(tRes(), tf());
+    pow<Type, r>(tRes.ref(), tf());
     reuseTmpFieldField<Field, powProductType, Type>::clear(tf);
     return tRes;
 }
@@ -130,7 +130,7 @@ sqr(const FieldField<Field, Type>& f)
     (
         FieldField<Field, outerProductType>::NewCalculatedType(f)
     );
-    sqr(tRes(), f);
+    sqr(tRes.ref(), f);
     return tRes;
 }
 
@@ -143,7 +143,7 @@ sqr(const tmp<FieldField<Field, Type>>& tf)
     (
         reuseTmpFieldField<Field, outerProductType, Type>::New(tf)
     );
-    sqr(tRes(), tf());
+    sqr(tRes.ref(), tf());
     reuseTmpFieldField<Field, outerProductType, Type>::clear(tf);
     return tRes;
 }
@@ -166,7 +166,7 @@ tmp<FieldField<Field, scalar>> magSqr(const FieldField<Field, Type>& f)
         FieldField<Field, scalar>::NewCalculatedType(f)
     );
 
-    magSqr(tRes(), f);
+    magSqr(tRes.ref(), f);
     return tRes;
 }
 
@@ -178,7 +178,7 @@ tmp<FieldField<Field, scalar>> magSqr(const tmp<FieldField<Field, Type>>& tf)
         reuseTmpFieldField<Field, scalar, Type>::New(tf)
     );
 
-    magSqr(tRes(), tf());
+    magSqr(tRes.ref(), tf());
     reuseTmpFieldField<Field, scalar, Type>::clear(tf);
     return tRes;
 }
@@ -201,7 +201,7 @@ tmp<FieldField<Field, scalar>> mag(const FieldField<Field, Type>& f)
         FieldField<Field, scalar>::NewCalculatedType(f)
     );
 
-    mag(tRes(), f);
+    mag(tRes.ref(), f);
     return tRes;
 }
 
@@ -213,7 +213,7 @@ tmp<FieldField<Field, scalar>> mag(const tmp<FieldField<Field, Type>>& tf)
         reuseTmpFieldField<Field, scalar, Type>::New(tf)
     );
 
-    mag(tRes(), tf());
+    mag(tRes.ref(), tf());
     reuseTmpFieldField<Field, scalar, Type>::clear(tf);
     return tRes;
 }
@@ -243,7 +243,7 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
     (
         FieldField<Field, cmptType>::NewCalculatedType(f)
     );
-    cmptMax(tRes(), f);
+    cmptMax(tRes.ref(), f);
     return tRes;
 }
 
@@ -258,7 +258,7 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
     (
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
-    cmptMax(tRes(), tf());
+    cmptMax(tRes.ref(), tf());
     reuseTmpFieldField<Field, cmptType, Type>::clear(tf);
     return tRes;
 }
@@ -288,7 +288,7 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
     (
         FieldField<Field, cmptType>::NewCalculatedType(f)
     );
-    cmptMin(tRes(), f);
+    cmptMin(tRes.ref(), f);
     return tRes;
 }
 
@@ -303,7 +303,7 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
     (
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
-    cmptMin(tRes(), tf());
+    cmptMin(tRes.ref(), tf());
     reuseTmpFieldField<Field, cmptType, Type>::clear(tf);
     return tRes;
 }
@@ -333,7 +333,7 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
     (
         FieldField<Field, cmptType>::NewCalculatedType(f)
     );
-    cmptAv(tRes(), f);
+    cmptAv(tRes.ref(), f);
     return tRes;
 }
 
@@ -348,7 +348,7 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
     (
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
-    cmptAv(tRes(), tf());
+    cmptAv(tRes.ref(), tf());
     reuseTmpFieldField<Field, cmptType, Type>::clear(tf);
     return tRes;
 }
@@ -377,7 +377,7 @@ tmp<FieldField<Field, Type>> cmptMag
     (
         FieldField<Field, Type>::NewCalculatedType(f)
     );
-    cmptMag(tRes(), f);
+    cmptMag(tRes.ref(), f);
     return tRes;
 }
 
@@ -391,7 +391,7 @@ tmp<FieldField<Field, Type>> cmptMag
     (
         reuseTmpFieldField<Field, Type, Type>::New(tf)
     );
-    cmptMag(tRes(), tf());
+    cmptMag(tRes.ref(), tf());
     reuseTmpFieldField<Field, Type, Type>::clear(tf);
     return tRes;
 }
@@ -667,7 +667,7 @@ operator op                                                                    \
     (                                                                          \
         FieldField<Field1, productType>::NewCalculatedType(f1)                 \
     );                                                                         \
-    opFunc(tRes(), f1, f2);                                                    \
+    opFunc(tRes.ref(), f1, f2);                                                \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -684,7 +684,7 @@ operator op                                                                    \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type2>::New(tf2)                \
     );                                                                         \
-    opFunc(tRes(), f1, tf2());                                                 \
+    opFunc(tRes.ref(), f1, tf2());                                             \
     reuseTmpFieldField<Field, productType, Type2>::clear(tf2);                 \
     return tRes;                                                               \
 }                                                                              \
@@ -708,7 +708,7 @@ operator op                                                                    \
     (                                                                          \
         FieldField<Field1, productType>::NewCalculatedType(f1)                 \
     );                                                                         \
-    opFunc(tRes(), f1, tf2());                                                 \
+    opFunc(tRes.ref(), f1, tf2());                                             \
     tf2.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
@@ -732,7 +732,7 @@ operator op                                                                    \
     (                                                                          \
         reuseTmpFieldField<Field1, productType, Type1>::New(tf1)               \
     );                                                                         \
-    opFunc(tRes(), tf1(), f2);                                                 \
+    opFunc(tRes.ref(), tf1(), f2);                                             \
     reuseTmpFieldField<Field1, productType, Type1>::clear(tf1);                \
     return tRes;                                                               \
 }                                                                              \
@@ -757,7 +757,7 @@ operator op                                                                    \
         reuseTmpTmpFieldField<Field1, productType, Type1, Type1, Type2>::New   \
         (tf1, tf2)                                                             \
     );                                                                         \
-    opFunc(tRes(), tf1(), tf2());                                              \
+    opFunc(tRes.ref(), tf1(), tf2());                                          \
     reuseTmpTmpFieldField<Field1, productType, Type1, Type1, Type2>::clear     \
     (tf1, tf2);                                                                \
     return tRes;                                                               \
@@ -792,7 +792,7 @@ operator op                                                                    \
     (                                                                          \
         FieldField<Field, productType>::NewCalculatedType(f1)                  \
     );                                                                         \
-    opFunc(tRes(), f1, static_cast<const Form&>(vs));                          \
+    opFunc(tRes.ref(), f1, static_cast<const Form&>(vs));                      \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -810,7 +810,7 @@ operator op                                                                    \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
     );                                                                         \
-    opFunc(tRes(), tf1(), static_cast<const Form&>(vs));                       \
+    opFunc(tRes.ref(), tf1(), static_cast<const Form&>(vs));                   \
     reuseTmpFieldField<Field, productType, Type>::clear(tf1);                  \
     return tRes;                                                               \
 }                                                                              \
@@ -844,7 +844,7 @@ operator op                                                                    \
     (                                                                          \
         FieldField<Field, productType>::NewCalculatedType(f1)                  \
     );                                                                         \
-    opFunc(tRes(), static_cast<const Form&>(vs), f1);                          \
+    opFunc(tRes.ref(), static_cast<const Form&>(vs), f1);                      \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -862,7 +862,7 @@ operator op                                                                    \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
     );                                                                         \
-    opFunc(tRes(), static_cast<const Form&>(vs), tf1());                       \
+    opFunc(tRes.ref(), static_cast<const Form&>(vs), tf1());                   \
     reuseTmpFieldField<Field, productType, Type>::clear(tf1);                  \
     return tRes;                                                               \
 }
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
index 03df3f8b9e..1d4b59cbf3 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
@@ -53,7 +53,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     (                                                                          \
         FieldField<Field, ReturnType>::NewCalculatedType(f)                    \
     );                                                                         \
-    Func(tRes(), f);                                                           \
+    Func(tRes.ref(), f);                                                       \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -67,7 +67,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     (                                                                          \
         reuseTmpFieldField<Field, Type, Type>::New(tf)                         \
     );                                                                         \
-    Func(tRes(), tf());                                                        \
+    Func(tRes.ref(), tf());                                                    \
     reuseTmpFieldField<Field, Type, Type>::clear(tf);                          \
     return tRes;                                                               \
 }
@@ -100,7 +100,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     (                                                                          \
         FieldField<Field, Type>::NewCalculatedType(f)                          \
     );                                                                         \
-    OpFunc(tRes(), f);                                                         \
+    OpFunc(tRes.ref(), f);                                                     \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -114,7 +114,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     (                                                                          \
         reuseTmpFieldField<Field, Type, Type>::New(tf)                         \
     );                                                                         \
-    OpFunc(tRes(), tf());                                                      \
+    OpFunc(tRes.ref(), tf());                                                  \
     reuseTmpFieldField<Field, Type, Type>::clear(tf);                          \
     return tRes;                                                               \
 }
@@ -149,7 +149,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     (                                                                          \
         FieldField<Field, Type1>::NewCalculatedType(f1)                        \
     );                                                                         \
-    Func(tRes(), f1, f2);                                                      \
+    Func(tRes.ref(), f1, f2);                                                  \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -164,7 +164,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     (                                                                          \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
     );                                                                         \
-    Func(tRes(), f1, tf2());                                                   \
+    Func(tRes.ref(), f1, tf2());                                               \
     reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
     return tRes;                                                               \
 }                                                                              \
@@ -180,7 +180,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     (                                                                          \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
     );                                                                         \
-    Func(tRes(), tf1(), f2);                                                   \
+    Func(tRes.ref(), tf1(), f2);                                               \
     reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
     return tRes;                                                               \
 }                                                                              \
@@ -197,7 +197,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
         reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::        \
             New(tf1, tf2)                                                      \
     );                                                                         \
-    Func(tRes(), tf1(), tf2());                                                \
+    Func(tRes.ref(), tf1(), tf2());                                            \
     reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::            \
         clear(tf1, tf2);                                                       \
     return tRes;                                                               \
@@ -233,7 +233,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     (                                                                          \
         FieldField<Field, Type1>::NewCalculatedType(f1)                        \
     );                                                                         \
-    Func(tRes(), f1, s);                                                       \
+    Func(tRes.ref(), f1, s);                                                   \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -248,7 +248,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     (                                                                          \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
     );                                                                         \
-    Func(tRes(), tf1(), s);                                                    \
+    Func(tRes.ref(), tf1(), s);                                                \
     reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
     return tRes;                                                               \
 }
@@ -281,7 +281,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     (                                                                          \
         FieldField<Field, Type2>::NewCalculatedType(f2)                        \
     );                                                                         \
-    Func(tRes(), s, f2);                                                       \
+    Func(tRes.ref(), s, f2);                                                   \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -296,7 +296,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     (                                                                          \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
     );                                                                         \
-    Func(tRes(), s, tf2());                                                    \
+    Func(tRes.ref(), s, tf2());                                                \
     reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
     return tRes;                                                               \
 }
@@ -336,7 +336,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     (                                                                          \
         FieldField<Field, ReturnType>::NewCalculatedType(f1)                   \
     );                                                                         \
-    OpFunc(tRes(), f1, f2);                                                    \
+    OpFunc(tRes.ref(), f1, f2);                                                \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -351,7 +351,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     (                                                                          \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
     );                                                                         \
-    OpFunc(tRes(), f1, tf2());                                                 \
+    OpFunc(tRes.ref(), f1, tf2());                                             \
     reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
     return tRes;                                                               \
 }                                                                              \
@@ -367,7 +367,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     (                                                                          \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
     );                                                                         \
-    OpFunc(tRes(), tf1(), f2);                                                 \
+    OpFunc(tRes.ref(), tf1(), f2);                                             \
     reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
     return tRes;                                                               \
 }                                                                              \
@@ -384,7 +384,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
         reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::        \
             New(tf1, tf2)                                                      \
     );                                                                         \
-    OpFunc(tRes(), tf1(), tf2());                                              \
+    OpFunc(tRes.ref(), tf1(), tf2());                                          \
     reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::            \
         clear(tf1, tf2);                                                       \
     return tRes;                                                               \
@@ -420,7 +420,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     (                                                                          \
         FieldField<Field, Type2>::NewCalculatedType(f2)                        \
     );                                                                         \
-    OpFunc(tRes(), s, f2);                                                     \
+    OpFunc(tRes.ref(), s, f2);                                                 \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -435,7 +435,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     (                                                                          \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
     );                                                                         \
-    OpFunc(tRes(), s, tf2());                                                  \
+    OpFunc(tRes.ref(), s, tf2());                                              \
     reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
     return tRes;                                                               \
 }
@@ -468,7 +468,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     (                                                                          \
         FieldField<Field, Type1>::NewCalculatedType(f1)                        \
     );                                                                         \
-    OpFunc(tRes(), f1, s);                                                     \
+    OpFunc(tRes.ref(), f1, s);                                                 \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -483,7 +483,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     (                                                                          \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
     );                                                                         \
-    OpFunc(tRes(), tf1(), s);                                                  \
+    OpFunc(tRes.ref(), tf1(), s);                                              \
     reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
     return tRes;                                                               \
 }
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
index 3e7b3fe665..672006b452 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
@@ -80,7 +80,7 @@ public:
 
             if (initRet)
             {
-                rtf() = tf1();
+                rtf.ref() = tf1();
             }
 
             return rtf;
@@ -89,10 +89,7 @@ public:
 
     static void clear(const tmp<FieldField<Field, TypeR>>& tf1)
     {
-        if (tf1.isTmp())
-        {
-            tf1.ptr();
-        }
+        tf1.clear();
     }
 };
 
@@ -164,10 +161,7 @@ public:
     )
     {
         tf1.clear();
-        if (tf2.isTmp())
-        {
-            tf2.ptr();
-        }
+        tf2.clear();
     }
 };
 
@@ -202,10 +196,7 @@ public:
         const tmp<FieldField<Field, Type2>>& tf2
     )
     {
-        if (tf1.isTmp())
-        {
-            tf1.ptr();
-        }
+        tf1.clear();
         tf2.clear();
     }
 };
@@ -245,16 +236,8 @@ public:
         const tmp<FieldField<Field, TypeR>>& tf2
     )
     {
-        if (tf1.isTmp())
-        {
-            tf1.ptr();
-            tf2.clear();
-        }
-        else if (tf2.isTmp())
-        {
-            tf1.clear();
-            tf2.ptr();
-        }
+        tf1.clear();
+        tf2.clear();
     }
 };
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 9f8f3da081..596f74f1c3 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -690,10 +690,7 @@ void Foam::Field<Type>::operator=(const tmp<Field>& rhs)
             << abort(FatalError);
     }
 
-    // This is dodgy stuff, don't try it at home.
-    Field* fieldPtr = rhs.ptr();
-    List<Type>::transfer(*fieldPtr);
-    delete fieldPtr;
+    List<Type>::operator=(rhs());
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
index 8bceb6885a..4eedccdc43 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
@@ -80,10 +80,7 @@ public:
 
     static void clear(const tmp<Field<TypeR>>& tf1)
     {
-        if (tf1.isTmp())
-        {
-            tf1.ptr();
-        }
+        tf1.clear();
     }
 };
 
@@ -142,10 +139,7 @@ public:
     )
     {
         tf1.clear();
-        if (tf2.isTmp())
-        {
-            tf2.ptr();
-        }
+        tf2.clear();
     }
 };
 
@@ -177,10 +171,7 @@ public:
         const tmp<Field<Type2>>& tf2
     )
     {
-        if (tf1.isTmp())
-        {
-            tf1.ptr();
-        }
+        tf1.clear();
         tf2.clear();
     }
 };
@@ -217,16 +208,8 @@ public:
         const tmp<Field<TypeR>>& tf2
     )
     {
-        if (tf1.isTmp())
-        {
-            tf1.ptr();
-            tf2.clear();
-        }
-        else if (tf2.isTmp())
-        {
-            tf1.clear();
-            tf2.ptr();
-        }
+        tf1.clear();
+        tf2.clear();
     }
 };
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 14098437e2..959a1182b1 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -992,8 +992,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::T() const
         )
     );
 
-    Foam::T(result().internalField(), internalField());
-    Foam::T(result().boundaryField(), boundaryField());
+    Foam::T(result.ref().internalField(), internalField());
+    Foam::T(result.ref().boundaryField(), boundaryField());
 
     return result;
 }
@@ -1029,8 +1029,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::component
         )
     );
 
-    Foam::component(Component().internalField(), internalField(), d);
-    Foam::component(Component().boundaryField(), boundaryField(), d);
+    Foam::component(Component.ref().internalField(), internalField(), d);
+    Foam::component(Component.ref().boundaryField(), boundaryField(), d);
 
     return Component;
 }
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
index a315c3e3c8..59b356e6f2 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
@@ -104,7 +104,7 @@ pow
         )
     );
 
-    pow<Type, r, PatchField, GeoMesh>(tPow(), gf);
+    pow<Type, r, PatchField, GeoMesh>(tPow.ref(), gf);
 
     return tPow;
 }
@@ -139,7 +139,7 @@ pow
         )
     );
 
-    pow<Type, r, PatchField, GeoMesh>(tPow(), gf);
+    pow<Type, r, PatchField, GeoMesh>(tPow.ref(), gf);
 
     tgf.clear();
 
@@ -190,7 +190,7 @@ sqr(const GeometricField<Type, PatchField, GeoMesh>& gf)
         )
     );
 
-    sqr(tSqr(), gf);
+    sqr(tSqr.ref(), gf);
 
     return tSqr;
 }
@@ -228,7 +228,7 @@ sqr(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
         )
     );
 
-    sqr(tSqr(), gf);
+    sqr(tSqr.ref(), gf);
 
     tgf.clear();
 
@@ -270,7 +270,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> magSqr
         )
     );
 
-    magSqr(tMagSqr(), gf);
+    magSqr(tMagSqr.ref(), gf);
 
     return tMagSqr;
 }
@@ -300,7 +300,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> magSqr
         )
     );
 
-    magSqr(tMagSqr(), gf);
+    magSqr(tMagSqr.ref(), gf);
 
     tgf.clear();
 
@@ -342,7 +342,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> mag
         )
     );
 
-    mag(tMag(), gf);
+    mag(tMag.ref(), gf);
 
     return tMag;
 }
@@ -372,7 +372,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> mag
         )
     );
 
-    mag(tMag(), gf);
+    mag(tMag.ref(), gf);
 
     tgf.clear();
 
@@ -428,7 +428,7 @@ cmptAv(const GeometricField<Type, PatchField, GeoMesh>& gf)
         )
     );
 
-    cmptAv(CmptAv(), gf);
+    cmptAv(CmptAv.ref(), gf);
 
     return CmptAv;
 }
@@ -467,7 +467,7 @@ cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
         )
     );
 
-    cmptAv(CmptAv(), gf);
+    cmptAv(CmptAv.ref(), gf);
 
     tgf.clear();
 
@@ -589,7 +589,7 @@ template                                                                       \
 <class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
 tmp                                                                            \
 <                                                                              \
-    GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh> \
+    GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh>  \
 >                                                                              \
 operator op                                                                    \
 (                                                                              \
@@ -615,7 +615,7 @@ operator op                                                                    \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::opFunc(tRes(), gf1, gf2);                                            \
+    Foam::opFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -644,7 +644,7 @@ operator op                                                                    \
             gf1.dimensions() op gf2.dimensions()                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tRes(), gf1, gf2);                                            \
+    Foam::opFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
     reuseTmpGeometricField<productType, Type2, PatchField, GeoMesh>            \
     ::clear(tgf2);                                                             \
@@ -676,7 +676,7 @@ operator op                                                                    \
             gf1.dimensions() op gf2.dimensions()                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tRes(), gf1, gf2);                                            \
+    Foam::opFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
     reuseTmpGeometricField<productType, Type1, PatchField, GeoMesh>            \
     ::clear(tgf1);                                                             \
@@ -711,7 +711,7 @@ operator op                                                                    \
             gf1.dimensions() op gf2.dimensions()                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tRes(), gf1, gf2);                                            \
+    Foam::opFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
     reuseTmpTmpGeometricField                                                  \
         <productType, Type1, Type1, Type2, PatchField, GeoMesh>                \
@@ -762,7 +762,7 @@ operator op                                                                    \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::opFunc(tRes(), gf1, dvs);                                            \
+    Foam::opFunc(tRes.ref(), gf1, dvs);                                        \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -807,7 +807,7 @@ operator op                                                                    \
             gf1.dimensions() op dvs.dimensions()                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tRes(), gf1, dvs);                                            \
+    Foam::opFunc(tRes.ref(), gf1, dvs);                                        \
                                                                                \
     reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>             \
     ::clear(tgf1);                                                             \
@@ -875,7 +875,7 @@ operator op                                                                    \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::opFunc(tRes(), dvs, gf1);                                            \
+    Foam::opFunc(tRes.ref(), dvs, gf1);                                        \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -919,7 +919,7 @@ operator op                                                                    \
             dvs.dimensions() op gf1.dimensions()                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tRes(), dvs, gf1);                                            \
+    Foam::opFunc(tRes.ref(), dvs, gf1);                                        \
                                                                                \
     reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>             \
     ::clear(tgf1);                                                             \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
index 01d84a1a62..344e79e8e6 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
@@ -68,7 +68,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::Func(tRes(), gf1);                                                   \
+    Foam::Func(tRes.ref(), gf1);                                               \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -91,7 +91,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::Func(tRes(), gf1);                                                   \
+    Foam::Func(tRes.ref(), gf1);                                               \
                                                                                \
     reuseTmpGeometricField                                                     \
         <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
@@ -138,7 +138,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes(), gf1);                                                 \
+    Foam::OpFunc(tRes.ref(), gf1);                                             \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -161,7 +161,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes(), gf1);                                                 \
+    Foam::OpFunc(tRes.ref(), gf1);                                             \
                                                                                \
     reuseTmpGeometricField                                                     \
         <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
@@ -210,7 +210,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::Func(tRes(), gf1, gf2);                                              \
+    Foam::Func(tRes.ref(), gf1, gf2);                                          \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -234,7 +234,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::Func(tRes(), gf1, gf2);                                              \
+    Foam::Func(tRes.ref(), gf1, gf2);                                          \
                                                                                \
     reuseTmpGeometricField                                                     \
         <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                 \
@@ -261,7 +261,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::Func(tRes(), gf1, gf2);                                              \
+    Foam::Func(tRes.ref(), gf1, gf2);                                          \
                                                                                \
     reuseTmpGeometricField                                                     \
         <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
@@ -292,7 +292,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::Func(tRes(), gf1, gf2);                                              \
+    Foam::Func(tRes.ref(), gf1, gf2);                                          \
                                                                                \
     reuseTmpTmpGeometricField                                                  \
         <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>                 \
@@ -341,7 +341,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::Func(tRes(), dt1, gf2);                                              \
+    Foam::Func(tRes.ref(), dt1, gf2);                                          \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -376,7 +376,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::Func(tRes(), dt1, gf2);                                              \
+    Foam::Func(tRes.ref(), dt1, gf2);                                          \
                                                                                \
     reuseTmpGeometricField                                                     \
         <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                 \
@@ -433,7 +433,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::Func(tRes(), gf1, dt2);                                              \
+    Foam::Func(tRes.ref(), gf1, dt2);                                          \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -468,7 +468,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::Func(tRes(), gf1, dt2);                                              \
+    Foam::Func(tRes.ref(), gf1, dt2);                                          \
                                                                                \
     reuseTmpGeometricField                                                     \
         <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
@@ -534,7 +534,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes(), gf1, gf2);                                            \
+    Foam::OpFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -558,7 +558,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes(), gf1, gf2);                                            \
+    Foam::OpFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
     reuseTmpGeometricField                                                     \
         <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                 \
@@ -585,7 +585,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes(), gf1, gf2);                                            \
+    Foam::OpFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
     reuseTmpGeometricField                                                     \
         <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
@@ -615,7 +615,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes(), gf1, gf2);                                            \
+    Foam::OpFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
     reuseTmpTmpGeometricField                                                  \
         <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>                 \
@@ -627,7 +627,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
+#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)  \
                                                                                \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
@@ -665,7 +665,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes(), dt1, gf2);                                            \
+    Foam::OpFunc(tRes.ref(), dt1, gf2);                                        \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -700,7 +700,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes(), dt1, gf2);                                            \
+    Foam::OpFunc(tRes.ref(), dt1, gf2);                                        \
                                                                                \
     reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>             \
         ::clear(tgf2);                                                         \
@@ -719,7 +719,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 }
 
 
-#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
+#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)  \
                                                                                \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
@@ -757,7 +757,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes(), gf1, dt2);                                            \
+    Foam::OpFunc(tRes.ref(), gf1, dt2);                                        \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -792,7 +792,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
         )                                                                      \
     );                                                                         \
                                                                                \
-    Foam::OpFunc(tRes(), gf1, dt2);                                            \
+    Foam::OpFunc(tRes.ref(), gf1, dt2);                                        \
                                                                                \
     reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>             \
         ::clear(tgf1);                                                         \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
index 563dc9b193..5429c4f44f 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
@@ -162,7 +162,7 @@ public:
 
             if (initRet)
             {
-                rtgf() == tgf1();
+                rtgf.ref() == tgf1();
             }
 
             return rtgf;
@@ -174,10 +174,7 @@ public:
         const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1
     )
     {
-        if (reusable(tgf1))
-        {
-            tgf1.ptr();
-        }
+        tgf1.clear();
     }
 };
 
@@ -290,10 +287,7 @@ public:
     )
     {
         tgf1.clear();
-        if (reusable(tgf2))
-        {
-            tgf2.ptr();
-        }
+        tgf2.clear();
     }
 };
 
@@ -351,10 +345,7 @@ public:
         const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2
     )
     {
-        if (reusable(tgf1))
-        {
-            tgf1.ptr();
-        }
+        tgf1.clear();
         tgf2.clear();
     }
 };
@@ -415,16 +406,8 @@ public:
         const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf2
     )
     {
-        if (reusable(tgf1))
-        {
-            tgf1.ptr();
-            tgf2.clear();
-        }
-        else if (reusable(tgf2))
-        {
-            tgf1.clear();
-            tgf2.ptr();
-        }
+        tgf1.clear();
+        tgf2.clear();
     }
 };
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
index a5a0d9b5cf..add1ed8dfb 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
@@ -72,7 +72,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
         )
     );
 
-    stabilise(tRes(), gsf, ds);
+    stabilise(tRes.ref(), gsf, ds);
 
     return tRes;
 }
@@ -97,7 +97,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
         )
     );
 
-    stabilise(tRes(), gsf, ds);
+    stabilise(tRes.ref(), gsf, ds);
 
     reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf);
 
@@ -159,7 +159,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
         )
     );
 
-    pow(tPow(), gsf1, gsf2);
+    pow(tPow.ref(), gsf1, gsf2);
 
     return tPow;
 }
@@ -188,7 +188,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
         )
     );
 
-    pow(tPow(), gsf1, gsf2);
+    pow(tPow.ref(), gsf1, gsf2);
 
     reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf1);
 
@@ -219,7 +219,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
         )
     );
 
-    pow(tPow(), gsf1, gsf2);
+    pow(tPow.ref(), gsf1, gsf2);
 
     reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf2);
 
@@ -252,7 +252,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
         )
     );
 
-    pow(tPow(), gsf1, gsf2);
+    pow(tPow.ref(), gsf1, gsf2);
 
     reuseTmpTmpGeometricField
         <scalar, scalar, scalar, scalar, PatchField, GeoMesh>
@@ -299,7 +299,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
         )
     );
 
-    pow(tPow(), gsf, ds);
+    pow(tPow.ref(), gsf, ds);
 
     return tPow;
 }
@@ -323,7 +323,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
         )
     );
 
-    pow(tPow(), gsf, ds);
+    pow(tPow.ref(), gsf, ds);
 
     reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf);
 
@@ -388,7 +388,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
         )
     );
 
-    pow(tPow(), ds, gsf);
+    pow(tPow.ref(), ds, gsf);
 
     return tPow;
 }
@@ -413,7 +413,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
         )
     );
 
-    pow(tPow(), ds, gsf);
+    pow(tPow.ref(), ds, gsf);
 
     reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf);
 
@@ -480,7 +480,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
         )
     );
 
-    atan2(tAtan2(), gsf1, gsf2);
+    atan2(tAtan2.ref(), gsf1, gsf2);
 
     return tAtan2;
 }
@@ -505,7 +505,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
         )
     );
 
-    atan2(tAtan2(), gsf1, gsf2);
+    atan2(tAtan2.ref(), gsf1, gsf2);
 
     reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf1);
 
@@ -532,7 +532,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
         )
     );
 
-    atan2(tAtan2(), gsf1, gsf2);
+    atan2(tAtan2.ref(), gsf1, gsf2);
 
     reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf2);
 
@@ -561,7 +561,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
         )
     );
 
-    atan2(tAtan2(), gsf1, gsf2);
+    atan2(tAtan2.ref(), gsf1, gsf2);
 
     reuseTmpTmpGeometricField
         <scalar, scalar, scalar, scalar, PatchField, GeoMesh>
@@ -608,7 +608,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
         )
     );
 
-    atan2(tAtan2(), gsf, ds);
+    atan2(tAtan2.ref(), gsf, ds);
 
     return tAtan2;
 }
@@ -632,7 +632,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
         )
     );
 
-    atan2(tAtan2(), gsf, ds);
+    atan2(tAtan2.ref(), gsf, ds);
 
     reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf);
 
@@ -697,7 +697,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
         )
     );
 
-    atan2(tAtan2(), ds, gsf);
+    atan2(tAtan2.ref(), ds, gsf);
 
     return tAtan2;
 }
@@ -722,7 +722,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
         )
     );
 
-    atan2(tAtan2(), ds, gsf);
+    atan2(tAtan2.ref(), ds, gsf);
 
     reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf);
 
@@ -836,7 +836,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> func                          \
         )                                                                      \
     );                                                                         \
                                                                                \
-    func(tFunc(), n, gsf);                                                     \
+    func(tFunc.ref(), n, gsf);                                                 \
                                                                                \
     return tFunc;                                                              \
 }                                                                              \
@@ -867,7 +867,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> func                          \
         )                                                                      \
     );                                                                         \
                                                                                \
-    func(tFunc(), n, gsf);                                                     \
+    func(tFunc.ref(), n, gsf);                                                 \
                                                                                \
     reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>                \
     ::clear(tgsf);                                                             \
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
index 5d7766e4f7..e347e2bf4b 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@@ -49,8 +49,7 @@ slicedBoundaryField
     (
         new FieldField<PatchField, Type>(mesh.boundary().size())
     );
-
-    FieldField<PatchField, Type>& bf = tbf();
+    FieldField<PatchField, Type>& bf = tbf.ref();
 
     forAll(mesh.boundary(), patchi)
     {
@@ -126,8 +125,7 @@ slicedBoundaryField
     (
         new FieldField<PatchField, Type>(mesh.boundary().size())
     );
-
-    FieldField<PatchField, Type>& bf = tbf();
+    FieldField<PatchField, Type>& bf = tbf.ref();
 
     forAll(mesh.boundary(), patchi)
     {
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
index f674bba7a9..739251c358 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
@@ -40,7 +40,7 @@ Foam::tmp<Foam::Field<Type>> Foam::lduMatrix::H(const Field<Type>& psi) const
 
     if (lowerPtr_ || upperPtr_)
     {
-        Field<Type> & Hpsi = tHpsi();
+        Field<Type> & Hpsi = tHpsi.ref();
 
         Type* __restrict__ HpsiPtr = Hpsi.begin();
 
@@ -87,7 +87,7 @@ Foam::lduMatrix::faceH(const Field<Type>& psi) const
         const labelUList& u = lduAddr().upperAddr();
 
         tmp<Field<Type>> tfaceHpsi(new Field<Type> (Lower.size()));
-        Field<Type> & faceHpsi = tfaceHpsi();
+        Field<Type> & faceHpsi = tfaceHpsi.ref();
 
         for (label face=0; face<l.size(); face++)
         {
diff --git a/src/OpenFOAM/memory/refCount/refCount.H b/src/OpenFOAM/memory/refCount/refCount.H
index 132e8b0b83..67f8b4c9ff 100644
--- a/src/OpenFOAM/memory/refCount/refCount.H
+++ b/src/OpenFOAM/memory/refCount/refCount.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,9 +79,9 @@ public:
 
 
         //- Return true if the reference count is zero
-        bool okToDelete() const
+        bool unique() const
         {
-            return !count_;
+            return count_ == 0;
         }
 
 
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index a842500af4..b431e73b81 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -56,7 +56,6 @@ class tmp
         enum type
         {
             TMP,
-            REF,
             CONST_REF
         };
 
@@ -74,15 +73,9 @@ public:
         //- Store object pointer
         inline explicit tmp(T* = 0);
 
-        //- Store object rvalue reference
-        inline tmp(T&&);
-
         //- Store object const reference
         inline tmp(const T&);
 
-        //- Construct copy and increment reference count
-        inline tmp(tmp<T>&&);
-
         //- Construct copy and increment reference count
         inline tmp(const tmp<T>&);
 
@@ -90,7 +83,7 @@ public:
         inline tmp(const tmp<T>&, bool allowTransfer);
 
 
-    //- Destructor, delete object when reference count == 0
+    //- Destructor: deletes temporary object when the reference count is 0
     inline ~tmp();
 
 
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index bb6fdbe902..4d0ad75614 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -36,14 +36,6 @@ inline Foam::tmp<T>::tmp(T* tPtr)
 {}
 
 
-template<class T>
-inline Foam::tmp<T>::tmp(T&& tRef)
-:
-    type_(REF),
-    ptr_(&tRef)
-{}
-
-
 template<class T>
 inline Foam::tmp<T>::tmp(const T& tRef)
 :
@@ -52,29 +44,6 @@ inline Foam::tmp<T>::tmp(const T& tRef)
 {}
 
 
-template<class T>
-inline Foam::tmp<T>::tmp(tmp<T>&& t)
-:
-    type_(t.type_),
-    ptr_(t.ptr_)
-{
-    if (isTmp())
-    {
-        if (ptr_)
-        {
-            ptr_->operator++();
-        }
-        else
-        {
-            FatalErrorInFunction
-                << "Attempted copy of a deallocated temporary"
-                << " of type " << typeid(T).name()
-                << abort(FatalError);
-        }
-    }
-}
-
-
 template<class T>
 inline Foam::tmp<T>::tmp(const tmp<T>& t)
 :
@@ -95,10 +64,6 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t)
                 << abort(FatalError);
         }
     }
-    else if (type_ == REF)
-    {
-        type_ = CONST_REF;
-    }
 }
 
 
@@ -137,7 +102,7 @@ inline Foam::tmp<T>::~tmp()
 {
     if (isTmp() && ptr_)
     {
-        if (ptr_->okToDelete())
+        if (ptr_->unique())
         {
             delete ptr_;
             ptr_ = 0;
@@ -187,13 +152,10 @@ inline T& Foam::tmp<T>::ref()
 
         return *ptr_;
     }
-    else if (type_ == REF)
-    {
-        return *ptr_;
-    }
     else
     {
-        FatalErrorInFunction << "Const object cast to non-const"
+        FatalErrorInFunction
+            << "Attempt to acquire non-const reference to const object"
             << abort(FatalError);
         return *ptr_;
     }
@@ -205,19 +167,25 @@ inline T* Foam::tmp<T>::ptr() const
 {
     if (isTmp())
     {
-         if (!ptr_)
-         {
-             FatalErrorInFunction
-                 << "Temporary of type " << typeid(T).name() << " deallocated"
-                 << abort(FatalError);
-         }
+        if (!ptr_)
+        {
+            FatalErrorInFunction
+                << "Temporary of type " << typeid(T).name() << " deallocated"
+                << abort(FatalError);
+        }
 
-         T* ptr = ptr_;
-         ptr_ = 0;
+        if (!ptr_->unique())
+        {
+            FatalErrorInFunction
+                << "Attempt to acquire pointer to object referred to"
+                   " by multiple 'tmp's"
+                << abort(FatalError);
+        }
 
-         ptr->resetRefCount();
+        T* ptr = ptr_;
+        ptr_ = 0;
 
-         return ptr;
+        return ptr;
     }
     else
     {
@@ -229,10 +197,18 @@ inline T* Foam::tmp<T>::ptr() const
 template<class T>
 inline void Foam::tmp<T>::clear() const
 {
-    if (isTmp() && ptr_)  // Skip this bit:  && ptr_->okToDelete())
+    if (isTmp() && ptr_)
     {
-        delete ptr_;
-        ptr_ = 0;
+        if (ptr_->unique())
+        {
+            delete ptr_;
+            ptr_ = 0;
+        }
+        else
+        {
+            ptr_->operator--();
+            ptr_ = 0;
+        }
     }
 }
 
@@ -307,10 +283,6 @@ inline T* Foam::tmp<T>::operator->()
 
          return ptr_;
     }
-    else if (type_ == REF)
-    {
-        return ptr_;
-    }
     else
     {
         FatalErrorInFunction << "Const object cast to non-const"
@@ -346,7 +318,7 @@ inline void Foam::tmp<T>::operator=(T* tPtr)
 {
     if (isTmp() && ptr_)
     {
-        if (ptr_->okToDelete())
+        if (ptr_->unique())
         {
             delete ptr_;
             ptr_ = 0;
@@ -377,7 +349,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
 {
     if (isTmp() && ptr_)
     {
-        if (ptr_->okToDelete())
+        if (ptr_->unique())
         {
             delete ptr_;
             ptr_ = 0;
@@ -401,8 +373,8 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
         }
 
         ptr_ = t.ptr_;
-        const_cast<tmp<T>&>(t).ptr_ = 0;
-        ptr_->resetRefCount();
+
+        ptr_->operator++();
     }
     else
     {
diff --git a/src/TurbulenceModels/compressible/Make/options b/src/TurbulenceModels/compressible/Make/options
index 4a6578d628..a6401963fd 100644
--- a/src/TurbulenceModels/compressible/Make/options
+++ b/src/TurbulenceModels/compressible/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I../turbulenceModels/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index 7612f746e7..e2cdfdfc0d 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -257,7 +257,7 @@ baffleThickness() const
         (
             new scalarField(nbrField.baffleThickness())
         );
-        scalarField& thickness = tthickness();
+        scalarField& thickness = tthickness.ref();
         mapDist.distribute(thickness);
         return tthickness;
     }
@@ -285,7 +285,7 @@ tmp<scalarField> thermalBaffle1DFvPatchScalarField<solidType>::Qs() const
         );
 
         tmp<scalarField> tQs(new scalarField(nbrField.Qs()));
-        scalarField& Qs = tQs();
+        scalarField& Qs = tQs.ref();
         mapDist.distribute(Qs);
         return tQs;
     }
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index ad37059180..f5940847c0 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -195,17 +195,17 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
 
     if (contactRes_ == 0.0)
     {
-        nbrIntFld() = nbrField.patchInternalField();
-        nbrKDelta() = nbrField.kappa(nbrField)*nbrPatch.deltaCoeffs();
+        nbrIntFld.ref() = nbrField.patchInternalField();
+        nbrKDelta.ref() = nbrField.kappa(nbrField)*nbrPatch.deltaCoeffs();
     }
     else
     {
-        nbrIntFld() = nbrField;
-        nbrKDelta() = contactRes_;
+        nbrIntFld.ref() = nbrField;
+        nbrKDelta.ref() = contactRes_;
     }
 
-    mpp.distribute(nbrIntFld());
-    mpp.distribute(nbrKDelta());
+    mpp.distribute(nbrIntFld.ref());
+    mpp.distribute(nbrKDelta.ref());
 
     tmp<scalarField> myKDelta = kappa(*this)*patch().deltaCoeffs();
 
diff --git a/src/TurbulenceModels/incompressible/Make/options b/src/TurbulenceModels/incompressible/Make/options
index c44e9ae61c..cf54ffd963 100644
--- a/src/TurbulenceModels/incompressible/Make/options
+++ b/src/TurbulenceModels/incompressible/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I../turbulenceModels/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
index 245a0ff55c..70c7403e2f 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -235,8 +235,8 @@ void LamBremhorstKE::correct()
       - fvm::Sp(Ceps2_*f2(Rt)*epsilon_/k_, epsilon_)
     );
 
-    epsEqn().relax();
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().relax();
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
     bound(epsilon_, epsilonMin_);
 
@@ -250,7 +250,7 @@ void LamBremhorstKE::correct()
         G - fvm::Sp(epsilon_/k_, k_)
     );
 
-    kEqn().relax();
+    kEqn.ref().relax();
     solve(kEqn);
     bound(k_, kMin_);
 
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
index cc58aabc78..3a4bc9c262 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -404,8 +404,8 @@ void LienCubicKE::correct()
       + E(f2)
     );
 
-    epsEqn().relax();
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().relax();
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
     bound(epsilon_, epsilonMin_);
 
@@ -421,7 +421,7 @@ void LienCubicKE::correct()
       - fvm::Sp(epsilon_/k_, k_)
     );
 
-    kEqn().relax();
+    kEqn.ref().relax();
     solve(kEqn);
     bound(k_, kMin_);
 
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
index 0b1ec73202..e91c623564 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -288,8 +288,8 @@ void LienLeschziner::correct()
       + E(f2)
     );
 
-    epsEqn().relax();
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().relax();
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
     bound(epsilon_, epsilonMin_);
 
@@ -305,7 +305,7 @@ void LienLeschziner::correct()
       - fvm::Sp(epsilon_/k_, k_)
     );
 
-    kEqn().relax();
+    kEqn.ref().relax();
     solve(kEqn);
     bound(k_, kMin_);
 
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
index c2d22054c2..145c863931 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -286,8 +286,8 @@ void ShihQuadraticKE::correct()
       - fvm::Sp(Ceps2_*epsilon_/k_, epsilon_)
     );
 
-    epsEqn().relax();
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().relax();
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
     bound(epsilon_, epsilonMin_);
 
@@ -303,7 +303,7 @@ void ShihQuadraticKE::correct()
       - fvm::Sp(epsilon_/k_, k_)
     );
 
-    kEqn().relax();
+    kEqn.ref().relax();
     solve(kEqn);
     bound(k_, kMin_);
 
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
index 58a84fc148..6b30ee9d0d 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -698,8 +698,8 @@ void kkLOmega::correct()
         )().dimensionedInternalField()/pow3(y_.dimensionedInternalField())
     );
 
-    omegaEqn().relax();
-    omegaEqn().boundaryManipulate(omega_.boundaryField());
+    omegaEqn.ref().relax();
+    omegaEqn.ref().boundaryManipulate(omega_.boundaryField());
 
     solve(omegaEqn);
     bound(omega_, omegaMin_);
@@ -718,8 +718,8 @@ void kkLOmega::correct()
       - fvm::Sp(Rbp + Rnat + Dl/(kl_ + kMin_), kl_)
     );
 
-    klEqn().relax();
-    klEqn().boundaryManipulate(kl_.boundaryField());
+    klEqn.ref().relax();
+    klEqn.ref().boundaryManipulate(kl_.boundaryField());
 
     solve(klEqn);
     bound(kl_, kMin_);
@@ -739,8 +739,8 @@ void kkLOmega::correct()
       - fvm::Sp(omega_ + Dt/(kt_+ kMin_), kt_)
     );
 
-    ktEqn().relax();
-    ktEqn().boundaryManipulate(kt_.boundaryField());
+    ktEqn.ref().relax();
+    ktEqn.ref().boundaryManipulate(kt_.boundaryField());
 
     solve(ktEqn);
     bound(kt_, kMin_);
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
index 44a5c33121..f5b587385a 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -260,7 +260,7 @@ void qZeta::correct()
       + E
     );
 
-    zetaEqn().relax();
+    zetaEqn.ref().relax();
     solve(zetaEqn);
     bound(zeta_, zetaMin_);
 
@@ -275,7 +275,7 @@ void qZeta::correct()
         G - fvm::Sp(zeta_/q_, q_)
     );
 
-    qEqn().relax();
+    qEqn.ref().relax();
     solve(qEqn);
     bound(q_, qMin_);
 
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
index 8c0e6b5984..789a1688da 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
@@ -615,7 +615,7 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
         kl.boundaryField().updateCoeffs();
         epsilonl.boundaryField().updateCoeffs();
 
-        Gc().checkOut();
+        Gc.ref().checkOut();
     }
 
     tmp<volScalarField> Gd;
@@ -635,7 +635,7 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
         kg.boundaryField().updateCoeffs();
         epsilong.boundaryField().updateCoeffs();
 
-        Gd().checkOut();
+        Gd.ref().checkOut();
     }
 
     // Mixture turbulence generation
@@ -665,9 +665,9 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
       + fvOptions(epsilonm)
     );
 
-    epsEqn().relax();
-    fvOptions.constrain(epsEqn());
-    epsEqn().boundaryManipulate(epsilonm.boundaryField());
+    epsEqn.ref().relax();
+    fvOptions.constrain(epsEqn.ref());
+    epsEqn.ref().boundaryManipulate(epsilonm.boundaryField());
     solve(epsEqn);
     fvOptions.correct(epsilonm);
     bound(epsilonm, this->epsilonMin_);
@@ -688,8 +688,8 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
       + fvOptions(km)
     );
 
-    kmEqn().relax();
-    fvOptions.constrain(kmEqn());
+    kmEqn.ref().relax();
+    fvOptions.constrain(kmEqn.ref());
     solve(kmEqn);
     fvOptions.correct(km);
     bound(km, this->kMin_);
diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
index 40f670e36a..b2e6cd9796 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -202,9 +202,9 @@ void DeardorffDiffStress<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, R)
     );
 
-    REqn().relax();
-    fvOptions.constrain(REqn());
-    REqn().solve();
+    REqn.ref().relax();
+    fvOptions.constrain(REqn.ref());
+    REqn.ref().solve();
     fvOptions.correct(R);
     this->boundNormalStress(R);
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C
index 38517e5bc5..9b6f2c4c8b 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ void Foam::LESModels::IDDESDelta::calcDelta()
         )
     );
 
-    scalarField& faceToFacenMax = tfaceToFacenMax().internalField();
+    scalarField& faceToFacenMax = tfaceToFacenMax.ref().internalField();
 
     const cellList& cells = mesh.cells();
     const vectorField& faceCentres = mesh.faceCentres();
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
index 701bab6da3..865f3fc693 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,24 +46,8 @@ void Foam::LESModels::maxDeltaxyz::calcDelta()
 
     label nD = mesh.nGeometricD();
 
-    tmp<volScalarField> hmax
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "hmax",
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh,
-            dimensionedScalar("zrero", dimLength, 0.0)
-        )
-    );
-
     const cellList& cells = mesh.cells();
+    scalarField hmax(cells.size());
 
     forAll(cells,cellI)
     {
@@ -81,12 +65,13 @@ void Foam::LESModels::maxDeltaxyz::calcDelta()
                 deltaMaxTmp = tmp;
             }
         }
-        hmax()[cellI] = deltaCoeff_*deltaMaxTmp;
+
+        hmax[cellI] = deltaCoeff_*deltaMaxTmp;
     }
 
     if (nD == 3)
     {
-        delta_.internalField() = hmax();
+        delta_.internalField() = hmax;
     }
     else if (nD == 2)
     {
@@ -94,7 +79,7 @@ void Foam::LESModels::maxDeltaxyz::calcDelta()
             << "Case is 2D, LES is not strictly applicable\n"
             << endl;
 
-        delta_.internalField() = hmax();
+        delta_.internalField() = hmax;
     }
     else
     {
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
index 08ce6197c6..8128591b42 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -190,7 +190,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::anisotropicFilter::operator()
 
     for (direction d=0; d<symmTensor::nComponents; d++)
     {
-        tmpFilteredField().replace
+        tmpFilteredField.ref().replace
         (
             d, anisotropicFilter::operator()(unFilteredField().component(d))
         );
@@ -224,7 +224,7 @@ Foam::tmp<Foam::volTensorField> Foam::anisotropicFilter::operator()
 
     for (direction d=0; d<tensor::nComponents; d++)
     {
-        tmpFilteredField().replace
+        tmpFilteredField.ref().replace
         (
             d, anisotropicFilter::operator()(unFilteredField().component(d))
         );
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
index 186970ca61..c48c901ba3 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ tmp<volScalarField> SpalartAllmarasDDES<BasicTurbulenceModel>::rd
             scalar(10)
         )
     );
-    tr().boundaryField() == 0.0;
+    tr.ref().boundaryField() == 0.0;
 
     return tr;
 }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
index 02f35be372..401e26d963 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::r
             scalar(10)
         )
     );
-    tr().boundaryField() == 0.0;
+    tr.ref().boundaryField() == 0.0;
 
     return tr;
 }
@@ -158,7 +158,7 @@ tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::dTilda
 ) const
 {
     tmp<volScalarField> tdTilda(CDES_*this->delta());
-    min(tdTilda().dimensionedInternalField(), tdTilda(), y_);
+    min(tdTilda.ref().dimensionedInternalField(), tdTilda(), y_);
     return tdTilda;
 }
 
@@ -442,8 +442,8 @@ void SpalartAllmarasDES<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, nuTilda_)
     );
 
-    nuTildaEqn().relax();
-    fvOptions.constrain(nuTildaEqn());
+    nuTildaEqn.ref().relax();
+    fvOptions.constrain(nuTildaEqn.ref());
     solve(nuTildaEqn);
     fvOptions.correct(nuTilda_);
     bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0.0));
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
index 1b61975899..c9c08b5672 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -274,8 +274,8 @@ void dynamicKEqn<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, k_)
     );
 
-    kEqn().relax();
-    fvOptions.constrain(kEqn());
+    kEqn.ref().relax();
+    fvOptions.constrain(kEqn.ref());
     solve(kEqn);
     fvOptions.correct(k_);
     bound(k_, this->kMin_);
diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
index 4a87768c10..5f617bf84e 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -196,8 +196,8 @@ void kEqn<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, k_)
     );
 
-    kEqn().relax();
-    fvOptions.constrain(kEqn());
+    kEqn.ref().relax();
+    fvOptions.constrain(kEqn.ref());
     solve(kEqn);
     fvOptions.correct(k_);
     bound(k_, this->kMin_);
diff --git a/src/TurbulenceModels/turbulenceModels/Make/options b/src/TurbulenceModels/turbulenceModels/Make/options
index a3ae8da833..bcd627471b 100644
--- a/src/TurbulenceModels/turbulenceModels/Make/options
+++ b/src/TurbulenceModels/turbulenceModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
index 63625919d8..c15fabab3d 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
@@ -307,9 +307,9 @@ void LRR<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, epsilon_)
     );
 
-    epsEqn().relax();
-    fvOptions.constrain(epsEqn());
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().relax();
+    fvOptions.constrain(epsEqn.ref());
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
     fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
@@ -362,13 +362,13 @@ void LRR<BasicTurbulenceModel>::correct()
             Cref1_*R - ((Cref2_*C2_)*(k_/epsilon_))*dev(P)
         );
 
-        REqn() +=
+        REqn.ref() +=
             ((3*pow(Cmu_, 0.75)/kappa_)*(alpha*rho*sqrt(k_)/y_))
            *dev(symm((n_ & reflect)*n_));
     }
 
-    REqn().relax();
-    fvOptions.constrain(REqn());
+    REqn.ref().relax();
+    fvOptions.constrain(REqn.ref());
     solve(REqn);
     fvOptions.correct(R);
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index c69c7b13c4..ce79ca5011 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -280,9 +280,9 @@ void LaunderSharmaKE<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, epsilon_)
     );
 
-    epsEqn().relax();
-    fvOptions.constrain(epsEqn());
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().relax();
+    fvOptions.constrain(epsEqn.ref());
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
     fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
@@ -301,8 +301,8 @@ void LaunderSharmaKE<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, k_)
     );
 
-    kEqn().relax();
-    fvOptions.constrain(kEqn());
+    kEqn.ref().relax();
+    fvOptions.constrain(kEqn.ref());
     solve(kEqn);
     fvOptions.correct(k_);
     bound(k_, this->kMin_);
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
index c88dffbc84..17e8f14f98 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -288,9 +288,9 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, epsilon_)
     );
 
-    epsEqn().relax();
-    fvOptions.constrain(epsEqn());
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().relax();
+    fvOptions.constrain(epsEqn.ref());
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
     fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
@@ -311,8 +311,8 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, k_)
     );
 
-    kEqn().relax();
-    fvOptions.constrain(kEqn());
+    kEqn.ref().relax();
+    fvOptions.constrain(kEqn.ref());
     solve(kEqn);
     fvOptions.correct(k_);
     bound(k_, this->kMin_);
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
index dc8815d8f3..7117f16623 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
@@ -317,9 +317,9 @@ void SSG<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, epsilon_)
     );
 
-    epsEqn().relax();
-    fvOptions.constrain(epsEqn());
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().relax();
+    fvOptions.constrain(epsEqn.ref());
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
     fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
@@ -371,8 +371,8 @@ void SSG<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, R)
     );
 
-    REqn().relax();
-    fvOptions.constrain(REqn());
+    REqn.ref().relax();
+    fvOptions.constrain(REqn.ref());
     solve(REqn);
     fvOptions.correct(R);
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
index 23446bc657..22e0529729 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -377,8 +377,8 @@ void SpalartAllmaras<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, nuTilda_)
     );
 
-    nuTildaEqn().relax();
-    fvOptions.constrain(nuTildaEqn());
+    nuTildaEqn.ref().relax();
+    fvOptions.constrain(nuTildaEqn.ref());
     solve(nuTildaEqn);
     fvOptions.correct(nuTilda_);
     bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0.0));
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
index 2fd57bbc3f..8733871d7a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
@@ -258,9 +258,9 @@ void kEpsilon<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, epsilon_)
     );
 
-    epsEqn().relax();
-    fvOptions.constrain(epsEqn());
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().relax();
+    fvOptions.constrain(epsEqn.ref());
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
     fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
@@ -279,8 +279,8 @@ void kEpsilon<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, k_)
     );
 
-    kEqn().relax();
-    fvOptions.constrain(kEqn());
+    kEqn.ref().relax();
+    fvOptions.constrain(kEqn.ref());
     solve(kEqn);
     fvOptions.correct(k_);
     bound(k_, this->kMin_);
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
index 0a45b35325..9084c57208 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
@@ -221,9 +221,9 @@ void kOmega<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, omega_)
     );
 
-    omegaEqn().relax();
-    fvOptions.constrain(omegaEqn());
-    omegaEqn().boundaryManipulate(omega_.boundaryField());
+    omegaEqn.ref().relax();
+    fvOptions.constrain(omegaEqn.ref());
+    omegaEqn.ref().boundaryManipulate(omega_.boundaryField());
     solve(omegaEqn);
     fvOptions.correct(omega_);
     bound(omega_, this->omegaMin_);
@@ -242,8 +242,8 @@ void kOmega<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, k_)
     );
 
-    kEqn().relax();
-    fvOptions.constrain(kEqn());
+    kEqn.ref().relax();
+    fvOptions.constrain(kEqn.ref());
     solve(kEqn);
     fvOptions.correct(k_);
     bound(k_, this->kMin_);
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
index ffbb4cb895..1deb432d4a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
@@ -101,7 +101,7 @@ tmp<volScalarField> kOmegaSST<BasicTurbulenceModel>::kOmegaSST::F23() const
 
     if (F3_)
     {
-        f23() *= F3();
+        f23.ref() *= F3();
     }
 
     return f23;
@@ -452,9 +452,9 @@ void kOmegaSST<BasicTurbulenceModel>::correct()
           + fvOptions(alpha, rho, omega_)
         );
 
-        omegaEqn().relax();
-        fvOptions.constrain(omegaEqn());
-        omegaEqn().boundaryManipulate(omega_.boundaryField());
+        omegaEqn.ref().relax();
+        fvOptions.constrain(omegaEqn.ref());
+        omegaEqn.ref().boundaryManipulate(omega_.boundaryField());
         solve(omegaEqn);
         fvOptions.correct(omega_);
         bound(omega_, this->omegaMin_);
@@ -474,8 +474,8 @@ void kOmegaSST<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, k_)
     );
 
-    kEqn().relax();
-    fvOptions.constrain(kEqn());
+    kEqn.ref().relax();
+    fvOptions.constrain(kEqn.ref());
     solve(kEqn);
     fvOptions.correct(k_);
     bound(k_, this->kMin_);
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
index f5b7dcf76a..aa74f0e57b 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
@@ -304,9 +304,9 @@ void realizableKE<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, epsilon_)
     );
 
-    epsEqn().relax();
-    fvOptions.constrain(epsEqn());
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().relax();
+    fvOptions.constrain(epsEqn.ref());
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
     fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
@@ -327,8 +327,8 @@ void realizableKE<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, k_)
     );
 
-    kEqn().relax();
-    fvOptions.constrain(kEqn());
+    kEqn.ref().relax();
+    fvOptions.constrain(kEqn.ref());
     solve(kEqn);
     fvOptions.correct(k_);
     bound(k_, this->kMin_);
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
index 84b12dc1b8..3bbe58c360 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
@@ -329,9 +329,9 @@ void v2f<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, epsilon_)
     );
 
-    epsEqn().relax();
-    fvOptions.constrain(epsEqn());
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().relax();
+    fvOptions.constrain(epsEqn.ref());
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
     fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
@@ -350,8 +350,8 @@ void v2f<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, k_)
     );
 
-    kEqn().relax();
-    fvOptions.constrain(kEqn());
+    kEqn.ref().relax();
+    fvOptions.constrain(kEqn.ref());
     solve(kEqn);
     fvOptions.correct(k_);
     bound(k_, this->kMin_);
@@ -366,8 +366,8 @@ void v2f<BasicTurbulenceModel>::correct()
       - 1.0/L2/k_*(v2fAlpha - C2_*G)
     );
 
-    fEqn().relax();
-    fvOptions.constrain(fEqn());
+    fEqn.ref().relax();
+    fvOptions.constrain(fEqn.ref());
     solve(fEqn);
     fvOptions.correct(f_);
     bound(f_, fMin_);
@@ -385,8 +385,8 @@ void v2f<BasicTurbulenceModel>::correct()
       + fvOptions(alpha, rho, v2_)
     );
 
-    v2Eqn().relax();
-    fvOptions.constrain(v2Eqn());
+    v2Eqn.ref().relax();
+    fvOptions.constrain(v2Eqn.ref());
     solve(v2Eqn);
     fvOptions.correct(v2_);
     bound(v2_, v2Min_);
diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
index 0893bea4a6..e32c7369fb 100644
--- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
+++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
@@ -198,7 +198,7 @@ Foam::tmp<Foam::volScalarField>
 Foam::ReynoldsStress<BasicTurbulenceModel>::k() const
 {
     tmp<Foam::volScalarField> tk(0.5*tr(R_));
-    tk().rename("k");
+    tk.ref().rename("k");
     return tk;
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
index 476a1679a0..7605716a4a 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,10 +57,10 @@ tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcNut() const
     const scalarField magUp(mag(Uw.patchInternalField() - Uw));
 
     tmp<scalarField> tyPlus = calcYPlus(magUp);
-    scalarField& yPlus = tyPlus();
+    scalarField& yPlus = tyPlus.ref();
 
     tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0));
-    scalarField& nutw = tnutw();
+    scalarField& nutw = tnutw.ref();
 
     forAll(yPlus, facei)
     {
@@ -95,7 +95,7 @@ tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcYPlus
     const scalarField& nuw = tnuw();
 
     tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
-    scalarField& yPlus = tyPlus();
+    scalarField& yPlus = tyPlus.ref();
 
     if (roughnessHeight_ > 0.0)
     {
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
index 711eb54438..fca1d717d2 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::calcUTau
     const scalarField& nutw = *this;
 
     tmp<scalarField> tuTau(new scalarField(patch().size(), 0.0));
-    scalarField& uTau = tuTau();
+    scalarField& uTau = tuTau.ref();
 
     forAll(uTau, faceI)
     {
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
index 9bc4767efd..eb4c55fb94 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ tmp<scalarField> nutUTabulatedWallFunctionFvPatchScalarField::calcUPlus
 ) const
 {
     tmp<scalarField> tuPlus(new scalarField(patch().size(), 0.0));
-    scalarField& uPlus = tuPlus();
+    scalarField& uPlus = tuPlus.ref();
 
     forAll(uPlus, faceI)
     {
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
index 9d848e8efa..8a85d72267 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,10 +54,10 @@ tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcNut() const
     const scalarField& nuw = tnuw();
 
     tmp<scalarField> tyPlus = calcYPlus(magUp);
-    scalarField& yPlus = tyPlus();
+    scalarField& yPlus = tyPlus.ref();
 
     tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0));
-    scalarField& nutw = tnutw();
+    scalarField& nutw = tnutw.ref();
 
     forAll(yPlus, facei)
     {
@@ -92,7 +92,7 @@ tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcYPlus
     const scalarField& nuw = tnuw();
 
     tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
-    scalarField& yPlus = tyPlus();
+    scalarField& yPlus = tyPlus.ref();
 
     forAll(yPlus, facei)
     {
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
index 9392408888..710ff8242b 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ tmp<scalarField> nutkAtmRoughWallFunctionFvPatchScalarField::calcNut() const
     const scalar Cmu25 = pow025(Cmu_);
 
     tmp<scalarField> tnutw(new scalarField(*this));
-    scalarField& nutw = tnutw();
+    scalarField& nutw = tnutw.ref();
 
     forAll(nutw, faceI)
     {
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
index 2d2f038b5a..67405f0aa8 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ tmp<scalarField> nutkRoughWallFunctionFvPatchScalarField::calcNut() const
     const scalar Cmu25 = pow025(Cmu_);
 
     tmp<scalarField> tnutw(new scalarField(*this));
-    scalarField& nutw = tnutw();
+    scalarField& nutw = tnutw.ref();
 
     forAll(nutw, faceI)
     {
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
index 98b3f548ff..60dcf74b26 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ tmp<scalarField> nutkWallFunctionFvPatchScalarField::calcNut() const
     const scalar Cmu25 = pow025(Cmu_);
 
     tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0));
-    scalarField& nutw = tnutw();
+    scalarField& nutw = tnutw.ref();
 
     forAll(nutw, faceI)
     {
diff --git a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
index c24ac4d6c5..409e9e8ca9 100644
--- a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ Foam::nonlinearEddyViscosity<BasicTurbulenceModel>::R() const
     (
         eddyViscosity<BasicTurbulenceModel>::R()
     );
-    tR() += nonlinearStress_;
+    tR.ref() += nonlinearStress_;
     return tR;
 }
 
@@ -96,7 +96,7 @@ Foam::nonlinearEddyViscosity<BasicTurbulenceModel>::devRhoReff() const
     (
         eddyViscosity<BasicTurbulenceModel>::devRhoReff()
     );
-    tdevRhoReff() += this->rho_*nonlinearStress_;
+    tdevRhoReff.ref() += this->rho_*nonlinearStress_;
     return tdevRhoReff;
 }
 
diff --git a/src/finiteVolume/Make/options b/src/finiteVolume/Make/options
index 1c1990e5f3..25eb0cc6f8 100644
--- a/src/finiteVolume/Make/options
+++ b/src/finiteVolume/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
index 89b9e85470..a4b099b6cb 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
@@ -180,7 +180,7 @@ Foam::tmp<Foam::volVectorField> Foam::MRFZoneList::DDt
             dimensionedVector("0", U.dimensions()/dimTime, vector::zero)
         )
     );
-    volVectorField& acceleration = tacceleration();
+    volVectorField& acceleration = tacceleration.ref();
 
     forAll(*this, i)
     {
@@ -238,7 +238,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::MRFZoneList::relative
             )
         );
 
-        makeRelative(rphi());
+        makeRelative(rphi.ref());
 
         reuseTmpGeometricField<scalar, scalar, fvsPatchField, surfaceMesh>
         ::clear(tphi);
@@ -267,7 +267,7 @@ Foam::MRFZoneList::relative
 
         forAll(*this, i)
         {
-            operator[](i).makeRelative(rphi());
+            operator[](i).makeRelative(rphi.ref());
         }
 
         reuseTmpFieldField<fvsPatchField, scalar, scalar>::clear(tphi);
@@ -297,7 +297,7 @@ Foam::MRFZoneList::relative
 
         forAll(*this, i)
         {
-            operator[](i).makeRelative(rphi(), patchi);
+            operator[](i).makeRelative(rphi.ref(), patchi);
         }
 
         reuseTmp<scalar, scalar>::clear(tphi);
@@ -361,7 +361,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::MRFZoneList::absolute
             )
         );
 
-        makeAbsolute(rphi());
+        makeAbsolute(rphi.ref());
 
         reuseTmpGeometricField<scalar, scalar, fvsPatchField, surfaceMesh>
         ::clear(tphi);
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
index 928777483f..93944c12bf 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
@@ -226,7 +226,7 @@ Foam::tmp<Foam::volVectorField> Foam::SRF::SRFModel::Uabs() const
     );
 
     // Add SRF contribution to internal field
-    tUabs().internalField() += Urel_.internalField();
+    tUabs.ref().internalField() += Urel_.internalField();
 
     // Add Urel boundary contributions
     const volVectorField::GeometricBoundaryField& bvf = Urel_.boundaryField();
@@ -241,12 +241,12 @@ Foam::tmp<Foam::volVectorField> Foam::SRF::SRFModel::Uabs() const
                 refCast<const SRFVelocityFvPatchVectorField>(bvf[i]);
             if (UrelPatch.relative())
             {
-                tUabs().boundaryField()[i] += Urel_.boundaryField()[i];
+                tUabs.ref().boundaryField()[i] += Urel_.boundaryField()[i];
             }
         }
         else
         {
-            tUabs().boundaryField()[i] += Urel_.boundaryField()[i];
+            tUabs.ref().boundaryField()[i] += Urel_.boundaryField()[i];
         }
     }
 
diff --git a/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C b/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C
index beb2c223e2..38f84f96a7 100644
--- a/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C
+++ b/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C
@@ -40,16 +40,15 @@ Foam::tmp<Foam::volVectorField> Foam::constrainHbyA
 
     if (tHbyA.isTmp())
     {
-        volVectorField* HbyAPtr = tHbyA.ptr();
-        HbyAPtr->rename("HbyA");
-        tHbyANew = HbyAPtr;
+        tHbyANew = tHbyA;
+        tHbyANew.ref().rename("HbyA");
     }
     else
     {
         tHbyANew = new volVectorField("HbyA", tHbyA);
     }
 
-    volVectorField& HbyA = tHbyANew();
+    volVectorField& HbyA = tHbyANew.ref();
 
     forAll(U.boundaryField(), patchi)
     {
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
index ca14e2b24e..8b9c65856c 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
@@ -47,7 +47,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
     const dimensionSet ds = field.dimensions()/dimTime*dimVolume;
 
     tmp<fvMatrix<Type>> tmtx(new fvMatrix<Type>(field, ds));
-    fvMatrix<Type>& mtx = tmtx();
+    fvMatrix<Type>& mtx = tmtx.ref();
 
     forAll(*this, i)
     {
@@ -103,7 +103,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
     );
 
     tmp<fvMatrix<Type>> tmtx(new fvMatrix<Type>(field, ds));
-    fvMatrix<Type>& mtx = tmtx();
+    fvMatrix<Type>& mtx = tmtx.ref();
 
     forAll(*this, i)
     {
@@ -162,7 +162,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
     );
 
     tmp<fvMatrix<Type>> tmtx(new fvMatrix<Type>(field, ds));
-    fvMatrix<Type>& mtx = tmtx();
+    fvMatrix<Type>& mtx = tmtx.ref();
 
     forAll(*this, i)
     {
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
index 8dd817f293..631f074ad9 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -158,7 +158,7 @@ Foam::tmp<Foam::vectorField> Foam::porosityModel::porosityModel::force
 
     if (!cellZoneIDs_.empty())
     {
-        this->calcForce(U, rho, mu, tforce());
+        this->calcForce(U, rho, mu, tforce.ref());
     }
 
     return tforce;
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 835de2a5f1..a80f6c0786 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -127,7 +127,7 @@ Foam::cyclicFvPatchField<Type>::patchNeighbourField() const
         cyclicPatch().cyclicPatch().neighbPatch().faceCells();
 
     tmp<Field<Type>> tpnf(new Field<Type>(this->size()));
-    Field<Type>& pnf = tpnf();
+    Field<Type>& pnf = tpnf.ref();
 
 
     if (doTransform())
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
index 194aabf65e..0ded42fdf7 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
@@ -159,7 +159,7 @@ Foam::cyclicACMIFvPatchField<Type>::patchNeighbourField() const
 
     if (doTransform())
     {
-        tpnf() = transform(forwardT(), tpnf());
+        tpnf.ref() = transform(forwardT(), tpnf());
     }
 
     return tpnf;
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index f993a8d8d9..a241a8071c 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -151,7 +151,7 @@ Foam::cyclicAMIFvPatchField<Type>::patchNeighbourField() const
 
     if (doTransform())
     {
-        tpnf() = transform(forwardT(), tpnf());
+        tpnf.ref() = transform(forwardT(), tpnf());
     }
 
     return tpnf;
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
index a66f608955..07764053fc 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
@@ -98,7 +98,7 @@ Foam::jumpCyclicFvPatchField<Type>::patchNeighbourField() const
         this->cyclicPatch().neighbFvPatch().faceCells();
 
     tmp<Field<Type>> tpnf(new Field<Type>(this->size()));
-    Field<Type>& pnf = tpnf();
+    Field<Type>& pnf = tpnf.ref();
 
     Field<Type> jf(this->jump());
     if (!this->cyclicPatch().owner())
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
index a4f4856f2a..1c52eadef5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
@@ -180,7 +180,7 @@ tmp<Field<Type>> mappedPatchFieldBase<Type>::mappedField() const
 
     // Result of obtaining remote values
     tmp<Field<Type>> tnewValues(new Field<Type>(0));
-    Field<Type>& newValues = tnewValues();
+    Field<Type>& newValues = tnewValues.ref();
 
     switch (mapper_.mode())
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
index e8f97d0cf8..537881840b 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
@@ -80,7 +80,7 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
         // Check if constraint type override and store patchType if so
         if ((patchTypeCstrIter != patchConstructorTablePtr_->end()))
         {
-            tfvp().patchType() = actualPatchType;
+            tfvp.ref().patchType() = actualPatchType;
         }
         return tfvp;
     }
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C
index 152b0dc6c4..38040b2119 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C
@@ -90,7 +90,7 @@ gaussConvectionScheme<Type>::fvmDiv
             faceFlux.dimensions()*vf.dimensions()
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     fvm.lower() = -weights.internalField()*faceFlux.internalField();
     fvm.upper() = fvm.lower() + faceFlux.internalField();
@@ -128,7 +128,7 @@ gaussConvectionScheme<Type>::fvcDiv
         fvc::surfaceIntegrate(flux(faceFlux, vf))
     );
 
-    tConvection().rename
+    tConvection.ref().rename
     (
         "convection(" + faceFlux.name() + ',' + vf.name() + ')'
     );
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
index 6d8a46ba73..44ee364964 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
@@ -247,7 +247,7 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
         )
     );
 
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar deltaT = mesh().time().deltaTValue();
     scalar deltaT0 = mesh().time().deltaT0Value();
@@ -308,7 +308,7 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
         )
     );
 
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar deltaT = mesh().time().deltaTValue();
     scalar deltaT0 = mesh().time().deltaT0Value();
@@ -368,7 +368,7 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
         )
     );
 
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar deltaT = mesh().time().deltaTValue();
     scalar deltaT0 = mesh().time().deltaT0Value();
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index f45c34dfce..2374f31fff 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -61,7 +61,7 @@ tmp<volScalarField> CoEulerDdtScheme<Type>::CorDeltaT() const
         )
     );
 
-    volScalarField& corDeltaT = tcorDeltaT();
+    volScalarField& corDeltaT = tcorDeltaT.ref();
 
     const labelUList& owner = mesh().owner();
     const labelUList& neighbour = mesh().neighbour();
@@ -183,7 +183,7 @@ CoEulerDdtScheme<Type>::fvcDdt
             )
         );
 
-        tdtdt().internalField() =
+        tdtdt.ref().internalField() =
             rDeltaT.internalField()*dt.value()
            *(1.0 - mesh().Vsc0()/mesh().Vsc());
 
@@ -453,7 +453,7 @@ CoEulerDdtScheme<Type>::fvmDdt
         )
     );
 
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalarField rDeltaT(CorDeltaT()().internalField());
 
@@ -488,7 +488,7 @@ CoEulerDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalarField rDeltaT(CorDeltaT()().internalField());
 
@@ -525,7 +525,7 @@ CoEulerDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalarField rDeltaT(CorDeltaT()().internalField());
 
@@ -565,7 +565,7 @@ CoEulerDdtScheme<Type>::fvmDdt
             alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalarField rDeltaT(CorDeltaT()().internalField());
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index c98d9979a9..d33969f50a 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -330,7 +330,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             )/mesh().V0();
         }
 
-        tdtdt().dimensionedInternalField() =
+        tdtdt.ref().dimensionedInternalField() =
         (
             (rDtCoef*dt)*(mesh().V() - mesh().V0())
           - mesh().V0()*offCentre_(ddt0.dimensionedInternalField())
@@ -773,7 +773,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
         )
     );
 
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDtCoef = rDtCoef_(ddt0).value();
     fvm.diag() = rDtCoef*mesh().V();
@@ -855,7 +855,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDtCoef = rDtCoef_(ddt0).value();
     fvm.diag() = rDtCoef*rho.value()*mesh().V();
@@ -937,7 +937,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDtCoef = rDtCoef_(ddt0).value();
     fvm.diag() = rDtCoef*rho.internalField()*mesh().V();
@@ -1028,7 +1028,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
             alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDtCoef = rDtCoef_(ddt0).value();
     fvm.diag() = rDtCoef*alpha.internalField()*rho.internalField()*mesh().V();
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index 8cbc6d42a0..79c3069f0d 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -73,7 +73,7 @@ EulerDdtScheme<Type>::fvcDdt
             )
         );
 
-        tdtdt().internalField() =
+        tdtdt.ref().internalField() =
             rDeltaT.value()*dt.value()*(1.0 - mesh().Vsc0()/mesh().Vsc());
 
         return tdtdt;
@@ -342,7 +342,7 @@ EulerDdtScheme<Type>::fvmDdt
         )
     );
 
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDeltaT = 1.0/mesh().time().deltaTValue();
 
@@ -377,7 +377,7 @@ EulerDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDeltaT = 1.0/mesh().time().deltaTValue();
 
@@ -414,7 +414,7 @@ EulerDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDeltaT = 1.0/mesh().time().deltaTValue();
 
@@ -454,7 +454,7 @@ EulerDdtScheme<Type>::fvmDdt
             alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDeltaT = 1.0/mesh().time().deltaTValue();
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index ea87426041..204f88e69c 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -111,7 +111,7 @@ tmp<volScalarField> SLTSDdtScheme<Type>::SLrDeltaT() const
         )
     );
 
-    volScalarField& rDeltaT = trDeltaT();
+    volScalarField& rDeltaT = trDeltaT.ref();
 
     relaxedDiag(rDeltaT, phi);
 
@@ -183,7 +183,7 @@ SLTSDdtScheme<Type>::fvcDdt
             )
         );
 
-        tdtdt().internalField() =
+        tdtdt.ref().internalField() =
             rDeltaT.internalField()*dt.value()*(1.0 - mesh().V0()/mesh().V());
 
         return tdtdt;
@@ -452,7 +452,7 @@ SLTSDdtScheme<Type>::fvmDdt
         )
     );
 
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalarField rDeltaT(SLrDeltaT()().internalField());
 
@@ -487,7 +487,7 @@ SLTSDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalarField rDeltaT(SLrDeltaT()().internalField());
 
@@ -524,7 +524,7 @@ SLTSDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalarField rDeltaT(SLrDeltaT()().internalField());
 
@@ -564,7 +564,7 @@ SLTSDdtScheme<Type>::fvmDdt
             alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalarField rDeltaT(SLrDeltaT()().internalField());
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index 5108e7d31a..9297d106d8 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -111,7 +111,7 @@ backwardDdtScheme<Type>::fvcDdt
             )
         );
 
-        tdtdt().internalField() = rDeltaT.value()*dt.value()*
+        tdtdt.ref().internalField() = rDeltaT.value()*dt.value()*
         (
             coefft - (coefft0*mesh().V0() - coefft00*mesh().V00())/mesh().V()
         );
@@ -467,7 +467,7 @@ backwardDdtScheme<Type>::fvmDdt
         )
     );
 
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDeltaT = 1.0/deltaT_();
 
@@ -518,7 +518,7 @@ backwardDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDeltaT = 1.0/deltaT_();
 
@@ -569,7 +569,7 @@ backwardDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDeltaT = 1.0/deltaT_();
 
@@ -624,7 +624,7 @@ backwardDdtScheme<Type>::fvmDdt
             alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     scalar rDeltaT = 1.0/deltaT_();
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C
index e7dc6dc813..c81e9f5266 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C
@@ -48,7 +48,7 @@ boundedDdtScheme<Type>::fvcDdt
     const dimensioned<Type>& dt
 )
 {
-    return scheme_().fvcDdt(dt);
+    return scheme_.ref().fvcDdt(dt);
 }
 
 
@@ -59,7 +59,7 @@ boundedDdtScheme<Type>::fvcDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return scheme_().fvcDdt(vf);
+    return scheme_.ref().fvcDdt(vf);
 }
 
 
@@ -71,7 +71,7 @@ boundedDdtScheme<Type>::fvcDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return scheme_().fvcDdt(rho, vf);
+    return scheme_.ref().fvcDdt(rho, vf);
 }
 
 
@@ -83,7 +83,7 @@ boundedDdtScheme<Type>::fvcDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return scheme_().fvcDdt(rho, vf) - fvc::ddt(rho)*vf;
+    return scheme_.ref().fvcDdt(rho, vf) - fvc::ddt(rho)*vf;
 }
 
 
@@ -96,7 +96,7 @@ boundedDdtScheme<Type>::fvcDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return scheme_().fvcDdt(alpha, rho, vf) - fvc::ddt(alpha, rho)*vf;
+    return scheme_.ref().fvcDdt(alpha, rho, vf) - fvc::ddt(alpha, rho)*vf;
 }
 
 
@@ -107,7 +107,7 @@ boundedDdtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return scheme_().fvmDdt(vf);
+    return scheme_.ref().fvmDdt(vf);
 }
 
 
@@ -119,7 +119,7 @@ boundedDdtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return scheme_().fvmDdt(rho, vf);
+    return scheme_.ref().fvmDdt(rho, vf);
 }
 
 
@@ -131,7 +131,7 @@ boundedDdtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return scheme_().fvmDdt(rho, vf) - fvm::Sp(fvc::ddt(rho), vf);
+    return scheme_.ref().fvmDdt(rho, vf) - fvm::Sp(fvc::ddt(rho), vf);
 }
 
 
@@ -144,7 +144,9 @@ boundedDdtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return scheme_().fvmDdt(alpha, rho, vf) - fvm::Sp(fvc::ddt(alpha, rho), vf);
+    return
+        scheme_.ref().fvmDdt(alpha, rho, vf)
+      - fvm::Sp(fvc::ddt(alpha, rho), vf);
 }
 
 
@@ -156,7 +158,7 @@ boundedDdtScheme<Type>::fvcDdtUfCorr
     const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
 )
 {
-    return scheme_().fvcDdtUfCorr(U, Uf);
+    return scheme_.ref().fvcDdtUfCorr(U, Uf);
 }
 
 
@@ -168,7 +170,7 @@ boundedDdtScheme<Type>::fvcDdtPhiCorr
     const fluxFieldType& phi
 )
 {
-    return scheme_().fvcDdtPhiCorr(U, phi);
+    return scheme_.ref().fvcDdtPhiCorr(U, phi);
 }
 
 
@@ -181,7 +183,7 @@ boundedDdtScheme<Type>::fvcDdtUfCorr
     const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
 )
 {
-    return scheme_().fvcDdtUfCorr(rho, U, Uf);
+    return scheme_.ref().fvcDdtUfCorr(rho, U, Uf);
 }
 
 
@@ -194,7 +196,7 @@ boundedDdtScheme<Type>::fvcDdtPhiCorr
     const fluxFieldType& phi
 )
 {
-    return scheme_().fvcDdtPhiCorr(rho, U, phi);
+    return scheme_.ref().fvcDdtPhiCorr(rho, U, phi);
 }
 
 
@@ -204,7 +206,7 @@ tmp<surfaceScalarField> boundedDdtScheme<Type>::meshPhi
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return scheme_().meshPhi(vf);
+    return scheme_.ref().meshPhi(vf);
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 5144c744c9..62cca7ec3a 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -148,7 +148,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
             scalar(1)
         );
 
-    surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff();
+    surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff.ref();
 
     forAll(U.boundaryField(), patchi)
     {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
index c77e3de641..4338399573 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@@ -79,7 +79,7 @@ localEulerDdtScheme<Type>::fvcDdt
             )
         );
 
-        tdtdt().internalField() =
+        tdtdt.ref().internalField() =
             rDeltaT.internalField()*dt.value()
            *(1.0 - mesh().Vsc0()/mesh().Vsc());
 
@@ -349,7 +349,7 @@ localEulerDdtScheme<Type>::fvmDdt
         )
     );
 
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     const scalarField& rDeltaT = localRDeltaT().internalField();
 
@@ -384,7 +384,7 @@ localEulerDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     const scalarField& rDeltaT = localRDeltaT().internalField();
 
@@ -421,7 +421,7 @@ localEulerDdtScheme<Type>::fvmDdt
             rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     const scalarField& rDeltaT = localRDeltaT().internalField();
 
@@ -461,7 +461,7 @@ localEulerDdtScheme<Type>::fvmDdt
             alpha.dimensions()*rho.dimensions()*vf.dimensions()*dimVol/dimTime
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     const scalarField& rDeltaT = localRDeltaT().internalField();
 
diff --git a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C
index 8d445b2f77..9721a04eca 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ gaussDivScheme<Type>::fvcDiv
         )
     );
 
-    tDiv().rename("div(" + vf.name() + ')');
+    tDiv.ref().rename("div(" + vf.name() + ')');
 
     return tDiv;
 }
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
index 022a5a688a..711a012f66 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
@@ -65,8 +65,7 @@ average
             ssf.dimensions()
         )
     );
-
-    GeometricField<Type, fvPatchField, volMesh>& av = taverage();
+    GeometricField<Type, fvPatchField, volMesh>& av = taverage.ref();
 
     av.internalField() =
     (
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDdt.C b/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
index 3cabcd5154..391da38be3 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
@@ -51,7 +51,7 @@ ddt
     (
         mesh,
         mesh.ddtScheme("ddt(" + dt.name() + ')')
-    )().fvcDdt(dt);
+    ).ref().fvcDdt(dt);
 }
 
 
@@ -66,7 +66,7 @@ ddt
     (
         vf.mesh(),
         vf.mesh().ddtScheme("ddt(" + vf.name() + ')')
-    )().fvcDdt(vf);
+    ).ref().fvcDdt(vf);
 }
 
 
@@ -82,7 +82,7 @@ ddt
     (
         vf.mesh(),
         vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
-    )().fvcDdt(rho, vf);
+    ).ref().fvcDdt(rho, vf);
 }
 
 
@@ -98,7 +98,7 @@ ddt
     (
         vf.mesh(),
         vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
-    )().fvcDdt(rho, vf);
+    ).ref().fvcDdt(rho, vf);
 }
 
 
@@ -121,7 +121,7 @@ ddt
           + rho.name() + ','
           + vf.name() + ')'
         )
-    )().fvcDdt(alpha, rho, vf);
+    ).ref().fvcDdt(alpha, rho, vf);
 }
 
 
@@ -161,7 +161,7 @@ ddtCorr
     (
         U.mesh(),
         U.mesh().ddtScheme("ddt(" + U.name() + ')')
-    )().fvcDdtUfCorr(U, Uf);
+    ).ref().fvcDdtUfCorr(U, Uf);
 }
 
 
@@ -182,7 +182,7 @@ ddtCorr
     (
         U.mesh(),
         U.mesh().ddtScheme("ddt(" + U.name() + ')')
-    )().fvcDdtPhiCorr(U, phi);
+    ).ref().fvcDdtPhiCorr(U, phi);
 }
 
 
@@ -199,7 +199,7 @@ ddtCorr
     (
         U.mesh(),
         U.mesh().ddtScheme("ddt(" + U.name() + ')')
-    )().fvcDdtUfCorr(rho, U, Uf);
+    ).ref().fvcDdtUfCorr(rho, U, Uf);
 }
 
 
@@ -221,7 +221,7 @@ ddtCorr
     (
         U.mesh(),
         U.mesh().ddtScheme("ddt(" + rho.name() + ',' + U.name() + ')')
-    )().fvcDdtPhiCorr(rho, U, phi);
+    ).ref().fvcDdtPhiCorr(rho, U, phi);
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDiv.C b/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
index c788eac5b6..888e394dfa 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
@@ -89,7 +89,7 @@ div
     return fv::divScheme<Type>::New
     (
         vf.mesh(), vf.mesh().divScheme(name)
-    )().fvcDiv(vf);
+    ).ref().fvcDiv(vf);
 }
 
 
@@ -167,7 +167,7 @@ div
         vf.mesh(),
         flux,
         vf.mesh().divScheme(name)
-    )().fvcDiv(flux, vf);
+    ).ref().fvcDiv(flux, vf);
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
index 0ec6662ce5..56b94907da 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
@@ -51,7 +51,7 @@ laplacian
     (
         vf.mesh(),
         vf.mesh().laplacianScheme(name)
-    )().fvcLaplacian(vf);
+    ).ref().fvcLaplacian(vf);
 }
 
 
@@ -202,7 +202,7 @@ laplacian
     (
         vf.mesh(),
         vf.mesh().laplacianScheme(name)
-    )().fvcLaplacian(gamma, vf);
+    ).ref().fvcLaplacian(gamma, vf);
 }
 
 
@@ -344,7 +344,7 @@ laplacian
     (
         vf.mesh(),
         vf.mesh().laplacianScheme(name)
-    )().fvcLaplacian(gamma, vf);
+    ).ref().fvcLaplacian(gamma, vf);
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C
index fbe3bca333..6def790f2e 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C
@@ -53,7 +53,8 @@ tmp<volScalarField> magSqrGradGrad
     // Loop over other vector field components
     for (direction cmpt = 1; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
-        tMagSqrGradGrad() += magSqr(fvc::grad(fvc::grad(vf.component(cmpt))))();
+        tMagSqrGradGrad.ref() +=
+            magSqr(fvc::grad(fvc::grad(vf.component(cmpt))))();
     }
 
     return tMagSqrGradGrad;
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
index 741321612c..f7707e0db7 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::fvc::meshPhi
     (
         vf.mesh(),
         vf.mesh().ddtScheme("ddt(" + vf.name() + ')')
-    )().meshPhi(vf);
+    ).ref().meshPhi(vf);
 }
 
 
@@ -52,7 +52,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::fvc::meshPhi
     (
         vf.mesh(),
         vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
-    )().meshPhi(vf);
+    ).ref().meshPhi(vf);
 }
 
 
@@ -66,7 +66,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::fvc::meshPhi
     (
         vf.mesh(),
         vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
-    )().meshPhi(vf);
+    ).ref().meshPhi(vf);
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
index 2b8c34a41b..30d12abc4b 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
@@ -75,8 +75,7 @@ tmp<volScalarField> reconstructMag(const surfaceScalarField& ssf)
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
-
-    scalarField& rf = treconField();
+    scalarField& rf = treconField.ref();
 
     forAll(owner, facei)
     {
@@ -109,7 +108,7 @@ tmp<volScalarField> reconstructMag(const surfaceScalarField& ssf)
 
     rf /= mesh.V();
 
-    treconField().correctBoundaryConditions();
+    treconField.ref().correctBoundaryConditions();
 
     return treconField;
 }
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
index ccf92f56c0..dd08e083aa 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
@@ -107,7 +107,7 @@ surfaceIntegrate
             extrapolatedCalculatedFvPatchField<Type>::typeName
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& vf = tvf();
+    GeometricField<Type, fvPatchField, volMesh>& vf = tvf.ref();
 
     surfaceIntegrate(vf.internalField(), ssf);
     vf.correctBoundaryConditions();
@@ -158,7 +158,7 @@ surfaceSum
             extrapolatedCalculatedFvPatchField<Type>::typeName
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& vf = tvf();
+    GeometricField<Type, fvPatchField, volMesh>& vf = tvf.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDdt.C b/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
index 2cea308b28..da9cef131c 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
@@ -51,7 +51,7 @@ ddt
     (
         vf.mesh(),
         vf.mesh().ddtScheme("ddt(" + vf.name() + ')')
-    )().fvmDdt(vf);
+    ).ref().fvmDdt(vf);
 }
 
 
@@ -79,7 +79,7 @@ ddt
     (
         vf.mesh(),
         vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
-    )().fvmDdt(rho, vf);
+    ).ref().fvmDdt(rho, vf);
 }
 
 
@@ -95,7 +95,7 @@ ddt
     (
         vf.mesh(),
         vf.mesh().ddtScheme("ddt(" + rho.name() + ',' + vf.name() + ')')
-    )().fvmDdt(rho, vf);
+    ).ref().fvmDdt(rho, vf);
 }
 
 
@@ -118,7 +118,7 @@ ddt
           + rho.name() + ','
           + vf.name() + ')'
         )
-    )().fvmDdt(alpha, rho, vf);
+    ).ref().fvmDdt(alpha, rho, vf);
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
index ef77f56982..aa44d4e68f 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
@@ -216,7 +216,7 @@ laplacian
     (
         vf.mesh(),
         vf.mesh().laplacianScheme(name)
-    )().fvmLaplacian(gamma, vf);
+    ).ref().fvmLaplacian(gamma, vf);
 }
 
 
@@ -281,7 +281,7 @@ laplacian
     (
         vf.mesh(),
         vf.mesh().laplacianScheme(name)
-    )().fvmLaplacian(gamma, vf);
+    ).ref().fvmLaplacian(gamma, vf);
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmSup.C b/src/finiteVolume/finiteVolume/fvm/fvmSup.C
index 5228eddcae..97d33bd609 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmSup.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmSup.C
@@ -47,7 +47,7 @@ Foam::fvm::Su
             dimVol*su.dimensions()
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     fvm.source() -= mesh.V()*su.field();
 
@@ -113,7 +113,7 @@ Foam::fvm::Sp
             dimVol*sp.dimensions()*vf.dimensions()
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     fvm.diag() += mesh.V()*sp.field();
 
@@ -167,7 +167,7 @@ Foam::fvm::Sp
             dimVol*sp.dimensions()*vf.dimensions()
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     fvm.diag() += mesh.V()*sp.value();
 
@@ -205,7 +205,7 @@ Foam::fvm::SuSp
             dimVol*susp.dimensions()*vf.dimensions()
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     fvm.diag() += mesh.V()*max(susp.field(), scalar(0));
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
index 26b582f77b..a462ff85f7 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
@@ -80,7 +80,7 @@ Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
             extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
     );
-    GeometricField<GradType, fvPatchField, volMesh>& lsGrad = tlsGrad();
+    GeometricField<GradType, fvPatchField, volMesh>& lsGrad = tlsGrad.ref();
     Field<GradType>& lsGradIf = lsGrad;
 
     const extendedCentredCellToCellStencil& stencil = lsv.stencil();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
index 32a433c61a..975ff9141d 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
@@ -85,7 +85,7 @@ Foam::fv::fourthGrad<Type>::calcGrad
             secondfGrad
         )
     );
-    GeometricField<GradType, fvPatchField, volMesh>& fGrad = tfGrad();
+    GeometricField<GradType, fvPatchField, volMesh>& fGrad = tfGrad.ref();
 
     const vectorField& C = mesh.C();
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
index a70e53f5a1..7e0c76cf55 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
@@ -70,7 +70,7 @@ Foam::fv::gaussGrad<Type>::gradf
             extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
     );
-    GeometricField<GradType, fvPatchField, volMesh>& gGrad = tgGrad();
+    GeometricField<GradType, fvPatchField, volMesh>& gGrad = tgGrad.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
@@ -132,7 +132,7 @@ Foam::fv::gaussGrad<Type>::calcGrad
     (
         gradf(tinterpScheme_().interpolate(vsf), name)
     );
-    GeometricField<GradType, fvPatchField, volMesh>& gGrad = tgGrad();
+    GeometricField<GradType, fvPatchField, volMesh>& gGrad = tgGrad.ref();
 
     correctBoundaryConditions(vsf, gGrad);
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
index fa80a08567..4a15dbc4d1 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
@@ -76,7 +76,7 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
             extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
     );
-    GeometricField<GradType, fvPatchField, volMesh>& lsGrad = tlsGrad();
+    GeometricField<GradType, fvPatchField, volMesh>& lsGrad = tlsGrad.ref();
 
     // Get reference to least square vectors
     const leastSquaresVectors& lsv = leastSquaresVectors::New(mesh);
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
index 14064aa9e2..43238d823c 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ Foam::fv::cellLimitedGrad<Foam::scalar>::calcGrad
         return tGrad;
     }
 
-    volVectorField& g = tGrad();
+    volVectorField& g = tGrad.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
@@ -208,7 +208,7 @@ Foam::fv::cellLimitedGrad<Foam::vector>::calcGrad
         return tGrad;
     }
 
-    volTensorField& g = tGrad();
+    volTensorField& g = tGrad.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
index 594ad63dd9..5f23015626 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ Foam::fv::cellMDLimitedGrad<Foam::scalar>::calcGrad
         return tGrad;
     }
 
-    volVectorField& g = tGrad();
+    volVectorField& g = tGrad.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
@@ -197,7 +197,7 @@ Foam::fv::cellMDLimitedGrad<Foam::vector>::calcGrad
         return tGrad;
     }
 
-    volTensorField& g = tGrad();
+    volTensorField& g = tGrad.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
index c37b14a298..775dee934a 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ Foam::fv::faceLimitedGrad<Foam::scalar>::calcGrad
         return tGrad;
     }
 
-    volVectorField& g = tGrad();
+    volVectorField& g = tGrad.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
@@ -190,7 +190,7 @@ Foam::fv::faceLimitedGrad<Foam::vector>::calcGrad
         return tGrad;
     }
 
-    volTensorField& g = tGrad();
+    volTensorField& g = tGrad.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
index 9a43689fd4..f0fd65ee01 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ Foam::fv::faceMDLimitedGrad<Foam::scalar>::calcGrad
         return tGrad;
     }
 
-    volVectorField& g = tGrad();
+    volVectorField& g = tGrad.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
@@ -195,7 +195,7 @@ Foam::fv::faceMDLimitedGrad<Foam::vector>::calcGrad
         return tGrad;
     }
 
-    volTensorField& g = tGrad();
+    volTensorField& g = tGrad.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
index 3bf14b57b2..fd9df516e8 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
@@ -58,7 +58,7 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacianUncorrected
             deltaCoeffs.dimensions()*gammaMagSf.dimensions()*vf.dimensions()
         )
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     fvm.upper() = deltaCoeffs.internalField()*gammaMagSf.internalField();
     fvm.negSumDiag();
@@ -118,7 +118,7 @@ gaussLaplacianScheme<Type, GType>::gammaSnGradCorr
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
-        tgammaSnGradCorr().replace
+        tgammaSnGradCorr.ref().replace
         (
             cmpt,
             SfGammaCorr & fvc::interpolate(fvc::grad(vf.component(cmpt)))
@@ -145,7 +145,7 @@ gaussLaplacianScheme<Type, GType>::fvcLaplacian
         fvc::div(this->tsnGradScheme_().snGrad(vf)*mesh.magSf())
     );
 
-    tLaplacian().rename("laplacian(" + vf.name() + ')');
+    tLaplacian.ref().rename("laplacian(" + vf.name() + ')');
 
     return tLaplacian;
 }
@@ -176,14 +176,14 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacian
         this->tsnGradScheme_().deltaCoeffs(vf),
         vf
     );
-    fvMatrix<Type>& fvm = tfvm();
+    fvMatrix<Type>& fvm = tfvm.ref();
 
     tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tfaceFluxCorrection
         = gammaSnGradCorr(SfGammaCorr, vf);
 
     if (this->tsnGradScheme_().corrected())
     {
-        tfaceFluxCorrection() +=
+        tfaceFluxCorrection.ref() +=
             SfGammaSn*this->tsnGradScheme_().correction(vf);
     }
 
@@ -225,7 +225,10 @@ gaussLaplacianScheme<Type, GType>::fvcLaplacian
         )
     );
 
-    tLaplacian().rename("laplacian(" + gamma.name() + ',' + vf.name() + ')');
+    tLaplacian.ref().rename
+    (
+        "laplacian(" + gamma.name() + ',' + vf.name() + ')'
+    );
 
     return tLaplacian;
 }
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
index 417c3ac19e..8afa4447dc 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
@@ -53,7 +53,7 @@ Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvmLaplacian         \
         this->tsnGradScheme_().deltaCoeffs(vf),                                \
         vf                                                                     \
     );                                                                         \
-    fvMatrix<Type>& fvm = tfvm();                                              \
+    fvMatrix<Type>& fvm = tfvm.ref();                                          \
                                                                                \
     if (this->tsnGradScheme_().corrected())                                    \
     {                                                                          \
@@ -102,7 +102,10 @@ Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvcLaplacian         \
         fvc::div(gamma*this->tsnGradScheme_().snGrad(vf)*mesh.magSf())         \
     );                                                                         \
                                                                                \
-    tLaplacian().rename("laplacian(" + gamma.name() + ',' + vf.name() + ')');\
+    tLaplacian.ref().rename                                                    \
+    (                                                                          \
+        "laplacian(" + gamma.name() + ',' + vf.name() + ')'                    \
+    );                                                                         \
                                                                                \
     return tLaplacian;                                                         \
 }
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
index 1a05f609c5..f06951f109 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
@@ -137,7 +137,7 @@ public:
                 stencil.weightedSum(vf, cfd.coeffs())
             );
 
-            sft().dimensions() /= dimLength;
+            sft.ref().dimensions() /= dimLength;
 
             return sft;
         }
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
index b653e839ea..ea58ee0249 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
@@ -59,7 +59,7 @@ Foam::fv::correctedSnGrad<Type>::fullGradCorrection
                 mesh.gradScheme("grad(" + vf.name() + ')')
             )().grad(vf, "grad(" + vf.name() + ')')
         );
-    tssf().rename("snGradCorr(" + vf.name() + ')');
+    tssf.ref().rename("snGradCorr(" + vf.name() + ')');
 
     return tssf;
 }
@@ -91,7 +91,7 @@ Foam::fv::correctedSnGrad<Type>::correction
             vf.dimensions()*mesh.nonOrthDeltaCoeffs().dimensions()
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& ssf = tssf();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& ssf = tssf.ref();
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
index 1d13539f40..467dc0af52 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
@@ -68,7 +68,7 @@ Foam::fv::faceCorrectedSnGrad<Type>::fullGradCorrection
         )
     );
 
-    Field<Type>& sfCorr = tsfCorr().internalField();
+    Field<Type>& sfCorr = tsfCorr.ref().internalField();
 
     const pointField& points = mesh.points();
     const faceList& faces = mesh.faces();
@@ -116,7 +116,7 @@ Foam::fv::faceCorrectedSnGrad<Type>::fullGradCorrection
         sfCorr[facei] = dCorr&fgrad;
     }
 
-    tsfCorr().boundaryField() = pTraits<Type>::zero;
+    tsfCorr.ref().boundaryField() = pTraits<Type>::zero;
 
     return tsfCorr;
 }
@@ -148,7 +148,7 @@ Foam::fv::faceCorrectedSnGrad<Type>::correction
             vf.dimensions()*mesh.nonOrthDeltaCoeffs().dimensions()
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& ssf = tssf();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& ssf = tssf.ref();
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index c667c4410d..f5c28f080c 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -123,7 +123,7 @@ snGradScheme<Type>::snGrad
             vf.dimensions()*tdeltaCoeffs().dimensions()
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& ssf = tsf();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& ssf = tsf.ref();
 
     // set reference to difference factors array
     const scalarField& deltaCoeffs = tdeltaCoeffs().internalField();
@@ -183,7 +183,7 @@ snGradScheme<Type>::snGrad
 
     if (corrected())
     {
-        tsf() += correction(vf);
+        tsf.ref() += correction(vf);
     }
 
     return tsf;
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 7fb437976b..6d4b18f371 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -158,7 +158,7 @@ void Foam::fvMatrix<Type>::addBoundarySource
         }
         else if (couples)
         {
-            tmp<Field<Type>> tpnf = ptf.patchNeighbourField();
+            const tmp<Field<Type>> tpnf = ptf.patchNeighbourField();
             const Field<Type>& pnf = tpnf();
 
             const labelUList& addr = lduAddr().patchAddr(patchI);
@@ -743,8 +743,8 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::A() const
         )
     );
 
-    tAphi().internalField() = D()/psi_.mesh().V();
-    tAphi().correctBoundaryConditions();
+    tAphi.ref().internalField() = D()/psi_.mesh().V();
+    tAphi.ref().correctBoundaryConditions();
 
     return tAphi;
 }
@@ -771,7 +771,7 @@ Foam::fvMatrix<Type>::H() const
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& Hphi = tHphi();
+    GeometricField<Type, fvPatchField, volMesh>& Hphi = tHphi.ref();
 
     // Loop over field components
     for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
@@ -833,7 +833,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::H1() const
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
-    volScalarField& H1_ = tH1();
+    volScalarField& H1_ = tH1.ref();
 
     H1_.internalField() = lduMatrix::H1();
 
@@ -890,7 +890,8 @@ flux() const
             dimensions()
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& fieldFlux = tfieldFlux();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& fieldFlux =
+        tfieldFlux.ref();
 
     for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
     {
@@ -1462,7 +1463,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 {
     checkMethod(A, su, "==");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() += su.mesh().V()*su.field();
+    tC.ref().source() += su.mesh().V()*su.field();
     return tC;
 }
 
@@ -1475,7 +1476,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 {
     checkMethod(A, tsu(), "==");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() += tsu().mesh().V()*tsu().field();
+    tC.ref().source() += tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
@@ -1489,7 +1490,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 {
     checkMethod(A, tsu(), "==");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() += tsu().mesh().V()*tsu().internalField();
+    tC.ref().source() += tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
@@ -1503,7 +1504,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 {
     checkMethod(tA(), su, "==");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() += su.mesh().V()*su.field();
+    tC.ref().source() += su.mesh().V()*su.field();
     return tC;
 }
 
@@ -1516,7 +1517,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 {
     checkMethod(tA(), tsu(), "==");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() += tsu().mesh().V()*tsu().field();
+    tC.ref().source() += tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
@@ -1530,7 +1531,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 {
     checkMethod(tA(), tsu(), "==");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() += tsu().mesh().V()*tsu().internalField();
+    tC.ref().source() += tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
@@ -1544,7 +1545,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 {
     checkMethod(A, su, "==");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() += A.psi().mesh().V()*su.value();
+    tC.ref().source() += A.psi().mesh().V()*su.value();
     return tC;
 }
 
@@ -1557,7 +1558,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 {
     checkMethod(tA(), su, "==");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() += tC().psi().mesh().V()*su.value();
+    tC.ref().source() += tC().psi().mesh().V()*su.value();
     return tC;
 }
 
@@ -1590,7 +1591,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 )
 {
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().negate();
+    tC.ref().negate();
     return tC;
 }
 
@@ -1601,7 +1602,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 )
 {
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().negate();
+    tC.ref().negate();
     return tC;
 }
 
@@ -1615,7 +1616,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(A, B, "+");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC() += B;
+    tC.ref() += B;
     return tC;
 }
 
@@ -1628,7 +1629,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(tA(), B, "+");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC() += B;
+    tC.ref() += B;
     return tC;
 }
 
@@ -1641,7 +1642,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(A, tB(), "+");
     tmp<fvMatrix<Type>> tC(tB.ptr());
-    tC() += A;
+    tC.ref() += A;
     return tC;
 }
 
@@ -1654,7 +1655,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(tA(), tB(), "+");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC() += tB();
+    tC.ref() += tB();
     tB.clear();
     return tC;
 }
@@ -1668,7 +1669,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(A, su, "+");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() -= su.mesh().V()*su.field();
+    tC.ref().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
@@ -1681,7 +1682,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(A, tsu(), "+");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() -= tsu().mesh().V()*tsu().field();
+    tC.ref().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
@@ -1695,7 +1696,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(A, tsu(), "+");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() -= tsu().mesh().V()*tsu().internalField();
+    tC.ref().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
@@ -1709,7 +1710,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(tA(), su, "+");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() -= su.mesh().V()*su.field();
+    tC.ref().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
@@ -1722,7 +1723,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(tA(), tsu(), "+");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() -= tsu().mesh().V()*tsu().field();
+    tC.ref().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
@@ -1736,7 +1737,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(tA(), tsu(), "+");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() -= tsu().mesh().V()*tsu().internalField();
+    tC.ref().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
@@ -1750,7 +1751,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(A, su, "+");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() -= su.mesh().V()*su.field();
+    tC.ref().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
@@ -1763,7 +1764,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(A, tsu(), "+");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() -= tsu().mesh().V()*tsu().field();
+    tC.ref().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
@@ -1777,7 +1778,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(A, tsu(), "+");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() -= tsu().mesh().V()*tsu().internalField();
+    tC.ref().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
@@ -1791,7 +1792,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(tA(), su, "+");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() -= su.mesh().V()*su.field();
+    tC.ref().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
@@ -1804,7 +1805,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(tA(), tsu(), "+");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() -= tsu().mesh().V()*tsu().field();
+    tC.ref().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
@@ -1818,7 +1819,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(tA(), tsu(), "+");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() -= tsu().mesh().V()*tsu().internalField();
+    tC.ref().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
@@ -1833,7 +1834,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(A, B, "-");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC() -= B;
+    tC.ref() -= B;
     return tC;
 }
 
@@ -1846,7 +1847,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(tA(), B, "-");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC() -= B;
+    tC.ref() -= B;
     return tC;
 }
 
@@ -1859,8 +1860,8 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(A, tB(), "-");
     tmp<fvMatrix<Type>> tC(tB.ptr());
-    tC() -= A;
-    tC().negate();
+    tC.ref() -= A;
+    tC.ref().negate();
     return tC;
 }
 
@@ -1873,7 +1874,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(tA(), tB(), "-");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC() -= tB();
+    tC.ref() -= tB();
     tB.clear();
     return tC;
 }
@@ -1887,7 +1888,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(A, su, "-");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() += su.mesh().V()*su.field();
+    tC.ref().source() += su.mesh().V()*su.field();
     return tC;
 }
 
@@ -1900,7 +1901,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(A, tsu(), "-");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() += tsu().mesh().V()*tsu().field();
+    tC.ref().source() += tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
@@ -1914,7 +1915,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(A, tsu(), "-");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() += tsu().mesh().V()*tsu().internalField();
+    tC.ref().source() += tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
@@ -1928,7 +1929,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(tA(), su, "-");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() += su.mesh().V()*su.field();
+    tC.ref().source() += su.mesh().V()*su.field();
     return tC;
 }
 
@@ -1941,7 +1942,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(tA(), tsu(), "-");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() += tsu().mesh().V()*tsu().field();
+    tC.ref().source() += tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
@@ -1955,7 +1956,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(tA(), tsu(), "-");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() += tsu().mesh().V()*tsu().internalField();
+    tC.ref().source() += tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
@@ -1969,8 +1970,8 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(A, su, "-");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().negate();
-    tC().source() -= su.mesh().V()*su.field();
+    tC.ref().negate();
+    tC.ref().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
@@ -1983,8 +1984,8 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(A, tsu(), "-");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().negate();
-    tC().source() -= tsu().mesh().V()*tsu().field();
+    tC.ref().negate();
+    tC.ref().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
@@ -1998,8 +1999,8 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(A, tsu(), "-");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().negate();
-    tC().source() -= tsu().mesh().V()*tsu().internalField();
+    tC.ref().negate();
+    tC.ref().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
@@ -2013,8 +2014,8 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(tA(), su, "-");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().negate();
-    tC().source() -= su.mesh().V()*su.field();
+    tC.ref().negate();
+    tC.ref().source() -= su.mesh().V()*su.field();
     return tC;
 }
 
@@ -2027,8 +2028,8 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(tA(), tsu(), "-");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().negate();
-    tC().source() -= tsu().mesh().V()*tsu().field();
+    tC.ref().negate();
+    tC.ref().source() -= tsu().mesh().V()*tsu().field();
     tsu.clear();
     return tC;
 }
@@ -2042,8 +2043,8 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(tA(), tsu(), "-");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().negate();
-    tC().source() -= tsu().mesh().V()*tsu().internalField();
+    tC.ref().negate();
+    tC.ref().source() -= tsu().mesh().V()*tsu().internalField();
     tsu.clear();
     return tC;
 }
@@ -2057,7 +2058,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(A, su, "+");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() -= su.value()*A.psi().mesh().V();
+    tC.ref().source() -= su.value()*A.psi().mesh().V();
     return tC;
 }
 
@@ -2070,7 +2071,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(tA(), su, "+");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() -= su.value()*tC().psi().mesh().V();
+    tC.ref().source() -= su.value()*tC().psi().mesh().V();
     return tC;
 }
 
@@ -2083,7 +2084,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(A, su, "+");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() -= su.value()*A.psi().mesh().V();
+    tC.ref().source() -= su.value()*A.psi().mesh().V();
     return tC;
 }
 
@@ -2096,7 +2097,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 {
     checkMethod(tA(), su, "+");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() -= su.value()*tC().psi().mesh().V();
+    tC.ref().source() -= su.value()*tC().psi().mesh().V();
     return tC;
 }
 
@@ -2109,7 +2110,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(A, su, "-");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().source() += su.value()*tC().psi().mesh().V();
+    tC.ref().source() += su.value()*tC().psi().mesh().V();
     return tC;
 }
 
@@ -2122,7 +2123,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(tA(), su, "-");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().source() += su.value()*tC().psi().mesh().V();
+    tC.ref().source() += su.value()*tC().psi().mesh().V();
     return tC;
 }
 
@@ -2135,8 +2136,8 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(A, su, "-");
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC().negate();
-    tC().source() -= su.value()*A.psi().mesh().V();
+    tC.ref().negate();
+    tC.ref().source() -= su.value()*A.psi().mesh().V();
     return tC;
 }
 
@@ -2149,8 +2150,8 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 {
     checkMethod(tA(), su, "-");
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC().negate();
-    tC().source() -= su.value()*tC().psi().mesh().V();
+    tC.ref().negate();
+    tC.ref().source() -= su.value()*tC().psi().mesh().V();
     return tC;
 }
 
@@ -2163,7 +2164,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 )
 {
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC() *= dsf;
+    tC.ref() *= dsf;
     return tC;
 }
 
@@ -2175,7 +2176,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 )
 {
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC() *= tdsf;
+    tC.ref() *= tdsf;
     return tC;
 }
 
@@ -2187,7 +2188,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 )
 {
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC() *= tvsf;
+    tC.ref() *= tvsf;
     return tC;
 }
 
@@ -2199,7 +2200,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 )
 {
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC() *= dsf;
+    tC.ref() *= dsf;
     return tC;
 }
 
@@ -2211,7 +2212,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 )
 {
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC() *= tdsf;
+    tC.ref() *= tdsf;
     return tC;
 }
 
@@ -2223,7 +2224,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 )
 {
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC() *= tvsf;
+    tC.ref() *= tvsf;
     return tC;
 }
 
@@ -2235,7 +2236,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 )
 {
     tmp<fvMatrix<Type>> tC(new fvMatrix<Type>(A));
-    tC() *= ds;
+    tC.ref() *= ds;
     return tC;
 }
 
@@ -2247,7 +2248,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 )
 {
     tmp<fvMatrix<Type>> tC(tA.ptr());
-    tC() *= ds;
+    tC.ref() *= ds;
     return tC;
 }
 
@@ -2277,7 +2278,7 @@ Foam::operator&
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& Mphi = tMphi();
+    GeometricField<Type, fvPatchField, volMesh>& Mphi = tMphi.ref();
 
     // Loop over field components
     if (M.hasDiag())
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
index 7effdd1ef5..46fa555289 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
@@ -201,7 +201,7 @@ Foam::tmp<Foam::scalarField> Foam::fvMatrix<Foam::scalar>::residual() const
         )
     );
 
-    addBoundarySource(tres());
+    addBoundarySource(tres.ref());
 
     return tres;
 }
@@ -227,7 +227,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Foam::scalar>::H() const
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
-    volScalarField& Hphi = tHphi();
+    volScalarField& Hphi = tHphi.ref();
 
     Hphi.internalField() = (lduMatrix::H(psi_.internalField()) + source_);
     addBoundarySource(Hphi.internalField());
@@ -259,7 +259,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Foam::scalar>::H1() const
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
-    volScalarField& H1_ = tH1();
+    volScalarField& H1_ = tH1.ref();
 
     H1_.internalField() = lduMatrix::H1();
     //addBoundarySource(Hphi.internalField());
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
index a14c06c710..7fe2202afe 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
@@ -118,7 +118,7 @@ Foam::extendedCellToFaceStencil::weightedSum
             )
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsfCorr();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsfCorr.ref();
 
     // Internal faces
     for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
index 0607c8e4e0..fe06177ec4 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
@@ -67,7 +67,7 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum
             )
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsfCorr();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsfCorr.ref();
 
     // Internal faces
     for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
index d6b47a56b2..e1530b0b36 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
@@ -112,7 +112,7 @@ Foam::extendedFaceToCellStencil::weightedSum
             )
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& sf = tsfCorr();
+    GeometricField<Type, fvPatchField, volMesh>& sf = tsfCorr.ref();
 
     // cells
     forAll(sf, cellI)
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 22f12198d8..a6ccd8ab03 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -761,7 +761,7 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
     scalar rDeltaT = 1.0/time().deltaTValue();
 
     tmp<scalarField> tsweptVols = polyMesh::movePoints(p);
-    scalarField& sweptVols = tsweptVols();
+    scalarField& sweptVols = tsweptVols.ref();
 
     phi.internalField() = scalarField::subField(sweptVols, nInternalFaces());
     phi.internalField() *= rDeltaT;
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index 17bb30ec05..8cdeca38a4 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -399,7 +399,7 @@ Foam::tmp<Foam::surfaceVectorField> Foam::fvMesh::delta() const
             dimLength
         )
     );
-    surfaceVectorField& delta = tdelta();
+    surfaceVectorField& delta = tdelta.ref();
 
     const volVectorField& C = this->C();
     const labelUList& owner = this->owner();
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
index 5b6ed73144..9b5a2aaf44 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ Foam::tmp<Foam::vectorField> Foam::cyclicFvPatch::delta() const
     const vectorField nbrPatchD(neighbFvPatch().coupledFvPatch::delta());
 
     tmp<vectorField> tpdv(new vectorField(patchD.size()));
-    vectorField& pdv = tpdv();
+    vectorField& pdv = tpdv.ref();
 
     // To the transformation if necessary
     if (parallel())
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
index b87157e343..ed1d97fb19 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,7 +148,7 @@ Foam::tmp<Foam::vectorField> Foam::cyclicACMIFvPatch::delta() const
         nbrPatchD -= nbrPatchD0;
 
         tmp<vectorField> tpdv(new vectorField(patchD.size()));
-        vectorField& pdv = tpdv();
+        vectorField& pdv = tpdv.ref();
 
         // do the transformation if necessary
         if (parallel())
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
index 5d8935139d..69e940d12f 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ Foam::tmp<Foam::vectorField> Foam::cyclicAMIFvPatch::delta() const
         const vectorField& nbrPatchD = tnbrPatchD();
 
         tmp<vectorField> tpdv(new vectorField(patchD.size()));
-        vectorField& pdv = tpdv();
+        vectorField& pdv = tpdv.ref();
 
         // do the transformation if necessary
         if (parallel())
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
index d7f1bcd39e..a3a9a2dd77 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ const Foam::vectorField& Foam::fvPatch::Cf() const
 Foam::tmp<Foam::vectorField> Foam::fvPatch::Cn() const
 {
     tmp<vectorField> tcc(new vectorField(size()));
-    vectorField& cc = tcc();
+    vectorField& cc = tcc.ref();
 
     const labelUList& faceCells = this->faceCells();
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
index 21e931f01c..f3862fdc0a 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
@@ -34,7 +34,7 @@ Foam::tmp<Foam::Field<Type>> Foam::fvPatch::patchInternalField
 ) const
 {
     tmp<Field<Type>> tpif(new Field<Type>(size()));
-    Field<Type>& pif = tpif();
+    Field<Type>& pif = tpif.ref();
 
     const labelUList& faceCells = this->faceCells();
 
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C
index d93e64dea6..03e03c6dfe 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,8 +94,7 @@ bool Foam::patchDistMethods::Poisson::correct
             )
         );
     }
-
-    volScalarField& yPsi = tyPsi_();
+    volScalarField& yPsi = tyPsi_.ref();
 
     solve(fvm::laplacian(yPsi) == dimensionedScalar("1", dimless, -1.0));
 
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
index b84c345a14..8b2131ea3e 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -176,7 +176,7 @@ const Foam::volVectorField& Foam::wallDist::n() const
 
         nRequired_ = true;
         constructn();
-        pdm_->correct(y_, n_());
+        pdm_->correct(y_, n_.ref());
     }
 
     return n_();
@@ -189,7 +189,7 @@ bool Foam::wallDist::movePoints()
     {
         if (nRequired_)
         {
-            return pdm_->correct(y_, n_());
+            return pdm_->correct(y_, n_.ref());
         }
         else
         {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
index 8342412460..8b523015e1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
@@ -198,7 +198,7 @@ Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
             )
         );
 
-        calcLimiter(phi, tlimiterField());
+        calcLimiter(phi, tlimiterField.ref());
 
         return tlimiterField;
     }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
index 28cc9fa1db..3101d60893 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ Foam::PhiScheme<Type, PhiLimiter>::limiter
             dimless
         )
     );
-    surfaceScalarField& Limiter = tLimiter();
+    surfaceScalarField& Limiter = tLimiter.ref();
 
     const surfaceScalarField& CDweights = mesh.surfaceInterpolation::weights();
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index 9b26d679ad..138fad0ee7 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -147,7 +147,7 @@ Foam::limitedSurfaceInterpolationScheme<Type>::weights
 {
     // Note that here the weights field is initialised as the limiter
     // from which the weight is calculated using the limiter value
-    surfaceScalarField& Weights = tLimiter();
+    surfaceScalarField& Weights = tLimiter.ref();
 
     scalarField& pWeights = Weights.internalField();
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
index b704841a40..59ffd4bac3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,7 +150,8 @@ public:
                     dimless
                 )
             );
-            surfaceScalarField& clippedLinearWeights = tclippedLinearWeights();
+            surfaceScalarField& clippedLinearWeights =
+                tclippedLinearWeights.ref();
 
             clippedLinearWeights.internalField() =
                 max(min(cdWeights.internalField(), 1 - wfLimit_), wfLimit_);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
index f8f1397711..2531574315 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
@@ -142,9 +142,8 @@ public:
                     surfaceInterpolationScheme<Type>::interpolate(vf, kSc, -kSc)
                 )
             );
-
             GeometricField<Type, fvsPatchField, surfaceMesh>& sfCorr =
-                tsfCorr();
+                tsfCorr.ref();
 
             for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
             {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
index a2a81508fb..aa7d4482b8 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
@@ -55,7 +55,7 @@ Foam::linearUpwind<Type>::correction
         )
     );
 
-    GeometricField<Type, fvsPatchField, surfaceMesh>& sfCorr = tsfCorr();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& sfCorr = tsfCorr.ref();
 
     const surfaceScalarField& faceFlux = this->faceFlux_;
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
index 85fc6a9594..fce527802c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
@@ -62,7 +62,7 @@ Foam::linearUpwindV<Type>::correction
         )
     );
 
-    GeometricField<Type, fvsPatchField, surfaceMesh>& sfCorr = tsfCorr();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& sfCorr = tsfCorr.ref();
 
     const surfaceScalarField& faceFlux = this->faceFlux_;
     const surfaceScalarField& w = mesh.weights();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
index d0cc9fba86..e081db91e0 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
@@ -136,7 +136,7 @@ public:
                     vf.dimensions()
                 )
             );
-            GeometricField<Type, fvsPatchField, surfaceMesh>& vff = tvff();
+            GeometricField<Type, fvsPatchField, surfaceMesh>& vff = tvff.ref();
 
             forAll(vff.boundaryField(), patchi)
             {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
index 598e45c791..7099656ddd 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
@@ -136,7 +136,7 @@ public:
                     vf.dimensions()
                 )
             );
-            GeometricField<Type, fvsPatchField, surfaceMesh>& vff = tvff();
+            GeometricField<Type, fvsPatchField, surfaceMesh>& vff = tvff.ref();
 
             forAll(vff.boundaryField(), patchi)
             {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
index 1841b832db..021abd7685 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ public:
             );
 
             surfaceScalarField::GeometricBoundaryField& awbf =
-                taw().boundaryField();
+                taw.ref().boundaryField();
 
             forAll(awbf, patchi)
             {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
index 49a70b7001..819347a972 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
@@ -133,7 +133,7 @@ public:
         ) const
         {
             tmp<surfaceScalarField> tw = tScheme_().weights(vf);
-            surfaceScalarField& w = tw();
+            surfaceScalarField& w = tw.ref();
 
             const fvMesh& mesh_ = this->mesh();
             const cellList& cells = mesh_.cells();
@@ -193,7 +193,7 @@ public:
                     tScheme_().correction(vf);
 
                 GeometricField<Type, fvsPatchField, surfaceMesh>& corr =
-                    tcorr();
+                    tcorr.ref();
 
                 const fvMesh& mesh_ = this->mesh();
                 const cellList& cells = mesh_.cells();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
index 7b6d3048e5..98a7cdbf41 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
@@ -48,7 +48,7 @@ correction
     tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr =
         linearInterpolate(vf);
 
-    Field<Type>& sfCorr = tsfCorr().internalField();
+    Field<Type>& sfCorr = tsfCorr.ref().internalField();
 
     const pointField& points = mesh.points();
     const pointField& C = mesh.C().internalField();
@@ -104,7 +104,7 @@ correction
 
 
     typename GeometricField<Type, fvsPatchField, surfaceMesh>::
-        GeometricBoundaryField& bSfCorr = tsfCorr().boundaryField();
+        GeometricBoundaryField& bSfCorr = tsfCorr.ref().boundaryField();
 
     forAll(bSfCorr, patchi)
     {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
index 3f3cae05fe..e84e66f251 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,8 @@ public:
                     dimless
                 )
             );
-            surfaceScalarField& reverseLinearWeights = treverseLinearWeights();
+            surfaceScalarField& reverseLinearWeights =
+                treverseLinearWeights.ref();
 
             reverseLinearWeights.internalField() =
                 1.0 - cdWeights.internalField();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
index aab20dac76..1f568e6315 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
@@ -159,7 +159,7 @@ public:
 
             for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
             {
-                tsfCorr().replace
+                tsfCorr.ref().replace
                 (
                     cmpt,
                     scv() & linear
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 43bcbe9d1c..d871edb6e2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -178,7 +178,7 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
             vf.dimensions()
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsf();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsf.ref();
 
     Field<Type>& sfi = sf.internalField();
 
@@ -256,7 +256,7 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
             vf.dimensions()
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsf();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsf.ref();
 
     Field<Type>& sfi = sf.internalField();
 
@@ -273,7 +273,7 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
 
         if (vf.boundaryField()[pi].coupled())
         {
-            tsf().boundaryField()[pi] =
+            tsf.ref().boundaryField()[pi] =
                 pLambda*vf.boundaryField()[pi].patchInternalField()
              + (1.0 - pLambda)*vf.boundaryField()[pi].patchNeighbourField();
         }
@@ -311,7 +311,7 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
 
     if (corrected())
     {
-        tsf() += correction(vf);
+        tsf.ref() += correction(vf);
     }
 
     return tsf;
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 84f41bba62..79bdc2a29a 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -167,7 +167,7 @@ Foam::tmp<Foam::Field<Type>> Foam::volPointInterpolation::flatBoundaryField
     (
         new Field<Type>(mesh.nFaces()-mesh.nInternalFaces())
     );
-    Field<Type>& boundaryVals = tboundaryVals();
+    Field<Type>& boundaryVals = tboundaryVals.ref();
 
     forAll(vf.boundaryField(), patchI)
     {
@@ -395,7 +395,7 @@ Foam::volPointInterpolation::interpolate
             )
         );
 
-        interpolate(vf, tpf());
+        interpolate(vf, tpf.ref());
 
         return tpf;
     }
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index ce776051c1..6b2f0ae692 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -1292,7 +1292,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
     (
         fld,
         multiplyWeightedOp<Type, CombineOp>(cop),
-        tresult(),
+        tresult.ref(),
         defaultValues
     );
 
@@ -1337,7 +1337,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
     (
         fld,
         multiplyWeightedOp<Type, CombineOp>(cop),
-        tresult(),
+        tresult.ref(),
         defaultValues
     );
 
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C
index 4b9f3b2dc2..03c34e0e49 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C
@@ -42,7 +42,7 @@ Foam::tmp<Foam::Field<Type>> Foam::pointToPointPlanarInterpolation::interpolate
     }
 
     tmp<Field<Type>> tfld(new Field<Type>(nearestVertex_.size()));
-    Field<Type>& fld = tfld();
+    Field<Type>& fld = tfld.ref();
 
     forAll(fld, i)
     {

From 37c1c04487b982e9379dc1b353839960d47c502b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 24 Feb 2016 14:05:20 +0000
Subject: [PATCH 219/447] reactingTwoPhaseEulerFoam/Make/options: Removed
 temporary debug option

---
 .../reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
index 622878cc52..5216efaa9c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -ggdb3 \
+EXE_INC = \
     -ItwoPhaseSystem/lnInclude \
     -I../phaseSystems/lnInclude \
     -I../interfacialModels/lnInclude \

From 65edfca2f968f5296a120e81f251d3470038d2b0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 24 Feb 2016 15:57:17 +0000
Subject: [PATCH 220/447] wallDist: Updated for new 'tmp'

---
 src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
index 8b2131ea3e..9ff12dd69c 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
@@ -59,7 +59,7 @@ void Foam::wallDist::constructn() const
     forAllConstIter(labelHashSet, patchIDs_, iter)
     {
         label patchi = iter.key();
-        n_().boundaryField()[patchi] == patches[patchi].nf();
+        n_.ref().boundaryField()[patchi] == patches[patchi].nf();
     }
 }
 

From 271935c1bff0f31e56fc2c50553d7a5f83fce838 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 24 Feb 2016 16:01:40 +0000
Subject: [PATCH 221/447] calculatedFvPatchField: 'value' entry is now required
 to avoid problems with non-initialization

---
 .../fvPatchFields/basic/calculated/calculatedFvPatchField.H   | 4 ++--
 tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
index 1afb39929c..d4b01de328 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
@@ -39,7 +39,7 @@ Description
     myPatch
     {
         type            calculated;
-        value           uniform (0 0 0);    // optional value entry
+        value           uniform (0 0 0);    // Required value entry
     }
     \endverbatim
 
@@ -89,7 +89,7 @@ public:
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
             const dictionary&,
-            const bool valueRequired=false
+            const bool valueRequired=true
         );
 
         //- Construct by mapping given patchField<Type> onto a new patch
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot
index cc500661a9..1ceda2d912 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot
@@ -24,6 +24,7 @@ boundaryField
     ".*"
     {
         type            calculated;
+        value           $internalField;
     }
 
     frontAndBack

From acac7d786b40673924205eb48c577fdbeedc5052 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 24 Feb 2016 16:21:50 +0000
Subject: [PATCH 222/447] tutorials: Added missing 'value' entry for
 'calculatedFvPatchField's

---
 tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2 | 5 +++++
 .../chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/G  | 1 +
 .../multiRegionHeaterRadiation/0/IDefault                    | 1 +
 .../chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Qr | 1 +
 .../chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/T  | 1 +
 .../chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/U  | 1 +
 .../multiRegionHeaterRadiation/0/epsilon                     | 1 +
 .../chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/k  | 1 +
 .../chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p  | 1 +
 .../multiRegionHeaterRadiation/0/p_rgh                       | 1 +
 10 files changed, 14 insertions(+)

diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2 b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2
index af44210d0c..b3b3d6ebd9 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2
@@ -22,26 +22,31 @@ boundaryField
     top
     {
         type            calculated;
+        value           $internalField;
     }
 
     ground
     {
         type            calculated;
+        value           $internalField;
     }
 
     sides
     {
         type            calculated;
+        value           $internalField;
     }
 
     burner
     {
         type            calculated;
+        value           $internalField;
     }
 
     "(region0_to.*)"
     {
         type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/G b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/G
index 4b106f6ea9..f444e87283 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/G
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/G
@@ -23,6 +23,7 @@ boundaryField
     ".*"
     {
         type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/IDefault b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/IDefault
index 95bef67fc7..2f3ab23fee 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/IDefault
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/IDefault
@@ -23,6 +23,7 @@ boundaryField
     ".*"
     {
         type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Qr b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Qr
index b4f1299fde..12ee0f2fe9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Qr
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Qr
@@ -23,6 +23,7 @@ boundaryField
     ".*"
     {
         type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/T
index 65d05cfc73..ac5fefc72f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/T
@@ -23,6 +23,7 @@ boundaryField
     ".*"
     {
         type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/U
index ee97b3a9fd..bc788b73e0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/U
@@ -23,6 +23,7 @@ boundaryField
     ".*"
     {
         type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/epsilon b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/epsilon
index d2a81a89e2..7c2600136e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/epsilon
@@ -23,6 +23,7 @@ boundaryField
     ".*"
     {
         type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/k b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/k
index ad5c96dfee..fe2c7fec89 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/k
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/k
@@ -23,6 +23,7 @@ boundaryField
     ".*"
     {
         type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p
index aaf33c77d4..cbd69c4464 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p
@@ -23,6 +23,7 @@ boundaryField
     ".*"
     {
         type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p_rgh b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p_rgh
index 0bcd7b7190..82a99f3e40 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p_rgh
@@ -23,6 +23,7 @@ boundaryField
     ".*"
     {
         type            calculated;
+        value           $internalField;
     }
 }
 

From dfa89cf8ee8ac20af4a5564065e9172aabc1ee88 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 25 Feb 2016 11:48:15 +0000
Subject: [PATCH 223/447] tmp: Improved diagnostics in case of inappropriate
 reuse

---
 src/OpenFOAM/memory/refCount/refCount.H |  21 ++-
 src/OpenFOAM/memory/tmp/tmp.H           |  11 +-
 src/OpenFOAM/memory/tmp/tmpI.H          | 165 ++++++++++--------------
 3 files changed, 87 insertions(+), 110 deletions(-)

diff --git a/src/OpenFOAM/memory/refCount/refCount.H b/src/OpenFOAM/memory/refCount/refCount.H
index 67f8b4c9ff..8eee3182f6 100644
--- a/src/OpenFOAM/memory/refCount/refCount.H
+++ b/src/OpenFOAM/memory/refCount/refCount.H
@@ -27,6 +27,10 @@ Class
 Description
     Reference counter for various OpenFOAM components.
 
+SeeAlso
+    Foam::tmp
+    Foam::token::compound
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef refCount_H
@@ -49,6 +53,7 @@ class refCount
 
         int count_;
 
+
     // Private Member Functions
 
         //- Dissallow copy
@@ -58,26 +63,27 @@ class refCount
         void operator=(const refCount&);
 
 
-public:
+protected:
 
     // Constructors
 
-        //- Construct null with zero count
+        //- Construct null initializing count to 0
         refCount()
         :
             count_(0)
         {}
 
 
+public:
+
     // Member Functions
 
-        //- Return the reference count
+        //- Return the current reference count
         int count() const
         {
             return count_;
         }
 
-
         //- Return true if the reference count is zero
         bool unique() const
         {
@@ -85,13 +91,6 @@ public:
         }
 
 
-        //- Reset the reference count to zero
-        void resetRefCount()
-        {
-            count_ = 0;
-        }
-
-
     // Member Operators
 
         //- Increment the reference count
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index b431e73b81..4b320d8e05 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -30,13 +30,17 @@ Description
 SourceFiles
     tmpI.H
 
+SeeAlso
+    Foam::refCount
+    Foam::autoPtr
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef tmp_H
 #define tmp_H
 
 #include "refCount.H"
-#include <cstddef>
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -102,6 +106,11 @@ public:
             //  ie, it is a reference or a temporary that has been allocated
             inline bool valid() const;
 
+            //- Return the type name of the tmp
+            //  constructed from the type name of T
+            inline word typeName() const;
+
+
         // Edit
 
             //- Return non-const reference or generate a fatal error
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index 4d0ad75614..a6a2824d79 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -33,7 +33,15 @@ inline Foam::tmp<T>::tmp(T* tPtr)
 :
     type_(TMP),
     ptr_(tPtr)
-{}
+{
+    if (tPtr && !tPtr->unique())
+    {
+        FatalErrorInFunction
+            << "Attempted construction of a " << typeName()
+            << " from non-unique pointer"
+            << abort(FatalError);
+    }
+}
 
 
 template<class T>
@@ -59,8 +67,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t)
         else
         {
             FatalErrorInFunction
-                << "Attempted copy of a deallocated temporary"
-                << " of type " << typeid(T).name()
+                << "Attempted copy of a deallocated " << typeName()
                 << abort(FatalError);
         }
     }
@@ -88,8 +95,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
             else
             {
                 FatalErrorInFunction
-                    << "Attempted copy of a deallocated temporary"
-                    << " of type " << typeid(T).name()
+                    << "Attempted copy of a deallocated " << typeName()
                     << abort(FatalError);
             }
         }
@@ -100,18 +106,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
 template<class T>
 inline Foam::tmp<T>::~tmp()
 {
-    if (isTmp() && ptr_)
-    {
-        if (ptr_->unique())
-        {
-            delete ptr_;
-            ptr_ = 0;
-        }
-        else
-        {
-            ptr_->operator--();
-        }
-    }
+    clear();
 }
 
 
@@ -138,27 +133,34 @@ inline bool Foam::tmp<T>::valid() const
 }
 
 
+template<class T>
+inline Foam::word Foam::tmp<T>::typeName() const
+{
+    return "tmp<" + word(typeid(T).name()) + '>';
+}
+
+
 template<class T>
 inline T& Foam::tmp<T>::ref()
 {
-    if (type_ == TMP)
+    if (isTmp())
     {
         if (!ptr_)
         {
             FatalErrorInFunction
-                << "Temporary of type " << typeid(T).name() << " deallocated"
+                << typeName() << " deallocated"
                 << abort(FatalError);
         }
-
-        return *ptr_;
     }
     else
     {
         FatalErrorInFunction
             << "Attempt to acquire non-const reference to const object"
+            << " from a " << typeName()
             << abort(FatalError);
-        return *ptr_;
     }
+
+    return *ptr_;
 }
 
 
@@ -170,7 +172,7 @@ inline T* Foam::tmp<T>::ptr() const
         if (!ptr_)
         {
             FatalErrorInFunction
-                << "Temporary of type " << typeid(T).name() << " deallocated"
+                << typeName() << " deallocated"
                 << abort(FatalError);
         }
 
@@ -178,7 +180,7 @@ inline T* Foam::tmp<T>::ptr() const
         {
             FatalErrorInFunction
                 << "Attempt to acquire pointer to object referred to"
-                   " by multiple 'tmp's"
+                << " by multiple temporaries of type " << typeName()
                 << abort(FatalError);
         }
 
@@ -219,23 +221,19 @@ inline void Foam::tmp<T>::clear() const
 template<class T>
 inline T& Foam::tmp<T>::operator()()
 {
-    if (type_ == TMP)
+    if (isTmp())
     {
         if (!ptr_)
         {
             FatalErrorInFunction
-                << "Temporary of type " << typeid(T).name() << " deallocated"
+                << typeName() << " deallocated"
                 << abort(FatalError);
         }
+    }
 
-        return *ptr_;
-    }
-    else
-    {
-        // Const-ness is automatically cast-away which is why this operator is
-        // deprecated.  Use ref() where non-const access is required.
-        return *ptr_;
-    }
+    // Const-ness is automatically cast-away which is why this operator is
+    // deprecated.  Use ref() where non-const access is required.
+    return *ptr_;
 }
 #endif
 
@@ -243,22 +241,18 @@ inline T& Foam::tmp<T>::operator()()
 template<class T>
 inline const T& Foam::tmp<T>::operator()() const
 {
-    if (type_ == TMP)
+    if (isTmp())
     {
         if (!ptr_)
         {
             FatalErrorInFunction
-                << "Temporary of type " << typeid(T).name() << " deallocated"
+                << typeName() << " deallocated"
                 << abort(FatalError);
         }
+    }
 
-        return *ptr_;
-    }
-    else
-    {
-        // Return const reference
-        return *ptr_;
-    }
+    // Return const reference
+    return *ptr_;
 }
 
 
@@ -274,91 +268,67 @@ inline T* Foam::tmp<T>::operator->()
 {
     if (isTmp())
     {
-         if (!ptr_)
-         {
-             FatalErrorInFunction
-                 << "Temporary of type " << typeid(T).name() << " deallocated"
-                 << abort(FatalError);
-         }
-
-         return ptr_;
+        if (!ptr_)
+        {
+            FatalErrorInFunction
+                << typeName() << " deallocated"
+                << abort(FatalError);
+        }
     }
     else
     {
-        FatalErrorInFunction << "Const object cast to non-const"
+        FatalErrorInFunction
+            << "Attempt to cast const object to non-const for a " << typeName()
             << abort(FatalError);
-        return ptr_;
     }
+
+    return ptr_;
 }
 
 
 template<class T>
 inline const T* Foam::tmp<T>::operator->() const
 {
-    if (isTmp())
+    if (isTmp() && !ptr_)
     {
-         if (!ptr_)
-         {
-             FatalErrorInFunction
-                 << "Temporary of type " << typeid(T).name() << " deallocated"
-                 << abort(FatalError);
-         }
+        FatalErrorInFunction
+            << typeName() << " deallocated"
+            << abort(FatalError);
+    }
 
-         return ptr_;
-    }
-    else
-    {
-        return ptr_;
-    }
+    return ptr_;
 }
 
 
 template<class T>
 inline void Foam::tmp<T>::operator=(T* tPtr)
 {
-    if (isTmp() && ptr_)
-    {
-        if (ptr_->unique())
-        {
-            delete ptr_;
-            ptr_ = 0;
-        }
-        else
-        {
-            ptr_->operator--();
-        }
-    }
-
-    type_ = TMP;
+    clear();
 
     if (!tPtr)
     {
         FatalErrorInFunction
-            << "Attempted copy of a deallocated temporary"
-            << " of type " << typeid(T).name()
+            << "Attempted copy of a deallocated " << typeName()
             << abort(FatalError);
     }
 
+    if (tPtr && !tPtr->unique())
+    {
+        FatalErrorInFunction
+            << "Attempted assignment of a " << typeName()
+            << " to non-unique pointer"
+            << abort(FatalError);
+    }
+
+    type_ = TMP;
     ptr_ = tPtr;
-    ptr_->resetRefCount();
 }
 
 
 template<class T>
 inline void Foam::tmp<T>::operator=(const tmp<T>& t)
 {
-    if (isTmp() && ptr_)
-    {
-        if (ptr_->unique())
-        {
-            delete ptr_;
-            ptr_ = 0;
-        }
-        else
-        {
-            ptr_->operator--();
-        }
-    }
+    clear();
 
     if (t.isTmp())
     {
@@ -367,8 +337,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
         if (!t.ptr_)
         {
             FatalErrorInFunction
-                << "Attempted assignment to a deallocated temporary"
-                << " of type " << typeid(T).name()
+                << "Attempted assignment to a deallocated " << typeName()
                 << abort(FatalError);
         }
 
@@ -379,7 +348,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
     else
     {
         FatalErrorInFunction
-            << "Attempted assignment to a const reference to constant object"
+            << "Attempted assignment to a const reference to an object"
             << " of type " << typeid(T).name()
             << abort(FatalError);
     }

From 85fa6c2649535b78b502fa35ca62b77905b028f3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 25 Feb 2016 15:07:14 +0000
Subject: [PATCH 224/447] Field: Simplified tmp reuse and cleanup

---
 .../fields/Fields/Field/FieldFunctions.C      | 29 +++---
 .../fields/Fields/Field/FieldFunctionsM.C     | 26 +++---
 .../fields/Fields/Field/FieldReuseFunctions.H | 90 ++++++-------------
 .../fields/Fields/scalarField/scalarField.C   |  8 +-
 .../Fields/symmTensorField/symmTensorField.C  |  4 +-
 .../symmTransformField/symmTransformField.C   | 12 +--
 .../fields/Fields/tensorField/tensorField.C   |  4 +-
 .../Fields/transformField/transformField.C    |  8 +-
 .../transformField/transformFieldTemplates.C  | 12 +--
 .../cfdTools/general/MRF/MRFZoneList.C        |  7 +-
 10 files changed, 82 insertions(+), 118 deletions(-)

diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index f927266195..d2b3e2d6b1 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -102,7 +102,7 @@ pow
     typedef typename powProduct<Type, r>::type powProductType;
     tmp<Field<powProductType>> tRes = reuseTmp<powProductType, Type>::New(tf);
     pow<Type, r>(tRes.ref(), tf());
-    reuseTmp<powProductType, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -139,7 +139,7 @@ sqr(const tmp<Field<Type>>& tf)
     tmp<Field<outerProductType>> tRes =
         reuseTmp<outerProductType, Type>::New(tf);
     sqr(tRes.ref(), tf());
-    reuseTmp<outerProductType, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -163,7 +163,7 @@ tmp<Field<scalar>> magSqr(const tmp<Field<Type>>& tf)
 {
     tmp<Field<scalar>> tRes = reuseTmp<scalar, Type>::New(tf);
     magSqr(tRes.ref(), tf());
-    reuseTmp<scalar, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -187,7 +187,7 @@ tmp<Field<scalar>> mag(const tmp<Field<Type>>& tf)
 {
     tmp<Field<scalar>> tRes = reuseTmp<scalar, Type>::New(tf);
     mag(tRes.ref(), tf());
-    reuseTmp<scalar, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -214,7 +214,7 @@ tmp<Field<typename Field<Type>::cmptType>> cmptMax(const tmp<Field<Type>>& tf)
     typedef typename Field<Type>::cmptType cmptType;
     tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
     cmptMax(tRes.ref(), tf());
-    reuseTmp<cmptType, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -241,7 +241,7 @@ tmp<Field<typename Field<Type>::cmptType>> cmptMin(const tmp<Field<Type>>& tf)
     typedef typename Field<Type>::cmptType cmptType;
     tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
     cmptMin(tRes.ref(), tf());
-    reuseTmp<cmptType, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -268,7 +268,7 @@ tmp<Field<typename Field<Type>::cmptType>> cmptAv(const tmp<Field<Type>>& tf)
     typedef typename Field<Type>::cmptType cmptType;
     tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
     cmptAv(tRes.ref(), tf());
-    reuseTmp<cmptType, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -290,9 +290,9 @@ tmp<Field<Type>> cmptMag(const UList<Type>& f)
 template<class Type>
 tmp<Field<Type>> cmptMag(const tmp<Field<Type>>& tf)
 {
-    tmp<Field<Type>> tRes = reuseTmp<Type, Type>::New(tf);
+    tmp<Field<Type>> tRes = New(tf);
     cmptMag(tRes.ref(), tf());
-    reuseTmp<Type, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -664,7 +664,7 @@ operator Op(const UList<Type1>& f1, const tmp<Field<Type2>>& tf2)              \
     typedef typename product<Type1, Type2>::type productType;                  \
     tmp<Field<productType>> tRes = reuseTmp<productType, Type2>::New(tf2);     \
     OpFunc(tRes.ref(), f1, tf2());                                             \
-    reuseTmp<productType, Type2>::clear(tf2);                                  \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -675,7 +675,7 @@ operator Op(const tmp<Field<Type1>>& tf1, const UList<Type2>& f2)              \
     typedef typename product<Type1, Type2>::type productType;                  \
     tmp<Field<productType>> tRes = reuseTmp<productType, Type1>::New(tf1);     \
     OpFunc(tRes.ref(), tf1(), f2);                                             \
-    reuseTmp<productType, Type1>::clear(tf1);                                  \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -687,7 +687,8 @@ operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2)        \
     tmp<Field<productType>> tRes =                                             \
         reuseTmpTmp<productType, Type1, Type1, Type2>::New(tf1, tf2);          \
     OpFunc(tRes.ref(), tf1(), tf2());                                          \
-    reuseTmpTmp<productType, Type1, Type1, Type2>::clear(tf1, tf2);            \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -725,7 +726,7 @@ operator Op                                                                    \
     typedef typename product<Type, Form>::type productType;                    \
     tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);      \
     OpFunc(tRes.ref(), tf1(), static_cast<const Form&>(vs));                   \
-    reuseTmp<productType, Type>::clear(tf1);                                   \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -762,7 +763,7 @@ operator Op                                                                    \
     typedef typename product<Form, Type>::type productType;                    \
     tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);      \
     OpFunc(tRes.ref(), static_cast<const Form&>(vs), tf1());                   \
-    reuseTmp<productType, Type>::clear(tf1);                                   \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
index c4a7ff6c03..f286d319f0 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
@@ -49,7 +49,7 @@ tmp<Field<ReturnType>> Func(const tmp<Field<Type>>& tf)                        \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);         \
     Func(tRes.ref(), tf());                                                    \
-    reuseTmp<ReturnType, Type>::clear(tf);                                     \
+    tf.clear();                                                                \
     return tRes;                                                               \
 }
 
@@ -77,7 +77,7 @@ tmp<Field<ReturnType>> operator Op(const tmp<Field<Type>>& tf)                 \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);         \
     OpFunc(tRes.ref(), tf());                                                  \
-    reuseTmp<ReturnType, Type>::clear(tf);                                     \
+    tf.clear();                                                                \
     return tRes;                                                               \
 }
 
@@ -121,7 +121,7 @@ tmp<Field<ReturnType>> Func                                                    \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
     Func(tRes.ref(), f1, tf2());                                               \
-    reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -134,7 +134,7 @@ tmp<Field<ReturnType>> Func                                                    \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
     Func(tRes.ref(), tf1(), f2);                                               \
-    reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -148,7 +148,8 @@ tmp<Field<ReturnType>> Func                                                    \
     tmp<Field<ReturnType>> tRes =                                              \
         reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);           \
     Func(tRes.ref(), tf1(), tf2());                                            \
-    reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);             \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }
 
@@ -192,7 +193,7 @@ tmp<Field<ReturnType>> Func                                                    \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
     Func(tRes.ref(), s1, tf2());                                               \
-    reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }
 
@@ -234,7 +235,7 @@ tmp<Field<ReturnType>> Func                                                    \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
     Func(tRes.ref(), tf1(), s2);                                               \
-    reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }
 
@@ -280,7 +281,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
     OpFunc(tRes.ref(), f1, tf2());                                             \
-    reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -293,7 +294,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
     OpFunc(tRes.ref(), tf1(), f2);                                             \
-    reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -307,7 +308,8 @@ tmp<Field<ReturnType>> operator Op                                             \
     tmp<Field<ReturnType>> tRes =                                              \
         reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);           \
     OpFunc(tRes.ref(), tf1(), tf2());                                          \
-    reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);             \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }
 
@@ -348,7 +350,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);       \
     OpFunc(tRes.ref(), s1, tf2());                                             \
-    reuseTmp<ReturnType, Type2>::clear(tf2);                                   \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }
 
@@ -387,7 +389,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 {                                                                              \
     tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);       \
     OpFunc(tRes.ref(), tf1(), s2);                                             \
-    reuseTmp<ReturnType, Type1>::clear(tf1);                                   \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
index 4eedccdc43..fac9e9a51c 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
@@ -33,6 +33,31 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+template<class TypeR>
+tmp<Field<TypeR>> New
+(
+    const tmp<Field<TypeR>>& tf1,
+    const bool initRet = false
+)
+{
+    if (tf1.isTmp())
+    {
+        return tf1;
+    }
+    else
+    {
+        tmp<Field<TypeR>> rtf(new Field<TypeR>(tf1().size()));
+
+        if (initRet)
+        {
+            rtf.ref() = tf1();
+        }
+
+        return rtf;
+    }
+}
+
+
 template<class TypeR, class Type1>
 class reuseTmp
 {
@@ -42,11 +67,6 @@ public:
     {
         return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
     }
-
-    static void clear(const tmp<Field<Type1>>& tf1)
-    {
-        tf1.clear();
-    }
 };
 
 
@@ -55,11 +75,7 @@ class reuseTmp<TypeR, TypeR>
 {
 public:
 
-    static tmp<Field<TypeR>> New
-    (
-        const tmp<Field<TypeR>>& tf1,
-        const bool initRet = false
-    )
+    static tmp<Field<TypeR>> New(const tmp<Field<TypeR>>& tf1)
     {
         if (tf1.isTmp())
         {
@@ -67,21 +83,9 @@ public:
         }
         else
         {
-            tmp<Field<TypeR>> rtf(new Field<TypeR>(tf1().size()));
-
-            if (initRet)
-            {
-                rtf.ref() = tf1();
-            }
-
-            return rtf;
+            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
-
-    static void clear(const tmp<Field<TypeR>>& tf1)
-    {
-        tf1.clear();
-    }
 };
 
 
@@ -98,16 +102,6 @@ public:
     {
         return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
     }
-
-    static void clear
-    (
-        const tmp<Field<Type1>>& tf1,
-        const tmp<Field<Type2>>& tf2
-    )
-    {
-        tf1.clear();
-        tf2.clear();
-    }
 };
 
 
@@ -131,16 +125,6 @@ public:
             return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
-
-    static void clear
-    (
-        const tmp<Field<Type1>>& tf1,
-        const tmp<Field<TypeR>>& tf2
-    )
-    {
-        tf1.clear();
-        tf2.clear();
-    }
 };
 
 
@@ -164,16 +148,6 @@ public:
             return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
-
-    static void clear
-    (
-        const tmp<Field<TypeR>>& tf1,
-        const tmp<Field<Type2>>& tf2
-    )
-    {
-        tf1.clear();
-        tf2.clear();
-    }
 };
 
 
@@ -201,16 +175,6 @@ public:
             return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
-
-    static void clear
-    (
-        const tmp<Field<TypeR>>& tf1,
-        const tmp<Field<TypeR>>& tf2
-    )
-    {
-        tf1.clear();
-        tf2.clear();
-    }
 };
 
 
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
index 875e610cb7..0aac998c8d 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
@@ -80,9 +80,9 @@ tmp<scalarField> stabilise(const UList<scalar>& sf, const scalar s)
 
 tmp<scalarField> stabilise(const tmp<scalarField>& tsf, const scalar s)
 {
-    tmp<scalarField> tRes = reuseTmp<scalar, scalar>::New(tsf);
+    tmp<scalarField> tRes = New(tsf);
     stabilise(tRes.ref(), tsf(), s);
-    reuseTmp<scalar, scalar>::clear(tsf);
+    tsf.clear();
     return tRes;
 }
 
@@ -179,9 +179,9 @@ tmp<scalarField> func(const int n, const UList<scalar>& sf)                    \
                                                                                \
 tmp<scalarField> func(const int n, const tmp<scalarField>& tsf)                \
 {                                                                              \
-    tmp<scalarField> tRes = reuseTmp<scalar, scalar>::New(tsf);                \
+    tmp<scalarField> tRes = New(tsf);                                          \
     func(tRes.ref(), n, tsf());                                                \
-    reuseTmp<scalar, scalar>::clear(tsf);                                      \
+    tsf.clear();                                                               \
     return tRes;                                                               \
 }
 
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
index 6304130a71..c50ab3daa4 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
@@ -114,9 +114,9 @@ tmp<symmTensorField> inv(const UList<symmTensor>& tf)
 
 tmp<symmTensorField> inv(const tmp<symmTensorField>& tf)
 {
-    tmp<symmTensorField> tRes = reuseTmp<symmTensor, symmTensor>::New(tf);
+    tmp<symmTensorField> tRes = New(tf);
     inv(tRes.ref(), tf());
-    reuseTmp<symmTensor, symmTensor>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
index 1b6c52bb14..e1b19cf8df 100644
--- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
+++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
@@ -75,9 +75,9 @@ tmp<Field<Type>> transform
     const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = New(ttf);
     transform(tranf.ref(), trf, ttf());
-    reuseTmp<Type, Type>::clear(ttf);
+    ttf.clear();
     return tranf;
 }
 
@@ -103,9 +103,9 @@ tmp<Field<Type>> transform
     const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = New(ttf);
     transform(tranf.ref(), ttrf(), ttf());
-    reuseTmp<Type, Type>::clear(ttf);
+    ttf.clear();
     ttrf.clear();
     return tranf;
 }
@@ -143,9 +143,9 @@ tmp<Field<Type>> transform
     const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = New(ttf);
     transform(tranf.ref(), t, ttf());
-    reuseTmp<Type, Type>::clear(ttf);
+    ttf.clear();
     return tranf;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
index a85f6052ea..45ea27e12c 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
@@ -112,9 +112,9 @@ tmp<tensorField> inv(const UList<tensor>& tf)
 
 tmp<tensorField> inv(const tmp<tensorField>& tf)
 {
-    tmp<tensorField> tRes = reuseTmp<tensor, tensor>::New(tf);
+    tmp<tensorField> tRes = New(tf);
     inv(tRes.ref(), tf());
-    reuseTmp<tensor, tensor>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformField.C b/src/OpenFOAM/fields/Fields/transformField/transformField.C
index d548c90260..4d35792d73 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformField.C
+++ b/src/OpenFOAM/fields/Fields/transformField/transformField.C
@@ -59,9 +59,9 @@ Foam::tmp<Foam::vectorField> Foam::transform
     const tmp<vectorField>& ttf
 )
 {
-    tmp<vectorField > tranf = reuseTmp<vector, vector>::New(ttf);
+    tmp<vectorField > tranf = New(ttf);
     transform(tranf.ref(), q, ttf());
-    reuseTmp<vector, vector>::clear(ttf);
+    ttf.clear();
     return tranf;
 }
 
@@ -117,9 +117,9 @@ Foam::tmp<Foam::vectorField> Foam::transform
     const tmp<vectorField>& ttf
 )
 {
-    tmp<vectorField > tranf = reuseTmp<vector, vector>::New(ttf);
+    tmp<vectorField > tranf = New(ttf);
     transform(tranf.ref(), tr, ttf());
-    reuseTmp<vector, vector>::clear(ttf);
+    ttf.clear();
     return tranf;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C b/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
index 985054bede..7e87d7af92 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
+++ b/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
@@ -75,9 +75,9 @@ tmp<Field<Type>> transform
     const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = New(ttf);
     transform(tranf.ref(), trf, ttf());
-    reuseTmp<Type, Type>::clear(ttf);
+    ttf.clear();
     return tranf;
 }
 
@@ -103,9 +103,9 @@ tmp<Field<Type>> transform
     const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = New(ttf);
     transform(tranf.ref(), ttrf(), ttf());
-    reuseTmp<Type, Type>::clear(ttf);
+    ttf.clear();
     ttrf.clear();
     return tranf;
 }
@@ -143,9 +143,9 @@ tmp<Field<Type>> transform
     const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = New(ttf);
     transform(tranf.ref(), t, ttf());
-    reuseTmp<Type, Type>::clear(ttf);
+    ttf.clear();
     return tranf;
 }
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
index a4b099b6cb..5e31ac1269 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
@@ -290,17 +290,14 @@ Foam::MRFZoneList::relative
 {
     if (size())
     {
-        tmp<Field<scalar>> rphi
-        (
-            reuseTmp<scalar, scalar>::New(tphi, true)
-        );
+        tmp<Field<scalar>> rphi(New(tphi, true));
 
         forAll(*this, i)
         {
             operator[](i).makeRelative(rphi.ref(), patchi);
         }
 
-        reuseTmp<scalar, scalar>::clear(tphi);
+        tphi.clear();
 
         return rphi;
     }

From e1405f226018c33b24abc20aec4e6ba66e3d4dee Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 25 Feb 2016 18:29:00 +0000
Subject: [PATCH 225/447] FieldField, DimensionedField, GeometricField:
 Simplified tmp reuse and cleanup

---
 .../DimensionedFieldFunctions.C               |  22 +--
 .../DimensionedFieldFunctionsM.C              |  28 +--
 .../DimensionedFieldReuseFunctions.H          |  87 ++++-----
 .../DimensionedScalarField.C                  | 165 ++++++++----------
 .../FieldField/FieldFieldFunctions.C          |  33 ++--
 .../FieldField/FieldFieldFunctionsM.C         |  38 ++--
 .../FieldField/FieldFieldReuseFunctions.H     |  90 ++++------
 .../scalarFieldField/scalarFieldField.C       |   7 +-
 .../GeometricField/GeometricFieldFunctions.C  |  39 ++---
 .../GeometricField/GeometricFieldFunctionsM.C |  40 ++---
 .../GeometricFieldReuseFunctions.H            | 113 +++++-------
 .../GeometricScalarField.C                    |  51 +++---
 src/OpenFOAM/memory/tmp/tmpI.H                |  20 +--
 .../cfdTools/general/MRF/MRFZoneList.C        |  19 +-
 14 files changed, 318 insertions(+), 434 deletions(-)

diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
index c5fffefcb8..c282ecb900 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
@@ -88,7 +88,7 @@ pow
 
     pow<Type, r, GeoMesh>(tPow().field(), df.field());
 
-    reuseTmpDimensionedField<powProductType, Type, GeoMesh>::clear(tdf);
+    tdf.clear();
 
     return tPow;
 }
@@ -137,7 +137,7 @@ sqr(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
 
     sqr(tSqr().field(), df.field());
 
-    reuseTmpDimensionedField<outerProductType, Type, GeoMesh>::clear(tdf);
+    tdf.clear();
 
     return tSqr;
 }
@@ -187,7 +187,7 @@ tmp<DimensionedField<scalar, GeoMesh>> magSqr
 
     magSqr(tMagSqr().field(), df.field());
 
-    reuseTmpDimensionedField<scalar, Type, GeoMesh>::clear(tdf);
+    tdf.clear();
 
     return tMagSqr;
 }
@@ -237,7 +237,7 @@ tmp<DimensionedField<scalar, GeoMesh>> mag
 
     mag(tMag().field(), df.field());
 
-    reuseTmpDimensionedField<scalar, Type, GeoMesh>::clear(tdf);
+    tdf.clear();
 
     return tMag;
 }
@@ -296,7 +296,7 @@ cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
 
     cmptAv(CmptAv().field(), df.field());
 
-    reuseTmpDimensionedField<cmptType, Type, GeoMesh>::clear(tdf);
+    tdf.clear();
 
     return CmptAv;
 }
@@ -417,7 +417,7 @@ operator op                                                                    \
                                                                                \
     Foam::opFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
-    reuseTmpDimensionedField<productType, Type2, GeoMesh>::clear(tdf2);        \
+    tdf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -444,7 +444,7 @@ operator op                                                                    \
                                                                                \
     Foam::opFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
-    reuseTmpDimensionedField<productType, Type1, GeoMesh>::clear(tdf1);        \
+    tdf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -474,8 +474,8 @@ operator op                                                                    \
                                                                                \
     Foam::opFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
-    reuseTmpTmpDimensionedField                                                \
-        <productType, Type1, Type1, Type2, GeoMesh>::clear(tdf1, tdf2);        \
+    tdf1.clear();                                                              \
+    tdf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -544,7 +544,7 @@ operator op                                                                    \
                                                                                \
     Foam::opFunc(tRes.ref().field(), df1.field(), dvs.value());                \
                                                                                \
-    reuseTmpDimensionedField<productType, Type, GeoMesh>::clear(tdf1);         \
+    tdf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -623,7 +623,7 @@ operator op                                                                    \
                                                                                \
     Foam::opFunc(tRes.ref().field(), dvs.value(), df1.field());                \
                                                                                \
-    reuseTmpDimensionedField<productType, Type, GeoMesh>::clear(tdf1);         \
+    tdf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
index 743ea0de38..6da09d945c 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
@@ -75,7 +75,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
                                                                                \
     Func(tRes.ref().field(), df1.field());                                     \
                                                                                \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+    tdf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }
@@ -131,7 +131,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
                                                                                \
     Foam::OpFunc(tRes.ref().field(), df1.field());                             \
                                                                                \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+    tdf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }
@@ -189,7 +189,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
                                                                                \
     Func(tRes.ref().field(), df1.field(), df2.field());                        \
                                                                                \
-    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
+    tdf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -215,7 +215,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
                                                                                \
     Func(tRes.ref().field(), df1.field(), df2.field());                        \
                                                                                \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+    tdf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -244,8 +244,8 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
                                                                                \
     Func(tRes.ref().field(), df1.field(), df2.field());                        \
                                                                                \
-    reuseTmpTmpDimensionedField<ReturnType, Type1, Type1, Type2, GeoMesh>      \
-    ::clear(tdf1, tdf2);                                                       \
+    tdf1.clear();                                                              \
+    tdf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }
@@ -314,7 +314,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
                                                                                \
     Func(tRes.ref().field(), dt1.value(), df2.field());                        \
                                                                                \
-    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
+    tdf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -391,7 +391,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
                                                                                \
     Func(tRes.ref().field(), df1.field(), dt2.value());                        \
                                                                                \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+    tdf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -464,7 +464,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
                                                                                \
     Foam::OpFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
-    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
+    tdf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -490,7 +490,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
                                                                                \
     Foam::OpFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+    tdf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -519,8 +519,8 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
                                                                                \
     Foam::OpFunc(tRes.ref().field(), df1.field(), df2.field());                \
                                                                                \
-    reuseTmpTmpDimensionedField<ReturnType, Type1, Type1, Type2, GeoMesh>::    \
-        clear(tdf1, tdf2);                                                     \
+    tdf1.clear();                                                              \
+    tdf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }
@@ -589,7 +589,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
                                                                                \
     Foam::OpFunc(tRes.ref().field(), dt1.value(), tdf2().field());             \
                                                                                \
-    reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::clear(tdf2);         \
+    tdf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -666,7 +666,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
                                                                                \
     Foam::OpFunc(tRes.ref().field(), tdf1().field(), dt2.value());             \
                                                                                \
-    reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::clear(tdf1);         \
+    tdf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
index b56adf3805..513efc44e5 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
@@ -33,6 +33,43 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+template<class TypeR, class GeoMesh>
+tmp<DimensionedField<TypeR, GeoMesh>> New
+(
+    const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
+    const word& name,
+    const dimensionSet& dimensions
+)
+{
+    DimensionedField<TypeR, GeoMesh>& df1 =
+        const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+
+    if (tdf1.isTmp())
+    {
+        df1.rename(name);
+        df1.dimensions().reset(dimensions);
+        return tdf1;
+    }
+    else
+    {
+        return tmp<DimensionedField<TypeR, GeoMesh>>
+        (
+            new DimensionedField<TypeR, GeoMesh>
+            (
+                IOobject
+                (
+                    name,
+                    df1.instance(),
+                    df1.db()
+                ),
+                df1.mesh(),
+                dimensions
+            )
+        );
+    }
+}
+
+
 template<class TypeR, class Type1, class GeoMesh>
 class reuseTmpDimensionedField
 {
@@ -62,11 +99,6 @@ public:
             )
         );
     }
-
-    static void clear(const tmp<DimensionedField<Type1, GeoMesh>>& tdf1)
-    {
-        tdf1.clear();
-    }
 };
 
 
@@ -109,11 +141,6 @@ public:
             );
         }
     }
-
-    static void clear(const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1)
-    {
-        tdf1.clear();
-    }
 };
 
 
@@ -147,16 +174,6 @@ public:
             )
         );
     }
-
-    static void clear
-    (
-        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2
-    )
-    {
-        tdf1.clear();
-        tdf2.clear();
-    }
 };
 
 
@@ -201,16 +218,6 @@ public:
             );
         }
     }
-
-    static void clear
-    (
-        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2
-    )
-    {
-        tdf1.clear();
-        tdf2.clear();
-    }
 };
 
 
@@ -254,16 +261,6 @@ public:
             );
         }
     }
-
-    static void clear
-    (
-        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2
-    )
-    {
-        tdf1.clear();
-        tdf2.clear();
-    }
 };
 
 
@@ -315,16 +312,6 @@ public:
             );
         }
     }
-
-    static void clear
-    (
-        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2
-    )
-    {
-        tdf1.clear();
-        tdf2.clear();
-    }
 };
 
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
index f8e3c8047e..9eb3fcf53f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
@@ -72,17 +72,16 @@ tmp<DimensionedField<scalar, GeoMesh>> stabilise
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh>> tRes =
-        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
-        (
-            tdsf,
-            "stabilise(" + dsf.name() + ',' + ds.name() + ')',
-            dsf.dimensions() + ds.dimensions()
-        );
+    tmp<DimensionedField<scalar, GeoMesh>> tRes = New
+    (
+        tdsf,
+        "stabilise(" + dsf.name() + ',' + ds.name() + ')',
+        dsf.dimensions() + ds.dimensions()
+    );
 
     stabilise(tRes.ref().field(), dsf.field(), ds.value());
 
-    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);
+    tdsf.clear();
 
     return tRes;
 }
@@ -141,21 +140,20 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
 {
     const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
 
-    tmp<DimensionedField<scalar, GeoMesh>> tPow =
-        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
+    tmp<DimensionedField<scalar, GeoMesh>> tPow = New
+    (
+        tdsf1,
+        "pow(" + dsf1.name() + ',' + dsf2.name() + ')',
+        pow
         (
-            tdsf1,
-            "pow(" + dsf1.name() + ',' + dsf2.name() + ')',
-            pow
-            (
-                dsf1.dimensions(),
-                dimensionedScalar("1", 1.0, dsf2.dimensions())
-            )
-        );
+            dsf1.dimensions(),
+            dimensionedScalar("1", 1.0, dsf2.dimensions())
+        )
+    );
 
     pow(tPow.ref().field(), dsf1.field(), dsf2.field());
 
-    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf1);
+    tdsf1.clear();
 
     return tPow;
 }
@@ -170,21 +168,20 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
 {
     const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
 
-    tmp<DimensionedField<scalar, GeoMesh>> tPow =
-        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
+    tmp<DimensionedField<scalar, GeoMesh>> tPow = New
+    (
+        tdsf2,
+        "pow(" + dsf1.name() + ',' + dsf2.name() + ')',
+        pow
         (
-            tdsf2,
-            "pow(" + dsf1.name() + ',' + dsf2.name() + ')',
-            pow
-            (
-                dsf1.dimensions(),
-                dimensionedScalar("1", 1.0, dsf2.dimensions())
-            )
-        );
+            dsf1.dimensions(),
+            dimensionedScalar("1", 1.0, dsf2.dimensions())
+        )
+    );
 
     pow(tPow.ref().field(), dsf1.field(), dsf2.field());
 
-    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf2);
+    tdsf2.clear();
 
     return tPow;
 }
@@ -215,11 +212,8 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
 
     pow(tPow.ref().field(), dsf1.field(), dsf2.field());
 
-    reuseTmpTmpDimensionedField<scalar, scalar, scalar, scalar, GeoMesh>::clear
-    (
-        tdsf1,
-        tdsf2
-    );
+    tdsf1.clear();
+    tdsf2.clear();
 
     return tPow;
 }
@@ -261,17 +255,16 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh>> tPow =
-        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
-        (
-            tdsf,
-            "pow(" + dsf.name() + ',' + ds.name() + ')',
-            pow(dsf.dimensions(), ds)
-        );
+    tmp<DimensionedField<scalar, GeoMesh>> tPow = New
+    (
+        tdsf,
+        "pow(" + dsf.name() + ',' + ds.name() + ')',
+        pow(dsf.dimensions(), ds)
+    );
 
     pow(tPow.ref().field(), dsf.field(), ds.value());
 
-    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);
+    tdsf.clear();
 
     return tPow;
 }
@@ -334,17 +327,16 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh>> tPow =
-        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
-        (
-            tdsf,
-            "pow(" + ds.name() + ',' + dsf.name() + ')',
-            pow(ds, dsf.dimensions())
-        );
+    tmp<DimensionedField<scalar, GeoMesh>> tPow = New
+    (
+        tdsf,
+        "pow(" + ds.name() + ',' + dsf.name() + ')',
+        pow(ds, dsf.dimensions())
+    );
 
     pow(tPow.ref().field(), ds.value(), dsf.field());
 
-    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);
+    tdsf.clear();
 
     return tPow;
 }
@@ -409,17 +401,16 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
 {
     const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
 
-    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
-        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
-        (
-            tdsf1,
-            "atan2(" + dsf1.name() + ',' + dsf2.name() + ')',
-            atan2(dsf1.dimensions(), dsf2.dimensions())
-        );
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 = New
+    (
+        tdsf1,
+        "atan2(" + dsf1.name() + ',' + dsf2.name() + ')',
+        atan2(dsf1.dimensions(), dsf2.dimensions())
+    );
 
     atan2(tAtan2.ref().field(), dsf1.field(), dsf2.field());
 
-    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf1);
+    tdsf1.clear();
 
     return tAtan2;
 }
@@ -434,17 +425,16 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
 {
     const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
 
-    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
-        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
-        (
-            tdsf2,
-            "atan2(" + dsf1.name() + ',' + dsf2.name() + ')',
-            atan2(dsf1.dimensions(), dsf2.dimensions())
-        );
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 = New
+    (
+        tdsf2,
+        "atan2(" + dsf1.name() + ',' + dsf2.name() + ')',
+        atan2(dsf1.dimensions(), dsf2.dimensions())
+    );
 
     atan2(tAtan2.ref().field(), dsf1.field(), dsf2.field());
 
-    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf2);
+    tdsf2.clear();
 
     return tAtan2;
 }
@@ -471,11 +461,8 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
 
     atan2(tAtan2.ref().field(), dsf1.field(), dsf2.field());
 
-    reuseTmpTmpDimensionedField<scalar, scalar, scalar, scalar, GeoMesh>::clear
-    (
-        tdsf1,
-        tdsf2
-    );
+    tdsf1.clear();
+    tdsf2.clear();
 
     return tAtan2;
 }
@@ -517,17 +504,16 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
-        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
-        (
-            tdsf,
-            "atan2(" + dsf.name() + ',' + ds.name() + ')',
-            atan2(dsf.dimensions(), ds)
-        );
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 = New
+    (
+        tdsf,
+        "atan2(" + dsf.name() + ',' + ds.name() + ')',
+        atan2(dsf.dimensions(), ds)
+    );
 
     atan2(tAtan2.ref().field(), dsf.field(), ds.value());
 
-    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);
+    tdsf.clear();
 
     return tAtan2;
 }
@@ -590,17 +576,16 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
-        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
-        (
-            tdsf,
-            "atan2(" + ds.name() + ',' + dsf.name() + ')',
-            atan2(ds, dsf.dimensions())
-        );
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 = New
+    (
+        tdsf,
+        "atan2(" + ds.name() + ',' + dsf.name() + ')',
+        atan2(ds, dsf.dimensions())
+    );
 
     atan2(tAtan2.ref().field(), ds.value(), dsf.field());
 
-    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);
+    tdsf.clear();
 
     return tAtan2;
 }
@@ -721,7 +706,7 @@ tmp<DimensionedField<scalar, GeoMesh>> func                                    \
                                                                                \
     tmp<DimensionedField<scalar, GeoMesh>> tFunc                               \
     (                                                                          \
-        reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New                 \
+        New                                                                    \
         (                                                                      \
             tdsf,                                                              \
             #func "(" + name(n) + ',' + dsf.name() + ')',                      \
@@ -731,7 +716,7 @@ tmp<DimensionedField<scalar, GeoMesh>> func                                    \
                                                                                \
     func(tFunc.ref().field(), n, dsf.field());                                 \
                                                                                \
-    reuseTmpDimensionedField<scalar, scalar, GeoMesh>::clear(tdsf);            \
+    tdsf.clear();                                                              \
                                                                                \
     return tFunc;                                                              \
 }
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index 1b705e2b8d..14e1d79ff3 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -103,7 +103,7 @@ pow
         reuseTmpFieldField<Field, powProductType, Type>::New(tf)
     );
     pow<Type, r>(tRes.ref(), tf());
-    reuseTmpFieldField<Field, powProductType, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -144,7 +144,7 @@ sqr(const tmp<FieldField<Field, Type>>& tf)
         reuseTmpFieldField<Field, outerProductType, Type>::New(tf)
     );
     sqr(tRes.ref(), tf());
-    reuseTmpFieldField<Field, outerProductType, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -179,7 +179,7 @@ tmp<FieldField<Field, scalar>> magSqr(const tmp<FieldField<Field, Type>>& tf)
     );
 
     magSqr(tRes.ref(), tf());
-    reuseTmpFieldField<Field, scalar, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -214,7 +214,7 @@ tmp<FieldField<Field, scalar>> mag(const tmp<FieldField<Field, Type>>& tf)
     );
 
     mag(tRes.ref(), tf());
-    reuseTmpFieldField<Field, scalar, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -259,7 +259,7 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
     cmptMax(tRes.ref(), tf());
-    reuseTmpFieldField<Field, cmptType, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -304,7 +304,7 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
     cmptMin(tRes.ref(), tf());
-    reuseTmpFieldField<Field, cmptType, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -349,7 +349,7 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
     cmptAv(tRes.ref(), tf());
-    reuseTmpFieldField<Field, cmptType, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -387,12 +387,9 @@ tmp<FieldField<Field, Type>> cmptMag
     const tmp<FieldField<Field, Type>>& tf
 )
 {
-    tmp<FieldField<Field, Type>> tRes
-    (
-        reuseTmpFieldField<Field, Type, Type>::New(tf)
-    );
+    tmp<FieldField<Field, Type>> tRes(New(tf));
     cmptMag(tRes.ref(), tf());
-    reuseTmpFieldField<Field, Type, Type>::clear(tf);
+    tf.clear();
     return tRes;
 }
 
@@ -685,7 +682,7 @@ operator op                                                                    \
         reuseTmpFieldField<Field, productType, Type2>::New(tf2)                \
     );                                                                         \
     opFunc(tRes.ref(), f1, tf2());                                             \
-    reuseTmpFieldField<Field, productType, Type2>::clear(tf2);                 \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -733,7 +730,7 @@ operator op                                                                    \
         reuseTmpFieldField<Field1, productType, Type1>::New(tf1)               \
     );                                                                         \
     opFunc(tRes.ref(), tf1(), f2);                                             \
-    reuseTmpFieldField<Field1, productType, Type1>::clear(tf1);                \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -758,8 +755,8 @@ operator op                                                                    \
         (tf1, tf2)                                                             \
     );                                                                         \
     opFunc(tRes.ref(), tf1(), tf2());                                          \
-    reuseTmpTmpFieldField<Field1, productType, Type1, Type1, Type2>::clear     \
-    (tf1, tf2);                                                                \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -811,7 +808,7 @@ operator op                                                                    \
         reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
     );                                                                         \
     opFunc(tRes.ref(), tf1(), static_cast<const Form&>(vs));                   \
-    reuseTmpFieldField<Field, productType, Type>::clear(tf1);                  \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -863,7 +860,7 @@ operator op                                                                    \
         reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
     );                                                                         \
     opFunc(tRes.ref(), static_cast<const Form&>(vs), tf1());                   \
-    reuseTmpFieldField<Field, productType, Type>::clear(tf1);                  \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
index 1d4b59cbf3..a32972d21a 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
@@ -63,12 +63,9 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     const tmp<FieldField<Field, Type>>& tf                                     \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tRes                                    \
-    (                                                                          \
-        reuseTmpFieldField<Field, Type, Type>::New(tf)                         \
-    );                                                                         \
+    tmp<FieldField<Field, ReturnType>> tRes(New(tf));                          \
     Func(tRes.ref(), tf());                                                    \
-    reuseTmpFieldField<Field, Type, Type>::clear(tf);                          \
+    tf.clear();                                                                \
     return tRes;                                                               \
 }
 
@@ -110,12 +107,9 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     const tmp<FieldField<Field, Type>>& tf                                     \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tRes                                    \
-    (                                                                          \
-        reuseTmpFieldField<Field, Type, Type>::New(tf)                         \
-    );                                                                         \
+    tmp<FieldField<Field, ReturnType>> tRes(New(tf));                          \
     OpFunc(tRes.ref(), tf());                                                  \
-    reuseTmpFieldField<Field, Type, Type>::clear(tf);                          \
+    tf.clear();                                                                \
     return tRes;                                                               \
 }
 
@@ -165,7 +159,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
     );                                                                         \
     Func(tRes.ref(), f1, tf2());                                               \
-    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -181,7 +175,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
     );                                                                         \
     Func(tRes.ref(), tf1(), f2);                                               \
-    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -198,8 +192,8 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
             New(tf1, tf2)                                                      \
     );                                                                         \
     Func(tRes.ref(), tf1(), tf2());                                            \
-    reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::            \
-        clear(tf1, tf2);                                                       \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }
 
@@ -249,7 +243,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
     );                                                                         \
     Func(tRes.ref(), tf1(), s);                                                \
-    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }
 
@@ -297,7 +291,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
     );                                                                         \
     Func(tRes.ref(), s, tf2());                                                \
-    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }
 
@@ -352,7 +346,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
     );                                                                         \
     OpFunc(tRes.ref(), f1, tf2());                                             \
-    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -368,7 +362,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
     );                                                                         \
     OpFunc(tRes.ref(), tf1(), f2);                                             \
-    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
@@ -385,8 +379,8 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
             New(tf1, tf2)                                                      \
     );                                                                         \
     OpFunc(tRes.ref(), tf1(), tf2());                                          \
-    reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::            \
-        clear(tf1, tf2);                                                       \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }
 
@@ -436,7 +430,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
     );                                                                         \
     OpFunc(tRes.ref(), s, tf2());                                              \
-    reuseTmpFieldField<Field, ReturnType, Type2>::clear(tf2);                  \
+    tf2.clear();                                                               \
     return tRes;                                                               \
 }
 
@@ -484,7 +478,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
     );                                                                         \
     OpFunc(tRes.ref(), tf1(), s);                                              \
-    reuseTmpFieldField<Field, ReturnType, Type1>::clear(tf1);                  \
+    tf1.clear();                                                               \
     return tRes;                                                               \
 }
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
index 672006b452..0006d9aa01 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
@@ -33,6 +33,34 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+template<template<class> class Field, class TypeR>
+tmp<FieldField<Field, TypeR>> New
+(
+    const tmp<FieldField<Field, TypeR>>& tf1,
+    const bool initRet = false
+)
+{
+    if (tf1.isTmp())
+    {
+        return tf1;
+    }
+    else
+    {
+        tmp<FieldField<Field, TypeR>> rtf
+        (
+            FieldField<Field, TypeR>::NewCalculatedType(tf1())
+        );
+
+        if (initRet)
+        {
+            rtf.ref() = tf1();
+        }
+
+        return rtf;
+    }
+}
+
+
 template<template<class> class Field, class TypeR, class Type1>
 class reuseTmpFieldField
 {
@@ -48,11 +76,6 @@ public:
             FieldField<Field, TypeR>::NewCalculatedType(tf1())
         );
     }
-
-    static void clear(const tmp<FieldField<Field, Type1>>& tf1)
-    {
-        tf1.clear();
-    }
 };
 
 
@@ -63,8 +86,7 @@ public:
 
     static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, TypeR>>& tf1,
-        const bool initRet = false
+        const tmp<FieldField<Field, TypeR>>& tf1
     )
     {
         if (tf1.isTmp())
@@ -73,24 +95,12 @@ public:
         }
         else
         {
-            tmp<FieldField<Field, TypeR>> rtf
+            return tmp<FieldField<Field, TypeR>>
             (
                 FieldField<Field, TypeR>::NewCalculatedType(tf1())
             );
-
-            if (initRet)
-            {
-                rtf.ref() = tf1();
-            }
-
-            return rtf;
         }
     }
-
-    static void clear(const tmp<FieldField<Field, TypeR>>& tf1)
-    {
-        tf1.clear();
-    }
 };
 
 
@@ -117,16 +127,6 @@ public:
             FieldField<Field, TypeR>::NewCalculatedType(tf1())
         );
     }
-
-    static void clear
-    (
-        const tmp<FieldField<Field, Type1>>& tf1,
-        const tmp<FieldField<Field, Type2>>& tf2
-    )
-    {
-        tf1.clear();
-        tf2.clear();
-    }
 };
 
 
@@ -153,16 +153,6 @@ public:
             );
         }
     }
-
-    static void clear
-    (
-        const tmp<FieldField<Field, Type1>>& tf1,
-        const tmp<FieldField<Field, TypeR>>& tf2
-    )
-    {
-        tf1.clear();
-        tf2.clear();
-    }
 };
 
 
@@ -189,16 +179,6 @@ public:
             );
         }
     }
-
-    static void clear
-    (
-        const tmp<FieldField<Field, TypeR>>& tf1,
-        const tmp<FieldField<Field, Type2>>& tf2
-    )
-    {
-        tf1.clear();
-        tf2.clear();
-    }
 };
 
 
@@ -229,16 +209,6 @@ public:
             );
         }
     }
-
-    static void clear
-    (
-        const tmp<FieldField<Field, TypeR>>& tf1,
-        const tmp<FieldField<Field, TypeR>>& tf2
-    )
-    {
-        tf1.clear();
-        tf2.clear();
-    }
 };
 
 
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
index ab97ba0020..3774f66c59 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
@@ -173,12 +173,9 @@ tmp<FieldField<Field, scalar>> func                                            \
     const tmp<FieldField<Field, scalar>>& tsf                                  \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, scalar>> tRes                                        \
-    (                                                                          \
-        reuseTmpFieldField<Field, scalar, scalar>::New(tsf)                    \
-    );                                                                         \
+    tmp<FieldField<Field, scalar>> tRes(New(tsf));                             \
     func(tRes(), n, tsf());                                                    \
-    reuseTmpFieldField<Field, scalar, scalar>::clear(tsf);                     \
+    tsf.clear();                                                               \
     return tRes;                                                               \
 }
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
index 59b356e6f2..cb723b0aed 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
@@ -624,7 +624,7 @@ template                                                                       \
 <class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
 tmp                                                                            \
 <                                                                              \
-    GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh> \
+    GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh>  \
 >                                                                              \
 operator op                                                                    \
 (                                                                              \
@@ -646,8 +646,7 @@ operator op                                                                    \
                                                                                \
     Foam::opFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
-    reuseTmpGeometricField<productType, Type2, PatchField, GeoMesh>            \
-    ::clear(tgf2);                                                             \
+    tgf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -656,7 +655,7 @@ template                                                                       \
 <class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
 tmp                                                                            \
 <                                                                              \
-    GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh> \
+    GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh>  \
 >                                                                              \
 operator op                                                                    \
 (                                                                              \
@@ -678,8 +677,7 @@ operator op                                                                    \
                                                                                \
     Foam::opFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
-    reuseTmpGeometricField<productType, Type1, PatchField, GeoMesh>            \
-    ::clear(tgf1);                                                             \
+    tgf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -688,7 +686,7 @@ template                                                                       \
 <class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
 tmp                                                                            \
 <                                                                              \
-    GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh> \
+    GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh>  \
 >                                                                              \
 operator op                                                                    \
 (                                                                              \
@@ -713,9 +711,8 @@ operator op                                                                    \
                                                                                \
     Foam::opFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
-    reuseTmpTmpGeometricField                                                  \
-        <productType, Type1, Type1, Type2, PatchField, GeoMesh>                \
-    ::clear(tgf1, tgf2);                                                       \
+    tgf1.clear();                                                              \
+    tgf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -736,7 +733,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
-tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>> \
+tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>>   \
 operator op                                                                    \
 (                                                                              \
     const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
@@ -775,7 +772,7 @@ template                                                                       \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
 operator op                                                                    \
 (                                                                              \
     const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
@@ -788,7 +785,7 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
-tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>> \
+tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>>   \
 operator op                                                                    \
 (                                                                              \
     const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,                \
@@ -809,8 +806,7 @@ operator op                                                                    \
                                                                                \
     Foam::opFunc(tRes.ref(), gf1, dvs);                                        \
                                                                                \
-    reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>             \
-    ::clear(tgf1);                                                             \
+    tgf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -823,7 +819,7 @@ template                                                                       \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
 operator op                                                                    \
 (                                                                              \
     const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,                \
@@ -850,7 +846,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
 operator op                                                                    \
 (                                                                              \
     const dimensioned<Form>& dvs,                                              \
@@ -888,7 +884,7 @@ template                                                                       \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
@@ -900,7 +896,7 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
 operator op                                                                    \
 (                                                                              \
     const dimensioned<Form>& dvs,                                              \
@@ -921,8 +917,7 @@ operator op                                                                    \
                                                                                \
     Foam::opFunc(tRes.ref(), dvs, gf1);                                        \
                                                                                \
-    reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>             \
-    ::clear(tgf1);                                                             \
+    tgf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -935,7 +930,7 @@ template                                                                       \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
index 344e79e8e6..2d0b007c27 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
@@ -93,8 +93,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
                                                                                \
     Foam::Func(tRes.ref(), gf1);                                               \
                                                                                \
-    reuseTmpGeometricField                                                     \
-        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
+    tgf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }
@@ -163,8 +162,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
                                                                                \
     Foam::OpFunc(tRes.ref(), gf1);                                             \
                                                                                \
-    reuseTmpGeometricField                                                     \
-        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
+    tgf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }
@@ -236,8 +234,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
                                                                                \
     Foam::Func(tRes.ref(), gf1, gf2);                                          \
                                                                                \
-    reuseTmpGeometricField                                                     \
-        <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                 \
+    tgf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -263,8 +260,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
                                                                                \
     Foam::Func(tRes.ref(), gf1, gf2);                                          \
                                                                                \
-    reuseTmpGeometricField                                                     \
-        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
+    tgf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -294,9 +290,8 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
                                                                                \
     Foam::Func(tRes.ref(), gf1, gf2);                                          \
                                                                                \
-    reuseTmpTmpGeometricField                                                  \
-        <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>                 \
-        ::clear(tgf1, tgf2);                                                   \
+    tgf1.clear();                                                              \
+    tgf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }
@@ -378,8 +373,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
                                                                                \
     Foam::Func(tRes.ref(), dt1, gf2);                                          \
                                                                                \
-    reuseTmpGeometricField                                                     \
-        <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                 \
+    tgf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -470,8 +464,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
                                                                                \
     Foam::Func(tRes.ref(), gf1, dt2);                                          \
                                                                                \
-    reuseTmpGeometricField                                                     \
-        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
+    tgf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -560,8 +553,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
                                                                                \
     Foam::OpFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
-    reuseTmpGeometricField                                                     \
-        <ReturnType, Type2, PatchField, GeoMesh>::clear(tgf2);                 \
+    tgf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -587,8 +579,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
                                                                                \
     Foam::OpFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
-    reuseTmpGeometricField                                                     \
-        <ReturnType, Type1, PatchField, GeoMesh>::clear(tgf1);                 \
+    tgf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -617,9 +608,8 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
                                                                                \
     Foam::OpFunc(tRes.ref(), gf1, gf2);                                        \
                                                                                \
-    reuseTmpTmpGeometricField                                                  \
-        <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>                 \
-        ::clear(tgf1, tgf2);                                                   \
+    tgf1.clear();                                                              \
+    tgf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }
@@ -702,8 +692,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
                                                                                \
     Foam::OpFunc(tRes.ref(), dt1, gf2);                                        \
                                                                                \
-    reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>             \
-        ::clear(tgf2);                                                         \
+    tgf2.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
@@ -794,8 +783,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
                                                                                \
     Foam::OpFunc(tRes.ref(), gf1, dt2);                                        \
                                                                                \
-    reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>             \
-        ::clear(tgf1);                                                         \
+    tgf1.clear();                                                              \
                                                                                \
     return tRes;                                                               \
 }                                                                              \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
index 5429c4f44f..3cb442163d 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
@@ -75,6 +75,51 @@ bool reusable(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
 }
 
 
+template<class TypeR, template<class> class PatchField, class GeoMesh>
+tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
+(
+    const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
+    const word& name,
+    const dimensionSet& dimensions,
+    const bool initRet = false
+)
+{
+    GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
+        const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+
+    if (reusable(tgf1))
+    {
+        gf1.rename(name);
+        gf1.dimensions().reset(dimensions);
+        return tgf1;
+    }
+    else
+    {
+        tmp<GeometricField<TypeR, PatchField, GeoMesh>> rtgf
+        (
+            new GeometricField<TypeR, PatchField, GeoMesh>
+            (
+                IOobject
+                (
+                    name,
+                    gf1.instance(),
+                    gf1.db()
+                ),
+                gf1.mesh(),
+                dimensions
+            )
+        );
+
+        if (initRet)
+        {
+            rtgf.ref() == tgf1();
+        }
+
+        return rtgf;
+    }
+}
+
+
 template
 <
     class TypeR,
@@ -110,14 +155,6 @@ public:
             )
         );
     }
-
-    static void clear
-    (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1
-    )
-    {
-        tgf1.clear();
-    }
 };
 
 
@@ -130,8 +167,7 @@ public:
     (
         const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
         const word& name,
-        const dimensionSet& dimensions,
-        const bool initRet = false
+        const dimensionSet& dimensions
     )
     {
         GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
@@ -145,7 +181,7 @@ public:
         }
         else
         {
-            tmp<GeometricField<TypeR, PatchField, GeoMesh>> rtgf
+            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
             (
                 new GeometricField<TypeR, PatchField, GeoMesh>
                 (
@@ -159,23 +195,8 @@ public:
                     dimensions
                 )
             );
-
-            if (initRet)
-            {
-                rtgf.ref() == tgf1();
-            }
-
-            return rtgf;
         }
     }
-
-    static void clear
-    (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1
-    )
-    {
-        tgf1.clear();
-    }
 };
 
 
@@ -217,16 +238,6 @@ public:
             )
         );
     }
-
-    static void clear
-    (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2
-    )
-    {
-        tgf1.clear();
-        tgf2.clear();
-    }
 };
 
 
@@ -279,16 +290,6 @@ public:
             );
         }
     }
-
-    static void clear
-    (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf2
-    )
-    {
-        tgf1.clear();
-        tgf2.clear();
-    }
 };
 
 
@@ -338,16 +339,6 @@ public:
             );
         }
     }
-
-    static void clear
-    (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2
-    )
-    {
-        tgf1.clear();
-        tgf2.clear();
-    }
 };
 
 
@@ -399,16 +390,6 @@ public:
             );
         }
     }
-
-    static void clear
-    (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf2
-    )
-    {
-        tgf1.clear();
-        tgf2.clear();
-    }
 };
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
index add1ed8dfb..41bbe8178f 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
@@ -89,7 +89,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
 
     tmp<GeometricField<scalar, PatchField, GeoMesh>> tRes
     (
-        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
+        New
         (
             tgsf,
             "stabilise(" + gsf.name() + ',' + ds.name() + ')',
@@ -99,7 +99,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
 
     stabilise(tRes.ref(), gsf, ds);
 
-    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf);
+    tgsf.clear();
 
     return tRes;
 }
@@ -176,7 +176,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 
     tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
-        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
+        New
         (
             tgsf1,
             "pow(" + gsf1.name() + ',' + gsf2.name() + ')',
@@ -190,7 +190,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 
     pow(tPow.ref(), gsf1, gsf2);
 
-    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf1);
+    tgsf1.clear();
 
     return tPow;
 }
@@ -207,7 +207,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 
     tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
-        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
+        New
         (
             tgsf2,
             "pow(" + gsf1.name() + ',' + gsf2.name() + ')',
@@ -221,7 +221,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 
     pow(tPow.ref(), gsf1, gsf2);
 
-    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf2);
+    tgsf2.clear();
 
     return tPow;
 }
@@ -254,9 +254,8 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 
     pow(tPow.ref(), gsf1, gsf2);
 
-    reuseTmpTmpGeometricField
-        <scalar, scalar, scalar, scalar, PatchField, GeoMesh>
-        ::clear(tgsf1, tgsf2);
+    tgsf1.clear();
+    tgsf2.clear();
 
     return tPow;
 }
@@ -315,7 +314,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 
     tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
-        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
+        New
         (
             tgsf,
             "pow(" + gsf.name() + ',' + ds.name() + ')',
@@ -325,7 +324,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 
     pow(tPow.ref(), gsf, ds);
 
-    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf);
+    tgsf.clear();
 
     return tPow;
 }
@@ -405,7 +404,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 
     tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
-        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
+        New
         (
             tgsf,
             "pow(" + ds.name() + ',' + gsf.name() + ')',
@@ -415,7 +414,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 
     pow(tPow.ref(), ds, gsf);
 
-    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf);
+    tgsf.clear();
 
     return tPow;
 }
@@ -497,7 +496,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 
     tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
-        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
+        New
         (
             tgsf1,
             "atan2(" + gsf1.name() + ',' + gsf2.name() + ')',
@@ -507,7 +506,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 
     atan2(tAtan2.ref(), gsf1, gsf2);
 
-    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf1);
+    tgsf1.clear();
 
     return tAtan2;
 }
@@ -524,7 +523,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 
     tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
-        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
+        New
         (
             tgsf2,
             "atan2(" + gsf1.name() + ',' + gsf2.name() + ')',
@@ -534,7 +533,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 
     atan2(tAtan2.ref(), gsf1, gsf2);
 
-    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf2);
+    tgsf2.clear();
 
     return tAtan2;
 }
@@ -563,9 +562,8 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 
     atan2(tAtan2.ref(), gsf1, gsf2);
 
-    reuseTmpTmpGeometricField
-        <scalar, scalar, scalar, scalar, PatchField, GeoMesh>
-        ::clear(tgsf1, tgsf2);
+    tgsf1.clear();
+    tgsf2.clear();
 
     return tAtan2;
 }
@@ -624,7 +622,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 
     tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
-        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
+        New
         (
             tgsf,
             "atan2(" + gsf.name() + ',' + ds.name() + ')',
@@ -634,7 +632,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 
     atan2(tAtan2.ref(), gsf, ds);
 
-    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf);
+    tgsf.clear();
 
     return tAtan2;
 }
@@ -714,7 +712,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 
     tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
-        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
+        New
         (
             tgsf,
             "atan2(" + ds.name() + ',' + gsf.name() + ')',
@@ -724,7 +722,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 
     atan2(tAtan2.ref(), ds, gsf);
 
-    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::clear(tgsf);
+    tgsf.clear();
 
     return tAtan2;
 }
@@ -859,7 +857,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> func                          \
                                                                                \
     tmp<GeometricField<scalar, PatchField, GeoMesh>> tFunc                     \
     (                                                                          \
-        reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New       \
+        New                                                                    \
         (                                                                      \
             tgsf,                                                              \
             #func "(" + gsf.name() + ')',                                      \
@@ -869,8 +867,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> func                          \
                                                                                \
     func(tFunc.ref(), n, gsf);                                                 \
                                                                                \
-    reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>                \
-    ::clear(tgsf);                                                             \
+    tgsf.clear();                                                              \
                                                                                \
     return tFunc;                                                              \
 }
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index a6a2824d79..5c96220048 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -82,23 +82,23 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
 {
     if (isTmp())
     {
-        if (allowTransfer)
+        if (ptr_)
         {
-            const_cast<tmp<T>&>(t).ptr_ = 0;
-        }
-        else
-        {
-            if (ptr_)
+            if (allowTransfer)
             {
-                ptr_->operator++();
+                t.ptr_ = 0;
             }
             else
             {
-                FatalErrorInFunction
-                    << "Attempted copy of a deallocated " << typeName()
-                    << abort(FatalError);
+                ptr_->operator++();
             }
         }
+        else
+        {
+            FatalErrorInFunction
+                << "Attempted copy of a deallocated " << typeName()
+                << abort(FatalError);
+        }
     }
 }
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
index 5e31ac1269..6b9cc1ca6f 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
@@ -228,8 +228,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::MRFZoneList::relative
     {
         tmp<surfaceScalarField> rphi
         (
-            reuseTmpGeometricField<scalar, scalar, fvsPatchField, surfaceMesh>
-            ::New
+            New
             (
                 tphi,
                 "relative(" + tphi().name() + ')',
@@ -240,8 +239,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::MRFZoneList::relative
 
         makeRelative(rphi.ref());
 
-        reuseTmpGeometricField<scalar, scalar, fvsPatchField, surfaceMesh>
-        ::clear(tphi);
+        tphi.clear();
 
         return rphi;
     }
@@ -260,17 +258,14 @@ Foam::MRFZoneList::relative
 {
     if (size())
     {
-        tmp<FieldField<fvsPatchField, scalar>> rphi
-        (
-            reuseTmpFieldField<fvsPatchField, scalar, scalar>::New(tphi, true)
-        );
+        tmp<FieldField<fvsPatchField, scalar>> rphi(New(tphi, true));
 
         forAll(*this, i)
         {
             operator[](i).makeRelative(rphi.ref());
         }
 
-        reuseTmpFieldField<fvsPatchField, scalar, scalar>::clear(tphi);
+        tphi.clear();
 
         return rphi;
     }
@@ -348,8 +343,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::MRFZoneList::absolute
     {
         tmp<surfaceScalarField> rphi
         (
-            reuseTmpGeometricField<scalar, scalar, fvsPatchField, surfaceMesh>
-            ::New
+            New
             (
                 tphi,
                 "absolute(" + tphi().name() + ')',
@@ -360,8 +354,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::MRFZoneList::absolute
 
         makeAbsolute(rphi.ref());
 
-        reuseTmpGeometricField<scalar, scalar, fvsPatchField, surfaceMesh>
-        ::clear(tphi);
+        tphi.clear();
 
         return rphi;
     }

From f4ba71ddd0873591472f0bbedc701c794a639c9b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 26 Feb 2016 08:13:59 +0000
Subject: [PATCH 226/447] OpenFOAM libraries: Updated to use the new const-safe
 tmp

---
 .../test/fieldMapping/Test-fieldMapping.C     |  3 +-
 src/OpenFOAM/fields/Fields/Field/Field.C      |  2 +-
 .../GeometricField/uniformInterpolate.C       |  2 +-
 .../PrimitivePatchInterpolation.C             |  6 +--
 .../PatchTools/PatchToolsNormals.C            |  4 +-
 src/combustionModels/FSD/FSD.C                |  8 ++--
 .../consumptionSpeed/consumptionSpeed.C       |  4 +-
 src/combustionModels/Make/options             |  2 +-
 src/combustionModels/laminar/laminar.C        |  6 +--
 .../singleStepCombustion.C                    |  2 +-
 src/conversion/Make/options                   |  2 +-
 src/dynamicFvMesh/Make/options                |  2 +-
 src/dynamicMesh/Make/options                  |  2 +-
 .../layerAdditionRemoval/addCellLayer.C       |  4 +-
 .../motionSmoother/motionSmootherAlgo.C       |  4 +-
 .../motionSmootherAlgoTemplates.C             |  2 +-
 src/engine/Make/options                       |  2 +-
 .../finiteVolume/fvc/fvcCellReduce.C          |  5 ++-
 src/finiteVolume/finiteVolume/fvc/fvcCurl.C   |  2 +-
 .../finiteVolume/fvc/fvcReconstruct.C         |  2 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            |  4 +-
 .../fvMeshSubset/fvMeshSubsetInterpolate.C    |  4 +-
 .../pairPatchAgglomeration/Make/options       |  2 +-
 .../pairPatchAgglomeration.C                  |  2 +-
 src/fvMotionSolver/Make/options               |  2 +-
 ...lacementComponentLaplacianFvMotionSolver.C |  9 +++--
 ...velocityComponentLaplacianFvMotionSolver.C |  6 +--
 .../displacementSBRStressFvMotionSolver.C     |  4 +-
 .../displacementInterpolationMotionSolver.C   |  2 +-
 .../displacementLaplacianFvMotionSolver.C     |  7 ++--
 .../displacementLayeredMotionMotionSolver.C   |  4 +-
 .../velocityLaplacianFvMotionSolver.C         |  4 +-
 src/fvOptions/Make/options                    |  2 +-
 .../rotorDiskSourceTemplates.C                |  4 +-
 .../trimModel/targetCoeff/targetCoeffTrim.C   |  4 +-
 .../interRegionHeatTransferModel.C            |  4 +-
 src/genericPatchFields/Make/options           |  2 +-
 src/lagrangian/DSMC/Make/options              |  2 +-
 src/lagrangian/basic/Make/options             |  2 +-
 src/lagrangian/coalCombustion/Make/options    |  2 +-
 .../coalCloudList/coalCloudListI.H            | 18 ++++-----
 .../distributionModels/Make/options           |  1 +
 src/lagrangian/intermediate/Make/options      |  2 +-
 .../KinematicCloud/KinematicCloudI.H          | 10 ++---
 .../Templates/ReactingCloud/ReactingCloudI.H  | 12 +++---
 .../Templates/ThermoCloud/ThermoCloudI.H      |  8 ++--
 .../MPPIC/PackingModels/Implicit/Implicit.C   |  6 +--
 .../cloudAbsorptionEmission.C                 |  6 +--
 .../scatter/cloudScatter/cloudScatter.C       |  4 +-
 .../molecularDynamics/molecule/Make/options   |  3 +-
 src/lagrangian/solidParticle/Make/options     |  2 +-
 src/lagrangian/spray/Make/options             |  2 +-
 src/lagrangian/turbulence/Make/options        |  2 +-
 src/mesh/autoMesh/Make/options                |  2 +-
 .../autoHexMeshDriver/autoLayerDriver.C       |  2 +-
 .../autoHexMeshDriver/autoSnapDriver.C        |  6 +--
 src/mesh/blockMesh/Make/options               |  2 +-
 src/mesh/extrudeModel/Make/options            |  2 +-
 .../cyclicACMIGAMGInterface.C                 |  4 +-
 .../cyclicAMIGAMGInterface.C                  |  4 +-
 src/meshTools/Make/options                    |  2 +-
 src/meshTools/cellQuality/cellQuality.C       | 10 ++---
 .../EulerCoordinateRotation.C                 |  4 +-
 .../STARCDCoordinateRotation.C                |  4 +-
 .../coordinateRotation/axesRotation.C         |  4 +-
 .../coordinateRotation/cylindrical.C          |  6 +--
 .../coordinateSystems/cylindricalCS.C         |  4 +-
 .../mappedPolyPatch/mappedPatchBase.C         |  6 +--
 .../momentOfInertia/momentOfInertia.C         |  4 +-
 .../searchableSurface/searchableBox.C         |  2 +-
 .../searchableSurface/searchableCylinder.C    |  8 ++--
 .../searchableSurface/searchablePlate.C       |  2 +-
 .../searchableSurfaceCollection.C             |  4 +-
 .../searchableSurface/triSurfaceMesh.C        |  2 +-
 .../pointToPointPlanarInterpolation.C         |  2 +-
 .../functionObjects/field/Make/options        |  2 +-
 .../faceSource/faceSourceTemplates.C          |  6 +--
 .../regionSizeDistribution.C                  |  2 +-
 .../functionObjects/utilities/Make/options    |  2 +-
 .../utilities/pressureTools/pressureTools.C   |  8 ++--
 src/randomProcesses/Make/options              |  2 +-
 src/randomProcesses/fft/fft.C                 | 10 ++---
 src/randomProcesses/noise/noiseFFT.C          |  6 +--
 src/regionCoupled/Make/options                |  2 +-
 .../energyRegionCoupledFvPatchScalarField.C   |  2 +-
 .../reactingOneDim/reactingOneDim.C           |  1 -
 src/regionModels/regionModel/Make/options     |  2 +-
 .../regionModel/regionModel1D/regionModel1D.C |  2 +-
 .../surfaceFilmModels/Make/options            |  2 +-
 .../nutkFilmWallFunctionFvPatchScalarField.C  |  4 +-
 .../kinematicSingleLayer.C                    |  4 +-
 .../kinematicSingleLayerI.H                   |  2 +-
 .../constantFilmThermo/constantFilmThermo.C   | 20 +++++-----
 .../liquidFilmThermo/liquidFilmThermo.C       | 20 +++++-----
 .../filmTurbulenceModel/laminar/laminar.C     |  4 +-
 .../contactAngleForce/contactAngleForce.C     |  6 +--
 .../kinematic/force/forceList/forceList.C     |  4 +-
 .../thermocapillaryForce.C                    |  4 +-
 .../curvatureSeparation/curvatureSeparation.C |  2 +-
 .../constantRadiation/constantRadiation.C     |  2 +-
 .../primaryRadiation/primaryRadiation.C       |  2 +-
 .../standardRadiation/standardRadiation.C     |  2 +-
 .../thermoSingleLayer/thermoSingleLayer.C     |  6 +--
 .../thermoSingleLayer/thermoSingleLayerI.H    |  4 +-
 .../thermalBaffle/thermalBaffle.C             |  2 +-
 src/sampling/Make/options                     |  2 +-
 src/sampling/meshToMesh/meshToMeshTemplates.C |  8 ++--
 src/sampling/probes/patchProbesTemplates.C    |  4 +-
 src/sampling/probes/probesTemplates.C         |  4 +-
 .../isoSurface/isoSurfaceCellTemplates.C      |  2 +-
 .../isoSurface/isoSurfaceTemplates.C          |  4 +-
 .../sampledIsoSurfaceCellTemplates.C          |  2 +-
 .../sampledPatch/sampledPatchTemplates.C      |  6 +--
 .../sampledPatchInternalFieldTemplates.C      |  2 +-
 .../sampledPlane/sampledPlaneTemplates.C      |  2 +-
 .../sampledSurface/sampledSurface.C           | 10 ++---
 .../sampledSurface/sampledSurfaceTemplates.C  |  2 +-
 .../sampledTriSurfaceMeshTemplates.C          |  4 +-
 .../sampledThresholdCellFacesTemplates.C      |  2 +-
 src/sixDoFRigidBodyMotion/Make/options        |  2 +-
 .../sixDoFRigidBodyMotion.C                   |  4 +-
 src/surfMesh/Make/options                     |  2 +-
 .../SLGThermo/Make/options                    |  2 +-
 .../Make/options                              |  2 +-
 src/thermophysicalModels/basic/Make/options   |  2 +-
 .../basic/heThermo/heThermo.C                 | 40 +++++++++----------
 .../chemistryModel/Make/options               |  2 +-
 .../chemistryModel/chemistryModel.C           | 12 +++---
 .../laminarFlameSpeed/Gulders/Gulders.C       |  6 +--
 .../laminarFlameSpeed/GuldersEGR/GuldersEGR.C |  6 +--
 .../laminarFlameSpeed/Make/options            |  2 +-
 .../RaviPetersen/RaviPetersen.C               |  2 +-
 .../liquidMixtureProperties/Make/options      |  3 +-
 .../properties/liquidProperties/Make/options  |  2 +-
 .../solidMixtureProperties/Make/options       |  2 +-
 .../properties/solidProperties/Make/options   |  2 +-
 .../radiation/Make/options                    |  2 +-
 .../blackBodyEmission/blackBodyEmission.C     | 11 ++---
 .../radiativeIntensityRay.C                   |  6 +--
 .../greyMeanAbsorptionEmission.C              |  8 ++--
 .../greyMeanSolidAbsorptionEmission.C         |  8 ++--
 .../wideBandAbsorptionEmission.C              |  8 ++--
 .../reactionThermo/Make/options               |  2 +-
 .../basicSpecieMixture/basicSpecieMixture.C   |  4 +-
 .../psiuReactionThermo/heheuPsiThermo.C       | 14 +++----
 .../solidChemistryModel/Make/options          |  2 +-
 .../pyrolysisChemistryModel.C                 |  2 +-
 .../pyrolysisChemistryModelI.H                |  5 ++-
 .../solidChemistryModel/solidChemistryModel.C |  4 +-
 .../solidChemistryModelI.H                    |  2 +-
 .../solidSpecie/Make/options                  |  2 +-
 .../solidThermo/Make/options                  |  2 +-
 .../solidThermo/solidThermo/heSolidThermo.C   |  4 +-
 src/topoChangerFvMesh/Make/options            |  2 +-
 .../movingConeTopoFvMesh.C                    |  2 +-
 src/transportModels/compressible/Make/options |  2 +-
 .../Make/options                              |  2 +-
 .../incompressible/Make/options               |  2 +-
 .../interfaceProperties/Make/options          |  2 +-
 .../twoPhaseMixture/Make/options              |  2 +-
 .../twoPhaseProperties/Make/options           |  2 +-
 src/triSurface/Make/options                   |  2 +-
 .../faceTriangulation/faceTriangulation.C     |  4 +-
 163 files changed, 346 insertions(+), 346 deletions(-)

diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index 38a4b110f9..41af9c7923 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,6 +39,7 @@ Description
 #include "mapPolyMesh.H"
 #include "polyTopoChange.H"
 #include "fvcDiv.H"
+#include "zeroGradientFvPatchFields.H"
 #include "Random.H"
 
 using namespace Foam;
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 596f74f1c3..e7e7479c15 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -609,7 +609,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::Field<Type>::T() const
 {
     tmp<Field<Type>> transpose(new Field<Type>(this->size()));
-    ::Foam::T(transpose(), *this);
+    ::Foam::T(transpose.ref(), *this);
     return transpose;
 }
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C
index e53fdf778a..a70abece0f 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C
@@ -92,7 +92,7 @@ Foam::tmp<GeoField> Foam::uniformInterpolate
 
     // Interpolate
     tmp<GeoField> tfld(new GeoField(fieldIO, weights[0]*field0));
-    GeoField& fld = tfld();
+    GeoField& fld = tfld.ref();
 
     for (label i = 1; i < times.size(); ++i)
     {
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
index fd77c9a677..e9253134ef 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
@@ -192,7 +192,7 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
         )
     );
 
-    Field<Type>& result = tresult();
+    Field<Type>& result = tresult.ref();
 
     const labelListList& pointFaces = patch_.pointFaces();
     const scalarListList& weights = faceToPointWeights();
@@ -249,7 +249,7 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
         )
     );
 
-    Field<Type>& result = tresult();
+    Field<Type>& result = tresult.ref();
 
     const List<typename Patch::FaceType>& localFaces = patch_.localFaces();
 
@@ -303,7 +303,7 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
         new Field<Type>(patch_.nEdges(), pTraits<Type>::zero)
     );
 
-    Field<Type>& result = tresult();
+    Field<Type>& result = tresult.ref();
 
     const edgeList& edges = patch_.edges();
     const labelListList& edgeFaces = patch_.edgeFaces();
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
index 82f5851f33..34be2afdca 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
@@ -159,7 +159,7 @@ Foam::PatchTools::pointNormals
     //    to avoid them being stored)
 
     tmp<pointField> textrudeN(new pointField(p.nPoints(), vector::zero));
-    pointField& extrudeN = textrudeN();
+    pointField& extrudeN = textrudeN.ref();
     {
         const faceList& localFaces = p.localFaces();
         const vectorField& faceNormals = p.faceNormals();
@@ -213,7 +213,7 @@ Foam::PatchTools::edgeNormals
     // 1. Start off with local normals
 
     tmp<pointField> tedgeNormals(new pointField(p.nEdges(), vector::zero));
-    pointField& edgeNormals = tedgeNormals();
+    pointField& edgeNormals = tedgeNormals.ref();
     {
         const labelListList& edgeFaces = p.edgeFaces();
         const vectorField& faceNormals = p.faceNormals();
diff --git a/src/combustionModels/FSD/FSD.C b/src/combustionModels/FSD/FSD.C
index 6d846b3d95..8f10a8940c 100644
--- a/src/combustionModels/FSD/FSD.C
+++ b/src/combustionModels/FSD/FSD.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ void FSD<CombThermoType, ThermoType>::calculateSourceNorm()
         )
     );
 
-    volScalarField& pc = tPc();
+    volScalarField& pc = tPc.ref();
 
     tmp<volScalarField> tomegaFuel
     (
@@ -185,7 +185,7 @@ void FSD<CombThermoType, ThermoType>::calculateSourceNorm()
         )
     );
 
-    volScalarField& omegaFuelBar = tomegaFuel();
+    volScalarField& omegaFuelBar = tomegaFuel.ref();
 
     // Calculation of the mixture fraction variance (ftVar)
     const compressible::LESModel& lesModel =
@@ -311,7 +311,7 @@ void FSD<CombThermoType, ThermoType>::calculateSourceNorm()
         )
     );
 
-    volScalarField& products = tproducts();
+    volScalarField& products = tproducts.ref();
 
     forAll(productsIndex, j)
     {
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C
index 2a5cbbd7da..1aa0e0ae83 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ Foam::tmp<Foam::volScalarField> Foam::consumptionSpeed::omega0Sigma
         )
     );
 
-    volScalarField& omega0 = tomega0();
+    volScalarField& omega0 = tomega0.ref();
 
     volScalarField::InternalField& iomega0 = omega0.internalField();
 
diff --git a/src/combustionModels/Make/options b/src/combustionModels/Make/options
index e660ccd9f6..d1ee86bab4 100644
--- a/src/combustionModels/Make/options
+++ b/src/combustionModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/src/combustionModels/laminar/laminar.C b/src/combustionModels/laminar/laminar.C
index d53a859a73..155c8bf01e 100644
--- a/src/combustionModels/laminar/laminar.C
+++ b/src/combustionModels/laminar/laminar.C
@@ -119,7 +119,7 @@ Foam::combustionModels::laminar<Type>::R(volScalarField& Y) const
 {
     tmp<fvScalarMatrix> tSu(new fvScalarMatrix(Y, dimMass/dimTime));
 
-    fvScalarMatrix& Su = tSu();
+    fvScalarMatrix& Su = tSu.ref();
 
     if (this->active())
     {
@@ -157,7 +157,7 @@ Foam::combustionModels::laminar<Type>::dQ() const
 
     if (this->active())
     {
-        tdQ() = this->chemistryPtr_->dQ();
+        tdQ.ref() = this->chemistryPtr_->dQ();
     }
 
     return tdQ;
@@ -188,7 +188,7 @@ Foam::combustionModels::laminar<Type>::Sh() const
 
     if (this->active())
     {
-        tSh() = this->chemistryPtr_->Sh();
+        tSh.ref() = this->chemistryPtr_->Sh();
     }
 
     return tSh;
diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.C b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
index ba586bc1cd..d8bc1cfac3 100644
--- a/src/combustionModels/singleStepCombustion/singleStepCombustion.C
+++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
@@ -160,7 +160,7 @@ singleStepCombustion<CombThermoType, ThermoType>::dQ() const
 
     if (this->active())
     {
-        volScalarField& dQ = tdQ();
+        volScalarField& dQ = tdQ.ref();
         dQ.dimensionedInternalField() = this->mesh().V()*Sh()();
     }
     return tdQ;
diff --git a/src/conversion/Make/options b/src/conversion/Make/options
index 4ff461186c..ace5a3133b 100644
--- a/src/conversion/Make/options
+++ b/src/conversion/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/src/dynamicFvMesh/Make/options b/src/dynamicFvMesh/Make/options
index 966b56964d..3cee7d2a3c 100644
--- a/src/dynamicFvMesh/Make/options
+++ b/src/dynamicFvMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/src/dynamicMesh/Make/options b/src/dynamicMesh/Make/options
index 0757c29678..5725e0f867 100644
--- a/src/dynamicMesh/Make/options
+++ b/src/dynamicMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
diff --git a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
index 572b8b7d79..085cc99079 100644
--- a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ Foam::tmp<Foam::vectorField> Foam::layerAdditionRemoval::extrusionDir() const
     const labelList& mp = masterFaceLayer.meshPoints();
 
     tmp<vectorField> textrusionDir(new vectorField(mp.size()));
-    vectorField& extrusionDir = textrusionDir();
+    vectorField& extrusionDir = textrusionDir.ref();
 
     if (setLayerPairing())
     {
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
index bebb9ea3aa..384663939e 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
@@ -119,7 +119,7 @@ Foam::tmp<Foam::scalarField> Foam::motionSmootherAlgo::calcEdgeWeights
     const edgeList& edges = mesh_.edges();
 
     tmp<scalarField> twght(new scalarField(edges.size()));
-    scalarField& wght = twght();
+    scalarField& wght = twght.ref();
 
     forAll(edges, edgeI)
     {
@@ -815,7 +815,7 @@ Foam::tmp<Foam::pointField> Foam::motionSmootherAlgo::curPoints() const
     tmp<pointField> tnewPoints(oldPoints_ + totalDisplacement.internalField());
 
     // Correct for 2-D motion
-    modifyMotionPoints(tnewPoints());
+    modifyMotionPoints(tnewPoints.ref());
 
     return tnewPoints;
 }
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
index f59703c56f..f7a9174d8e 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
@@ -159,7 +159,7 @@ Foam::motionSmootherAlgo::avg
             dimensioned<Type>("zero", fld.dimensions(), pTraits<Type>::zero)
         )
     );
-    GeometricField<Type, pointPatchField, pointMesh>& res = tres();
+    GeometricField<Type, pointPatchField, pointMesh>& res = tres.ref();
 
     const polyMesh& mesh = fld.mesh()();
 
diff --git a/src/engine/Make/options b/src/engine/Make/options
index 0929e2bc8f..f16d25abf1 100644
--- a/src/engine/Make/options
+++ b/src/engine/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
index 3ec972fc2a..c078bd365d 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
@@ -70,7 +70,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
         )
     );
 
-    volFieldType& result = tresult();
+    volFieldType& result = tresult.ref();
 
     const labelUList& own = mesh.owner();
     const labelUList& nbr = mesh.neighbour();
@@ -102,7 +102,8 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
     tmp<GeometricField<Type, fvPatchField, volMesh>>
         tvf(cellReduce(cop, tssf));
 
-   tssf.clear();
+    tssf.clear();
+
     return tvf;
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCurl.C b/src/finiteVolume/finiteVolume/fvc/fvcCurl.C
index 38dee36681..1ec6024fb9 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCurl.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCurl.C
@@ -56,7 +56,7 @@ curl
     tmp<GeometricField<Type, fvPatchField, volMesh>> tcurlVf =
         2.0*(*skew(fvc::grad(vf, nameCurlVf)));
 
-    tcurlVf().rename(nameCurlVf);
+    tcurlVf.ref().rename(nameCurlVf);
 
     return tcurlVf;
 }
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
index 9b2f375b08..32c8a51dda 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
@@ -78,7 +78,7 @@ reconstruct
         )
     );
 
-    treconField().correctBoundaryConditions();
+    treconField.ref().correctBoundaryConditions();
 
     return treconField;
 }
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 6d4b18f371..91d7384f55 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -693,7 +693,7 @@ template<class Type>
 Foam::tmp<Foam::scalarField> Foam::fvMatrix<Type>::D() const
 {
     tmp<scalarField> tdiag(new scalarField(diag()));
-    addCmptAvBoundaryDiag(tdiag());
+    addCmptAvBoundaryDiag(tdiag.ref());
     return tdiag;
 }
 
@@ -713,7 +713,7 @@ Foam::tmp<Foam::Field<Type>> Foam::fvMatrix<Type>::DD() const
             (
                 lduAddr().patchAddr(patchI),
                 internalCoeffs_[patchI],
-                tdiag()
+                tdiag.ref()
             );
         }
     }
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index dbf2c09d77..33255e5c14 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -100,7 +100,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> fvMeshSubset::interpolate
             patchFields
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& resF = tresF();
+    GeometricField<Type, fvPatchField, volMesh>& resF = tresF.ref();
 
 
     // 2. Change the fvPatchFields to the correct type using a mapper
@@ -243,7 +243,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> fvMeshSubset::interpolate
             patchFields
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& resF = tresF();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& resF = tresF.ref();
 
 
     // 2. Change the fvsPatchFields to the correct type using a mapper
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
index 93a7e01542..63d132ca50 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/OpenFOAM/lnInclude
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
index ab49334a5d..32bf9efa12 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
@@ -440,7 +440,7 @@ Foam::tmp<Foam::labelField> Foam::pairPatchAgglomeration::agglomerateOneLevel
     const label nFineFaces = patch.size();
 
     tmp<labelField> tcoarseCellMap(new labelField(nFineFaces, -1));
-    labelField& coarseCellMap = tcoarseCellMap();
+    labelField& coarseCellMap = tcoarseCellMap.ref();
 
     const labelListList& faceFaces = patch.faceFaces();
 
diff --git a/src/fvMotionSolver/Make/options b/src/fvMotionSolver/Make/options
index 29e4469610..e0b34247ad 100644
--- a/src/fvMotionSolver/Make/options
+++ b/src/fvMotionSolver/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
index 8f90cb8444..fe9ac195c7 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -188,8 +188,9 @@ Foam::displacementComponentLaplacianFvMotionSolver::curPoints() const
     else
     {
         tmp<pointField> tcurPoints(new pointField(fvMesh_.points()));
+        pointField& curPoints = tcurPoints.ref();
 
-        tcurPoints().replace
+        curPoints.replace
         (
             cmpt_,
             points0_ + pointDisplacement_.internalField()
@@ -204,11 +205,11 @@ Foam::displacementComponentLaplacianFvMotionSolver::curPoints() const
             {
                 label pointI = pz[i];
 
-                tcurPoints()[pointI][cmpt_] = points0_[pointI];
+                curPoints[pointI][cmpt_] = points0_[pointI];
             }
         }
 
-        twoDCorrectPoints(tcurPoints());
+        twoDCorrectPoints(curPoints);
 
         return tcurPoints;
     }
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
index 124a679e15..bb40c74881 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,14 +101,14 @@ Foam::velocityComponentLaplacianFvMotionSolver::curPoints() const
 
     tmp<pointField> tcurPoints(new pointField(fvMesh_.points()));
 
-    tcurPoints().replace
+    tcurPoints.ref().replace
     (
         cmpt_,
         tcurPoints().component(cmpt_)
       + fvMesh_.time().deltaTValue()*pointMotionU_.internalField()
     );
 
-    twoDCorrectPoints(tcurPoints());
+    twoDCorrectPoints(tcurPoints.ref());
 
     return tcurPoints;
 }
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
index 7aafefc0c5..ba28c423c9 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ Foam::displacementSBRStressFvMotionSolver::curPoints() const
         points0() + pointDisplacement().internalField()
     );
 
-    twoDCorrectPoints(tcurPoints());
+    twoDCorrectPoints(tcurPoints.ref());
 
     return tcurPoints;
 }
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
index f3286af26a..b1a72eb6f8 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
@@ -313,7 +313,7 @@ Foam::displacementInterpolationMotionSolver::curPoints() const
     }
 
     tmp<pointField> tcurPoints(new pointField(points0()));
-    pointField& curPoints = tcurPoints();
+    pointField& curPoints = tcurPoints.ref();
 
     // Interpolate the displacement of the face zones.
     vectorField zoneDisp(displacements_.size(), vector::zero);
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index d4a3ca5a0a..863f800d19 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -200,6 +200,7 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const
         (
             points0() + pointDisplacement_.internalField()
         );
+        pointField& curPoints = tcurPoints.ref();
 
         // Implement frozen points
         if (frozenPointsZone_ != -1)
@@ -208,11 +209,11 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const
 
             forAll(pz, i)
             {
-                tcurPoints()[pz[i]] = points0()[pz[i]];
+                curPoints[pz[i]] = points0()[pz[i]];
             }
         }
 
-        twoDCorrectPoints(tcurPoints());
+        twoDCorrectPoints(curPoints);
 
         return tcurPoints;
     }
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
index 832f249e20..0900344564 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -223,7 +223,7 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate
 ) const
 {
     tmp<vectorField> tfld(new vectorField(meshPoints.size()));
-    vectorField& fld = tfld();
+    vectorField& fld = tfld.ref();
 
     const word type(dict.lookup("type"));
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
index ce63274ed9..ba05811ba6 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ Foam::velocityLaplacianFvMotionSolver::curPoints() const
       + fvMesh_.time().deltaTValue()*pointMotionU_.internalField()
     );
 
-    twoDCorrectPoints(tcurPoints());
+    twoDCorrectPoints(tcurPoints.ref());
 
     return tcurPoints;
 }
diff --git a/src/fvOptions/Make/options b/src/fvOptions/Make/options
index 124084c057..5598b4ef20 100644
--- a/src/fvOptions/Make/options
+++ b/src/fvOptions/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
index 181db2575e..3ca231a5c1 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,7 +186,7 @@ void Foam::fv::rotorDiskSource::writeField
             )
         );
 
-        Field<Type>& field = tfield().internalField();
+        Field<Type>& field = tfield.ref().internalField();
 
         if (cells_.size() != values.size())
         {
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
index 7ac47f1b2b..1f9905b94b 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -260,7 +260,7 @@ Foam::tmp<Foam::scalarField> Foam::targetCoeffTrim::thetag() const
     const List<vector>& x = rotor_.x();
 
     tmp<scalarField> ttheta(new scalarField(x.size()));
-    scalarField& t = ttheta();
+    scalarField& t = ttheta.ref();
 
     forAll(t, i)
     {
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
index 170f72517b..ee213ae246 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,7 +194,7 @@ void Foam::fv::interRegionHeatTransferModel::addSup
         )
     );
 
-    volScalarField& Tmapped = tTmapped();
+    volScalarField& Tmapped = tTmapped.ref();
 
     const fvMesh& nbrMesh = mesh_.time().lookupObject<fvMesh>(nbrRegionName_);
 
diff --git a/src/genericPatchFields/Make/options b/src/genericPatchFields/Make/options
index 71b7873964..287318da1f 100644
--- a/src/genericPatchFields/Make/options
+++ b/src/genericPatchFields/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
diff --git a/src/lagrangian/DSMC/Make/options b/src/lagrangian/DSMC/Make/options
index 55865dfabc..4f10470b16 100644
--- a/src/lagrangian/DSMC/Make/options
+++ b/src/lagrangian/DSMC/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/src/lagrangian/basic/Make/options b/src/lagrangian/basic/Make/options
index f7d9a36f3b..4670e80487 100644
--- a/src/lagrangian/basic/Make/options
+++ b/src/lagrangian/basic/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 04b133ba05..9c78fa29f7 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
diff --git a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
index 16152ff9dc..a249a875d1 100644
--- a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
+++ b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
@@ -47,7 +47,7 @@ Foam::coalCloudList::UTrans() const
         )
     );
 
-    DimensionedField<vector, volMesh>& fld = tfld();
+    DimensionedField<vector, volMesh>& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -64,7 +64,7 @@ Foam::tmp<Foam::fvVectorMatrix> Foam::coalCloudList::SU
 ) const
 {
     tmp<fvVectorMatrix> tfvm(new fvVectorMatrix(U, dimForce));
-    fvVectorMatrix& fvm = tfvm();
+    fvVectorMatrix& fvm = tfvm.ref();
 
     forAll(*this, i)
     {
@@ -95,7 +95,7 @@ Foam::coalCloudList::hsTrans() const
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld();
+    DimensionedField<scalar, volMesh>& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -112,7 +112,7 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::coalCloudList::Sh
 ) const
 {
     tmp<fvScalarMatrix> tfvm(new fvScalarMatrix(hs, dimEnergy/dimTime));
-    fvScalarMatrix& fvm = tfvm();
+    fvScalarMatrix& fvm = tfvm.ref();
 
     forAll(*this, i)
     {
@@ -130,7 +130,7 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::coalCloudList::SYi
 ) const
 {
     tmp<fvScalarMatrix> tfvm(new fvScalarMatrix(Yi, dimMass/dimTime));
-    fvScalarMatrix& fvm = tfvm();
+    fvScalarMatrix& fvm = tfvm.ref();
 
     forAll(*this, i)
     {
@@ -161,7 +161,7 @@ Foam::coalCloudList::rhoTrans() const
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld();
+    DimensionedField<scalar, volMesh>& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -197,7 +197,7 @@ Foam::coalCloudList::Srho() const
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld();
+    DimensionedField<scalar, volMesh>& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -231,7 +231,7 @@ Foam::coalCloudList::Srho
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld();
+    DimensionedField<scalar, volMesh>& fld = tfld.ref();
 
     forAll(*this, j)
     {
@@ -248,7 +248,7 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::coalCloudList::Srho
 ) const
 {
     tmp<fvScalarMatrix> tfvm(new fvScalarMatrix(rho, dimMass/dimTime));
-    fvScalarMatrix& fvm = tfvm();
+    fvScalarMatrix& fvm = tfvm.ref();
 
     forAll(*this, i)
     {
diff --git a/src/lagrangian/distributionModels/Make/options b/src/lagrangian/distributionModels/Make/options
index e69de29bb2..ccd5450e02 100644
--- a/src/lagrangian/distributionModels/Make/options
+++ b/src/lagrangian/distributionModels/Make/options
@@ -0,0 +1 @@
+EXE_INC = -DCONST_TMP
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index a5a3b3c8eb..18eeb81970 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 3ed9040875..69b0eb60af 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -439,7 +439,7 @@ Foam::KinematicCloud<CloudType>::SU(volVectorField& U) const
         else
         {
             tmp<fvVectorMatrix> tfvm(new fvVectorMatrix(U, dimForce));
-            fvVectorMatrix& fvm = tfvm();
+            fvVectorMatrix& fvm = tfvm.ref();
 
             fvm.source() = -UTrans()/(this->db().time().deltaT());
 
@@ -474,7 +474,7 @@ Foam::KinematicCloud<CloudType>::vDotSweep() const
         )
     );
 
-    volScalarField& vDotSweep = tvDotSweep();
+    volScalarField& vDotSweep = tvDotSweep.ref();
     forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
         const parcelType& p = iter();
@@ -513,7 +513,7 @@ Foam::KinematicCloud<CloudType>::theta() const
         )
     );
 
-    volScalarField& theta = ttheta();
+    volScalarField& theta = ttheta.ref();
     forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
         const parcelType& p = iter();
@@ -551,7 +551,7 @@ Foam::KinematicCloud<CloudType>::alpha() const
         )
     );
 
-    scalarField& alpha = talpha().internalField();
+    scalarField& alpha = talpha.ref().internalField();
     forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
         const parcelType& p = iter();
@@ -588,7 +588,7 @@ Foam::KinematicCloud<CloudType>::rhoEff() const
         )
     );
 
-    scalarField& rhoEff = trhoEff().internalField();
+    scalarField& rhoEff = trhoEff.ref().internalField();
     forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
         const parcelType& p = iter();
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index d159381215..1c9907ecdb 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -127,7 +127,7 @@ inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
                 )
             );
 
-            volScalarField& sourceField = trhoTrans();
+            volScalarField& sourceField = trhoTrans.ref();
 
             sourceField.internalField() =
                 rhoTrans_[i]/(this->db().time().deltaTValue()*this->mesh().V());
@@ -141,7 +141,7 @@ inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
         else
         {
             tmp<fvScalarMatrix> tfvm(new fvScalarMatrix(Yi, dimMass/dimTime));
-            fvScalarMatrix& fvm = tfvm();
+            fvScalarMatrix& fvm = tfvm.ref();
 
             fvm.source() = -rhoTrans_[i]/this->db().time().deltaTValue();
 
@@ -182,7 +182,7 @@ Foam::ReactingCloud<CloudType>::Srho(const label i) const
 
     if (this->solution().coupled())
     {
-        scalarField& rhoi = tRhoi();
+        scalarField& rhoi = tRhoi.ref();
         rhoi = rhoTrans_[i]/(this->db().time().deltaTValue()*this->mesh().V());
     }
 
@@ -219,7 +219,7 @@ Foam::ReactingCloud<CloudType>::Srho() const
 
     if (this->solution().coupled())
     {
-        scalarField& sourceField = trhoTrans();
+        scalarField& sourceField = trhoTrans.ref();
         forAll(rhoTrans_, i)
         {
             sourceField += rhoTrans_[i];
@@ -256,7 +256,7 @@ Foam::ReactingCloud<CloudType>::Srho(volScalarField& rho) const
             )
         );
 
-        scalarField& sourceField = trhoTrans();
+        scalarField& sourceField = trhoTrans.ref();
 
         if (this->solution().semiImplicit("rho"))
         {
@@ -272,7 +272,7 @@ Foam::ReactingCloud<CloudType>::Srho(volScalarField& rho) const
         else
         {
             tmp<fvScalarMatrix> tfvm(new fvScalarMatrix(rho, dimMass/dimTime));
-            fvScalarMatrix& fvm = tfvm();
+            fvScalarMatrix& fvm = tfvm.ref();
 
             forAll(rhoTrans_, i)
             {
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index 9655ef95f3..d23371cb82 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -247,7 +247,7 @@ Foam::ThermoCloud<CloudType>::Sh(volScalarField& hs) const
         else
         {
             tmp<fvScalarMatrix> tfvm(new fvScalarMatrix(hs, dimEnergy/dimTime));
-            fvScalarMatrix& fvm = tfvm();
+            fvScalarMatrix& fvm = tfvm.ref();
 
             fvm.source() = -hsTrans()/(this->db().time().deltaT());
 
@@ -282,7 +282,7 @@ inline Foam::tmp<Foam::volScalarField> Foam::ThermoCloud<CloudType>::Ep() const
 
     if (radiation_)
     {
-        scalarField& Ep = tEp().internalField();
+        scalarField& Ep = tEp.ref().internalField();
         const scalar dt = this->db().time().deltaTValue();
         const scalarField& V = this->mesh().V();
         const scalar epsilon = constProps_.epsilon0();
@@ -318,7 +318,7 @@ inline Foam::tmp<Foam::volScalarField> Foam::ThermoCloud<CloudType>::ap() const
 
     if (radiation_)
     {
-        scalarField& ap = tap().internalField();
+        scalarField& ap = tap.ref().internalField();
         const scalar dt = this->db().time().deltaTValue();
         const scalarField& V = this->mesh().V();
         const scalar epsilon = constProps_.epsilon0();
@@ -355,7 +355,7 @@ Foam::ThermoCloud<CloudType>::sigmap() const
 
     if (radiation_)
     {
-        scalarField& sigmap = tsigmap().internalField();
+        scalarField& sigmap = tsigmap.ref().internalField();
         const scalar dt = this->db().time().deltaTValue();
         const scalarField& V = this->mesh().V();
         const scalar epsilon = constProps_.epsilon0();
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
index 73a72f5540..ad22dc25fb 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
@@ -267,14 +267,14 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
 
             if (applyGravity_)
             {
-                phiCorrect_() -= phiGByA();
+                phiCorrect_.ref() -= phiGByA();
             }
 
             forAll(phiCorrect_(), faceI)
             {
                 // Current and correction fluxes
                 const scalar phiCurr = phi[faceI];
-                scalar& phiCorr = phiCorrect_()[faceI];
+                scalar& phiCorr = phiCorrect_.ref()[faceI];
 
                 // Don't limit if the correction is in the opposite direction to
                 // the flux. We need all the help we can get in this state.
@@ -296,7 +296,7 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
 
             if (applyGravity_)
             {
-                phiCorrect_() += phiGByA();
+                phiCorrect_.ref() += phiGByA();
             }
         }
 
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
index 56153ff88b..bf3a35272b 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ Foam::radiation::cloudAbsorptionEmission::aDisp(const label) const
             mesh_.objectRegistry::lookupObject<thermoCloud>(cloudNames_[i])
         );
 
-        ta() += tc.ap();
+        ta.ref() += tc.ap();
     }
 
     return ta;
@@ -155,7 +155,7 @@ Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const
             mesh_.objectRegistry::lookupObject<thermoCloud>(cloudNames_[i])
         );
 
-        tE() += tc.Ep();
+        tE.ref() += tc.Ep();
     }
 
     // Total emission is 4 times the projected emission
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
index aa38692a76..0f88407b4e 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ Foam::radiation::cloudScatter::sigmaEff() const
             mesh_.objectRegistry::lookupObject<thermoCloud>(cloudNames_[i])
         );
 
-        tsigma() += tc.sigmap();
+        tsigma.ref() += tc.sigmap();
     }
 
     return 3.0*tsigma;
diff --git a/src/lagrangian/molecularDynamics/molecule/Make/options b/src/lagrangian/molecularDynamics/molecule/Make/options
index 5698f81a65..6ccac8015b 100644
--- a/src/lagrangian/molecularDynamics/molecule/Make/options
+++ b/src/lagrangian/molecularDynamics/molecule/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -11,4 +11,3 @@ LIB_LIBS = \
     -llagrangian \
     -lpotential \
     -lmolecularMeasurements
-
diff --git a/src/lagrangian/solidParticle/Make/options b/src/lagrangian/solidParticle/Make/options
index 9fe79c9220..5cf0265987 100644
--- a/src/lagrangian/solidParticle/Make/options
+++ b/src/lagrangian/solidParticle/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options
index 3b5a4e72e9..d5eb8a74c5 100644
--- a/src/lagrangian/spray/Make/options
+++ b/src/lagrangian/spray/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
diff --git a/src/lagrangian/turbulence/Make/options b/src/lagrangian/turbulence/Make/options
index 7b2fc4bea8..67f1b6608c 100644
--- a/src/lagrangian/turbulence/Make/options
+++ b/src/lagrangian/turbulence/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options
index d37a26a9dd..78bd91e593 100644
--- a/src/mesh/autoMesh/Make/options
+++ b/src/mesh/autoMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index f1727c44b0..91ce9cce75 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -112,7 +112,7 @@ Foam::tmp<Foam::scalarField> Foam::autoLayerDriver::avgPointData
 )
 {
     tmp<scalarField> tfaceFld(new scalarField(pp.size(), 0.0));
-    scalarField& faceFld = tfaceFld();
+    scalarField& faceFld = tfaceFld.ref();
 
     forAll(pp.localFaces(), faceI)
     {
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index 7e4fd3a1af..29475a3958 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -514,7 +514,7 @@ Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::edgePatchDist
 
     // Copy edge values into scalarField
     tmp<scalarField> tedgeDist(new scalarField(mesh.nEdges()));
-    scalarField& edgeDist = tedgeDist();
+    scalarField& edgeDist = tedgeDist.ref();
 
     forAll(allEdgeInfo, edgeI)
     {
@@ -874,7 +874,7 @@ Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avgCellCentres
     (
         new pointField(pointFaces.size(), vector::zero)
     );
-    pointField& avgBoundary = tavgBoundary();
+    pointField& avgBoundary = tavgBoundary.ref();
     labelList nBoundary(pointFaces.size(), 0);
 
     forAll(pointFaces, pointI)
diff --git a/src/mesh/blockMesh/Make/options b/src/mesh/blockMesh/Make/options
index 1618ab57ec..d398d1687f 100644
--- a/src/mesh/blockMesh/Make/options
+++ b/src/mesh/blockMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
diff --git a/src/mesh/extrudeModel/Make/options b/src/mesh/extrudeModel/Make/options
index eabd0b53a8..92abbacf67 100644
--- a/src/mesh/extrudeModel/Make/options
+++ b/src/mesh/extrudeModel/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
index d9e3a0fb77..50dad9b28b 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -184,7 +184,7 @@ Foam::cyclicACMIGAMGInterface::internalFieldTransfer
     const labelUList& nbrFaceCells = nbr.faceCells();
 
     tmp<labelField> tpnf(new labelField(nbrFaceCells.size()));
-    labelField& pnf = tpnf();
+    labelField& pnf = tpnf.ref();
 
     forAll(pnf, facei)
     {
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
index 151b021aba..0270d4c645 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -183,7 +183,7 @@ Foam::tmp<Foam::labelField> Foam::cyclicAMIGAMGInterface::internalFieldTransfer
     const labelUList& nbrFaceCells = nbr.faceCells();
 
     tmp<labelField> tpnf(new labelField(nbrFaceCells.size()));
-    labelField& pnf = tpnf();
+    labelField& pnf = tpnf.ref();
 
     forAll(pnf, facei)
     {
diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options
index 1713152e9e..2f8d1a7b47 100644
--- a/src/meshTools/Make/options
+++ b/src/meshTools/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude
diff --git a/src/meshTools/cellQuality/cellQuality.C b/src/meshTools/cellQuality/cellQuality.C
index 95fe7e5339..c1165ee375 100644
--- a/src/meshTools/cellQuality/cellQuality.C
+++ b/src/meshTools/cellQuality/cellQuality.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
         )
     );
 
-    scalarField& result = tresult();
+    scalarField& result = tresult.ref();
 
     scalarField sumArea(mesh_.nCells(), 0.0);
 
@@ -108,7 +108,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::skewness() const
             mesh_.nCells(), 0.0
         )
     );
-    scalarField& result = tresult();
+    scalarField& result = tresult.ref();
 
     scalarField sumArea(mesh_.nCells(), 0.0);
 
@@ -187,7 +187,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
             mesh_.nFaces(), 0.0
         )
     );
-    scalarField& result = tresult();
+    scalarField& result = tresult.ref();
 
 
     const vectorField& centres = mesh_.cellCentres();
@@ -247,7 +247,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceSkewness() const
             mesh_.nFaces(), 0.0
         )
     );
-    scalarField& result = tresult();
+    scalarField& result = tresult.ref();
 
 
     const vectorField& cellCtrs = mesh_.cellCentres();
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
index 0ffe75d2e6..a0bfb14b8f 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ transformVector
 ) const
 {
     tmp<symmTensorField> tfld(new symmTensorField(st.size()));
-    symmTensorField& fld = tfld();
+    symmTensorField& fld = tfld.ref();
 
     forAll(fld, i)
     {
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
index fde7eb39cc..41e331c2b5 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ transformVector
 ) const
 {
     tmp<symmTensorField> tfld(new symmTensorField(st.size()));
-    symmTensorField& fld = tfld();
+    symmTensorField& fld = tfld.ref();
 
     forAll(fld, i)
     {
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
index c28a6fd3b4..ae0614f8de 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -232,7 +232,7 @@ Foam::tmp<Foam::symmTensorField> Foam::axesRotation::transformVector
 ) const
 {
     tmp<symmTensorField> tfld(new symmTensorField(st.size()));
-    symmTensorField& fld = tfld();
+    symmTensorField& fld = tfld.ref();
 
     forAll(fld, i)
     {
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
index a5427b5fa1..572db42283 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -304,7 +304,7 @@ Foam::tmp<Foam::tensorField> Foam::cylindrical::transformTensor
     const tensorField& R = Rptr_();
     const tensorField Rtr(R.T());
     tmp<tensorField> tt(new tensorField(cellMap.size()));
-    tensorField& t = tt();
+    tensorField& t = tt.ref();
     forAll(cellMap, i)
     {
         const label cellI = cellMap[i];
@@ -328,7 +328,7 @@ Foam::tmp<Foam::symmTensorField> Foam::cylindrical::transformVector
     }
 
     tmp<symmTensorField> tfld(new symmTensorField(Rptr_->size()));
-    symmTensorField& fld = tfld();
+    symmTensorField& fld = tfld.ref();
 
     const tensorField& R = Rptr_();
     forAll(fld, i)
diff --git a/src/meshTools/coordinateSystems/cylindricalCS.C b/src/meshTools/coordinateSystems/cylindricalCS.C
index 18be4ab3a8..fda455545a 100644
--- a/src/meshTools/coordinateSystems/cylindricalCS.C
+++ b/src/meshTools/coordinateSystems/cylindricalCS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -208,7 +208,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::globalToLocal
     );
 
     tmp<vectorField> tresult(new vectorField(lc.size()));
-    vectorField& result = tresult();
+    vectorField& result = tresult.ref();
 
     result.replace
     (
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 22e92fa7c3..0ecb78004f 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -99,7 +99,7 @@ Foam::tmp<Foam::pointField> Foam::mappedPatchBase::facePoints
 
     // Initialise to face-centre
     tmp<pointField> tfacePoints(new pointField(patch_.size()));
-    pointField& facePoints = tfacePoints();
+    pointField& facePoints = tfacePoints.ref();
 
     forAll(pp, faceI)
     {
@@ -867,7 +867,7 @@ Foam::tmp<Foam::pointField> Foam::mappedPatchBase::readListOrField
 )
 {
     tmp<pointField> tfld(new pointField());
-    pointField& fld = tfld();
+    pointField& fld = tfld.ref();
 
     if (size)
     {
@@ -1267,7 +1267,7 @@ Foam::tmp<Foam::pointField> Foam::mappedPatchBase::samplePoints
 ) const
 {
     tmp<pointField> tfld(new pointField(fc));
-    pointField& fld = tfld();
+    pointField& fld = tfld.ref();
 
     switch (offsetMode_)
     {
diff --git a/src/meshTools/momentOfInertia/momentOfInertia.C b/src/meshTools/momentOfInertia/momentOfInertia.C
index bb17f5833c..c28ca0325b 100644
--- a/src/meshTools/momentOfInertia/momentOfInertia.C
+++ b/src/meshTools/momentOfInertia/momentOfInertia.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -306,7 +306,7 @@ Foam::tmp<Foam::tensorField> Foam::momentOfInertia::meshInertia
 {
     tmp<tensorField> tTf = tmp<tensorField>(new tensorField(mesh.nCells()));
 
-    tensorField& tf = tTf();
+    tensorField& tf = tTf.ref();
 
     forAll(tf, cI)
     {
diff --git a/src/meshTools/searchableSurface/searchableBox.C b/src/meshTools/searchableSurface/searchableBox.C
index a293385436..c42150e7ef 100644
--- a/src/meshTools/searchableSurface/searchableBox.C
+++ b/src/meshTools/searchableSurface/searchableBox.C
@@ -223,7 +223,7 @@ const Foam::wordList& Foam::searchableBox::regions() const
 Foam::tmp<Foam::pointField> Foam::searchableBox::coordinates() const
 {
     tmp<pointField> tCtrs = tmp<pointField>(new pointField(6));
-    pointField& ctrs = tCtrs();
+    pointField& ctrs = tCtrs.ref();
 
     const pointField pts(treeBoundBox::points());
     const faceList& fcs = treeBoundBox::faces;
diff --git a/src/meshTools/searchableSurface/searchableCylinder.C b/src/meshTools/searchableSurface/searchableCylinder.C
index 01eee6e635..69568fa18d 100644
--- a/src/meshTools/searchableSurface/searchableCylinder.C
+++ b/src/meshTools/searchableSurface/searchableCylinder.C
@@ -30,10 +30,8 @@ License
 
 namespace Foam
 {
-
-defineTypeNameAndDebug(searchableCylinder, 0);
-addToRunTimeSelectionTable(searchableSurface, searchableCylinder, dict);
-
+    defineTypeNameAndDebug(searchableCylinder, 0);
+    addToRunTimeSelectionTable(searchableSurface, searchableCylinder, dict);
 }
 
 
@@ -67,7 +65,7 @@ void Foam::searchableCylinder::boundingSpheres
 Foam::tmp<Foam::pointField> Foam::searchableCylinder::points() const
 {
     tmp<pointField> tPts(new pointField(2));
-    pointField& pts = tPts();
+    pointField& pts = tPts.ref();
 
     pts[0] = point1_;
     pts[1] = point2_;
diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C
index f03b4ac26f..166aef7752 100644
--- a/src/meshTools/searchableSurface/searchablePlate.C
+++ b/src/meshTools/searchableSurface/searchablePlate.C
@@ -298,7 +298,7 @@ void Foam::searchablePlate::boundingSpheres
 Foam::tmp<Foam::pointField> Foam::searchablePlate::points() const
 {
     tmp<pointField> tPts(new pointField(4));
-    pointField& pts = tPts();
+    pointField& pts = tPts.ref();
 
     pts[0] = origin_;
     pts[2] = origin_ + span_;
diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.C b/src/meshTools/searchableSurface/searchableSurfaceCollection.C
index 868a959941..17477023ca 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceCollection.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.C
@@ -325,7 +325,7 @@ Foam::tmp<Foam::pointField>
 Foam::searchableSurfaceCollection::coordinates() const
 {
     tmp<pointField> tCtrs = tmp<pointField>(new pointField(size()));
-    pointField& ctrs = tCtrs();
+    pointField& ctrs = tCtrs.ref();
 
     // Append individual coordinates
     label coordI = 0;
@@ -400,7 +400,7 @@ Foam::searchableSurfaceCollection::points() const
     }
 
     tmp<pointField> tPts(new pointField(nPoints));
-    pointField& pts = tPts();
+    pointField& pts = tPts.ref();
 
     // Append individual coordinates
     nPoints = 0;
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index de185b181c..507e839c92 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -382,7 +382,7 @@ void Foam::triSurfaceMesh::clearOut()
 Foam::tmp<Foam::pointField> Foam::triSurfaceMesh::coordinates() const
 {
     tmp<pointField> tPts(new pointField(8));
-    pointField& pt = tPts();
+    pointField& pt = tPts.ref();
 
     // Use copy to calculate face centres so they don't get stored
     pt = PrimitivePatch<triSurface::FaceType, SubList, const pointField&>
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
index 87300a9928..e61a40391e 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
@@ -197,7 +197,7 @@ void Foam::pointToPointPlanarInterpolation::calcWeights
         (
             referenceCS_.localPosition(sourcePoints)
         );
-        vectorField& localVertices = tlocalVertices();
+        vectorField& localVertices = tlocalVertices.ref();
 
         const boundBox bb(localVertices, true);
         const point bbMid(bb.midpoint());
diff --git a/src/postProcessing/functionObjects/field/Make/options b/src/postProcessing/functionObjects/field/Make/options
index 0732822dba..583c538b9e 100644
--- a/src/postProcessing/functionObjects/field/Make/options
+++ b/src/postProcessing/functionObjects/field/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
index e633d9e72b..ca7c997662 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
@@ -83,7 +83,7 @@ Foam::tmp<Foam::Field<Type>> Foam::fieldValues::faceSource::getFieldValues
                 (
                     new Field<Type>(faces.size(), pTraits<Type>::zero)
                 );
-                Field<Type>& avg = tavg();
+                Field<Type>& avg = tavg.ref();
 
                 forAll(faces, faceI)
                 {
@@ -355,7 +355,7 @@ Foam::tmp<Foam::Field<Type>> Foam::fieldValues::faceSource::filterField
 ) const
 {
     tmp<Field<Type>> tvalues(new Field<Type>(faceId_.size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
 
     forAll(values, i)
     {
@@ -396,7 +396,7 @@ Foam::tmp<Foam::Field<Type>> Foam::fieldValues::faceSource::filterField
 ) const
 {
     tmp<Field<Type>> tvalues(new Field<Type>(faceId_.size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
 
     forAll(values, i)
     {
diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index 6d02c13969..8e6698b326 100644
--- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -216,7 +216,7 @@ Foam::tmp<Foam::scalarField> Foam::regionSizeDistribution::divide
 )
 {
     tmp<scalarField> tresult(new scalarField(num.size()));
-    scalarField& result = tresult();
+    scalarField& result = tresult.ref();
 
     forAll(denom, i)
     {
diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options
index ad4e27c196..f50a857be2 100644
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \
     -I$(LIB_SRC)/transportModels \
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
index 1d9013d96e..3dd1877a87 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
+++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,7 +148,7 @@ Foam::tmp<Foam::volScalarField> Foam::pressureTools::pDyn
     {
         const volVectorField& U = obr_.lookupObject<volVectorField>(UName_);
 
-        tpDyn() == rho(p)*0.5*magSqr(U);
+        tpDyn.ref() == rho(p)*0.5*magSqr(U);
     }
 
     return tpDyn;
@@ -164,13 +164,13 @@ Foam::tmp<Foam::volScalarField> Foam::pressureTools::convertToCoeff
 
     if (calcCoeff_)
     {
-        tCoeff() -= dimensionedScalar("pInf", dimPressure, pInf_);
+        tCoeff.ref() -= dimensionedScalar("pInf", dimPressure, pInf_);
 
         const dimensionedScalar p0("p0", dimPressure, SMALL);
         const dimensionedVector U("U", dimVelocity, UInf_);
         const dimensionedScalar rho("rho", dimDensity, rhoInf_);
 
-        tCoeff() /= 0.5*rho*magSqr(U) + p0;
+        tCoeff.ref() /= 0.5*rho*magSqr(U) + p0;
     }
 
     return tCoeff;
diff --git a/src/randomProcesses/Make/options b/src/randomProcesses/Make/options
index 71b7873964..287318da1f 100644
--- a/src/randomProcesses/Make/options
+++ b/src/randomProcesses/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
diff --git a/src/randomProcesses/fft/fft.C b/src/randomProcesses/fft/fft.C
index fdc5e856ed..f859b37f52 100644
--- a/src/randomProcesses/fft/fft.C
+++ b/src/randomProcesses/fft/fft.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -191,7 +191,7 @@ tmp<complexField> fft::forwardTransform
 {
     tmp<complexField> tfftField(new complexField(tfield));
 
-    transform(tfftField(), nn, FORWARD_TRANSFORM);
+    transform(tfftField.ref(), nn, FORWARD_TRANSFORM);
 
     tfield.clear();
 
@@ -207,7 +207,7 @@ tmp<complexField> fft::reverseTransform
 {
     tmp<complexField> tifftField(new complexField(tfield));
 
-    transform(tifftField(), nn, REVERSE_TRANSFORM);
+    transform(tifftField.ref(), nn, REVERSE_TRANSFORM);
 
     tfield.clear();
 
@@ -231,7 +231,7 @@ tmp<complexVectorField> fft::forwardTransform
 
     for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
     {
-        tfftVectorField().replace
+        tfftVectorField.ref().replace
         (
             cmpt,
             forwardTransform(tfield().component(cmpt), nn)
@@ -260,7 +260,7 @@ tmp<complexVectorField> fft::reverseTransform
 
     for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
     {
-        tifftVectorField().replace
+        tifftVectorField.ref().replace
         (
             cmpt,
             reverseTransform(tfield().component(cmpt), nn)
diff --git a/src/randomProcesses/noise/noiseFFT.C b/src/randomProcesses/noise/noiseFFT.C
index 88cbe3c5ba..0f09cdf817 100644
--- a/src/randomProcesses/noise/noiseFFT.C
+++ b/src/randomProcesses/noise/noiseFFT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -140,7 +140,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::window
     }
 
     tmp<scalarField> tpw(new scalarField(N));
-    scalarField& pw = tpw();
+    scalarField& pw = tpw.ref();
 
     label offset = ni*windowOffset;
 
@@ -193,7 +193,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::Pf
             scalarField::subField(tPn2(), tPn2().size()/2)
         )
     );
-    scalarField& Pn = tPn();
+    scalarField& Pn = tPn.ref();
 
     Pn *= 2.0/sqrt(scalar(tPn2().size()));
     Pn[0] /= 2.0;
diff --git a/src/regionCoupled/Make/options b/src/regionCoupled/Make/options
index a9753c5115..21a2486c48 100644
--- a/src/regionCoupled/Make/options
+++ b/src/regionCoupled/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
index 697405daf7..004fecb0e2 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
@@ -190,7 +190,7 @@ weights() const
     const scalarField nbrAlphaDelta(nbrAlpha/nbrDeltas);
 
     tmp<scalarField> tw(new scalarField(deltas.size()));
-    scalarField& w = tw();
+    scalarField& w = tw.ref();
 
     forAll(alphaDelta, faceI)
     {
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
index 501f4aa64c..ec261e277e 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
@@ -196,7 +196,6 @@ void reactingOneDim::updatePhiGas()
                 }
             }
         }
-        tHsiGas().clear();
     }
 }
 
diff --git a/src/regionModels/regionModel/Make/options b/src/regionModels/regionModel/Make/options
index a3ae8da833..bcd627471b 100644
--- a/src/regionModels/regionModel/Make/options
+++ b/src/regionModels/regionModel/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.C b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
index 63e8145c5f..ba750c9f76 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1D.C
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
@@ -183,7 +183,7 @@ Foam::tmp<Foam::labelField> Foam::regionModels::regionModel1D::moveMesh
 )
 {
     tmp<labelField> tcellMoveMap(new labelField(regionMesh().nCells(), 0));
-    labelField& cellMoveMap = tcellMoveMap();
+    labelField& cellMoveMap = tcellMoveMap.ref();
 
     if (!moveMesh_)
     {
diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options
index a0eb4828ea..0cd68b47e8 100644
--- a/src/regionModels/surfaceFilmModels/Make/options
+++ b/src/regionModels/surfaceFilmModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
index 2b6727b91f..72b853d0de 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ tmp<scalarField> nutkFilmWallFunctionFvPatchScalarField::calcUTau
 ) const
 {
     tmp<scalarField> tuTau(new scalarField(patch().size(), 0.0));
-    scalarField& uTau = tuTau();
+    scalarField& uTau = tuTau.ref();
 
     typedef regionModels::surfaceFilmModels::surfaceFilmModel modelType;
 
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index e87619f67f..529b95f964 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -299,13 +299,13 @@ tmp<Foam::fvVectorMatrix> kinematicSingleLayer::solveMomentum
       + fvm::div(phi_, U_)
      ==
       - USp_
-//      - fvm::SuSp(rhoSp_, U_)
+   // - fvm::SuSp(rhoSp_, U_)
       - rhoSp_*U_
       + forces_.correct(U_)
       + turbulence_->Su(U_)
     );
 
-    fvVectorMatrix& UEqn = tUEqn();
+    fvVectorMatrix& UEqn = tUEqn.ref();
 
     UEqn.relax();
 
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
index 3c0bd597f2..e7647ec9e0 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
@@ -249,7 +249,7 @@ inline tmp<volScalarField> kinematicSingleLayer::gNormClipped() const
         )
     );
 
-    volScalarField& gNormClipped = tgNormClipped();
+    volScalarField& gNormClipped = tgNormClipped.ref();
     gNormClipped.min(0.0);
 
     return tgNormClipped;
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
index cc53371852..3e7602868b 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
@@ -275,8 +275,8 @@ tmp<volScalarField> constantFilmThermo::rho() const
         )
     );
 
-    trho().internalField() = this->rho(0, 0);
-    trho().correctBoundaryConditions();
+    trho.ref().internalField() = this->rho(0, 0);
+    trho.ref().correctBoundaryConditions();
 
     return trho;
 }
@@ -302,8 +302,8 @@ tmp<volScalarField> constantFilmThermo::mu() const
         )
     );
 
-    tmu().internalField() = this->mu(0, 0);
-    tmu().correctBoundaryConditions();
+    tmu.ref().internalField() = this->mu(0, 0);
+    tmu.ref().correctBoundaryConditions();
 
     return tmu;
 }
@@ -329,8 +329,8 @@ tmp<volScalarField> constantFilmThermo::sigma() const
         )
     );
 
-    tsigma().internalField() = this->sigma(0, 0);
-    tsigma().correctBoundaryConditions();
+    tsigma.ref().internalField() = this->sigma(0, 0);
+    tsigma.ref().correctBoundaryConditions();
 
     return tsigma;
 }
@@ -356,8 +356,8 @@ tmp<volScalarField> constantFilmThermo::Cp() const
         )
     );
 
-    tCp().internalField() = this->Cp(0, 0);
-    tCp().correctBoundaryConditions();
+    tCp.ref().internalField() = this->Cp(0, 0);
+    tCp.ref().correctBoundaryConditions();
 
     return tCp;
 }
@@ -383,8 +383,8 @@ tmp<volScalarField> constantFilmThermo::kappa() const
         )
     );
 
-    tkappa().internalField() = this->kappa(0, 0);
-    tkappa().correctBoundaryConditions();
+    tkappa.ref().internalField() = this->kappa(0, 0);
+    tkappa.ref().correctBoundaryConditions();
 
     return tkappa;
 }
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
index 59b5713617..13f6937b2a 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@@ -255,7 +255,7 @@ tmp<volScalarField> liquidFilmThermo::rho() const
         )
     );
 
-    scalarField& rho = trho().internalField();
+    scalarField& rho = trho.ref().internalField();
 
     if (useReferenceValues_)
     {
@@ -277,7 +277,7 @@ tmp<volScalarField> liquidFilmThermo::rho() const
         }
     }
 
-    trho().correctBoundaryConditions();
+    trho.ref().correctBoundaryConditions();
 
     return trho;
 }
@@ -303,7 +303,7 @@ tmp<volScalarField> liquidFilmThermo::mu() const
         )
     );
 
-    scalarField& mu = tmu().internalField();
+    scalarField& mu = tmu.ref().internalField();
 
     if (useReferenceValues_)
     {
@@ -325,7 +325,7 @@ tmp<volScalarField> liquidFilmThermo::mu() const
         }
     }
 
-    tmu().correctBoundaryConditions();
+    tmu.ref().correctBoundaryConditions();
 
     return tmu;
 }
@@ -351,7 +351,7 @@ tmp<volScalarField> liquidFilmThermo::sigma() const
         )
     );
 
-    scalarField& sigma = tsigma().internalField();
+    scalarField& sigma = tsigma.ref().internalField();
 
     if (useReferenceValues_)
     {
@@ -373,7 +373,7 @@ tmp<volScalarField> liquidFilmThermo::sigma() const
         }
     }
 
-    tsigma().correctBoundaryConditions();
+    tsigma.ref().correctBoundaryConditions();
 
     return tsigma;
 }
@@ -399,7 +399,7 @@ tmp<volScalarField> liquidFilmThermo::Cp() const
         )
     );
 
-    scalarField& Cp = tCp().internalField();
+    scalarField& Cp = tCp.ref().internalField();
 
     if (useReferenceValues_)
     {
@@ -421,7 +421,7 @@ tmp<volScalarField> liquidFilmThermo::Cp() const
         }
     }
 
-    tCp().correctBoundaryConditions();
+    tCp.ref().correctBoundaryConditions();
 
     return tCp;
 }
@@ -447,7 +447,7 @@ tmp<volScalarField> liquidFilmThermo::kappa() const
         )
     );
 
-    scalarField& kappa = tkappa().internalField();
+    scalarField& kappa = tkappa.ref().internalField();
 
     if (useReferenceValues_)
     {
@@ -469,7 +469,7 @@ tmp<volScalarField> liquidFilmThermo::kappa() const
         }
     }
 
-    tkappa().correctBoundaryConditions();
+    tkappa.ref().correctBoundaryConditions();
 
     return tkappa;
 }
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
index df7ccf0845..4a1c6383e8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
@@ -89,8 +89,8 @@ tmp<volVectorField> laminar::Us() const
     );
 
     // apply quadratic profile
-    tUs() = Foam::sqrt(2.0)*owner_.U();
-    tUs().correctBoundaryConditions();
+    tUs.ref() = Foam::sqrt(2.0)*owner_.U();
+    tUs.ref().correctBoundaryConditions();
 
     return tUs;
 }
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
index 756b1d8cc4..c8d111579e 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,7 +153,7 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
         )
     );
 
-    vectorField& force = tForce().internalField();
+    vectorField& force = tForce.ref().internalField();
 
     const labelUList& own = owner_.regionMesh().owner();
     const labelUList& nbr = owner_.regionMesh().neighbour();
@@ -229,7 +229,7 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
     tmp<fvVectorMatrix>
         tfvm(new fvVectorMatrix(U, dimForce/dimArea*dimVolume));
 
-    tfvm() += tForce;
+    tfvm.ref() += tForce;
 
     return tfvm;
 }
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C
index a6b54fe235..56a1454c46 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ tmp<fvVectorMatrix> forceList::correct(volVectorField& U)
     (
         new fvVectorMatrix(U, dimForce/dimArea*dimVolume)
     );
-    fvVectorMatrix& result = tResult();
+    fvVectorMatrix& result = tResult.ref();
 
     forAll(*this, i)
     {
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C
index 0d681da008..19614cbcf9 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ tmp<fvVectorMatrix> thermocapillaryForce::correct(volVectorField& U)
     tmp<fvVectorMatrix>
         tfvm(new fvVectorMatrix(U, dimForce/dimArea*dimVolume));
 
-    tfvm() += fvc::grad(sigma);
+    tfvm.ref() += fvc::grad(sigma);
 
     return tfvm;
 }
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index 2709cd08a5..72ec8a44ba 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -78,7 +78,7 @@ tmp<volScalarField> curvatureSeparation::calcInvR1
     );
 
 
-    scalarField& invR1 = tinvR1().internalField();
+    scalarField& invR1 = tinvR1.ref().internalField();
 
     // apply defined patch radii
     const scalar rMin = 1e-6;
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
index 4f5c60f145..489b453cb9 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
@@ -124,7 +124,7 @@ tmp<volScalarField> constantRadiation::Shs()
 
     if ((time >= timeStart_) && (time <= timeStart_ + duration_))
     {
-        scalarField& Shs = tShs();
+        scalarField& Shs = tShs.ref();
         const scalarField& Qr = QrConst_.internalField();
         const scalarField& alpha = owner_.alpha().internalField();
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
index b653ee4638..a6350c3ac1 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
@@ -107,7 +107,7 @@ tmp<volScalarField> primaryRadiation::Shs()
         )
     );
 
-    scalarField& Shs = tShs();
+    scalarField& Shs = tShs.ref();
     const scalarField& QinP = QinPrimary_.internalField();
     const scalarField& alpha = owner_.alpha().internalField();
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
index 3505f9c8a0..2d6e8b77b8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
@@ -124,7 +124,7 @@ tmp<volScalarField> standardRadiation::Shs()
         )
     );
 
-    scalarField& Shs = tShs();
+    scalarField& Shs = tShs.ref();
     const scalarField& QinP = QinPrimary_.internalField();
     const scalarField& delta = owner_.delta().internalField();
     const scalarField& alpha = owner_.alpha().internalField();
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index f29d5d64ed..c4fc973d23 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -751,7 +751,7 @@ tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho() const
         )
     );
 
-    scalarField& Srho = tSrho();
+    scalarField& Srho = tSrho.ref();
     const scalarField& V = primaryMesh().V();
     const scalar dt = time_.deltaTValue();
 
@@ -805,7 +805,7 @@ tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho
 
     if (vapId == i)
     {
-        scalarField& Srho = tSrho();
+        scalarField& Srho = tSrho.ref();
         const scalarField& V = primaryMesh().V();
         const scalar dt = time().deltaTValue();
 
@@ -855,7 +855,7 @@ tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Sh() const
 /*
     phase change energy fed back into the film...
 
-    scalarField& Sh = tSh();
+    scalarField& Sh = tSh.ref();
     const scalarField& V = primaryMesh().V();
     const scalar dt = time_.deltaTValue();
 
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
index 223254c38e..22bd215deb 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
@@ -100,8 +100,8 @@ inline tmp<volScalarField> thermoSingleLayer::T
         )
     );
 
-    tT().min(Tmax_);
-    tT().max(Tmin_);
+    tT.ref().min(Tmax_);
+    tT.ref().max(Tmin_);
 
     return tT;
 }
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
index 360bdfeb1f..1490e558b1 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
@@ -91,7 +91,7 @@ void thermalBaffle::solveEnergy()
         )
     );
 
-    volScalarField& Q = tQ();
+    volScalarField& Q = tQ.ref();
 
     volScalarField rho("rho", thermo_->rho());
     volScalarField alpha("alpha", thermo_->alpha());
diff --git a/src/sampling/Make/options b/src/sampling/Make/options
index 23e6bc81a7..15ca6b932f 100644
--- a/src/sampling/Make/options
+++ b/src/sampling/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C
index 24d01d89a3..958b932be5 100644
--- a/src/sampling/meshToMesh/meshToMeshTemplates.C
+++ b/src/sampling/meshToMesh/meshToMeshTemplates.C
@@ -161,7 +161,7 @@ Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapSrcToTgt
         )
     );
 
-    mapSrcToTgt(srcField, cop, tresult());
+    mapSrcToTgt(srcField, cop, tresult.ref());
 
     return tresult;
 }
@@ -280,7 +280,7 @@ Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapTgtToSrc
         )
     );
 
-    mapTgtToSrc(tgtField, cop, tresult());
+    mapTgtToSrc(tgtField, cop, tresult.ref());
 
     return tresult;
 }
@@ -466,7 +466,7 @@ Foam::meshToMesh::mapSrcToTgt
         )
     );
 
-    mapSrcToTgt(field, cop, tresult());
+    mapSrcToTgt(field, cop, tresult.ref());
 
     return tresult;
 }
@@ -655,7 +655,7 @@ Foam::meshToMesh::mapTgtToSrc
         )
     );
 
-    mapTgtToSrc(field, cop, tresult());
+    mapTgtToSrc(field, cop, tresult.ref());
 
     return tresult;
 }
diff --git a/src/sampling/probes/patchProbesTemplates.C b/src/sampling/probes/patchProbesTemplates.C
index 325ff16a0e..59dfd0f50a 100644
--- a/src/sampling/probes/patchProbesTemplates.C
+++ b/src/sampling/probes/patchProbesTemplates.C
@@ -202,7 +202,7 @@ Foam::patchProbes::sample
         new Field<Type>(this->size(), unsetVal)
     );
 
-    Field<Type>& values = tValues();
+    Field<Type>& values = tValues.ref();
 
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
@@ -253,7 +253,7 @@ Foam::patchProbes::sample
         new Field<Type>(this->size(), unsetVal)
     );
 
-    Field<Type>& values = tValues();
+    Field<Type>& values = tValues.ref();
 
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
diff --git a/src/sampling/probes/probesTemplates.C b/src/sampling/probes/probesTemplates.C
index f035d5fe03..37d0bd98d5 100644
--- a/src/sampling/probes/probesTemplates.C
+++ b/src/sampling/probes/probesTemplates.C
@@ -225,7 +225,7 @@ Foam::probes::sample
         new Field<Type>(this->size(), unsetVal)
     );
 
-    Field<Type>& values = tValues();
+    Field<Type>& values = tValues.ref();
 
     if (fixedLocations_)
     {
@@ -295,7 +295,7 @@ Foam::probes::sample
         new Field<Type>(this->size(), unsetVal)
     );
 
-    Field<Type>& values = tValues();
+    Field<Type>& values = tValues.ref();
 
     forAll(*this, probeI)
     {
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
index ac27677924..1eba2063c4 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
@@ -596,7 +596,7 @@ Foam::isoSurfaceCell::interpolate
 
     // One value per point
     tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
 
     forAll(triPoints, i)
     {
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
index 58950e006b..ea92b65ef7 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
@@ -70,7 +70,7 @@ Foam::isoSurface::adaptPatchFields
             true        // preserveCouples
         )
     );
-    FieldType& sliceFld = tsliceFld();
+    FieldType& sliceFld = tsliceFld.ref();
 
     const fvMesh& mesh = fld.mesh();
 
@@ -737,7 +737,7 @@ Foam::isoSurface::interpolate
     (
         new Field<Type>(points().size(), pTraits<Type>::zero)
     );
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
     labelList nValues(values.size(), 0);
 
     forAll(triPoints, i)
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
index a80bd81a3b..72bcbbf701 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
@@ -57,7 +57,7 @@ Foam::sampledIsoSurfaceCell::interpolateField
 
     // One value per point
     tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
 
     boolList pointDone(points().size(), false);
 
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
index dc7f0cbb6e..58bd02fcb0 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
@@ -36,7 +36,7 @@ Foam::sampledPatch::sampleField
 {
     // One value per face
     tmp<Field<Type>> tvalues(new Field<Type>(patchFaceLabels_.size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
     forAll(patchFaceLabels_, i)
     {
         label patchI = patchIDs_[patchIndex_[i]];
@@ -57,7 +57,7 @@ Foam::sampledPatch::sampleField
 {
     // One value per face
     tmp<Field<Type>> tvalues(new Field<Type>(patchFaceLabels_.size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
 
     forAll(patchFaceLabels_, i)
     {
@@ -78,7 +78,7 @@ Foam::sampledPatch::interpolateField
 {
     // One value per vertex
     tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
 
     const labelList& own = mesh().faceOwner();
 
diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
index 56852b4ec2..be2348729f 100644
--- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
@@ -38,7 +38,7 @@ Foam::sampledPatchInternalField::sampleField
 {
     // One value per face
     tmp<Field<Type>> tvalues(new Field<Type>(patchFaceLabels().size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
 
     forAll(patchStart(), i)
     {
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
index 52e830d75f..60e6b5a489 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
@@ -47,7 +47,7 @@ Foam::sampledPlane::interpolateField
 {
     // One value per point
     tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
 
     boolList pointDone(points().size(), false);
 
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
index 59a34de598..38c478edc0 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
@@ -291,7 +291,7 @@ Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::sampledSurface::project(const Field<scalar>& field) const
 {
     tmp<Field<scalar>> tRes(new Field<scalar>(faces().size()));
-    Field<scalar>& res = tRes();
+    Field<scalar>& res = tRes.ref();
 
     forAll(faces(), faceI)
     {
@@ -306,7 +306,7 @@ Foam::tmp<Foam::Field<Foam::scalar>>
 Foam::sampledSurface::project(const Field<vector>& field) const
 {
     tmp<Field<scalar>> tRes(new Field<scalar>(faces().size()));
-    project(tRes(), field);
+    project(tRes.ref(), field);
     return tRes;
 }
 
@@ -315,7 +315,7 @@ Foam::tmp<Foam::Field<Foam::vector>>
 Foam::sampledSurface::project(const Field<sphericalTensor>& field) const
 {
     tmp<Field<vector>> tRes(new Field<vector>(faces().size()));
-    project(tRes(), field);
+    project(tRes.ref(), field);
     return tRes;
 }
 
@@ -324,7 +324,7 @@ Foam::tmp<Foam::Field<Foam::vector>>
 Foam::sampledSurface::project(const Field<symmTensor>& field) const
 {
     tmp<Field<vector>> tRes(new Field<vector>(faces().size()));
-    project(tRes(), field);
+    project(tRes.ref(), field);
     return tRes;
 }
 
@@ -333,7 +333,7 @@ Foam::tmp<Foam::Field<Foam::vector>>
 Foam::sampledSurface::project(const Field<tensor>& field) const
 {
     tmp<Field<vector>> tRes(new Field<vector>(faces().size()));
-    project(tRes(), field);
+    project(tRes.ref(), field);
     return tRes;
 }
 
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
index d361cdd029..dcf176b56a 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
@@ -177,7 +177,7 @@ Foam::sampledSurface::pointAverage
             dimensioned<Type>("zero", dimless, pTraits<Type>::zero)
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& cellAvg = tcellAvg();
+    GeometricField<Type, fvPatchField, volMesh>& cellAvg = tcellAvg.ref();
 
     labelField nPointCells(mesh.nCells(), 0);
     {
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
index 40190c9ae3..c286dde965 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
@@ -36,7 +36,7 @@ Foam::sampledTriSurfaceMesh::sampleField
 {
     // One value per face
     tmp<Field<Type>> tvalues(new Field<Type>(sampleElements_.size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
 
     if (sampleSource_ == cells || sampleSource_ == insideCells)
     {
@@ -92,7 +92,7 @@ Foam::sampledTriSurfaceMesh::interpolateField
 {
     // One value per vertex
     tmp<Field<Type>> tvalues(new Field<Type>(sampleElements_.size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
 
     if (sampleSource_ == cells || sampleSource_ == insideCells)
     {
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
index d78da36837..03c2fffb4a 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
@@ -58,7 +58,7 @@ Foam::sampledThresholdCellFaces::interpolateField
 
     // One value per point
     tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
-    Field<Type>& values = tvalues();
+    Field<Type>& values = tvalues.ref();
 
     boolList pointDone(points().size(), false);
 
diff --git a/src/sixDoFRigidBodyMotion/Make/options b/src/sixDoFRigidBodyMotion/Make/options
index f2367d2e1d..fd1f401690 100644
--- a/src/sixDoFRigidBodyMotion/Make/options
+++ b/src/sixDoFRigidBodyMotion/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
index e7a8b92d33..c3a94123d1 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -356,7 +356,7 @@ Foam::tmp<Foam::pointField> Foam::sixDoFRigidBodyMotion::transform
     );
 
     tmp<pointField> tpoints(new pointField(initialPoints));
-    pointField& points = tpoints();
+    pointField& points = tpoints.ref();
 
     forAll(points, pointi)
     {
diff --git a/src/surfMesh/Make/options b/src/surfMesh/Make/options
index 7e207d0dbe..079607db05 100644
--- a/src/surfMesh/Make/options
+++ b/src/surfMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/fileFormats/lnInclude
 
 LIB_LIBS = \
diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options
index c4f0b2a8a9..3dac244d79 100644
--- a/src/thermophysicalModels/SLGThermo/Make/options
+++ b/src/thermophysicalModels/SLGThermo/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Make/options b/src/thermophysicalModels/barotropicCompressibilityModel/Make/options
index 71b7873964..287318da1f 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Make/options
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
diff --git a/src/thermophysicalModels/basic/Make/options b/src/thermophysicalModels/basic/Make/options
index b5c859baf1..95f178b455 100644
--- a/src/thermophysicalModels/basic/Make/options
+++ b/src/thermophysicalModels/basic/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C
index 0cc1354ffa..1db5c4ac7c 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.C
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -184,7 +184,7 @@ Foam::tmp<Foam::volScalarField> Foam::heThermo<BasicThermo, MixtureType>::he
         )
     );
 
-    volScalarField& he = the();
+    volScalarField& he = the.ref();
     scalarField& heCells = he.internalField();
     const scalarField& pCells = p.internalField();
     const scalarField& TCells = T.internalField();
@@ -221,7 +221,7 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::he
 ) const
 {
     tmp<scalarField> the(new scalarField(T.size()));
-    scalarField& he = the();
+    scalarField& he = the.ref();
 
     forAll(T, celli)
     {
@@ -241,7 +241,7 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::he
 ) const
 {
     tmp<scalarField> the(new scalarField(T.size()));
-    scalarField& he = the();
+    scalarField& he = the.ref();
 
     forAll(T, facei)
     {
@@ -277,7 +277,7 @@ Foam::heThermo<BasicThermo, MixtureType>::hc() const
         )
     );
 
-    volScalarField& hcf = thc();
+    volScalarField& hcf = thc.ref();
     scalarField& hcCells = hcf.internalField();
 
     forAll(hcCells, celli)
@@ -308,7 +308,7 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::Cp
 ) const
 {
     tmp<scalarField> tCp(new scalarField(T.size()));
-    scalarField& cp = tCp();
+    scalarField& cp = tCp.ref();
 
     forAll(T, facei)
     {
@@ -344,7 +344,7 @@ Foam::heThermo<BasicThermo, MixtureType>::Cp() const
         )
     );
 
-    volScalarField& cp = tCp();
+    volScalarField& cp = tCp.ref();
 
     forAll(this->T_, celli)
     {
@@ -379,7 +379,7 @@ Foam::heThermo<BasicThermo, MixtureType>::Cv
 ) const
 {
     tmp<scalarField> tCv(new scalarField(T.size()));
-    scalarField& cv = tCv();
+    scalarField& cv = tCv.ref();
 
     forAll(T, facei)
     {
@@ -415,7 +415,7 @@ Foam::heThermo<BasicThermo, MixtureType>::Cv() const
         )
     );
 
-    volScalarField& cv = tCv();
+    volScalarField& cv = tCv.ref();
 
     forAll(this->T_, celli)
     {
@@ -446,7 +446,7 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::gamma
 ) const
 {
     tmp<scalarField> tgamma(new scalarField(T.size()));
-    scalarField& cpv = tgamma();
+    scalarField& cpv = tgamma.ref();
 
     forAll(T, facei)
     {
@@ -482,7 +482,7 @@ Foam::heThermo<BasicThermo, MixtureType>::gamma() const
         )
     );
 
-    volScalarField& cpv = tgamma();
+    volScalarField& cpv = tgamma.ref();
 
     forAll(this->T_, celli)
     {
@@ -519,7 +519,7 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::Cpv
 ) const
 {
     tmp<scalarField> tCpv(new scalarField(T.size()));
-    scalarField& cpv = tCpv();
+    scalarField& cpv = tCpv.ref();
 
     forAll(T, facei)
     {
@@ -555,7 +555,7 @@ Foam::heThermo<BasicThermo, MixtureType>::Cpv() const
         )
     );
 
-    volScalarField& cpv = tCpv();
+    volScalarField& cpv = tCpv.ref();
 
     forAll(this->T_, celli)
     {
@@ -589,7 +589,7 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::CpByCpv
 ) const
 {
     tmp<scalarField> tCpByCpv(new scalarField(T.size()));
-    scalarField& cpByCpv = tCpByCpv();
+    scalarField& cpByCpv = tCpByCpv.ref();
 
     forAll(T, facei)
     {
@@ -625,7 +625,7 @@ Foam::heThermo<BasicThermo, MixtureType>::CpByCpv() const
         )
     );
 
-    volScalarField& cpByCpv = tCpByCpv();
+    volScalarField& cpByCpv = tCpByCpv.ref();
 
     forAll(this->T_, celli)
     {
@@ -666,7 +666,7 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::THE
 ) const
 {
     tmp<scalarField> tT(new scalarField(h.size()));
-    scalarField& T = tT();
+    scalarField& T = tT.ref();
 
     forAll(h, celli)
     {
@@ -689,7 +689,7 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::THE
 {
 
     tmp<scalarField> tT(new scalarField(h.size()));
-    scalarField& T = tT();
+    scalarField& T = tT.ref();
     forAll(h, facei)
     {
         T[facei] = this->patchFaceMixture
@@ -708,7 +708,7 @@ Foam::tmp<Foam::volScalarField>
 Foam::heThermo<BasicThermo, MixtureType>::kappa() const
 {
     tmp<Foam::volScalarField> kappa(Cp()*this->alpha_);
-    kappa().rename("kappa");
+    kappa.ref().rename("kappa");
     return kappa;
 }
 
@@ -737,7 +737,7 @@ Foam::heThermo<BasicThermo, MixtureType>::kappaEff
 ) const
 {
     tmp<Foam::volScalarField> kappaEff(Cp()*(this->alpha_ + alphat));
-    kappaEff().rename("kappaEff");
+    kappaEff.ref().rename("kappaEff");
     return kappaEff;
 }
 
@@ -772,7 +772,7 @@ Foam::heThermo<BasicThermo, MixtureType>::alphaEff
 ) const
 {
     tmp<Foam::volScalarField> alphaEff(this->CpByCpv()*(this->alpha_ + alphat));
-    alphaEff().rename("alphaEff");
+    alphaEff.ref().rename("alphaEff");
     return alphaEff;
 }
 
diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options
index de52d7e6ae..7a1e7f43d2 100644
--- a/src/thermophysicalModels/chemistryModel/Make/options
+++ b/src/thermophysicalModels/chemistryModel/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index ee7a8974d6..7c2d9beac2 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -104,7 +104,7 @@ Foam::chemistryModel<CompType, ThermoType>::omega
     label lRef, rRef;
 
     tmp<scalarField> tom(new scalarField(nEqns(), 0.0));
-    scalarField& om = tom();
+    scalarField& om = tom.ref();
 
     forAll(reactions_, i)
     {
@@ -500,7 +500,7 @@ Foam::chemistryModel<CompType, ThermoType>::tc() const
         )
     );
 
-    scalarField& tc = ttc();
+    scalarField& tc = ttc.ref();
     const scalarField& T = this->thermo().T();
     const scalarField& p = this->thermo().p();
 
@@ -540,7 +540,7 @@ Foam::chemistryModel<CompType, ThermoType>::tc() const
     }
 
 
-    ttc().correctBoundaryConditions();
+    ttc.ref().correctBoundaryConditions();
 
     return ttc;
 }
@@ -570,7 +570,7 @@ Foam::chemistryModel<CompType, ThermoType>::Sh() const
 
     if (this->chemistry_)
     {
-        scalarField& Sh = tSh();
+        scalarField& Sh = tSh.ref();
 
         forAll(Y_, i)
         {
@@ -610,7 +610,7 @@ Foam::chemistryModel<CompType, ThermoType>::dQ() const
 
     if (this->chemistry_)
     {
-        volScalarField& dQ = tdQ();
+        volScalarField& dQ = tdQ.ref();
         dQ.dimensionedInternalField() = this->mesh_.V()*Sh()();
     }
 
@@ -668,7 +668,7 @@ Foam::chemistryModel<CompType, ThermoType>::calculateRR
         )
     );
 
-    DimensionedField<scalar, volMesh>& RR = tRR();
+    DimensionedField<scalar, volMesh>& RR = tRR.ref();
 
     const scalarField& T = this->thermo().T();
     const scalarField& p = this->thermo().p();
diff --git a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
index a1563921c2..8ed9f35853 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::Gulders::Su0pTphi
         )
     );
 
-    volScalarField& Su0 = tSu0();
+    volScalarField& Su0 = tSu0.ref();
 
     forAll(Su0, celli)
     {
@@ -179,7 +179,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::Gulders::Su0pTphi
         )
     );
 
-    volScalarField& Su0 = tSu0();
+    volScalarField& Su0 = tSu0.ref();
 
     forAll(Su0, celli)
     {
diff --git a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
index 173e3d8841..74e62e7114 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi
         )
     );
 
-    volScalarField& Su0 = tSu0();
+    volScalarField& Su0 = tSu0.ref();
 
     forAll(Su0, celli)
     {
@@ -181,7 +181,7 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi
         )
     );
 
-    volScalarField& Su0 = tSu0();
+    volScalarField& Su0 = tSu0.ref();
 
     forAll(Su0, celli)
     {
diff --git a/src/thermophysicalModels/laminarFlameSpeed/Make/options b/src/thermophysicalModels/laminarFlameSpeed/Make/options
index f97edb8458..925d4a58aa 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/Make/options
+++ b/src/thermophysicalModels/laminarFlameSpeed/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
index e57be1b68f..c3eaf9c0e9 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
@@ -343,7 +343,7 @@ Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const
         )
     );
 
-    volScalarField& Su0 = tSu0();
+    volScalarField& Su0 = tSu0.ref();
 
     forAll(Su0, cellI)
     {
diff --git a/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options
index 138f439935..690761730f 100644
--- a/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options
+++ b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
@@ -8,4 +8,3 @@ EXE_INC = \
 LIB_LIBS = \
     -lliquidProperties \
     -lthermophysicalFunctions
-
diff --git a/src/thermophysicalModels/properties/liquidProperties/Make/options b/src/thermophysicalModels/properties/liquidProperties/Make/options
index b964b61294..e1fbd3ed45 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Make/options
+++ b/src/thermophysicalModels/properties/liquidProperties/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
 
 LIB_LIBS = \
diff --git a/src/thermophysicalModels/properties/solidMixtureProperties/Make/options b/src/thermophysicalModels/properties/solidMixtureProperties/Make/options
index f2d8f809d5..97cc509212 100644
--- a/src/thermophysicalModels/properties/solidMixtureProperties/Make/options
+++ b/src/thermophysicalModels/properties/solidMixtureProperties/Make/options
@@ -1,3 +1,3 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I${LIB_SRC}/thermophysicalModels/properties/solidProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
diff --git a/src/thermophysicalModels/properties/solidProperties/Make/options b/src/thermophysicalModels/properties/solidProperties/Make/options
index 848cce789f..f8779f538f 100644
--- a/src/thermophysicalModels/properties/solidProperties/Make/options
+++ b/src/thermophysicalModels/properties/solidProperties/Make/options
@@ -1,2 +1,2 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiation/Make/options
index 726b76e764..ea189b0b63 100644
--- a/src/thermophysicalModels/radiation/Make/options
+++ b/src/thermophysicalModels/radiation/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
index 4b07238462..b2fdb85d16 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
@@ -227,18 +227,15 @@ Foam::radiation::blackBodyEmission::EbDeltaLambdaT
     }
     else
     {
+        scalarField& Ebif = Eb.ref();
+
         forAll(T, i)
         {
             scalar T1 = fLambdaT(band[1]*T[i]);
             scalar T2 = fLambdaT(band[0]*T[i]);
-            dimensionedScalar fLambdaDelta
-            (
-                "fLambdaDelta",
-                dimless,
-                T1 - T2
-            );
-            Eb()[i] = Eb()[i]*fLambdaDelta.value();
+            Ebif[i] *= T1 - T2;
         }
+
         return Eb;
     }
 }
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index c27520f4e5..92f0ae3084 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -253,11 +253,11 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
             );
         }
 
-        IiEq().relax();
+        IiEq.ref().relax();
 
         const solverPerformance ILambdaSol = solve
         (
-            IiEq(),
+            IiEq.ref(),
             mesh_.solver("Ii")
         );
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index 208425212f..5d7e9070ef 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -213,7 +213,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
         )
     );
 
-    scalarField& a = ta().internalField();
+    scalarField& a = ta.ref().internalField();
 
     forAll(a, cellI)
     {
@@ -261,7 +261,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
                 );
         }
     }
-    ta().correctBoundaryConditions();
+    ta.ref().correctBoundaryConditions();
     return ta;
 }
 
@@ -300,11 +300,11 @@ Foam::radiation::greyMeanAbsorptionEmission::ECont(const label bandI) const
 
         if (dQ.dimensions() == dimEnergy/dimTime)
         {
-            E().internalField() = EhrrCoeff_*dQ/mesh_.V();
+            E.ref().internalField() = EhrrCoeff_*dQ/mesh_.V();
         }
         else if (dQ.dimensions() == dimEnergy/dimTime/dimVolume)
         {
-            E().internalField() = EhrrCoeff_*dQ;
+            E.ref().internalField() = EhrrCoeff_*dQ;
         }
         else
         {
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
index d3da12eb59..0e2238eeec 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@@ -55,10 +55,10 @@ greyMeanSolidAbsorptionEmission::X(const word specie) const
     const volScalarField& p = thermo_.p();
 
     tmp<scalarField> tXj(new scalarField(T.internalField().size(), 0.0));
-    scalarField& Xj = tXj();
+    scalarField& Xj = tXj.ref();
 
     tmp<scalarField> tRhoInv(new scalarField(T.internalField().size(), 0.0));
-    scalarField& rhoInv = tRhoInv();
+    scalarField& rhoInv = tRhoInv.ref();
 
     forAll(mixture_.Y(), specieI)
     {
@@ -162,7 +162,7 @@ calc(const label propertyId) const
         )
     );
 
-    scalarField& a = ta().internalField();
+    scalarField& a = ta.ref().internalField();
 
     forAllConstIter(HashTable<label>, speciesNames_, iter)
     {
@@ -172,7 +172,7 @@ calc(const label propertyId) const
         }
     }
 
-    ta().correctBoundaryConditions();
+    ta.ref().correctBoundaryConditions();
     return ta;
 }
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index 7147a96065..673043c39b 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -177,7 +177,7 @@ Foam::radiation::wideBandAbsorptionEmission::aCont(const label bandI) const
         )
     );
 
-    scalarField& a = ta().internalField();
+    scalarField& a = ta.ref().internalField();
 
     forAll(a, i)
     {
@@ -255,7 +255,7 @@ Foam::radiation::wideBandAbsorptionEmission::ECont(const label bandI) const
 
         if (dQ.dimensions() == dimEnergy/dimTime)
         {
-            E().internalField() =
+            E.ref().internalField() =
                 iEhrrCoeffs_[bandI]
                *dQ.internalField()
                *(iBands_[bandI][1] - iBands_[bandI][0])
@@ -264,7 +264,7 @@ Foam::radiation::wideBandAbsorptionEmission::ECont(const label bandI) const
         }
         else if (dQ.dimensions() == dimEnergy/dimTime/dimVolume)
         {
-            E().internalField() =
+            E.ref().internalField() =
                 iEhrrCoeffs_[bandI]
                *dQ.internalField()
                *(iBands_[bandI][1] - iBands_[bandI][0])
diff --git a/src/thermophysicalModels/reactionThermo/Make/options b/src/thermophysicalModels/reactionThermo/Make/options
index f59f44fc8d..bded2d7118 100644
--- a/src/thermophysicalModels/reactionThermo/Make/options
+++ b/src/thermophysicalModels/reactionThermo/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.C
index d9062e03f4..a3643c0d30 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ Foam::tmp<Foam::volScalarField> Foam::basicSpecieMixture::W() const
         )
     );
 
-    volScalarField& rW = trW();
+    volScalarField& rW = trW.ref();
 
     forAll(Y, i)
     {
diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
index 7d51293208..5f963582dc 100644
--- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
@@ -229,7 +229,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::heu
 ) const
 {
     tmp<scalarField> theu(new scalarField(Tu.size()));
-    scalarField& heu = theu();
+    scalarField& heu = theu.ref();
 
     forAll(Tu, celli)
     {
@@ -250,7 +250,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::heu
 ) const
 {
     tmp<scalarField> theu(new scalarField(Tu.size()));
-    scalarField& heu = theu();
+    scalarField& heu = theu.ref();
 
     forAll(Tu, facei)
     {
@@ -283,7 +283,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::Tb() const
         )
     );
 
-    volScalarField& Tb_ = tTb();
+    volScalarField& Tb_ = tTb.ref();
     scalarField& TbCells = Tb_.internalField();
     const scalarField& pCells = this->p_.internalField();
     const scalarField& TCells = this->T_.internalField();
@@ -341,7 +341,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psiu() const
         )
     );
 
-    volScalarField& psiu = tpsiu();
+    volScalarField& psiu = tpsiu.ref();
     scalarField& psiuCells = psiu.internalField();
     const scalarField& TuCells = this->Tu_.internalField();
     const scalarField& pCells = this->p_.internalField();
@@ -393,7 +393,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psib() const
         )
     );
 
-    volScalarField& psib = tpsib();
+    volScalarField& psib = tpsib.ref();
     scalarField& psibCells = psib.internalField();
     const volScalarField Tb_(Tb());
     const scalarField& TbCells = Tb_.internalField();
@@ -446,7 +446,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::muu() const
         )
     );
 
-    volScalarField& muu_ = tmuu();
+    volScalarField& muu_ = tmuu.ref();
     scalarField& muuCells = muu_.internalField();
     const scalarField& pCells = this->p_.internalField();
     const scalarField& TuCells = this->Tu_.internalField();
@@ -502,7 +502,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::mub() const
         )
     );
 
-    volScalarField& mub_ = tmub();
+    volScalarField& mub_ = tmub.ref();
     scalarField& mubCells = mub_.internalField();
     const volScalarField Tb_(Tb());
     const scalarField& pCells = this->p_.internalField();
diff --git a/src/thermophysicalModels/solidChemistryModel/Make/options b/src/thermophysicalModels/solidChemistryModel/Make/options
index e871169b17..e922aa724f 100644
--- a/src/thermophysicalModels/solidChemistryModel/Make/options
+++ b/src/thermophysicalModels/solidChemistryModel/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index efa78b4e14..dee571fe18 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -637,7 +637,7 @@ Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::gasHs
         )
     );
 
-    volScalarField::InternalField& gasHs = tHs().internalField();
+    volScalarField::InternalField& gasHs = tHs.ref().internalField();
 
     const GasThermo& mixture = gasThermo_[index];
 
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H
index d045a3f894..b14770004d 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H
@@ -98,12 +98,15 @@ RRg() const
 
     if (this->chemistry_)
     {
-        DimensionedField<scalar, volMesh>& RRg = tRRg();
+        DimensionedField<scalar, volMesh>& RRg = tRRg.ref();
         for (label i=0; i < nGases_; i++)
         {
             RRg += RRg_[i];
         }
     }
+
     return tRRg;
 }
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
index 07cc0c3ae3..8bf5ea9320 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
@@ -136,7 +136,7 @@ Foam::solidChemistryModel<CompType, SolidThermo>::Sh() const
 
     if (this->chemistry_)
     {
-        scalarField& Sh = tSh();
+        scalarField& Sh = tSh.ref();
 
         forAll(Ys_, i)
         {
@@ -176,7 +176,7 @@ Foam::solidChemistryModel<CompType, SolidThermo>::dQ() const
 
     if (this->chemistry_)
     {
-        volScalarField& dQ = tdQ();
+        volScalarField& dQ = tdQ.ref();
         dQ.dimensionedInternalField() = this->mesh_.V()*Sh()();
     }
 
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
index 6223a85086..43a343b5f8 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
@@ -85,7 +85,7 @@ Foam::solidChemistryModel<CompType, SolidThermo>::RRs() const
 
     if (this->chemistry_)
     {
-        DimensionedField<scalar, volMesh>& RRs = tRRs();
+        DimensionedField<scalar, volMesh>& RRs = tRRs.ref();
         for (label i=0; i < nSolids_; i++)
         {
             RRs += RRs_[i];
diff --git a/src/thermophysicalModels/solidSpecie/Make/options b/src/thermophysicalModels/solidSpecie/Make/options
index bdc8b074c0..85a93d1d17 100644
--- a/src/thermophysicalModels/solidSpecie/Make/options
+++ b/src/thermophysicalModels/solidSpecie/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
 
 LIB_LIBS = \
diff --git a/src/thermophysicalModels/solidThermo/Make/options b/src/thermophysicalModels/solidThermo/Make/options
index d3e1cb87ce..c84b6c5546 100644
--- a/src/thermophysicalModels/solidThermo/Make/options
+++ b/src/thermophysicalModels/solidThermo/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
index 75de2bc003..7928d9bdff 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
@@ -203,7 +203,7 @@ Foam::heSolidThermo<BasicSolidThermo, MixtureType>::Kappa() const
         )
     );
 
-    volVectorField& Kappa = tKappa();
+    volVectorField& Kappa = tKappa.ref();
     vectorField& KappaCells = Kappa.internalField();
     const scalarField& TCells = this->T_.internalField();
     const scalarField& pCells = this->p_.internalField();
@@ -253,7 +253,7 @@ Foam::heSolidThermo<BasicSolidThermo, MixtureType>::Kappa
     const scalarField& Tp = this->T_.boundaryField()[patchi];
     tmp<vectorField> tKappa(new vectorField(pp.size()));
 
-    vectorField& Kappap = tKappa();
+    vectorField& Kappap = tKappa.ref();
 
     forAll(Tp, facei)
     {
diff --git a/src/topoChangerFvMesh/Make/options b/src/topoChangerFvMesh/Make/options
index 44753e64c9..82165ae6e5 100644
--- a/src/topoChangerFvMesh/Make/options
+++ b/src/topoChangerFvMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index 02d6a6ae87..747a1c0edf 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -59,7 +59,7 @@ Foam::tmp<Foam::scalarField> Foam::movingConeTopoFvMesh::vertexMarkup
         << curLeft << " curRight: " << curRight << endl;
 
     tmp<scalarField> tvertexMarkup(new scalarField(p.size()));
-    scalarField& vertexMarkup = tvertexMarkup();
+    scalarField& vertexMarkup = tvertexMarkup.ref();
 
     forAll(p, pI)
     {
diff --git a/src/transportModels/compressible/Make/options b/src/transportModels/compressible/Make/options
index 71b7873964..287318da1f 100644
--- a/src/transportModels/compressible/Make/options
+++ b/src/transportModels/compressible/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
diff --git a/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options b/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options
index 4ae2fbf966..138dcbf7f5 100644
--- a/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options
+++ b/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I.. \
     -I../incompressible/lnInclude \
     -I../interfaceProperties/lnInclude \
diff --git a/src/transportModels/incompressible/Make/options b/src/transportModels/incompressible/Make/options
index 46aa26d4ad..c55a98a0b6 100644
--- a/src/transportModels/incompressible/Make/options
+++ b/src/transportModels/incompressible/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I.. \
     -I../twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/src/transportModels/interfaceProperties/Make/options b/src/transportModels/interfaceProperties/Make/options
index cc63db7dcc..efbf1b41ca 100644
--- a/src/transportModels/interfaceProperties/Make/options
+++ b/src/transportModels/interfaceProperties/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \
     -I$(LIB_SRC)/finiteVolume/lnInclude
diff --git a/src/transportModels/twoPhaseMixture/Make/options b/src/transportModels/twoPhaseMixture/Make/options
index 71b7873964..287318da1f 100644
--- a/src/transportModels/twoPhaseMixture/Make/options
+++ b/src/transportModels/twoPhaseMixture/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
diff --git a/src/transportModels/twoPhaseProperties/Make/options b/src/transportModels/twoPhaseProperties/Make/options
index 32ce36b959..547d45694c 100644
--- a/src/transportModels/twoPhaseProperties/Make/options
+++ b/src/transportModels/twoPhaseProperties/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
diff --git a/src/triSurface/Make/options b/src/triSurface/Make/options
index 9ee5884e59..948c54f756 100644
--- a/src/triSurface/Make/options
+++ b/src/triSurface/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -DCONST_TMP \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude
 
diff --git a/src/triSurface/faceTriangulation/faceTriangulation.C b/src/triSurface/faceTriangulation/faceTriangulation.C
index ddf905f06b..6b44c53065 100644
--- a/src/triSurface/faceTriangulation/faceTriangulation.C
+++ b/src/triSurface/faceTriangulation/faceTriangulation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ Foam::tmp<Foam::vectorField> Foam::faceTriangulation::calcEdges
 )
 {
     tmp<vectorField> tedges(new vectorField(f.size()));
-    vectorField& edges = tedges();
+    vectorField& edges = tedges.ref();
 
     forAll(f, i)
     {

From cd852be3da95f867689570ee8b04ff48a50659c7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 26 Feb 2016 17:31:28 +0000
Subject: [PATCH 227/447] OpenFOAM: Updated all libraries, solvers and
 utilities to use the new const-safe tmp

The deprecated non-const tmp functionality is now on the compiler switch
NON_CONST_TMP which can be enabled by adding -DNON_CONST_TMP to EXE_INC
in the Make/options file.  However, it is recommended to upgrade all
code to the new safer tmp by using the '.ref()' member function rather
than the non-const '()' dereference operator when non-const access to
the temporary object is required.

Please report any problems on Mantis.

Henry G. Weller
CFD Direct.
---
 .../XiGModels/basicXiSubG/basicXiSubG.C       |  2 +-
 .../PDRModels/dragModels/basic/basic.C        |  4 +-
 .../turbulence/PDRkEpsilon/PDRkEpsilon.C      |  6 +--
 .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C |  4 +-
 .../XiModels/XiEqModels/XiEqModel/XiEqModel.C |  2 +-
 .../SCOPE/SCOPELaminarFlameSpeed.C            |  8 +--
 .../solvers/combustion/reactingFoam/UEqn.H    |  9 ++--
 .../solvers/combustion/reactingFoam/pEqn.H    |  6 +--
 .../solvers/combustion/reactingFoam/pcEqn.H   |  8 +--
 .../reactingFoam/rhoReactingFoam/pEqn.H       |  4 +-
 .../combustion/reactingFoam/setRDeltaT.H      |  4 +-
 .../rhoCentralFoam/directionInterpolate.H     |  2 +-
 .../compressible/rhoCentralFoam/setRDeltaT.H  |  2 +-
 .../solvers/compressible/rhoPimpleFoam/UEqn.H |  9 ++--
 .../solvers/compressible/rhoPimpleFoam/pEqn.H |  6 +--
 .../compressible/rhoPimpleFoam/pcEqn.H        |  8 +--
 .../rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H     |  6 +--
 .../compressible/rhoPimpleFoam/setRDeltaT.H   |  2 +-
 .../solvers/compressible/rhoSimpleFoam/UEqn.H |  9 ++--
 .../solvers/compressible/rhoSimpleFoam/pEqn.H |  6 +--
 .../compressible/rhoSimpleFoam/pcEqn.H        |  8 +--
 .../rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H  | 25 ++++-----
 .../rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H  | 16 +++---
 .../buoyantBoussinesqSimpleFoam/UEqn.H        |  9 ++--
 .../buoyantBoussinesqSimpleFoam/pEqn.H        |  6 +--
 .../heatTransfer/buoyantSimpleFoam/UEqn.H     |  9 ++--
 .../heatTransfer/buoyantSimpleFoam/pEqn.H     |  6 +--
 .../chtMultiRegionSimpleFoam/fluid/UEqn.H     |  9 ++--
 .../chtMultiRegionSimpleFoam/fluid/pEqn.H     |  6 +--
 .../chtMultiRegionFoam/fluid/UEqn.H           |  9 ++--
 .../chtMultiRegionFoam/fluid/pEqn.H           |  4 +-
 .../chtMultiRegionFoam/solid/solveSolid.H     |  8 +--
 .../adjointShapeOptimizationFoam.C            | 30 ++++++-----
 .../pimpleFoam/SRFPimpleFoam/UrelEqn.H        |  9 ++--
 .../pimpleFoam/SRFPimpleFoam/pEqn.H           |  8 +--
 .../solvers/incompressible/pimpleFoam/UEqn.H  |  9 ++--
 .../solvers/incompressible/pimpleFoam/pEqn.H  |  8 +--
 .../pimpleFoam/pimpleDyMFoam/pEqn.H           |  8 +--
 .../simpleFoam/SRFSimpleFoam/UrelEqn.H        |  9 ++--
 .../simpleFoam/SRFSimpleFoam/pEqn.H           |  8 +--
 .../solvers/incompressible/simpleFoam/UEqn.H  |  9 ++--
 .../solvers/incompressible/simpleFoam/pEqn.H  |  8 +--
 .../simpleFoam/porousSimpleFoam/UEqn.H        | 25 ++++-----
 .../simpleFoam/porousSimpleFoam/pEqn.H        | 16 +++---
 .../DPMFoam/DPMTurbulenceModels/Make/options  |  2 +-
 .../lagrangian/coalChemistryFoam/setRDeltaT.H |  4 +-
 .../reactingParcelFoam/setRDeltaT.H           |  4 +-
 .../simpleReactingParcelFoam/UEqn.H           |  9 ++--
 .../simpleReactingParcelFoam/pEqn.H           |  6 +--
 .../solvers/lagrangian/sprayFoam/UEqn.H       |  9 ++--
 .../solvers/lagrangian/sprayFoam/pEqn.H       |  6 +--
 .../lagrangian/sprayFoam/sprayDyMFoam/pEqn.H  |  6 +--
 .../compressibleInterDyMFoam/pEqn.H           |  8 +--
 .../multiphase/compressibleInterFoam/pEqn.H   |  8 +--
 .../multiphaseMixtureThermo.C                 | 54 ++++++++++---------
 .../compressibleMultiphaseInterFoam/pEqn.H    |  2 +-
 .../multiphase/driftFluxFoam/alphaEqn.H       |  4 +-
 .../solvers/multiphase/interFoam/alphaEqn.H   |  7 +--
 .../solvers/multiphase/interFoam/setRDeltaT.H |  2 +-
 .../interPhaseChangeFoam/alphaEqn.H           | 10 ++--
 .../multiphaseSystem/multiphaseSystem.C       | 30 ++++++-----
 .../multiphaseMixture/multiphaseMixture.C     | 21 +++++---
 .../potentialFreeSurfaceFoam/UEqn.H           |  9 ++--
 .../potentialFreeSurfaceFoam/pEqn.H           |  6 +--
 .../potentialFreeSurfaceDyMFoam/pEqn.H        |  6 +--
 .../InterfaceCompositionModel.C               |  6 +--
 .../saturationModels/polynomial/polynomial.C  |  4 +-
 .../wallLubricationModel.C                    |  2 +-
 .../BlendedInterfacialModel.C                 | 48 ++++++++---------
 .../HeatAndMassTransferPhaseSystem.C          |  2 +-
 .../AnisothermalPhaseModel.C                  |  6 +--
 .../phaseSystems/phaseSystem/phaseSystem.C    |  8 +--
 .../reactingMultiphaseEulerFoam/EEqns.H       |  2 +-
 .../Make/options                              |  2 +-
 .../multiphaseSystem/multiphaseSystem.C       |  6 +--
 .../reactingMultiphaseEulerFoam/pU/pEqn.H     |  2 +-
 .../reactingMultiphaseEulerFoam/setRDeltaT.H  |  2 +-
 .../reactingTwoPhaseEulerFoam/EEqns.H         |  4 +-
 .../reactingTwoPhaseEulerFoam/pU/pEqn.H       | 12 ++---
 .../reactingTwoPhaseEulerFoam/pUf/pEqn.H      | 12 ++---
 .../reactingTwoPhaseEulerFoam/setRDeltaT.H    |  2 +-
 .../Make/options                              |  2 +-
 ...allBoilingWallFunctionFvPatchScalarField.C |  4 +-
 .../twoPhaseSystem/twoPhaseSystem.C           |  4 +-
 .../multiphase/twoPhaseEulerFoam/pU/pEqn.H    |  8 +--
 .../multiphase/twoPhaseEulerFoam/pUf/pEqn.H   |  8 +--
 .../Make/options                              |  2 +-
 .../BlendedInterfacialModel.C                 | 40 +++++++-------
 .../extrudeToRegionMesh/extrudeToRegionMesh.C |  2 +-
 .../DelaunayMeshToolsTemplates.C              |  4 +-
 .../cellShapeControlMesh.C                    |  4 +-
 .../smoothAlignmentSolver.C                   |  4 +-
 .../automatic/automatic.C                     |  4 +-
 .../fieldFromFile/fieldFromFile.C             |  4 +-
 .../searchableBoxFeatures.C                   |  4 +-
 .../manipulation/renumberMesh/renumberMesh.C  |  4 +-
 .../splitMeshRegions/splitMeshRegions.C       |  4 +-
 .../foamToEnsight/ensightField.C              |  6 +--
 .../foamToVTK/surfaceMeshWriterTemplates.C    |  2 +-
 .../dataConversion/foamToVTK/vtkMesh.H        |  4 +-
 .../applyBoundaryLayer/applyBoundaryLayer.C   |  8 +--
 .../surfaceLambdaMuSmooth.C                   |  4 +-
 src/OpenFOAM/Make/options                     |  2 +-
 .../DimensionedFieldFunctions.C               | 20 +++----
 src/OpenFOAM/memory/tmp/tmp.H                 |  2 +-
 src/OpenFOAM/memory/tmp/tmpI.H                |  2 +-
 .../compressible/Make/options                 |  2 +-
 .../incompressible/Make/options               |  2 +-
 .../turbulenceModels/Make/options             |  2 +-
 src/combustionModels/Make/options             |  2 +-
 src/conversion/Make/options                   |  2 +-
 src/dynamicFvMesh/Make/options                |  2 +-
 src/dynamicMesh/Make/options                  |  2 +-
 src/engine/Make/options                       |  2 +-
 src/finiteVolume/Make/options                 |  2 +-
 src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C  |  6 +--
 .../fvMatrices/fvMatrix/fvMatrix.C            |  2 +-
 .../fvMeshSubset/fvMeshSubsetInterpolate.C    |  2 +-
 .../singleCellFvMeshInterpolate.C             |  2 +-
 .../pairPatchAgglomeration/Make/options       |  2 +-
 src/fvMotionSolver/Make/options               |  2 +-
 src/fvOptions/Make/options                    |  2 +-
 src/genericPatchFields/Make/options           |  2 +-
 src/lagrangian/DSMC/Make/options              |  2 +-
 src/lagrangian/basic/Make/options             |  2 +-
 src/lagrangian/coalCombustion/Make/options    |  2 +-
 .../distributionModels/Make/options           |  2 +-
 src/lagrangian/intermediate/Make/options      |  2 +-
 .../molecularDynamics/molecule/Make/options   |  2 +-
 src/lagrangian/solidParticle/Make/options     |  2 +-
 src/lagrangian/spray/Make/options             |  2 +-
 src/lagrangian/turbulence/Make/options        |  2 +-
 src/mesh/autoMesh/Make/options                |  2 +-
 src/mesh/blockMesh/Make/options               |  2 +-
 src/mesh/extrudeModel/Make/options            |  2 +-
 src/meshTools/Make/options                    |  2 +-
 .../fvFieldDecomposerDecomposeFields.C        |  4 +-
 .../reconstruct/reconstructLagrangianFields.C |  4 +-
 .../functionObjects/field/Make/options        |  2 +-
 .../functionObjects/utilities/Make/options    |  2 +-
 src/randomProcesses/Make/options              |  2 +-
 src/regionCoupled/Make/options                |  2 +-
 src/regionModels/regionModel/Make/options     |  2 +-
 .../surfaceFilmModels/Make/options            |  2 +-
 src/sampling/Make/options                     |  2 +-
 src/sixDoFRigidBodyMotion/Make/options        |  2 +-
 src/surfMesh/Make/options                     |  2 +-
 .../SLGThermo/Make/options                    |  2 +-
 .../Make/options                              |  2 +-
 src/thermophysicalModels/basic/Make/options   |  2 +-
 .../chemistryModel/Make/options               |  2 +-
 .../laminarFlameSpeed/Make/options            |  2 +-
 .../liquidMixtureProperties/Make/options      |  2 +-
 .../properties/liquidProperties/Make/options  |  2 +-
 .../solidMixtureProperties/Make/options       |  2 +-
 .../properties/solidProperties/Make/options   |  2 +-
 .../radiation/Make/options                    |  2 +-
 .../reactionThermo/Make/options               |  2 +-
 .../solidChemistryModel/Make/options          |  2 +-
 .../solidSpecie/Make/options                  |  2 +-
 .../solidThermo/Make/options                  |  2 +-
 src/topoChangerFvMesh/Make/options            |  2 +-
 src/transportModels/compressible/Make/options |  2 +-
 .../Make/options                              |  2 +-
 .../incompressible/Make/options               |  2 +-
 .../interfaceProperties/Make/options          |  2 +-
 .../twoPhaseMixture/Make/options              |  2 +-
 .../twoPhaseProperties/Make/options           |  2 +-
 src/triSurface/Make/options                   |  2 +-
 169 files changed, 511 insertions(+), 477 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
index fe96d0bfe7..45050a171b 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
@@ -70,7 +70,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiGModels::basicSubGrid::G() const
     const volScalarField& Lobs = db.lookupObject<volScalarField>("Lobs");
 
     tmp<volScalarField> tGtot = XiGModel_->G();
-    volScalarField& Gtot = tGtot();
+    volScalarField& Gtot = tGtot.ref();
 
     const scalarField Cw = pow(Su_.mesh().V(), 2.0/3.0);
     scalarField N(Nv.internalField()*Cw);
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
index 7454b2f7ee..0de82a82e4 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
@@ -113,7 +113,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::PDRDragModels::basic::Dcu() const
         )
     );
 
-    volSymmTensorField& DragDcu = tDragDcu();
+    volSymmTensorField& DragDcu = tDragDcu.ref();
 
     if (on_)
     {
@@ -147,7 +147,7 @@ Foam::tmp<Foam::volScalarField> Foam::PDRDragModels::basic::Gk() const
         )
     );
 
-    volScalarField& Gk = tGk();
+    volScalarField& Gk = tGk.ref();
 
     if (on_)
     {
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index ebc92684a4..afe97f7f7f 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -161,9 +161,9 @@ void PDRkEpsilon::correct()
       - fvm::Sp(C2_*betav*rho_*epsilon_/k_, epsilon_)
     );
 
-    epsEqn().relax();
+    epsEqn.ref().relax();
 
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
 
     solve(epsEqn);
     bound(epsilon_, epsilonMin_);
@@ -182,7 +182,7 @@ void PDRkEpsilon::correct()
       - fvm::Sp(betav*rho_*epsilon_/k_, k_)
     );
 
-    kEqn().relax();
+    kEqn.ref().relax();
     solve(kEqn);
     bound(k_, kMin_);
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
index ad8452f5a4..0208818ee0 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::SCOPEXiEq::XiEq() const
             dimensionedScalar("XiEq", dimless, 0.0)
         )
     );
-    volScalarField& xieq = tXiEq();
+    volScalarField& xieq = tXiEq.ref();
 
     forAll(xieq, celli)
     {
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
index 59f5c81bd3..a84aca3210 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
@@ -113,7 +113,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
             dimensionedScalar("zero", Nv.dimensions(), 0.0)
         )
     );
-    volScalarField& N = tN();
+    volScalarField& N = tN.ref();
     N.internalField() = Nv.internalField()*pow(mesh.V(), 2.0/3.0);
 
     volSymmTensorField ns
diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
index d4d7782287..fd07b0b3cb 100644
--- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
+++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -259,7 +259,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
         )
     );
 
-    volScalarField& Su0 = tSu0();
+    volScalarField& Su0 = tSu0.ref();
 
     forAll(Su0, celli)
     {
@@ -306,7 +306,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
         )
     );
 
-    volScalarField& Su0 = tSu0();
+    volScalarField& Su0 = tSu0.ref();
 
     forAll(Su0, celli)
     {
@@ -358,7 +358,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Ma
         )
     );
 
-    volScalarField& ma = tMa();
+    volScalarField& ma = tMa.ref();
 
     forAll(ma, celli)
     {
diff --git a/applications/solvers/combustion/reactingFoam/UEqn.H b/applications/solvers/combustion/reactingFoam/UEqn.H
index 907c9934e2..e4caa1cea4 100644
--- a/applications/solvers/combustion/reactingFoam/UEqn.H
+++ b/applications/solvers/combustion/reactingFoam/UEqn.H
@@ -2,7 +2,7 @@
 
 MRF.correctBoundaryVelocity(U);
 
-tmp<fvVectorMatrix> UEqn
+tmp<fvVectorMatrix> tUEqn
 (
     fvm::ddt(rho, U) + fvm::div(phi, U)
   + MRF.DDt(rho, U)
@@ -10,14 +10,15 @@ tmp<fvVectorMatrix> UEqn
  ==
     fvOptions(rho, U)
 );
+fvVectorMatrix& UEqn = tUEqn.ref();
 
-UEqn().relax();
+UEqn.relax();
 
-fvOptions.constrain(UEqn());
+fvOptions.constrain(UEqn);
 
 if (pimple.momentumPredictor())
 {
-    solve(UEqn() == -fvc::grad(p));
+    solve(UEqn == -fvc::grad(p));
 
     fvOptions.correct(U);
     K = 0.5*magSqr(U);
diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H
index ae5478c5b6..f5b7141224 100644
--- a/applications/solvers/combustion/reactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pEqn.H
@@ -3,13 +3,13 @@ rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
 rho.relax();
 
-volScalarField rAU(1.0/UEqn().A());
+volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
-    UEqn.clear();
+    tUEqn.clear();
 }
 
 if (pimple.transonic())
diff --git a/applications/solvers/combustion/reactingFoam/pcEqn.H b/applications/solvers/combustion/reactingFoam/pcEqn.H
index 8bef07a5bb..bf8eb899af 100644
--- a/applications/solvers/combustion/reactingFoam/pcEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pcEqn.H
@@ -3,13 +3,13 @@ rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
 rho.relax();
 
-volScalarField rAU(1.0/UEqn().A());
-volScalarField rAtU(1.0/(1.0/rAU - UEqn().H1()));
-volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
+volScalarField rAU(1.0/UEqn.A());
+volScalarField rAtU(1.0/(1.0/rAU - UEqn.H1()));
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
-    UEqn.clear();
+    tUEqn.clear();
 }
 
 if (pimple.transonic())
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
index cd19153462..3d02c63381 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
@@ -5,9 +5,9 @@
     // pressure solution - done in 2 parts. Part 1:
     thermo.rho() -= psi*p;
 
-    volScalarField rAU(1.0/UEqn().A());
+    volScalarField rAU(1.0/UEqn.A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
     if (pimple.transonic())
     {
diff --git a/applications/solvers/combustion/reactingFoam/setRDeltaT.H b/applications/solvers/combustion/reactingFoam/setRDeltaT.H
index b84be5a66d..12bdceb7e5 100644
--- a/applications/solvers/combustion/reactingFoam/setRDeltaT.H
+++ b/applications/solvers/combustion/reactingFoam/setRDeltaT.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 {
-    volScalarField& rDeltaT = trDeltaT();
+    volScalarField& rDeltaT = trDeltaT.ref();
 
     const dictionary& pimpleDict = pimple.dict();
 
diff --git a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H b/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
index 7d361ac9f8..bc94840d1f 100644
--- a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
+++ b/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
@@ -22,7 +22,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
         )
     );
 
-    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsf();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsf.ref();
 
     sf.rename(vf.name() + '_' + dir.name());
 
diff --git a/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H b/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H
index e469bafa34..806ddd3832 100644
--- a/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H
+++ b/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H
@@ -1,5 +1,5 @@
 {
-    volScalarField& rDeltaT = trDeltaT();
+    volScalarField& rDeltaT = trDeltaT.ref();
 
     scalar rDeltaTSmoothingCoeff
     (
diff --git a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
index 907c9934e2..e4caa1cea4 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
@@ -2,7 +2,7 @@
 
 MRF.correctBoundaryVelocity(U);
 
-tmp<fvVectorMatrix> UEqn
+tmp<fvVectorMatrix> tUEqn
 (
     fvm::ddt(rho, U) + fvm::div(phi, U)
   + MRF.DDt(rho, U)
@@ -10,14 +10,15 @@ tmp<fvVectorMatrix> UEqn
  ==
     fvOptions(rho, U)
 );
+fvVectorMatrix& UEqn = tUEqn.ref();
 
-UEqn().relax();
+UEqn.relax();
 
-fvOptions.constrain(UEqn());
+fvOptions.constrain(UEqn);
 
 if (pimple.momentumPredictor())
 {
-    solve(UEqn() == -fvc::grad(p));
+    solve(UEqn == -fvc::grad(p));
 
     fvOptions.correct(U);
     K = 0.5*magSqr(U);
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index ae5478c5b6..f5b7141224 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -3,13 +3,13 @@ rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
 rho.relax();
 
-volScalarField rAU(1.0/UEqn().A());
+volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
-    UEqn.clear();
+    tUEqn.clear();
 }
 
 if (pimple.transonic())
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
index 8bef07a5bb..bf8eb899af 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
@@ -3,13 +3,13 @@ rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
 rho.relax();
 
-volScalarField rAU(1.0/UEqn().A());
-volScalarField rAtU(1.0/(1.0/rAU - UEqn().H1()));
-volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
+volScalarField rAU(1.0/UEqn.A());
+volScalarField rAtU(1.0/(1.0/rAU - UEqn.H1()));
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
-    UEqn.clear();
+    tUEqn.clear();
 }
 
 if (pimple.transonic())
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
index 615682db12..4abc5cd4aa 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
@@ -3,13 +3,13 @@ rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
 rho.relax();
 
-volScalarField rAU(1.0/UEqn().A());
+volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
-    UEqn.clear();
+    tUEqn.clear();
 }
 
 if (pimple.transonic())
diff --git a/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H b/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H
index 30a3908b05..ba2db0d04a 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H
@@ -1,5 +1,5 @@
 {
-    volScalarField& rDeltaT = trDeltaT();
+    volScalarField& rDeltaT = trDeltaT.ref();
 
     const dictionary& pimpleDict = pimple.dict();
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
index 396b923494..a6f410250b 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
@@ -2,7 +2,7 @@
 
     MRF.correctBoundaryVelocity(U);
 
-    tmp<fvVectorMatrix> UEqn
+    tmp<fvVectorMatrix> tUEqn
     (
         fvm::div(phi, U)
       + MRF.DDt(rho, U)
@@ -10,11 +10,12 @@
      ==
         fvOptions(rho, U)
     );
+    fvVectorMatrix& UEqn = tUEqn.ref();
 
-    UEqn().relax();
+    UEqn.relax();
 
-    fvOptions.constrain(UEqn());
+    fvOptions.constrain(UEqn);
 
-    solve(UEqn() == -fvc::grad(p));
+    solve(UEqn == -fvc::grad(p));
 
     fvOptions.correct(U);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index 4c6276711c..b085a2b9d1 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -1,8 +1,8 @@
 {
-    volScalarField rAU(1.0/UEqn().A());
+    volScalarField rAU(1.0/UEqn.A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
-    UEqn.clear();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
+    tUEqn.clear();
 
     bool closedVolume = false;
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
index 7b77048a99..51b3865165 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
@@ -1,7 +1,7 @@
-volScalarField rAU(1.0/UEqn().A());
-volScalarField rAtU(1.0/(1.0/rAU - UEqn().H1()));
-volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
-UEqn.clear();
+volScalarField rAU(1.0/UEqn.A());
+volScalarField rAtU(1.0/(1.0/rAU - UEqn.H1()));
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
+tUEqn.clear();
 
 bool closedVolume = false;
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H
index fcb8f713d6..3ec153c567 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H
@@ -2,7 +2,7 @@
 
     MRF.correctBoundaryVelocity(U);
 
-    tmp<fvVectorMatrix> UEqn
+    tmp<fvVectorMatrix> tUEqn
     (
         fvm::div(phi, U)
       + MRF.DDt(rho, U)
@@ -10,8 +10,9 @@
      ==
         fvOptions(rho, U)
     );
+    fvVectorMatrix& UEqn = tUEqn.ref();
 
-    UEqn().relax();
+    UEqn.relax();
 
     // Include the porous media resistance and solve the momentum equation
     // either implicit in the tensorial resistance or transport using by
@@ -22,18 +23,18 @@
 
     if (pressureImplicitPorosity)
     {
-        tmp<volTensorField> tTU = tensor(I)*UEqn().A();
-        pZones.addResistance(UEqn(), tTU());
+        tmp<volTensorField> tTU = tensor(I)*UEqn.A();
+        pZones.addResistance(UEqn, tTU.ref());
         trTU = inv(tTU());
-        trTU().rename("rAU");
+        trTU.ref().rename("rAU");
 
-        fvOptions.constrain(UEqn());
+        fvOptions.constrain(UEqn);
 
         volVectorField gradp(fvc::grad(p));
 
         for (int UCorr=0; UCorr<nUCorr; UCorr++)
         {
-            U = trTU() & (UEqn().H() - gradp);
+            U = trTU() & (UEqn.H() - gradp);
         }
         U.correctBoundaryConditions();
 
@@ -41,14 +42,14 @@
     }
     else
     {
-        pZones.addResistance(UEqn());
+        pZones.addResistance(UEqn);
 
-        fvOptions.constrain(UEqn());
+        fvOptions.constrain(UEqn);
 
-        solve(UEqn() == -fvc::grad(p));
+        solve(UEqn == -fvc::grad(p));
 
         fvOptions.correct(U);
 
-        trAU = 1.0/UEqn().A();
-        trAU().rename("rAU");
+        trAU = 1.0/UEqn.A();
+        trAU.ref().rename("rAU");
     }
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
index d54f7eec24..b586cd15c0 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
@@ -4,15 +4,15 @@
     tmp<volVectorField> tHbyA;
     if (pressureImplicitPorosity)
     {
-        tHbyA = constrainHbyA(trTU()&UEqn().H(), U, p);
+        tHbyA = constrainHbyA(trTU()&UEqn.H(), U, p);
     }
     else
     {
-        tHbyA = constrainHbyA(trAU()*UEqn().H(), U, p);
+        tHbyA = constrainHbyA(trAU()*UEqn.H(), U, p);
     }
-    volVectorField& HbyA = tHbyA();
+    volVectorField& HbyA = tHbyA.ref();
 
-    UEqn.clear();
+    tUEqn.clear();
 
     bool closedVolume = false;
 
@@ -51,13 +51,15 @@
             );
         }
 
-        tpEqn().setReference(pRefCell, pRefValue);
+        fvScalarMatrix& pEqn = tpEqn.ref();
 
-        tpEqn().solve();
+        pEqn.setReference(pRefCell, pRefValue);
+
+        pEqn.solve();
 
         if (simple.finalNonOrthogonalIter())
         {
-            phi = phiHbyA - tpEqn().flux();
+            phi = phiHbyA - pEqn.flux();
         }
     }
 
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H
index 72bf78c7fb..d8a347f87d 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H
@@ -2,7 +2,7 @@
 
     MRF.correctBoundaryVelocity(U);
 
-    tmp<fvVectorMatrix> UEqn
+    tmp<fvVectorMatrix> tUEqn
     (
         fvm::div(phi, U)
       + MRF.DDt(U)
@@ -10,16 +10,17 @@
      ==
         fvOptions(U)
     );
+    fvVectorMatrix& UEqn = tUEqn.ref();
 
-    UEqn().relax();
+    UEqn.relax();
 
-    fvOptions.constrain(UEqn());
+    fvOptions.constrain(UEqn);
 
     if (simple.momentumPredictor())
     {
         solve
         (
-            UEqn()
+            UEqn
           ==
             fvc::reconstruct
             (
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
index 13200035d8..7df0ac46d2 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
@@ -1,9 +1,9 @@
 {
-    volScalarField rAU("rAU", 1.0/UEqn().A());
+    volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_rgh));
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
 
-    UEqn.clear();
+    tUEqn.clear();
 
     surfaceScalarField phig(-rAUf*ghf*fvc::snGrad(rhok)*mesh.magSf());
 
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H
index 04796b4754..1a47d06a8e 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H
@@ -2,7 +2,7 @@
 
     MRF.correctBoundaryVelocity(U);
 
-    tmp<fvVectorMatrix> UEqn
+    tmp<fvVectorMatrix> tUEqn
     (
         fvm::div(phi, U)
       + MRF.DDt(rho, U)
@@ -10,16 +10,17 @@
      ==
         fvOptions(rho, U)
     );
+    fvVectorMatrix& UEqn = tUEqn.ref();
 
-    UEqn().relax();
+    UEqn.relax();
 
-    fvOptions.constrain(UEqn());
+    fvOptions.constrain(UEqn);
 
     if (simple.momentumPredictor())
     {
         solve
         (
-            UEqn()
+            UEqn
          ==
             fvc::reconstruct
             (
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index 132e440bcd..a744b9d19f 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -2,10 +2,10 @@
     rho = thermo.rho();
     rho.relax();
 
-    volScalarField rAU("rAU", 1.0/UEqn().A());
+    volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_rgh));
-    UEqn.clear();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
+    tUEqn.clear();
 
     surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
index b65ef6bfdb..ed0402c2d0 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
@@ -2,7 +2,7 @@
 
     MRF.correctBoundaryVelocity(U);
 
-    tmp<fvVectorMatrix> UEqn
+    tmp<fvVectorMatrix> tUEqn
     (
         fvm::div(phi, U)
       + MRF.DDt(rho, U)
@@ -10,14 +10,15 @@
      ==
         fvOptions(rho, U)
     );
+    fvVectorMatrix& UEqn = tUEqn.ref();
 
-    UEqn().relax();
+    UEqn.relax();
 
-    fvOptions.constrain(UEqn());
+    fvOptions.constrain(UEqn);
 
     solve
     (
-        UEqn()
+        UEqn
      ==
         fvc::reconstruct
         (
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
index 341de6b13e..3fdadc042a 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
@@ -4,10 +4,10 @@
     rho = min(rho, rhoMax[i]);
     rho.relax();
 
-    volScalarField rAU("rAU", 1.0/UEqn().A());
+    volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_rgh));
-    UEqn.clear();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
+    tUEqn.clear();
 
     surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
index 563ad65eba..a12d0e8146 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
@@ -2,7 +2,7 @@
 
     MRF.correctBoundaryVelocity(U);
 
-    tmp<fvVectorMatrix> UEqn
+    tmp<fvVectorMatrix> tUEqn
     (
         fvm::ddt(rho, U) + fvm::div(phi, U)
       + MRF.DDt(rho, U)
@@ -10,16 +10,17 @@
      ==
         fvOptions(rho, U)
     );
+    fvVectorMatrix& UEqn = tUEqn.ref();
 
-    UEqn().relax();
+    UEqn.relax();
 
-    fvOptions.constrain(UEqn());
+    fvOptions.constrain(UEqn);
 
     if (momentumPredictor)
     {
         solve
         (
-            UEqn()
+            UEqn
           ==
             fvc::reconstruct
             (
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
index 0b82c44068..358535efe9 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
@@ -5,9 +5,9 @@
 
     rho = thermo.rho();
 
-    volScalarField rAU("rAU", 1.0/UEqn().A());
+    volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_rgh));
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
 
     surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
index 49fd39e45b..30a670768f 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
@@ -6,7 +6,7 @@ if (finalIter)
 {
     for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
-        tmp<fvScalarMatrix> hEqn
+        fvScalarMatrix hEqn
         (
             fvm::ddt(betav*rho, h)
           - (
@@ -18,11 +18,11 @@ if (finalIter)
             fvOptions(rho, h)
         );
 
-        hEqn().relax();
+        hEqn.relax();
 
-        fvOptions.constrain(hEqn());
+        fvOptions.constrain(hEqn);
 
-        hEqn().solve(mesh.solver(h.select(finalIter)));
+        hEqn.solve(mesh.solver(h.select(finalIter)));
 
         fvOptions.correct(h);
     }
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index fbd8e5f150..cdc1616e2b 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
         {
             // Momentum predictor
 
-            tmp<fvVectorMatrix> UEqn
+            tmp<fvVectorMatrix> tUEqn
             (
                 fvm::div(phi, U)
               + turbulence->divDevReff(U)
@@ -115,18 +115,19 @@ int main(int argc, char *argv[])
              ==
                 fvOptions(U)
             );
+            fvVectorMatrix& UEqn = tUEqn.ref();
 
-            UEqn().relax();
+            UEqn.relax();
 
-            fvOptions.constrain(UEqn());
+            fvOptions.constrain(UEqn);
 
-            solve(UEqn() == -fvc::grad(p));
+            solve(UEqn == -fvc::grad(p));
 
             fvOptions.correct(U);
 
-            volScalarField rAU(1.0/UEqn().A());
-            volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
-            UEqn.clear();
+            volScalarField rAU(1.0/UEqn.A());
+            volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
+            tUEqn.clear();
             surfaceScalarField phiHbyA
             (
                 "phiHbyA",
@@ -180,7 +181,7 @@ int main(int argc, char *argv[])
 
             zeroCells(adjointTransposeConvection, inletCells);
 
-            tmp<fvVectorMatrix> UaEqn
+            tmp<fvVectorMatrix> tUaEqn
             (
                 fvm::div(-phi, Ua)
               - adjointTransposeConvection
@@ -189,19 +190,20 @@ int main(int argc, char *argv[])
              ==
                 fvOptions(Ua)
             );
+            fvVectorMatrix& UaEqn = tUaEqn.ref();
 
-            UaEqn().relax();
+            UaEqn.relax();
 
-            fvOptions.constrain(UaEqn());
+            fvOptions.constrain(UaEqn);
 
-            solve(UaEqn() == -fvc::grad(pa));
+            solve(UaEqn == -fvc::grad(pa));
 
             fvOptions.correct(Ua);
 
-            volScalarField rAUa(1.0/UaEqn().A());
+            volScalarField rAUa(1.0/UaEqn.A());
             volVectorField HbyAa("HbyAa", Ua);
-            HbyAa = rAUa*UaEqn().H();
-            UaEqn.clear();
+            HbyAa = rAUa*UaEqn.H();
+            tUaEqn.clear();
             surfaceScalarField phiHbyAa
             (
                 "phiHbyAa",
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H
index 5aa6cef0b1..0d55edd5a0 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H
@@ -1,5 +1,5 @@
     // Relative momentum predictor
-    tmp<fvVectorMatrix> UrelEqn
+    tmp<fvVectorMatrix> tUrelEqn
     (
         fvm::ddt(Urel)
       + fvm::div(phi, Urel)
@@ -8,11 +8,12 @@
      ==
         fvOptions(Urel)
     );
+    fvVectorMatrix& UrelEqn = tUrelEqn.ref();
 
-    UrelEqn().relax();
+    UrelEqn.relax();
 
-    fvOptions.constrain(UrelEqn());
+    fvOptions.constrain(UrelEqn);
 
-    solve(UrelEqn() == -fvc::grad(p));
+    solve(UrelEqn == -fvc::grad(p));
 
     fvOptions.correct(Urel);
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
index 0e3936bc5d..aaeb12ae06 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
@@ -1,6 +1,6 @@
-volScalarField rAUrel(1.0/UrelEqn().A());
+volScalarField rAUrel(1.0/UrelEqn.A());
 volVectorField HbyA("HbyA", Urel);
-HbyA = rAUrel*UrelEqn().H();
+HbyA = rAUrel*UrelEqn.H();
 
 surfaceScalarField phiHbyA
 (
@@ -15,7 +15,7 @@ tmp<volScalarField> rAtUrel(rAUrel);
 
 if (pimple.consistent())
 {
-    rAtUrel = 1.0/max(1.0/rAUrel - UrelEqn().H1(), 0.1/rAUrel);
+    rAtUrel = 1.0/max(1.0/rAUrel - UrelEqn.H1(), 0.1/rAUrel);
     phiHbyA +=
         fvc::interpolate(rAtUrel() - rAUrel)*fvc::snGrad(p)*mesh.magSf();
     HbyA -= (rAUrel - rAtUrel())*fvc::grad(p);
@@ -23,7 +23,7 @@ if (pimple.consistent())
 
 if (pimple.nCorrPISO() <= 1)
 {
-    UrelEqn.clear();
+    tUrelEqn.clear();
 }
 
 // Update the pressure BCs to ensure flux consistency
diff --git a/applications/solvers/incompressible/pimpleFoam/UEqn.H b/applications/solvers/incompressible/pimpleFoam/UEqn.H
index 880c0066e3..1a6b404885 100644
--- a/applications/solvers/incompressible/pimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/UEqn.H
@@ -2,7 +2,7 @@
 
 MRF.correctBoundaryVelocity(U);
 
-tmp<fvVectorMatrix> UEqn
+tmp<fvVectorMatrix> tUEqn
 (
     fvm::ddt(U) + fvm::div(phi, U)
   + MRF.DDt(U)
@@ -10,14 +10,15 @@ tmp<fvVectorMatrix> UEqn
  ==
     fvOptions(U)
 );
+fvVectorMatrix& UEqn = tUEqn.ref();
 
-UEqn().relax();
+UEqn.relax();
 
-fvOptions.constrain(UEqn());
+fvOptions.constrain(UEqn);
 
 if (pimple.momentumPredictor())
 {
-    solve(UEqn() == -fvc::grad(p));
+    solve(UEqn == -fvc::grad(p));
 
     fvOptions.correct(U);
 }
diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H
index 6d4eb90334..ffce137326 100644
--- a/applications/solvers/incompressible/pimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H
@@ -1,5 +1,5 @@
-volScalarField rAU(1.0/UEqn().A());
-volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
+volScalarField rAU(1.0/UEqn.A());
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 surfaceScalarField phiHbyA
 (
     "phiHbyA",
@@ -15,7 +15,7 @@ tmp<volScalarField> rAtU(rAU);
 
 if (pimple.consistent())
 {
-    rAtU = 1.0/max(1.0/rAU - UEqn().H1(), 0.1/rAU);
+    rAtU = 1.0/max(1.0/rAU - UEqn.H1(), 0.1/rAU);
     phiHbyA +=
         fvc::interpolate(rAtU() - rAU)*fvc::snGrad(p)*mesh.magSf();
     HbyA -= (rAU - rAtU())*fvc::grad(p);
@@ -23,7 +23,7 @@ if (pimple.consistent())
 
 if (pimple.nCorrPISO() <= 1)
 {
-    UEqn.clear();
+    tUEqn.clear();
 }
 
 // Update the pressure BCs to ensure flux consistency
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
index f4106997c6..452f13fb1f 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
@@ -1,5 +1,5 @@
-volScalarField rAU(1.0/UEqn().A());
-volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
+volScalarField rAU(1.0/UEqn.A());
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 surfaceScalarField phiHbyA
 (
     "phiHbyA",
@@ -20,7 +20,7 @@ tmp<volScalarField> rAtU(rAU);
 
 if (pimple.consistent())
 {
-    rAtU = 1.0/max(1.0/rAU - UEqn().H1(), 0.1/rAU);
+    rAtU = 1.0/max(1.0/rAU - UEqn.H1(), 0.1/rAU);
     phiHbyA +=
         fvc::interpolate(rAtU() - rAU)*fvc::snGrad(p)*mesh.magSf();
     HbyA -= (rAU - rAtU())*fvc::grad(p);
@@ -28,7 +28,7 @@ if (pimple.consistent())
 
 if (pimple.nCorrPISO() <= 1)
 {
-    UEqn.clear();
+    tUEqn.clear();
 }
 
 // Update the pressure BCs to ensure flux consistency
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H
index 75df41d00b..6a2070eb4e 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H
@@ -1,6 +1,6 @@
     // Relative momentum predictor
 
-    tmp<fvVectorMatrix> UrelEqn
+    tmp<fvVectorMatrix> tUrelEqn
     (
         fvm::div(phi, Urel)
       + turbulence->divDevReff(Urel)
@@ -8,11 +8,12 @@
      ==
         fvOptions(Urel)
     );
+    fvVectorMatrix& UrelEqn = tUrelEqn.ref();
 
-    UrelEqn().relax();
+    UrelEqn.relax();
 
-    fvOptions.constrain(UrelEqn());
+    fvOptions.constrain(UrelEqn);
 
-    solve(UrelEqn() == -fvc::grad(p));
+    solve(UrelEqn == -fvc::grad(p));
 
     fvOptions.correct(Urel);
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H
index 636a4c571d..9982ddf546 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H
@@ -1,7 +1,7 @@
 {
-    volScalarField rAUrel(1.0/UrelEqn().A());
+    volScalarField rAUrel(1.0/UrelEqn.A());
     volVectorField HbyA("HbyA", Urel);
-    HbyA = rAUrel*UrelEqn().H();
+    HbyA = rAUrel*UrelEqn.H();
 
     surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
     adjustPhi(phiHbyA, Urel, p);
@@ -10,13 +10,13 @@
 
     if (simple.consistent())
     {
-        rAtUrel = 1.0/(1.0/rAUrel - UrelEqn().H1());
+        rAtUrel = 1.0/(1.0/rAUrel - UrelEqn.H1());
         phiHbyA +=
             fvc::interpolate(rAtUrel() - rAUrel)*fvc::snGrad(p)*mesh.magSf();
         HbyA -= (rAUrel - rAtUrel())*fvc::grad(p);
     }
 
-    UrelEqn.clear();
+    tUrelEqn.clear();
 
     // Update the pressure BCs to ensure flux consistency
     constrainPressure(p, Urel, phiHbyA, rAtUrel());
diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H
index 12b5621636..31c081792c 100644
--- a/applications/solvers/incompressible/simpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/UEqn.H
@@ -2,7 +2,7 @@
 
     MRF.correctBoundaryVelocity(U);
 
-    tmp<fvVectorMatrix> UEqn
+    tmp<fvVectorMatrix> tUEqn
     (
         fvm::div(phi, U)
       + MRF.DDt(U)
@@ -10,11 +10,12 @@
      ==
         fvOptions(U)
     );
+    fvVectorMatrix& UEqn = tUEqn.ref();
 
-    UEqn().relax();
+    UEqn.relax();
 
-    fvOptions.constrain(UEqn());
+    fvOptions.constrain(UEqn);
 
-    solve(UEqn() == -fvc::grad(p));
+    solve(UEqn == -fvc::grad(p));
 
     fvOptions.correct(U);
diff --git a/applications/solvers/incompressible/simpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/pEqn.H
index b506bf43cf..5d5dde848c 100644
--- a/applications/solvers/incompressible/simpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/pEqn.H
@@ -1,6 +1,6 @@
 {
-    volScalarField rAU(1.0/UEqn().A());
-    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
+    volScalarField rAU(1.0/UEqn.A());
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
     surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
     MRF.makeRelative(phiHbyA);
     adjustPhi(phiHbyA, U, p);
@@ -9,13 +9,13 @@
 
     if (simple.consistent())
     {
-        rAtU = 1.0/(1.0/rAU - UEqn().H1());
+        rAtU = 1.0/(1.0/rAU - UEqn.H1());
         phiHbyA +=
             fvc::interpolate(rAtU() - rAU)*fvc::snGrad(p)*mesh.magSf();
         HbyA -= (rAU - rAtU())*fvc::grad(p);
     }
 
-    UEqn.clear();
+    tUEqn.clear();
 
     // Update the pressure BCs to ensure flux consistency
     constrainPressure(p, U, phiHbyA, rAtU(), MRF);
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H
index 035b83ebd1..e2c9917d5a 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H
@@ -2,7 +2,7 @@
 
     MRF.correctBoundaryVelocity(U);
 
-    tmp<fvVectorMatrix> UEqn
+    tmp<fvVectorMatrix> tUEqn
     (
         fvm::div(phi, U)
       + MRF.DDt(U)
@@ -10,8 +10,9 @@
       ==
         fvOptions(U)
     );
+    fvVectorMatrix& UEqn = tUEqn.ref();
 
-    UEqn().relax();
+    UEqn.relax();
 
     // Include the porous media resistance and solve the momentum equation
     // either implicit in the tensorial resistance or transport using by
@@ -22,18 +23,18 @@
 
     if (pressureImplicitPorosity)
     {
-        tmp<volTensorField> tTU = tensor(I)*UEqn().A();
-        pZones.addResistance(UEqn(), tTU());
+        tmp<volTensorField> tTU = tensor(I)*UEqn.A();
+        pZones.addResistance(UEqn, tTU.ref());
         trTU = inv(tTU());
-        trTU().rename("rAU");
+        trTU.ref().rename("rAU");
 
-        fvOptions.constrain(UEqn());
+        fvOptions.constrain(UEqn);
 
         volVectorField gradp(fvc::grad(p));
 
         for (int UCorr=0; UCorr<nUCorr; UCorr++)
         {
-            U = trTU() & (UEqn().H() - gradp);
+            U = trTU() & (UEqn.H() - gradp);
         }
         U.correctBoundaryConditions();
 
@@ -41,14 +42,14 @@
     }
     else
     {
-        pZones.addResistance(UEqn());
+        pZones.addResistance(UEqn);
 
-        fvOptions.constrain(UEqn());
+        fvOptions.constrain(UEqn);
 
-        solve(UEqn() == -fvc::grad(p));
+        solve(UEqn == -fvc::grad(p));
 
         fvOptions.correct(U);
 
-        trAU = 1.0/UEqn().A();
-        trAU().rename("rAU");
+        trAU = 1.0/UEqn.A();
+        trAU.ref().rename("rAU");
     }
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
index e4ad23aabc..68bdcc77e0 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
@@ -1,15 +1,15 @@
 tmp<volVectorField> tHbyA;
 if (pressureImplicitPorosity)
 {
-    tHbyA = constrainHbyA(trTU()&UEqn().H(), U, p);
+    tHbyA = constrainHbyA(trTU()&UEqn.H(), U, p);
 }
 else
 {
-    tHbyA = constrainHbyA(trAU()*UEqn().H(), U, p);
+    tHbyA = constrainHbyA(trAU()*UEqn.H(), U, p);
 }
-volVectorField& HbyA = tHbyA();
+volVectorField& HbyA = tHbyA.ref();
 
-UEqn.clear();
+tUEqn.clear();
 surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
 
 MRF.makeRelative(phiHbyA);
@@ -29,13 +29,15 @@ while (simple.correctNonOrthogonal())
         tpEqn = (fvm::laplacian(trAU(), p) == fvc::div(phiHbyA));
     }
 
-    tpEqn().setReference(pRefCell, pRefValue);
+    fvScalarMatrix pEqn = tpEqn.ref();
 
-    tpEqn().solve();
+    pEqn.setReference(pRefCell, pRefValue);
+
+    pEqn.solve();
 
     if (simple.finalNonOrthogonalIter())
     {
-        phi = phiHbyA - tpEqn().flux();
+        phi = phiHbyA - pEqn.flux();
     }
 }
 
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options
index bd9cbcb613..902afe59e4 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels \
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H
index 1c7d7cb5e2..65b0388e12 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 {
-    volScalarField& rDeltaT = trDeltaT();
+    volScalarField& rDeltaT = trDeltaT.ref();
 
     const dictionary& pimpleDict = pimple.dict();
 
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H
index d599d491f8..f51eeb49bf 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 {
-    volScalarField& rDeltaT = trDeltaT();
+    volScalarField& rDeltaT = trDeltaT.ref();
 
     const dictionary& pimpleDict = pimple.dict();
 
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/UEqn.H
index 2f5a74d45b..86cf5362f8 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/UEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/UEqn.H
@@ -1,6 +1,6 @@
     MRF.correctBoundaryVelocity(U);
 
-    tmp<fvVectorMatrix> UEqn
+    tmp<fvVectorMatrix> tUEqn
     (
         fvm::div(phi, U)
       + MRF.DDt(rho, U)
@@ -10,11 +10,12 @@
       + parcels.SU(U)
       + fvOptions(rho, U)
     );
+    fvVectorMatrix& UEqn = tUEqn.ref();
 
-    UEqn().relax();
+    UEqn.relax();
 
-    fvOptions.constrain(UEqn());
+    fvOptions.constrain(UEqn);
 
-    solve(UEqn() == -fvc::grad(p));
+    solve(UEqn == -fvc::grad(p));
 
     fvOptions.correct(U);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
index aa775bc0d0..9b48bb939d 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
@@ -3,10 +3,10 @@
     // pressure solution - done in 2 parts. Part 1:
     thermo.rho() -= psi*p;
 
-    volScalarField rAU(1.0/UEqn().A());
+    volScalarField rAU(1.0/UEqn.A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
-    UEqn.clear();
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
+    tUEqn.clear();
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
diff --git a/applications/solvers/lagrangian/sprayFoam/UEqn.H b/applications/solvers/lagrangian/sprayFoam/UEqn.H
index c26bf1cf65..97a83f7d5b 100644
--- a/applications/solvers/lagrangian/sprayFoam/UEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/UEqn.H
@@ -2,7 +2,7 @@
 
 MRF.correctBoundaryVelocity(U);
 
-tmp<fvVectorMatrix> UEqn
+tmp<fvVectorMatrix> tUEqn
 (
     fvm::ddt(rho, U) + fvm::div(phi, U)
   + MRF.DDt(rho, U)
@@ -12,14 +12,15 @@ tmp<fvVectorMatrix> UEqn
   + parcels.SU(U)
   + fvOptions(rho, U)
 );
+fvVectorMatrix& UEqn = tUEqn.ref();
 
-UEqn().relax();
+UEqn.relax();
 
-fvOptions.constrain(UEqn());
+fvOptions.constrain(UEqn);
 
 if (pimple.momentumPredictor())
 {
-    solve(UEqn() == -fvc::grad(p));
+    solve(UEqn == -fvc::grad(p));
 
     fvOptions.correct(U);
     K = 0.5*magSqr(U);
diff --git a/applications/solvers/lagrangian/sprayFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/pEqn.H
index 5d28412683..1447f5b6be 100644
--- a/applications/solvers/lagrangian/sprayFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/pEqn.H
@@ -3,13 +3,13 @@ rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
 rho.relax();
 
-volScalarField rAU(1.0/UEqn().A());
+volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
-    UEqn.clear();
+    tUEqn.clear();
 }
 
 if (pimple.transonic())
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H
index 406128feed..8522e60918 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H
@@ -3,13 +3,13 @@ rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
 rho.relax();
 
-volScalarField rAU(1.0/UEqn().A());
+volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p));
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
 if (pimple.nCorrPISO() <= 1)
 {
-    UEqn.clear();
+    tUEqn.clear();
 }
 
 if (pimple.transonic())
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
index e1ac128810..c326215512 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
@@ -40,8 +40,8 @@
                 psi1*fvm::ddt(p_rgh)
               + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
             );
-        deleteDemandDrivenData(p_rghEqnComp1().faceFluxCorrectionPtr());
-        p_rghEqnComp1().relax();
+        deleteDemandDrivenData(p_rghEqnComp1.ref().faceFluxCorrectionPtr());
+        p_rghEqnComp1.ref().relax();
 
         p_rghEqnComp2 =
             fvc::ddt(rho2) + fvc::div(phi, rho2) - fvc::Sp(fvc::div(phi), rho2)
@@ -50,8 +50,8 @@
                 psi2*fvm::ddt(p_rgh)
               + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
             );
-        deleteDemandDrivenData(p_rghEqnComp2().faceFluxCorrectionPtr());
-        p_rghEqnComp2().relax();
+        deleteDemandDrivenData(p_rghEqnComp2.ref().faceFluxCorrectionPtr());
+        p_rghEqnComp2.ref().relax();
     }
     else
     {
diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index fb23042a87..a0a91c3255 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -37,8 +37,8 @@
                 psi1*fvm::ddt(p_rgh)
               + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
             );
-        deleteDemandDrivenData(p_rghEqnComp1().faceFluxCorrectionPtr());
-        p_rghEqnComp1().relax();
+        deleteDemandDrivenData(p_rghEqnComp1.ref().faceFluxCorrectionPtr());
+        p_rghEqnComp1.ref().relax();
 
         p_rghEqnComp2 =
             fvc::ddt(rho2) + fvc::div(phi, rho2) - fvc::Sp(fvc::div(phi), rho2)
@@ -47,8 +47,8 @@
                 psi2*fvm::ddt(p_rgh)
               + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
             );
-        deleteDemandDrivenData(p_rghEqnComp2().faceFluxCorrectionPtr());
-        p_rghEqnComp2().relax();
+        deleteDemandDrivenData(p_rghEqnComp2.ref().faceFluxCorrectionPtr());
+        p_rghEqnComp2.ref().relax();
     }
     else
     {
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index 5730273383..14bbbe8708 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -190,7 +190,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::he
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        the() += phasei()*phasei().thermo().he(p, T);
+        the.ref() += phasei()*phasei().thermo().he(p, T);
     }
 
     return the;
@@ -213,7 +213,8 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::he
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        the() += scalarField(phasei(), cells)*phasei().thermo().he(p, T, cells);
+        the.ref() +=
+            scalarField(phasei(), cells)*phasei().thermo().he(p, T, cells);
     }
 
     return the;
@@ -236,7 +237,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::he
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        the() +=
+        the.ref() +=
             phasei().boundaryField()[patchi]*phasei().thermo().he(p, T, patchi);
     }
 
@@ -252,7 +253,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::hc() const
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        thc() += phasei()*phasei().thermo().hc();
+        thc.ref() += phasei()*phasei().thermo().hc();
     }
 
     return thc;
@@ -293,7 +294,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::rho() const
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        trho() += phasei()*phasei().thermo().rho();
+        trho.ref() += phasei()*phasei().thermo().rho();
     }
 
     return trho;
@@ -314,7 +315,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::rho
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        trho() +=
+        trho.ref() +=
             phasei().boundaryField()[patchi]*phasei().thermo().rho(patchi);
     }
 
@@ -330,7 +331,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::Cp() const
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tCp() += phasei()*phasei().thermo().Cp();
+        tCp.ref() += phasei()*phasei().thermo().Cp();
     }
 
     return tCp;
@@ -353,7 +354,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::Cp
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tCp() +=
+        tCp.ref() +=
             phasei().boundaryField()[patchi]*phasei().thermo().Cp(p, T, patchi);
     }
 
@@ -369,7 +370,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::Cv() const
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tCv() += phasei()*phasei().thermo().Cv();
+        tCv.ref() += phasei()*phasei().thermo().Cv();
     }
 
     return tCv;
@@ -392,7 +393,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::Cv
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tCv() +=
+        tCv.ref() +=
             phasei().boundaryField()[patchi]*phasei().thermo().Cv(p, T, patchi);
     }
 
@@ -408,7 +409,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::gamma() const
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tgamma() += phasei()*phasei().thermo().gamma();
+        tgamma.ref() += phasei()*phasei().thermo().gamma();
     }
 
     return tgamma;
@@ -431,7 +432,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::gamma
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tgamma() +=
+        tgamma.ref() +=
             phasei().boundaryField()[patchi]
            *phasei().thermo().gamma(p, T, patchi);
     }
@@ -448,7 +449,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::Cpv() const
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tCpv() += phasei()*phasei().thermo().Cpv();
+        tCpv.ref() += phasei()*phasei().thermo().Cpv();
     }
 
     return tCpv;
@@ -471,7 +472,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::Cpv
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tCpv() +=
+        tCpv.ref() +=
             phasei().boundaryField()[patchi]
            *phasei().thermo().Cpv(p, T, patchi);
     }
@@ -488,7 +489,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::CpByCpv() const
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tCpByCpv() += phasei()*phasei().thermo().CpByCpv();
+        tCpByCpv.ref() += phasei()*phasei().thermo().CpByCpv();
     }
 
     return tCpByCpv;
@@ -511,7 +512,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::CpByCpv
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tCpByCpv() +=
+        tCpByCpv.ref() +=
             phasei().boundaryField()[patchi]
            *phasei().thermo().CpByCpv(p, T, patchi);
     }
@@ -543,7 +544,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::kappa() const
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tkappa() += phasei()*phasei().thermo().kappa();
+        tkappa.ref() += phasei()*phasei().thermo().kappa();
     }
 
     return tkappa;
@@ -564,7 +565,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::kappa
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tkappa() +=
+        tkappa.ref() +=
             phasei().boundaryField()[patchi]*phasei().thermo().kappa(patchi);
     }
 
@@ -583,7 +584,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::kappaEff
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tkappaEff() += phasei()*phasei().thermo().kappaEff(alphat);
+        tkappaEff.ref() += phasei()*phasei().thermo().kappaEff(alphat);
     }
 
     return tkappaEff;
@@ -606,7 +607,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::kappaEff
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        tkappaEff() +=
+        tkappaEff.ref() +=
             phasei().boundaryField()[patchi]
            *phasei().thermo().kappaEff(alphat, patchi);
     }
@@ -626,7 +627,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::alphaEff
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        talphaEff() += phasei()*phasei().thermo().alphaEff(alphat);
+        talphaEff.ref() += phasei()*phasei().thermo().alphaEff(alphat);
     }
 
     return talphaEff;
@@ -649,7 +650,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::alphaEff
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        talphaEff() +=
+        talphaEff.ref() +=
             phasei().boundaryField()[patchi]
            *phasei().thermo().alphaEff(alphat, patchi);
     }
@@ -666,7 +667,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::rCv() const
 
     for (++phasei; phasei != phases_.end(); ++phasei)
     {
-        trCv() += phasei()/phasei().thermo().Cv();
+        trCv.ref() += phasei()/phasei().thermo().Cv();
     }
 
     return trCv;
@@ -696,7 +697,7 @@ Foam::multiphaseMixtureThermo::surfaceTensionForce() const
         )
     );
 
-    surfaceScalarField& stf = tstf();
+    surfaceScalarField& stf = tstf.ref();
 
     forAllConstIter(PtrDictionary<phaseModel>, phases_, phase1)
     {
@@ -922,7 +923,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::K
 {
     tmp<surfaceVectorField> tnHatfv = nHatfv(alpha1, alpha2);
 
-    correctContactAngle(alpha1, alpha2, tnHatfv().boundaryField());
+    correctContactAngle(alpha1, alpha2, tnHatfv.ref().boundaryField());
 
     // Simple expression for curvature
     return -fvc::div(tnHatfv & mesh_.Sf());
@@ -949,7 +950,8 @@ Foam::multiphaseMixtureThermo::nearInterface() const
 
     forAllConstIter(PtrDictionary<phaseModel>, phases_, phase)
     {
-        tnearInt() = max(tnearInt(), pos(phase() - 0.01)*pos(0.99 - phase()));
+        tnearInt.ref() =
+            max(tnearInt(), pos(phase() - 0.01)*pos(0.99 - phase()));
     }
 
     return tnearInt;
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H
index ccf4bc9794..26ffef825a 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H
@@ -80,7 +80,7 @@
             }
             else
             {
-                p_rghEqnComp() += hmm;
+                p_rghEqnComp.ref() += hmm;
             }
 
             phasei++;
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
index 68f027cd24..3938fde30f 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
@@ -34,7 +34,7 @@
             (
                 alpha1,
                 alphaPhi,
-                talphaPhiCorr0(),
+                talphaPhiCorr0.ref(),
                 mixture.alphaMax(),
                 0
             );
@@ -73,7 +73,7 @@
             (
                 alpha1,
                 talphaPhiUn(),
-                talphaPhiCorr(),
+                talphaPhiCorr.ref(),
                 mixture.alphaMax(),
                 0
             );
diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H
index 055aac3966..9d6dd2dc18 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interFoam/alphaEqn.H
@@ -32,7 +32,8 @@
         }
 
         ocCoeff =
-            refCast<fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha()).ocCoeff();
+            refCast<const fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha())
+           .ocCoeff();
     }
     else
     {
@@ -104,7 +105,7 @@
         if (alphaApplyPrevCorr && talphaPhiCorr0.valid())
         {
             Info<< "Applying the previous iteration compression flux" << endl;
-            MULES::correct(alpha1, alphaPhi, talphaPhiCorr0(), 1, 0);
+            MULES::correct(alpha1, alphaPhi, talphaPhiCorr0.ref(), 1, 0);
 
             alphaPhi += talphaPhiCorr0();
         }
@@ -150,7 +151,7 @@
             tmp<surfaceScalarField> talphaPhiCorr(talphaPhiUn() - alphaPhi);
             volScalarField alpha10("alpha10", alpha1);
 
-            MULES::correct(alpha1, talphaPhiUn(), talphaPhiCorr(), 1, 0);
+            MULES::correct(alpha1, talphaPhiUn(), talphaPhiCorr.ref(), 1, 0);
 
             // Under-relax the correction for all but the 1st corrector
             if (aCorr == 0)
diff --git a/applications/solvers/multiphase/interFoam/setRDeltaT.H b/applications/solvers/multiphase/interFoam/setRDeltaT.H
index 01bb8aa411..dd0e6a4da4 100644
--- a/applications/solvers/multiphase/interFoam/setRDeltaT.H
+++ b/applications/solvers/multiphase/interFoam/setRDeltaT.H
@@ -1,5 +1,5 @@
 {
-    volScalarField& rDeltaT = trDeltaT();
+    volScalarField& rDeltaT = trDeltaT.ref();
 
     const dictionary& pimpleDict = pimple.dict();
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
index 9cc90a9ebe..150ccd1f78 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
@@ -62,7 +62,7 @@
 
         if (MULESCorr)
         {
-            talphaPhiCorr() -= talphaPhi();
+            talphaPhiCorr.ref() -= talphaPhi();
 
             volScalarField alpha100("alpha100", alpha10);
             alpha10 = alpha1;
@@ -72,7 +72,7 @@
                 geometricOneField(),
                 alpha1,
                 talphaPhi(),
-                talphaPhiCorr(),
+                talphaPhiCorr.ref(),
                 vDotvmcAlphal,
                 (
                     divU*(alpha10 - alpha100)
@@ -85,12 +85,12 @@
             // Under-relax the correction for all but the 1st corrector
             if (aCorr == 0)
             {
-                talphaPhi() += talphaPhiCorr();
+                talphaPhi.ref() += talphaPhiCorr();
             }
             else
             {
                 alpha1 = 0.5*alpha1 + 0.5*alpha10;
-                talphaPhi() += 0.5*talphaPhiCorr();
+                talphaPhi.ref() += 0.5*talphaPhiCorr();
             }
         }
         else
@@ -100,7 +100,7 @@
                 geometricOneField(),
                 alpha1,
                 phi,
-                talphaPhiCorr(),
+                talphaPhiCorr.ref(),
                 vDotvmcAlphal,
                 (divU*alpha1 + vDotcAlphal)(),
                 1,
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 6755e96ecb..27a5067edd 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -372,7 +372,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::K
 {
     tmp<surfaceVectorField> tnHatfv = nHatfv(phase1, phase2);
 
-    correctContactAngle(phase1, phase2, tnHatfv().boundaryField());
+    correctContactAngle(phase1, phase2, tnHatfv.ref().boundaryField());
 
     // Simple expression for curvature
     return -fvc::div(tnHatfv & mesh_.Sf());
@@ -493,10 +493,11 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::rho() const
     PtrDictionary<phaseModel>::const_iterator iter = phases_.begin();
 
     tmp<volScalarField> trho = iter()*iter().rho();
+    volScalarField& rho = trho.ref();
 
     for (++iter; iter != phases_.end(); ++iter)
     {
-        trho() += iter()*iter().rho();
+        rho += iter()*iter().rho();
     }
 
     return trho;
@@ -509,10 +510,11 @@ Foam::multiphaseSystem::rho(const label patchi) const
     PtrDictionary<phaseModel>::const_iterator iter = phases_.begin();
 
     tmp<scalarField> trho = iter().boundaryField()[patchi]*iter().rho().value();
+    scalarField& rho = trho.ref();
 
     for (++iter; iter != phases_.end(); ++iter)
     {
-        trho() += iter().boundaryField()[patchi]*iter().rho().value();
+        rho += iter().boundaryField()[patchi]*iter().rho().value();
     }
 
     return trho;
@@ -524,10 +526,11 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::nu() const
     PtrDictionary<phaseModel>::const_iterator iter = phases_.begin();
 
     tmp<volScalarField> tmu = iter()*(iter().rho()*iter().nu());
+    volScalarField& mu = tmu.ref();
 
     for (++iter; iter != phases_.end(); ++iter)
     {
-        tmu() += iter()*(iter().rho()*iter().nu());
+        mu += iter()*(iter().rho()*iter().nu());
     }
 
     return tmu/rho();
@@ -542,10 +545,11 @@ Foam::multiphaseSystem::nu(const label patchi) const
     tmp<scalarField> tmu =
         iter().boundaryField()[patchi]
        *(iter().rho().value()*iter().nu().value());
+    scalarField& mu = tmu.ref();
 
     for (++iter; iter != phases_.end(); ++iter)
     {
-        tmu() +=
+        mu +=
             iter().boundaryField()[patchi]
            *(iter().rho().value()*iter().nu().value());
     }
@@ -592,7 +596,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::Cvm
 
             if (Cvm != Cvms_.end())
             {
-                tCvm() += Cvm()*phase2.rho()*phase2;
+                tCvm.ref() += Cvm()*phase2.rho()*phase2;
             }
             else
             {
@@ -600,7 +604,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::Cvm
 
                 if (Cvm != Cvms_.end())
                 {
-                    tCvm() += Cvm()*phase.rho()*phase2;
+                    tCvm.ref() += Cvm()*phase.rho()*phase2;
                 }
             }
         }
@@ -648,7 +652,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
 
             if (Cvm != Cvms_.end())
             {
-                tSvm() += Cvm()*phase2.rho()*phase2*phase2.DDtU();
+                tSvm.ref() += Cvm()*phase2.rho()*phase2*phase2.DDtU();
             }
             else
             {
@@ -656,7 +660,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
 
                 if (Cvm != Cvms_.end())
                 {
-                    tSvm() += Cvm()*phase.rho()*phase2*phase2.DDtU();
+                    tSvm.ref() += Cvm()*phase.rho()*phase2*phase2.DDtU();
                 }
             }
         }
@@ -673,7 +677,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
             )
         )
         {
-            tSvm().boundaryField()[patchi] = vector::zero;
+            tSvm.ref().boundaryField()[patchi] = vector::zero;
         }
     }
 
@@ -772,7 +776,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::dragCoeff
          || &phase == &dmIter()->phase2()
         )
         {
-            tdragCoeff() += *dcIter();
+            tdragCoeff.ref() += *dcIter();
         }
     }
 
@@ -818,7 +822,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
 
             if (sigma != sigmas_.end())
             {
-                tSurfaceTension() +=
+                tSurfaceTension.ref() +=
                     dimensionedScalar("sigma", dimSigma_, sigma())
                    *fvc::interpolate(K(phase1, phase2))*
                     (
@@ -853,7 +857,7 @@ Foam::multiphaseSystem::nearInterface() const
 
     forAllConstIter(PtrDictionary<phaseModel>, phases_, iter)
     {
-        tnearInt() = max(tnearInt(), pos(iter() - 0.01)*pos(0.99 - iter()));
+        tnearInt.ref() = max(tnearInt(), pos(iter() - 0.01)*pos(0.99 - iter()));
     }
 
     return tnearInt;
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index 27f0f51c35..ea08ba2986 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -141,10 +141,11 @@ Foam::multiphaseMixture::rho() const
     PtrDictionary<phase>::const_iterator iter = phases_.begin();
 
     tmp<volScalarField> trho = iter()*iter().rho();
+    volScalarField& rho = trho.ref();
 
     for (++iter; iter != phases_.end(); ++iter)
     {
-        trho() += iter()*iter().rho();
+        rho += iter()*iter().rho();
     }
 
     return trho;
@@ -157,10 +158,11 @@ Foam::multiphaseMixture::rho(const label patchi) const
     PtrDictionary<phase>::const_iterator iter = phases_.begin();
 
     tmp<scalarField> trho = iter().boundaryField()[patchi]*iter().rho().value();
+    scalarField& rho = trho.ref();
 
     for (++iter; iter != phases_.end(); ++iter)
     {
-        trho() += iter().boundaryField()[patchi]*iter().rho().value();
+        rho += iter().boundaryField()[patchi]*iter().rho().value();
     }
 
     return trho;
@@ -173,10 +175,11 @@ Foam::multiphaseMixture::mu() const
     PtrDictionary<phase>::const_iterator iter = phases_.begin();
 
     tmp<volScalarField> tmu = iter()*iter().rho()*iter().nu();
+    volScalarField& mu = tmu.ref();
 
     for (++iter; iter != phases_.end(); ++iter)
     {
-        tmu() += iter()*iter().rho()*iter().nu();
+        mu += iter()*iter().rho()*iter().nu();
     }
 
     return tmu;
@@ -192,10 +195,11 @@ Foam::multiphaseMixture::mu(const label patchi) const
         iter().boundaryField()[patchi]
        *iter().rho().value()
        *iter().nu(patchi);
+    scalarField& mu = tmu.ref();
 
     for (++iter; iter != phases_.end(); ++iter)
     {
-        tmu() +=
+        mu +=
             iter().boundaryField()[patchi]
            *iter().rho().value()
            *iter().nu(patchi);
@@ -212,10 +216,11 @@ Foam::multiphaseMixture::muf() const
 
     tmp<surfaceScalarField> tmuf =
         fvc::interpolate(iter())*iter().rho()*fvc::interpolate(iter().nu());
+    surfaceScalarField& muf = tmuf.ref();
 
     for (++iter; iter != phases_.end(); ++iter)
     {
-        tmuf() +=
+        muf +=
             fvc::interpolate(iter())*iter().rho()*fvc::interpolate(iter().nu());
     }
 
@@ -267,7 +272,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const
         )
     );
 
-    surfaceScalarField& stf = tstf();
+    surfaceScalarField& stf = tstf.ref();
 
     forAllConstIter(PtrDictionary<phase>, phases_, iter1)
     {
@@ -518,7 +523,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixture::K
 {
     tmp<surfaceVectorField> tnHatfv = nHatfv(alpha1, alpha2);
 
-    correctContactAngle(alpha1, alpha2, tnHatfv().boundaryField());
+    correctContactAngle(alpha1, alpha2, tnHatfv.ref().boundaryField());
 
     // Simple expression for curvature
     return -fvc::div(tnHatfv & mesh_.Sf());
@@ -545,7 +550,7 @@ Foam::multiphaseMixture::nearInterface() const
 
     forAllConstIter(PtrDictionary<phase>, phases_, iter)
     {
-        tnearInt() = max(tnearInt(), pos(iter() - 0.01)*pos(0.99 - iter()));
+        tnearInt.ref() = max(tnearInt(), pos(iter() - 0.01)*pos(0.99 - iter()));
     }
 
     return tnearInt;
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/UEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/UEqn.H
index 794c0aca52..421e45ae7d 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/UEqn.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/UEqn.H
@@ -1,6 +1,6 @@
 MRF.correctBoundaryVelocity(U);
 
-tmp<fvVectorMatrix> UEqn
+tmp<fvVectorMatrix> tUEqn
 (
     fvm::ddt(U) + fvm::div(phi, U)
   + MRF.DDt(U)
@@ -8,14 +8,15 @@ tmp<fvVectorMatrix> UEqn
  ==
     fvOptions(U)
 );
+fvVectorMatrix& UEqn = tUEqn.ref();
 
-UEqn().relax();
+UEqn.relax();
 
-fvOptions.constrain(UEqn());
+fvOptions.constrain(UEqn);
 
 if (pimple.momentumPredictor())
 {
-    solve(UEqn() == -fvc::grad(p_gh));
+    solve(UEqn == -fvc::grad(p_gh));
 
     fvOptions.correct(U);
 }
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
index e182350114..7d4c5f9039 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
@@ -1,10 +1,10 @@
-volScalarField rAU(1.0/UEqn().A());
+volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_gh));
+volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_gh));
 
 if (pimple.nCorrPISO() <= 1)
 {
-    UEqn.clear();
+    tUEqn.clear();
 }
 
 surfaceScalarField phiHbyA
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H
index 04b187cf85..a74f6c2664 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H
@@ -1,11 +1,11 @@
 {
-    rAU = 1.0/UEqn().A();
+    rAU = 1.0/UEqn.A();
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn().H(), U, p_gh));
+    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_gh));
 
     if (pimple.nCorrPISO() <= 1)
     {
-        UEqn.clear();
+        tUEqn.clear();
     }
 
     surfaceScalarField phiHbyA
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
index 5fd646c5ce..ff5d3e5a6e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,7 +153,7 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::D
         )
     );
 
-    volScalarField& D(tmpD());
+    volScalarField& D(tmpD.ref());
 
     forAll(p, cellI)
     {
@@ -207,7 +207,7 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::L
         )
     );
 
-    volScalarField& L(tmpL());
+    volScalarField& L(tmpL.ref());
 
     forAll(p, cellI)
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C
index 886fefe8e8..a2fbcd0bbc 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ Foam::saturationModels::polynomial::Tsat
         )
     );
 
-    volScalarField& Tsat = tTsat();
+    volScalarField& Tsat = tTsat.ref();
 
     forAll(Tsat,celli)
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
index fb755c6347..c17b649212 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
@@ -46,7 +46,7 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModel::zeroGradWalls
     tmp<volVectorField> tFi
 ) const
 {
-    volVectorField& Fi = tFi();
+    volVectorField& Fi = tFi.ref();
     const fvPatchList& patches =  Fi.mesh().boundary();
 
     forAll(patches, patchi)
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
index 3cb567273f..78eb01cf1c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -199,15 +199,15 @@ Foam::BlendedInterfacialModel<ModelType>::K() const
 
     if (model_.valid())
     {
-        x() += model_->K()*(scalar(1) - f1() - f2());
+        x.ref() += model_->K()*(scalar(1) - f1() - f2());
     }
     if (model1In2_.valid())
     {
-        x() += model1In2_->K()*f1;
+        x.ref() += model1In2_->K()*f1;
     }
     if (model2In1_.valid())
     {
-        x() += model2In1_->K()*f2;
+        x.ref() += model2In1_->K()*f2;
     }
 
     if
@@ -216,7 +216,7 @@ Foam::BlendedInterfacialModel<ModelType>::K() const
      && (model_.valid() || model1In2_.valid() || model2In1_.valid())
     )
     {
-        correctFixedFluxBCs(x());
+        correctFixedFluxBCs(x.ref());
     }
 
     return x;
@@ -259,15 +259,15 @@ Foam::BlendedInterfacialModel<ModelType>::K(const scalar residualAlpha) const
 
     if (model_.valid())
     {
-        x() += model_->K(residualAlpha)*(scalar(1) - f1() - f2());
+        x.ref() += model_->K(residualAlpha)*(scalar(1) - f1() - f2());
     }
     if (model1In2_.valid())
     {
-        x() += model1In2_->K(residualAlpha)*f1;
+        x.ref() += model1In2_->K(residualAlpha)*f1;
     }
     if (model2In1_.valid())
     {
-        x() += model2In1_->K(residualAlpha)*f2;
+        x.ref() += model2In1_->K(residualAlpha)*f2;
     }
 
     if
@@ -276,7 +276,7 @@ Foam::BlendedInterfacialModel<ModelType>::K(const scalar residualAlpha) const
      && (model_.valid() || model1In2_.valid() || model2In1_.valid())
     )
     {
-        correctFixedFluxBCs(x());
+        correctFixedFluxBCs(x.ref());
     }
 
     return x;
@@ -325,17 +325,17 @@ Foam::BlendedInterfacialModel<ModelType>::Kf() const
 
     if (model_.valid())
     {
-        x() += model_->Kf()*(scalar(1) - f1() - f2());
+        x.ref() += model_->Kf()*(scalar(1) - f1() - f2());
     }
 
     if (model1In2_.valid())
     {
-        x() += model1In2_->Kf()*f1;
+        x.ref() += model1In2_->Kf()*f1;
     }
 
     if (model2In1_.valid())
     {
-        x() += model2In1_->Kf()*f2;
+        x.ref() += model2In1_->Kf()*f2;
     }
 
     if
@@ -344,7 +344,7 @@ Foam::BlendedInterfacialModel<ModelType>::Kf() const
      && (model_.valid() || model1In2_.valid() || model2In1_.valid())
     )
     {
-        correctFixedFluxBCs(x());
+        correctFixedFluxBCs(x.ref());
     }
 
     return x;
@@ -388,17 +388,17 @@ Foam::BlendedInterfacialModel<ModelType>::F() const
 
     if (model_.valid())
     {
-        x() += model_->F()*(scalar(1) - f1() - f2());
+        x.ref() += model_->F()*(scalar(1) - f1() - f2());
     }
 
     if (model1In2_.valid())
     {
-        x() += model1In2_->F()*f1;
+        x.ref() += model1In2_->F()*f1;
     }
 
     if (model2In1_.valid())
     {
-        x() -= model2In1_->F()*f2; // note : subtraction
+        x.ref() -= model2In1_->F()*f2; // note : subtraction
     }
 
     if
@@ -407,7 +407,7 @@ Foam::BlendedInterfacialModel<ModelType>::F() const
      && (model_.valid() || model1In2_.valid() || model2In1_.valid())
     )
     {
-        correctFixedFluxBCs(x());
+        correctFixedFluxBCs(x.ref());
     }
 
     return x;
@@ -456,17 +456,17 @@ Foam::BlendedInterfacialModel<ModelType>::Ff() const
 
     if (model_.valid())
     {
-        x() += model_->Ff()*(scalar(1) - f1() - f2());
+        x.ref() += model_->Ff()*(scalar(1) - f1() - f2());
     }
 
     if (model1In2_.valid())
     {
-        x() += model1In2_->Ff()*f1;
+        x.ref() += model1In2_->Ff()*f1;
     }
 
     if (model2In1_.valid())
     {
-        x() -= model2In1_->Ff()*f2; // note : subtraction
+        x.ref() -= model2In1_->Ff()*f2; // note : subtraction
     }
 
     if
@@ -475,7 +475,7 @@ Foam::BlendedInterfacialModel<ModelType>::Ff() const
      && (model_.valid() || model1In2_.valid() || model2In1_.valid())
     )
     {
-        correctFixedFluxBCs(x());
+        correctFixedFluxBCs(x.ref());
     }
 
     return x;
@@ -518,15 +518,15 @@ Foam::BlendedInterfacialModel<ModelType>::D() const
 
     if (model_.valid())
     {
-        x() += model_->D()*(scalar(1) - f1() - f2());
+        x.ref() += model_->D()*(scalar(1) - f1() - f2());
     }
     if (model1In2_.valid())
     {
-        x() += model1In2_->D()*f1;
+        x.ref() += model1In2_->D()*f1;
     }
     if (model2In1_.valid())
     {
-        x() += model2In1_->D()*f2;
+        x.ref() += model2In1_->D()*f2;
     }
 
     if
@@ -535,7 +535,7 @@ Foam::BlendedInterfacialModel<ModelType>::D() const
      && (model_.valid() || model1In2_.valid() || model2In1_.valid())
     )
     {
-        correctFixedFluxBCs(x());
+        correctFixedFluxBCs(x.ref());
     }
 
     return x;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
index 03c26c89dc..c63f6bfd44 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
@@ -218,7 +218,7 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::dmdt
         {
             if (phase1 == &phase)
             {
-                tdmdt() += this->dmdt(pair);
+                tdmdt.ref() += this->dmdt(pair);
             }
 
             Swap(phase1, phase2);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
index b737cd0322..6ca75c6ed4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,13 +112,13 @@ Foam::AnisothermalPhaseModel<BasePhaseModel>::heEqn()
     // Add the appropriate pressure-work term
     if (he.name() == this->thermo_->phasePropertyName("e"))
     {
-        tEEqn() +=
+        tEEqn.ref() +=
             fvc::ddt(alpha)*this->thermo().p()
           + fvc::div(alphaPhi, this->thermo().p());
     }
     else if (this->thermo_->dpdt())
     {
-        tEEqn() -= alpha*this->fluid().dpdt();
+        tEEqn.ref() -= alpha*this->fluid().dpdt();
     }
 
     return tEEqn;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
index 4202907a2e..b9abe549a0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::phaseSystem::calcPhi
 
     for (label phasei=1; phasei<phaseModels.size(); phasei++)
     {
-        tmpPhi() +=
+        tmpPhi.ref() +=
             fvc::interpolate(phaseModels[phasei])*phaseModels[phasei].phi();
     }
 
@@ -197,7 +197,7 @@ Foam::tmp<Foam::volScalarField> Foam::phaseSystem::rho() const
 
     for (label phasei=1; phasei<phaseModels_.size(); phasei++)
     {
-        tmpRho() += phaseModels_[phasei]*phaseModels_[phasei].rho();
+        tmpRho.ref() += phaseModels_[phasei]*phaseModels_[phasei].rho();
     }
 
     return tmpRho;
@@ -213,7 +213,7 @@ Foam::tmp<Foam::volVectorField> Foam::phaseSystem::U() const
 
     for (label phasei=1; phasei<phaseModels_.size(); phasei++)
     {
-        tmpU() += phaseModels_[phasei]*phaseModels_[phasei].U();
+        tmpU.ref() += phaseModels_[phasei]*phaseModels_[phasei].U();
     }
 
     return tmpU;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
index 422f6324b1..c1d98bcb43 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
@@ -29,7 +29,7 @@ for (int Ecorr=0; Ecorr<nEnergyCorrectors; Ecorr++)
             );
 
             EEqn->relax();
-            fvOptions.constrain(EEqn());
+            fvOptions.constrain(EEqn.ref());
             EEqn->solve();
         }
     }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
index ec5ca1596d..5bdb4cea14 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I../multiphaseSystem/lnInclude \
     -I../../phaseSystems/lnInclude \
     -I../../interfacialModels/lnInclude\
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index a9de2e6d55..b81e174db8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -477,7 +477,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::K
 {
     tmp<surfaceVectorField> tnHatfv = nHatfv(phase1, phase2);
 
-    correctContactAngle(phase1, phase2, tnHatfv().boundaryField());
+    correctContactAngle(phase1, phase2, tnHatfv.ref().boundaryField());
 
     // Simple expression for curvature
     return -fvc::div(tnHatfv & mesh_.Sf());
@@ -568,7 +568,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
 
             if (cAlpha != cAlphas_.end())
             {
-                tSurfaceTension() +=
+                tSurfaceTension.ref() +=
                     fvc::interpolate(sigma(key12)*K(phase1, phase2))
                    *(
                         fvc::interpolate(phase2)*fvc::snGrad(phase1)
@@ -602,7 +602,7 @@ Foam::multiphaseSystem::nearInterface() const
 
     forAll(phases(), phasei)
     {
-        tnearInt() = max
+        tnearInt.ref() = max
         (
             tnearInt(),
             pos(phases()[phasei] - 0.01)*pos(0.99 - phases()[phasei])
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index 74e29d3df2..42e0fe70e4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -457,7 +457,7 @@ while (pimple.correct())
     forAll(phases, phasei)
     {
         phaseModel& phase = phases[phasei];
-        phase.rho()() += phase.thermo().psi()*(p_rgh - p_rgh_0);
+        phase.thermo().rho() += phase.thermo().psi()*(p_rgh - p_rgh_0);
     }
 
     // Correct p_rgh for consistency with p and the updated densities
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
index c0ca68835c..fec017ea30 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
@@ -1,5 +1,5 @@
 {
-    volScalarField& rDeltaT = trDeltaT();
+    volScalarField& rDeltaT = trDeltaT.ref();
 
     const dictionary& pimpleDict = pimple.dict();
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
index 3060c444de..0ac8e84129 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
@@ -23,7 +23,7 @@ for (int Ecorr=0; Ecorr<nEnergyCorrectors; Ecorr++)
             );
 
             E1Eqn->relax();
-            fvOptions.constrain(E1Eqn());
+            fvOptions.constrain(E1Eqn.ref());
             E1Eqn->solve();
         }
     }
@@ -43,7 +43,7 @@ for (int Ecorr=0; Ecorr<nEnergyCorrectors; Ecorr++)
             );
 
             E2eqn->relax();
-            fvOptions.constrain(E2eqn());
+            fvOptions.constrain(E2eqn.ref());
             E2eqn->solve();
         }
     }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
index d6ba189b12..104bc0047f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
@@ -261,8 +261,8 @@ while (pimple.correct())
                     )
                 );
 
-            deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
-            pEqnComp1().relax();
+            deleteDemandDrivenData(pEqnComp1.ref().faceFluxCorrectionPtr());
+            pEqnComp1.ref().relax();
         }
 
         if (phase2.compressible())
@@ -286,8 +286,8 @@ while (pimple.correct())
                       + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
                     )
                 );
-            deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
-            pEqnComp2().relax();
+            deleteDemandDrivenData(pEqnComp2.ref().faceFluxCorrectionPtr());
+            pEqnComp2.ref().relax();
         }
     }
     else
@@ -317,7 +317,7 @@ while (pimple.correct())
     {
         if (pEqnComp1.valid())
         {
-            pEqnComp1() -= fluid.dmdt()/rho1;
+            pEqnComp1.ref() -= fluid.dmdt()/rho1;
         }
         else
         {
@@ -326,7 +326,7 @@ while (pimple.correct())
 
         if (pEqnComp2.valid())
         {
-            pEqnComp2() += fluid.dmdt()/rho2;
+            pEqnComp2.ref() += fluid.dmdt()/rho2;
         }
         else
         {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
index 57f491480e..d618226411 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
@@ -242,8 +242,8 @@ while (pimple.correct())
                   + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
                 )
             );
-            deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
-            pEqnComp1().relax();
+            deleteDemandDrivenData(pEqnComp1.ref().faceFluxCorrectionPtr());
+            pEqnComp1.ref().relax();
         }
 
         if (phase2.compressible())
@@ -261,8 +261,8 @@ while (pimple.correct())
                   + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
                 )
             );
-            deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
-            pEqnComp2().relax();
+            deleteDemandDrivenData(pEqnComp2.ref().faceFluxCorrectionPtr());
+            pEqnComp2.ref().relax();
         }
     }
     else
@@ -292,7 +292,7 @@ while (pimple.correct())
     {
         if (pEqnComp1.valid())
         {
-            pEqnComp1() -= fluid.dmdt()/rho1;
+            pEqnComp1.ref() -= fluid.dmdt()/rho1;
         }
         else
         {
@@ -301,7 +301,7 @@ while (pimple.correct())
 
         if (pEqnComp2.valid())
         {
-            pEqnComp2() += fluid.dmdt()/rho2;
+            pEqnComp2.ref() += fluid.dmdt()/rho2;
         }
         else
         {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H
index ff07dc4a32..4bef17a6bb 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H
@@ -1,5 +1,5 @@
 {
-    volScalarField& rDeltaT = trDeltaT();
+    volScalarField& rDeltaT = trDeltaT.ref();
 
     const dictionary& pimpleDict = pimple.dict();
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
index 46e46e4599..3c3db948dd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I../twoPhaseSystem/lnInclude \
     -I../../phaseSystems/lnInclude \
     -I../../interfacialModels/lnInclude\
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
index 924f8209a4..4aac384117 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -299,7 +299,7 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
     const scalarField liquidw(liquid.boundaryField()[patchi]);
 
     // Damp boiling at high void fractions.
-    const scalarField W(min(liquidw/0.2, scalar(0.1)));
+    const scalarField W(min(liquidw/0.2, scalar(1)));
 
     const scalarField A2(W*min(M_PI*sqr(Ddep)*N*Al/4, scalar(1)));
     const scalarField A1(max(1 - A2, scalar(1e-4)));
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index 36e73662cd..597d15e7ff 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -284,7 +284,7 @@ void Foam::twoPhaseSystem::solve()
 
         if (tdgdt.valid())
         {
-            scalarField& dgdt = tdgdt();
+            scalarField& dgdt = tdgdt.ref();
 
             forAll(dgdt, celli)
             {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H
index 2d4baf024a..c2621ae66a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H
@@ -260,8 +260,8 @@ while (pimple.correct())
                   + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
                 )
             );
-        deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
-        pEqnComp1().relax();
+        deleteDemandDrivenData(pEqnComp1.ref().faceFluxCorrectionPtr());
+        pEqnComp1.ref().relax();
 
         pEqnComp2 =
             (
@@ -276,8 +276,8 @@ while (pimple.correct())
                   + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
                 )
             );
-        deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
-        pEqnComp2().relax();
+        deleteDemandDrivenData(pEqnComp2.ref().faceFluxCorrectionPtr());
+        pEqnComp2.ref().relax();
     }
     else
     {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
index 9fd243f275..63321bab7d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
@@ -239,8 +239,8 @@ while (pimple.correct())
                   + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
                 )
             );
-        deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
-        pEqnComp1().relax();
+        deleteDemandDrivenData(pEqnComp1.ref().faceFluxCorrectionPtr());
+        pEqnComp1.ref().relax();
 
         pEqnComp2 =
             (
@@ -255,8 +255,8 @@ while (pimple.correct())
                   + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
                 )
             );
-        deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
-        pEqnComp2().relax();
+        deleteDemandDrivenData(pEqnComp2.ref().faceFluxCorrectionPtr());
+        pEqnComp2.ref().relax();
     }
     else
     {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
index 58f3051b4d..84786bdc5d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I../twoPhaseSystem/lnInclude \
     -I../interfacialModels/lnInclude\
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
index 1cac6d7176..1b2a492782 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -155,17 +155,17 @@ Foam::BlendedInterfacialModel<modelType>::K() const
 
     if (model_.valid())
     {
-        x() += model_->K()*(f1() - f2());
+        x.ref() += model_->K()*(f1() - f2());
     }
 
     if (model1In2_.valid())
     {
-        x() += model1In2_->K()*(1 - f1);
+        x.ref() += model1In2_->K()*(1 - f1);
     }
 
     if (model2In1_.valid())
     {
-        x() += model2In1_->K()*f2;
+        x.ref() += model2In1_->K()*f2;
     }
 
     if
@@ -174,7 +174,7 @@ Foam::BlendedInterfacialModel<modelType>::K() const
      && (model_.valid() || model1In2_.valid() || model2In1_.valid())
     )
     {
-        correctFixedFluxBCs(x());
+        correctFixedFluxBCs(x.ref());
     }
 
     return x;
@@ -223,17 +223,17 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
 
     if (model_.valid())
     {
-        x() += model_->Kf()*(f1() - f2());
+        x.ref() += model_->Kf()*(f1() - f2());
     }
 
     if (model1In2_.valid())
     {
-        x() += model1In2_->Kf()*(1 - f1);
+        x.ref() += model1In2_->Kf()*(1 - f1);
     }
 
     if (model2In1_.valid())
     {
-        x() += model2In1_->Kf()*f2;
+        x.ref() += model2In1_->Kf()*f2;
     }
 
     if
@@ -242,7 +242,7 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
      && (model_.valid() || model1In2_.valid() || model2In1_.valid())
     )
     {
-        correctFixedFluxBCs(x());
+        correctFixedFluxBCs(x.ref());
     }
 
     return x;
@@ -286,17 +286,17 @@ Foam::BlendedInterfacialModel<modelType>::F() const
 
     if (model_.valid())
     {
-        x() += model_->F()*(f1() - f2());
+        x.ref() += model_->F()*(f1() - f2());
     }
 
     if (model1In2_.valid())
     {
-        x() += model1In2_->F()*(1 - f1);
+        x.ref() += model1In2_->F()*(1 - f1);
     }
 
     if (model2In1_.valid())
     {
-        x() -= model2In1_->F()*f2; // note : subtraction
+        x.ref() -= model2In1_->F()*f2; // note : subtraction
     }
 
     if
@@ -305,7 +305,7 @@ Foam::BlendedInterfacialModel<modelType>::F() const
      && (model_.valid() || model1In2_.valid() || model2In1_.valid())
     )
     {
-        correctFixedFluxBCs(x());
+        correctFixedFluxBCs(x.ref());
     }
 
     return x;
@@ -354,17 +354,17 @@ Foam::BlendedInterfacialModel<modelType>::Ff() const
 
     if (model_.valid())
     {
-        x() += model_->Ff()*(f1() - f2());
+        x.ref() += model_->Ff()*(f1() - f2());
     }
 
     if (model1In2_.valid())
     {
-        x() += model1In2_->Ff()*(1 - f1);
+        x.ref() += model1In2_->Ff()*(1 - f1);
     }
 
     if (model2In1_.valid())
     {
-        x() -= model2In1_->Ff()*f2; // note : subtraction
+        x.ref() -= model2In1_->Ff()*f2; // note : subtraction
     }
 
     if
@@ -373,7 +373,7 @@ Foam::BlendedInterfacialModel<modelType>::Ff() const
      && (model_.valid() || model1In2_.valid() || model2In1_.valid())
     )
     {
-        correctFixedFluxBCs(x());
+        correctFixedFluxBCs(x.ref());
     }
 
     return x;
@@ -416,17 +416,17 @@ Foam::BlendedInterfacialModel<modelType>::D() const
 
     if (model_.valid())
     {
-        x() += model_->D()*(f1() - f2());
+        x.ref() += model_->D()*(f1() - f2());
     }
 
     if (model1In2_.valid())
     {
-        x() += model1In2_->D()*(1 - f1);
+        x.ref() += model1In2_->D()*(1 - f1);
     }
 
     if (model2In1_.valid())
     {
-        x() += model2In1_->D()*f2;
+        x.ref() += model2In1_->D()*f2;
     }
 
     if
@@ -435,7 +435,7 @@ Foam::BlendedInterfacialModel<modelType>::D() const
      && (model_.valid() || model1In2_.valid() || model2In1_.valid())
     )
     {
-        correctFixedFluxBCs(x());
+        correctFixedFluxBCs(x.ref());
     }
 
     return x;
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index 3659dcff38..ac12a39f4e 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -1150,7 +1150,7 @@ tmp<pointField> calcOffset
     vectorField::subField fc = pp.faceCentres();
 
     tmp<pointField> toffsets(new pointField(fc.size()));
-    pointField& offsets = toffsets();
+    pointField& offsets = toffsets.ref();
 
     forAll(fc, i)
     {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C
index 04abf8a943..143241f858 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -280,7 +280,7 @@ Foam::tmp<Foam::pointField> Foam::DelaunayMeshTools::allPoints
 )
 {
     tmp<pointField> tpts(new pointField(t.vertexCount(), point::max));
-    pointField& pts = tpts();
+    pointField& pts = tpts.ref();
 
     for
     (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
index 301e6b8074..24916fa50b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -262,7 +262,7 @@ Foam::label Foam::cellShapeControlMesh::removePoints()
 Foam::tmp<Foam::pointField> Foam::cellShapeControlMesh::cellCentres() const
 {
     tmp<pointField> tcellCentres(new pointField(number_of_finite_cells()));
-    pointField& cellCentres = tcellCentres();
+    pointField& cellCentres = tcellCentres.ref();
 
     label count = 0;
     for
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
index 456f6be9c5..af208c587b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
@@ -179,7 +179,7 @@ Foam::tmp<Foam::triadField> Foam::smoothAlignmentSolver::buildAlignmentField
     (
         new triadField(mesh.vertexCount(), triad::unset)
     );
-    triadField& alignments = tAlignments();
+    triadField& alignments = tAlignments.ref();
 
     for
     (
@@ -211,7 +211,7 @@ Foam::tmp<Foam::pointField> Foam::smoothAlignmentSolver::buildPointField
     (
         new pointField(mesh.vertexCount(), point(GREAT, GREAT, GREAT))
     );
-    pointField& points = tPoints();
+    pointField& points = tPoints.ref();
 
     for
     (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
index 5a016d88fb..025ba5885d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,7 +152,7 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
         )
     );
 
-    triSurfacePointScalarField& pointCellSize = tPointCellSize();
+    triSurfacePointScalarField& pointCellSize = tPointCellSize.ref();
 
     if (readCurvature_)
     {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
index 805ad1196a..6d6b56e7b6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::fieldFromFile::load()
         )
     );
 
-    pointCellSize() *= cellSizeMultipleCoeff_;
+    pointCellSize.ref() *= cellSizeMultipleCoeff_;
 
     return pointCellSize;
 }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C
index 5c3bb699e2..16a18de191 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ Foam::searchableBoxFeatures::features() const
     edgeNormals[11][0] = 3; edgeNormals[11][1] = 0;
 
     tmp<pointField> surfacePointsTmp(surface().points());
-    pointField& surfacePoints = surfacePointsTmp();
+    pointField& surfacePoints = surfacePointsTmp.ref();
 
     forAll(edgeDirections, eI)
     {
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 65f1f25b45..b8e25e4f6c 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ tmp<volScalarField> createScalarField
             zeroGradientFvPatchScalarField::typeName
         )
     );
-    volScalarField& fld = tfld();
+    volScalarField& fld = tfld.ref();
 
     forAll(fld, cellI)
     {
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 9494874c89..6697fbecfb 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -181,7 +181,7 @@ void subsetVolFields
         {
             if (addedPatches.found(patchI))
             {
-                tSubFld().boundaryField()[patchI] ==
+                tSubFld.ref().boundaryField()[patchI] ==
                     pTraits<typename GeoField::value_type>::zero;
             }
         }
@@ -233,7 +233,7 @@ void subsetSurfaceFields
         {
             if (addedPatches.found(patchI))
             {
-                tSubFld().boundaryField()[patchI] ==
+                tSubFld.ref().boundaryField()[patchI] ==
                     pTraits<typename GeoField::value_type>::zero;
             }
         }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index e6a38a6cf6..612afc260a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -53,8 +53,8 @@ volField
         (
             meshSubsetter.interpolate(vf)
         );
-        tfld().checkOut();
-        tfld().rename(vf.name());
+        tfld.ref().checkOut();
+        tfld.ref().rename(vf.name());
         return tfld;
     }
     else
@@ -729,7 +729,7 @@ void ensightField
         (
             volPointInterpolation::New(vf.mesh()).interpolate(vf)
         );
-        pfld().rename(vf.name());
+        pfld.ref().rename(vf.name());
 
         ensightPointField<Type>
         (
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C
index 86ccae2867..c3412a1faa 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C
@@ -37,7 +37,7 @@ Foam::tmp<Field<Type>> Foam::surfaceMeshWriter::getFaceField
     const polyBoundaryMesh& patches = sfld.mesh().boundaryMesh();
 
     tmp<Field<Type>> tfld(new Field<Type>(pp_.size()));
-    Field<Type>& fld = tfld();
+    Field<Type>& fld = tfld.ref();
 
     forAll(pp_.addressing(), i)
     {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
index d9d65a1201..f536ae04fa 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -157,7 +157,7 @@ public:
                 if (useSubMesh())
                 {
                     tmp<GeoField> subFld = subsetter_.interpolate(fld);
-                    subFld().rename(fld.name());
+                    subFld.ref().rename(fld.name());
                     return subFld;
                 }
                 else
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 146878e272..2a6808776b 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
         // Calculate nut - reference nut is calculated by the turbulence model
         // on its construction
         tmp<volScalarField> tnut = turbulence->nut();
-        volScalarField& nut = tnut();
+        volScalarField& nut = tnut.ref();
         volScalarField S(mag(dev(symm(fvc::grad(U)))));
         nut = (1 - mask)*nut + mask*sqr(kappa*min(y, ybl))*::sqrt(2)*S;
 
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
 
         // Turbulence k
         tmp<volScalarField> tk = turbulence->k();
-        volScalarField& k = tk();
+        volScalarField& k = tk.ref();
         scalar ck0 = pow025(Cmu)*kappa;
         k = (1 - mask)*k + mask*sqr(nut/(ck0*min(y, ybl)));
 
@@ -165,7 +165,7 @@ int main(int argc, char *argv[])
 
         // Turbulence epsilon
         tmp<volScalarField> tepsilon = turbulence->epsilon();
-        volScalarField& epsilon = tepsilon();
+        volScalarField& epsilon = tepsilon.ref();
         scalar ce0 = ::pow(Cmu, 0.75)/kappa;
         epsilon = (1 - mask)*epsilon + mask*ce0*k*sqrt(k)/min(y, ybl);
 
diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
index 6c1cf3cf7b..46bbfdf395 100644
--- a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
+++ b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ tmp<pointField> avg
     const labelListList& pointEdges = s.pointEdges();
 
     tmp<pointField> tavg(new pointField(s.nPoints(), vector::zero));
-    pointField& avg = tavg();
+    pointField& avg = tavg.ref();
 
     forAll(pointEdges, vertI)
     {
diff --git a/src/OpenFOAM/Make/options b/src/OpenFOAM/Make/options
index 9543b9ae27..b1cc1a2d10 100644
--- a/src/OpenFOAM/Make/options
+++ b/src/OpenFOAM/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP -I$(OBJECTS_DIR)
+EXE_INC = -I$(OBJECTS_DIR)
 
 LIB_LIBS = \
     $(FOAM_LIBBIN)/libOSspecific.o \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
index c282ecb900..dc2a68de38 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
@@ -60,7 +60,7 @@ pow
         )
     );
 
-    pow<Type, r, GeoMesh>(tPow().field(), df.field());
+    pow<Type, r, GeoMesh>(tPow.ref().field(), df.field());
 
     return tPow;
 }
@@ -86,7 +86,7 @@ pow
             pow(df.dimensions(), r)
         );
 
-    pow<Type, r, GeoMesh>(tPow().field(), df.field());
+    pow<Type, r, GeoMesh>(tPow.ref().field(), df.field());
 
     tdf.clear();
 
@@ -114,7 +114,7 @@ sqr(const DimensionedField<Type, GeoMesh>& df)
         )
     );
 
-    sqr(tSqr().field(), df.field());
+    sqr(tSqr.ref().field(), df.field());
 
     return tSqr;
 }
@@ -135,7 +135,7 @@ sqr(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
             sqr(df.dimensions())
         );
 
-    sqr(tSqr().field(), df.field());
+    sqr(tSqr.ref().field(), df.field());
 
     tdf.clear();
 
@@ -164,7 +164,7 @@ tmp<DimensionedField<scalar, GeoMesh>> magSqr
         )
     );
 
-    magSqr(tMagSqr().field(), df.field());
+    magSqr(tMagSqr.ref().field(), df.field());
 
     return tMagSqr;
 }
@@ -185,7 +185,7 @@ tmp<DimensionedField<scalar, GeoMesh>> magSqr
             sqr(df.dimensions())
         );
 
-    magSqr(tMagSqr().field(), df.field());
+    magSqr(tMagSqr.ref().field(), df.field());
 
     tdf.clear();
 
@@ -214,7 +214,7 @@ tmp<DimensionedField<scalar, GeoMesh>> mag
         )
     );
 
-    mag(tMag().field(), df.field());
+    mag(tMag.ref().field(), df.field());
 
     return tMag;
 }
@@ -235,7 +235,7 @@ tmp<DimensionedField<scalar, GeoMesh>> mag
             df.dimensions()
         );
 
-    mag(tMag().field(), df.field());
+    mag(tMag.ref().field(), df.field());
 
     tdf.clear();
 
@@ -268,7 +268,7 @@ cmptAv(const DimensionedField<Type, GeoMesh>& df)
         )
     );
 
-    cmptAv(CmptAv().field(), df.field());
+    cmptAv(CmptAv.ref().field(), df.field());
 
     return CmptAv;
 }
@@ -294,7 +294,7 @@ cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
             df.dimensions()
         );
 
-    cmptAv(CmptAv().field(), df.field());
+    cmptAv(CmptAv.ref().field(), df.field());
 
     tdf.clear();
 
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 4b320d8e05..9afb78bcfe 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -128,7 +128,7 @@ public:
 
     // Member operators
 
-        #ifndef CONST_TMP
+        #ifdef NON_CONST_TMP
         //- Deprecated non-const dereference operator.
         //  Use ref() where non-const access is required
         inline T& operator()();
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index 5c96220048..819c471428 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -217,7 +217,7 @@ inline void Foam::tmp<T>::clear() const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-#ifndef CONST_TMP
+#ifdef NON_CONST_TMP
 template<class T>
 inline T& Foam::tmp<T>::operator()()
 {
diff --git a/src/TurbulenceModels/compressible/Make/options b/src/TurbulenceModels/compressible/Make/options
index a6401963fd..4a6578d628 100644
--- a/src/TurbulenceModels/compressible/Make/options
+++ b/src/TurbulenceModels/compressible/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I../turbulenceModels/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/src/TurbulenceModels/incompressible/Make/options b/src/TurbulenceModels/incompressible/Make/options
index cf54ffd963..c44e9ae61c 100644
--- a/src/TurbulenceModels/incompressible/Make/options
+++ b/src/TurbulenceModels/incompressible/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I../turbulenceModels/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/src/TurbulenceModels/turbulenceModels/Make/options b/src/TurbulenceModels/turbulenceModels/Make/options
index bcd627471b..a3ae8da833 100644
--- a/src/TurbulenceModels/turbulenceModels/Make/options
+++ b/src/TurbulenceModels/turbulenceModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
diff --git a/src/combustionModels/Make/options b/src/combustionModels/Make/options
index d1ee86bab4..e660ccd9f6 100644
--- a/src/combustionModels/Make/options
+++ b/src/combustionModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/src/conversion/Make/options b/src/conversion/Make/options
index ace5a3133b..4ff461186c 100644
--- a/src/conversion/Make/options
+++ b/src/conversion/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/src/dynamicFvMesh/Make/options b/src/dynamicFvMesh/Make/options
index 3cee7d2a3c..966b56964d 100644
--- a/src/dynamicFvMesh/Make/options
+++ b/src/dynamicFvMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/src/dynamicMesh/Make/options b/src/dynamicMesh/Make/options
index 5725e0f867..0757c29678 100644
--- a/src/dynamicMesh/Make/options
+++ b/src/dynamicMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
diff --git a/src/engine/Make/options b/src/engine/Make/options
index f16d25abf1..0929e2bc8f 100644
--- a/src/engine/Make/options
+++ b/src/engine/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/src/finiteVolume/Make/options b/src/finiteVolume/Make/options
index 25eb0cc6f8..1c1990e5f3 100644
--- a/src/finiteVolume/Make/options
+++ b/src/finiteVolume/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
index b02f92354f..46a3f5db9d 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
@@ -51,7 +51,7 @@ d2dt2
     (
         vf.mesh(),
         vf.mesh().d2dt2Scheme("d2dt2(" + vf.name() + ')')
-    )().fvmD2dt2(vf);
+    ).ref().fvmD2dt2(vf);
 }
 
 
@@ -67,7 +67,7 @@ d2dt2
     (
         vf.mesh(),
         vf.mesh().d2dt2Scheme("d2dt2(" + rho.name() + ',' + vf.name() + ')')
-    )().fvmD2dt2(rho, vf);
+    ).ref().fvmD2dt2(rho, vf);
 }
 
 
@@ -83,7 +83,7 @@ d2dt2
     (
         vf.mesh(),
         vf.mesh().d2dt2Scheme("d2dt2(" + rho.name() + ',' + vf.name() + ')')
-    )().fvmD2dt2(rho, vf);
+    ).ref().fvmD2dt2(rho, vf);
 }
 
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 91d7384f55..799b5d2198 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -1401,7 +1401,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::correction
      && A.psi().mesh().fluxRequired(A.psi().name())
     )
     {
-        tAcorr().faceFluxCorrectionPtr() = (-A.flux()).ptr();
+        tAcorr.ref().faceFluxCorrectionPtr() = (-A.flux()).ptr();
     }
 
     return tAcorr;
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index 33255e5c14..7f3923aef8 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -406,7 +406,7 @@ fvMeshSubset::interpolate
             patchFields
         )
     );
-    GeometricField<Type, pointPatchField, pointMesh>& resF = tresF();
+    GeometricField<Type, pointPatchField, pointMesh>& resF = tresF.ref();
 
 
     // 2. Change the pointPatchFields to the correct type using a mapper
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
index 186fe7d500..171e47ecd4 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
@@ -77,7 +77,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> singleCellFvMesh::interpolate
             patchFields
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& resF = tresF();
+    GeometricField<Type, fvPatchField, volMesh>& resF = tresF.ref();
 
 
     // 2. Change the fvPatchFields to the correct type using a mapper
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
index 63d132ca50..93a7e01542 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/OpenFOAM/lnInclude
diff --git a/src/fvMotionSolver/Make/options b/src/fvMotionSolver/Make/options
index e0b34247ad..29e4469610 100644
--- a/src/fvMotionSolver/Make/options
+++ b/src/fvMotionSolver/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/src/fvOptions/Make/options b/src/fvOptions/Make/options
index 5598b4ef20..124084c057 100644
--- a/src/fvOptions/Make/options
+++ b/src/fvOptions/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
diff --git a/src/genericPatchFields/Make/options b/src/genericPatchFields/Make/options
index 287318da1f..71b7873964 100644
--- a/src/genericPatchFields/Make/options
+++ b/src/genericPatchFields/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
diff --git a/src/lagrangian/DSMC/Make/options b/src/lagrangian/DSMC/Make/options
index 4f10470b16..55865dfabc 100644
--- a/src/lagrangian/DSMC/Make/options
+++ b/src/lagrangian/DSMC/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/src/lagrangian/basic/Make/options b/src/lagrangian/basic/Make/options
index 4670e80487..f7d9a36f3b 100644
--- a/src/lagrangian/basic/Make/options
+++ b/src/lagrangian/basic/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 9c78fa29f7..04b133ba05 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
diff --git a/src/lagrangian/distributionModels/Make/options b/src/lagrangian/distributionModels/Make/options
index ccd5450e02..41306609f2 100644
--- a/src/lagrangian/distributionModels/Make/options
+++ b/src/lagrangian/distributionModels/Make/options
@@ -1 +1 @@
-EXE_INC = -DCONST_TMP
+EXE_INC =
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index 18eeb81970..a5a3b3c8eb 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
diff --git a/src/lagrangian/molecularDynamics/molecule/Make/options b/src/lagrangian/molecularDynamics/molecule/Make/options
index 6ccac8015b..de95d1b75b 100644
--- a/src/lagrangian/molecularDynamics/molecule/Make/options
+++ b/src/lagrangian/molecularDynamics/molecule/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
diff --git a/src/lagrangian/solidParticle/Make/options b/src/lagrangian/solidParticle/Make/options
index 5cf0265987..9fe79c9220 100644
--- a/src/lagrangian/solidParticle/Make/options
+++ b/src/lagrangian/solidParticle/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options
index d5eb8a74c5..3b5a4e72e9 100644
--- a/src/lagrangian/spray/Make/options
+++ b/src/lagrangian/spray/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
diff --git a/src/lagrangian/turbulence/Make/options b/src/lagrangian/turbulence/Make/options
index 67f1b6608c..7b2fc4bea8 100644
--- a/src/lagrangian/turbulence/Make/options
+++ b/src/lagrangian/turbulence/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options
index 78bd91e593..d37a26a9dd 100644
--- a/src/mesh/autoMesh/Make/options
+++ b/src/mesh/autoMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/src/mesh/blockMesh/Make/options b/src/mesh/blockMesh/Make/options
index d398d1687f..1618ab57ec 100644
--- a/src/mesh/blockMesh/Make/options
+++ b/src/mesh/blockMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
diff --git a/src/mesh/extrudeModel/Make/options b/src/mesh/extrudeModel/Make/options
index 92abbacf67..eabd0b53a8 100644
--- a/src/mesh/extrudeModel/Make/options
+++ b/src/mesh/extrudeModel/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options
index 2f8d1a7b47..1713152e9e 100644
--- a/src/meshTools/Make/options
+++ b/src/meshTools/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude
diff --git a/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C b/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
index 24a3b377da..65875e91fb 100644
--- a/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
+++ b/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
@@ -76,7 +76,7 @@ Foam::fvFieldDecomposer::decomposeField
             patchFields
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& resF = tresF();
+    GeometricField<Type, fvPatchField, volMesh>& resF = tresF.ref();
 
 
     // 2. Change the fvPatchFields to the correct type using a mapper
@@ -246,7 +246,7 @@ Foam::fvFieldDecomposer::decomposeField
             patchFields
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& resF = tresF();
+    GeometricField<Type, fvsPatchField, surfaceMesh>& resF = tresF.ref();
 
 
     // 2. Change the fvsPatchFields to the correct type using a mapper
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
index 1fb0a26ac0..960a65d76a 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
@@ -55,7 +55,7 @@ Foam::tmp<Foam::IOField<Type>> Foam::reconstructLagrangianField
             Field<Type>(0)
         )
     );
-    Field<Type>& field = tfield();
+    Field<Type>& field = tfield.ref();
 
     forAll(meshes, i)
     {
@@ -115,7 +115,7 @@ Foam::reconstructLagrangianFieldField
             Field<Field<Type>>(0)
         )
     );
-    Field<Field<Type>>& field = tfield();
+    Field<Field<Type>>& field = tfield.ref();
 
     forAll(meshes, i)
     {
diff --git a/src/postProcessing/functionObjects/field/Make/options b/src/postProcessing/functionObjects/field/Make/options
index 583c538b9e..0732822dba 100644
--- a/src/postProcessing/functionObjects/field/Make/options
+++ b/src/postProcessing/functionObjects/field/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options
index f50a857be2..ad4e27c196 100644
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \
     -I$(LIB_SRC)/transportModels \
diff --git a/src/randomProcesses/Make/options b/src/randomProcesses/Make/options
index 287318da1f..71b7873964 100644
--- a/src/randomProcesses/Make/options
+++ b/src/randomProcesses/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
diff --git a/src/regionCoupled/Make/options b/src/regionCoupled/Make/options
index 21a2486c48..a9753c5115 100644
--- a/src/regionCoupled/Make/options
+++ b/src/regionCoupled/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
diff --git a/src/regionModels/regionModel/Make/options b/src/regionModels/regionModel/Make/options
index bcd627471b..a3ae8da833 100644
--- a/src/regionModels/regionModel/Make/options
+++ b/src/regionModels/regionModel/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options
index 0cd68b47e8..a0eb4828ea 100644
--- a/src/regionModels/surfaceFilmModels/Make/options
+++ b/src/regionModels/surfaceFilmModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/src/sampling/Make/options b/src/sampling/Make/options
index 15ca6b932f..23e6bc81a7 100644
--- a/src/sampling/Make/options
+++ b/src/sampling/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
diff --git a/src/sixDoFRigidBodyMotion/Make/options b/src/sixDoFRigidBodyMotion/Make/options
index fd1f401690..f2367d2e1d 100644
--- a/src/sixDoFRigidBodyMotion/Make/options
+++ b/src/sixDoFRigidBodyMotion/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \
diff --git a/src/surfMesh/Make/options b/src/surfMesh/Make/options
index 079607db05..7e207d0dbe 100644
--- a/src/surfMesh/Make/options
+++ b/src/surfMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude
 
 LIB_LIBS = \
diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options
index 3dac244d79..c4f0b2a8a9 100644
--- a/src/thermophysicalModels/SLGThermo/Make/options
+++ b/src/thermophysicalModels/SLGThermo/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Make/options b/src/thermophysicalModels/barotropicCompressibilityModel/Make/options
index 287318da1f..71b7873964 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Make/options
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
diff --git a/src/thermophysicalModels/basic/Make/options b/src/thermophysicalModels/basic/Make/options
index 95f178b455..b5c859baf1 100644
--- a/src/thermophysicalModels/basic/Make/options
+++ b/src/thermophysicalModels/basic/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options
index 7a1e7f43d2..de52d7e6ae 100644
--- a/src/thermophysicalModels/chemistryModel/Make/options
+++ b/src/thermophysicalModels/chemistryModel/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/src/thermophysicalModels/laminarFlameSpeed/Make/options b/src/thermophysicalModels/laminarFlameSpeed/Make/options
index 925d4a58aa..f97edb8458 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/Make/options
+++ b/src/thermophysicalModels/laminarFlameSpeed/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options
index 690761730f..6e1d19dbb6 100644
--- a/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options
+++ b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
diff --git a/src/thermophysicalModels/properties/liquidProperties/Make/options b/src/thermophysicalModels/properties/liquidProperties/Make/options
index e1fbd3ed45..b964b61294 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Make/options
+++ b/src/thermophysicalModels/properties/liquidProperties/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
 
 LIB_LIBS = \
diff --git a/src/thermophysicalModels/properties/solidMixtureProperties/Make/options b/src/thermophysicalModels/properties/solidMixtureProperties/Make/options
index 97cc509212..f2d8f809d5 100644
--- a/src/thermophysicalModels/properties/solidMixtureProperties/Make/options
+++ b/src/thermophysicalModels/properties/solidMixtureProperties/Make/options
@@ -1,3 +1,3 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I${LIB_SRC}/thermophysicalModels/properties/solidProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
diff --git a/src/thermophysicalModels/properties/solidProperties/Make/options b/src/thermophysicalModels/properties/solidProperties/Make/options
index f8779f538f..848cce789f 100644
--- a/src/thermophysicalModels/properties/solidProperties/Make/options
+++ b/src/thermophysicalModels/properties/solidProperties/Make/options
@@ -1,2 +1,2 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiation/Make/options
index ea189b0b63..726b76e764 100644
--- a/src/thermophysicalModels/radiation/Make/options
+++ b/src/thermophysicalModels/radiation/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/src/thermophysicalModels/reactionThermo/Make/options b/src/thermophysicalModels/reactionThermo/Make/options
index bded2d7118..f59f44fc8d 100644
--- a/src/thermophysicalModels/reactionThermo/Make/options
+++ b/src/thermophysicalModels/reactionThermo/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/src/thermophysicalModels/solidChemistryModel/Make/options b/src/thermophysicalModels/solidChemistryModel/Make/options
index e922aa724f..e871169b17 100644
--- a/src/thermophysicalModels/solidChemistryModel/Make/options
+++ b/src/thermophysicalModels/solidChemistryModel/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
diff --git a/src/thermophysicalModels/solidSpecie/Make/options b/src/thermophysicalModels/solidSpecie/Make/options
index 85a93d1d17..bdc8b074c0 100644
--- a/src/thermophysicalModels/solidSpecie/Make/options
+++ b/src/thermophysicalModels/solidSpecie/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
 
 LIB_LIBS = \
diff --git a/src/thermophysicalModels/solidThermo/Make/options b/src/thermophysicalModels/solidThermo/Make/options
index c84b6c5546..d3e1cb87ce 100644
--- a/src/thermophysicalModels/solidThermo/Make/options
+++ b/src/thermophysicalModels/solidThermo/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/src/topoChangerFvMesh/Make/options b/src/topoChangerFvMesh/Make/options
index 82165ae6e5..44753e64c9 100644
--- a/src/topoChangerFvMesh/Make/options
+++ b/src/topoChangerFvMesh/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/src/transportModels/compressible/Make/options b/src/transportModels/compressible/Make/options
index 287318da1f..71b7873964 100644
--- a/src/transportModels/compressible/Make/options
+++ b/src/transportModels/compressible/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
diff --git a/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options b/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options
index 138dcbf7f5..4ae2fbf966 100644
--- a/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options
+++ b/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I.. \
     -I../incompressible/lnInclude \
     -I../interfaceProperties/lnInclude \
diff --git a/src/transportModels/incompressible/Make/options b/src/transportModels/incompressible/Make/options
index c55a98a0b6..46aa26d4ad 100644
--- a/src/transportModels/incompressible/Make/options
+++ b/src/transportModels/incompressible/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I.. \
     -I../twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/src/transportModels/interfaceProperties/Make/options b/src/transportModels/interfaceProperties/Make/options
index efbf1b41ca..cc63db7dcc 100644
--- a/src/transportModels/interfaceProperties/Make/options
+++ b/src/transportModels/interfaceProperties/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \
     -I$(LIB_SRC)/finiteVolume/lnInclude
diff --git a/src/transportModels/twoPhaseMixture/Make/options b/src/transportModels/twoPhaseMixture/Make/options
index 287318da1f..71b7873964 100644
--- a/src/transportModels/twoPhaseMixture/Make/options
+++ b/src/transportModels/twoPhaseMixture/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
diff --git a/src/transportModels/twoPhaseProperties/Make/options b/src/transportModels/twoPhaseProperties/Make/options
index 547d45694c..32ce36b959 100644
--- a/src/transportModels/twoPhaseProperties/Make/options
+++ b/src/transportModels/twoPhaseProperties/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
diff --git a/src/triSurface/Make/options b/src/triSurface/Make/options
index 948c54f756..9ee5884e59 100644
--- a/src/triSurface/Make/options
+++ b/src/triSurface/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -DCONST_TMP \
+EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude
 

From 93d7a419aad80ebcb235d31cf8986e2a706be1f8 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Fri, 26 Feb 2016 16:12:50 -0600
Subject: [PATCH 228/447] Packaged coordinateSystem: updated localAxesRotation
 -> cylindrical

---
 etc/caseDicts/general/coordinateSystem/cylindrical | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/caseDicts/general/coordinateSystem/cylindrical b/etc/caseDicts/general/coordinateSystem/cylindrical
index ff5b3559d3..f1ddea960e 100644
--- a/etc/caseDicts/general/coordinateSystem/cylindrical
+++ b/etc/caseDicts/general/coordinateSystem/cylindrical
@@ -17,7 +17,7 @@ FoamFile
 type      cartesian;
 coordinateRotation
 {
-    type  localAxesRotation;
+    type  cylindrical;
     e3    $axis;
 }
 

From 0830ace954605b57a480c453f91fed33cceaf6c4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 27 Feb 2016 18:11:09 +0000
Subject: [PATCH 229/447] tmp: Limit the number of references to a temporary
 object to 2 which reduces the number of potential problems with the reuse of
 temporary objects.

In order to avoid unnecessary creation of tmp's referring to temporary
objects the assignment operator now transfers ownership of the object
and resets the argument.
---
 src/OpenFOAM/memory/tmp/tmp.H  |  5 +++++
 src/OpenFOAM/memory/tmp/tmpI.H | 24 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 9afb78bcfe..72a49def8f 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -70,6 +70,11 @@ class tmp
         mutable T* ptr_;
 
 
+    // Private member operators
+
+        inline void operator++();
+
+
 public:
 
     // Constructors
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index 819c471428..a0dfdc6d23 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -26,6 +26,23 @@ License
 #include "error.H"
 #include <typeinfo>
 
+// * * * * * * * * * * * * * Private Member Operators  * * * * * * * * * * * //
+
+template<class T>
+inline void Foam::tmp<T>::operator++()
+{
+    ptr_->operator++();
+
+    if (ptr_->count() > 1)
+    {
+        FatalErrorInFunction
+            << "Attempt to create more than 2 tmp's referring to"
+               " the same object of type " << typeName()
+            << abort(FatalError);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
@@ -62,7 +79,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t)
     {
         if (ptr_)
         {
-            ptr_->operator++();
+            operator++();
         }
         else
         {
@@ -90,7 +107,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
             }
             else
             {
-                ptr_->operator++();
+                operator++();
             }
         }
         else
@@ -342,8 +359,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
         }
 
         ptr_ = t.ptr_;
-
-        ptr_->operator++();
+        t.ptr_ = 0;
     }
     else
     {

From 0db8ff34fd8683f02aa5a7b5cdc45500b4e6f1e7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 28 Feb 2016 18:21:58 +0000
Subject: [PATCH 230/447] src/OpenFOAM/containers: Updated formatting and
 comments

---
 .../Dictionaries/Dictionary/Dictionary.H      |  4 +-
 .../DictionaryBase/DictionaryBase.C           | 10 +--
 .../DictionaryBase/DictionaryBase.H           |  4 +-
 .../PtrDictionary/PtrDictionary.H             |  4 +-
 .../PtrListDictionary/PtrListDictionary.H     |  4 +-
 .../Dictionaries/UDictionary/UDictionary.H    |  4 +-
 .../UPtrDictionary/UPtrDictionary.H           |  4 +-
 .../HashTables/HashPtrTable/HashPtrTable.C    |  4 +-
 .../HashTables/HashPtrTable/HashPtrTable.H    |  4 +-
 .../containers/HashTables/HashSet/HashSet.C   |  3 +-
 .../containers/HashTables/HashSet/HashSet.H   |  2 +-
 .../HashTables/HashTable/HashTable.C          | 10 +--
 .../HashTables/HashTable/HashTable.H          |  4 +-
 .../StaticHashTable/StaticHashTable.H         |  4 +-
 .../StaticHashTable/StaticHashTableI.H        |  8 +-
 .../LinkedLists/accessTypes/ILList/ILList.H   |  4 +-
 .../LinkedLists/accessTypes/LList/LList.H     |  4 +-
 .../accessTypes/LPtrList/LPtrList.H           |  4 +-
 .../LinkedLists/accessTypes/UILList/UILList.C |  3 +-
 .../LinkedLists/accessTypes/UILList/UILList.H |  4 +-
 src/OpenFOAM/containers/Lists/BinSum/BinSum.H |  4 +-
 .../Lists/CompactListList/CompactListList.H   |  4 +-
 .../Lists/Distribution/Distribution.H         |  2 +-
 .../Lists/DynamicList/DynamicList.H           |  2 +-
 .../Lists/DynamicList/DynamicListI.H          | 86 ++++++++++---------
 .../containers/Lists/FixedList/FixedList.H    |  2 +-
 .../containers/Lists/FixedList/FixedListI.H   | 26 +++---
 .../containers/Lists/Histogram/Histogram.H    |  6 +-
 src/OpenFOAM/containers/Lists/List/List.H     |  4 +-
 .../Lists/ListListOps/ListListOps.H           |  4 +-
 .../containers/Lists/ListOps/ListOps.H        |  4 +-
 .../Lists/ListOps/ListOpsTemplates.C          |  4 +-
 .../containers/Lists/PackedList/PackedList.C  |  6 +-
 .../containers/Lists/PackedList/PackedList.H  |  2 +-
 .../containers/Lists/PackedList/PackedListI.H | 58 ++++++-------
 .../containers/Lists/PtrList/PtrList.H        |  4 +-
 .../Lists/SortableList/ParSortableList.C      |  6 +-
 .../Lists/SortableList/ParSortableList.H      |  4 +-
 .../Lists/SortableList/SortableList.H         |  2 +-
 .../containers/Lists/SubList/SubListI.H       |  8 +-
 .../Lists/UIndirectList/UIndirectList.H       |  4 +-
 src/OpenFOAM/containers/Lists/UList/UList.H   |  6 +-
 src/OpenFOAM/containers/Lists/UList/UListI.H  | 18 ++--
 .../containers/Lists/UPtrList/UPtrList.H      |  4 +-
 src/OpenFOAM/containers/NamedEnum/NamedEnum.H |  4 +-
 45 files changed, 165 insertions(+), 201 deletions(-)

diff --git a/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H b/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H
index 85901731f2..98be8b170c 100644
--- a/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Dictionary.C"
+    #include "Dictionary.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
index 8ddb9e062d..9693eb9488 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,6 @@ Foam::DictionaryBase<IDLListType, T>::DictionaryBase(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Find and return T
 template<class IDLListType, class T>
 bool Foam::DictionaryBase<IDLListType, T>::found(const word& keyword) const
 {
@@ -96,7 +95,6 @@ bool Foam::DictionaryBase<IDLListType, T>::found(const word& keyword) const
 }
 
 
-// Find and return T*, return NULL if not found
 template<class IDLListType, class T>
 const T* Foam::DictionaryBase<IDLListType, T>::lookupPtr
 (
@@ -116,7 +114,6 @@ const T* Foam::DictionaryBase<IDLListType, T>::lookupPtr
 }
 
 
-// Find and return T*, return NULL if not found
 template<class IDLListType, class T>
 T* Foam::DictionaryBase<IDLListType, T>::lookupPtr(const word& keyword)
 {
@@ -133,7 +130,6 @@ T* Foam::DictionaryBase<IDLListType, T>::lookupPtr(const word& keyword)
 }
 
 
-// Find and return T*, FatalError if keyword not found
 template<class IDLListType, class T>
 const T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword) const
 {
@@ -150,7 +146,6 @@ const T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword) const
 }
 
 
-// Find and return T*, FatalError if keyword not found
 template<class IDLListType, class T>
 T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword)
 {
@@ -167,7 +162,6 @@ T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword)
 }
 
 
-// Return the table of contents
 template<class IDLListType, class T>
 Foam::wordList Foam::DictionaryBase<IDLListType, T>::toc() const
 {
@@ -188,7 +182,6 @@ Foam::wordList Foam::DictionaryBase<IDLListType, T>::toc() const
 }
 
 
-// Add at head of dictionary
 template<class IDLListType, class T>
 void Foam::DictionaryBase<IDLListType, T>::insert(const word& keyword, T* tPtr)
 {
@@ -198,7 +191,6 @@ void Foam::DictionaryBase<IDLListType, T>::insert(const word& keyword, T* tPtr)
 }
 
 
-// Add at tail of dictionary
 template<class IDLListType, class T>
 void Foam::DictionaryBase<IDLListType, T>::append(const word& keyword, T* tPtr)
 {
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
index f9294eedd0..9b85e01594 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -183,7 +183,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DictionaryBase.C"
+    #include "DictionaryBase.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
index a287e326cb..974a967890 100644
--- a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PtrDictionary.C"
+    #include "PtrDictionary.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H b/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H
index 761bccd76e..ab45e2c491 100644
--- a/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PtrListDictionary.C"
+    #include "PtrListDictionary.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Dictionaries/UDictionary/UDictionary.H b/src/OpenFOAM/containers/Dictionaries/UDictionary/UDictionary.H
index efe4542b0c..b01140d283 100644
--- a/src/OpenFOAM/containers/Dictionaries/UDictionary/UDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/UDictionary/UDictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "UDictionary.C"
+    #include "UDictionary.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H b/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H
index f83825a327..6be6c44a65 100644
--- a/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "UPtrDictionary.C"
+    #include "UPtrDictionary.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
index 4f6ad375ab..df115134ef 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct given initial table size
 template<class T, class Key, class Hash>
 Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(const label size)
 :
@@ -36,7 +35,6 @@ Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(const label size)
 {}
 
 
-// Construct as copy
 template<class T, class Key, class Hash>
 Foam::HashPtrTable<T, Key, Hash>::HashPtrTable
 (
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index 783e579989..796076fe22 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,7 +153,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "HashPtrTable.C"
+    #include "HashPtrTable.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
index 814fcdcc8c..08dc33d3cf 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,7 +166,6 @@ void Foam::HashSet<Key, Hash>::operator^=(const HashSet<Key, Hash>& rhs)
 }
 
 
-// same as HashTable::erase()
 template<class Key, class Hash>
 void Foam::HashSet<Key, Hash>::operator-=(const HashSet<Key, Hash>& rhs)
 {
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index 513efd8c9b..bbc04789bd 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -218,7 +218,7 @@ typedef HashSet<label, Hash<label>> labelHashSet;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "HashSet.C"
+    #include "HashSet.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index a76846247d..9755dc56c1 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -363,15 +363,13 @@ bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
 }
 
 
-
-// NOTE:
-// We use (const iterator&) here, but manipulate its contents anyhow.
-// The parameter should be (iterator&), but then the compiler doesn't find
-// it correctly and tries to call as (iterator) instead.
-//
 template<class T, class Key, class Hash>
 bool Foam::HashTable<T, Key, Hash>::erase(const iterator& iter)
 {
+    // NOTE: We use (const iterator&) here, but manipulate its contents anyhow.
+    // The parameter should be (iterator&), but then the compiler doesn't find
+    // it correctly and tries to call as (iterator) instead.
+    //
     // Adjust iterator after erase
     return const_cast<iterator&>(iter).erase();
 }
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index b24990f5c1..f213768738 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -546,13 +546,13 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "HashTableI.H"
+    #include "HashTableI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifndef NoHashTableC
 #ifdef NoRepository
-#   include "HashTable.C"
+    #include "HashTable.C"
 #endif
 #endif
 
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
index d10ae72bb4..67dfdfa5a9 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
@@ -397,13 +397,13 @@ private:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "StaticHashTableI.H"
+    #include "StaticHashTableI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifndef NoStaticHashTableC
 #ifdef NoRepository
-#   include "StaticHashTable.C"
+    #include "StaticHashTable.C"
 #endif
 #endif
 
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
index 50030eae94..cebb3852aa 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
@@ -345,12 +345,12 @@ Foam::StaticHashTable<T, Key, Hash>::begin()
         }
     }
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (debug)
     {
         Info<< "StaticHashTable is empty\n";
     }
-#   endif
+    #endif
 
     return StaticHashTable<T, Key, Hash>::endIter_;
 }
@@ -377,12 +377,12 @@ Foam::StaticHashTable<T, Key, Hash>::cbegin() const
         }
     }
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (debug)
     {
         Info<< "StaticHashTable is empty\n";
     }
-#   endif
+    #endif
 
     return StaticHashTable<T, Key, Hash>::endConstIter_;
 }
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
index 893095d15b..3a25cfad7a 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,7 +147,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ILList.C"
+    #include "ILList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
index e8a9ff22d4..fd1c3e0aef 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -368,7 +368,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LList.C"
+    #include "LList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
index 0ef461ccde..e2b7e49a5a 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -270,7 +270,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LPtrList.C"
+    #include "LPtrList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C
index 9afa118da0..0a7f057286 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,6 @@ bool Foam::UILList<LListBase, T>::operator==
 }
 
 
-// Comparison for inequality
 template<class LListBase, class T>
 bool Foam::UILList<LListBase, T>::operator!=
 (
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
index b2ec4c8fca..28d1231762 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -380,7 +380,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "UILList.C"
+    #include "UILList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/BinSum/BinSum.H b/src/OpenFOAM/containers/Lists/BinSum/BinSum.H
index 3cf09bc3a7..dc7d72c4cb 100644
--- a/src/OpenFOAM/containers/Lists/BinSum/BinSum.H
+++ b/src/OpenFOAM/containers/Lists/BinSum/BinSum.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,7 +139,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "BinSum.C"
+    #include "BinSum.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index 91c6b98fec..d5764ba08d 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -254,12 +254,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "CompactListListI.H"
+    #include "CompactListListI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CompactListList.C"
+    #include "CompactListList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
index 89e9eb5cd4..5ef5d4de3a 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
@@ -197,7 +197,7 @@ Distribution<Type> operator+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Distribution.C"
+    #include "Distribution.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index e4a0b14253..893804bb32 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -254,7 +254,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DynamicList.C"
+    #include "DynamicList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 802cf9b17a..d62f00006c 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -44,7 +44,7 @@ inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
     List<T>(nElem),
     capacity_(nElem)
 {
-    // we could also enforce SizeInc granularity when (!SizeMult || !SizeDiv)
+    // We could also enforce SizeInc granularity when (!SizeMult || !SizeDiv)
     List<T>::size(0);
 }
 
@@ -115,10 +115,11 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setCapacity
 
     if (nextFree > capacity_)
     {
-        // truncate addressed sizes too
+        // Truncate addressed sizes too
         nextFree = capacity_;
     }
-    // we could also enforce SizeInc granularity when (!SizeMult || !SizeDiv)
+
+    // We could also enforce SizeInc granularity when (!SizeMult || !SizeDiv)
 
     List<T>::setSize(capacity_);
     List<T>::size(nextFree);
@@ -131,21 +132,21 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::reserve
     const label nElem
 )
 {
-    // allocate more capacity?
+    // Allocate more capacity?
     if (nElem > capacity_)
     {
-// TODO: convince the compiler that division by zero does not occur
-//        if (SizeInc && (!SizeMult || !SizeDiv))
-//        {
-//            // resize with SizeInc as the granularity
-//            capacity_ = nElem;
-//            unsigned pad = SizeInc - (capacity_ % SizeInc);
-//            if (pad != SizeInc)
-//            {
-//                capacity_ += pad;
-//            }
-//        }
-//        else
+        // TODO: convince the compiler that division by zero does not occur
+        //        if (SizeInc && (!SizeMult || !SizeDiv))
+        //        {
+        //            // resize with SizeInc as the granularity
+        //            capacity_ = nElem;
+        //            unsigned pad = SizeInc - (capacity_ % SizeInc);
+        //            if (pad != SizeInc)
+        //            {
+        //                capacity_ += pad;
+        //            }
+        //        }
+        //        else
         {
             capacity_ = max
             (
@@ -154,7 +155,7 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::reserve
             );
         }
 
-        // adjust allocated size, leave addressed size untouched
+        // Adjust allocated size, leave addressed size untouched
         label nextFree = List<T>::size();
         List<T>::setSize(capacity_);
         List<T>::size(nextFree);
@@ -168,21 +169,21 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setSize
     const label nElem
 )
 {
-    // allocate more capacity?
+    // Allocate more capacity?
     if (nElem > capacity_)
     {
-// TODO: convince the compiler that division by zero does not occur
-//        if (SizeInc && (!SizeMult || !SizeDiv))
-//        {
-//            // resize with SizeInc as the granularity
-//            capacity_ = nElem;
-//            unsigned pad = SizeInc - (capacity_ % SizeInc);
-//            if (pad != SizeInc)
-//            {
-//                capacity_ += pad;
-//            }
-//        }
-//        else
+        // TODO: convince the compiler that division by zero does not occur
+        //        if (SizeInc && (!SizeMult || !SizeDiv))
+        //        {
+        //            // resize with SizeInc as the granularity
+        //            capacity_ = nElem;
+        //            unsigned pad = SizeInc - (capacity_ % SizeInc);
+        //            if (pad != SizeInc)
+        //            {
+        //                capacity_ += pad;
+        //            }
+        //        }
+        //        else
         {
             capacity_ = max
             (
@@ -194,7 +195,7 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setSize
         List<T>::setSize(capacity_);
     }
 
-    // adjust addressed size
+    // Adjust addressed size
     List<T>::size(nElem);
 }
 
@@ -209,7 +210,7 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setSize
     label nextFree = List<T>::size();
     setSize(nElem);
 
-    // set new elements to constant value
+    // Set new elements to constant value
     while (nextFree < nElem)
     {
         this->operator[](nextFree++) = t;
@@ -260,10 +261,10 @@ Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::shrink()
     label nextFree = List<T>::size();
     if (capacity_ > nextFree)
     {
-        // use the full list when resizing
+        // Use the full list when resizing
         List<T>::size(capacity_);
 
-        // the new size
+        // The new size
         capacity_ = nextFree;
         List<T>::setSize(capacity_);
         List<T>::size(nextFree);
@@ -277,7 +278,7 @@ inline void
 Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::transfer(List<T>& lst)
 {
     capacity_ = lst.size();
-    List<T>::transfer(lst);   // take over storage, clear addressing for lst.
+    List<T>::transfer(lst);   // Take over storage, clear addressing for lst.
 }
 
 
@@ -288,7 +289,7 @@ Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::transfer
     DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
 )
 {
-    // take over storage as-is (without shrink), clear addressing for lst.
+    // Take over storage as-is (without shrink), clear addressing for lst.
     capacity_ = lst.capacity_;
     lst.capacity_ = 0;
 
@@ -421,13 +422,13 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
 
     if (capacity_ >= lst.size())
     {
-        // can copy w/o reallocating, match initial size to avoid reallocation
+        // Can copy w/o reallocating, match initial size to avoid reallocation
         List<T>::size(lst.size());
         List<T>::operator=(lst);
     }
     else
     {
-        // make everything available for the copy operation
+        // Make everything available for the copy operation
         List<T>::size(capacity_);
 
         List<T>::operator=(lst);
@@ -444,13 +445,13 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
 {
     if (capacity_ >= lst.size())
     {
-        // can copy w/o reallocating, match initial size to avoid reallocation
+        // Can copy w/o reallocating, match initial size to avoid reallocation
         List<T>::size(lst.size());
         List<T>::operator=(lst);
     }
     else
     {
-        // make everything available for the copy operation
+        // Make everything available for the copy operation
         List<T>::size(capacity_);
 
         List<T>::operator=(lst);
@@ -467,13 +468,13 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
 {
     if (capacity_ >= lst.size())
     {
-        // can copy w/o reallocating, match initial size to avoid reallocation
+        // Can copy w/o reallocating, match initial size to avoid reallocation
         List<T>::size(lst.size());
         List<T>::operator=(lst);
     }
     else
     {
-        // make everything available for the copy operation
+        // Make everything available for the copy operation
         List<T>::size(capacity_);
 
         List<T>::operator=(lst);
@@ -481,4 +482,5 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
     }
 }
 
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index ed0fbc12b2..c7974940c5 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -365,7 +365,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "FixedList.C"
+    #include "FixedList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index a647069599..0b0daf1d71 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -125,7 +125,6 @@ inline Foam::label Foam::FixedList<T, Size>::rcIndex(const label i) const
 }
 
 
-// Check start is within valid range (0 ... size-1).
 template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::checkStart(const label start) const
 {
@@ -138,7 +137,6 @@ inline void Foam::FixedList<T, Size>::checkStart(const label start) const
 }
 
 
-// Check size is within valid range (0 ... size).
 template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::checkSize(const label size) const
 {
@@ -151,8 +149,6 @@ inline void Foam::FixedList<T, Size>::checkSize(const label size) const
 }
 
 
-// Check index i is within valid range (0 ... size-1)
-// The check for zero-sized list is already done in static assert
 template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::checkIndex(const label i) const
 {
@@ -168,17 +164,17 @@ inline void Foam::FixedList<T, Size>::checkIndex(const label i) const
 template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::resize(const label s)
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     checkSize(s);
-#   endif
+    #endif
 }
 
 template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::setSize(const label s)
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     checkSize(s);
-#   endif
+    #endif
 }
 
 template<class T, unsigned Size>
@@ -237,24 +233,22 @@ inline const T& Foam::FixedList<T, Size>::last() const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-// element access
 template<class T, unsigned Size>
 inline T& Foam::FixedList<T, Size>::operator[](const label i)
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     checkIndex(i);
-#   endif
+    #endif
     return v_[i];
 }
 
 
-// const element access
 template<class T, unsigned Size>
 inline const T& Foam::FixedList<T, Size>::operator[](const label i) const
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     checkIndex(i);
-#   endif
+    #endif
     return v_[i];
 }
 
@@ -435,12 +429,12 @@ inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
 {
     if (contiguous<T>())
     {
-        // hash directly
+        // Hash directly
         return Hasher(lst.v_, sizeof(lst.v_), seed);
     }
     else
     {
-        // hash incrementally
+        // Hash incrementally
         unsigned val = seed;
 
         for (unsigned i=0; i<Size; i++)
diff --git a/src/OpenFOAM/containers/Lists/Histogram/Histogram.H b/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
index 7cdf6ebda3..5b4b5a9b22 100644
--- a/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
+++ b/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,12 +120,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//#   include "HistogramI.H"
+//    #include "HistogramI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Histogram.C"
+    #include "Histogram.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 4f8859e32c..d86ea02251 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -251,12 +251,12 @@ List<T> readList(Istream&);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "ListI.H"
+    #include "ListI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "List.C"
+    #include "List.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
index 02afe8abf3..ab9dfd4e49 100644
--- a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,7 +150,7 @@ namespace ListListOps
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ListListOps.C"
+    #include "ListListOps.C"
 #endif
 
 
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index c322c7856f..82be15ee5a 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -291,7 +291,7 @@ void inplaceRotateList(ListType<DataType>& list, label n);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ListOpsTemplates.C"
+    #include "ListOpsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 7421eabbce..7194a89eb7 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -411,8 +411,6 @@ void Foam::inplaceSubset
 }
 
 
-// As clarification:
-// coded as inversion from pointEdges to edges but completely general.
 template<class InList, class OutList>
 void Foam::invertManyToMany
 (
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 576471c9a9..5e0487ebcd 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -31,7 +31,7 @@ License
 
 #if (UINT_MAX == 0xFFFFFFFF)
 // 32-bit counting, Hamming weight method
-#   define COUNT_PACKEDBITS(sum, x)                                            \
+    #define COUNT_PACKEDBITS(sum, x)                                            \
 {                                                                              \
     x -= (x >> 1) & 0x55555555;                                                \
     x = (x & 0x33333333) + ((x >> 2) & 0x33333333);                            \
@@ -39,7 +39,7 @@ License
 }
 #elif (UINT_MAX == 0xFFFFFFFFFFFFFFFF)
 // 64-bit counting, Hamming weight method
-#   define COUNT_PACKEDBITS(sum, x)                                            \
+    #define COUNT_PACKEDBITS(sum, x)                                            \
 {                                                                              \
     x -= (x >> 1) & 0x5555555555555555;                                        \
     x = (x & 0x3333333333333333) + ((x >> 2) & 0x3333333333333333);            \
@@ -47,7 +47,7 @@ License
 }
 #else
 // Arbitrary number of bits, Brian Kernighan's method
-#   define COUNT_PACKEDBITS(sum, x)    for (; x; ++sum) { x &= x - 1; }
+    #define COUNT_PACKEDBITS(sum, x)    for (; x; ++sum) { x &= x - 1; }
 #endif
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 7f038c159b..078a4dde9f 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -639,7 +639,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PackedList.C"
+    #include "PackedList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 4b6898cf5e..69d68a8b32 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -52,7 +52,7 @@ inline unsigned int Foam::PackedList<nBits>::packing()
 template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::maskLower(unsigned offset)
 {
-    // return (1u << (nBits * offset)) - 1;
+    // Return (1u << (nBits * offset)) - 1;
     // The next one works more reliably with overflows
     // eg, when compiled without optimization
     return (~0u >> ( sizeof(StorageType)*CHAR_BIT - nBits * offset));
@@ -266,8 +266,6 @@ Foam::PackedList<nBits>::clone() const
 
 // * * * * * * * * * * * * * * * * Iterators * * * * * * * * * * * * * * * * //
 
-// iteratorBase
-
 template<unsigned nBits>
 inline Foam::PackedList<nBits>::iteratorBase::iteratorBase()
 :
@@ -315,7 +313,7 @@ Foam::PackedList<nBits>::iteratorBase::set(const unsigned int val)
 
     if (val >= max_value())
     {
-        // overflow is max_value, fill everything
+        // Overflow is max_value, fill everything
         stored |= mask;
     }
     else
@@ -372,7 +370,7 @@ inline void Foam::PackedList<nBits>::iteratorBase::operator=
     const unsigned int val
 )
 {
-    // lazy evaluation - increase size on assigment
+    // Lazy evaluation - increase size on assigment
     if (index_ >= list_->size_)
     {
         list_->resize(index_ + 1);
@@ -386,7 +384,7 @@ template<unsigned nBits>
 inline Foam::PackedList<nBits>::iteratorBase::operator
 unsigned int () const
 {
-    // lazy evaluation - return 0 for out-of-range
+    // Lazy evaluation - return 0 for out-of-range
     if (index_ >= list_->size_)
     {
         return 0;
@@ -396,8 +394,6 @@ unsigned int () const
 }
 
 
-// const_iterator, iterator
-
 template<unsigned nBits>
 inline Foam::PackedList<nBits>::iterator::iterator()
 :
@@ -420,7 +416,7 @@ inline Foam::PackedList<nBits>::iterator::iterator
 :
     iteratorBase(iter)
 {
-    // avoid going past end()
+    // Avoid going past end()
     // eg, iter = iterator(list, Inf)
     if (this->index_ > this->list_->size_)
     {
@@ -437,7 +433,7 @@ inline Foam::PackedList<nBits>::const_iterator::const_iterator
 :
     iteratorBase(iter)
 {
-    // avoid going past end()
+    // Avoid going past end()
     // eg, iter = iterator(list, Inf)
     if (this->index_ > this->list_->size_)
     {
@@ -527,7 +523,7 @@ inline void Foam::PackedList<nBits>::iterator::operator=
     this->list_  = iter.list_;
     this->index_ = iter.index_;
 
-    // avoid going past end()
+    // Avoid going past end()
     // eg, iter = iterator(list, Inf)
     if (this->index_ > this->list_->size_)
     {
@@ -545,7 +541,7 @@ inline void Foam::PackedList<nBits>::const_iterator::operator=
     this->list_  = iter.list_;
     this->index_ = iter.index_;
 
-    // avoid going past end()
+    // Avoid going past end()
     // eg, iter = iterator(list, Inf)
     if (this->index_ > this->list_->size_)
     {
@@ -742,15 +738,15 @@ inline void Foam::PackedList<nBits>::resize
 
     if (size_ > oldSize)
     {
-        // fill new elements or newly exposed elements
+        // Fill new elements or newly exposed elements
         if (val)
         {
-            // fill value for complete segments
+            // Fill value for complete segments
             unsigned int fill = val;
 
             if (val >= max_value())
             {
-                // fill everything
+                // Fill everything
                 fill = maskLower(packing());
             }
             else
@@ -761,7 +757,7 @@ inline void Foam::PackedList<nBits>::resize
                 }
             }
 
-            // fill in complete segments
+            // Fill in complete segments
             const label oldLen = packedLength(oldSize);
             const label newLen = packedLength(size_);
             for (label i=oldLen; i < newLen; ++i)
@@ -769,7 +765,7 @@ inline void Foam::PackedList<nBits>::resize
                 StorageList::operator[](i) = fill;
             }
 
-            // finish previous partial segment, preserve existing value
+            // Finish previous partial segment, preserve existing value
             {
                 const unsigned int off = oldSize % packing();
                 if (off)
@@ -783,7 +779,7 @@ inline void Foam::PackedList<nBits>::resize
             }
 
 
-            // mask off the (new) final partial segment
+            // Mask off the (new) final partial segment
             {
                 const unsigned int off = size_ % packing();
                 if (off)
@@ -797,10 +793,10 @@ inline void Foam::PackedList<nBits>::resize
     }
     else if (size_ < oldSize)
     {
-        // resize shrinking
+        // Resize shrinking
         // - clear newly exposed elements
 
-        // fill in complete segments
+        // Fill in complete segments
         const label oldLen = packedLength(oldSize);
         const label newLen = packedLength(size_);
         for (label i=newLen; i < oldLen; ++i)
@@ -808,7 +804,7 @@ inline void Foam::PackedList<nBits>::resize
             StorageList::operator[](i) = 0u;
         }
 
-        // mask off the final partial segment
+        // Mask off the final partial segment
         {
             const unsigned int off = size_ % packing();
             if (off)
@@ -846,12 +842,12 @@ inline void Foam::PackedList<nBits>::setCapacity(const label nElem)
 {
     StorageList::setSize(packedLength(nElem), 0u);
 
-    // truncate addressed size too
+    // Truncate addressed size too
     if (size_ > nElem)
     {
         size_ = nElem;
 
-        // mask off the final partial segment
+        // Mask off the final partial segment
         const unsigned int off = size_ % packing();
         if (off)
         {
@@ -868,7 +864,7 @@ inline void Foam::PackedList<nBits>::reserve(const label nElem)
 {
     const label len = packedLength(nElem);
 
-    // need more capacity?
+    // Need more capacity?
     if (len > StorageList::size())
     {
         // Like DynamicList with SizeInc=0, SizeMult=2, SizeDiv=1
@@ -911,7 +907,7 @@ inline void Foam::PackedList<nBits>::clearStorage()
 template<unsigned nBits>
 inline void Foam::PackedList<nBits>::shrink()
 {
-    // any uneed space allocated?
+    // Any uneed space allocated?
     const label len = packedLength();
     if (len < StorageList::size())
     {
@@ -967,7 +963,7 @@ inline Foam::Xfer<Foam::PackedList<nBits>> Foam::PackedList<nBits>::xfer()
 template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::get(const label i) const
 {
-    // lazy evaluation - return 0 for out-of-range
+    // Lazy evaluation - return 0 for out-of-range
     if (i < 0 || i >= size_)
     {
         return 0;
@@ -982,7 +978,7 @@ inline unsigned int Foam::PackedList<nBits>::get(const label i) const
 template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::operator[](const label i) const
 {
-    // lazy evaluation - return 0 for out-of-range
+    // Lazy evaluation - return 0 for out-of-range
     if (i < 0 || i >= size_)
     {
         return 0;
@@ -1003,12 +999,12 @@ inline bool Foam::PackedList<nBits>::set
 {
     if (i < 0)
     {
-        // lazy evaluation - ignore out-of-bounds
+        // Lazy evaluation - ignore out-of-bounds
         return false;
     }
     else if (i >= size_)
     {
-        // lazy evaluation - increase size on assigment
+        // Lazy evaluation - increase size on assigment
         resize(i + 1);
     }
 
@@ -1080,7 +1076,7 @@ inline void Foam::PackedList<nBits>::operator=(const unsigned int val)
 
         if (val >= max_value())
         {
-            // fill everything
+            // Fill everything
             fill = maskLower(packing());
         }
         else
@@ -1096,7 +1092,7 @@ inline void Foam::PackedList<nBits>::operator=(const unsigned int val)
             StorageList::operator[](i) = fill;
         }
 
-        // mask off the final partial segment
+        // Mask off the final partial segment
         {
             const unsigned int off = size_ % packing();
             if (off)
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index d412270b13..2b5e5584d6 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -432,12 +432,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "PtrListI.H"
+    #include "PtrListI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PtrList.C"
+    #include "PtrList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
index ef9e71ffc2..67de1b2dc0 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
+++ b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,6 @@ void Foam::ParSortableList<Type>::write
 }
 
 
-// Copy src, starting at destI into dest.
 template<class Type>
 void Foam::ParSortableList<Type>::copyInto
 (
@@ -122,7 +121,6 @@ void Foam::ParSortableList<Type>::checkAndSend
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from List, sorting the elements
 template<class Type>
 Foam::ParSortableList<Type>::ParSortableList(const UList<Type>& values)
 :
@@ -134,7 +132,6 @@ Foam::ParSortableList<Type>::ParSortableList(const UList<Type>& values)
 }
 
 
-// Construct given size. Sort later on.
 template<class Type>
 Foam::ParSortableList<Type>::ParSortableList(const label size)
 :
@@ -146,7 +143,6 @@ Foam::ParSortableList<Type>::ParSortableList(const label size)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Sort
 template<class Type>
 void Foam::ParSortableList<Type>::sort()
 {
diff --git a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H
index c528d94d86..9d7bdf71c4 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -204,7 +204,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ParSortableList.C"
+    #include "ParSortableList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
index 56fa2e20c1..1eb4fe782c 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
@@ -137,7 +137,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SortableList.C"
+    #include "SortableList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
index a0b9f32807..90b6ce6d28 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
@@ -34,9 +34,9 @@ inline Foam::SubList<T>::SubList
 :
     UList<T>(list.v_, subSize)
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     list.checkSize(subSize);
-#   endif
+    #endif
 }
 
 
@@ -50,7 +50,7 @@ inline Foam::SubList<T>::SubList
 :
     UList<T>(&(list.v_[startIndex]), subSize)
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
 
     // Artificially allow the start of a zero-sized subList to be
     // one past the end of the original list.
@@ -65,7 +65,7 @@ inline Foam::SubList<T>::SubList
         // behind the last element is allowed
         list.checkSize(startIndex);
     }
-#   endif
+    #endif
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
index 4409dac8c0..bb3b9e3a9a 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -165,7 +165,7 @@ public:
 #include "UIndirectListI.H"
 
 #ifdef NoRepository
-#   include "UIndirectListIO.C"
+    #include "UIndirectListIO.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 1bb858d796..aff5ff8e12 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -391,7 +391,7 @@ inline void reverse(UList<T>&);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "UListI.H"
+    #include "UListI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -459,7 +459,7 @@ inline void reverse(UList<T>&);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "UList.C"
+    #include "UList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/UList/UListI.H b/src/OpenFOAM/containers/Lists/UList/UListI.H
index 523abb2d29..243e5faaf1 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListI.H
+++ b/src/OpenFOAM/containers/Lists/UList/UListI.H
@@ -68,7 +68,6 @@ inline Foam::label Foam::UList<T>::rcIndex(const label i) const
 }
 
 
-// Check start is within valid range (0 ... size-1).
 template<class T>
 inline void Foam::UList<T>::checkStart(const label start) const
 {
@@ -81,7 +80,6 @@ inline void Foam::UList<T>::checkStart(const label start) const
 }
 
 
-// Check size is within valid range (0 ... size).
 template<class T>
 inline void Foam::UList<T>::checkSize(const label size) const
 {
@@ -94,7 +92,6 @@ inline void Foam::UList<T>::checkSize(const label size) const
 }
 
 
-// Check index i is within valid range (0 ... size-1).
 template<class T>
 inline void Foam::UList<T>::checkIndex(const label i) const
 {
@@ -158,20 +155,18 @@ inline T* Foam::UList<T>::data()
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 
-// element access
 template<class T>
 inline T& Foam::UList<T>::operator[](const label i)
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     checkIndex(i);
-#   endif
+    #endif
     return v_[i];
 }
 
 
 namespace Foam
 {
-
     // Template specialization for bool
     template<>
     inline const bool& Foam::UList<bool>::operator[](const label i) const
@@ -186,22 +181,19 @@ namespace Foam
             return Foam::pTraits<bool>::zero;
         }
     }
-
-} // end of namespace Foam
+}
 
 
-// const element access
 template<class T>
 inline const T& Foam::UList<T>::operator[](const label i) const
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     checkIndex(i);
-#   endif
+    #endif
     return v_[i];
 }
 
 
-// Allow cast to a const List<T>&
 template<class T>
 inline Foam::UList<T>::operator const Foam::List<T>&() const
 {
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
index 36cdc80fbc..fd8fe3f2d2 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
@@ -273,12 +273,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "UPtrListI.H"
+#include "UPtrListI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "UPtrList.C"
+    #include "UPtrList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/NamedEnum/NamedEnum.H b/src/OpenFOAM/containers/NamedEnum/NamedEnum.H
index 3fb7dc0e07..f4af06792c 100644
--- a/src/OpenFOAM/containers/NamedEnum/NamedEnum.H
+++ b/src/OpenFOAM/containers/NamedEnum/NamedEnum.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NamedEnum.C"
+    #include "NamedEnum.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

From eb1498f4c7c99ce6ee0a2f16527db173b4acde13 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 28 Feb 2016 18:22:38 +0000
Subject: [PATCH 231/447] ConeNozzleInjection: Corrected copy constructor
 Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=2010

---
 .../InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 3100a6b703..89f885065e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -223,7 +223,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     thetaOuter_(im.thetaOuter_),
     sizeDistribution_(im.sizeDistribution_().clone().ptr()),
     tanVec1_(im.tanVec1_),
-    tanVec2_(im.tanVec1_),
+    tanVec2_(im.tanVec2_),
     normal_(im.normal_),
     UMag_(im.UMag_),
     Cd_(im.Cd_),

From dac76d680ce15b1c21c5f4aaa5657a8f879df300 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 28 Feb 2016 22:50:24 +0000
Subject: [PATCH 232/447] tmp: encapsulate refCount to enable the option for
 tmp to use a specific version

---
 src/OpenFOAM/db/IOstreams/token/token.C       |  12 +-
 src/OpenFOAM/db/IOstreams/token/tokenI.H      | 148 ++++++++----------
 src/OpenFOAM/db/IOstreams/token/tokenList.H   |   6 +-
 .../DimensionedField/SubDimensionedFieldI.H   |   2 +-
 .../FieldFields/FieldField/FieldField.C       |   3 +-
 .../FieldFields/FieldField/FieldField.H       |   2 +-
 src/OpenFOAM/fields/Fields/Field/Field.C      |   2 +-
 src/OpenFOAM/fields/Fields/Field/Field.H      |   2 +-
 src/OpenFOAM/fields/Fields/Field/SubField.H   |   2 +-
 src/OpenFOAM/fields/Fields/Field/SubFieldI.H  |   2 +-
 src/OpenFOAM/memory/tmp/tmp.H                 |   3 +
 .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.H |   2 -
 .../mapPolyMesh/mapSubsetMesh/mapSubsetMesh.H |   3 -
 .../functions/Function1/Function1/Function1.C |   7 +-
 .../functions/Function1/Function1/Function1.H |   2 +-
 .../convectionScheme/convectionScheme.C       |   2 +-
 .../convectionScheme/convectionScheme.H       |   2 +-
 .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H    |   2 +-
 .../ddtSchemes/ddtScheme/ddtScheme.H          |   2 +-
 .../divSchemes/divScheme/divScheme.H          |   2 +-
 .../gradSchemes/gradScheme/gradScheme.H       |   2 +-
 .../laplacianScheme/laplacianScheme.H         |   2 +-
 .../snGradSchemes/snGradScheme/snGradScheme.H |   5 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            |   3 +-
 .../fvMatrices/fvMatrix/fvMatrix.H            |   2 +-
 .../multivariateSurfaceInterpolationScheme.H  |   2 +-
 .../surfaceInterpolationScheme.H              |   2 +-
 27 files changed, 104 insertions(+), 122 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/token/token.C b/src/OpenFOAM/db/IOstreams/token/token.C
index 857d4f6b48..59c551b6f8 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.C
+++ b/src/OpenFOAM/db/IOstreams/token/token.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,12 +29,12 @@ License
 
 namespace Foam
 {
-const char* const token::typeName = "token";
-token token::undefinedToken;
+    const char* const token::typeName = "token";
+    token token::undefinedToken;
 
-typedef token::compound tokenCompound;
-defineTypeNameAndDebug(tokenCompound, 0);
-defineRunTimeSelectionTable(tokenCompound, Istream);
+    typedef token::compound tokenCompound;
+    defineTypeNameAndDebug(tokenCompound, 0);
+    defineRunTimeSelectionTable(tokenCompound, Istream);
 }
 
 
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenI.H b/src/OpenFOAM/db/IOstreams/token/tokenI.H
index d2d9a39d7e..2f0383c9b2 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenI.H
+++ b/src/OpenFOAM/db/IOstreams/token/tokenI.H
@@ -25,15 +25,9 @@ License
 
 #include <iostream>
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Clear any allocated storage (word or string)
-inline void token::clear()
+inline void Foam::token::clear()
 {
     if (type_ == WORD)
     {
@@ -61,15 +55,14 @@ inline void token::clear()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct null
-inline token::token()
+inline Foam::token::token()
 :
     type_(UNDEFINED),
     lineNumber_(0)
 {}
 
-// Construct as copy
-inline token::token(const token& t)
+
+inline Foam::token::token(const token& t)
 :
     type_(t.type_),
     lineNumber_(t.lineNumber_)
@@ -115,48 +108,48 @@ inline token::token(const token& t)
     }
 }
 
-// Construct punctuation character token
-inline token::token(punctuationToken p, label lineNumber)
+
+inline Foam::token::token(punctuationToken p, label lineNumber)
 :
     type_(PUNCTUATION),
     punctuationToken_(p),
     lineNumber_(lineNumber)
 {}
 
-// Construct word token
-inline token::token(const word& w, label lineNumber)
+
+inline Foam::token::token(const word& w, label lineNumber)
 :
     type_(WORD),
     wordTokenPtr_(new word(w)),
     lineNumber_(lineNumber)
 {}
 
-// Construct string token
-inline token::token(const string& s, label lineNumber)
+
+inline Foam::token::token(const string& s, label lineNumber)
 :
     type_(STRING),
     stringTokenPtr_(new string(s)),
     lineNumber_(lineNumber)
 {}
 
-// Construct label token
-inline token::token(const label l, label lineNumber)
+
+inline Foam::token::token(const label l, label lineNumber)
 :
     type_(LABEL),
     labelToken_(l),
     lineNumber_(lineNumber)
 {}
 
-// Construct floatScalar token
-inline token::token(const floatScalar s, label lineNumber)
+
+inline Foam::token::token(const floatScalar s, label lineNumber)
 :
     type_(FLOAT_SCALAR),
     floatScalarToken_(s),
     lineNumber_(lineNumber)
 {}
 
-// Construct doubleScalar token
-inline token::token(const doubleScalar s, label lineNumber)
+
+inline Foam::token::token(const doubleScalar s, label lineNumber)
 :
     type_(DOUBLE_SCALAR),
     doubleScalarToken_(s),
@@ -166,8 +159,7 @@ inline token::token(const doubleScalar s, label lineNumber)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-// Delete token clearing the storage used by word or string
-inline token::~token()
+inline Foam::token::~token()
 {
     clear();
 }
@@ -175,37 +167,37 @@ inline token::~token()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline token::tokenType token::type() const
+inline Foam::token::tokenType  Foam::token::type() const
 {
     return type_;
 }
 
-inline token::tokenType& token::type()
+inline Foam::token::tokenType&  Foam::token::type()
 {
     return type_;
 }
 
-inline bool token::good() const
+inline bool Foam::token::good() const
 {
     return (type_ != ERROR && type_ != UNDEFINED);
 }
 
-inline bool token::undefined() const
+inline bool Foam::token::undefined() const
 {
     return (type_ == UNDEFINED);
 }
 
-inline bool token::error() const
+inline bool Foam::token::error() const
 {
     return (type_ == ERROR);
 }
 
-inline bool token::isPunctuation() const
+inline bool Foam::token::isPunctuation() const
 {
     return (type_ == PUNCTUATION);
 }
 
-inline token::punctuationToken token::pToken() const
+inline Foam::token::punctuationToken  Foam::token::pToken() const
 {
     if (type_ == PUNCTUATION)
     {
@@ -218,12 +210,12 @@ inline token::punctuationToken token::pToken() const
     }
 }
 
-inline bool token::isWord() const
+inline bool Foam::token::isWord() const
 {
     return (type_ == WORD);
 }
 
-inline const word& token::wordToken() const
+inline const Foam::word& Foam::token::wordToken() const
 {
     if (type_ == WORD)
     {
@@ -236,17 +228,17 @@ inline const word& token::wordToken() const
     }
 }
 
-inline bool token::isVariable() const
+inline bool Foam::token::isVariable() const
 {
     return (type_ == VARIABLE);
 }
 
-inline bool token::isString() const
+inline bool Foam::token::isString() const
 {
     return (type_ == STRING || type_ == VARIABLE || type_ == VERBATIMSTRING);
 }
 
-inline const string& token::stringToken() const
+inline const Foam::string& Foam::token::stringToken() const
 {
     if (type_ == STRING || type_ == VARIABLE || type_ == VERBATIMSTRING)
     {
@@ -259,12 +251,12 @@ inline const string& token::stringToken() const
     }
 }
 
-inline bool token::isLabel() const
+inline bool Foam::token::isLabel() const
 {
     return (type_ == LABEL);
 }
 
-inline label token::labelToken() const
+inline Foam::label Foam::token::labelToken() const
 {
     if (type_ == LABEL)
     {
@@ -277,12 +269,12 @@ inline label token::labelToken() const
     }
 }
 
-inline bool token::isFloatScalar() const
+inline bool Foam::token::isFloatScalar() const
 {
     return (type_ == FLOAT_SCALAR);
 }
 
-inline floatScalar token::floatScalarToken() const
+inline Foam::floatScalar Foam::token::floatScalarToken() const
 {
     if (type_ == FLOAT_SCALAR)
     {
@@ -296,12 +288,12 @@ inline floatScalar token::floatScalarToken() const
 }
 
 
-inline bool token::isDoubleScalar() const
+inline bool Foam::token::isDoubleScalar() const
 {
     return (type_ == DOUBLE_SCALAR);
 }
 
-inline doubleScalar token::doubleScalarToken() const
+inline Foam::doubleScalar Foam::token::doubleScalarToken() const
 {
     if (type_ == DOUBLE_SCALAR)
     {
@@ -315,12 +307,12 @@ inline doubleScalar token::doubleScalarToken() const
 }
 
 
-inline bool token::isScalar() const
+inline bool Foam::token::isScalar() const
 {
     return (type_ == FLOAT_SCALAR || type_ == DOUBLE_SCALAR);
 }
 
-inline scalar token::scalarToken() const
+inline Foam::scalar Foam::token::scalarToken() const
 {
     if (type_ == FLOAT_SCALAR)
     {
@@ -337,12 +329,12 @@ inline scalar token::scalarToken() const
     }
 }
 
-inline bool token::isNumber() const
+inline bool Foam::token::isNumber() const
 {
     return (type_ == LABEL || isScalar());
 }
 
-inline scalar token::number() const
+inline Foam::scalar Foam::token::number() const
 {
     if (type_ == LABEL)
     {
@@ -359,12 +351,12 @@ inline scalar token::number() const
     }
 }
 
-inline bool token::isCompound() const
+inline bool Foam::token::isCompound() const
 {
     return (type_ == COMPOUND);
 }
 
-inline const token::compound& token::compoundToken() const
+inline const Foam::token::compound& Foam::token::compoundToken() const
 {
     if (type_ == COMPOUND)
     {
@@ -378,18 +370,18 @@ inline const token::compound& token::compoundToken() const
 }
 
 
-inline label token::lineNumber() const
+inline Foam::label Foam::token::lineNumber() const
 {
     return lineNumber_;
 }
 
-inline label& token::lineNumber()
+inline Foam::label& Foam::token::lineNumber()
 {
     return lineNumber_;
 }
 
 
-inline void token::setBad()
+inline void Foam::token::setBad()
 {
     clear();
     type_ = ERROR;
@@ -398,7 +390,7 @@ inline void token::setBad()
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline void token::operator=(const token& t)
+inline void Foam::token::operator=(const token& t)
 {
     clear();
     type_ = t.type_;
@@ -446,59 +438,59 @@ inline void token::operator=(const token& t)
     lineNumber_ = t.lineNumber_;
 }
 
-inline void token::operator=(const punctuationToken p)
+inline void Foam::token::operator=(const punctuationToken p)
 {
     clear();
     type_ = PUNCTUATION;
     punctuationToken_ = p;
 }
 
-inline void token::operator=(word* wPtr)
+inline void Foam::token::operator=(word* wPtr)
 {
     clear();
     type_ = WORD;
     wordTokenPtr_ = wPtr;
 }
 
-inline void token::operator=(const word& w)
+inline void Foam::token::operator=(const word& w)
 {
     operator=(new word(w));
 }
 
-inline void token::operator=(string* sPtr)
+inline void Foam::token::operator=(string* sPtr)
 {
     clear();
     type_ = STRING;
     stringTokenPtr_ = sPtr;
 }
 
-inline void token::operator=(const string& s)
+inline void Foam::token::operator=(const string& s)
 {
     operator=(new string(s));
 }
 
-inline void token::operator=(const label l)
+inline void Foam::token::operator=(const label l)
 {
     clear();
     type_ = LABEL;
     labelToken_ = l;
 }
 
-inline void token::operator=(const floatScalar s)
+inline void Foam::token::operator=(const floatScalar s)
 {
     clear();
     type_ = FLOAT_SCALAR;
     floatScalarToken_ = s;
 }
 
-inline void token::operator=(const doubleScalar s)
+inline void Foam::token::operator=(const doubleScalar s)
 {
     clear();
     type_ = DOUBLE_SCALAR;
     doubleScalarToken_ = s;
 }
 
-inline void token::operator=(token::compound* cPtr)
+inline void Foam::token::operator=(Foam::token::compound* cPtr)
 {
     clear();
     type_ = COMPOUND;
@@ -506,7 +498,7 @@ inline void token::operator=(token::compound* cPtr)
 }
 
 
-inline bool token::operator==(const token& t) const
+inline bool Foam::token::operator==(const token& t) const
 {
     if (type_ != t.type_)
     {
@@ -548,17 +540,17 @@ inline bool token::operator==(const token& t) const
     return false;
 }
 
-inline bool token::operator==(const punctuationToken p) const
+inline bool Foam::token::operator==(const punctuationToken p) const
 {
     return (type_ == PUNCTUATION && punctuationToken_ == p);
 }
 
-inline bool token::operator==(const word& w) const
+inline bool Foam::token::operator==(const word& w) const
 {
     return (type_ == WORD && wordToken() == w);
 }
 
-inline bool token::operator==(const string& s) const
+inline bool Foam::token::operator==(const string& s) const
 {
     return
     (
@@ -567,59 +559,55 @@ inline bool token::operator==(const string& s) const
     );
 }
 
-inline bool token::operator==(const label l) const
+inline bool Foam::token::operator==(const label l) const
 {
     return (type_ == LABEL && labelToken_ == l);
 }
 
-inline bool token::operator==(const floatScalar s) const
+inline bool Foam::token::operator==(const floatScalar s) const
 {
     return (type_ == FLOAT_SCALAR && equal(floatScalarToken_, s));
 }
 
-inline bool token::operator==(const doubleScalar s) const
+inline bool Foam::token::operator==(const doubleScalar s) const
 {
     return (type_ == DOUBLE_SCALAR && equal(doubleScalarToken_, s));
 }
 
-inline bool token::operator!=(const token& t) const
+inline bool Foam::token::operator!=(const token& t) const
 {
     return !operator==(t);
 }
 
-inline bool token::operator!=(const punctuationToken p) const
+inline bool Foam::token::operator!=(const punctuationToken p) const
 {
     return !operator==(p);
 }
 
-inline bool token::operator!=(const word& w) const
+inline bool Foam::token::operator!=(const word& w) const
 {
     return !operator==(w);
 }
 
-inline bool token::operator!=(const string& s) const
+inline bool Foam::token::operator!=(const string& s) const
 {
     return !operator==(s);
 }
 
-inline bool token::operator!=(const floatScalar s) const
+inline bool Foam::token::operator!=(const floatScalar s) const
 {
     return !operator==(s);
 }
 
-inline bool token::operator!=(const doubleScalar s) const
+inline bool Foam::token::operator!=(const doubleScalar s) const
 {
     return !operator==(s);
 }
 
-inline bool token::operator!=(const label l) const
+inline bool Foam::token::operator!=(const label l) const
 {
     return !operator==(l);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenList.H b/src/OpenFOAM/db/IOstreams/token/tokenList.H
index a6f165cbbb..5ee815ea78 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenList.H
+++ b/src/OpenFOAM/db/IOstreams/token/tokenList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,11 +39,9 @@ Description
 
 namespace Foam
 {
-
     typedef List<token> tokenList;
     typedef List<token::tokenType> tokenTypeList;
-
-} // End namespace Foam
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
index 215a525421..93147ece1d 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
@@ -63,7 +63,7 @@ inline Foam::SubDimensionedField<Type, GeoMesh>::SubDimensionedField
     const SubDimensionedField<Type, GeoMesh>& sfield
 )
 :
-    refCount(),
+    tmp<SubDimensionedField<Type, GeoMesh>>::refCount(),
     SubField<Type>(sfield)
 {}
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index c26bdd03ac..2324b86e12 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -137,7 +137,7 @@ FieldField<Field, Type>::FieldField
 template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(const FieldField<Field, Type>& f)
 :
-    refCount(),
+    tmp<FieldField<Field, Type>>::refCount(),
     PtrList<Field<Type>>(f)
 {}
 
@@ -145,7 +145,6 @@ FieldField<Field, Type>::FieldField(const FieldField<Field, Type>& f)
 template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(FieldField<Field, Type>& f, bool reuse)
 :
-    refCount(),
     PtrList<Field<Type>>(f, reuse)
 {}
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
index e63201e5b8..40e3f2c24a 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
@@ -73,7 +73,7 @@ Ostream& operator<<
 template<template<class> class Field, class Type>
 class FieldField
 :
-    public refCount,
+    public tmp<FieldField<Field, Type>>::refCount,
     public PtrList<Field<Type>>
 {
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index e7e7479c15..4739e3fa3c 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -196,7 +196,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field(const Field<Type>& f)
 :
-    refCount(),
+    tmp<Field<Type>>::refCount(),
     List<Type>(f)
 {}
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index fd8a849c1d..1d69ef80da 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -77,7 +77,7 @@ class dictionary;
 template<class Type>
 class Field
 :
-    public refCount,
+    public tmp<Field<Type>>::refCount,
     public List<Type>
 {
 
diff --git a/src/OpenFOAM/fields/Fields/Field/SubField.H b/src/OpenFOAM/fields/Fields/Field/SubField.H
index 4ebacc1feb..ec3d150295 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubField.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubField.H
@@ -58,7 +58,7 @@ template<class Type> class SubField;
 template<class Type>
 class SubField
 :
-    public refCount,
+    public tmp<SubField<Type>>::refCount,
     public SubList<Type>
 {
 
diff --git a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
index e5ed14146d..796b2995c2 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
@@ -74,7 +74,7 @@ inline Foam::SubField<Type>::SubField
     const SubField<Type>& sfield
 )
 :
-    refCount(),
+    tmp<SubField<Type>>::refCount(),
     SubList<Type>(sfield)
 {}
 
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 72a49def8f..bfa2e4abcf 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -77,6 +77,9 @@ class tmp
 
 public:
 
+    typedef Foam::refCount refCount;
+
+
     // Constructors
 
         //- Store object pointer
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
index 33ef923403..f369944c69 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
@@ -157,8 +157,6 @@ class polyMesh;
 \*---------------------------------------------------------------------------*/
 
 class mapPolyMesh
-:
-    public refCount
 {
     // Private data
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapSubsetMesh/mapSubsetMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapSubsetMesh/mapSubsetMesh.H
index ff8ea1f265..c8dcd8154b 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapSubsetMesh/mapSubsetMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapSubsetMesh/mapSubsetMesh.H
@@ -34,7 +34,6 @@ SourceFiles
 #ifndef mapSubsetMesh_H
 #define mapSubsetMesh_H
 
-#include "refCount.H"
 #include "labelList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -47,8 +46,6 @@ namespace Foam
 \*---------------------------------------------------------------------------*/
 
 class mapSubsetMesh
-:
-    public refCount
 {
     // Private data
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index 5b7cdafc0f..3654a7563e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -31,7 +31,6 @@ License
 template<class Type>
 Foam::Function1<Type>::Function1(const word& entryName)
 :
-    refCount(),
     name_(entryName)
 {}
 
@@ -39,7 +38,7 @@ Foam::Function1<Type>::Function1(const word& entryName)
 template<class Type>
 Foam::Function1<Type>::Function1(const Function1<Type>& de)
 :
-    refCount(),
+    tmp<Function1<Type>>::refCount(),
     name_(de.name_)
 {}
 
@@ -62,9 +61,7 @@ const Foam::word& Foam::Function1<Type>::name() const
 
 template<class Type>
 void Foam::Function1<Type>::convertTimeBase(const Time&)
-{
-    // do nothing
-}
+{}
 
 
 template<class Type>
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index a5c77c2527..0e22404a44 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -61,7 +61,7 @@ template<class Type> Ostream& operator<<(Ostream&, const Function1<Type>&);
 template<class Type>
 class Function1
 :
-    public refCount
+    public tmp<Function1<Type>>::refCount
 {
     // Private Member Functions
 
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
index d3e257b0c2..a3ba465414 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
@@ -46,7 +46,7 @@ namespace fv
 template<class Type>
 convectionScheme<Type>::convectionScheme(const convectionScheme& cs)
 :
-    refCount(),
+    tmp<convectionScheme<Type>>::refCount(),
     mesh_(cs.mesh_)
 {}
 
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
index cab9dfdabd..e0320fe74e 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
@@ -64,7 +64,7 @@ namespace fv
 template<class Type>
 class convectionScheme
 :
-    public refCount
+    public tmp<convectionScheme<Type>>::refCount
 {
     // Private data
 
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
index afb1046833..6d527df771 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
@@ -64,7 +64,7 @@ namespace fv
 template<class Type>
 class d2dt2Scheme
 :
-    public refCount
+    public tmp<d2dt2Scheme<Type>>::refCount
 {
 
 protected:
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
index 3b42fef134..125ef04f61 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
@@ -64,7 +64,7 @@ namespace fv
 template<class Type>
 class ddtScheme
 :
-    public refCount
+    public tmp<ddtScheme<Type>>::refCount
 {
 
 protected:
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
index 9ed6164477..639d5c334f 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
@@ -64,7 +64,7 @@ namespace fv
 template<class Type>
 class divScheme
 :
-    public refCount
+    public tmp<divScheme<Type>>::refCount
 {
 
 protected:
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
index 26522ce52f..8abb81d520 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
@@ -60,7 +60,7 @@ namespace fv
 template<class Type>
 class gradScheme
 :
-    public refCount
+    public tmp<gradScheme<Type>>::refCount
 {
     // Private data
 
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
index a2c8431731..a1c47c211c 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
@@ -65,7 +65,7 @@ namespace fv
 template<class Type, class GType>
 class laplacianScheme
 :
-    public refCount
+    public tmp<laplacianScheme<Type, GType>>::refCount
 {
 
 protected:
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
index ae4dea3a1d..a2a52e9a4d 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
@@ -60,7 +60,7 @@ namespace fv
 template<class Type>
 class snGradScheme
 :
-    public refCount
+    public tmp<snGradScheme<Type>>::refCount
 {
     // Private data
 
@@ -70,6 +70,9 @@ class snGradScheme
 
     // Private Member Functions
 
+        //- Disallow copy construct
+        snGradScheme(const snGradScheme&);
+
         //- Disallow default bitwise assignment
         void operator=(const snGradScheme&);
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 799b5d2198..41b7fae8a7 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -321,7 +321,7 @@ Foam::fvMatrix<Type>::fvMatrix
 template<class Type>
 Foam::fvMatrix<Type>::fvMatrix(const fvMatrix<Type>& fvm)
 :
-    refCount(),
+    tmp<fvMatrix<Type>>::refCount(),
     lduMatrix(fvm),
     psi_(fvm.psi_),
     dimensions_(fvm.dimensions_),
@@ -351,7 +351,6 @@ Foam::fvMatrix<Type>::fvMatrix(const fvMatrix<Type>& fvm)
 template<class Type>
 Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>& tfvm)
 :
-    refCount(),
     lduMatrix
     (
         const_cast<fvMatrix<Type>&>(tfvm()),
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 6565f3a9b7..b06251fed5 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -114,7 +114,7 @@ template<class T> class UIndirectList;
 template<class Type>
 class fvMatrix
 :
-    public refCount,
+    public tmp<fvMatrix<Type>>::refCount,
     public lduMatrix
 {
     // Private data
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
index 2279b55e1a..780fde611f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
@@ -50,7 +50,7 @@ namespace Foam
 template<class Type>
 class multivariateSurfaceInterpolationScheme
 :
-    public refCount
+    public tmp<multivariateSurfaceInterpolationScheme<Type>>::refCount
 {
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
index 5f1e59f716..4b1d0838a2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
@@ -55,7 +55,7 @@ class fvMesh;
 template<class Type>
 class surfaceInterpolationScheme
 :
-    public refCount
+    public tmp<surfaceInterpolationScheme<Type>>::refCount
 {
     // Private data
 

From 1277b4b8c447cf14d1d33afce823f119a63f4ac0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 29 Feb 2016 12:09:46 +0000
Subject: [PATCH 233/447] sampledSets: use smallDist consistently between
 getTrackingPoint and other tracking functions

Use different hit-tolerances between sampling methods to account for the
difference in the "offset" definition.
---
 src/sampling/sampledSet/face/faceOnlySet.C      |  6 ++++--
 src/sampling/sampledSet/face/faceOnlySet.H      | 10 +++++++++-
 src/sampling/sampledSet/polyLine/polyLineSet.C  |  6 ++++--
 src/sampling/sampledSet/polyLine/polyLineSet.H  |  9 ++++++++-
 src/sampling/sampledSet/sampledSet/sampledSet.C |  7 +------
 src/sampling/sampledSet/sampledSet/sampledSet.H | 11 ++---------
 src/sampling/sampledSet/uniform/uniformSet.C    |  6 ++++--
 src/sampling/sampledSet/uniform/uniformSet.H    | 10 +++++++++-
 8 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/sampling/sampledSet/face/faceOnlySet.C b/src/sampling/sampledSet/face/faceOnlySet.C
index d8aedfee9a..0225658feb 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.C
+++ b/src/sampling/sampledSet/face/faceOnlySet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,8 @@ namespace Foam
 {
     defineTypeNameAndDebug(faceOnlySet, 0);
     addToRunTimeSelectionTable(sampledSet, faceOnlySet, word);
+
+    const scalar faceOnlySet::tol = 1e-6;
 }
 
 
@@ -146,10 +148,10 @@ void Foam::faceOnlySet::calcSamples
 
     getTrackingPoint
     (
-        offset,
         start_,
         bPoint,
         bFaceI,
+        smallDist,
 
         trackPt,
         trackCellI,
diff --git a/src/sampling/sampledSet/face/faceOnlySet.H b/src/sampling/sampledSet/face/faceOnlySet.H
index fdb47d4d43..61f20c7ce7 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.H
+++ b/src/sampling/sampledSet/face/faceOnlySet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,6 +96,14 @@ public:
     //- Runtime type information
     TypeName("face");
 
+
+    // Static data
+
+        //- Tolerance when comparing points relative to difference between
+        //  start_ and end_
+        static const scalar tol;
+
+
     // Constructors
 
         //- Construct from components
diff --git a/src/sampling/sampledSet/polyLine/polyLineSet.C b/src/sampling/sampledSet/polyLine/polyLineSet.C
index 7ce2e3fdc2..f5ff5b461b 100644
--- a/src/sampling/sampledSet/polyLine/polyLineSet.C
+++ b/src/sampling/sampledSet/polyLine/polyLineSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,8 @@ namespace Foam
 {
     defineTypeNameAndDebug(polyLineSet, 0);
     addToRunTimeSelectionTable(sampledSet, polyLineSet, word);
+
+    const scalar polyLineSet::tol = 1e-6;
 }
 
 
@@ -205,10 +207,10 @@ void Foam::polyLineSet::calcSamples
             bool isSample =
                 getTrackingPoint
                 (
-                    sampleCoords_[sampleI+1] - sampleCoords_[sampleI],
                     sampleCoords_[sampleI],
                     bPoint,
                     bFaceI,
+                    smallDist,
 
                     trackPt,
                     trackCellI,
diff --git a/src/sampling/sampledSet/polyLine/polyLineSet.H b/src/sampling/sampledSet/polyLine/polyLineSet.H
index 3dc880246a..c97ff9fc7d 100644
--- a/src/sampling/sampledSet/polyLine/polyLineSet.H
+++ b/src/sampling/sampledSet/polyLine/polyLineSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,6 +95,13 @@ public:
     TypeName("polyLine");
 
 
+    // Static data
+
+        //- Tolerance when comparing points relative to difference between
+        //  start_ and end_
+        static const scalar tol;
+
+
     // Constructors
 
         //- Construct from components
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C
index 00f843d570..ff58cef6bf 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -34,8 +34,6 @@ License
 
 namespace Foam
 {
-    const scalar sampledSet::tol = 1e-3;
-
     defineTypeNameAndDebug(sampledSet, 0);
     defineRunTimeSelectionTable(sampledSet, word);
 }
@@ -227,18 +225,16 @@ Foam::point Foam::sampledSet::pushIn
 
 bool Foam::sampledSet::getTrackingPoint
 (
-    const vector& offset,
     const point& samplePt,
     const point& bPoint,
     const label bFaceI,
+    const scalar smallDist,
 
     point& trackPt,
     label& trackCellI,
     label& trackFaceI
 ) const
 {
-    const scalar smallDist = mag(tol*offset);
-
     bool isGoodSample = false;
 
     if (bFaceI == -1)
@@ -311,7 +307,6 @@ bool Foam::sampledSet::getTrackingPoint
     if (debug)
     {
         InfoInFunction
-            << " offset:" << offset
             << " samplePt:" << samplePt
             << " bPoint:" << bPoint
             << " bFaceI:" << bFaceI
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.H b/src/sampling/sampledSet/sampledSet/sampledSet.H
index 810d4565ed..005ef61c1c 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.H
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,10 +125,10 @@ protected:
         //  trackFaceI, trackCellI (-1 if no tracking point found)
         bool getTrackingPoint
         (
-            const vector& offset,
             const point& samplePt,
             const point& bPoint,
             const label bFaceI,
+            const scalar smallDist,
 
             point& trackPt,
             label& trackCellI,
@@ -193,13 +193,6 @@ public:
         };
 
 
-    // Static data
-
-        //- Tolerance when comparing points. Usually relative to difference
-        //  between start_ and end_
-        static const scalar tol;
-
-
     // Constructors
 
         //- Construct from components
diff --git a/src/sampling/sampledSet/uniform/uniformSet.C b/src/sampling/sampledSet/uniform/uniformSet.C
index 295a3e79e3..75376d2778 100644
--- a/src/sampling/sampledSet/uniform/uniformSet.C
+++ b/src/sampling/sampledSet/uniform/uniformSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,8 @@ namespace Foam
 {
     defineTypeNameAndDebug(uniformSet, 0);
     addToRunTimeSelectionTable(sampledSet, uniformSet, word);
+
+    const scalar uniformSet::tol = 1e-3;
 }
 
 
@@ -260,10 +262,10 @@ void Foam::uniformSet::calcSamples
     bool isSample =
         getTrackingPoint
         (
-            offset,
             start_,
             bPoint,
             bFaceI,
+            smallDist,
 
             trackPt,
             trackCellI,
diff --git a/src/sampling/sampledSet/uniform/uniformSet.H b/src/sampling/sampledSet/uniform/uniformSet.H
index edd5212e51..a9f29ed2b9 100644
--- a/src/sampling/sampledSet/uniform/uniformSet.H
+++ b/src/sampling/sampledSet/uniform/uniformSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,6 +112,14 @@ public:
     //- Runtime type information
     TypeName("uniform");
 
+
+    // Static data
+
+        //- Tolerance when comparing points relative to difference between
+        //  start_ and end_
+        static const scalar tol;
+
+
     // Constructors
 
         //- Construct from components

From 95d146ecdff6df62f98711b8650075ced88ee9b9 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 29 Feb 2016 15:42:03 +0000
Subject: [PATCH 234/447] Rationalized the indentation of C-preprocessor
 directives

---
 .../interfaceCompositionModels/Henry/Henry.H  |   4 +-
 .../InterfaceCompositionModel.H               |   2 +-
 .../NonRandomTwoLiquid/NonRandomTwoLiquid.H   |   4 +-
 .../Raoult/Raoult.H                           |   2 +-
 .../Saturated/Saturated.H                     |   4 +-
 .../HeatAndMassTransferPhaseSystem.H          |   2 +-
 .../HeatTransferPhaseSystem.H                 |   2 +-
 ...terfaceCompositionPhaseChangePhaseSystem.H |   4 +-
 .../MomentumTransferPhaseSystem.H             |   2 +-
 .../ThermalPhaseChangePhaseSystem.H           |   4 +-
 .../AnisothermalPhaseModel.H                  |   4 +-
 .../InertPhaseModel/InertPhaseModel.H         |   4 +-
 .../IsothermalPhaseModel.H                    |   4 +-
 .../MovingPhaseModel/MovingPhaseModel.H       |   4 +-
 .../MultiComponentPhaseModel.H                |   4 +-
 .../PurePhaseModel/PurePhaseModel.H           |   4 +-
 .../ReactingPhaseModel/ReactingPhaseModel.H   |   4 +-
 .../ThermoPhaseModel/ThermoPhaseModel.H       |   4 +-
 .../phaseSystems/phaseSystem/phaseSystem.H    |   2 +-
 .../test/HashingSpeed/Test-HashingSpeed.C     |  18 +-
 .../star3ToFoam/createCoupleMatches.C         | 188 +++++++++---------
 .../star3ToFoam/mergeCoupleFacePoints.C       |  22 +-
 .../mesh/manipulation/setSet/setSet.C         |  12 +-
 .../mesh/manipulation/setSet/writeFuns.C      |  14 +-
 .../dataConversion/foamToVTK/writeFuns.C      |  32 +--
 .../USERD_get_part_elements_by_type.H         |   8 +-
 etc/codeTemplates/BC/BC.H                     |   2 +-
 .../template/_TemplateTemplate.H              |   2 +-
 src/OSspecific/POSIX/POSIX.C                  |  14 +-
 src/OSspecific/POSIX/fileMonitor.C            |  18 +-
 .../dynamicIndexedOctree.H                    |   2 +-
 .../algorithms/indexedOctree/indexedOctree.H  |   2 +-
 .../algorithms/indexedOctree/labelBits.H      |   6 +-
 src/OpenFOAM/db/Callback/Callback.H           |   4 +-
 .../db/CallbackRegistry/CallbackRegistry.H    |   4 +-
 .../IOobjects/CompactIOField/CompactIOField.H |   2 +-
 .../IOobjects/CompactIOList/CompactIOList.H   |   2 +-
 src/OpenFOAM/db/IOobjects/IOField/IOField.H   |   2 +-
 src/OpenFOAM/db/IOobjects/IOList/IOList.H     |   2 +-
 src/OpenFOAM/db/IOobjects/IOMap/IOMap.H       |   2 +-
 .../db/IOobjects/IOPtrList/IOPtrList.H        |   2 +-
 src/OpenFOAM/db/IOstreams/IOstreams/Istream.H |   4 +-
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H  |  10 +-
 src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H  |   4 +-
 src/OpenFOAM/db/dictionary/dictionary.H       |   2 +-
 .../primitiveEntry/primitiveEntry.H           |   2 +-
 .../dlLibraryTable/dlLibraryTable.H           |   4 +-
 .../IOOutputFilter/IOOutputFilter.H           |   4 +-
 .../OutputFilterFunctionObject.H              |   4 +-
 .../db/objectRegistry/objectRegistry.H        |   4 +-
 src/OpenFOAM/db/typeInfo/className.H          |   4 +-
 .../dimensionedType/dimensionedType.H         |   2 +-
 .../DimensionedField/DimensionedField.H       |   2 +-
 .../DimensionedScalarField.H                  |   2 +-
 .../DimensionedSphericalTensorField.H         |   4 +-
 .../DimensionedSymmTensorField.H              |   4 +-
 .../DimensionedTensorField.H                  |   4 +-
 .../FieldFields/FieldField/FieldField.C       |   2 +-
 .../FieldFields/FieldField/FieldField.H       |   2 +-
 .../FieldFields/oneFieldField/oneFieldField.H |   4 +-
 .../scalarFieldField/scalarFieldField.H       |   2 +-
 .../sphericalTensorFieldField.H               |   4 +-
 .../symmTensorFieldField.H                    |   4 +-
 .../tensorFieldField/tensorFieldField.H       |   4 +-
 .../transformFieldField/transformFieldField.H |   2 +-
 .../zeroFieldField/zeroFieldField.H           |   4 +-
 .../fields/Fields/DynamicField/DynamicField.H |   2 +-
 src/OpenFOAM/fields/Fields/Field/Field.H      |   2 +-
 .../fields/Fields/oneField/oneField.H         |   4 +-
 .../symmTransformField/symmTransformField.H   |   2 +-
 .../Fields/transformField/transformField.H    |   2 +-
 .../Fields/transformList/transformList.H      |   4 +-
 .../GeometricField/GeometricField.H           |   2 +-
 .../GeometricField/uniformInterpolate.H       |   2 +-
 .../GeometricScalarField.H                    |   2 +-
 .../GeometricSphericalTensorField.H           |   4 +-
 .../GeometricSymmTensorField.H                |   4 +-
 .../GeometricTensorField.H                    |   4 +-
 .../SlicedGeometricField.H                    |   2 +-
 .../geometricOneField/geometricOneField.H     |   4 +-
 .../geometricZeroField/geometricZeroField.H   |   4 +-
 .../transformGeometricField.H                 |   2 +-
 src/OpenFOAM/fields/ReadFields/ReadFields.H   |   4 +-
 .../UniformDimensionedField.H                 |   4 +-
 .../basicSymmetryPointPatchField.H            |   2 +-
 .../calculated/calculatedPointPatchField.H    |   2 +-
 .../basic/coupled/coupledPointPatchField.H    |   2 +-
 .../fixedValue/fixedValuePointPatchField.H    |   2 +-
 .../basic/value/valuePointPatchField.H        |   2 +-
 .../zeroGradientPointPatchField.H             |   2 +-
 .../constraint/cyclic/cyclicPointPatchField.H |   2 +-
 .../cyclicSlip/cyclicSlipPointPatchField.H    |   2 +-
 .../constraint/empty/emptyPointPatchField.H   |   2 +-
 ...nonuniformTransformCyclicPointPatchField.H |   2 +-
 .../processor/processorPointPatchField.H      |   2 +-
 .../processorCyclicPointPatchField.H          |   2 +-
 .../symmetry/symmetryPointPatchField.H        |   2 +-
 .../symmetryPlanePointPatchField.H            |   2 +-
 .../constraint/wedge/wedgePointPatchField.H   |   2 +-
 .../codedFixedValuePointPatchField.H          |   2 +-
 .../fixedNormalSlipPointPatchField.H          |   2 +-
 .../derived/slip/slipPointPatchField.H        |   2 +-
 ...eVaryingUniformFixedValuePointPatchField.H |   2 +-
 .../uniformFixedValuePointPatchField.H        |   2 +-
 .../pointPatchField/pointPatchField.H         |   4 +-
 src/OpenFOAM/global/debug/defineDebugSwitch.H |   4 +-
 .../interpolatePointToCell.H                  |   4 +-
 .../interpolateSplineXY/interpolateSplineXY.H |   4 +-
 .../interpolateXY/interpolateXY.H             |   4 +-
 .../interpolation2DTable.H                    |   2 +-
 .../interpolationLookUpTable.H                |   4 +-
 .../interpolationTable/interpolationTable.H   |   2 +-
 .../tableReaders/csv/csvTableReader.H         |   2 +-
 .../openFoam/openFoamTableReader.H            |   2 +-
 .../tableReaders/tableReader.H                |   2 +-
 .../interpolationWeights.H                    |   4 +-
 .../PatchToPatchInterpolation.C               |   6 +-
 .../PatchToPatchInterpolation.H               |   2 +-
 .../PrimitivePatchInterpolation.H             |   2 +-
 .../matrices/DiagonalMatrix/DiagonalMatrix.H  |   4 +-
 .../matrices/LUscalarMatrix/LUscalarMatrix.H  |   4 +-
 .../LduInterfaceField/LduInterfaceField.H     |   4 +-
 .../matrices/LduMatrix/LduMatrix/LduMatrix.H  |   4 +-
 .../LduMatrix/LduMatrix/SolverPerformance.H   |   2 +-
 .../DILUPreconditioner/TDILUPreconditioner.H  |   4 +-
 .../DiagonalPreconditioner.H                  |   4 +-
 .../NoPreconditioner/NoPreconditioner.H       |   4 +-
 .../GaussSeidel/TGaussSeidelSmoother.H        |   4 +-
 .../Solvers/DiagonalSolver/DiagonalSolver.H   |   4 +-
 .../LduMatrix/Solvers/PBiCCCG/PBiCCCG.H       |   4 +-
 .../LduMatrix/Solvers/PBiCICG/PBiCICG.H       |   4 +-
 .../matrices/LduMatrix/Solvers/PCICG/PCICG.H  |   4 +-
 .../Solvers/SmoothSolver/SmoothSolver.H       |   4 +-
 src/OpenFOAM/matrices/Matrix/Matrix.H         |   4 +-
 src/OpenFOAM/matrices/Matrix/MatrixI.H        |   8 +-
 .../matrices/SquareMatrix/SquareMatrix.H      |   4 +-
 .../SymmetricSquareMatrix.H                   |   4 +-
 .../lduInterface/processorLduInterface.H      |   2 +-
 .../matrices/lduMatrix/lduMatrix/lduMatrix.H  |   2 +-
 .../GAMGAgglomeration/GAMGAgglomeration.H     |   4 +-
 .../interfaces/GAMGInterface/GAMGInterface.H  |   2 +-
 .../matrices/scalarMatrices/scalarMatrices.H  |   4 +-
 .../matrices/simpleMatrix/simpleMatrix.H      |   4 +-
 src/OpenFOAM/matrices/solution/solution.H     |   4 +-
 src/OpenFOAM/meshes/MeshObject/MeshObject.H   |   4 +-
 .../ProcessorTopology/ProcessorTopology.H     |   4 +-
 src/OpenFOAM/meshes/boundBox/boundBox.H       |   4 +-
 src/OpenFOAM/meshes/data/data.H               |   4 +-
 src/OpenFOAM/meshes/lduMesh/lduMesh.H         |   4 +-
 .../meshes/lduMesh/lduPrimitiveMesh.H         |   2 +-
 src/OpenFOAM/meshes/meshShapes/face/face.H    |   4 +-
 .../meshes/meshShapes/tetCell/tetCellI.H      |  18 +-
 .../meshes/meshShapes/triFace/triFace.H       |   4 +-
 src/OpenFOAM/meshes/meshTools/mergePoints.H   |   4 +-
 .../polyMesh/globalMeshData/globalIndex.H     |   4 +-
 .../polyMesh/globalMeshData/globalMeshData.H  |   2 +-
 .../mapPolyMesh/mapDistribute/mapDistribute.H |   2 +-
 .../meshes/polyMesh/syncTools/syncTools.H     |   4 +-
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H |   4 +-
 .../primitiveMesh/PatchTools/PatchTools.H     |   4 +-
 .../PrimitivePatch/PrimitivePatch.H           |   2 +-
 .../primitiveShapes/tetrahedron/tetrahedron.H |   4 +-
 .../meshes/treeBoundBox/treeBoundBox.H        |   4 +-
 .../primitives/VectorSpace/VectorSpace.H      |   4 +-
 .../primitives/VectorSpace/VectorSpaceI.H     |  26 +--
 .../primitives/functions/Function1/CSV/CSV.H  |   2 +-
 .../functions/Function1/Constant/Constant.H   |   4 +-
 .../functions/Function1/Function1/Function1.H |   4 +-
 .../PolynomialEntry/PolynomialEntry.H         |   2 +-
 .../functions/Function1/Sine/Sine.H           |   2 +-
 .../functions/Function1/Square/Square.H       |   2 +-
 .../functions/Function1/Table/Table.H         |   2 +-
 .../functions/Function1/Table/TableBase.H     |   2 +-
 .../functions/Function1/TableFile/TableFile.H |   2 +-
 .../functions/Polynomial/Polynomial.H         |   6 +-
 .../functions/TimeFunction1/TimeFunction1.H   |   2 +-
 .../globalIndexAndTransformI.H                |   4 +-
 .../vectorTensorTransform.H                   |   2 +-
 .../primitives/hashes/Hasher/Hasher.C         |  12 +-
 src/OpenFOAM/primitives/hashes/SHA1/SHA1.C    |  46 ++---
 .../random/cachedRandom/cachedRandom.H        |   4 +-
 .../primitives/strings/lists/stringListOps.H  |   4 +-
 .../primitives/subModelBase/subModelBase.H    |   4 +-
 src/OpenFOAM/primitives/zero/zero.H           |   4 +-
 src/Pstream/mpi/UPstream.C                    |  14 +-
 src/Pstream/mpi/allReduce.H                   |   4 +-
 .../CompressibleTurbulenceModel.H             |   4 +-
 .../EddyDiffusivity/EddyDiffusivity.H         |   4 +-
 .../RAS/buoyantKEpsilon/buoyantKEpsilon.H     |   2 +-
 .../ThermalDiffusivity/ThermalDiffusivity.H   |   4 +-
 .../thermalBaffle1DFvPatchScalarField.H       |   4 +-
 .../turbulentFluidThermoModel.H               |   2 +-
 .../IncompressibleTurbulenceModel.H           |   4 +-
 .../turbulentTransportModel.H                 |   4 +-
 .../phaseCompressible/LES/Niceno/NicenoKEqn.H |   2 +-
 .../LES/SmagorinskyZhang/SmagorinskyZhang.H   |   2 +-
 .../LES/continuousGasKEqn/continuousGasKEqn.H |   2 +-
 .../PhaseCompressibleTurbulenceModel.H        |   4 +-
 .../RAS/LaheyKEpsilon/LaheyKEpsilon.H         |   2 +-
 .../continuousGasKEpsilon.H                   |   2 +-
 .../RAS/mixtureKEpsilon/mixtureKEpsilon.H     |   2 +-
 .../PhaseIncompressibleTurbulenceModel.H      |   4 +-
 .../DeardorffDiffStress/DeardorffDiffStress.H |   2 +-
 .../turbulenceModels/LES/LESModel/LESModel.H  |   4 +-
 .../LES/LESeddyViscosity/LESeddyViscosity.H   |   2 +-
 .../LES/Smagorinsky/Smagorinsky.H             |   2 +-
 .../SpalartAllmarasDDES/SpalartAllmarasDDES.H |   2 +-
 .../SpalartAllmarasDES/SpalartAllmarasDES.H   |   2 +-
 .../SpalartAllmarasIDDES.H                    |   2 +-
 .../turbulenceModels/LES/WALE/WALE.H          |   2 +-
 .../LES/dynamicKEqn/dynamicKEqn.H             |   2 +-
 .../LES/dynamicLagrangian/dynamicLagrangian.H |   2 +-
 .../turbulenceModels/LES/kEqn/kEqn.H          |   2 +-
 .../turbulenceModels/RAS/LRR/LRR.H            |   2 +-
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.H     |   2 +-
 .../turbulenceModels/RAS/RASModel/RASModel.H  |   4 +-
 .../RAS/RNGkEpsilon/RNGkEpsilon.H             |   2 +-
 .../turbulenceModels/RAS/SSG/SSG.H            |   2 +-
 .../RAS/SpalartAllmaras/SpalartAllmaras.H     |   2 +-
 .../turbulenceModels/RAS/kEpsilon/kEpsilon.H  |   2 +-
 .../turbulenceModels/RAS/kOmega/kOmega.H      |   2 +-
 .../RAS/kOmegaSST/kOmegaSST.H                 |   2 +-
 .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.H           |   2 +-
 .../RAS/realizableKE/realizableKE.H           |   2 +-
 .../turbulenceModels/RAS/v2f/v2f.H            |   2 +-
 .../ReynoldsStress/ReynoldsStress.H           |   4 +-
 .../TurbulenceModel/TurbulenceModel.H         |   4 +-
 .../kqRWallFunctionFvPatchField.H             |   2 +-
 .../eddyViscosity/eddyViscosity.H             |   4 +-
 .../turbulenceModels/laminar/laminar.H        |   4 +-
 .../linearViscousStress/linearViscousStress.H |   4 +-
 .../nonlinearEddyViscosity.H                  |   4 +-
 src/combustionModels/FSD/FSD.H                |   4 +-
 src/combustionModels/PaSR/PaSR.H              |   4 +-
 src/combustionModels/diffusion/diffusion.H    |   4 +-
 .../infinitelyFastChemistry.H                 |   4 +-
 src/combustionModels/laminar/laminar.H        |   4 +-
 .../noCombustion/noCombustion.H               |   4 +-
 .../singleStepCombustion.H                    |   4 +-
 src/conversion/ensight/part/ensightPart.H     |   4 +-
 src/conversion/ensight/part/ensightParts.H    |   4 +-
 src/dynamicMesh/fvMeshAdder/fvMeshAdder.H     |   4 +-
 .../fvMeshDistribute/fvMeshDistribute.H       |   2 +-
 src/dynamicMesh/fvMeshTools/fvMeshTools.H     |   4 +-
 .../motionSmoother/motionSmootherAlgo.H       |   2 +-
 .../polyMeshAdder/faceCoupleInfo.H            |   2 +-
 .../polyMeshFilter/polyMeshFilter.H           |   4 +-
 .../polyTopoChange/polyTopoChange.H           |   2 +-
 src/dynamicMesh/setUpdater/setUpdater.H       |   4 +-
 .../extendedEdgeMesh/extendedEdgeMesh.H       |   2 +-
 .../sampledSetWriters/csv/csvSetWriter.H      |   2 +-
 .../ensight/ensightSetWriter.H                |   2 +-
 .../gnuplot/gnuplotSetWriter.H                |   2 +-
 .../sampledSetWriters/jplot/jplotSetWriter.H  |   2 +-
 .../sampledSetWriters/raw/rawSetWriter.H      |   2 +-
 .../sampledSetWriters/vtk/vtkSetWriter.H      |   2 +-
 src/fileFormats/sampledSetWriters/writer.H    |   2 +-
 .../xmgrace/xmgraceSetWriter.H                |   2 +-
 src/fileFormats/vtk/vtkUnstructuredReader.H   |   4 +-
 .../cfdTools/general/CorrectPhi/CorrectPhi.H  |   4 +-
 .../cfdTools/general/MRF/MRFZone.H            |   2 +-
 .../constrainPressure/constrainPressure.H     |   2 +-
 .../movingMeshRhoUContinuityErrs.H            |   4 +-
 .../basicSymmetry/basicSymmetryFvPatchField.H |   2 +-
 .../basic/calculated/calculatedFvPatchField.H |   2 +-
 .../basic/coupled/coupledFvPatchField.H       |   2 +-
 .../directionMixedFvPatchField.H              |   2 +-
 .../extrapolatedCalculatedFvPatchField.H      |   2 +-
 .../fixedGradient/fixedGradientFvPatchField.H |   2 +-
 .../basic/fixedValue/fixedValueFvPatchField.H |   2 +-
 .../basic/mixed/mixedFvPatchField.H           |   2 +-
 .../basic/sliced/slicedFvPatchField.H         |   2 +-
 .../basic/transform/transformFvPatchField.H   |   2 +-
 .../zeroGradient/zeroGradientFvPatchField.H   |   2 +-
 .../constraint/cyclic/cyclicFvPatchField.H    |   2 +-
 .../cyclicACMI/cyclicACMIFvPatchField.H       |   2 +-
 .../cyclicAMI/cyclicAMIFvPatchField.H         |   2 +-
 .../cyclicSlip/cyclicSlipFvPatchField.H       |   2 +-
 .../constraint/empty/emptyFvPatchField.H      |   2 +-
 .../jumpCyclic/jumpCyclicFvPatchField.H       |   2 +-
 .../jumpCyclicAMI/jumpCyclicAMIFvPatchField.H |   2 +-
 .../nonuniformTransformCyclicFvPatchField.H   |   2 +-
 .../processor/processorFvPatchField.H         |   2 +-
 .../processorCyclicFvPatchField.H             |   2 +-
 .../symmetry/symmetryFvPatchField.H           |   2 +-
 .../symmetryPlane/symmetryPlaneFvPatchField.H |   2 +-
 .../constraint/wedge/wedgeFvPatchField.H      |   2 +-
 .../derived/advective/advectiveFvPatchField.H |   2 +-
 .../codedFixedValueFvPatchField.H             |   2 +-
 .../codedMixed/codedMixedFvPatchField.H       |   2 +-
 .../externalCoupledMixedFvPatchField.H        |   2 +-
 .../derived/fan/fanFvPatchField.H             |   2 +-
 .../fixedInternalValueFvPatchField.H          |   2 +-
 .../derived/fixedJump/fixedJumpFvPatchField.H |   2 +-
 .../fixedJumpAMI/fixedJumpAMIFvPatchField.H   |   2 +-
 .../derived/fixedMean/fixedMeanFvPatchField.H |   2 +-
 .../fixedNormalSlipFvPatchField.H             |   2 +-
 .../fixedProfile/fixedProfileFvPatchField.H   |   2 +-
 .../freestream/freestreamFvPatchField.H       |   2 +-
 .../inletOutlet/inletOutletFvPatchField.H     |   2 +-
 .../mappedField/mappedFieldFvPatchField.H     |   2 +-
 .../mappedField/mappedPatchFieldBase.H        |   2 +-
 .../mappedFixedInternalValueFvPatchField.H    |   2 +-
 ...ppedFixedPushedInternalValueFvPatchField.H |   2 +-
 .../mappedFixedValueFvPatchField.H            |   2 +-
 .../outletInlet/outletInletFvPatchField.H     |   2 +-
 .../outletMappedUniformInletFvPatchField.H    |   2 +-
 .../partialSlip/partialSlipFvPatchField.H     |   2 +-
 .../derived/slip/slipFvPatchField.H           |   2 +-
 .../AverageIOField.H                          |   4 +-
 .../timeVaryingMappedFixedValueFvPatchField.H |   2 +-
 .../turbulentInletFvPatchField.H              |   2 +-
 .../uniformFixedGradientFvPatchField.H        |   2 +-
 .../uniformFixedValueFvPatchField.H           |   2 +-
 .../uniformInletOutletFvPatchField.H          |   2 +-
 .../uniformJump/uniformJumpFvPatchField.H     |   2 +-
 .../uniformJumpAMIFvPatchField.H              |   2 +-
 .../waveTransmissiveFvPatchField.H            |   2 +-
 .../fvPatchFields/fvPatchField/fvPatchField.C |   2 +-
 .../fvPatchFields/fvPatchField/fvPatchField.H |   4 +-
 .../calculated/calculatedFvsPatchField.H      |   2 +-
 .../basic/coupled/coupledFvsPatchField.H      |   2 +-
 .../fixedValue/fixedValueFvsPatchField.H      |   2 +-
 .../basic/sliced/slicedFvsPatchField.H        |   2 +-
 .../constraint/cyclic/cyclicFvsPatchField.H   |   2 +-
 .../cyclicACMI/cyclicACMIFvsPatchField.H      |   2 +-
 .../cyclicAMI/cyclicAMIFvsPatchField.H        |   2 +-
 .../cyclicSlip/cyclicSlipFvsPatchField.H      |   2 +-
 .../constraint/empty/emptyFvsPatchField.H     |   2 +-
 .../nonuniformTransformCyclicFvsPatchField.H  |   2 +-
 .../processor/processorFvsPatchField.H        |   2 +-
 .../processorCyclicFvsPatchField.H            |   2 +-
 .../symmetry/symmetryFvsPatchField.H          |   2 +-
 .../symmetryPlaneFvsPatchField.H              |   2 +-
 .../constraint/wedge/wedgeFvsPatchField.H     |   2 +-
 .../fvsPatchField/fvsPatchField.H             |   4 +-
 .../boundedConvectionScheme.H                 |   2 +-
 .../convectionScheme/convectionScheme.H       |   2 +-
 .../gaussConvectionScheme.H                   |   2 +-
 .../multivariateGaussConvectionScheme.H       |   2 +-
 .../EulerD2dt2Scheme/EulerD2dt2Scheme.H       |   2 +-
 .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H    |   2 +-
 .../steadyStateD2dt2Scheme.H                  |   2 +-
 .../CoEulerDdtScheme/CoEulerDdtScheme.H       |   2 +-
 .../CrankNicolsonDdtScheme.H                  |   2 +-
 .../EulerDdtScheme/EulerDdtScheme.H           |   2 +-
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H  |   2 +-
 .../backwardDdtScheme/backwardDdtScheme.H     |   2 +-
 .../boundedDdtScheme/boundedDdtScheme.H       |   2 +-
 .../ddtSchemes/ddtScheme/ddtScheme.H          |   2 +-
 .../localEulerDdtScheme/localEulerDdtScheme.H |   2 +-
 .../steadyStateDdtScheme.H                    |   2 +-
 .../divSchemes/divScheme/divScheme.H          |   2 +-
 .../gaussDivScheme/gaussDivScheme.H           |   4 +-
 .../finiteVolume/fvc/fvcAverage.H             |   2 +-
 .../finiteVolume/fvc/fvcCellReduce.H          |   2 +-
 src/finiteVolume/finiteVolume/fvc/fvcCurl.H   |   2 +-
 src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H  |   2 +-
 src/finiteVolume/finiteVolume/fvc/fvcDDt.H    |   2 +-
 src/finiteVolume/finiteVolume/fvc/fvcDdt.H    |   2 +-
 src/finiteVolume/finiteVolume/fvc/fvcDiv.H    |   2 +-
 src/finiteVolume/finiteVolume/fvc/fvcFlux.H   |   2 +-
 src/finiteVolume/finiteVolume/fvc/fvcGrad.H   |   2 +-
 .../finiteVolume/fvc/fvcLaplacian.H           |   2 +-
 .../finiteVolume/fvc/fvcMagSqrGradGrad.H      |   2 +-
 .../finiteVolume/fvc/fvcReconstruct.H         |   2 +-
 src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H |   2 +-
 src/finiteVolume/finiteVolume/fvc/fvcSup.H    |   2 +-
 .../finiteVolume/fvc/fvcSurfaceIntegrate.H    |   2 +-
 .../finiteVolume/fvc/fvcVolumeIntegrate.H     |   2 +-
 src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H  |   2 +-
 src/finiteVolume/finiteVolume/fvm/fvmDdt.H    |   2 +-
 src/finiteVolume/finiteVolume/fvm/fvmDiv.H    |   2 +-
 .../finiteVolume/fvm/fvmLaplacian.H           |   2 +-
 src/finiteVolume/finiteVolume/fvm/fvmSup.H    |   2 +-
 .../LeastSquaresGrad/LeastSquaresGrad.H       |   2 +-
 .../LeastSquaresGrad/LeastSquaresVectors.H    |   2 +-
 .../gradSchemes/fourthGrad/fourthGrad.H       |   4 +-
 .../gradSchemes/gaussGrad/gaussGrad.H         |   2 +-
 .../gradSchemes/gradScheme/gradScheme.H       |   2 +-
 .../leastSquaresGrad/leastSquaresGrad.H       |   4 +-
 .../gaussLaplacianScheme.H                    |   2 +-
 .../laplacianScheme/laplacianScheme.H         |   2 +-
 .../CentredFitSnGrad/CentredFitSnGradData.H   |   4 +-
 .../correctedSnGrad/correctedSnGrad.H         |   2 +-
 .../faceCorrectedSnGrad/faceCorrectedSnGrad.H |   2 +-
 .../limitedSnGrad/limitedSnGrad.H             |   2 +-
 .../orthogonalSnGrad/orthogonalSnGrad.H       |   2 +-
 .../snGradSchemes/snGradScheme/snGradScheme.H |   2 +-
 .../uncorrectedSnGrad/uncorrectedSnGrad.H     |   2 +-
 .../fvMatrices/fvMatrix/fvMatrix.H            |   2 +-
 .../fvMatrices/solvers/MULES/CMULES.H         |   4 +-
 .../fvMatrices/solvers/MULES/IMULES.H         |   4 +-
 .../fvMatrices/solvers/MULES/MULES.H          |   4 +-
 .../cellToCell/extendedCellToCellStencil.H    |   2 +-
 .../cellToFace/extendedCellToFaceStencil.H    |   2 +-
 .../extendedUpwindCellToFaceStencil.H         |   2 +-
 .../faceToCell/extendedFaceToCellStencil.H    |   2 +-
 src/finiteVolume/fvMesh/fvMesh.H              |   4 +-
 .../fvMesh/fvMeshSubset/fvMeshSubset.H        |   2 +-
 .../fvMesh/fvPatches/fvPatch/fvPatch.H        |   2 +-
 .../singleCellFvMesh/singleCellFvMesh.H       |   2 +-
 .../meshWave/wallDistData/wallDistData.H      |   4 +-
 .../patchDistMethod/patchDistMethod.H         |   4 +-
 .../interpolation/interpolation.H             |   2 +-
 .../interpolationCell/interpolationCell.H     |   4 +-
 .../interpolationCellPatchConstrained.H       |   4 +-
 .../interpolationCellPoint.H                  |   4 +-
 .../interpolationCellPointFace.H              |   4 +-
 .../interpolationCellPointWallModified.H      |   4 +-
 .../interpolationPointMVC.H                   |   4 +-
 .../limitedSchemes/LimitedScheme/LimitFuncs.H |   2 +-
 .../LimitedScheme/LimitedScheme.H             |   2 +-
 .../limitedSchemes/PhiScheme/PhiScheme.H      |   2 +-
 .../limitedSurfaceInterpolationScheme.H       |   2 +-
 .../multivariateIndependentScheme.H           |   2 +-
 .../multivariateScheme/multivariateScheme.H   |   2 +-
 .../multivariateSelectionScheme.H             |   2 +-
 .../multivariateSurfaceInterpolationScheme.H  |   2 +-
 .../schemes/CentredFitScheme/CentredFitData.H |   4 +-
 .../schemes/FitData/FitData.H                 |   4 +-
 .../schemes/UpwindFitScheme/UpwindFitData.H   |   4 +-
 .../surfaceInterpolation/surfaceInterpolate.H |   2 +-
 .../surfaceInterpolationScheme.H              |   2 +-
 .../volPointInterpolation/pointConstraints.H  |   4 +-
 .../volPointInterpolation.H                   |   2 +-
 .../MGridGenGAMGAgglomeration.H               |   4 +-
 .../pairPatchAgglomeration.H                  |   4 +-
 .../fvMotionSolverCore/fvMotionSolverCore.H   |   4 +-
 .../cellMotion/cellMotionFvPatchField.H       |   2 +-
 ...meVaryingMappedFixedValuePointPatchField.H |   2 +-
 .../explicitSetValue/ExplicitSetValue.H       |   6 +-
 .../actuationDiskSource/actuationDiskSource.H |   4 +-
 .../radialActuationDiskSource.H               |   4 +-
 .../sources/general/codedSource/CodedSource.H |   6 +-
 .../semiImplicitSource/SemiImplicitSource.H   |   4 +-
 .../genericFvPatchField/genericFvPatchField.H |   2 +-
 .../genericPointPatchField.H                  |   2 +-
 .../clouds/Templates/DSMCCloud/DSMCCloud.H    |   2 +-
 .../BinaryCollisionModel.H                    |   2 +-
 .../LarsenBorgnakkeVariableHardSphere.H       |   4 +-
 .../NoBinaryCollision/NoBinaryCollision.H     |   4 +-
 .../VariableHardSphere/VariableHardSphere.H   |   4 +-
 .../FreeStream/FreeStream.H                   |   2 +-
 .../InflowBoundaryModel/InflowBoundaryModel.H |   2 +-
 .../InflowBoundaryModel/NoInflow/NoInflow.H   |   4 +-
 .../MaxwellianThermal/MaxwellianThermal.H     |   4 +-
 .../MixedDiffuseSpecular.H                    |   4 +-
 .../SpecularReflection/SpecularReflection.H   |   4 +-
 .../WallInteractionModel.H                    |   2 +-
 src/lagrangian/basic/Cloud/Cloud.H            |   4 +-
 src/lagrangian/basic/IOPosition/IOPosition.H  |   4 +-
 .../basic/InteractionLists/InteractionLists.H |   2 +-
 src/lagrangian/basic/particle/particle.H      |   2 +-
 .../IntegrationScheme/Analytical/Analytical.H |   2 +-
 .../IntegrationScheme/Euler/Euler.H           |   2 +-
 .../IntegrationScheme/IntegrationScheme.H     |   2 +-
 .../Templates/CollidingCloud/CollidingCloud.H |   2 +-
 .../Templates/KinematicCloud/KinematicCloud.H |   2 +-
 .../clouds/Templates/MPPICCloud/MPPICCloud.H  |   2 +-
 .../Templates/ReactingCloud/ReactingCloud.H   |   2 +-
 .../ReactingMultiphaseCloud.H                 |   2 +-
 .../Templates/ThermoCloud/ThermoCloud.H       |   2 +-
 .../CollisionRecordList/CollisionRecordList.H |   2 +-
 .../PairCollisionRecord/PairCollisionRecord.H |   4 +-
 .../WallCollisionRecord/WallCollisionRecord.H |   4 +-
 .../CloudFunctionObject/CloudFunctionObject.H |   2 +-
 .../FacePostProcessing/FacePostProcessing.H   |   2 +-
 .../ParticleCollector/ParticleCollector.H     |   2 +-
 .../ParticleErosion/ParticleErosion.H         |   2 +-
 .../ParticleTracks/ParticleTracks.H           |   2 +-
 .../ParticleTrap/ParticleTrap.H               |   2 +-
 .../PatchPostProcessing/PatchPostProcessing.H |   2 +-
 .../VoidFraction/VoidFraction.H               |   2 +-
 .../submodels/CloudSubModelBase.H             |   4 +-
 .../CollisionModel/CollisionModel.H           |   2 +-
 .../CollisionModel/NoCollision/NoCollision.H  |   2 +-
 .../PairCollision/PairCollision.H             |   2 +-
 .../PairModel/PairModel/PairModel.H           |   2 +-
 .../PairSpringSliderDashpot.H                 |   4 +-
 .../WallLocalSpringSliderDashpot.H            |   2 +-
 .../WallModel/WallModel/WallModel.H           |   2 +-
 .../WallSpringSliderDashpot.H                 |   2 +-
 .../PairCollision/WallSiteData/WallSiteData.H |   4 +-
 .../DispersionModel/DispersionModel.H         |   2 +-
 .../NoDispersion/NoDispersion.H               |   2 +-
 .../CellZoneInjection/CellZoneInjection.H     |   2 +-
 .../ConeInjection/ConeInjection.H             |   2 +-
 .../ConeNozzleInjection/ConeNozzleInjection.H |   2 +-
 .../FieldActivatedInjection.H                 |   2 +-
 .../InflationInjection/InflationInjection.H   |   2 +-
 .../InjectionModel/InjectionModel.H           |   2 +-
 .../InjectionModel/InjectionModelList.H       |   2 +-
 .../KinematicLookupTableInjection.H           |   2 +-
 .../ManualInjection/ManualInjection.H         |   2 +-
 .../InjectionModel/NoInjection/NoInjection.H  |   2 +-
 .../PatchFlowRateInjection.H                  |   2 +-
 .../PatchInjection/PatchInjection.H           |   2 +-
 .../DistortedSphereDragForce.H                |   2 +-
 .../Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H |   2 +-
 .../Drag/NonSphereDrag/NonSphereDragForce.H   |   2 +-
 .../PlessisMasliyahDragForce.H                |   2 +-
 .../Drag/SphereDrag/SphereDragForce.H         |   2 +-
 .../Drag/WenYuDrag/WenYuDragForce.H           |   2 +-
 .../LocalInteraction/LocalInteraction.H       |   2 +-
 .../MultiInteraction/MultiInteraction.H       |   2 +-
 .../NoInteraction/NoInteraction.H             |   2 +-
 .../PatchInteractionModel.H                   |   2 +-
 .../PatchInteractionModel/Rebound/Rebound.H   |   2 +-
 .../StandardWallInteraction.H                 |   2 +-
 .../NoStochasticCollision.H                   |   2 +-
 .../StochasticCollisionModel.H                |   2 +-
 .../NoSurfaceFilm/NoSurfaceFilm.H             |   2 +-
 .../SurfaceFilmModel/SurfaceFilmModel.H       |   2 +-
 .../AveragingMethod/AveragingMethod.H         |   2 +-
 .../MPPIC/AveragingMethods/Basic/Basic.H      |   2 +-
 .../MPPIC/AveragingMethods/Dual/Dual.H        |   2 +-
 .../MPPIC/AveragingMethods/Moment/Moment.H    |   2 +-
 .../DampingModels/DampingModel/DampingModel.H |   2 +-
 .../MPPIC/DampingModels/NoDamping/NoDamping.H |   2 +-
 .../DampingModels/Relaxation/Relaxation.H     |   2 +-
 .../IsotropyModel/IsotropyModel.H             |   2 +-
 .../IsotropyModels/NoIsotropy/NoIsotropy.H    |   2 +-
 .../IsotropyModels/Stochastic/Stochastic.H    |   2 +-
 .../MPPIC/PackingModels/Explicit/Explicit.H   |   2 +-
 .../MPPIC/PackingModels/Implicit/Implicit.H   |   2 +-
 .../MPPIC/PackingModels/NoPacking/NoPacking.H |   2 +-
 .../PackingModels/PackingModel/PackingModel.H |   2 +-
 .../CompositionModel/CompositionModel.H       |   2 +-
 .../NoComposition/NoComposition.H             |   2 +-
 .../SingleMixtureFraction.H                   |   2 +-
 .../SinglePhaseMixture/SinglePhaseMixture.H   |   2 +-
 .../ReactingLookupTableInjection.H            |   2 +-
 .../LiquidEvaporation/LiquidEvaporation.H     |   2 +-
 .../LiquidEvaporationBoil.H                   |   2 +-
 .../NoPhaseChange/NoPhaseChange.H             |   2 +-
 .../PhaseChangeModel/PhaseChangeModel.H       |   2 +-
 .../ConstantRateDevolatilisation.H            |   2 +-
 .../DevolatilisationModel.H                   |   2 +-
 .../NoDevolatilisation/NoDevolatilisation.H   |   2 +-
 .../SingleKineticRateDevolatilisation.H       |   2 +-
 .../ReactingMultiphaseLookupTableInjection.H  |   2 +-
 .../SuppressionCollision.H                    |   2 +-
 .../NoSurfaceReaction/NoSurfaceReaction.H     |   2 +-
 .../SurfaceReactionModel.H                    |   2 +-
 .../HeatTransferModel/HeatTransferModel.H     |   2 +-
 .../NoHeatTransfer/NoHeatTransfer.H           |   2 +-
 .../RanzMarshall/RanzMarshall.H               |   2 +-
 .../ThermoLookupTableInjection.H              |   2 +-
 .../ThermoSurfaceFilm/ThermoSurfaceFilm.H     |   2 +-
 .../bufferedAccumulator/bufferedAccumulator.C |   2 +-
 .../bufferedAccumulator/bufferedAccumulator.H |   2 +-
 .../correlationFunction/correlationFunction.C |   2 +-
 .../correlationFunction/correlationFunction.H |   2 +-
 .../clouds/Templates/SprayCloud/SprayCloud.H  |   2 +-
 .../AtomizationModel/AtomizationModel.H       |   2 +-
 .../BlobsSheetAtomization.H                   |   2 +-
 .../LISAAtomization/LISAAtomization.H         |   2 +-
 .../NoAtomization/NoAtomization.H             |   2 +-
 .../BreakupModel/BreakupModel/BreakupModel.H  |   2 +-
 .../spray/submodels/BreakupModel/ETAB/ETAB.H  |   2 +-
 .../BreakupModel/NoBreakup/NoBreakup.H        |   2 +-
 .../BreakupModel/PilchErdman/PilchErdman.H    |   2 +-
 .../BreakupModel/ReitzDiwakar/ReitzDiwakar.H  |   2 +-
 .../BreakupModel/ReitzKHRT/ReitzKHRT.H        |   2 +-
 .../spray/submodels/BreakupModel/SHF/SHF.H    |   2 +-
 .../spray/submodels/BreakupModel/TAB/TAB.H    |   2 +-
 .../ORourkeCollision/ORourkeCollision.H       |   2 +-
 .../TrajectoryCollision/TrajectoryCollision.H |   2 +-
 .../DispersionRASModel/DispersionRASModel.H   |   2 +-
 .../GradientDispersionRAS.H                   |   2 +-
 .../StochasticDispersionRAS.H                 |   2 +-
 .../autoHexMeshDriver/autoLayerDriver.H       |   4 +-
 .../zeroFixedValuePointPatchField.H           |   2 +-
 .../meshRefinement/meshRefinement.H           |   2 +-
 .../AMIInterpolation/AMIInterpolation.H       |   4 +-
 .../AMIMethod/AMIMethod/AMIMethod.H           |   4 +-
 .../AMIMethod/directAMI/directAMI.H           |   4 +-
 .../faceAreaWeightAMI/faceAreaWeightAMI.H     |   2 +-
 .../AMIMethod/mapNearestAMI/mapNearestAMI.H   |   2 +-
 .../partialFaceAreaWeightAMI.H                |   4 +-
 .../cyclicACMIPointPatchField.H               |   2 +-
 .../cyclicAMIPointPatchField.H                |   2 +-
 .../algorithms/MeshWave/FaceCellWave.H        |   4 +-
 src/meshTools/algorithms/MeshWave/MeshWave.H  |   4 +-
 .../PatchEdgeFaceWave/PatchEdgeFaceWave.H     |   4 +-
 .../algorithms/PointEdgeWave/PointEdgeWave.H  |   4 +-
 src/meshTools/cellDist/cellDistFuncs.H        |   4 +-
 .../cellDist/patchWave/patchDataWave.H        |   2 +-
 .../cellDist/wallPoint/wallPointData.H        |   2 +-
 .../indexedOctree/treeDataPrimitivePatch.H    |   2 +-
 src/meshTools/meshTools/meshTools.H           |   4 +-
 .../polyMeshZipUpCells/polyMeshZipUpCells.C   |  70 +++----
 .../surfaceIntersection/surfaceIntersection.H |   2 +-
 .../pointToPointPlanarInterpolation.H         |   2 +-
 .../decompose/decompose/fvFieldDecomposer.H   |   2 +-
 .../decompose/ptscotchDecomp/ptscotchDecomp.C |  18 +-
 .../decompose/ptscotchDecomp/ptscotchDecomp.H |   4 +-
 .../decompose/scotchDecomp/scotchDecomp.C     |  18 +-
 .../distributedTriSurfaceMesh.H               |   2 +-
 .../reconstruct/fvFieldReconstructor.H        |   2 +-
 .../reconstruct/pointFieldReconstructor.H     |   2 +-
 .../reconstruct/reconstructLagrangian.H       |   2 +-
 .../basic/addSubtract/addSubtract.H           |   6 +-
 .../field/components/components.H             |   4 +-
 .../foamCalcFunctions/field/div/div.H         |   4 +-
 .../field/interpolate/interpolate.H           |   4 +-
 .../foamCalcFunctions/field/mag/mag.H         |   4 +-
 .../foamCalcFunctions/field/magGrad/magGrad.H |   4 +-
 .../foamCalcFunctions/field/magSqr/magSqr.H   |   4 +-
 .../field/randomise/randomise.H               |   4 +-
 .../IO/partialWrite/partialWrite.H            |   2 +-
 .../fieldAverage/fieldAverage/fieldAverage.H  |   2 +-
 .../fieldCoordinateSystemTransform.H          |   2 +-
 .../field/fieldMinMax/fieldMinMax.H           |   4 +-
 .../field/nearWallFields/nearWallFields.H     |   2 +-
 .../field/readFields/readFields.H             |   2 +-
 .../regionSizeDistribution.H                  |   2 +-
 .../surfaceInterpolateFields.H                |   2 +-
 .../wallBoundedParticle.H                     |   4 +-
 .../utilities/residuals/residuals.H           |   2 +-
 .../kinematicSingleLayer.H                    |   2 +-
 src/sampling/cuttingPlane/cuttingPlane.H      |   2 +-
 src/sampling/meshToMesh0/meshToMesh0.H        |   2 +-
 src/sampling/probes/patchProbes.H             |   2 +-
 src/sampling/probes/probes.H                  |   2 +-
 .../sampledSet/sampledSets/sampledSets.H      |   2 +-
 .../distanceSurface/distanceSurface.H         |   2 +-
 .../sampledSurface/isoSurface/isoSurface.H    |   2 +-
 .../isoSurface/isoSurfaceCell.H               |   2 +-
 .../isoSurface/sampledIsoSurface.H            |   2 +-
 .../isoSurface/sampledIsoSurfaceCell.H        |   2 +-
 .../sampledCuttingPlane/sampledCuttingPlane.H |   2 +-
 .../sampledPatch/sampledPatch.H               |   2 +-
 .../sampledPatchInternalField.H               |   2 +-
 .../sampledPlane/sampledPlane.H               |   2 +-
 .../sampledSurface/sampledSurface.H           |   2 +-
 .../sampledSurfaces/sampledSurfaces.H         |   4 +-
 .../sampledTriSurfaceMesh.H                   |   2 +-
 .../sampledThresholdCellFaces.H               |   2 +-
 src/surfMesh/MeshedSurface/MeshedSurface.H    |   2 +-
 .../MeshedSurfaceProxy/MeshedSurfaceProxy.H   |   4 +-
 .../UnsortedMeshedSurface.H                   |   2 +-
 .../surfaceFormats/ac3d/AC3DsurfaceFormat.H   |   2 +-
 .../ac3d/AC3DsurfaceFormatCore.H              |   4 +-
 .../surfaceFormats/ftr/FTRsurfaceFormat.H     |   2 +-
 .../surfaceFormats/gts/GTSsurfaceFormat.H     |   2 +-
 .../surfaceFormats/nas/NASsurfaceFormat.H     |   2 +-
 .../surfaceFormats/obj/OBJsurfaceFormat.H     |   2 +-
 .../surfaceFormats/off/OFFsurfaceFormat.H     |   2 +-
 .../surfaceFormats/ofs/OFSsurfaceFormat.H     |   2 +-
 .../surfaceFormats/smesh/SMESHsurfaceFormat.H |   4 +-
 .../starcd/STARCDsurfaceFormat.H              |   2 +-
 .../surfaceFormats/stl/STLsurfaceFormat.H     |   2 +-
 .../surfaceFormats/tri/TRIsurfaceFormat.H     |   2 +-
 .../surfaceFormats/vtk/VTKsurfaceFormat.H     |   2 +-
 .../surfaceFormats/wrl/WRLsurfaceFormat.H     |   4 +-
 .../surfaceFormats/x3d/X3DsurfaceFormat.H     |   4 +-
 .../basic/basicThermo/basicThermo.H           |   4 +-
 .../basic/heThermo/heThermo.H                 |   4 +-
 .../basic/mixtures/pureMixture/pureMixture.H  |   4 +-
 .../basic/psiThermo/hePsiThermo.H             |   4 +-
 .../basic/rhoThermo/heRhoThermo.H             |   4 +-
 .../basicChemistryModel/basicChemistryModel.H |   2 +-
 .../chemistryModel/chemistryModel.H           |   2 +-
 .../EulerImplicit/EulerImplicit.H             |   4 +-
 .../chemistrySolver/chemistrySolver.H         |   4 +-
 .../noChemistrySolver/noChemistrySolver.H     |   4 +-
 .../chemistryModel/chemistrySolver/ode/ode.H  |   4 +-
 .../mixtureFractionSoot/mixtureFractionSoot.H |   4 +-
 .../chemistryReader/chemistryReader.H         |   2 +-
 .../foamChemistryReader/foamChemistryReader.H |   4 +-
 .../moleFractions/moleFractions.H             |   2 +-
 .../mixtures/SpecieMixture/SpecieMixture.H    |   4 +-
 .../mixtures/egrMixture/egrMixture.H          |   4 +-
 .../homogeneousMixture/homogeneousMixture.H   |   4 +-
 .../inhomogeneousMixture.H                    |   4 +-
 .../multiComponentMixture.H                   |   4 +-
 .../reactingMixture/reactingMixture.H         |   2 +-
 .../singleStepReactingMixture.H               |   2 +-
 .../veryInhomogeneousMixture.H                |   4 +-
 .../psiuReactionThermo/heheuPsiThermo.H       |   4 +-
 .../pyrolysisChemistryModel.H                 |   4 +-
 .../solidChemistryModel/solidChemistryModel.H |   4 +-
 .../Reactions/solidReaction/solidReaction.H   |   2 +-
 .../const/constAnIsoSolidTransport.H          |   2 +-
 .../transport/const/constIsoSolidTransport.H  |   2 +-
 .../exponential/exponentialSolidTransport.H   |   2 +-
 .../polynomial/polynomialSolidTransport.H     |   2 +-
 .../solidThermo/solidThermo/heSolidThermo.H   |   4 +-
 .../equationOfState/Boussinesq/Boussinesq.H   |   2 +-
 .../PengRobinsonGas/PengRobinsonGas.H         |   2 +-
 .../adiabaticPerfectFluid.H                   |   2 +-
 .../icoPolynomial/icoPolynomial.H             |   2 +-
 .../incompressiblePerfectGas.H                |   2 +-
 .../specie/equationOfState/linear/linear.H    |   2 +-
 .../perfectFluid/perfectFluid.H               |   2 +-
 .../equationOfState/perfectGas/perfectGas.H   |   2 +-
 .../equationOfState/rhoConst/rhoConst.H       |   2 +-
 .../IrreversibleReaction.H                    |   2 +-
 .../NonEquilibriumReversibleReaction.H        |   2 +-
 .../reaction/Reactions/Reaction/Reaction.H    |   2 +-
 .../Reactions/ReactionList/ReactionList.H     |   2 +-
 .../ReversibleReaction/ReversibleReaction.H   |   2 +-
 .../specie/thermo/eConst/eConstThermo.H       |   4 +-
 .../specie/thermo/hConst/hConstThermo.H       |   4 +-
 .../thermo/hPolynomial/hPolynomialThermo.H    |   2 +-
 .../specie/thermo/hPower/hPowerThermo.H       |   6 +-
 .../specie/thermo/hRefConst/hRefConstThermo.H |   4 +-
 .../specie/thermo/janaf/janafThermo.H         |   4 +-
 .../specie/thermo/thermo/thermo.H             |   2 +-
 .../specie/transport/const/constTransport.H   |   2 +-
 .../logPolynomial/logPolynomialTransport.H    |   2 +-
 .../polynomial/polynomialTransport.H          |   2 +-
 .../sutherland/sutherlandTransport.H          |   2 +-
 .../rawTopoChangerFvMesh.H                    |   4 +-
 wmake/src/wmkdep.l                            |   4 +-
 717 files changed, 1212 insertions(+), 1214 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H
index 8d9c6a73fa..60303766fc 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Henry.C"
+    #include "Henry.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
index c0a77f3b36..198783c4e6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
@@ -206,7 +206,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "InterfaceCompositionModel.C"
+    #include "InterfaceCompositionModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H
index f0197e77f7..601806164a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -157,7 +157,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NonRandomTwoLiquid.C"
+    #include "NonRandomTwoLiquid.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H
index ca001df8e4..2844539222 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H
@@ -120,7 +120,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Raoult.C"
+    #include "Raoult.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H
index 758bd3a0ad..a585447a1e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Saturated.C"
+    #include "Saturated.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
index c02f04e82e..296201ddba 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
@@ -156,7 +156,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "HeatAndMassTransferPhaseSystem.C"
+    #include "HeatAndMassTransferPhaseSystem.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
index 931fc2a758..480433d189 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
@@ -121,7 +121,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "HeatTransferPhaseSystem.C"
+    #include "HeatTransferPhaseSystem.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H
index b87c5a709d..0052008abc 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "InterfaceCompositionPhaseChangePhaseSystem.C"
+    #include "InterfaceCompositionPhaseChangePhaseSystem.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
index c449e0f67d..49a0bfb642 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
@@ -218,7 +218,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MomentumTransferPhaseSystem.C"
+    #include "MomentumTransferPhaseSystem.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
index b54c183150..c1ab9e7c9c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ThermalPhaseChangePhaseSystem.C"
+    #include "ThermalPhaseChangePhaseSystem.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
index 1b7ec2f615..7a9cbd51bf 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "AnisothermalPhaseModel.C"
+    #include "AnisothermalPhaseModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H
index 77823d4491..26c9661ab7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "InertPhaseModel.C"
+    #include "InertPhaseModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H
index bdf1a14aed..85a31f8807 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IsothermalPhaseModel.C"
+    #include "IsothermalPhaseModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
index 6c5da0bde9..864a6b4259 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -196,7 +196,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MovingPhaseModel.C"
+    #include "MovingPhaseModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H
index 94ca80582c..6bbab1cf56 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MultiComponentPhaseModel.C"
+    #include "MultiComponentPhaseModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H
index 2aa8034ede..ff42fbe714 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,7 +99,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PurePhaseModel.C"
+    #include "PurePhaseModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H
index 305b62590a..e05c71b44a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,7 +99,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReactingPhaseModel.C"
+    #include "ReactingPhaseModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
index 960d2c1ba6..56289cbf78 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ThermoPhaseModel.C"
+    #include "ThermoPhaseModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index cee72cb353..85470192a1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
@@ -365,7 +365,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "phaseSystemTemplates.C"
+    #include "phaseSystemTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/HashingSpeed/Test-HashingSpeed.C b/applications/test/HashingSpeed/Test-HashingSpeed.C
index 7e89d44f8b..5937ad741e 100644
--- a/applications/test/HashingSpeed/Test-HashingSpeed.C
+++ b/applications/test/HashingSpeed/Test-HashingSpeed.C
@@ -7,9 +7,9 @@
 #include <time.h>
 
 #ifndef CLOCKS_PER_SEC
-# ifdef CLK_TCK
-#  define CLOCKS_PER_SEC (CLK_TCK)
-# endif
+    #ifdef CLK_TCK
+        #define CLOCKS_PER_SEC (CLK_TCK)
+    #endif
 #endif
 
 #undef mix
@@ -66,16 +66,16 @@ on 1 byte), but shoehorning those bytes into integers efficiently is messy.
      __BYTE_ORDER == __LITTLE_ENDIAN) || \
     (defined(i386) || defined(__i386__) || defined(__i486__) || \
      defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL))
-# define HASH_LITTLE_ENDIAN 1
-# define HASH_BIG_ENDIAN 0
+    #define HASH_LITTLE_ENDIAN 1
+    #define HASH_BIG_ENDIAN 0
 #elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
        __BYTE_ORDER == __BIG_ENDIAN) || \
       (defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel))
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 1
+    #define HASH_LITTLE_ENDIAN 0
+    #define HASH_BIG_ENDIAN 1
 #else
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 0
+    #define HASH_LITTLE_ENDIAN 0
+    #define HASH_BIG_ENDIAN 0
 #endif
 
 #define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
index 4f91fcd5ef..70ca236c7c 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
@@ -75,14 +75,14 @@ void Foam::starMesh::createCoupleMatches()
         const face& masterFace = cellFaces_[fp.masterCell()][fp.masterFace()];
         const face& slaveFace = cellFaces_[fp.slaveCell()][fp.slaveFace()];
 
-#       ifdef DEBUG_COUPLE
+        #ifdef DEBUG_COUPLE
         Info<< "coupleI: " << coupleI << endl
             << "masterFace: " << masterFace << endl
             << "master points: " << masterFace.points(points_) << endl
             << "slaveFace: " << slaveFace << endl
             << "slave points: " << slaveFace.points(points_)
             << endl << endl;
-#       endif
+        #endif
 
         // check the angle of face area vectors
          scalar faceAreaAngle =
@@ -177,10 +177,10 @@ void Foam::starMesh::createCoupleMatches()
                 vector d = curMasterEdge.vec(points_);
                 d -= n*(n & d);
 
-#               ifdef DEBUG_COUPLE_INTERSECTION
+                #ifdef DEBUG_COUPLE_INTERSECTION
                 Info<< "curMasterEdge: " << curMasterEdge << endl
                     << "P: " << P << endl << "d: " << d << endl;
-#               endif
+                #endif
 
                 // go through all slave edges and try to get an intersection.
                 // The point is created along the original master edge rather
@@ -196,20 +196,20 @@ void Foam::starMesh::createCoupleMatches()
                     e -= n*(n & e);
                     scalar det = -(e & (n ^ d));
 
-#                   ifdef DEBUG_COUPLE_INTERSECTION
+                    #ifdef DEBUG_COUPLE_INTERSECTION
                     Info<< "curSlaveEdge: " << curSlaveEdge << endl
                         << "S: " << S << endl
                         << "e: " << e << endl;
-#                   endif
+                    #endif
 
                     if (mag(det) > SMALL)
                     {
                         // non-singular matrix. Look for intersection
                         scalar beta = ((S - P) & (n ^ d))/det;
 
-#                       ifdef DEBUG_COUPLE_INTERSECTION
+                        #ifdef DEBUG_COUPLE_INTERSECTION
                         Info<< " beta: " << beta << endl;
-#                       endif
+                        #endif
 
                         if (beta > -smallMergeTol_ && beta < 1 + smallMergeTol_)
                         {
@@ -217,9 +217,9 @@ void Foam::starMesh::createCoupleMatches()
                             scalar alpha =
                                 (((S - P) & d) + beta*(d & e))/magSqr(d);
 
-#                           ifdef DEBUG_COUPLE_INTERSECTION
+                            #ifdef DEBUG_COUPLE_INTERSECTION
                             Info<< " alpha: " << alpha << endl;
-#                           endif
+                            #endif
 
                             if
                             (
@@ -228,10 +228,10 @@ void Foam::starMesh::createCoupleMatches()
                             )
                             {
                                 // intersection of non-parallel edges
-#                               ifdef DEBUG_COUPLE_INTERSECTION
+                                #ifdef DEBUG_COUPLE_INTERSECTION
                                 Info<< "intersection of non-parallel edges"
                                     << endl;
-#                               endif
+                                #endif
 
 
                                 // check for insertion of start-end
@@ -309,14 +309,14 @@ void Foam::starMesh::createCoupleMatches()
                                         nLivePoints + coupleFacePoints.size()
                                     );
 
-#                                   ifdef DEBUG_COUPLE_INTERSECTION
+                                    #ifdef DEBUG_COUPLE_INTERSECTION
                                     Info<< "regular intersection. "
                                         << "Adding point: "
                                         << coupleFacePoints.size()
                                         << " which is "
                                         << P + alpha*curMasterEdge.vec(points_)
                                         << endl;
-#                                   endif
+                                    #endif
 
                                     // A new point is created. Warning:
                                     // using original edge for accuracy.
@@ -369,12 +369,12 @@ void Foam::starMesh::createCoupleMatches()
                              && alpha1 < 1 + smallMergeTol_
                             )
                             {
-#                               ifdef DEBUG_COUPLE_INTERSECTION
+                                #ifdef DEBUG_COUPLE_INTERSECTION
                                 Info<< "adding irregular master "
                                     << "intersection1: "
                                     << points_[slaveEdges[slaveEdgeI].start()]
                                     << endl;
-#                               endif
+                                #endif
 
                                 masterEdgePoints[masterEdgeI].append
                                 (
@@ -390,12 +390,12 @@ void Foam::starMesh::createCoupleMatches()
                              && alpha2 < 1 + smallMergeTol_
                             )
                             {
-#                               ifdef DEBUG_COUPLE_INTERSECTION
+                                #ifdef DEBUG_COUPLE_INTERSECTION
                                 Info<< "adding irregular master "
                                     << "intersection2: "
                                     << points_[slaveEdges[slaveEdgeI].end()]
                                     << endl;
-#                               endif
+                                #endif
 
                                 masterEdgePoints[masterEdgeI].append
                                 (
@@ -411,11 +411,11 @@ void Foam::starMesh::createCoupleMatches()
 
                             scalar beta1 = (sp & e)/magSqr(e);
 
-#                           ifdef DEBUG_COUPLE_INTERSECTION
+                            #ifdef DEBUG_COUPLE_INTERSECTION
                             Info<< "P: " << P << " S: " << S << " d: " << d
                                 << " e: " << e << " sp: " << sp
                                 << " beta1: " << beta1 << endl;
-#                           endif
+                            #endif
 
                             if
                             (
@@ -423,12 +423,12 @@ void Foam::starMesh::createCoupleMatches()
                              && beta1 < 1 + smallMergeTol_
                             )
                             {
-#                               ifdef DEBUG_COUPLE_INTERSECTION
+                                #ifdef DEBUG_COUPLE_INTERSECTION
                                 Info<< "adding irregular slave "
                                     << "intersection1: "
                                     << points_[masterEdges[masterEdgeI].start()]
                                     << endl;
-#                               endif
+                                #endif
 
                                 slaveEdgePoints[slaveEdgeI].append
                                 (
@@ -444,12 +444,12 @@ void Foam::starMesh::createCoupleMatches()
                              && beta2 < 1 + smallMergeTol_
                             )
                             {
-#                               ifdef DEBUG_COUPLE_INTERSECTION
+                                #ifdef DEBUG_COUPLE_INTERSECTION
                                 Info<< "adding irregular slave "
                                     << "intersection2: "
                                     << points_[masterEdges[masterEdgeI].end()]
                                     << endl;
-#                               endif
+                                #endif
 
                                 slaveEdgePoints[slaveEdgeI].append
                                 (
@@ -461,14 +461,14 @@ void Foam::starMesh::createCoupleMatches()
                 } // end of slave edges
             } // end of master edges
 
-#           ifdef DEBUG_COUPLE_INTERSECTION
+            #ifdef DEBUG_COUPLE_INTERSECTION
             Info<< "additional slave edge points: " << endl;
             forAll(slaveEdgePoints, edgeI)
             {
                 Info<< "edge: " << edgeI << ": " << slaveEdgePoints[edgeI]
                     << endl;
             }
-#           endif
+            #endif
 
             // Add new points
             if (nLivePoints + coupleFacePoints.size() >= points_.size())
@@ -509,11 +509,11 @@ void Foam::starMesh::createCoupleMatches()
             );
             label nTmpMasterLabels = 0;
 
-#           ifdef DEBUG_COUPLE_INTERSECTION
+            #ifdef DEBUG_COUPLE_INTERSECTION
             Info<< "masterFace: " << masterFace << endl
                 << "nAdditionalMasterPoints: " << nAdditionalMasterPoints
                 << endl;
-#           endif
+            #endif
 
             forAll(masterEdges, masterEdgeI)
             {
@@ -531,11 +531,11 @@ void Foam::starMesh::createCoupleMatches()
 
                 vector edgeVector = masterEdges[masterEdgeI].vec(points_);
 
-#               ifdef DEBUG_FACE_ORDERING
+                #ifdef DEBUG_FACE_ORDERING
                 Info<< "edgeVector: " << edgeVector << endl
                     << "curMEdgePoints.size(): " << curMEdgePoints.size()
                     << endl;
-#               endif
+                #endif
 
                 // renormalise
                 edgeVector /= magSqr(edgeVector);
@@ -569,14 +569,14 @@ void Foam::starMesh::createCoupleMatches()
                                   - edgeStartPoint
                                 );
 
-#                           ifdef DEBUG_FACE_ORDERING
+                            #ifdef DEBUG_FACE_ORDERING
                             Info<< " edgeStartPoint: " << edgeStartPoint
                                 << " edgeEndPoint: "
                                 << points_[masterEdges[masterEdgeI].end()]
                                 << " other point: "
                                 << points_[curMEdgePointsIter()]
                                 << " alpha: " << alpha << endl;
-#                           endif
+                            #endif
 
                             if (alpha < minAlpha)
                             {
@@ -586,20 +586,20 @@ void Foam::starMesh::createCoupleMatches()
                             }
                         }
 
-#                       ifdef DEBUG_FACE_ORDERING
+                        #ifdef DEBUG_FACE_ORDERING
                         Info<< "nextPointLabel: " << nextPointLabel << endl;
-#                       endif
+                        #endif
 
                         i++;
                     }
 
                     if (nextPointLabel > -1)
                     {
-#                       ifdef DEBUG_FACE_ORDERING
+                        #ifdef DEBUG_FACE_ORDERING
                         Info<< "added nextPointLabel: " << nextPointLabel
                             << " nTmpMasterLabels: " << nTmpMasterLabels
                             << " to place " << nTmpMasterLabels << endl;
-#                       endif
+                        #endif
 
                         usedMasterPoint[usedI] = true;
                         // add the next point
@@ -617,9 +617,9 @@ void Foam::starMesh::createCoupleMatches()
             // reset the size of master
             tmpMasterFace.setSize(nTmpMasterLabels);
 
-#           ifdef DEBUG_FACE_ORDERING
+            #ifdef DEBUG_FACE_ORDERING
             Info<< "tmpMasterFace: " << tmpMasterFace << endl;
-#           endif
+            #endif
 
             // Eliminate all zero-length edges
             face newMasterFace(labelList(tmpMasterFace.size(), labelMax));
@@ -638,12 +638,12 @@ void Foam::starMesh::createCoupleMatches()
 
             forAll(mstEdgesToCollapse, edgeI)
             {
-#               ifdef DEBUG_FACE_ORDERING
+                #ifdef DEBUG_FACE_ORDERING
                 Info<< "edgeI: " << edgeI << " curEdge: "
                     << mstEdgesToCollapse[edgeI] << endl
                     << "master edge " << edgeI << ", "
                     << mstEdgesToCollapse[edgeI].mag(points_) << endl;
-#               endif
+                #endif
 
                 // Edge merge tolerance = masterTol
                 if (mstEdgesToCollapse[edgeI].mag(points_) < masterTol)
@@ -655,10 +655,10 @@ void Foam::starMesh::createCoupleMatches()
                             mstEdgesToCollapse[edgeI].end()
                         );
 
-#                   ifdef DEBUG_FACE_ORDERING
+                    #ifdef DEBUG_FACE_ORDERING
                     Info<< "Collapsed: nMaster: " << nMaster
                         << " label: " << newMasterFace[nMaster] << endl;
-#                   endif
+                    #endif
 
                 }
                 else
@@ -668,11 +668,11 @@ void Foam::starMesh::createCoupleMatches()
                     if (edgeI < mstEdgesToCollapse.size() - 1)
                     {
                         // last edge does not add the point
-#                   ifdef DEBUG_FACE_ORDERING
+                    #ifdef DEBUG_FACE_ORDERING
                         Info<< "Added: nMaster: " << nMaster
                             << " label: " << mstEdgesToCollapse[edgeI].end()
                             << endl;
-#                   endif
+                    #endif
 
                         newMasterFace[nMaster] =
                             mstEdgesToCollapse[edgeI].end();
@@ -682,10 +682,10 @@ void Foam::starMesh::createCoupleMatches()
 
             newMasterFace.setSize(nMaster);
 
-#           ifdef DEBUG_COUPLE
+            #ifdef DEBUG_COUPLE
             Info<< "newMasterFace: " << newMasterFace << endl
                 << "points: " << newMasterFace.points(points_) << endl;
-#           endif
+            #endif
 
             // Creating new slave side
 
@@ -704,10 +704,10 @@ void Foam::starMesh::createCoupleMatches()
             );
             label nTmpSlaveLabels = 0;
 
-#           ifdef DEBUG_COUPLE_INTERSECTION
+            #ifdef DEBUG_COUPLE_INTERSECTION
             Info<< "slaveFace: " << slaveFace << endl
                 << "nAdditionalSlavePoints: " << nAdditionalSlavePoints << endl;
-#           endif
+            #endif
 
             forAll(slaveEdges, slaveEdgeI)
             {
@@ -725,11 +725,11 @@ void Foam::starMesh::createCoupleMatches()
 
                 vector edgeVector = slaveEdges[slaveEdgeI].vec(points_);
 
-#               ifdef DEBUG_FACE_ORDERING
+                #ifdef DEBUG_FACE_ORDERING
                 Info<< "curSEdgePoints.size(): "
                     << curSEdgePoints.size() << endl
                     << "edgeVector: " << edgeVector << endl;
-#               endif
+                #endif
 
                 // renormalise
                 edgeVector /= magSqr(edgeVector);
@@ -763,14 +763,14 @@ void Foam::starMesh::createCoupleMatches()
                                   - edgeStartPoint
                                 );
 
-#                           ifdef DEBUG_FACE_ORDERING
+                            #ifdef DEBUG_FACE_ORDERING
                             Info<< " edgeStartPoint: " << edgeStartPoint
                                 << " edgeEndPoint: "
                                 << points_[slaveEdges[slaveEdgeI].end()]
                                 << " other point: "
                                 << points_[curSEdgePointsIter()]
                                 << " alpha: " << alpha << endl;
-#                           endif
+                            #endif
 
                             if (alpha < minAlpha)
                             {
@@ -780,20 +780,20 @@ void Foam::starMesh::createCoupleMatches()
                             }
                         }
 
-#                       ifdef DEBUG_FACE_ORDERING
+                        #ifdef DEBUG_FACE_ORDERING
                         Info<< "nextPointLabel: " << nextPointLabel << endl;
-#                       endif
+                        #endif
 
                         i++;
                     }
 
                     if (nextPointLabel > -1)
                     {
-#                       ifdef DEBUG_FACE_ORDERING
+                        #ifdef DEBUG_FACE_ORDERING
                         Info<< "added nextPointLabel: " << nextPointLabel
                             << " nTmpSlaveLabels: " << nTmpSlaveLabels
                             << " to place " << nTmpSlaveLabels << endl;
-#                       endif
+                        #endif
 
                         usedSlavePoint[usedI] = true;
                         // add the next point
@@ -811,9 +811,9 @@ void Foam::starMesh::createCoupleMatches()
             // reset the size of slave
             tmpSlaveFace.setSize(nTmpSlaveLabels);
 
-#           ifdef DEBUG_FACE_ORDERING
+            #ifdef DEBUG_FACE_ORDERING
             Info<< "tmpSlaveFace: " << tmpSlaveFace << endl;
-#           endif
+            #endif
 
             // Eliminate all zero-length edges
             face newSlaveFace(labelList(tmpSlaveFace.size(), labelMax));
@@ -832,10 +832,10 @@ void Foam::starMesh::createCoupleMatches()
 
             forAll(slvEdgesToCollapse, edgeI)
             {
-#               ifdef DEBUG_FACE_ORDERING
+                #ifdef DEBUG_FACE_ORDERING
                 Info<< "slave edge length: " << edgeI << ", "
                     << slvEdgesToCollapse[edgeI].mag(points_)<< endl;
-#               endif
+                #endif
 
                  // edge merge tolerance = slaveTol
                 if (slvEdgesToCollapse[edgeI].mag(points_) < slaveTol)
@@ -860,10 +860,10 @@ void Foam::starMesh::createCoupleMatches()
 
             newSlaveFace.setSize(nSlave);
 
-#           ifdef DEBUG_COUPLE
+            #ifdef DEBUG_COUPLE
             Info<< "newSlaveFace: " << newSlaveFace << endl
                 << "points: " << newSlaveFace.points(points_) << endl << endl;
-#           endif
+            #endif
 
             // Create the intersection face
 
@@ -878,10 +878,10 @@ void Foam::starMesh::createCoupleMatches()
             edgeList newMasterEdges = newMasterFace.edges();
             edgeList newSlaveEdges = newSlaveFace.edges();
 
-#           ifdef DEBUG_RIGHT_HAND_WALK
+            #ifdef DEBUG_RIGHT_HAND_WALK
             Info<< "newMasterEdges: " << newMasterEdges << endl
                 << "newSlaveEdges: " << newSlaveEdges << endl;
-#           endif
+            #endif
 
             edge startEdge(-1, -1);
 
@@ -924,9 +924,9 @@ void Foam::starMesh::createCoupleMatches()
                     startEdge = newSlaveEdges[edgeI];
                     startEdgeFound = 2;
 
-#                   ifdef DEBUG_RIGHT_HAND_WALK
+                    #ifdef DEBUG_RIGHT_HAND_WALK
                     Info<< "slave edge found" << endl;
-#                   endif
+                    #endif
 
                     break;
                 }
@@ -967,9 +967,9 @@ void Foam::starMesh::createCoupleMatches()
                         startEdge = newMasterEdges[edgeI];
                         startEdgeFound = 1;
 
-#                       ifdef DEBUG_RIGHT_HAND_WALK
+                        #ifdef DEBUG_RIGHT_HAND_WALK
                         Info<< "master edge found" << endl;
-#                       endif
+                        #endif
 
                         break;
                     }
@@ -984,9 +984,9 @@ void Foam::starMesh::createCoupleMatches()
 
             if (startEdgeFound > 0)
             {
-#               ifdef DEBUG_RIGHT_HAND_WALK
+                #ifdef DEBUG_RIGHT_HAND_WALK
                 Info<< "start edge: " << startEdge << endl;
-#               endif
+                #endif
 
                 // Loop through both faces and add all edges
                 // containing the current point and add them to the
@@ -1002,9 +1002,9 @@ void Foam::starMesh::createCoupleMatches()
                 vector planeNormal = newMasterFace.normal(points_);
                 planeNormal /= mag(planeNormal) + VSMALL;
 
-#               ifdef DEBUG_RIGHT_HAND_WALK
+                #ifdef DEBUG_RIGHT_HAND_WALK
                 Info<< "planeNormal: " << planeNormal << endl;
-#               endif
+                #endif
 
                 // Do a check to control the right-hand turn.  This is
                 // based on the triple product of the edge start
@@ -1032,9 +1032,9 @@ void Foam::starMesh::createCoupleMatches()
 
                 if (tripleProduct < 0)
                 {
-#                   ifdef DEBUG_RIGHT_HAND_WALK
+                    #ifdef DEBUG_RIGHT_HAND_WALK
                     Info<< "Turning edge for right-hand turn rule" << endl;
-#                   endif
+                    #endif
                     startEdge.flip();
                 }
 
@@ -1089,11 +1089,11 @@ void Foam::starMesh::createCoupleMatches()
                         }
                     }
 
-#                   ifdef DEBUG_RIGHT_HAND_WALK
+                    #ifdef DEBUG_RIGHT_HAND_WALK
                     Info<< "number of edges to consider: "
                         << edgesToConsider.size() << endl
                         << "edges to consider: " << edgesToConsider << endl;
-#                   endif
+                    #endif
 
                     if (edgesToConsider.empty())
                     {
@@ -1132,10 +1132,10 @@ void Foam::starMesh::createCoupleMatches()
                     scalar rightTurn = nextEdgeVec & right;
                     scalar goStraight = nextEdgeVec & ahead;
 
-#                   ifdef DEBUG_RIGHT_HAND_WALK
+                    #ifdef DEBUG_RIGHT_HAND_WALK
                     Info<< "rightTurn: " << rightTurn
                         << " goStraight: " << goStraight << endl;
-#                   endif
+                    #endif
 
                     for
                     (
@@ -1153,10 +1153,10 @@ void Foam::starMesh::createCoupleMatches()
                         scalar curRightTurn = newDir & right;
                         scalar curGoStraight = newDir & ahead;
 
-#                       ifdef DEBUG_RIGHT_HAND_WALK
+                        #ifdef DEBUG_RIGHT_HAND_WALK
                         Info<< "curRightTurn: " << curRightTurn
                             << " curGoStraight: " << curGoStraight << endl;
-#                       endif
+                        #endif
 
                         if (rightTurn < 0) // old edge turning left
                         {
@@ -1165,9 +1165,9 @@ void Foam::starMesh::createCoupleMatches()
                                 // both go left. Grab one with greater ahead
                                 if (curGoStraight > goStraight)
                                 {
-#                                   ifdef DEBUG_RIGHT_HAND_WALK
+                                    #ifdef DEBUG_RIGHT_HAND_WALK
                                     Info<< "a" << endl;
-#                                   endif
+                                    #endif
 
                                     // Good edge, turning left less than before
                                     nextEdge = etcIter();
@@ -1177,9 +1177,9 @@ void Foam::starMesh::createCoupleMatches()
                             }
                             else // new edge turning right
                             {
-#                               ifdef DEBUG_RIGHT_HAND_WALK
+                                #ifdef DEBUG_RIGHT_HAND_WALK
                                 Info<< "b" << endl;
-#                               endif
+                                #endif
 
                                 // good edge, turning right
                                 nextEdge = etcIter();
@@ -1195,9 +1195,9 @@ void Foam::starMesh::createCoupleMatches()
                                 // grab one with smaller ahead
                                 if (curGoStraight < goStraight)
                                 {
-#                                   ifdef DEBUG_RIGHT_HAND_WALK
+                                    #ifdef DEBUG_RIGHT_HAND_WALK
                                     Info<< "c" << endl;
-#                                   endif
+                                    #endif
 
                                     // good edge, turning right more than before
                                     nextEdge = etcIter();
@@ -1243,10 +1243,10 @@ void Foam::starMesh::createCoupleMatches()
                         // grab the current point and the current edge
                         curEdge = nextEdge;
 
-#                       ifdef DEBUG_RIGHT_HAND_WALK
+                        #ifdef DEBUG_RIGHT_HAND_WALK
                         Info<< "inserted point " << nextEdge.end() << endl
                             << "curEdge: " << curEdge << endl;
-#                       endif
+                        #endif
                     }
                 }
                 while (!completedFace);
@@ -1254,9 +1254,9 @@ void Foam::starMesh::createCoupleMatches()
                 // resize the face
                 intersectedFace.setSize(nIntFacePoints);
 
-#               ifdef DEBUG_COUPLE
+                #ifdef DEBUG_COUPLE
                 Info<< "intersectedFace: " << intersectedFace << endl;
-#               endif
+                #endif
 
                 // check the intersection face for duplicate points
                 forAll(intersectedFace, checkI)
@@ -1313,10 +1313,10 @@ void Foam::starMesh::createCoupleMatches()
 
             forAll(intersectedFace, intPointI)
             {
-#               ifdef DEBUG_COUPLE_PROJECTION
+                #ifdef DEBUG_COUPLE_PROJECTION
                 Info<< "Proj: old point: "
                     << points_[intersectedFace[intPointI]] << endl;
-#               endif
+                #endif
 
                 pointHit projHit =
                     masterFace.ray
@@ -1332,10 +1332,10 @@ void Foam::starMesh::createCoupleMatches()
                     points_[intersectedFace[intPointI]] =
                         projHit.hitPoint();
 
-#                   ifdef DEBUG_COUPLE_PROJECTION
+                    #ifdef DEBUG_COUPLE_PROJECTION
                     Info<< "      new point: "
                         << points_[intersectedFace[intPointI]] << endl;
-#                   endif
+                    #endif
                 }
             }
 
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
index f71573c112..39e7a27b5d 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,9 +126,9 @@ void Foam::starMesh::mergeCoupleFacePoints()
                     if (edge (a, b).mag(points_) < pointMergeTol)
                     {
                         // found a pair of points to merge
-#                       ifdef DEBUG_MERGE
+                        #ifdef DEBUG_MERGE
                         Info<< "Merging points " << a << " and " << b << endl;
-#                       endif
+                        #endif
 
                         // are the two points in a merge group?
                         label mergeSetA = -1;
@@ -147,10 +147,10 @@ void Foam::starMesh::mergeCoupleFacePoints()
                         if (mergeSetA == -1 && mergeSetB == -1)
                         {
                             // add new merge group
-#                           ifdef DEBUG_MERGE
+                            #ifdef DEBUG_MERGE
                             Info<< "adding new merge group " << nMergeSets
                                 << endl;
-#                           endif
+                            #endif
 
                             // mark points as belonging to a new merge set
                             renumberPoints[a] = nMergeSets;
@@ -169,10 +169,10 @@ void Foam::starMesh::mergeCoupleFacePoints()
                         }
                         else if (mergeSetA == -1 && mergeSetB != -1)
                         {
-#                           ifdef DEBUG_MERGE
+                            #ifdef DEBUG_MERGE
                             Info<< "adding point a into the merge set of b. "
                                 << "a: " << a << endl;
-#                           endif
+                            #endif
 
                             // add point a into the merge set of b
                             renumberPoints[a] = mergeSetB;
@@ -183,10 +183,10 @@ void Foam::starMesh::mergeCoupleFacePoints()
                         }
                         else if  (mergeSetA != -1 && mergeSetB == -1)
                         {
-#                           ifdef DEBUG_MERGE
+                            #ifdef DEBUG_MERGE
                             Info<< "adding point b into the merge set of a. "
                                 << "b: " << b << endl;
-#                           endif
+                            #endif
 
                             // add point b into the merge set of a
                             renumberPoints[b] = mergeSetA;
@@ -202,12 +202,12 @@ void Foam::starMesh::mergeCoupleFacePoints()
                             label minMerge = min(mergeSetA, mergeSetB);
                             label maxMerge = max(mergeSetA, mergeSetB);
 
-#                           ifdef DEBUG_MERGE
+                            #ifdef DEBUG_MERGE
                             Info<< "Points already belong to two "
                                 << "different merge sets. "
                                 << "Eliminate the higher merge set. Sets: "
                                 << minMerge << " and " << maxMerge << endl;
-#                           endif
+                            #endif
 
                             forAll(renumberPoints, elimI)
                             {
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index 07b146f674..c5459ebb9c 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -847,12 +847,12 @@ int main(int argc, char *argv[])
     printAllSets(mesh, Info);
 
     // Read history if interactive
-#   ifdef HAS_READLINE
+    #ifdef HAS_READLINE
     if (!batch && !read_history((runTime.path()/historyFile).c_str()))
     {
         Info<< "Successfully read history from " << historyFile << endl;
     }
-#   endif
+    #endif
 
 
     // Exit status
@@ -929,7 +929,7 @@ int main(int argc, char *argv[])
             }
             else
             {
-#               ifdef HAS_READLINE
+                #ifdef HAS_READLINE
                 {
                     char* linePtr = readline("readline>");
 
@@ -950,7 +950,7 @@ int main(int argc, char *argv[])
                         break;
                     }
                 }
-#               else
+                #else
                 {
                     if (!std::cin.good())
                     {
@@ -961,7 +961,7 @@ int main(int argc, char *argv[])
                     Info<< "Command>" << flush;
                     std::getline(std::cin, rawLine);
                 }
-#               endif
+                #endif
             }
 
             // Strip off anything after #
diff --git a/applications/utilities/mesh/manipulation/setSet/writeFuns.C b/applications/utilities/mesh/manipulation/setSet/writeFuns.C
index 6363a485aa..720a6dff94 100644
--- a/applications/utilities/mesh/manipulation/setSet/writeFuns.C
+++ b/applications/utilities/mesh/manipulation/setSet/writeFuns.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,19 +26,19 @@ License
 #include "writeFuns.H"
 
 #if defined(__mips)
-#include <standards.h>
-#include <sys/endian.h>
+    #include <standards.h>
+    #include <sys/endian.h>
 #endif
 
 #if defined(LITTLE_ENDIAN) \
  || defined(_LITTLE_ENDIAN) \
  || defined(__LITTLE_ENDIAN)
-#   define LITTLEENDIAN 1
+    #define LITTLEENDIAN 1
 #elif defined(BIG_ENDIAN) || defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN)
-#   undef LITTLEENDIAN
+    #undef LITTLEENDIAN
 #else
-#   error "Cannot find LITTLE_ENDIAN or BIG_ENDIAN symbol defined."
-#   error "Please add to compilation options"
+    #error "Cannot find LITTLE_ENDIAN or BIG_ENDIAN symbol defined."
+    #error "Please add to compilation options"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
index 5685ebc440..d9e9f9cfc8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,28 +27,28 @@ License
 #include "vtkTopo.H"
 
 #if defined(__mips)
-#include <standards.h>
-#include <sys/endian.h>
+    #include <standards.h>
+    #include <sys/endian.h>
 #endif
 
 // MacOSX
 #ifdef __DARWIN_BYTE_ORDER
-#if __DARWIN_BYTE_ORDER==__DARWIN_BIG_ENDIAN
-#undef LITTLE_ENDIAN
-#else
-#undef BIG_ENDIAN
-#endif
+    #if __DARWIN_BYTE_ORDER==__DARWIN_BIG_ENDIAN
+        #undef LITTLE_ENDIAN
+    #else
+        #undef BIG_ENDIAN
+    #endif
 #endif
 
 #if defined(LITTLE_ENDIAN) \
  || defined(_LITTLE_ENDIAN) \
  || defined(__LITTLE_ENDIAN)
-#   define LITTLEENDIAN 1
+    #define LITTLEENDIAN 1
 #elif defined(BIG_ENDIAN) || defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN)
-#   undef LITTLEENDIAN
+    #undef LITTLEENDIAN
 #else
-#   error "Cannot find LITTLE_ENDIAN or BIG_ENDIAN symbol defined."
-#   error "Please add to compilation options"
+    #error "Cannot find LITTLE_ENDIAN or BIG_ENDIAN symbol defined."
+    #error "Please add to compilation options"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -85,9 +85,9 @@ void Foam::writeFuns::write
 {
     if (binary)
     {
-#       ifdef LITTLEENDIAN
+        #ifdef LITTLEENDIAN
         swapWords(fField.size(), reinterpret_cast<label*>(fField.begin()));
-#       endif
+        #endif
         os.write
         (
             reinterpret_cast<char*>(fField.begin()),
@@ -138,9 +138,9 @@ void Foam::writeFuns::write
 {
     if (binary)
     {
-#       ifdef LITTLEENDIAN
+        #ifdef LITTLEENDIAN
         swapWords(elems.size(), reinterpret_cast<label*>(elems.begin()));
-#       endif
+        #endif
         os.write
         (
             reinterpret_cast<char*>(elems.begin()),
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H
index c9fd0d389f..7d768159ce 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H
@@ -5,7 +5,7 @@ int USERD_get_part_elements_by_type
     int **conn_array
 )
 {
-#   ifdef ENSIGHTDEBUG
+    #ifdef ENSIGHTDEBUG
     Info<< "Entering: USERD_get_part_elements_by_type" << nl
         << "part_number = " << part_number << nl
         << "element_type = " << element_type;
@@ -46,7 +46,7 @@ int USERD_get_part_elements_by_type
         Info<< " unknown";
     }
     Info<< endl << flush;
-#   endif
+    #endif
 
     if (part_number == 1)
     {
@@ -244,9 +244,9 @@ int USERD_get_part_elements_by_type
         return Z_ERR;
     }
 
-#   ifdef ENSIGHTDEBUG
+    #ifdef ENSIGHTDEBUG
     Info<< "Leaving: USERD_get_part_elements_by_type" << endl;
-#   endif
+    #endif
 
     return Z_OK;
 }
diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H
index 8dc2e49a75..65a4757036 100644
--- a/etc/codeTemplates/BC/BC.H
+++ b/etc/codeTemplates/BC/BC.H
@@ -236,7 +236,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CONSTRUCT.C"
+    #include "CONSTRUCT.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/etc/codeTemplates/template/_TemplateTemplate.H b/etc/codeTemplates/template/_TemplateTemplate.H
index 8fee2df3ef..12e5511b73 100644
--- a/etc/codeTemplates/template/_TemplateTemplate.H
+++ b/etc/codeTemplates/template/_TemplateTemplate.H
@@ -147,7 +147,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CLASSNAME.C"
+    #include "CLASSNAME.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 9188b7e24c..525c84817a 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #ifdef solarisGcc
-# define _SYS_VNODE_H
+    #define _SYS_VNODE_H
 #endif
 
 #include "OSspecific.H"
@@ -58,11 +58,11 @@ Description
 #include <netinet/in.h>
 
 #ifdef USE_RANDOM
-#   include <climits>
-#   if INT_MAX    != 2147483647
-#       error "INT_MAX    != 2147483647"
-#       error "The random number generator may not work!"
-#   endif
+    #include <climits>
+    #if INT_MAX    != 2147483647
+        #error "INT_MAX    != 2147483647"
+        #error "The random number generator may not work!"
+    #endif
 #endif
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index e3bddbc78f..045ed5be49 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,15 +32,15 @@ License
 #include "regIOobject.H"     // for fileModificationSkew symbol
 
 #ifdef FOAM_USE_INOTIFY
-#   include <unistd.h>
-#   include <sys/inotify.h>
-#   include <sys/ioctl.h>
-#   include <errno.h>
-#   define EVENT_SIZE  ( sizeof (struct inotify_event) )
-#   define EVENT_LEN   (EVENT_SIZE + 16)
-#   define EVENT_BUF_LEN     ( 1024 * EVENT_LEN )
+    #include <unistd.h>
+    #include <sys/inotify.h>
+    #include <sys/ioctl.h>
+    #include <errno.h>
+    #define EVENT_SIZE  ( sizeof (struct inotify_event) )
+    #define EVENT_LEN   (EVENT_SIZE + 16)
+    #define EVENT_BUF_LEN     ( 1024 * EVENT_LEN )
 #else
-#   include "OSspecific.H"
+    #include "OSspecific.H"
 #endif
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
index e80b526461..c54493d5ef 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
@@ -683,7 +683,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "dynamicIndexedOctree.C"
+    #include "dynamicIndexedOctree.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
index d1debf7f9f..e0ead6cf00 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
@@ -697,7 +697,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "indexedOctree.C"
+    #include "indexedOctree.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/algorithms/indexedOctree/labelBits.H b/src/OpenFOAM/algorithms/indexedOctree/labelBits.H
index b2a8907e3c..6653189945 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/labelBits.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/labelBits.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ class labelBits
 
         inline static label pack(const label val, const direction bits)
         {
-#           ifdef FULLDEBUG
+            #ifdef FULLDEBUG
             if (bits > 7 || (((val<<3)>>3) != val))
             {
                 FatalErrorInFunction
@@ -66,7 +66,7 @@ class labelBits
                     << label(8*sizeof(label)-3) << " bit representation"
                     << abort(FatalError);
             }
-#           endif
+            #endif
 
             return (val<<3) | bits;
         }
diff --git a/src/OpenFOAM/db/Callback/Callback.H b/src/OpenFOAM/db/Callback/Callback.H
index c4ef970595..b68e13e1e6 100644
--- a/src/OpenFOAM/db/Callback/Callback.H
+++ b/src/OpenFOAM/db/Callback/Callback.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,7 +99,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Callback.C"
+    #include "Callback.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
index 71777c2c09..e2481e6473 100644
--- a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
+++ b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CallbackRegistry.C"
+    #include "CallbackRegistry.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
index f7bdf4b48c..231119e6a0 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
@@ -130,7 +130,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CompactIOField.C"
+    #include "CompactIOField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
index 7c8628ef1c..9abb601210 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
@@ -149,7 +149,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CompactIOList.C"
+    #include "CompactIOList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
index 29768ee62d..c5029307db 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
@@ -98,7 +98,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IOField.C"
+    #include "IOField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.H b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
index 8a54d99aac..ea5b42dc50 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.H
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
@@ -99,7 +99,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IOList.C"
+    #include "IOList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
index 5d9cae6b5f..0f2afa9828 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IOMap.C"
+    #include "IOMap.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
index cef88c4608..09df9ba721 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IOPtrList.C"
+    #include "IOPtrList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
index 5eefb98e99..984110e314 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -181,7 +181,7 @@ inline Istream& operator>>(Istream& is, IOstreamManip f)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "HashTable.C"
+    #include "HashTable.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index 2a0ebd43b7..266849bba8 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -328,10 +328,10 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "gatherScatter.C"
-#   include "combineGatherScatter.C"
-#   include "gatherScatterList.C"
-#   include "exchange.C"
+    #include "gatherScatter.C"
+    #include "combineGatherScatter.C"
+    #include "gatherScatterList.C"
+    #include "exchange.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H b/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H
index 72b38e5ec3..b4188f75fc 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ T ReadHex(ISstream&);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReadHex.C"
+    #include "ReadHex.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 040e829fb4..33c1528ba0 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -554,7 +554,7 @@ dictionary operator|(const dictionary& dict1, const dictionary& dict2);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "dictionaryTemplates.C"
+    #include "dictionaryTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index 35314c46e0..74392ebda7 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
@@ -194,7 +194,7 @@ Ostream& operator<<(Ostream&, const InfoProxy<primitiveEntry>&);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "primitiveEntryTemplates.C"
+    #include "primitiveEntryTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
index 6def8c4580..1f3936c579 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "dlLibraryTableTemplates.C"
+    #include "dlLibraryTableTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
index f466832690..77b248f7e8 100644
--- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
+++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,7 +154,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IOOutputFilter.C"
+    #include "IOOutputFilter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
index 6e874dc52a..05b794d5e7 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -232,7 +232,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "OutputFilterFunctionObject.C"
+    #include "OutputFilterFunctionObject.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index 2352b3a3bd..bae145b041 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -235,7 +235,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "objectRegistryTemplates.C"
+    #include "objectRegistryTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/typeInfo/className.H b/src/OpenFOAM/db/typeInfo/className.H
index 745da10fc5..46ab38152b 100644
--- a/src/OpenFOAM/db/typeInfo/className.H
+++ b/src/OpenFOAM/db/typeInfo/className.H
@@ -100,11 +100,11 @@ public:                                                                        \
     defineTypeNameWithName(Type, Type::typeName_())
 
 //- Define the typeName as \a Name for template classes
-# define defineTemplateTypeNameWithName(Type, Name)                            \
+#define defineTemplateTypeNameWithName(Type, Name)                             \
     template<>                                                                 \
     defineTypeNameWithName(Type, Name)
 //- Define the typeName as \a Name for template sub-classes
-# define defineTemplate2TypeNameWithName(Type, Name)                           \
+#define defineTemplate2TypeNameWithName(Type, Name)                            \
     template<>                                                                 \
     defineTypeNameWithName(Type, Name)
 
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index b4817d45e0..946b28baf8 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -340,7 +340,7 @@ PRODUCT_OPERATOR(scalarProduct, &&, dotdot)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "dimensionedType.C"
+    #include "dimensionedType.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index f90f9bfe25..2f5034c0f8 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -348,7 +348,7 @@ public:
 #include "DimensionedFieldFunctions.H"
 
 #ifdef NoRepository
-#   include "DimensionedField.C"
+    #include "DimensionedField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
index efd3b9c231..0a9eeae38c 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
@@ -152,7 +152,7 @@ BesselFunc(yn)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "DimensionedScalarField.C"
+    #include "DimensionedScalarField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.H
index 2b7cb73ef8..6a94e7a398 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ BINARY_TYPE_OPERATOR(sphericalTensor, scalar, sphericalTensor, /, '|', divide)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "DimensionedSphericalTensorField.C"
+    #include "DimensionedSphericalTensorField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H
index 01f8c2a037..b046816f2c 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ UNARY_OPERATOR(vector, symmTensor, *, hdual, transform)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "DimensionedSymmTensorField.C"
+    #include "DimensionedSymmTensorField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H
index d0a62746aa..8b20379d76 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ UNARY_OPERATOR(tensor, vector, *, hdual, transform)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "DimensionedTensorField.C"
+    #include "DimensionedTensorField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index 2324b86e12..940afea59b 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -387,6 +387,6 @@ Ostream& operator<<(Ostream& os, const tmp<FieldField<Field, Type>>& tf)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "FieldFieldFunctions.C"
+    #include "FieldFieldFunctions.C"
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
index 40e3f2c24a..2f2b273535 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
@@ -195,7 +195,7 @@ public:
 #include "FieldFieldFunctions.H"
 
 #ifdef NoRepository
-#   include "FieldField.C"
+    #include "FieldField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H b/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H
index 3fb0e4763f..4b1c9e084b 100644
--- a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "oneFieldFieldI.H"
+    #include "oneFieldFieldI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
index 208a719074..43e6418914 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
@@ -153,7 +153,7 @@ BesselFunc(yn)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "scalarFieldField.C"
+    #include "scalarFieldField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/FieldFields/sphericalTensorFieldField/sphericalTensorFieldField.H b/src/OpenFOAM/fields/FieldFields/sphericalTensorFieldField/sphericalTensorFieldField.H
index b3b84d6a1d..cc88213139 100644
--- a/src/OpenFOAM/fields/FieldFields/sphericalTensorFieldField/sphericalTensorFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/sphericalTensorFieldField/sphericalTensorFieldField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ BINARY_TYPE_OPERATOR(sphericalTensor, scalar, sphericalTensor, /, divide)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "sphericalTensorFieldField.C"
+    #include "sphericalTensorFieldField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H b/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H
index 3e28101332..3742575345 100644
--- a/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ BINARY_TYPE_OPERATOR(tensor, symmTensor, symmTensor, &, dot)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "symmTensorFieldField.C"
+    #include "symmTensorFieldField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H b/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H
index ad6d7a5eae..df227c1293 100644
--- a/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ BINARY_TYPE_OPERATOR(vector, vector, tensor, /, divide)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "tensorFieldField.C"
+    #include "tensorFieldField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
index 2b313ac995..28cd315077 100644
--- a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
@@ -113,7 +113,7 @@ tmp<FieldField<Field, Type>> transform
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "transformFieldField.C"
+    #include "transformFieldField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H b/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H
index a351a7cb40..a48c83ffce 100644
--- a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "zeroFieldFieldI.H"
+    #include "zeroFieldFieldI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index 06165cbb41..60cff25b94 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -249,7 +249,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DynamicField.C"
+    #include "DynamicField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 1d69ef80da..a5d01b47f7 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -386,7 +386,7 @@ public:
 #include "FieldFunctions.H"
 
 #ifdef NoRepository
-#   include "Field.C"
+    #include "Field.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/oneField/oneField.H b/src/OpenFOAM/fields/Fields/oneField/oneField.H
index 7512ee14f0..1dbf352756 100644
--- a/src/OpenFOAM/fields/Fields/oneField/oneField.H
+++ b/src/OpenFOAM/fields/Fields/oneField/oneField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "oneFieldI.H"
+    #include "oneFieldI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
index 5e25bf0e74..3b09762d2d 100644
--- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
+++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
@@ -122,7 +122,7 @@ tmp<Field<tensor>> transformFieldMask<tensor>
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "symmTransformField.C"
+    #include "symmTransformField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformField.H b/src/OpenFOAM/fields/Fields/transformField/transformField.H
index e5bf3917a1..efef059d9e 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformField.H
+++ b/src/OpenFOAM/fields/Fields/transformField/transformField.H
@@ -134,7 +134,7 @@ tmp<vectorField> transform(const septernion&, const tmp<vectorField>&);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "transformFieldTemplates.C"
+    #include "transformFieldTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/transformList/transformList.H b/src/OpenFOAM/fields/Fields/transformList/transformList.H
index 2da8e39477..1d08200634 100644
--- a/src/OpenFOAM/fields/Fields/transformList/transformList.H
+++ b/src/OpenFOAM/fields/Fields/transformList/transformList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -145,7 +145,7 @@ inline void transformList(const tensorField&, EdgeMap<scalar>&)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "transformList.C"
+    #include "transformList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index 5c27f055d1..4efc05d309 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -618,7 +618,7 @@ Ostream& operator<<
 #include "GeometricFieldI.H"
 
 #ifdef NoRepository
-#   include "GeometricField.C"
+    #include "GeometricField.C"
 #endif
 
 #include "GeometricFieldFunctions.H"
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
index 4cf01dcf9d..5174d91fd9 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
@@ -77,7 +77,7 @@ tmp<GeoField> uniformInterpolate
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "uniformInterpolate.C"
+    #include "uniformInterpolate.C"
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
index 65ebaf9304..950b526796 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
@@ -168,7 +168,7 @@ BesselFunc(yn)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "GeometricScalarField.C"
+    #include "GeometricScalarField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.H b/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.H
index 94a48d134d..e2a49fb04c 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ BINARY_TYPE_OPERATOR(sphericalTensor, scalar, sphericalTensor, /, '|', divide)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "GeometricSphericalTensorField.C"
+    #include "GeometricSphericalTensorField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H b/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H
index 5706894bbe..53a4245619 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ BINARY_TYPE_OPERATOR(tensor, symmTensor, symmTensor, &, '&', dot)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "GeometricSymmTensorField.C"
+    #include "GeometricSymmTensorField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
index e88d0e6cb4..0479e636e9 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ BINARY_TYPE_OPERATOR(vector, vector, tensor, /, '|', divide)
 #include "undefFieldFunctionsM.H"
 
 #ifdef NoRepository
-#   include "GeometricTensorField.C"
+    #include "GeometricTensorField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
index 594315715e..716225e3fb 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
@@ -215,7 +215,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SlicedGeometricField.C"
+    #include "SlicedGeometricField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H
index e83c2c0d58..d57bfbea91 100644
--- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H
+++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ inline const geometricOneField& operator/
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "geometricOneFieldI.H"
+    #include "geometricOneFieldI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H
index 7e5aa91024..0eb7c87235 100644
--- a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H
+++ b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "geometricZeroFieldI.H"
+    #include "geometricZeroFieldI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
index 36307c90aa..77c95e7422 100644
--- a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
@@ -112,7 +112,7 @@ tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "transformGeometricField.C"
+    #include "transformGeometricField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/ReadFields/ReadFields.H b/src/OpenFOAM/fields/ReadFields/ReadFields.H
index ac4bdb37c7..5d6e9db570 100644
--- a/src/OpenFOAM/fields/ReadFields/ReadFields.H
+++ b/src/OpenFOAM/fields/ReadFields/ReadFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ static void ReadFields
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReadFields.C"
+    #include "ReadFields.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
index 5a19a4e494..767e4daf06 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "UniformDimensionedField.C"
+    #include "UniformDimensionedField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
index 45f1945ad8..3529c77b7d 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
@@ -136,7 +136,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "basicSymmetryPointPatchField.C"
+    #include "basicSymmetryPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
index b331000367..afea0505b9 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
@@ -126,7 +126,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "calculatedPointPatchField.C"
+    #include "calculatedPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
index 283c8cf3b8..d9cac6941f 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
@@ -143,7 +143,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "coupledPointPatchField.C"
+    #include "coupledPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
index 1e101b8f88..7b3c152679 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
@@ -148,7 +148,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "fixedValuePointPatchField.C"
+    #include "fixedValuePointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
index aedb5b5ceb..298eabeecb 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
@@ -226,7 +226,7 @@ tmp<Field<Type>> operator+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "valuePointPatchField.C"
+    #include "valuePointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
index 6f288f86ab..26d34f8cbc 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
@@ -128,7 +128,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "zeroGradientPointPatchField.C"
+    #include "zeroGradientPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
index 981f7ee0d9..50b4afbe68 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
@@ -181,7 +181,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "cyclicPointPatchField.C"
+    #include "cyclicPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
index b33f1ed47a..22b39163eb 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
@@ -140,7 +140,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "cyclicSlipPointPatchField.C"
+    #include "cyclicSlipPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
index 6f7dfda203..3cac7561d0 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
@@ -140,7 +140,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "emptyPointPatchField.C"
+    #include "emptyPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
index 8a3c17e453..b6ef3e2a8c 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
@@ -140,7 +140,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "nonuniformTransformCyclicPointPatchField.C"
+    #include "nonuniformTransformCyclicPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
index 68565fa3fd..c8028b4710 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
@@ -192,7 +192,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "processorPointPatchField.C"
+    #include "processorPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
index bca065d7a7..2859591bed 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
@@ -193,7 +193,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "processorCyclicPointPatchField.C"
+    #include "processorCyclicPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
index 098f484e81..01278db9a8 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
@@ -139,7 +139,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "symmetryPointPatchField.C"
+    #include "symmetryPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
index 4090b6b9f2..acbba86d21 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
@@ -151,7 +151,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "symmetryPlanePointPatchField.C"
+    #include "symmetryPlanePointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
index 27270b5fd1..e14fb992e6 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
@@ -147,7 +147,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "wedgePointPatchField.C"
+    #include "wedgePointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
index bc2a08de68..19c775ab71 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
@@ -245,7 +245,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "codedFixedValuePointPatchField.C"
+    #include "codedFixedValuePointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
index fa0692d96d..cff5af3d6e 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
@@ -160,7 +160,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "fixedNormalSlipPointPatchField.C"
+    #include "fixedNormalSlipPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
index f21b4ef1b9..4847b73675 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
@@ -128,7 +128,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "slipPointPatchField.C"
+    #include "slipPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H
index 40c18a6dc0..2880afa4c4 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H
@@ -157,7 +157,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "timeVaryingUniformFixedValuePointPatchField.C"
+    #include "timeVaryingUniformFixedValuePointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
index d0d76fd083..02adc8dc96 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
@@ -173,7 +173,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "uniformFixedValuePointPatchField.C"
+    #include "uniformFixedValuePointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index bf77b43ac9..d69b75f37f 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -496,8 +496,8 @@ const pointPatchField<Type>& operator+
 #include "pointPatchFieldFunctions.H"
 
 #ifdef NoRepository
-#   include "pointPatchField.C"
-#   include "calculatedPointPatchField.H"
+    #include "pointPatchField.C"
+    #include "calculatedPointPatchField.H"
 #endif
 
 
diff --git a/src/OpenFOAM/global/debug/defineDebugSwitch.H b/src/OpenFOAM/global/debug/defineDebugSwitch.H
index 219d01c349..f71e960f40 100644
--- a/src/OpenFOAM/global/debug/defineDebugSwitch.H
+++ b/src/OpenFOAM/global/debug/defineDebugSwitch.H
@@ -115,12 +115,12 @@ public:
     registerDebugSwitchWithName(Type, Type, Type::typeName_())
 
 //- Define the debug information for templates, lookup as \a Name
-# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch)            \
+#define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch)             \
     template<>                                                                 \
     defineDebugSwitchWithName(Type, Name, DebugSwitch);                        \
     registerTemplateDebugSwitchWithName(Type, Name)
 //- Define the debug information for templates sub-classes, lookup as \a Name
-# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch)           \
+#define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch)            \
     template<>                                                                 \
     defineDebugSwitchWithName(Type, Name, DebugSwitch);                        \
     registerTemplateDebugSwitchWithName(Type, Name)
diff --git a/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.H b/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.H
index efb999078e..05194148fa 100644
--- a/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.H
+++ b/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ Type interpolatePointToCell
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolatePointToCell.C"
+    #include "interpolatePointToCell.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/interpolateSplineXY/interpolateSplineXY.H b/src/OpenFOAM/interpolations/interpolateSplineXY/interpolateSplineXY.H
index 57a49b4236..d99af5575c 100644
--- a/src/OpenFOAM/interpolations/interpolateSplineXY/interpolateSplineXY.H
+++ b/src/OpenFOAM/interpolations/interpolateSplineXY/interpolateSplineXY.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ Type interpolateSplineXY
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolateSplineXY.C"
+    #include "interpolateSplineXY.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/interpolateXY/interpolateXY.H b/src/OpenFOAM/interpolations/interpolateXY/interpolateXY.H
index cf4abd786d..ea6d6e215f 100644
--- a/src/OpenFOAM/interpolations/interpolateXY/interpolateXY.H
+++ b/src/OpenFOAM/interpolations/interpolateXY/interpolateXY.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ Type interpolateXY
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolateXY.C"
+    #include "interpolateXY.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
index be6fb45e33..7555239bbc 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
@@ -167,7 +167,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolation2DTable.C"
+    #include "interpolation2DTable.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H
index e71f902d88..019c3738ed 100644
--- a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H
+++ b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -221,7 +221,7 @@ public:
 #include "interpolationLookUpTableI.H"
 
 #ifdef NoRepository
-#   include "interpolationLookUpTable.C"
+    #include "interpolationLookUpTable.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
index 83382d343c..fc34afbd87 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
@@ -179,7 +179,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolationTable.C"
+    #include "interpolationTable.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
index 46949da452..d1bc29c332 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
@@ -122,7 +122,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "csvTableReader.C"
+    #include "csvTableReader.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
index ee44fe6799..035c178877 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "openFoamTableReader.C"
+    #include "openFoamTableReader.C"
 #endif
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
index 7540e37fa0..53cb930af4 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
@@ -122,7 +122,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "tableReader.C"
+    #include "tableReader.C"
 #endif
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
index 36e3472835..131cfeb93f 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,7 +149,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolationWeightsTemplates.C"
+    #include "interpolationWeightsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C
index 2cc2a88c10..3f5d9baba1 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -182,7 +182,7 @@ bool PatchToPatchInterpolation<FromPatch, ToPatch>::movePoints()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "CalcPatchToPatchWeights.C"
-#   include "PatchToPatchInterpolate.C"
+    #include "CalcPatchToPatchWeights.C"
+    #include "PatchToPatchInterpolate.C"
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
index 04cea8be20..9af12426f0 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
@@ -228,7 +228,7 @@ public:
 } // End namespace Foam
 
 #ifdef NoRepository
-#   include "PatchToPatchInterpolation.C"
+    #include "PatchToPatchInterpolation.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
index 14f2228772..f0663606c5 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
@@ -156,7 +156,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PrimitivePatchInterpolation.C"
+    #include "PrimitivePatchInterpolation.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
index a065b3aec3..8fdf3e972a 100644
--- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
+++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ DiagonalMatrix<Type> inv(const DiagonalMatrix<Type>&);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DiagonalMatrix.C"
+    #include "DiagonalMatrix.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
index 9c96d8dd23..226cd63a80 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,7 +120,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LUscalarMatrixTemplates.C"
+    #include "LUscalarMatrixTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
index aa21af6b43..289649f2a9 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LduInterfaceField.C"
+    #include "LduInterfaceField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
index 55081e89a5..1da27f106b 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
@@ -794,8 +794,8 @@ LduMatrix<Type, DType, LUType>::solver::                                       \
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LduMatrixI.H"
-#   include "LduMatrix.C"
+    #include "LduMatrixI.H"
+    #include "LduMatrix.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
index 9781cf42cb..a933e1aeca 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
@@ -291,7 +291,7 @@ const scalar solverPerformance##Type::vsmall_(VSMALL);                         \
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SolverPerformance.C"
+    #include "SolverPerformance.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H
index da46f81858..075f2087a6 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TDILUPreconditioner.C"
+    #include "TDILUPreconditioner.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
index 93eca754e0..f35342aa8b 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DiagonalPreconditioner.C"
+    #include "DiagonalPreconditioner.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
index bf8b10d24b..856b4673f9 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoPreconditioner.C"
+    #include "NoPreconditioner.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H b/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H
index 2627592989..839aff7a1e 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TGaussSeidelSmoother.C"
+    #include "TGaussSeidelSmoother.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
index b9dc537c08..cd771ed8ba 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DiagonalSolver.C"
+    #include "DiagonalSolver.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
index 39c0e56d44..7ebf51669a 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PBiCCCG.C"
+    #include "PBiCCCG.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
index 1265af2aac..6c848f418a 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PBiCICG.C"
+    #include "PBiCICG.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
index cafeb7f61d..56764df933 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PCICG.C"
+    #include "PCICG.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H
index 54db11be8c..cc073477c7 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SmoothSolver.C"
+    #include "SmoothSolver.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index dc8e1f9e88..8455ac997f 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -227,12 +227,12 @@ template<class Form, class Type> Form operator*
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "MatrixI.H"
+    #include "MatrixI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Matrix.C"
+    #include "Matrix.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index 07e987580b..613285c707 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H
@@ -114,9 +114,9 @@ inline void Foam::Matrix<Form, Type>::checkj(const label j) const
 template<class Form, class Type>
 inline Type* Foam::Matrix<Form, Type>::operator[](const label i)
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     checki(i);
-#   endif
+    #endif
     return v_[i];
 }
 
@@ -124,9 +124,9 @@ inline Type* Foam::Matrix<Form, Type>::operator[](const label i)
 template<class Form, class Type>
 inline const Type* Foam::Matrix<Form, Type>::operator[](const label i) const
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     checki(i);
-#   endif
+    #endif
     return v_[i];
 }
 
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
index 3938728b36..270891a955 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
@@ -102,12 +102,12 @@ scalar det(SquareMatrix<Type>&);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "SquareMatrixI.H"
+    #include "SquareMatrixI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SquareMatrix.C"
+    #include "SquareMatrix.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
index f6fee5f732..a5050b24c8 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
@@ -111,12 +111,12 @@ scalar det(const SymmetricSquareMatrix<Type>&);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "SymmetricSquareMatrixI.H"
+    #include "SymmetricSquareMatrixI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SymmetricSquareMatrix.C"
+    #include "SymmetricSquareMatrix.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
index 2ca3c7290c..9a9f9ddd88 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
@@ -159,7 +159,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "processorLduInterfaceTemplates.C"
+    #include "processorLduInterfaceTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 5d5d62fd48..771317ed72 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -735,7 +735,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "lduMatrixTemplates.C"
+    #include "lduMatrixTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
index edcc01d6ee..ff9030ff89 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -494,7 +494,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "GAMGAgglomerationTemplates.C"
+    #include "GAMGAgglomerationTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
index dea8a20d36..c1b8009f29 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
@@ -287,7 +287,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "GAMGInterfaceTemplates.C"
+    #include "GAMGInterfaceTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H
index f01a46f1e0..8cf58611d2 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -160,7 +160,7 @@ scalarRectangularMatrix SVDinv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "scalarMatricesTemplates.C"
+    #include "scalarMatricesTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.H b/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.H
index 62cefec4bc..ddf2e95089 100644
--- a/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.H
+++ b/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,7 +162,7 @@ simpleMatrix<Type> operator*
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "simpleMatrix.C"
+    #include "simpleMatrix.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/solution/solution.H b/src/OpenFOAM/matrices/solution/solution.H
index e6a8040c72..f106450b0f 100644
--- a/src/OpenFOAM/matrices/solution/solution.H
+++ b/src/OpenFOAM/matrices/solution/solution.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -158,7 +158,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "solutionTemplates.C"
+    #include "solutionTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.H b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
index bc844bd1eb..d1e9cf1f48 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.H
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -278,7 +278,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MeshObject.C"
+    #include "MeshObject.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H
index ef1ad593dc..90923a88c2 100644
--- a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H
+++ b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ProcessorTopology.C"
+    #include "ProcessorTopology.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.H b/src/OpenFOAM/meshes/boundBox/boundBox.H
index 9a9821b533..a340a90c04 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.H
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -256,7 +256,7 @@ inline bool contiguous<boundBox>() {return contiguous<point>();}
 #include "boundBoxI.H"
 
 #ifdef NoRepository
-#   include "boundBoxTemplates.C"
+    #include "boundBoxTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/data/data.H b/src/OpenFOAM/meshes/data/data.H
index c5b7758e93..6158348364 100644
--- a/src/OpenFOAM/meshes/data/data.H
+++ b/src/OpenFOAM/meshes/data/data.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,7 +114,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "dataTemplates.C"
+    #include "dataTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.H b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
index d8700b106a..f42413294b 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "lduMeshTemplates.C"
+    #include "lduMeshTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
index e94850f4bd..7561554b64 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
@@ -271,7 +271,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "lduPrimitiveMeshTemplates.C"
+    #include "lduPrimitiveMeshTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index afb9b45496..ca5fd198aa 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -426,7 +426,7 @@ label longestEdge(const face& f, const pointField& pts);
 #include "faceI.H"
 
 #ifdef NoRepository
-#   include "faceTemplates.C"
+    #include "faceTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
index 218fa12e9b..d4f424b6ca 100644
--- a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
+++ b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,14 +70,14 @@ inline Foam::triFace Foam::tetCell::face(const label faceI) const
     static const label b[] = {2, 3, 1, 2};
     static const label c[] = {3, 2, 3, 1};
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (faceI >= 4)
     {
         FatalErrorInFunction
             << "index out of range 0 -> 3. faceI = " << faceI
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     return triFace
     (
@@ -95,14 +95,14 @@ inline Foam::label Foam::tetCell::edgeFace(const label edgeI) const
     //static const label edgeFaces[6] = {2, 1, 1, 0, 0, 0};
     static const label edgeFaces[6] = {2, 3, 1, 0, 0, 1};
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (edgeI >= 6)
     {
         FatalErrorInFunction
             << "edge index out of range 0 -> 5. edgeI = " << edgeI
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     return edgeFaces[edgeI];
 }
@@ -126,7 +126,7 @@ inline Foam::label Foam::tetCell::edgeAdjacentFace
         {1, 0, -1, -1}
     };
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (faceI >= 4)
     {
         FatalErrorInFunction
@@ -140,7 +140,7 @@ inline Foam::label Foam::tetCell::edgeAdjacentFace
             << "edge index out of range 0 -> 5. edgeI = " << edgeI
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     return adjacentFace[edgeI][faceI];
 }
@@ -154,14 +154,14 @@ inline Foam::edge Foam::tetCell::tetEdge(const label edgeI) const
     static const label start[] = {0, 0, 0, 3, 1, 3};
     static const label end[] = {1, 2, 3, 1, 2, 2};
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (edgeI >= 6)
     {
         FatalErrorInFunction
             << "index out of range 0 -> 5. edgeI = " << edgeI
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     return edge(operator[](start[edgeI]), operator[](end[edgeI]));
 }
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index 892fd6d480..2a66556d22 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -293,7 +293,7 @@ public:
 #include "triFaceI.H"
 
 #ifdef NoRepository
-#   include "triFaceTemplates.C"
+    #include "triFaceTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshTools/mergePoints.H b/src/OpenFOAM/meshes/meshTools/mergePoints.H
index 92f1f1071f..37d41f3e7b 100644
--- a/src/OpenFOAM/meshes/meshTools/mergePoints.H
+++ b/src/OpenFOAM/meshes/meshTools/mergePoints.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ bool mergePoints
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "mergePoints.C"
+    #include "mergePoints.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.H
index 3a6d49e757..129b477bec 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -251,7 +251,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "globalIndexTemplates.C"
+    #include "globalIndexTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index 3c1cb48cb0..2362f9382f 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -625,7 +625,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "globalMeshDataTemplates.C"
+    #include "globalMeshDataTemplates.C"
 #endif
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
index 8a5b06d446..f209610e0f 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
@@ -771,7 +771,7 @@ void mapDistribute::transform::operator()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "mapDistributeTemplates.C"
+    #include "mapDistributeTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
index cb1484b3b0..281b891b6c 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -615,7 +615,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "syncToolsTemplates.C"
+    #include "syncToolsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
index d0bb099026..06ee30f5e9 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -204,7 +204,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ZoneMesh.C"
+    #include "ZoneMesh.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
index 6eed70e628..648fd4a264 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -310,7 +310,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PatchTools.C"
+    #include "PatchTools.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
index 0d7f235d84..e01541b6ec 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
@@ -473,7 +473,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PrimitivePatch.C"
+    #include "PrimitivePatch.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
index 6ecdfddbab..954cffdabe 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -327,7 +327,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "tetrahedron.C"
+    #include "tetrahedron.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
index 6648ba7bcc..24a68e8fd4 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -362,7 +362,7 @@ inline bool contiguous<treeBoundBox>() {return contiguous<boundBox>();}
 #include "treeBoundBoxI.H"
 
 #ifdef NoRepository
-#   include "treeBoundBoxTemplates.C"
+    #include "treeBoundBoxTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index f9bf6dfc67..7a2bf4f91b 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -168,7 +168,7 @@ word name(const VectorSpace<Form, Cmpt, nCmpt>&);
 #include "VectorSpaceI.H"
 
 #ifdef NoRepository
-#   include "VectorSpace.C"
+    #include "VectorSpace.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index 4752ea43f5..7ba4fe1690 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,14 +76,14 @@ inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
     const direction d
 ) const
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (d >= nCmpt)
     {
         FatalErrorInFunction
             << "index out of range"
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     return v_[d];
 }
@@ -95,14 +95,14 @@ inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
     const direction d
 )
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (d >= nCmpt)
     {
         FatalErrorInFunction
             << "index out of range"
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     return v_[d];
 }
@@ -115,14 +115,14 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::component
     const direction d
 ) const
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (d >= nCmpt)
     {
         FatalErrorInFunction
             << "index out of range"
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     c = v_[d];
 }
@@ -135,14 +135,14 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::replace
     const Cmpt& c
 )
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (d >= nCmpt)
     {
         FatalErrorInFunction
             << "index out of range"
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     v_[d] = c;
 }
@@ -156,14 +156,14 @@ inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
     const direction d
 ) const
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (d >= nCmpt)
     {
         FatalErrorInFunction
             << "index out of range"
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     return v_[d];
 }
@@ -175,14 +175,14 @@ inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
     const direction d
 )
 {
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (d >= nCmpt)
     {
         FatalErrorInFunction
             << "index out of range"
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     return v_[d];
 }
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
index fd8f8d2655..97e0047a2b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
@@ -164,7 +164,7 @@ Foam::scalar CSV<scalar>::readValue(const List<string>& splitted);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CSV.C"
+    #include "CSV.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
index eda6f21654..20b8a68708 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
@@ -121,8 +121,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Constant.C"
-#   include "Function1New.C"
+    #include "Constant.C"
+    #include "Function1New.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index 0e22404a44..fb71134add 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -198,8 +198,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Function1.C"
-#   include "Constant.H"
+    #include "Function1.C"
+    #include "Constant.H"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
index 93ddccbe65..5afa502751 100644
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
@@ -141,7 +141,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PolynomialEntry.C"
+    #include "PolynomialEntry.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index 00320d7568..66c9f11058 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -168,7 +168,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Sine.C"
+    #include "Sine.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
index 9ae5cd8b14..9ca2079c00 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
@@ -175,7 +175,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Square.C"
+    #include "Square.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
index ab1cafd9c5..c11eb621db 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
@@ -104,7 +104,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Table.C"
+    #include "Table.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index 1f2ab0f46f..9a1e228bb1 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
@@ -175,7 +175,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TableBase.C"
+    #include "TableBase.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
index 3bb7d0f813..a44ba48d7f 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
@@ -127,7 +127,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TableFile.C"
+    #include "TableFile.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
index c484830212..b6f20330d8 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -168,8 +168,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Polynomial.C"
-#   include "PolynomialIO.C"
+    #include "Polynomial.C"
+    #include "PolynomialIO.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
index 80f1ed0b63..5d89572d8d 100644
--- a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
+++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
@@ -143,7 +143,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TimeFunction1.C"
+    #include "TimeFunction1.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
index ddd43327ef..e37e3fb371 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
@@ -157,7 +157,7 @@ Foam::globalIndexAndTransform::decodeTransformIndex
         }
     }
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     t /= 3;
     if (t != 0)
     {
@@ -166,7 +166,7 @@ Foam::globalIndexAndTransform::decodeTransformIndex
             << " has more than 3 fields."
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     return permutation;
 }
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H
index d56741a79b..c4db7aa53f 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H
@@ -248,7 +248,7 @@ inline vectorTensorTransform operator&
 #include "vectorTensorTransformI.H"
 
 #ifdef NoRepository
-#   include "vectorTensorTransformTemplates.C"
+    #include "vectorTensorTransformTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
index 17e5697980..b9f16b6b35 100644
--- a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
+++ b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
@@ -29,7 +29,7 @@ Description
 #include "HasherInt.H"
 
 #if defined (__GLIBC__)
-#  include <endian.h>
+    #include <endian.h>
 #endif
 
 // Left-rotate a 32-bit value and carry by nBits
@@ -480,11 +480,11 @@ unsigned Foam::Hasher
 )
 {
 #ifdef __BYTE_ORDER
-# if (__BYTE_ORDER == __BIG_ENDIAN)
-    return jenkins_hashbig(key, length, initval);
-# else
-    return jenkins_hashlittle(key, length, initval);
-# endif
+    #if (__BYTE_ORDER == __BIG_ENDIAN)
+        return jenkins_hashbig(key, length, initval);
+    #else
+        return jenkins_hashlittle(key, length, initval);
+    #endif
 #else
     // endian-ness not known at compile-time: runtime endian test
     const short endianTest = 0x0100;
diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
index 84c179262c..43cb7ec474 100644
--- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
+++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
@@ -39,7 +39,7 @@ Description
 #include <cstring>
 
 #if defined (__GLIBC__)
-#  include <endian.h>
+    #include <endian.h>
 #endif
 
 
@@ -57,29 +57,9 @@ static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
 inline uint32_t Foam::SHA1::swapBytes(uint32_t n)
 {
     #ifdef __BYTE_ORDER
-    # if (__BYTE_ORDER == __BIG_ENDIAN)
-    return n;
-    # else
-    return
-    (
-        ((n) << 24)
-      | (((n) & 0xff00) << 8)
-      | (((n) >> 8) & 0xff00)
-      | ((n) >> 24)
-    );
-    # endif
-
-    #else
-
-    const short x = 0x0100;
-
-    // yields 0x01 for big endian
-    if (*(reinterpret_cast<const char*>(&x)))
-    {
+        #if (__BYTE_ORDER == __BIG_ENDIAN)
         return n;
-    }
-    else
-    {
+        #else
         return
         (
             ((n) << 24)
@@ -87,7 +67,25 @@ inline uint32_t Foam::SHA1::swapBytes(uint32_t n)
           | (((n) >> 8) & 0xff00)
           | ((n) >> 24)
         );
-    }
+        #endif
+    #else
+        const short x = 0x0100;
+
+        // yields 0x01 for big endian
+        if (*(reinterpret_cast<const char*>(&x)))
+        {
+            return n;
+        }
+        else
+        {
+            return
+            (
+                ((n) << 24)
+              | (((n) & 0xff00) << 8)
+              | (((n) >> 8) & 0xff00)
+              | ((n) >> 24)
+            );
+        }
     #endif
 }
 
diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H
index 46f23adfe5..539d8103b1 100644
--- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H
+++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -224,7 +224,7 @@ label cachedRandom::globalPosition<label>(const label& start, const label& end);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cachedRandomTemplates.C"
+    #include "cachedRandomTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/strings/lists/stringListOps.H b/src/OpenFOAM/primitives/strings/lists/stringListOps.H
index 0fb48c6ede..927118e87f 100644
--- a/src/OpenFOAM/primitives/strings/lists/stringListOps.H
+++ b/src/OpenFOAM/primitives/strings/lists/stringListOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -303,7 +303,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "stringListOpsTemplates.C"
+    #include "stringListOpsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/subModelBase/subModelBase.H b/src/OpenFOAM/primitives/subModelBase/subModelBase.H
index 92627782e9..c5f05c06c5 100644
--- a/src/OpenFOAM/primitives/subModelBase/subModelBase.H
+++ b/src/OpenFOAM/primitives/subModelBase/subModelBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -210,7 +210,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "subModelBaseTemplates.C"
+    #include "subModelBaseTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/zero/zero.H b/src/OpenFOAM/primitives/zero/zero.H
index af7a9e562f..ca997cae22 100644
--- a/src/OpenFOAM/primitives/zero/zero.H
+++ b/src/OpenFOAM/primitives/zero/zero.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "zeroI.H"
+    #include "zeroI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index f035c989c3..c5407cb52d 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,9 +37,9 @@ License
 #include <csignal>
 
 #if defined(WM_SP)
-#   define MPI_SCALAR MPI_FLOAT
+    #define MPI_SCALAR MPI_FLOAT
 #elif defined(WM_DP)
-#   define MPI_SCALAR MPI_DOUBLE
+    #define MPI_SCALAR MPI_DOUBLE
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -86,7 +86,7 @@ bool Foam::UPstream::init(int& argc, char**& argv)
     // Initialise parallel structure
     setParRun(numprocs);
 
-#   ifndef SGIMPI
+    #ifndef SGIMPI
     string bufferSizeName = getEnv("MPI_BUFFER_SIZE");
 
     if (bufferSizeName.size())
@@ -105,7 +105,7 @@ bool Foam::UPstream::init(int& argc, char**& argv)
             << "environment variable MPI_BUFFER_SIZE not defined"
             << Foam::abort(FatalError);
     }
-#   endif
+    #endif
 
     //int processorNameLen;
     //char processorName[MPI_MAX_PROCESSOR_NAME];
@@ -125,12 +125,12 @@ void Foam::UPstream::exit(int errnum)
         Pout<< "UPstream::exit." << endl;
     }
 
-#   ifndef SGIMPI
+    #ifndef SGIMPI
     int size;
     char* buff;
     MPI_Buffer_detach(&buff, &size);
     delete[] buff;
-#   endif
+    #endif
 
     if (PstreamGlobals::outstandingRequests_.size())
     {
diff --git a/src/Pstream/mpi/allReduce.H b/src/Pstream/mpi/allReduce.H
index fae4ff99ea..83e4f4c847 100644
--- a/src/Pstream/mpi/allReduce.H
+++ b/src/Pstream/mpi/allReduce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ void allReduce
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "allReduceTemplates.C"
+    #include "allReduceTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
index 0a9cdfe58b..763303447e 100644
--- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,7 +148,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CompressibleTurbulenceModel.C"
+    #include "CompressibleTurbulenceModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
index 82ba1221d9..3254919297 100644
--- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
+++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,7 +155,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "EddyDiffusivity.C"
+    #include "EddyDiffusivity.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H
index f36c0f69a4..0b29d2481d 100644
--- a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H
+++ b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H
@@ -152,7 +152,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "buoyantKEpsilon.C"
+    #include "buoyantKEpsilon.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
index ab8c7c5388..d2e9808cb3 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -177,7 +177,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ThermalDiffusivity.C"
+    #include "ThermalDiffusivity.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
index f3c84cb4b5..d861f56895 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -263,7 +263,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "thermalBaffle1DFvPatchScalarField.C"
+    #include "thermalBaffle1DFvPatchScalarField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
index 0be10e1b0e..3306738501 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
@@ -79,7 +79,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "turbulentFluidThermoModel.C"
+    #include "turbulentFluidThermoModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H
index eb9d8bfb06..49ccd10f83 100644
--- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IncompressibleTurbulenceModel.C"
+    #include "IncompressibleTurbulenceModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
index 99f70435bd..31b9a37c15 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "turbulentTransportModel.C"
+    #include "turbulentTransportModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H
index 62b65a9a6c..70503dbdd8 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H
+++ b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H
@@ -165,7 +165,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NicenoKEqn.C"
+    #include "NicenoKEqn.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H
index 4e3e5ef03b..e243ba689f 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H
+++ b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H
@@ -158,7 +158,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SmagorinskyZhang.C"
+    #include "SmagorinskyZhang.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H
index fe4b8f20a2..fdf2d23738 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H
+++ b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H
@@ -152,7 +152,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "continuousGasKEqn.C"
+    #include "continuousGasKEqn.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H
index 7ebabf3072..9e5e68e103 100644
--- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -158,7 +158,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PhaseCompressibleTurbulenceModel.C"
+    #include "PhaseCompressibleTurbulenceModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H
index 57b2d5da2d..86dbf0d6da 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H
@@ -172,7 +172,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LaheyKEpsilon.C"
+    #include "LaheyKEpsilon.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H
index 60fa636321..778a6f7dcb 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H
@@ -170,7 +170,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "continuousGasKEpsilon.C"
+    #include "continuousGasKEpsilon.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
index 0f0e835e8a..09313c1106 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
@@ -257,7 +257,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "mixtureKEpsilon.C"
+    #include "mixtureKEpsilon.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H
index fb4ee56c32..9a8e7f1fe4 100644
--- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,7 +133,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PhaseIncompressibleTurbulenceModel.C"
+    #include "PhaseIncompressibleTurbulenceModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
index f0b57e7937..fd6b47ca50 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -162,7 +162,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DeardorffDiffStress.C"
+    #include "DeardorffDiffStress.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
index cefb8dd70e..1449f4b8f6 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -230,7 +230,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LESModel.C"
+    #include "LESModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
index ca9915d137..88f41711b1 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
@@ -117,7 +117,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LESeddyViscosity.C"
+    #include "LESeddyViscosity.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H
index 8ed2c4626a..b1eb383b0c 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H
@@ -174,7 +174,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Smagorinsky.C"
+    #include "Smagorinsky.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
index 6e2827650d..b46946f27d 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
@@ -131,7 +131,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SpalartAllmarasDDES.C"
+    #include "SpalartAllmarasDDES.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
index 6fa86abc67..b1c2bf60e1 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
@@ -214,7 +214,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SpalartAllmarasDES.C"
+    #include "SpalartAllmarasDES.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
index 276af65b20..bb1aa852f9 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -159,7 +159,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SpalartAllmarasIDDES.C"
+    #include "SpalartAllmarasIDDES.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H
index 7860f33904..0c2732b3a3 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H
@@ -166,7 +166,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "WALE.C"
+    #include "WALE.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H
index d2f1835c93..01a78ea590 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H
@@ -199,7 +199,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "dynamicKEqn.C"
+    #include "dynamicKEqn.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H
index 74cfa33188..5b4580e869 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H
@@ -169,7 +169,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "dynamicLagrangian.C"
+    #include "dynamicLagrangian.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
index 19fc999ec3..a91d3e68e2 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
@@ -171,7 +171,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "kEqn.C"
+    #include "kEqn.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
index bb385757ee..08ac25e6f0 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
@@ -215,7 +215,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LRR.C"
+    #include "LRR.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 5e4f3b0013..f919a54435 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -211,7 +211,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LaunderSharmaKE.C"
+    #include "LaunderSharmaKE.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
index 7ecd22b2b2..cf862ef5e3 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -244,7 +244,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "RASModel.C"
+    #include "RASModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
index 81f39eaf0c..374a74bfc7 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -211,7 +211,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "RNGkEpsilon.C"
+    #include "RNGkEpsilon.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
index 6195edfec4..ba72854074 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
@@ -206,7 +206,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SSG.C"
+    #include "SSG.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
index 4756e55843..9a0b893c93 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -208,7 +208,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SpalartAllmaras.C"
+    #include "SpalartAllmaras.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
index 0877f91fd7..a4126d2efc 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
@@ -209,7 +209,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "kEpsilon.C"
+    #include "kEpsilon.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H
index fd3f7b79a7..add5195f2e 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H
@@ -208,7 +208,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 #ifdef NoRepository
-#   include "kOmega.C"
+    #include "kOmega.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
index 56ae2becc4..79f2942719 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
@@ -322,7 +322,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 #ifdef NoRepository
-#   include "kOmegaSST.C"
+    #include "kOmegaSST.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
index 6a29c5312f..52c918c1c7 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -190,7 +190,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "kOmegaSSTSAS.C"
+    #include "kOmegaSSTSAS.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H
index e9640e92d2..f47616f4f3 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H
@@ -211,7 +211,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "realizableKE.C"
+    #include "realizableKE.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H
index 8b05497c16..d8a22ed440 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H
@@ -274,7 +274,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "v2f.C"
+    #include "v2f.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H
index 0beb0f5885..e29c447459 100644
--- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H
+++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,7 +156,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReynoldsStress.C"
+    #include "ReynoldsStress.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
index ecda6e6296..bff236d486 100644
--- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -178,7 +178,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TurbulenceModel.C"
+    #include "TurbulenceModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
index 20ad29982c..7920e431f6 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -172,7 +172,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "kqRWallFunctionFvPatchField.C"
+    #include "kqRWallFunctionFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H
index 3a26fac199..c214b9930b 100644
--- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H
+++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,7 +143,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "eddyViscosity.C"
+    #include "eddyViscosity.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminar.H b/src/TurbulenceModels/turbulenceModels/laminar/laminar.H
index 07988089d2..114287c0b6 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminar.H
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminar.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -140,7 +140,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "laminar.C"
+    #include "laminar.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H
index 0a8f0e8563..6cea0f9cb1 100644
--- a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H
+++ b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "linearViscousStress.C"
+    #include "linearViscousStress.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H
index da8a24a055..7e9d259074 100644
--- a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H
+++ b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "nonlinearEddyViscosity.C"
+    #include "nonlinearEddyViscosity.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/combustionModels/FSD/FSD.H b/src/combustionModels/FSD/FSD.H
index 10be2acdfa..c9b4b6fa7d 100644
--- a/src/combustionModels/FSD/FSD.H
+++ b/src/combustionModels/FSD/FSD.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -164,7 +164,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "FSD.C"
+    #include "FSD.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/combustionModels/PaSR/PaSR.H b/src/combustionModels/PaSR/PaSR.H
index f0d8344af1..51614ab2e6 100644
--- a/src/combustionModels/PaSR/PaSR.H
+++ b/src/combustionModels/PaSR/PaSR.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PaSR.C"
+    #include "PaSR.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/combustionModels/diffusion/diffusion.H b/src/combustionModels/diffusion/diffusion.H
index b2a3516188..a3023ee32b 100644
--- a/src/combustionModels/diffusion/diffusion.H
+++ b/src/combustionModels/diffusion/diffusion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "diffusion.C"
+    #include "diffusion.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
index 69fb847e26..08dec407c0 100644
--- a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
+++ b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "infinitelyFastChemistry.C"
+    #include "infinitelyFastChemistry.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/combustionModels/laminar/laminar.H b/src/combustionModels/laminar/laminar.H
index 6abd8978fa..0caf5a80f0 100644
--- a/src/combustionModels/laminar/laminar.H
+++ b/src/combustionModels/laminar/laminar.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "laminar.C"
+    #include "laminar.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/combustionModels/noCombustion/noCombustion.H b/src/combustionModels/noCombustion/noCombustion.H
index 1a93461c39..7e7a3b3781 100644
--- a/src/combustionModels/noCombustion/noCombustion.H
+++ b/src/combustionModels/noCombustion/noCombustion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "noCombustion.C"
+    #include "noCombustion.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.H b/src/combustionModels/singleStepCombustion/singleStepCombustion.H
index 6fd81ea098..404bfe1c13 100644
--- a/src/combustionModels/singleStepCombustion/singleStepCombustion.H
+++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "singleStepCombustion.C"
+    #include "singleStepCombustion.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/conversion/ensight/part/ensightPart.H b/src/conversion/ensight/part/ensightPart.H
index ff1cdcf1f8..feb6d371ba 100644
--- a/src/conversion/ensight/part/ensightPart.H
+++ b/src/conversion/ensight/part/ensightPart.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -362,7 +362,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ensightPartTemplates.C"
+    #include "ensightPartTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/conversion/ensight/part/ensightParts.H b/src/conversion/ensight/part/ensightParts.H
index 10faa7ea75..68c18774ba 100644
--- a/src/conversion/ensight/part/ensightParts.H
+++ b/src/conversion/ensight/part/ensightParts.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,7 +156,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ensightPartsTemplates.C"
+    #include "ensightPartsTemplates.C"
 #endif
 
 #endif
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
index cc4240c77e..9de33e452f 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,7 +141,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvMeshAdderTemplates.C"
+    #include "fvMeshAdderTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index bc87c5ec31..52e11746c2 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
@@ -347,7 +347,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvMeshDistributeTemplates.C"
+    #include "fvMeshDistributeTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/fvMeshTools/fvMeshTools.H b/src/dynamicMesh/fvMeshTools/fvMeshTools.H
index 0e7e132d9c..15516612d6 100644
--- a/src/dynamicMesh/fvMeshTools/fvMeshTools.H
+++ b/src/dynamicMesh/fvMeshTools/fvMeshTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvMeshToolsTemplates.C"
+    #include "fvMeshToolsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
index 6d21f2cb05..21db600776 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
@@ -508,7 +508,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "motionSmootherAlgoTemplates.C"
+    #include "motionSmootherAlgoTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
index 4ea2819195..90fb030b95 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
@@ -503,7 +503,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "faceCoupleInfoTemplates.C"
+    #include "faceCoupleInfoTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
index 816e75e126..ffae205634 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -257,7 +257,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "polyMeshFilterTemplates.C"
+    #include "polyMeshFilterTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
index e8de772018..97d82bdb52 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
@@ -610,7 +610,7 @@ public:
 #include "polyTopoChangeI.H"
 
 #ifdef NoRepository
-#   include "polyTopoChangeTemplates.C"
+    #include "polyTopoChangeTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/setUpdater/setUpdater.H b/src/dynamicMesh/setUpdater/setUpdater.H
index fa95ea9bcc..f9d14353d0 100644
--- a/src/dynamicMesh/setUpdater/setUpdater.H
+++ b/src/dynamicMesh/setUpdater/setUpdater.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 #ifdef NoRepository
-#   include "setUpdaterTemplates.C"
+    #include "setUpdaterTemplates.C"
 #endif
 
 
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
index 3e4a823d9d..757097c9fd 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
@@ -549,7 +549,7 @@ public:
 #include "extendedEdgeMeshI.H"
 
 #ifdef NoRepository
-#   include "extendedEdgeMeshTemplates.C"
+    #include "extendedEdgeMeshTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H
index c15c9f6f04..381285b385 100644
--- a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H
@@ -114,7 +114,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "csvSetWriter.C"
+    #include "csvSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H
index 2d5a0a0634..662a62e8c1 100644
--- a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ensightSetWriter.C"
+    #include "ensightSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H
index 74ab086a6c..786f80cbea 100644
--- a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "gnuplotSetWriter.C"
+    #include "gnuplotSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
index bdaf888067..2fd8dfafa3 100644
--- a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
@@ -108,7 +108,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "jplotSetWriter.C"
+    #include "jplotSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H
index 36b067b09d..73c6894468 100644
--- a/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "rawSetWriter.C"
+    #include "rawSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H
index 583a304165..b09e417a45 100644
--- a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "vtkSetWriter.C"
+    #include "vtkSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/sampledSetWriters/writer.H b/src/fileFormats/sampledSetWriters/writer.H
index ab198560ec..8d36cabea4 100644
--- a/src/fileFormats/sampledSetWriters/writer.H
+++ b/src/fileFormats/sampledSetWriters/writer.H
@@ -209,7 +209,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "writer.C"
+    #include "writer.C"
 #endif
 
 
diff --git a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H
index fb18ac6aff..cb357d7cfd 100644
--- a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "xmgraceSetWriter.C"
+    #include "xmgraceSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.H b/src/fileFormats/vtk/vtkUnstructuredReader.H
index 7c93f86be6..7ea0a4ae20 100644
--- a/src/fileFormats/vtk/vtkUnstructuredReader.H
+++ b/src/fileFormats/vtk/vtkUnstructuredReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -365,7 +365,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "vtkUnstructuredReaderTemplates.C"
+    #include "vtkUnstructuredReaderTemplates.C"
 #endif
 
 
diff --git a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.H b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.H
index ecf8559c8b..ce936721db 100644
--- a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.H
+++ b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CorrectPhi.C"
+    #include "CorrectPhi.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index 1600ac4e79..d6ea9cdf5c 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -280,7 +280,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MRFZoneTemplates.C"
+    #include "MRFZoneTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H
index 06359c8ad2..1c4a853f52 100644
--- a/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H
+++ b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.H
@@ -128,7 +128,7 @@ void constrainPressure
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "constrainPressure.C"
+    #include "constrainPressure.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H b/src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H
index e998e94cf2..acee29ed5a 100644
--- a/src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H
+++ b/src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ if (mesh.moving())
 }
 else
 {
-#   include "continuityErrs.H"
+    #include "continuityErrs.H"
 }
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
index 9713c6050d..01af21c5fe 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
@@ -157,7 +157,7 @@ void basicSymmetryFvPatchField<scalar>::evaluate
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "basicSymmetryFvPatchField.C"
+    #include "basicSymmetryFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
index d4b01de328..54dc55633e 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
@@ -186,7 +186,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "calculatedFvPatchField.C"
+    #include "calculatedFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
index 44d7a76bed..0148af1ac5 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
@@ -234,7 +234,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "coupledFvPatchField.C"
+    #include "coupledFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
index 86fbb9702c..d40a605f74 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
@@ -244,7 +244,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "directionMixedFvPatchField.C"
+    #include "directionMixedFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
index 0003baac0e..2a8674128d 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
@@ -155,7 +155,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "extrapolatedCalculatedFvPatchField.C"
+    #include "extrapolatedCalculatedFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H
index 276fdd433d..e829dfc72c 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H
@@ -237,7 +237,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fixedGradientFvPatchField.C"
+    #include "fixedGradientFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
index 5046987851..aef9052b56 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
@@ -227,7 +227,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fixedValueFvPatchField.C"
+    #include "fixedValueFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
index dc6d9cbb88..1421baefb4 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
@@ -304,7 +304,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "mixedFvPatchField.C"
+    #include "mixedFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
index aeef595cb0..7f783ce695 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
@@ -245,7 +245,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "slicedFvPatchField.C"
+    #include "slicedFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
index 1b677ceeff..6784364e4e 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
@@ -179,7 +179,7 @@ tmp<scalarField> transformFvPatchField<scalar>::gradientInternalCoeffs() const;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "transformFvPatchField.C"
+    #include "transformFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
index a0e0efe62a..188dbdb6bd 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
@@ -184,7 +184,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "zeroGradientFvPatchField.C"
+    #include "zeroGradientFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
index 99177eca6c..68f883f320 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
@@ -236,7 +236,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cyclicFvPatchField.C"
+    #include "cyclicFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
index cf50ae1576..b17c933a4c 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
@@ -321,7 +321,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cyclicACMIFvPatchField.C"
+    #include "cyclicACMIFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
index 53278b796f..76a2a02031 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
@@ -242,7 +242,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cyclicAMIFvPatchField.C"
+    #include "cyclicAMIFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H
index f53b7650cd..4d3cb95e35 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H
@@ -145,7 +145,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cyclicSlipFvPatchField.C"
+    #include "cyclicSlipFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
index 0afffe0abc..06d0273bfa 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
@@ -207,7 +207,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "emptyFvPatchField.C"
+    #include "emptyFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
index 88114efff0..07eadc8c54 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
@@ -163,7 +163,7 @@ void jumpCyclicFvPatchField<scalar>::updateInterfaceMatrix
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "jumpCyclicFvPatchField.C"
+    #include "jumpCyclicFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.H
index 2e1ca7c8b8..3a9bb130af 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.H
@@ -167,7 +167,7 @@ void jumpCyclicAMIFvPatchField<scalar>::updateInterfaceMatrix
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "jumpCyclicAMIFvPatchField.C"
+    #include "jumpCyclicAMIFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H
index bd53a7ea13..15dbeacccf 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H
@@ -138,7 +138,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "nonuniformTransformCyclicFvPatchField.C"
+    #include "nonuniformTransformCyclicFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index 71a27f794e..3928028ced 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -293,7 +293,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "processorFvPatchField.C"
+    #include "processorFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
index 7b5abd9ed8..9bf1d7b707 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
@@ -179,7 +179,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "processorCyclicFvPatchField.C"
+    #include "processorCyclicFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.H
index 1fb4240e8c..8834805377 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.H
@@ -144,7 +144,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "symmetryFvPatchField.C"
+    #include "symmetryFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H
index 55ff10c251..7f00417dd3 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H
@@ -179,7 +179,7 @@ void symmetryPlaneFvPatchField<scalar>::evaluate
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "symmetryPlaneFvPatchField.C"
+    #include "symmetryPlaneFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H
index b2781cfeea..f88636e414 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H
@@ -174,7 +174,7 @@ void wedgeFvPatchField<scalar>::evaluate
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "wedgeFvPatchField.C"
+    #include "wedgeFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H
index b42da86b5e..123fc8e13c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H
@@ -232,7 +232,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "advectiveFvPatchField.C"
+    #include "advectiveFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
index 878313c83b..60e58bb399 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
@@ -243,7 +243,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "codedFixedValueFvPatchField.C"
+    #include "codedFixedValueFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
index 0d73332f81..e774bf915c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
@@ -255,7 +255,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "codedMixedFvPatchField.C"
+    #include "codedMixedFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
index 61d32bc7c0..dbb594f784 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
@@ -357,7 +357,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "externalCoupledMixedFvPatchField.C"
+    #include "externalCoupledMixedFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
index c9808939d9..b1080e264f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
@@ -213,7 +213,7 @@ fanFvPatchField<scalar>::fanFvPatchField
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fanFvPatchField.C"
+    #include "fanFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
index 638f76d62e..53a8d50fa7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
@@ -160,7 +160,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fixedInternalValueFvPatchField.C"
+    #include "fixedInternalValueFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H
index d9f3aa6afa..002d60045a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H
@@ -196,7 +196,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fixedJumpFvPatchField.C"
+    #include "fixedJumpFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.H
index 0f8ff41a5f..83f7d4c070 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.H
@@ -190,7 +190,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fixedJumpAMIFvPatchField.C"
+    #include "fixedJumpAMIFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
index 1b3dd9d2c4..55c1312c8d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
@@ -168,7 +168,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fixedMeanFvPatchField.C"
+    #include "fixedMeanFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
index e5c5d6b210..2119f70268 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
@@ -237,7 +237,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fixedNormalSlipFvPatchField.C"
+    #include "fixedNormalSlipFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
index 997917ed85..d0bb6d640f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
@@ -220,7 +220,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fixedProfileFvPatchField.C"
+    #include "fixedProfileFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
index 924cf479d8..4c260a6adc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
@@ -173,7 +173,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "freestreamFvPatchField.C"
+    #include "freestreamFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
index 95bea2eb68..d70a836616 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
@@ -194,7 +194,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "inletOutletFvPatchField.C"
+    #include "inletOutletFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H
index da3f5c26a5..2bbece6baa 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H
@@ -212,7 +212,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "mappedFieldFvPatchField.C"
+    #include "mappedFieldFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H
index f9ec1396e7..a02e92197b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H
@@ -159,7 +159,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "mappedPatchFieldBase.C"
+    #include "mappedPatchFieldBase.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H
index 909bcfe26b..f0af7f306c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H
@@ -173,7 +173,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "mappedFixedInternalValueFvPatchField.C"
+    #include "mappedFixedInternalValueFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H
index da10304f6f..2740010164 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H
@@ -181,7 +181,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "mappedFixedPushedInternalValueFvPatchField.C"
+    #include "mappedFixedPushedInternalValueFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.H
index 4d6be29b8f..38857d4e98 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.H
@@ -200,7 +200,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "mappedFixedValueFvPatchField.C"
+    #include "mappedFixedValueFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
index 2b7a69b2f4..62625a7aac 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
@@ -180,7 +180,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "outletInletFvPatchField.C"
+    #include "outletInletFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
index addf6642d5..7433f9c1ee 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
@@ -184,7 +184,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "outletMappedUniformInletFvPatchField.C"
+    #include "outletMappedUniformInletFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
index 0adb57f948..4824ea6613 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
@@ -238,7 +238,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "partialSlipFvPatchField.C"
+    #include "partialSlipFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H
index 555ab0494c..c22f79a096 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H
@@ -174,7 +174,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "slipFvPatchField.C"
+    #include "slipFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.H
index 3f4445f17f..bfac397000 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "AverageIOField.C"
+    #include "AverageIOField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
index ab90b04063..20783c7f76 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
@@ -258,7 +258,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "timeVaryingMappedFixedValueFvPatchField.C"
+    #include "timeVaryingMappedFixedValueFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
index 812946f112..a38d1dfec5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
@@ -243,7 +243,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "turbulentInletFvPatchField.C"
+    #include "turbulentInletFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
index eed5afe79d..8dfd45e86b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
@@ -179,7 +179,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "uniformFixedGradientFvPatchField.C"
+    #include "uniformFixedGradientFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
index 401b621426..3b87530609 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
@@ -178,7 +178,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "uniformFixedValueFvPatchField.C"
+    #include "uniformFixedValueFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
index c652b917a1..c0d82ef75d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
@@ -213,7 +213,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "uniformInletOutletFvPatchField.C"
+    #include "uniformInletOutletFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
index bed083da90..11f8a2f0b4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
@@ -181,7 +181,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "uniformJumpFvPatchField.C"
+    #include "uniformJumpFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
index 8147aa107b..645375887b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.H
@@ -181,7 +181,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "uniformJumpAMIFvPatchField.C"
+    #include "uniformJumpAMIFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H
index 4ec9c16fc9..b3e5498b75 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H
@@ -208,7 +208,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "waveTransmissiveFvPatchField.C"
+    #include "waveTransmissiveFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 2487e76cc9..7c80ead82d 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -604,6 +604,6 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const fvPatchField<Type>& ptf)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "fvPatchFieldNew.C"
+    #include "fvPatchFieldNew.C"
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 05f2391b6f..f91107ab1e 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -588,8 +588,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvPatchField.C"
-#   include "calculatedFvPatchField.H"
+    #include "fvPatchField.C"
+    #include "calculatedFvPatchField.H"
 #endif
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
index e9ef84ed7c..f16499538f 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
@@ -140,7 +140,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "calculatedFvsPatchField.C"
+    #include "calculatedFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H
index 1458e879fc..2cc3086944 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H
@@ -136,7 +136,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "coupledFvsPatchField.C"
+    #include "coupledFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
index 5ab20e641a..a59b8f8f57 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
@@ -189,7 +189,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fixedValueFvsPatchField.C"
+    #include "fixedValueFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
index c229d70114..392d110d0e 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
@@ -167,7 +167,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "slicedFvsPatchField.C"
+    #include "slicedFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H
index b026877c72..edcec6361d 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H
@@ -133,7 +133,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cyclicFvsPatchField.C"
+    #include "cyclicFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.H
index 02c57a0eee..b0b0d57454 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.H
@@ -140,7 +140,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cyclicACMIFvsPatchField.C"
+    #include "cyclicACMIFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H
index f7340f5487..36edeb2d3b 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H
@@ -141,7 +141,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cyclicAMIFvsPatchField.C"
+    #include "cyclicAMIFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H
index d6e80130bf..ea34cd0d19 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H
@@ -128,7 +128,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cyclicSlipFvsPatchField.C"
+    #include "cyclicSlipFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
index dfafe46a58..a70fca2172 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
@@ -148,7 +148,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "emptyFvsPatchField.C"
+    #include "emptyFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H
index ecf3f40a82..aa488c74c8 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H
@@ -129,7 +129,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "nonuniformTransformCyclicFvsPatchField.C"
+    #include "nonuniformTransformCyclicFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
index 29c6e522b4..d9eb058068 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
@@ -160,7 +160,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "processorFvsPatchField.C"
+    #include "processorFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H
index 2f74fdc88d..8a67a0c632 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H
@@ -161,7 +161,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "processorCyclicFvsPatchField.C"
+    #include "processorCyclicFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H
index 1ae3aa1a49..56ee70064b 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H
@@ -128,7 +128,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "symmetryFvsPatchField.C"
+    #include "symmetryFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H
index 0b7f50d577..5b8e4724f7 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H
@@ -129,7 +129,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "symmetryPlaneFvsPatchField.C"
+    #include "symmetryPlaneFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H
index 12aae142c6..fd2c68c8e2 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H
@@ -128,7 +128,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "wedgeFvsPatchField.C"
+    #include "wedgeFvsPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 96240cd17d..6bfd32ec06 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -385,8 +385,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvsPatchField.C"
-#   include "calculatedFvsPatchField.H"
+    #include "fvsPatchField.C"
+    #include "calculatedFvsPatchField.H"
 #endif
 
 
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
index bdbbf14cf8..225f507e67 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
@@ -140,7 +140,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "boundedConvectionScheme.C"
+    #include "boundedConvectionScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
index e0320fe74e..5388abce15 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
@@ -250,7 +250,7 @@ makeMultivariateFvConvectionTypeScheme(SS, tensor)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "convectionScheme.C"
+    #include "convectionScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
index 516e78e2fc..fc7d98d4c5 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
@@ -173,7 +173,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "gaussConvectionScheme.C"
+    #include "gaussConvectionScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H
index 3f7288d3c5..3b363b1de6 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H
@@ -135,7 +135,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "multivariateGaussConvectionScheme.C"
+    #include "multivariateGaussConvectionScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
index ff8df9a827..0ce4c7d220 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
@@ -136,7 +136,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "EulerD2dt2Scheme.C"
+    #include "EulerD2dt2Scheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
index 6d527df771..b00888c577 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
@@ -204,7 +204,7 @@ makeFvD2dt2TypeScheme(SS, tensor)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "d2dt2Scheme.C"
+    #include "d2dt2Scheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
index 835a151eda..76fe1160b3 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
@@ -135,7 +135,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "steadyStateD2dt2Scheme.C"
+    #include "steadyStateD2dt2Scheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
index f74b739d04..9ee9020e23 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
@@ -247,7 +247,7 @@ tmp<surfaceScalarField> CoEulerDdtScheme<scalar>::fvcDdtPhiCorr
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CoEulerDdtScheme.C"
+    #include "CoEulerDdtScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
index dabe016b71..14d6947a1c 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
@@ -363,7 +363,7 @@ tmp<surfaceScalarField> CrankNicolsonDdtScheme<scalar>::fvcDdtPhiCorr
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CrankNicolsonDdtScheme.C"
+    #include "CrankNicolsonDdtScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
index 56dcbe2e13..4cc92a40e2 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
@@ -225,7 +225,7 @@ tmp<surfaceScalarField> EulerDdtScheme<scalar>::fvcDdtPhiCorr
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "EulerDdtScheme.C"
+    #include "EulerDdtScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
index fd6bd6eb6f..edfcdb4043 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
@@ -249,7 +249,7 @@ tmp<surfaceScalarField> SLTSDdtScheme<scalar>::fvcDdtPhiCorr
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SLTSDdtScheme.C"
+    #include "SLTSDdtScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
index ff6ff90da3..0833cda7a4 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
@@ -236,7 +236,7 @@ tmp<surfaceScalarField> backwardDdtScheme<scalar>::fvcDdtPhiCorr
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "backwardDdtScheme.C"
+    #include "backwardDdtScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
index 59abfc9113..7441cf9c55 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
@@ -234,7 +234,7 @@ tmp<surfaceScalarField> boundedDdtScheme<scalar>::fvcDdtPhiCorr
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "boundedDdtScheme.C"
+    #include "boundedDdtScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
index 125ef04f61..2b36031b92 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
@@ -334,7 +334,7 @@ tmp<surfaceScalarField> SS<scalar>::fvcDdtPhiCorr                              \
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ddtScheme.C"
+    #include "ddtScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
index dad26f6cc7..5ea0b2127f 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
@@ -279,7 +279,7 @@ tmp<surfaceScalarField> localEulerDdtScheme<scalar>::fvcDdtPhiCorr
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "localEulerDdtScheme.C"
+    #include "localEulerDdtScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
index 635763cdda..2f004cf994 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
@@ -224,7 +224,7 @@ tmp<surfaceScalarField> steadyStateDdtScheme<scalar>::fvcDdtPhiCorr
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "steadyStateDdtScheme.C"
+    #include "steadyStateDdtScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
index 639d5c334f..add7bbccc9 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
@@ -187,7 +187,7 @@ makeFvDivTypeScheme(SS, tensor)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "divScheme.C"
+    #include "divScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H
index 34b444437d..b2d42395a1 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "gaussDivScheme.C"
+    #include "gaussDivScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcAverage.H b/src/finiteVolume/finiteVolume/fvc/fvcAverage.H
index 3ab02f26fb..3bea8d32a4 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcAverage.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcAverage.H
@@ -88,7 +88,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcAverage.C"
+    #include "fvcAverage.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
index 2519b3d7ce..5c03792629 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
@@ -72,7 +72,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcCellReduce.C"
+    #include "fvcCellReduce.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCurl.H b/src/finiteVolume/finiteVolume/fvc/fvcCurl.H
index 0157d86557..210e08d444 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCurl.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCurl.H
@@ -71,7 +71,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcCurl.C"
+    #include "fvcCurl.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H
index 76a3db7b50..9d01ba787c 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H
@@ -71,7 +71,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcD2dt2.C"
+    #include "fvcD2dt2.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDDt.H b/src/finiteVolume/finiteVolume/fvc/fvcDDt.H
index 35da1bce0e..67a77dbbf1 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDDt.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDDt.H
@@ -73,7 +73,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcDDt.C"
+    #include "fvcDDt.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDdt.H b/src/finiteVolume/finiteVolume/fvc/fvcDdt.H
index 23b158733f..c164445ebf 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDdt.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDdt.H
@@ -196,7 +196,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcDdt.C"
+    #include "fvcDdt.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDiv.H b/src/finiteVolume/finiteVolume/fvc/fvcDiv.H
index 333d08e52b..868d141f59 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDiv.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDiv.H
@@ -177,7 +177,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcDiv.C"
+    #include "fvcDiv.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcFlux.H b/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
index 6568664f75..0e3e3a9fe6 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
@@ -120,7 +120,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcFlux.C"
+    #include "fvcFlux.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcGrad.H b/src/finiteVolume/finiteVolume/fvc/fvcGrad.H
index 8982568edd..21528f0e70 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcGrad.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcGrad.H
@@ -121,7 +121,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcGrad.C"
+    #include "fvcGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H
index b962c888d6..4548ce48b7 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H
@@ -239,7 +239,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcLaplacian.C"
+    #include "fvcLaplacian.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H
index 7ca54485a0..010c17e26c 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H
@@ -71,7 +71,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcMagSqrGradGrad.C"
+    #include "fvcMagSqrGradGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H
index ba3f0db4d5..47a140974e 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H
@@ -82,7 +82,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcReconstruct.C"
+    #include "fvcReconstruct.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H
index 67ce684f57..61f85bd954 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H
@@ -85,7 +85,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcSnGrad.C"
+    #include "fvcSnGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSup.H b/src/finiteVolume/finiteVolume/fvc/fvcSup.H
index 70a669cbee..44b40e28bf 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSup.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSup.H
@@ -116,7 +116,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcSup.C"
+    #include "fvcSup.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H
index 90997d1a9f..c3efda91c5 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H
@@ -93,7 +93,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcSurfaceIntegrate.C"
+    #include "fvcSurfaceIntegrate.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H
index 79861e0f5a..804bbbeef9 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H
@@ -114,7 +114,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvcVolumeIntegrate.C"
+    #include "fvcVolumeIntegrate.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H
index b2f9b3105d..20ec929bcd 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H
@@ -78,7 +78,7 @@ namespace fvm
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvmD2dt2.C"
+    #include "fvmD2dt2.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDdt.H b/src/finiteVolume/finiteVolume/fvm/fvmDdt.H
index 35915410c4..621e9617d7 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDdt.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDdt.H
@@ -118,7 +118,7 @@ namespace fvm
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvmDdt.C"
+    #include "fvmDdt.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDiv.H b/src/finiteVolume/finiteVolume/fvm/fvmDiv.H
index ae08924592..0310c5518d 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDiv.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDiv.H
@@ -91,7 +91,7 @@ namespace fvm
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvmDiv.C"
+    #include "fvmDiv.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
index 08e9e5db4f..647541a342 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
@@ -185,7 +185,7 @@ namespace fvm
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvmLaplacian.C"
+    #include "fvmLaplacian.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmSup.H b/src/finiteVolume/finiteVolume/fvm/fvmSup.H
index c0ef18cb63..7a82b7e138 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmSup.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmSup.H
@@ -160,7 +160,7 @@ namespace fvm
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvmSup.C"
+    #include "fvmSup.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
index e9bb230cc6..3393e6c487 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
@@ -175,7 +175,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LeastSquaresGrad.C"
+    #include "LeastSquaresGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.H b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.H
index 81944893b7..d187f4d382 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.H
@@ -121,7 +121,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LeastSquaresVectors.C"
+    #include "LeastSquaresVectors.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H
index effe6d7ffd..f2da695dd9 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fourthGrad.C"
+    #include "fourthGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
index 77d3ae84c5..bec2d9c6f1 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
@@ -162,7 +162,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "gaussGrad.C"
+    #include "gaussGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
index 8abb81d520..4e6ca98bf6 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
@@ -210,7 +210,7 @@ makeFvGradTypeScheme(SS, vector)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "gradScheme.C"
+    #include "gradScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H
index cf8c570480..7755bac098 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "leastSquaresGrad.C"
+    #include "leastSquaresGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
index 4c18160f8c..0176db4e9d 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
@@ -175,7 +175,7 @@ defineFvmLaplacianScalarGamma(tensor);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "gaussLaplacianScheme.C"
+    #include "gaussLaplacianScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
index a1c47c211c..c88282da17 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
@@ -251,7 +251,7 @@ makeFvLaplacianTypeScheme(SS, tensor, tensor)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "laplacianScheme.C"
+    #include "laplacianScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.H b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.H
index be834684a7..369f195f3c 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CentredFitSnGradData.C"
+    #include "CentredFitSnGradData.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
index 6d65a107a9..57224578dc 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
@@ -147,7 +147,7 @@ tmp<surfaceVectorField> correctedSnGrad<vector>::correction
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "correctedSnGrad.C"
+    #include "correctedSnGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
index 7cdb83d7e4..fcbcfd6089 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
@@ -147,7 +147,7 @@ tmp<surfaceVectorField> faceCorrectedSnGrad<vector>::correction
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "faceCorrectedSnGrad.C"
+    #include "faceCorrectedSnGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
index 2523e0a223..a2c836bc00 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
@@ -184,7 +184,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "limitedSnGrad.C"
+    #include "limitedSnGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
index 65026ee5cb..2c08e57162 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
@@ -123,7 +123,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "orthogonalSnGrad.C"
+    #include "orthogonalSnGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
index a2a52e9a4d..db7ad52082 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
@@ -215,7 +215,7 @@ makeSnGradTypeScheme(SS, tensor)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "snGradScheme.C"
+    #include "snGradScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
index d72aad37ea..9ed87c76d2 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
@@ -123,7 +123,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "uncorrectedSnGrad.C"
+    #include "uncorrectedSnGrad.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index b06251fed5..ec2084bd27 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -1055,7 +1055,7 @@ tmp<fvMatrix<Type>> operator*
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvMatrix.C"
+    #include "fvMatrix.C"
 #endif
 
 // Specialisation for scalars
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.H b/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.H
index fe0d353c70..fd76c9f2fd 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.H
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ void limitCorr
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CMULESTemplates.C"
+    #include "CMULESTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/IMULES.H b/src/finiteVolume/fvMatrices/solvers/MULES/IMULES.H
index 2d6e4a26a0..fdef6b283b 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/IMULES.H
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/IMULES.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ void implicitSolve
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IMULESTemplates.C"
+    #include "IMULESTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H
index 47a4454216..5ece4fefcb 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,7 +148,7 @@ void limitSum(SurfaceScalarFieldList& phiPsiCorrs);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MULESTemplates.C"
+    #include "MULESTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
index 06cf50969b..d408c99265 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
@@ -96,7 +96,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "extendedCellToCellStencilTemplates.C"
+    #include "extendedCellToCellStencilTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H
index fb5f5a5e4e..c3c57bc7fd 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H
@@ -126,7 +126,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "extendedCellToFaceStencilTemplates.C"
+    #include "extendedCellToFaceStencilTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
index 6412cd7a4f..e7aa86a8ba 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
@@ -193,7 +193,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "extendedUpwindCellToFaceStencilTemplates.C"
+    #include "extendedUpwindCellToFaceStencilTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
index 3e6abebd22..25a46ab9fa 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
@@ -99,7 +99,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "extendedFaceToCellStencilTemplates.C"
+    #include "extendedFaceToCellStencilTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index df558664dc..d2e326dd35 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -389,8 +389,8 @@ fvMesh::validComponents<sphericalTensor>() const;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvMeshTemplates.C"
-#   include "fvPatchFvMeshTemplates.C"
+    #include "fvMeshTemplates.C"
+    #include "fvPatchFvMeshTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
index 2dca7d534f..471404a98a 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
@@ -269,7 +269,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvMeshSubsetInterpolate.C"
+    #include "fvMeshSubsetInterpolate.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
index 1f655bd4b3..95be079ad6 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
@@ -272,7 +272,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvPatchTemplates.C"
+    #include "fvPatchTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
index 97bd16390c..f439b425a4 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
@@ -218,7 +218,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "singleCellFvMeshInterpolate.C"
+    #include "singleCellFvMeshInterpolate.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.H b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.H
index 8d7aa1312a..3c1052fab7 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "wallDistData.C"
+    #include "wallDistData.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
index 1ba9585ba0..6f23e3ae7e 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -168,7 +168,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "patchDistMethodTemplates.C"
+    #include "patchDistMethodTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
index 6ab57ef093..bb3a6afbce 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
@@ -177,7 +177,7 @@ makeInterpolationType(SS, tensor)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolation.C"
+    #include "interpolation.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H
index cad83f5666..209f3d3ea6 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolationCell.C"
+    #include "interpolationCell.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.H
index ba76c1ad89..4f8babdfd2 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolationCellPatchConstrained.C"
+    #include "interpolationCellPatchConstrained.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
index 842b46c79d..4cb6804597 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolationCellPoint.C"
+    #include "interpolationCellPoint.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.H
index 54a6596266..e26b2e5f64 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolationCellPointFace.C"
+    #include "interpolationCellPointFace.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
index 377f044858..2af0957cd7 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolationCellPointWallModified.C"
+    #include "interpolationCellPointWallModified.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H
index 134e2ade97..81028eccbf 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "interpolationPointMVC.C"
+    #include "interpolationPointMVC.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
index b188a05586..32834c4f58 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
@@ -143,7 +143,7 @@ inline tmp<volScalarField> rhoMagSqr<scalar>::operator()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LimitFuncs.C"
+    #include "LimitFuncs.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
index acdbb0245f..09421775cb 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
@@ -233,7 +233,7 @@ limitedSurfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable         \
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LimitedScheme.C"
+    #include "LimitedScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
index f49cbb0554..c18beaf685 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
@@ -155,7 +155,7 @@ limitedSurfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable         \
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PhiScheme.C"
+    #include "PhiScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
index 4f27e1302d..2609921872 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
@@ -229,7 +229,7 @@ makelimitedSurfaceInterpolationTypeScheme(SS, tensor)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "limitedSurfaceInterpolationScheme.C"
+    #include "limitedSurfaceInterpolationScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
index 9e2fc9064b..d255170cfe 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
@@ -116,7 +116,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "multivariateIndependentScheme.C"
+    #include "multivariateIndependentScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
index 1060971f3a..e6e71c0cf3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
@@ -204,7 +204,7 @@ multivariateSurfaceInterpolationScheme<scalar>::addIstreamConstructorToTable   \
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "multivariateScheme.C"
+    #include "multivariateScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
index 852eab5dd9..fec04468e4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
@@ -148,7 +148,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "multivariateSelectionScheme.C"
+    #include "multivariateSelectionScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
index 780fde611f..4669b43d63 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
@@ -228,7 +228,7 @@ makeMultivariateSurfaceInterpolationTypeScheme(SS, tensor)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "multivariateSurfaceInterpolationScheme.C"
+    #include "multivariateSurfaceInterpolationScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H
index 41aac91b29..7c3bac7a93 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CentredFitData.C"
+    #include "CentredFitData.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.H
index 5faeed6eb1..711d2f4df1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -173,7 +173,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "FitData.C"
+    #include "FitData.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H
index 35dfafc969..dfe329ac6b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "UpwindFitData.C"
+    #include "UpwindFitData.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
index 75415501e0..389e72018a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
@@ -200,7 +200,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "surfaceInterpolate.C"
+    #include "surfaceInterpolate.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
index 4b1d0838a2..7780f9d8bb 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
@@ -231,7 +231,7 @@ makeSurfaceInterpolationTypeScheme(SS, tensor)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "surfaceInterpolationScheme.C"
+    #include "surfaceInterpolationScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H
index 06515ba003..f34ae6f304 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -204,7 +204,7 @@ void pointConstraints::constrainCorners<label>
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "pointConstraintsTemplates.C"
+    #include "pointConstraintsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
index b040fc10fd..d26ecad7d2 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
@@ -257,7 +257,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "volPointInterpolate.C"
+    #include "volPointInterpolate.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
index 21090e7513..34fe51a034 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ SourceFiles
 
 extern "C"
 {
-#   include "mgridgen.h"
+    #include "mgridgen.h"
 }
 
 
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
index f0a654151f..c9bfaead50 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -210,7 +210,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "pairPatchAgglomerationTemplates.C"
+    #include "pairPatchAgglomerationTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolverCore/fvMotionSolverCore.H b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolverCore/fvMotionSolverCore.H
index b91dd80121..d6a3418e7e 100644
--- a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolverCore/fvMotionSolverCore.H
+++ b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolverCore/fvMotionSolverCore.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvMotionSolverCoreTemplates.C"
+    #include "fvMotionSolverCoreTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H
index dad854ea25..e255f0a367 100644
--- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H
+++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H
@@ -138,7 +138,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cellMotionFvPatchField.C"
+    #include "cellMotionFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
index d285b0b97d..7eaaec39ee 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
@@ -209,7 +209,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "timeVaryingMappedFixedValuePointPatchField.C"
+    #include "timeVaryingMappedFixedValuePointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H
index 7e3bb15c33..780ff55787 100644
--- a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H
+++ b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,8 +126,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ExplicitSetValue.C"
-#   include "ExplicitSetValueIO.C"
+    #include "ExplicitSetValue.C"
+    #include "ExplicitSetValueIO.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
index 45ae16693a..c825d0fd27 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -220,7 +220,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "actuationDiskSourceTemplates.C"
+    #include "actuationDiskSourceTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
index 92e619999c..0df0d1347c 100644
--- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
+++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -176,7 +176,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "radialActuationDiskSourceTemplates.C"
+    #include "radialActuationDiskSourceTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.H b/src/fvOptions/sources/general/codedSource/CodedSource.H
index 516ec81de7..6961faffbd 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSource.H
+++ b/src/fvOptions/sources/general/codedSource/CodedSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -239,8 +239,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CodedSource.C"
-#   include "CodedSourceIO.C"
+    #include "CodedSource.C"
+    #include "CodedSourceIO.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
index 5b22ca6ac8..9a61f1b94a 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
@@ -215,8 +215,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SemiImplicitSource.C"
-#   include "SemiImplicitSourceIO.C"
+    #include "SemiImplicitSource.C"
+    #include "SemiImplicitSourceIO.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
index 4f84cce98a..ec3be385b4 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
@@ -191,7 +191,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "genericFvPatchField.C"
+    #include "genericFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
index 95e9e7b322..e68ce631b1 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
@@ -163,7 +163,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "genericPointPatchField.C"
+    #include "genericPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
index ea2db73db0..bdd2f07926 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
@@ -484,7 +484,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DSMCCloud.C"
+    #include "DSMCCloud.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
index 391ef249bb..1d27613fc3 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
@@ -178,7 +178,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "BinaryCollisionModel.C"
+    #include "BinaryCollisionModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
index d802e3976a..8575cac5f4 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LarsenBorgnakkeVariableHardSphere.C"
+    #include "LarsenBorgnakkeVariableHardSphere.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H
index ec5364921a..edf1ac106b 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoBinaryCollision.C"
+    #include "NoBinaryCollision.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
index 9edca634bb..29e409d1f6 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "VariableHardSphere.C"
+    #include "VariableHardSphere.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.H b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
index 2942937ea8..d1b69a71df 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
@@ -110,7 +110,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "FreeStream.C"
+    #include "FreeStream.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
index 847d8b16c0..625682b663 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
@@ -164,7 +164,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "InflowBoundaryModel.C"
+    #include "InflowBoundaryModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/NoInflow/NoInflow.H b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
index 914ea8ca42..524797440b 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoInflow.C"
+    #include "NoInflow.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H b/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
index e9d3d9f532..7cb6d28654 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MaxwellianThermal.C"
+    #include "MaxwellianThermal.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H b/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
index 66698f2a8b..db3999a6bd 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MixedDiffuseSpecular.C"
+    #include "MixedDiffuseSpecular.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H b/src/lagrangian/DSMC/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
index 861ff44e1e..91f256d432 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SpecularReflection.C"
+    #include "SpecularReflection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index d564c48a63..8befbaeb6a 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
@@ -164,7 +164,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "WallInteractionModel.C"
+    #include "WallInteractionModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index c295a18e24..1c9998327c 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -339,7 +339,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Cloud.C"
+    #include "Cloud.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.H b/src/lagrangian/basic/IOPosition/IOPosition.H
index 4eff22391f..002e4e2ac9 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.H
+++ b/src/lagrangian/basic/IOPosition/IOPosition.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IOPosition.C"
+    #include "IOPosition.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.H b/src/lagrangian/basic/InteractionLists/InteractionLists.H
index 95af9ec409..613c5fd31f 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.H
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.H
@@ -312,7 +312,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "InteractionLists.C"
+    #include "InteractionLists.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H
index 3277b5c31a..4bbd17bcc4 100644
--- a/src/lagrangian/basic/particle/particle.H
+++ b/src/lagrangian/basic/particle/particle.H
@@ -593,7 +593,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "particleTemplates.C"
+    #include "particleTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
index e7810d4619..84f8c98b6e 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
@@ -96,7 +96,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Analytical.C"
+    #include "Analytical.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
index 6a0b7ea26c..efd91eea25 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
@@ -93,7 +93,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Euler.C"
+    #include "Euler.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
index c787220ab2..ab077d5b7f 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
@@ -212,7 +212,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IntegrationScheme.C"
+    #include "IntegrationScheme.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
index d679ec5a18..009f36ba2e 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
@@ -246,7 +246,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CollidingCloud.C"
+    #include "CollidingCloud.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 46d12b09bf..2091654067 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -623,7 +623,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "KinematicCloud.C"
+    #include "KinematicCloud.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H
index edc84a1f68..1d34b686ed 100644
--- a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H
@@ -239,7 +239,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MPPICCloud.C"
+    #include "MPPICCloud.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index af9c5a1a04..f7d66a0663 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -324,7 +324,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReactingCloud.C"
+    #include "ReactingCloud.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 25a92b24a3..bc846e136e 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -304,7 +304,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReactingMultiphaseCloud.C"
+    #include "ReactingMultiphaseCloud.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index 9c211567fb..441c6d671a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -384,7 +384,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ThermoCloud.C"
+    #include "ThermoCloud.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H
index 8a12ac6570..44e444dd88 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H
@@ -241,7 +241,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CollisionRecordList.C"
+    #include "CollisionRecordList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
index a60d7f64ab..ccba82d55f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -211,7 +211,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PairCollisionRecord.C"
+    #include "PairCollisionRecord.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
index 7bbd40de33..702f114f14 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -201,7 +201,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "WallCollisionRecord.C"
+    #include "WallCollisionRecord.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
index ae0dcfa0e7..e05b3ca86a 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
@@ -220,7 +220,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CloudFunctionObject.C"
+    #include "CloudFunctionObject.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
index 15e8411d8a..132509ad66 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
@@ -179,7 +179,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "FacePostProcessing.C"
+    #include "FacePostProcessing.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
index 27ba298b57..7cce69b9d3 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
@@ -306,7 +306,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ParticleCollector.C"
+    #include "ParticleCollector.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
index 0d309fea30..ab6bec14b8 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
@@ -146,7 +146,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ParticleErosion.C"
+    #include "ParticleErosion.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
index 6f6a5d5744..fb4ac9c060 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
@@ -165,7 +165,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ParticleTracks.C"
+    #include "ParticleTracks.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
index 4c3e045703..a315b10508 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
@@ -145,7 +145,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ParticleTrap.C"
+    #include "ParticleTrap.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
index 64a678d2eb..902e186b1d 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
@@ -151,7 +151,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PatchPostProcessing.C"
+    #include "PatchPostProcessing.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
index 9ea04da0a4..e424612418 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
@@ -134,7 +134,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "VoidFraction.C"
+    #include "VoidFraction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudSubModelBase.H b/src/lagrangian/intermediate/submodels/CloudSubModelBase.H
index 443612e018..f96b8f5d5d 100644
--- a/src/lagrangian/intermediate/submodels/CloudSubModelBase.H
+++ b/src/lagrangian/intermediate/submodels/CloudSubModelBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CloudSubModelBase.C"
+    #include "CloudSubModelBase.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
index 6422c1bd33..243d82df36 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
@@ -164,7 +164,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CollisionModel.C"
+    #include "CollisionModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
index 1aca7e4ea6..5c7a857e37 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
@@ -106,7 +106,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoCollision.C"
+    #include "NoCollision.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
index bea5f5745e..bb6449e843 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
@@ -189,7 +189,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PairCollision.C"
+    #include "PairCollision.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
index 6d0bec06f5..36c7e0fa3b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
@@ -170,7 +170,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PairModel.C"
+    #include "PairModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
index f5e4b31ff9..d96fcdddc4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -178,7 +178,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PairSpringSliderDashpot.C"
+    #include "PairSpringSliderDashpot.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
index e7b0e3b6b8..0a81c76976 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
@@ -181,7 +181,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "WallLocalSpringSliderDashpot.C"
+    #include "WallLocalSpringSliderDashpot.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
index 9450e29fe3..d5979f5aa6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
@@ -180,7 +180,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "WallModel.C"
+    #include "WallModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
index d3d6ca1166..799d0b2776 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
@@ -176,7 +176,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "WallSpringSliderDashpot.C"
+    #include "WallSpringSliderDashpot.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H
index 4cf4979c18..cb169750d5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,7 +134,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "WallSiteData.C"
+    #include "WallSiteData.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
index 6b50f12d02..138bff4396 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
@@ -152,7 +152,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DispersionModel.C"
+    #include "DispersionModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
index 70dcebd844..721868f3c4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoDispersion.C"
+    #include "NoDispersion.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
index ec4faa4d61..aa466137c4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
@@ -182,7 +182,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CellZoneInjection.C"
+    #include "CellZoneInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index e993410345..5891f27d82 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -197,7 +197,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ConeInjection.C"
+    #include "ConeInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
index a8fd69d9d1..07fc39274e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
@@ -264,7 +264,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ConeNozzleInjection.C"
+    #include "ConeNozzleInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index fd48e04aff..e2bb8db399 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -202,7 +202,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "FieldActivatedInjection.C"
+    #include "FieldActivatedInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
index 799243fdae..f408ac4728 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
@@ -198,7 +198,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "InflationInjection.C"
+    #include "InflationInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 1f3dd7beb5..e63d7dfb08 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -385,7 +385,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "InjectionModel.C"
+    #include "InjectionModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.H
index 9deceb5501..84e6c19891 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.H
@@ -128,7 +128,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "InjectionModelList.C"
+    #include "InjectionModelList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
index 037409ee10..af958d45fa 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -184,7 +184,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "KinematicLookupTableInjection.C"
+    #include "KinematicLookupTableInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index 23352d3756..2104a2b79c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -176,7 +176,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ManualInjection.C"
+    #include "ManualInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index 7b92401335..96ffac0d71 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -133,7 +133,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoInjection.C"
+    #include "NoInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
index e09bcbe3a6..8f966b38af 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
@@ -182,7 +182,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PatchFlowRateInjection.C"
+    #include "PatchFlowRateInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index 2f53a8e038..57fc5f371c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -176,7 +176,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PatchInjection.C"
+    #include "PatchInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.H
index 28884346d9..4aed131ed4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.H
@@ -117,7 +117,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DistortedSphereDragForce.C"
+    #include "DistortedSphereDragForce.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H
index b3f4051c2b..04686a7c78 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H
@@ -117,7 +117,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ErgunWenYuDragForce.C"
+    #include "ErgunWenYuDragForce.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.H
index 1005cc162d..1bfc4bcb9f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.H
@@ -157,7 +157,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NonSphereDragForce.C"
+    #include "NonSphereDragForce.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.H
index ac8871f969..2e53bd0c11 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.H
@@ -117,7 +117,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PlessisMasliyahDragForce.C"
+    #include "PlessisMasliyahDragForce.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.H
index d9cd602de0..485f0ad8ac 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.H
@@ -109,7 +109,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SphereDragForce.C"
+    #include "SphereDragForce.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.H
index 0268bd8181..631b073854 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.H
@@ -117,7 +117,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "WenYuDragForce.C"
+    #include "WenYuDragForce.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
index bf5b867455..fa4bb84566 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
@@ -142,7 +142,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LocalInteraction.C"
+    #include "LocalInteraction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.H
index 669e9c68f0..8fda4432fc 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.H
@@ -155,7 +155,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MultiInteraction.C"
+    #include "MultiInteraction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/NoInteraction/NoInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/NoInteraction/NoInteraction.H
index ce503efcaf..3817b5b8c9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/NoInteraction/NoInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/NoInteraction/NoInteraction.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoInteraction.C"
+    #include "NoInteraction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
index 32cc7be305..3af6abee50 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
@@ -204,7 +204,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PatchInteractionModel.C"
+    #include "PatchInteractionModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
index b8d05c3a53..38627da57b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
@@ -103,7 +103,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Rebound.C"
+    #include "Rebound.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
index 744b73527d..007ed3132f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
@@ -145,7 +145,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "StandardWallInteraction.C"
+    #include "StandardWallInteraction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/NoStochasticCollision/NoStochasticCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/NoStochasticCollision/NoStochasticCollision.H
index 40e6c75e20..7edc360341 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/NoStochasticCollision/NoStochasticCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/NoStochasticCollision/NoStochasticCollision.H
@@ -97,7 +97,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoStochasticCollision.C"
+    #include "NoStochasticCollision.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
index 49aa66a081..578852b6db 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
@@ -157,7 +157,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "StochasticCollisionModel.C"
+    #include "StochasticCollisionModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
index cf92e35fee..6e1bd9dc76 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
@@ -125,7 +125,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoSurfaceFilm.C"
+    #include "NoSurfaceFilm.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
index ab36657edb..03fbffe3da 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
@@ -264,7 +264,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SurfaceFilmModel.C"
+    #include "SurfaceFilmModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
index 323d5a5e34..dacaa9f644 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
@@ -197,7 +197,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "AveragingMethod.C"
+    #include "AveragingMethod.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.H
index e5af8fe80f..4696b33641 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.H
@@ -160,7 +160,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Basic.C"
+    #include "Basic.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
index ebc3e2f537..f7d52bd3e1 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
@@ -193,7 +193,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Dual.C"
+    #include "Dual.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H
index dbd6f93eb0..cc62a5e5c3 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H
@@ -173,7 +173,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Moment.C"
+    #include "Moment.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
index 7e960b4600..226a9c0881 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
@@ -169,7 +169,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DampingModel.C"
+    #include "DampingModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.H b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.H
index db30fb7c63..aced198b7c 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoDamping.C"
+    #include "NoDamping.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.H b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.H
index 41c2805827..ff543439c4 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/Relaxation/Relaxation.H
@@ -125,7 +125,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Relaxation.C"
+    #include "Relaxation.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
index 0cf3d1e905..3e5f5d8f4c 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
@@ -163,7 +163,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IsotropyModel.C"
+    #include "IsotropyModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/NoIsotropy/NoIsotropy.H b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/NoIsotropy/NoIsotropy.H
index ff8cd52296..c3b1bca064 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/NoIsotropy/NoIsotropy.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/NoIsotropy/NoIsotropy.H
@@ -97,7 +97,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoIsotropy.C"
+    #include "NoIsotropy.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.H b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.H
index 9eb973873c..ed9031cb81 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.H
@@ -119,7 +119,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Stochastic.C"
+    #include "Stochastic.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.H
index 4604a7a6c2..d5dd9cdbba 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.H
@@ -133,7 +133,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Explicit.C"
+    #include "Explicit.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
index dc31170004..85e6c75d5c 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
@@ -131,7 +131,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Implicit.C"
+    #include "Implicit.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.H
index 9214f4251d..280dd0bb36 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoPacking.C"
+    #include "NoPacking.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
index 1a1f061fff..23115c2588 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
@@ -174,7 +174,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PackingModel.C"
+    #include "PackingModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index b59c971893..0382e339e1 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -296,7 +296,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "CompositionModel.C"
+    #include "CompositionModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/NoComposition/NoComposition.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/NoComposition/NoComposition.H
index c60a9f4e27..cea8a6aae0 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/NoComposition/NoComposition.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/NoComposition/NoComposition.H
@@ -111,7 +111,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoComposition.C"
+    #include "NoComposition.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
index 71b7d93467..942ef85acc 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
@@ -132,7 +132,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SingleMixtureFraction.C"
+    #include "SingleMixtureFraction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
index afb2f9b8b7..35dce6e401 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
@@ -130,7 +130,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SinglePhaseMixture.C"
+    #include "SinglePhaseMixture.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
index ffe45f5811..08b9d32755 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
@@ -188,7 +188,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReactingLookupTableInjection.C"
+    #include "ReactingLookupTableInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index 31535bddbc..8416919bca 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -146,7 +146,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LiquidEvaporation.C"
+    #include "LiquidEvaporation.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H
index 7765690782..b92f44e7ab 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H
@@ -156,7 +156,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LiquidEvaporationBoil.C"
+    #include "LiquidEvaporationBoil.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index cd86aaf97a..7b1d714c22 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -106,7 +106,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoPhaseChange.C"
+    #include "NoPhaseChange.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index 3afdb46255..91f45b595f 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -232,7 +232,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PhaseChangeModel.C"
+    #include "PhaseChangeModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
index 407e7f41e4..581c647ffc 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
@@ -124,7 +124,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ConstantRateDevolatilisation.C"
+    #include "ConstantRateDevolatilisation.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index bc3b6dcba5..096b96e490 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -183,7 +183,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DevolatilisationModel.C"
+    #include "DevolatilisationModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
index e71a822855..804e09c88a 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
@@ -105,7 +105,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoDevolatilisation.C"
+    #include "NoDevolatilisation.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
index 6103d96d4d..78f170fea0 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
@@ -249,7 +249,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SingleKineticRateDevolatilisation.C"
+    #include "SingleKineticRateDevolatilisation.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
index 938ff2ef91..6d1f9b7f2e 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
@@ -190,7 +190,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReactingMultiphaseLookupTableInjection.C"
+    #include "ReactingMultiphaseLookupTableInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.H
index a4c6dff4a3..d5917f440b 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.H
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SuppressionCollision.C"
+    #include "SuppressionCollision.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index 8209595f59..36e0c54f73 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -111,7 +111,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoSurfaceReaction.C"
+    #include "NoSurfaceReaction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index ceca733c06..60f860c33c 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -193,7 +193,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SurfaceReactionModel.C"
+    #include "SurfaceReactionModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
index 8324e645f0..e31eaaf349 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
@@ -178,7 +178,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "HeatTransferModel.C"
+    #include "HeatTransferModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
index a53fe6f5cf..b72648e5be 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
@@ -96,7 +96,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoHeatTransfer.C"
+    #include "NoHeatTransfer.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
index 8d8d20deab..11a57a0f2d 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
@@ -97,7 +97,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "RanzMarshall.C"
+    #include "RanzMarshall.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
index 54394a9d8c..0f77e61be2 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
@@ -191,7 +191,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ThermoLookupTableInjection.C"
+    #include "ThermoLookupTableInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
index 6f97e165f0..b6fb8f1a11 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
@@ -295,7 +295,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ThermoSurfaceFilm.C"
+    #include "ThermoSurfaceFilm.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
index a65a18ac10..d693708a9b 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
@@ -227,6 +227,6 @@ void Foam::bufferedAccumulator<Type>::operator=
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "bufferedAccumulatorIO.C"
+    #include "bufferedAccumulatorIO.C"
 
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
index a96d90b192..98e7ef50b1 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
@@ -166,7 +166,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "bufferedAccumulator.C"
+    #include "bufferedAccumulator.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
index b3aedbeb18..c90588a71f 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
@@ -218,6 +218,6 @@ Foam::scalar Foam::correlationFunction<Type>::integral() const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "correlationFunctionIO.C"
+    #include "correlationFunctionIO.C"
 
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
index 6fcf25d8ed..99647b4c2a 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
@@ -171,7 +171,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "correlationFunction.C"
+    #include "correlationFunction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
index f5f0e887dd..6c0fa9f44f 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
@@ -251,7 +251,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SprayCloud.C"
+    #include "SprayCloud.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
index e83d94382c..79c3a1afce 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
@@ -176,7 +176,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "AtomizationModel.C"
+    #include "AtomizationModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H
index b2ace22a8e..68729f4611 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H
@@ -131,7 +131,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "BlobsSheetAtomization.C"
+    #include "BlobsSheetAtomization.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H
index d46938f646..63baffb983 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H
@@ -151,7 +151,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "LISAAtomization.C"
+    #include "LISAAtomization.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H b/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H
index aff33e4036..ee9dd85a8f 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H
@@ -114,7 +114,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoAtomization.C"
+    #include "NoAtomization.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
index 26692acb2e..22df98c34b 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
@@ -223,7 +223,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "BreakupModel.C"
+    #include "BreakupModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H
index 20881a013b..3304802cae 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H
@@ -142,7 +142,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ETAB.C"
+    #include "ETAB.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H b/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H
index bb9c1424d3..3d9faf6e6e 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H
@@ -115,7 +115,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoBreakup.C"
+    #include "NoBreakup.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H
index c4232a4b60..0d968ff5dc 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H
@@ -146,7 +146,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PilchErdman.C"
+    #include "PilchErdman.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H
index 99bcbc6bd1..6588b10ca0 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H
@@ -140,7 +140,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReitzDiwakar.C"
+    #include "ReitzDiwakar.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H
index 0ea6e7b67e..1e8c3c9991 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H
@@ -127,7 +127,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReitzKHRT.C"
+    #include "ReitzKHRT.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H
index 295b79d4fa..a9b121fb2a 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H
@@ -169,7 +169,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SHF.C"
+    #include "SHF.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H
index f9f17423c5..55c1e1b16d 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H
@@ -152,7 +152,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TAB.C"
+    #include "TAB.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.H b/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.H
index 543c9c7c68..aa26c45341 100644
--- a/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.H
+++ b/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.H
@@ -129,7 +129,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ORourkeCollision.C"
+    #include "ORourkeCollision.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.H b/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.H
index 31c9ca80b6..722ebd1db0 100644
--- a/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.H
+++ b/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.H
@@ -114,7 +114,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TrajectoryCollision.C"
+    #include "TrajectoryCollision.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
index 6e95c15749..e987e653cf 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
@@ -130,7 +130,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DispersionRASModel.C"
+    #include "DispersionRASModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
index ee9453d31a..12820a2f6a 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
@@ -116,7 +116,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "GradientDispersionRAS.C"
+    #include "GradientDispersionRAS.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
index 53c5f3904f..f031ed799c 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
@@ -100,7 +100,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "StochasticDispersionRAS.C"
+    #include "StochasticDispersionRAS.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
index 7aa5050a22..c35aa7a737 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -610,7 +610,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "autoLayerDriverTemplates.C"
+    #include "autoLayerDriverTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
index be683e731b..116c6b1891 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
@@ -144,7 +144,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "zeroFixedValuePointPatchField.C"
+    #include "zeroFixedValuePointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
index 3184e808e2..2d0d76b2f8 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
@@ -1144,7 +1144,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "meshRefinementTemplates.C"
+    #include "meshRefinementTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
index 130a9c230d..4b6c4bc862 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
@@ -563,8 +563,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "AMIInterpolation.C"
-#   include "AMIInterpolationParallelOps.C"
+    #include "AMIInterpolation.C"
+    #include "AMIInterpolationParallelOps.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
index fd0af6039a..706d19b0b5 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
@@ -275,8 +275,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "AMIMethod.C"
-#   include "AMIMethodNew.C"
+    #include "AMIMethod.C"
+    #include "AMIMethodNew.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H
index d74094d0b5..19abca727a 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -145,7 +145,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "directAMI.C"
+    #include "directAMI.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
index b410de737e..7162d602d9 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
@@ -177,7 +177,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "faceAreaWeightAMI.C"
+    #include "faceAreaWeightAMI.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H
index 73734ab8ea..8e8634705b 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H
@@ -149,7 +149,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "mapNearestAMI.C"
+    #include "mapNearestAMI.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H
index de8afcf0ef..2e3855270b 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "partialFaceAreaWeightAMI.C"
+    #include "partialFaceAreaWeightAMI.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
index 0d236dd04a..78b70675da 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
@@ -231,7 +231,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "cyclicACMIPointPatchField.C"
+    #include "cyclicACMIPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
index e50759d7ba..5a02c94479 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
@@ -231,7 +231,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#    include "cyclicAMIPointPatchField.C"
+    #include "cyclicAMIPointPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.H b/src/meshTools/algorithms/MeshWave/FaceCellWave.H
index 93e2277daa..d9afeed1ad 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.H
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -359,7 +359,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "FaceCellWave.C"
+    #include "FaceCellWave.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/algorithms/MeshWave/MeshWave.H b/src/meshTools/algorithms/MeshWave/MeshWave.H
index 04fe52c519..a45ba4b988 100644
--- a/src/meshTools/algorithms/MeshWave/MeshWave.H
+++ b/src/meshTools/algorithms/MeshWave/MeshWave.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -167,7 +167,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MeshWave.C"
+    #include "MeshWave.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
index 7321c43ff4..943e225198 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -358,7 +358,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PatchEdgeFaceWave.C"
+    #include "PatchEdgeFaceWave.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
index 1e951590b8..1d2d07f9a0 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -357,7 +357,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PointEdgeWave.C"
+    #include "PointEdgeWave.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/cellDist/cellDistFuncs.H b/src/meshTools/cellDist/cellDistFuncs.H
index 11c29d5650..f5aedbe22c 100644
--- a/src/meshTools/cellDist/cellDistFuncs.H
+++ b/src/meshTools/cellDist/cellDistFuncs.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,7 +162,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cellDistFuncsTemplates.C"
+    #include "cellDistFuncsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/cellDist/patchWave/patchDataWave.H b/src/meshTools/cellDist/patchWave/patchDataWave.H
index 180b239f5d..a155d1ec34 100644
--- a/src/meshTools/cellDist/patchWave/patchDataWave.H
+++ b/src/meshTools/cellDist/patchWave/patchDataWave.H
@@ -198,7 +198,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "patchDataWave.C"
+    #include "patchDataWave.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/cellDist/wallPoint/wallPointData.H b/src/meshTools/cellDist/wallPoint/wallPointData.H
index 06595dc20b..96c4e3b97e 100644
--- a/src/meshTools/cellDist/wallPoint/wallPointData.H
+++ b/src/meshTools/cellDist/wallPoint/wallPointData.H
@@ -208,7 +208,7 @@ inline bool contiguous<wallPointData<tensor>>()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "wallPointData.C"
+    #include "wallPointData.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
index ddd84f2e9c..b1dd87b517 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
@@ -270,7 +270,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "treeDataPrimitivePatch.C"
+    #include "treeDataPrimitivePatch.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/meshTools/meshTools.H b/src/meshTools/meshTools/meshTools.H
index 08d36f3208..2974f95963 100644
--- a/src/meshTools/meshTools/meshTools.H
+++ b/src/meshTools/meshTools/meshTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -345,7 +345,7 @@ namespace meshTools
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "meshToolsTemplates.C"
+    #include "meshToolsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
index d1edb53ad4..8ae25c2898 100644
--- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
+++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,7 +123,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                         << "Should be 1 or 2 - serious error "
                         << "in mesh structure. " << endl;
 
-#                   ifdef DEBUG_ZIPUP
+                    #ifdef DEBUG_ZIPUP
                     forAll(curFaces, faceI)
                     {
                         Info<< "face: " << oldFaces[curFaces[faceI]]
@@ -140,7 +140,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                             << "\" coordinates "
                             << Points[cellPoints[cpI]] << endl;
                     }
-#                   endif
+                    #endif
 
                     // Gather the problem cell
                     problemCells.insert(cellI);
@@ -152,7 +152,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
             singleEdges.setSize(nSingleEdges);
 
-#           ifdef DEBUG_ZIPUP
+            #ifdef DEBUG_ZIPUP
             Info<< "Cell " << cellI << endl;
 
             forAll(curFaces, faceI)
@@ -171,7 +171,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                     << "\" coordinates "
                     << points()[cellPoints[cpI]] << endl;
             }
-#           endif
+            #endif
 
             // Loop through all single edges and mark the points they use
             // points marked twice are internal to edge; those marked more than
@@ -260,10 +260,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                     pointChain.insert(newEdgeStart);
                     pointChain.append(newEdgeEnd);
 
-#                   ifdef DEBUG_CHAIN
+                    #ifdef DEBUG_CHAIN
                     Info<< "found edge to start with: "
                         << singleEdges[edgeI] << endl;
-#                   endif
+                    #endif
 
                     // Check if head or tail are blocked
                     forAll(cellPoints, pointI)
@@ -272,9 +272,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                         {
                             if (pointUsage[pointI] > 2)
                             {
-#                               ifdef DEBUG_CHAIN
+                                #ifdef DEBUG_CHAIN
                                 Info<< "start head blocked" << endl;
-#                               endif
+                                #endif
 
                                 blockHead = true;
                             }
@@ -283,9 +283,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                         {
                             if (pointUsage[pointI] > 2)
                             {
-#                               ifdef DEBUG_CHAIN
+                                #ifdef DEBUG_CHAIN
                                 Info<< "start tail blocked" << endl;
-#                               endif
+                                #endif
 
                                 blockTail = true;
                             }
@@ -310,10 +310,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                 label addEnd =
                                     singleEdges[addEdgeI].end();
 
-#                               ifdef DEBUG_CHAIN
+                                #ifdef DEBUG_CHAIN
                                 Info<< "Trying candidate "
                                     << singleEdges[addEdgeI] << endl;
-#                               endif
+                                #endif
 
                                 // Try to add the edge onto the head
                                 if (!blockHead)
@@ -356,10 +356,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                 label curEdgeStart = pointChain.first();
                                 label curEdgeEnd = pointChain.last();
 
-#                               ifdef DEBUG_CHAIN
+                                #ifdef DEBUG_CHAIN
                                 Info<< "curEdgeStart: " << curEdgeStart
                                     << " curEdgeEnd: " << curEdgeEnd << endl;
-#                               endif
+                                #endif
 
                                 forAll(cellPoints, pointI)
                                 {
@@ -367,9 +367,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                     {
                                         if (pointUsage[pointI] > 2)
                                         {
-#                                           ifdef DEBUG_CHAIN
+                                            #ifdef DEBUG_CHAIN
                                             Info<< "head blocked" << endl;
-#                                           endif
+                                            #endif
 
                                             blockHead = true;
                                         }
@@ -378,9 +378,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                     {
                                         if (pointUsage[pointI] > 2)
                                         {
-#                                           ifdef DEBUG_CHAIN
+                                            #ifdef DEBUG_CHAIN
                                             Info<< "tail blocked" << endl;
-#                                           endif
+                                            #endif
 
                                             blockTail = true;
                                         }
@@ -390,9 +390,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                 // Check if the loop is closed
                                 if (curEdgeStart == curEdgeEnd)
                                 {
-#                                   ifdef DEBUG_CHAIN
+                                    #ifdef DEBUG_CHAIN
                                     Info<< "closed loop" << endl;
-#                                   endif
+                                    #endif
 
                                     pointChain.removeHead();
 
@@ -402,10 +402,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                     stopSearching = true;
                                 }
 
-#                               ifdef DEBUG_CHAIN
+                                #ifdef DEBUG_CHAIN
                                 Info<< "current pointChain: " << pointChain
                                     << endl;
-#                               endif
+                                #endif
 
                                 if (stopSearching) break;
                             }
@@ -413,9 +413,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                     } while (stopSearching);
                 }
 
-#               ifdef DEBUG_CHAIN
+                #ifdef DEBUG_CHAIN
                 Info<< "completed patch chain: " << pointChain << endl;
-#               endif
+                #endif
 
                 if (pointChain.size() > 2)
                 {
@@ -426,9 +426,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
             edgesToInsert.setSize(nEdgesToInsert);
 
-#           ifdef DEBUG_ZIPUP
+            #ifdef DEBUG_ZIPUP
             Info<< "edgesToInsert: " << edgesToInsert << endl;
-#           endif
+            #endif
 
             // Insert the edges into a list of faces
             forAll(edgesToInsert, edgeToInsertI)
@@ -477,10 +477,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                     used[nextPoint] = true;
                 }
 
-#               ifdef DEBUG_ORDER
+                #ifdef DEBUG_ORDER
                 Info<< "unorderedEdge: " << unorderedEdge << nl
                     << "orderedEdge: " << orderedEdge << endl;
-#               endif
+                #endif
 
                 // check for duplicate points in the ordered edge
                 forAll(orderedEdge, checkI)
@@ -582,12 +582,12 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                 allPointsPresent && curPointFound;
                         }
 
-#                       ifdef DEBUG_ZIPUP
+                        #ifdef DEBUG_ZIPUP
                         if (allPointsPresent)
                         {
                             Info<< "All points present" << endl;
                         }
-#                       endif
+                        #endif
 
                         if (!allPointsPresent)
                         {
@@ -601,9 +601,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                             // resized.
                             edgeList newFaceEdges = newFace.edges();
 
-#                           ifdef DEBUG_ZIPUP
+                            #ifdef DEBUG_ZIPUP
                             Info<< "Not all points present." << endl;
-#                           endif
+                            #endif
 
                             label nNewFacePoints = 0;
 
@@ -670,11 +670,11 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                 }
                             }
 
-#                           ifdef DEBUG_ZIPUP
+                            #ifdef DEBUG_ZIPUP
                             Info<< "oldFace: "
                                 << oldFaces[currentFaceIndex] << nl
                                 << "newFace: " << newFace << endl;
-#                           endif
+                            #endif
 
                             // Check for duplicate points in the new face
                             forAll(newFace, checkI)
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
index 857ebc673c..685d2ea217 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
@@ -294,7 +294,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "surfaceIntersectionTemplates.C"
+    #include "surfaceIntersectionTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
index b5484532ce..85f6743485 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
@@ -169,7 +169,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "pointToPointPlanarInterpolationTemplates.C"
+    #include "pointToPointPlanarInterpolationTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/parallel/decompose/decompose/fvFieldDecomposer.H b/src/parallel/decompose/decompose/fvFieldDecomposer.H
index 1a5e672614..c6953b37a4 100644
--- a/src/parallel/decompose/decompose/fvFieldDecomposer.H
+++ b/src/parallel/decompose/decompose/fvFieldDecomposer.H
@@ -283,7 +283,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvFieldDecomposerDecomposeFields.C"
+    #include "fvFieldDecomposerDecomposeFields.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
index 532ded955b..101eb3b7c9 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,10 +130,10 @@ extern "C"
 // Hack: scotch generates floating point errors so need to switch of error
 //       trapping!
 #ifdef __GLIBC__
-#   ifndef _GNU_SOURCE
-#       define _GNU_SOURCE
-#   endif
-#   include <fenv.h>
+    #ifndef _GNU_SOURCE
+        #define _GNU_SOURCE
+    #endif
+    #include <fenv.h>
 #endif
 
 
@@ -648,14 +648,14 @@ Foam::label Foam::ptscotchDecomp::decompose
 
 
     // Hack:switch off fpu error trapping
-#   ifdef  FE_NOMASK_ENV
+    #ifdef  FE_NOMASK_ENV
     int oldExcepts = fedisableexcept
     (
         FE_DIVBYZERO
       | FE_INVALID
       | FE_OVERFLOW
     );
-#   endif
+    #endif
 
 
     // Note: always provide allocated storage even if local size 0
@@ -678,9 +678,9 @@ Foam::label Foam::ptscotchDecomp::decompose
         "SCOTCH_graphMap"
     );
 
-#   ifdef  FE_NOMASK_ENV
+    #ifdef  FE_NOMASK_ENV
     feenableexcept(oldExcepts);
-#   endif
+    #endif
 
 
 
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
index e0ae30e5cc..a4ec01d1c9 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ptscotchDecompTemplates.C"
+    #include "ptscotchDecompTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
index d0b9d6a6af..dd72d4e3b1 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.C
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,10 +136,10 @@ extern "C"
 // Hack: scotch generates floating point errors so need to switch of error
 //       trapping!
 #ifdef __GLIBC__
-#   ifndef _GNU_SOURCE
-#       define _GNU_SOURCE
-#   endif
-#   include <fenv.h>
+    #ifndef _GNU_SOURCE
+        #define _GNU_SOURCE
+    #endif
+    #include <fenv.h>
 #endif
 
 
@@ -523,14 +523,14 @@ Foam::label Foam::scotchDecomp::decomposeOneProc
 
 
     // Hack:switch off fpu error trapping
-#   ifdef FE_NOMASK_ENV
+    #ifdef FE_NOMASK_ENV
     int oldExcepts = fedisableexcept
     (
         FE_DIVBYZERO
       | FE_INVALID
       | FE_OVERFLOW
     );
-#   endif
+    #endif
 
     finalDecomp.setSize(xadj.size()-1);
     finalDecomp = 0;
@@ -546,9 +546,9 @@ Foam::label Foam::scotchDecomp::decomposeOneProc
         "SCOTCH_graphMap"
     );
 
-#   ifdef FE_NOMASK_ENV
+    #ifdef FE_NOMASK_ENV
     feenableexcept(oldExcepts);
-#   endif
+    #endif
 
 
 
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
index c99d560395..bbec71057b 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
@@ -467,7 +467,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "distributedTriSurfaceMeshTemplates.C"
+    #include "distributedTriSurfaceMeshTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
index 35122ad04a..a56a761ec0 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
@@ -226,7 +226,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvFieldReconstructorReconstructFields.C"
+    #include "fvFieldReconstructorReconstructFields.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
index 4c5c514c29..3d575d4a1c 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
@@ -166,7 +166,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "pointFieldReconstructorReconstructFields.C"
+    #include "pointFieldReconstructorReconstructFields.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H b/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H
index 9b33dcdebf..5c49b8ff46 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H
@@ -107,7 +107,7 @@ void reconstructLagrangianFieldFields
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "reconstructLagrangianFields.C"
+    #include "reconstructLagrangianFields.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
index f9152e4e05..0458adcee6 100644
--- a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
+++ b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,8 +206,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "writeAddSubtractField.C"
-#   include "writeAddSubtractValue.C"
+    #include "writeAddSubtractField.C"
+    #include "writeAddSubtractValue.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/foamCalcFunctions/field/components/components.H b/src/postProcessing/foamCalcFunctions/field/components/components.H
index edf1572f6c..e32b50925c 100644
--- a/src/postProcessing/foamCalcFunctions/field/components/components.H
+++ b/src/postProcessing/foamCalcFunctions/field/components/components.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "writeComponentFields.C"
+    #include "writeComponentFields.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/foamCalcFunctions/field/div/div.H b/src/postProcessing/foamCalcFunctions/field/div/div.H
index 94a9b87cf4..e17a9c841c 100644
--- a/src/postProcessing/foamCalcFunctions/field/div/div.H
+++ b/src/postProcessing/foamCalcFunctions/field/div/div.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "writeDivField.C"
+    #include "writeDivField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H b/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H
index d49ffcacfb..d69df83018 100644
--- a/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H
+++ b/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,7 +126,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "writeInterpolateField.C"
+    #include "writeInterpolateField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/foamCalcFunctions/field/mag/mag.H b/src/postProcessing/foamCalcFunctions/field/mag/mag.H
index 459d052745..5590ab0940 100644
--- a/src/postProcessing/foamCalcFunctions/field/mag/mag.H
+++ b/src/postProcessing/foamCalcFunctions/field/mag/mag.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,7 +126,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "writeMagField.C"
+    #include "writeMagField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H b/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
index e98f9221f5..3ced812781 100644
--- a/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
+++ b/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "writeMagGradField.C"
+    #include "writeMagGradField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H b/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
index ec85edbe38..8750f4c206 100644
--- a/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
+++ b/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,7 +126,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "writeMagSqrField.C"
+    #include "writeMagSqrField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H b/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H
index d46dcde85b..eb7dcdd849 100644
--- a/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H
+++ b/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "writeRandomField.C"
+    #include "writeRandomField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
index 4d896b6026..59f101619f 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
+++ b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
@@ -213,7 +213,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "partialWriteTemplates.C"
+    #include "partialWriteTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index 7729163977..b78b10ad10 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -342,7 +342,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fieldAverageTemplates.C"
+    #include "fieldAverageTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
index e190360c85..c74aad72fb 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
@@ -201,7 +201,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fieldCoordinateSystemTransformTemplates.C"
+    #include "fieldCoordinateSystemTransformTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
index b2246eb9b1..05438c88d7 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -235,7 +235,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fieldMinMaxTemplates.C"
+    #include "fieldMinMaxTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
index 7362f9e32d..3862c6426a 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
@@ -242,7 +242,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "nearWallFieldsTemplates.C"
+    #include "nearWallFieldsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index ac5a794b43..7706d327bd 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.H
@@ -201,7 +201,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "readFieldsTemplates.C"
+    #include "readFieldsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index 3976cfe672..fb8e4b71dc 100644
--- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
@@ -301,7 +301,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "regionSizeDistributionTemplates.C"
+    #include "regionSizeDistributionTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
index 02ebba304b..f95995fe51 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
@@ -197,7 +197,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "surfaceInterpolateFieldsTemplates.C"
+    #include "surfaceInterpolateFieldsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
index 0054ec2bb9..5f1f0b3f0c 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -346,7 +346,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "wallBoundedParticleTemplates.C"
+    #include "wallBoundedParticleTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/residuals/residuals.H b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
index 39b5dd2d45..11b77ff3d8 100644
--- a/src/postProcessing/functionObjects/utilities/residuals/residuals.H
+++ b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
@@ -195,7 +195,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "residualsTemplates.C"
+    #include "residualsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
index 8c533e0114..2951aab362 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
@@ -538,7 +538,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "kinematicSingleLayerTemplates.C"
+    #include "kinematicSingleLayerTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/cuttingPlane/cuttingPlane.H b/src/sampling/cuttingPlane/cuttingPlane.H
index 0119f2b30b..d8309cf942 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.H
+++ b/src/sampling/cuttingPlane/cuttingPlane.H
@@ -188,7 +188,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "cuttingPlaneTemplates.C"
+    #include "cuttingPlaneTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/meshToMesh0/meshToMesh0.H b/src/sampling/meshToMesh0/meshToMesh0.H
index 9907e79f5b..885d4baeb0 100644
--- a/src/sampling/meshToMesh0/meshToMesh0.H
+++ b/src/sampling/meshToMesh0/meshToMesh0.H
@@ -363,7 +363,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "meshToMesh0Templates.C"
+    #include "meshToMesh0Templates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/probes/patchProbes.H b/src/sampling/probes/patchProbes.H
index 01d1f618c2..7ee2e796d0 100644
--- a/src/sampling/probes/patchProbes.H
+++ b/src/sampling/probes/patchProbes.H
@@ -161,7 +161,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "patchProbesTemplates.C"
+    #include "patchProbesTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index 6845576d7e..2d7e8c1d76 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -303,7 +303,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "probesTemplates.C"
+    #include "probesTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index 5a3985ef6c..26e494c28d 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -318,7 +318,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "sampledSetsTemplates.C"
+    #include "sampledSetsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
index 3442f96f58..25421ded89 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
@@ -274,7 +274,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "distanceSurfaceTemplates.C"
+    #include "distanceSurfaceTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.H b/src/sampling/sampledSurface/isoSurface/isoSurface.H
index f05035369c..967536b7c6 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.H
@@ -444,7 +444,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "isoSurfaceTemplates.C"
+    #include "isoSurfaceTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
index 20a0abfd32..034fbd3171 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
@@ -383,7 +383,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "isoSurfaceCellTemplates.C"
+    #include "isoSurfaceCellTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
index c07338b5f5..d0a0b0ba98 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
@@ -276,7 +276,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "sampledIsoSurfaceTemplates.C"
+    #include "sampledIsoSurfaceTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
index a990173b6e..c3609e7356 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
@@ -236,7 +236,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "sampledIsoSurfaceCellTemplates.C"
+    #include "sampledIsoSurfaceCellTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
index 17a6dc59bc..cae3793ac8 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
@@ -252,7 +252,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "sampledCuttingPlaneTemplates.C"
+    #include "sampledCuttingPlaneTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
index ec5821c556..b16ddef634 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
@@ -287,7 +287,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "sampledPatchTemplates.C"
+    #include "sampledPatchTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
index 3e7d33e74c..59671c946e 100644
--- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
+++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
@@ -176,7 +176,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "sampledPatchInternalFieldTemplates.C"
+    #include "sampledPatchInternalFieldTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
index f4134573b1..02a4147a81 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
@@ -220,7 +220,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "sampledPlaneTemplates.C"
+    #include "sampledPlaneTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
index 243906b385..0fdcca5dd7 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
@@ -445,7 +445,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "sampledSurfaceTemplates.C"
+    #include "sampledSurfaceTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
index 5957d1398d..f2c2430e5a 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -248,7 +248,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "sampledSurfacesTemplates.C"
+    #include "sampledSurfacesTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
index 2f1b12cb8d..6a41255075 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
@@ -291,7 +291,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "sampledTriSurfaceMeshTemplates.C"
+    #include "sampledTriSurfaceMeshTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
index 4d78b2ab19..840a9920ad 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
@@ -211,7 +211,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "sampledThresholdCellFacesTemplates.C"
+    #include "sampledThresholdCellFacesTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index f420fd34d3..e3d99ca999 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -485,7 +485,7 @@ inline label MeshedSurface<triFace>::triangulate(List<label>& faceMap)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MeshedSurface.C"
+    #include "MeshedSurface.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
index 7824533ee1..4cc7264a43 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -187,7 +187,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MeshedSurfaceProxy.C"
+    #include "MeshedSurfaceProxy.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index 23254afa66..52cbddd3bc 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -382,7 +382,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "UnsortedMeshedSurface.C"
+    #include "UnsortedMeshedSurface.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
index 4b05228f03..8d626099c3 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
@@ -125,7 +125,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "AC3DsurfaceFormat.C"
+    #include "AC3DsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
index ab3ae8e799..602ca18565 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,7 @@ protected:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "AC3DsurfaceFormatCoreTemplates.C"
+    #include "AC3DsurfaceFormatCoreTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
index 33b4f5b7b8..790fd8c51f 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
@@ -134,7 +134,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "FTRsurfaceFormat.C"
+    #include "FTRsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
index db1c75cc20..7a0175d0d2 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
@@ -118,7 +118,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "GTSsurfaceFormat.C"
+    #include "GTSsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
index b1c57c8828..65f22eecf7 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
@@ -114,7 +114,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NASsurfaceFormat.C"
+    #include "NASsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
index 4fb383662e..7162078175 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
@@ -115,7 +115,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "OBJsurfaceFormat.C"
+    #include "OBJsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
index 1326e2a5cf..d861a92a6d 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
@@ -124,7 +124,7 @@ public:
 
 
 #ifdef NoRepository
-#   include "OFFsurfaceFormat.C"
+    #include "OFFsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
index 838268c25e..33ab7212a5 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
@@ -145,7 +145,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "OFSsurfaceFormat.C"
+    #include "OFSsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
index 0b1b53c481..cd00d23e8f 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SMESHsurfaceFormat.C"
+    #include "SMESHsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
index 404b9b9d5b..12093d490b 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
@@ -138,7 +138,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "STARCDsurfaceFormat.C"
+    #include "STARCDsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
index 87baed1a80..02c12ae24b 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
@@ -169,7 +169,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "STLsurfaceFormat.C"
+    #include "STLsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
index c2ffcb99df..12834226f4 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
@@ -130,7 +130,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TRIsurfaceFormat.C"
+    #include "TRIsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
index 473201503e..0691f40414 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
@@ -123,7 +123,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "VTKsurfaceFormat.C"
+    #include "VTKsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
index 70b069da9a..191da07386 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "WRLsurfaceFormat.C"
+    #include "WRLsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
index a3dfd2b3b3..1dce035069 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "X3DsurfaceFormat.C"
+    #include "X3DsurfaceFormat.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
index 9d4fc58519..c1d299dbb7 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -453,7 +453,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "basicThermoTemplates.C"
+    #include "basicThermoTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.H b/src/thermophysicalModels/basic/heThermo/heThermo.H
index 9858f16a31..7967cc44cc 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.H
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -304,7 +304,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
-#   include "heThermo.C"
+    #include "heThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H
index 95c61d4eeb..d49aa797ff 100644
--- a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H
+++ b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,7 +120,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
-#   include "pureMixture.C"
+    #include "pureMixture.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.H b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.H
index 08e531a3f2..ca5a89f73f 100644
--- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.H
+++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "hePsiThermo.C"
+    #include "hePsiThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H
index ec453442ad..7e2138d127 100644
--- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H
+++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "heRhoThermo.C"
+    #include "heRhoThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
index f08b87393b..eb927e71b2 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
@@ -187,7 +187,7 @@ public:
 #include "basicChemistryModelI.H"
 
 #ifdef NoRepository
-#   include "basicChemistryModelTemplates.C"
+    #include "basicChemistryModelTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
index f2600319fe..720ad96b99 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
@@ -274,7 +274,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "chemistryModel.C"
+    #include "chemistryModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
index 0b6c7e08f9..8196d84671 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "EulerImplicit.C"
+    #include "EulerImplicit.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
index b5fb3adca1..fa7ec343f7 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "chemistrySolver.C"
+    #include "chemistrySolver.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H
index c0e9d642a4..e0f5db3f60 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "noChemistrySolver.C"
+    #include "noChemistrySolver.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
index cfd8164f47..1b301dca4e 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ode.C"
+    #include "ode.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H
index 6c8eb065cb..ca65aca1d1 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -169,7 +169,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "mixtureFractionSoot.C"
+    #include "mixtureFractionSoot.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
index 6c2cf13771..f298f1b9b7 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
@@ -127,7 +127,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "chemistryReader.C"
+    #include "chemistryReader.C"
 #endif
 
 
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
index 925692dc7a..16046fd29c 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,7 +144,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "foamChemistryReader.C"
+    #include "foamChemistryReader.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H
index b699d16005..fa158e4754 100644
--- a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H
+++ b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H
@@ -164,7 +164,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "moleFractions.C"
+    #include "moleFractions.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
index 533caad0bf..24f95915ab 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -232,7 +232,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
-#   include "SpecieMixture.C"
+    #include "SpecieMixture.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
index 808d08b79d..fa81aa92e1 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -180,7 +180,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
-#   include "egrMixture.C"
+    #include "egrMixture.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
index 17e907574f..31915735d1 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,7 +138,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
-#   include "homogeneousMixture.C"
+    #include "homogeneousMixture.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
index 78f33cd99a..ef9284dde8 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -169,7 +169,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
-#   include "inhomogeneousMixture.C"
+    #include "inhomogeneousMixture.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
index 61c9d59ee6..eaf395a91e 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,7 +155,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "multiComponentMixture.C"
+    #include "multiComponentMixture.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
index 51d6c7adc4..5261eb726e 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
@@ -111,7 +111,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "reactingMixture.C"
+    #include "reactingMixture.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H
index ed0b464297..b5a4a90fbf 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H
@@ -184,7 +184,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "singleStepReactingMixture.C"
+    #include "singleStepReactingMixture.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
index 9748acdb2b..2e852b80c1 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -175,7 +175,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
-#   include "veryInhomogeneousMixture.C"
+    #include "veryInhomogeneousMixture.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H
index 4c52e775ed..725ce90e3a 100644
--- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
-#   include "heheuPsiThermo.C"
+    #include "heheuPsiThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
index dcbf784912..c9d2a89fe1 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
@@ -238,12 +238,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "pyrolysisChemistryModelI.H"
+    #include "pyrolysisChemistryModelI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "pyrolysisChemistryModel.C"
+    #include "pyrolysisChemistryModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
index db38d9195c..f762114fbf 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
@@ -242,12 +242,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#   include "solidChemistryModelI.H"
+    #include "solidChemistryModelI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "solidChemistryModel.C"
+    #include "solidChemistryModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
index 99838ba87c..190e758123 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
@@ -203,7 +203,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "solidReaction.C"
+    #include "solidReaction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H
index 414cb669ee..d7b388ccd6 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H
@@ -165,7 +165,7 @@ public:
 #include "constAnIsoSolidTransportI.H"
 
 #ifdef NoRepository
-#   include "constAnIsoSolidTransport.C"
+    #include "constAnIsoSolidTransport.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
index 2dbe8cded2..4439a279fa 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
@@ -167,7 +167,7 @@ public:
 #include "constIsoSolidTransportI.H"
 
 #ifdef NoRepository
-#   include "constIsoSolidTransport.C"
+    #include "constIsoSolidTransport.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H
index 32d16b69e0..f8c8267644 100644
--- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H
@@ -174,7 +174,7 @@ public:
 #include "exponentialSolidTransportI.H"
 
 #ifdef NoRepository
-#   include "exponentialSolidTransport.C"
+    #include "exponentialSolidTransport.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
index 5a02e2a7c8..d2f2e45fac 100644
--- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
@@ -224,7 +224,7 @@ public:
 #include "polynomialSolidTransportI.H"
 
 #ifdef NoRepository
-#   include "polynomialSolidTransport.C"
+    #include "polynomialSolidTransport.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H
index a964b3fe53..588bcd1607 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,7 +120,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "heSolidThermo.C"
+    #include "heSolidThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
index 7cd491fde7..a388cbddc0 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
@@ -253,7 +253,7 @@ public:
 #include "BoussinesqI.H"
 
 #ifdef NoRepository
-#   include "Boussinesq.C"
+    #include "Boussinesq.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
index 37099a8e6c..49e1445c45 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
@@ -246,7 +246,7 @@ public:
 #include "PengRobinsonGasI.H"
 
 #ifdef NoRepository
-#   include "PengRobinsonGas.C"
+    #include "PengRobinsonGas.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
index 72b273ae05..342e6b3bb6 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
@@ -246,7 +246,7 @@ public:
 #include "adiabaticPerfectFluidI.H"
 
 #ifdef NoRepository
-#   include "adiabaticPerfectFluid.C"
+    #include "adiabaticPerfectFluid.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
index e4345e2f4e..a02883a70a 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
@@ -248,7 +248,7 @@ defineTemplateTypeNameAndDebugWithName                                         \
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "icoPolynomial.C"
+    #include "icoPolynomial.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
index 30c6ea1b4d..67adc188c2 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
@@ -238,7 +238,7 @@ public:
 #include "incompressiblePerfectGasI.H"
 
 #ifdef NoRepository
-#   include "incompressiblePerfectGas.C"
+    #include "incompressiblePerfectGas.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.H b/src/thermophysicalModels/specie/equationOfState/linear/linear.H
index f023bf5d56..99d924632d 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linear.H
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.H
@@ -235,7 +235,7 @@ public:
 #include "linearI.H"
 
 #ifdef NoRepository
-#   include "linear.C"
+    #include "linear.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
index 45409b6278..1d0e993b4e 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
@@ -234,7 +234,7 @@ public:
 #include "perfectFluidI.H"
 
 #ifdef NoRepository
-#   include "perfectFluid.C"
+    #include "perfectFluid.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
index 75883f13d9..b3671e5b11 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
@@ -218,7 +218,7 @@ public:
 #include "perfectGasI.H"
 
 #ifdef NoRepository
-#   include "perfectGas.C"
+    #include "perfectGas.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
index b9d0ddb54c..160015a0f3 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
@@ -220,7 +220,7 @@ public:
 #include "rhoConstI.H"
 
 #ifdef NoRepository
-#   include "rhoConst.C"
+    #include "rhoConst.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
index a01f444740..c5273d8302 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
@@ -185,7 +185,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "IrreversibleReaction.C"
+    #include "IrreversibleReaction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
index 5188552e9f..f1b23abfec 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
@@ -187,7 +187,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NonEquilibriumReversibleReaction.C"
+    #include "NonEquilibriumReversibleReaction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
index dbe7cada7c..ead361e110 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
@@ -383,7 +383,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Reaction.C"
+    #include "Reaction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
index 483e05bf4e..c9a4b2c001 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
@@ -125,7 +125,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReactionList.C"
+    #include "ReactionList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
index 36b7421c8a..fd801d347b 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
@@ -200,7 +200,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReversibleReaction.C"
+    #include "ReversibleReaction.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
index fea19e2cc6..6a99ba435f 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -226,7 +226,7 @@ public:
 #include "eConstThermoI.H"
 
 #ifdef NoRepository
-#   include "eConstThermo.C"
+    #include "eConstThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
index ef33aeaf4c..a83346040b 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -219,7 +219,7 @@ public:
 #include "hConstThermoI.H"
 
 #ifdef NoRepository
-#   include "hConstThermo.C"
+    #include "hConstThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
index ed491b3a00..9a671e77ec 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
@@ -239,7 +239,7 @@ public:
 #include "hPolynomialThermoI.H"
 
 #ifdef NoRepository
-#   include "hPolynomialThermo.C"
+    #include "hPolynomialThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H
index 8285262765..1f0caaff09 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -233,8 +233,8 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "hPowerThermoI.H"
-#   include "hPowerThermo.C"
+    #include "hPowerThermoI.H"
+    #include "hPowerThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
index 9a62231d9c..04b9d311b4 100644
--- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -223,7 +223,7 @@ public:
 #include "hRefConstThermoI.H"
 
 #ifdef NoRepository
-#   include "hRefConstThermo.C"
+    #include "hRefConstThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
index e3e4c1657f..34f3777c51 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -254,7 +254,7 @@ public:
 #include "janafThermoI.H"
 
 #ifdef NoRepository
-#   include "janafThermo.C"
+    #include "janafThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermo.H b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
index e96b525896..9820f11473 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermo.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
@@ -397,7 +397,7 @@ public:
 #include "thermoI.H"
 
 #ifdef NoRepository
-#   include "thermo.C"
+    #include "thermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.H b/src/thermophysicalModels/specie/transport/const/constTransport.H
index a8c445ff8a..2c2e691bf2 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.H
@@ -216,7 +216,7 @@ public:
 #include "constTransportI.H"
 
 #ifdef NoRepository
-#   include "constTransport.C"
+    #include "constTransport.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
index f2a3032c5c..b93f5348f4 100644
--- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
@@ -228,7 +228,7 @@ public:
 #include "logPolynomialTransportI.H"
 
 #ifdef NoRepository
-#   include "logPolynomialTransport.C"
+    #include "logPolynomialTransport.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
index 768c4fe034..9f7be3b8e2 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
@@ -218,7 +218,7 @@ public:
 #include "polynomialTransportI.H"
 
 #ifdef NoRepository
-#   include "polynomialTransport.C"
+    #include "polynomialTransport.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
index 1033a73de3..3c926eb005 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
@@ -241,7 +241,7 @@ public:
 #include "sutherlandTransportI.H"
 
 #ifdef NoRepository
-#   include "sutherlandTransport.C"
+    #include "sutherlandTransport.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
index 7fb05ce05b..250b70d0b4 100644
--- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "rawTopoChangerFvMeshTemplates.C"
+    #include "rawTopoChangerFvMeshTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/wmake/src/wmkdep.l b/wmake/src/wmkdep.l
index cf0be5e02c..a98a597278 100644
--- a/wmake/src/wmkdep.l
+++ b/wmake/src/wmkdep.l
@@ -3,7 +3,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011-2014 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 ------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ void nextFile(const char* fileName);
 void importFile(const char* fileName);
 void importDir(const char* dirName);
 
-#   undef yywrap        /* sometimes a macro by default */
+#undef yywrap        /* sometimes a macro by default */
 
 %}
 

From 7ba41e00959c85b8a2895dcf5ce80a147444ba89 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 29 Feb 2016 18:33:54 +0000
Subject: [PATCH 235/447] Removed duplicate, inconsistent and spurious comments
 in .C files

---
 .../incompressibleThreePhaseMixture.C         |  3 +-
 .../cellShapeControl/cellShapeControl.C       |  8 +---
 .../manipulation/polyDualMesh/meshDualiser.C  |  8 +---
 .../ensightOutputFunctions.C                  |  3 +-
 .../surface/surfaceClean/collapseEdge.C       |  3 +-
 src/OSspecific/POSIX/POSIX.C                  | 35 ++++-----------
 .../dynamicTreeDataPoint.C                    |  6 +--
 src/OpenFOAM/db/regIOobject/regIOobject.C     |  5 +--
 src/OpenFOAM/dimensionSet/dimensionSets.C     | 14 +++---
 .../PatchToPatchInterpolate.C                 |  2 -
 .../mapPolyMesh/mapDistribute/mapDistribute.C |  3 --
 .../mapDistribute/mapDistributePolyMesh.C     |  3 +-
 .../mapDistribute/mapDistributeTemplates.C    | 15 +------
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       |  2 -
 .../polyMesh/polyMeshCheck/polyMeshCheck.C    | 13 +++---
 .../meshes/polyMesh/polyMeshFromShapeMesh.C   |  1 -
 .../constraint/oldCyclic/oldCyclicPolyPatch.C | 17 +++----
 .../constraint/processor/processorPolyPatch.C |  8 ----
 .../constraint/processor/processorPolyPatch.H |  4 ++
 .../processorCyclicPolyPatch.C                |  4 --
 .../polyPatches/polyPatch/polyPatch.C         |  1 -
 .../polyMesh/syncTools/syncToolsTemplates.C   |  4 +-
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C | 11 +----
 .../PatchTools/PatchToolsSearch.C             | 13 +-----
 .../meshes/primitiveMesh/primitiveMesh.C      |  2 -
 .../meshes/primitiveMesh/primitiveMesh.H      |  4 ++
 .../primitiveMeshCheck/primitiveMeshCheck.C   | 11 -----
 .../meshes/primitiveMesh/primitiveMeshEdges.C |  3 --
 .../primitiveMesh/primitivePatch/patchZones.C |  9 +---
 .../primitiveMesh/primitivePatch/walkPatch.C  |  8 +---
 .../meshes/primitiveShapes/plane/plane.C      | 17 +------
 .../primitiveShapes/tetrahedron/tetrahedron.C | 15 ++++---
 .../meshes/treeBoundBox/treeBoundBox.C        | 45 +++++++------------
 .../primitives/Tensor2D/tensor2D/tensor2D.C   | 32 +++++--------
 .../primitives/VectorSpace/VectorSpace.C      |  4 +-
 src/OpenFOAM/primitives/bools/Switch/Switch.C |  6 +--
 .../primitives/hashes/Hasher/Hasher.C         |  2 +-
 .../primitives/strings/string/string.C        |  9 +---
 src/dynamicMesh/fvMeshAdder/fvMeshAdder.C     |  5 +--
 .../meshCutAndRemove/meshCutAndRemove.C       | 15 +------
 .../motionSmootherAlgoTemplates.C             |  3 --
 .../polyMeshGeometry/polyMeshGeometry.C       | 10 +----
 .../attachPolyTopoChanger.C                   |  3 +-
 .../polyTopoChange/refinementHistory.C        |  9 +---
 .../polyTopoChange/removePoints.C             | 27 ++---------
 .../featureEdgeMesh/featureEdgeMesh.C         |  7 +--
 src/engine/engineTime/engineTime.C            |  3 +-
 src/fileFormats/coordSet/coordSet.C           |  4 +-
 src/finiteVolume/fvMesh/fvMesh.C              |  1 -
 .../autoHexMeshDriver/autoLayerDriver.C       |  1 -
 .../meshRefinement/meshRefinement.C           |  2 -
 src/meshTools/indexedOctree/treeDataEdge.C    |  8 +---
 src/meshTools/indexedOctree/treeDataFace.C    |  8 ++--
 src/meshTools/indexedOctree/treeDataPoint.C   |  6 +--
 .../indexedOctree/treeDataPrimitivePatch.C    |  2 -
 src/meshTools/meshTools/meshTools.C           |  4 +-
 .../primitiveMeshGeometry.C                   |  4 +-
 .../searchableSurface/searchableSurfaces.C    | 12 +----
 .../searchableSurfacesQueries.C               |  3 +-
 src/meshTools/sets/topoSets/cellZoneSet.C     |  3 +-
 src/meshTools/sets/topoSets/faceZoneSet.C     |  3 +-
 src/meshTools/sets/topoSets/pointZoneSet.C    |  3 +-
 .../surfaceFeatures/surfaceFeatures.C         | 10 ++---
 .../triSurfaceTools/triSurfaceTools.C         |  2 -
 .../wallBoundedParticleTemplates.C            | 15 ++++---
 src/sampling/probes/probesTemplates.C         |  1 -
 .../incompressibleTwoPhaseMixture.C           |  3 +-
 67 files changed, 138 insertions(+), 392 deletions(-)

diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
index f6c00e12a4..b5eae6b98c 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,6 @@ License
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
-//- Calculate and return the laminar viscosity
 void Foam::incompressibleThreePhaseMixture::calcNu()
 {
     nuModel1_->correct();
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
index ca65462488..9e3e9e82ad 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,13 +36,10 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(cellShapeControl, 0);
+    defineTypeNameAndDebug(cellShapeControl, 0);
 }
 
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::cellShapeControl::cellShapeControl
@@ -173,7 +170,6 @@ Foam::scalar Foam::cellShapeControl::cellSize(const point& pt) const
 }
 
 
-//- Return the cell alignment at the given location
 Foam::tensor Foam::cellShapeControl::cellAlignment(const point& pt) const
 {
     scalarList bary;
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index ce6e15e9fa..ff34c2a92d 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(meshDualiser, 0);
+    defineTypeNameAndDebug(meshDualiser, 0);
 }
 
 
@@ -123,8 +123,6 @@ void Foam::meshDualiser::dumpPolyTopoChange
 }
 
 
-//- Given cell and point on mesh finds the corresponding dualCell. Most
-//  points become only one cell but the feature points might be split.
 Foam::label Foam::meshDualiser::findDualCell
 (
     const label cellI,
@@ -146,8 +144,6 @@ Foam::label Foam::meshDualiser::findDualCell
 }
 
 
-// Helper function to generate dualpoints on all boundary edges emanating
-// from (boundary & feature) point
 void Foam::meshDualiser::generateDualBoundaryEdges
 (
     const PackedBoolList& isBoundaryEdge,
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
index ace330060d..a21efa64da 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,7 +206,6 @@ void Foam::ensightLagrangianField
 }
 
 
-//- Write generalized field components
 template<class Type>
 void Foam::ensightVolField
 (
diff --git a/applications/utilities/surface/surfaceClean/collapseEdge.C b/applications/utilities/surface/surfaceClean/collapseEdge.C
index c2eb4b0d05..8b752129ef 100644
--- a/applications/utilities/surface/surfaceClean/collapseEdge.C
+++ b/applications/utilities/surface/surfaceClean/collapseEdge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "collapseEdge.H"
 
-//- Sets point neighbours of face to val
 static void markPointNbrs
 (
     const triSurface& surf,
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 525c84817a..0b9a541d94 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -188,7 +188,6 @@ bool Foam::isAdministrator()
 }
 
 
-// use $HOME environment variable or passwd info
 Foam::fileName Foam::home()
 {
     char* env = ::getenv("HOME");
@@ -588,14 +587,12 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 }
 
 
-// Set the file mode
 bool Foam::chMod(const fileName& name, const mode_t m)
 {
     return ::chmod(name.c_str(), m) == 0;
 }
 
 
-// Return the file mode
 mode_t Foam::mode(const fileName& name)
 {
     fileStat fileStatus(name);
@@ -610,7 +607,6 @@ mode_t Foam::mode(const fileName& name)
 }
 
 
-// Return the file type: FILE or DIRECTORY
 Foam::fileName::Type Foam::type(const fileName& name)
 {
     mode_t m = mode(name);
@@ -630,28 +626,24 @@ Foam::fileName::Type Foam::type(const fileName& name)
 }
 
 
-// Does the name exist in the filing system?
 bool Foam::exists(const fileName& name, const bool checkGzip)
 {
     return mode(name) || isFile(name, checkGzip);
 }
 
 
-// Does the directory exist?
 bool Foam::isDir(const fileName& name)
 {
     return S_ISDIR(mode(name));
 }
 
 
-// Does the file exist?
 bool Foam::isFile(const fileName& name, const bool checkGzip)
 {
     return S_ISREG(mode(name)) || (checkGzip && S_ISREG(mode(name + ".gz")));
 }
 
 
-// Return size of file
 off_t Foam::fileSize(const fileName& name)
 {
     fileStat fileStatus(name);
@@ -666,7 +658,6 @@ off_t Foam::fileSize(const fileName& name)
 }
 
 
-// Return time of last file modification
 time_t Foam::lastModified(const fileName& name)
 {
     fileStat fileStatus(name);
@@ -681,7 +672,6 @@ time_t Foam::lastModified(const fileName& name)
 }
 
 
-// Read a directory and return the entries as a string list
 Foam::fileNameList Foam::readDir
 (
     const fileName& directory,
@@ -776,7 +766,6 @@ Foam::fileNameList Foam::readDir
 }
 
 
-// Copy, recursively if necessary, the source to the destination
 bool Foam::cp(const fileName& src, const fileName& dest)
 {
     // Make sure source exists.
@@ -877,7 +866,6 @@ bool Foam::cp(const fileName& src, const fileName& dest)
 }
 
 
-// Create a softlink. dst should not exist. Returns true if successful.
 bool Foam::ln(const fileName& src, const fileName& dst)
 {
     if (POSIX::debug)
@@ -915,7 +903,6 @@ bool Foam::ln(const fileName& src, const fileName& dst)
 }
 
 
-// Rename srcFile dstFile
 bool Foam::mv(const fileName& src, const fileName& dst)
 {
     if (POSIX::debug)
@@ -941,8 +928,6 @@ bool Foam::mv(const fileName& src, const fileName& dst)
 }
 
 
-//- Rename to a corresponding backup file
-//  If the backup file already exists, attempt with "01" .. "99" index
 bool Foam::mvBak(const fileName& src, const std::string& ext)
 {
     if (POSIX::debug)
@@ -980,7 +965,6 @@ bool Foam::mvBak(const fileName& src, const std::string& ext)
 }
 
 
-// Remove a file, returning true if successful otherwise false
 bool Foam::rm(const fileName& file)
 {
     if (POSIX::debug)
@@ -1001,7 +985,6 @@ bool Foam::rm(const fileName& file)
 }
 
 
-// Remove a dirctory and its contents
 bool Foam::rmDir(const fileName& directory)
 {
     if (POSIX::debug)
@@ -1314,31 +1297,31 @@ Foam::fileNameList Foam::dlLoaded()
 
 void Foam::osRandomSeed(const label seed)
 {
-#ifdef USE_RANDOM
+    #ifdef USE_RANDOM
     srandom((unsigned int)seed);
-#else
+    #else
     srand48(seed);
-#endif
+    #endif
 }
 
 
 Foam::label Foam::osRandomInteger()
 {
-#ifdef USE_RANDOM
+    #ifdef USE_RANDOM
     return random();
-#else
+    #else
     return lrand48();
-#endif
+    #endif
 }
 
 
 Foam::scalar Foam::osRandomDouble()
 {
-#ifdef USE_RANDOM
+    #ifdef USE_RANDOM
     return (scalar)random()/INT_MAX;
-#else
+    #else
     return drand48();
-#endif
+    #endif
 }
 
 
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C
index 821e4ff500..4eca98a813 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,8 +55,6 @@ Foam::dynamicTreeDataPoint::shapePoints() const
 }
 
 
-//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface.
-//  Only makes sense for closed surfaces.
 Foam::volumeType Foam::dynamicTreeDataPoint::getVolumeType
 (
     const dynamicIndexedOctree<dynamicTreeDataPoint>& oc,
@@ -129,8 +127,6 @@ void Foam::dynamicTreeDataPoint::findNearest
 }
 
 
-//- Calculates nearest (to line) point in shape.
-//  Returns point and distance (squared)
 void Foam::dynamicTreeDataPoint::findNearest
 (
     const labelUList& indices,
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index c3f86da318..5a239f5642 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -405,14 +405,12 @@ bool Foam::regIOobject::upToDate
 }
 
 
-//- Flag me as up to date
 void Foam::regIOobject::setUpToDate()
 {
     eventNo_ = db().getEvent();
 }
 
 
-// Rename object and re-register with objectRegistry under new name
 void Foam::regIOobject::rename(const word& newName)
 {
     // Check out of objectRegistry
@@ -428,7 +426,6 @@ void Foam::regIOobject::rename(const word& newName)
 }
 
 
-// Assign to IOobject
 void Foam::regIOobject::operator=(const IOobject& io)
 {
     if (isPtr_)
diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C
index a2ad4482dd..2a76260c57 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,16 +35,16 @@ namespace Foam
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
-//- Since dimensionSystems() can be reread we actually store a copy of
-//  the controlDict subDict (v.s. a reference to the subDict for e.g.
-//  dimensionedConstants)
+// Since dimensionSystems() can be reread we actually store a copy of
+// the controlDict subDict (v.s. a reference to the subDict for e.g.
+// dimensionedConstants)
 dictionary* dimensionSystemsPtr_(NULL);
 HashTable<dimensionedScalar>* unitSetPtr_(NULL);
 dimensionSets* writeUnitSetPtr_(NULL);
 
-//- Helper class to
-//  - register re-reader
-//  - deallocate demand-driven data
+// Helper class to
+//   register re-reader
+//   deallocate demand-driven data
 class addDimensionSetsToDebug
 :
     public ::Foam::simpleRegIOobject
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
index 8993cdbdb8..b44cd52352 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
@@ -33,7 +33,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//- Interpolate point field
 template<class FromPatch, class ToPatch>
 template<class Type>
 tmp<Field<Type>>
@@ -102,7 +101,6 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 }
 
 
-//- Interpolate face field
 template<class FromPatch, class ToPatch>
 template<class Type>
 tmp<Field<Type>>
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index 5d0650ef2e..2624d9a696 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -636,7 +636,6 @@ void Foam::mapDistribute::exchangeAddressing
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct null
 Foam::mapDistribute::mapDistribute()
 :
     constructSize_(0),
@@ -644,7 +643,6 @@ Foam::mapDistribute::mapDistribute()
 {}
 
 
-//- Construct from components
 Foam::mapDistribute::mapDistribute
 (
     const label constructSize,
@@ -659,7 +657,6 @@ Foam::mapDistribute::mapDistribute
 {}
 
 
-//- Construct from components
 Foam::mapDistribute::mapDistribute
 (
     const label constructSize,
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
index 8df3c0a211..c33f2a6248 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,6 @@ void Foam::mapDistributePolyMesh::calcPatchSizes()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct from components
 Foam::mapDistributePolyMesh::mapDistributePolyMesh
 (
     const polyMesh& mesh,
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index 849b3ee366..35b13d6cda 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -31,7 +31,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Distribute list.
 template<class T>
 void Foam::mapDistribute::distribute
 (
@@ -381,7 +380,6 @@ void Foam::mapDistribute::distribute
 }
 
 
-// Distribute list.
 template<class T, class CombineOp>
 void Foam::mapDistribute::distribute
 (
@@ -783,7 +781,6 @@ void Foam::mapDistribute::receive(PstreamBuffers& pBufs, List<T>& field) const
 }
 
 
-// In case of no transform: copy elements
 template<class T>
 void Foam::mapDistribute::applyDummyTransforms(List<T>& field) const
 {
@@ -801,7 +798,6 @@ void Foam::mapDistribute::applyDummyTransforms(List<T>& field) const
 }
 
 
-// In case of no transform: copy elements
 template<class T>
 void Foam::mapDistribute::applyDummyInverseTransforms(List<T>& field) const
 {
@@ -818,7 +814,6 @@ void Foam::mapDistribute::applyDummyInverseTransforms(List<T>& field) const
 }
 
 
-// Calculate transformed elements.
 template<class T, class TransformOp>   //, class CombineOp>
 void Foam::mapDistribute::applyTransforms
 (
@@ -849,7 +844,6 @@ void Foam::mapDistribute::applyTransforms
 }
 
 
-// Calculate transformed elements.
 template<class T, class TransformOp>   //, class CombineOp>
 void Foam::mapDistribute::applyInverseTransforms
 (
@@ -880,7 +874,6 @@ void Foam::mapDistribute::applyInverseTransforms
 }
 
 
-//- Distribute data using default commsType.
 template<class T>
 void Foam::mapDistribute::distribute
 (
@@ -899,7 +892,6 @@ void Foam::mapDistribute::distribute
 }
 
 
-//- Distribute data using default commsType.
 template<class T>
 void Foam::mapDistribute::distribute
 (
@@ -948,7 +940,7 @@ void Foam::mapDistribute::distribute
         );
     }
 
-    //- Fill in transformed slots with copies
+    // Fill in transformed slots with copies
     if (dummyTransform)
     {
         applyDummyTransforms(fld);
@@ -956,7 +948,6 @@ void Foam::mapDistribute::distribute
 }
 
 
-//- Reverse distribute data using default commsType.
 template<class T>
 void Foam::mapDistribute::reverseDistribute
 (
@@ -1013,9 +1004,6 @@ void Foam::mapDistribute::reverseDistribute
 }
 
 
-//- Reverse distribute data using default commsType.
-//  Since constructSize might be larger than supplied size supply
-//  a nullValue
 template<class T>
 void Foam::mapDistribute::reverseDistribute
 (
@@ -1079,7 +1067,6 @@ void Foam::mapDistribute::reverseDistribute
 }
 
 
-//- Distribute data using default commsType.
 template<class T, class TransformOp>
 void Foam::mapDistribute::distribute
 (
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 0a793a5155..6af1eb9be2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -1130,7 +1130,6 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
 }
 
 
-// Reset motion by deleting old points
 void Foam::polyMesh::resetMotion() const
 {
     curMotionTimeIndex_ = 0;
@@ -1138,7 +1137,6 @@ void Foam::polyMesh::resetMotion() const
 }
 
 
-// Return parallel info
 const Foam::globalMeshData& Foam::polyMesh::globalData() const
 {
     if (globalMeshDataPtr_.empty())
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
index 302afd7b49..45494b3ce9 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
@@ -269,12 +269,6 @@ bool Foam::polyMesh::checkFaceSkewness
 }
 
 
-// Check 1D/2Dness of edges. Gets passed the non-empty directions and
-// checks all edges in the mesh whether they:
-// - have no component in a non-empty direction or
-// - are only in a singe non-empty direction.
-// Empty direction info is passed in as a vector of labels (synchronised)
-// which are 1 if the direction is non-empty, 0 if it is.
 bool Foam::polyMesh::checkEdgeAlignment
 (
     const pointField& p,
@@ -283,6 +277,13 @@ bool Foam::polyMesh::checkEdgeAlignment
     labelHashSet* setPtr
 ) const
 {
+    // Check 1D/2Dness of edges. Gets passed the non-empty directions and
+    // checks all edges in the mesh whether they:
+    // - have no component in a non-empty direction or
+    // - are only in a singe non-empty direction.
+    // Empty direction info is passed in as a vector of labels (synchronised)
+    // which are 1 if the direction is non-empty, 0 if it is.
+
     if (debug)
     {
         InfoInFunction << "Checking edge alignment" << endl;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index ec1495c267..143dfa79af 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -127,7 +127,6 @@ Foam::labelList Foam::polyMesh::facePatchFaceCells
 }
 
 
-//- Set faces_, calculate cells and patchStarts.
 void Foam::polyMesh::setTopology
 (
     const cellShapeList& cellsAsShapes,
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
index efc2c8adaf..96b06851ce 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,11 +104,6 @@ Foam::label Foam::oldCyclicPolyPatch::findMaxArea
 }
 
 
-// Get geometric zones of patch by looking at normals.
-// Method 1: any edge with sharpish angle is edge between two halves.
-//           (this will handle e.g. wedge geometries).
-//           Also two fully disconnected regions will be handled this way.
-// Method 2: sort faces into two halves based on face normal.
 bool Foam::oldCyclicPolyPatch::getGeometricHalves
 (
     const primitivePatch& pp,
@@ -116,6 +111,12 @@ bool Foam::oldCyclicPolyPatch::getGeometricHalves
     labelList& half1ToPatch
 ) const
 {
+    // Get geometric zones of patch by looking at normals.
+    // Method 1: any edge with sharpish angle is edge between two halves.
+    //           (this will handle e.g. wedge geometries).
+    //           Also two fully disconnected regions will be handled this way.
+    // Method 2: sort faces into two halves based on face normal.
+
     // Calculate normals
     const vectorField& faceNormals = pp.faceNormals();
 
@@ -282,9 +283,6 @@ bool Foam::oldCyclicPolyPatch::getGeometricHalves
 }
 
 
-// Given a split of faces into left and right half calculate the centres
-// and anchor points. Transform the left points so they align with the
-// right ones.
 void Foam::oldCyclicPolyPatch::getCentresAndAnchors
 (
     const primitivePatch& pp,
@@ -430,7 +428,6 @@ void Foam::oldCyclicPolyPatch::getCentresAndAnchors
 }
 
 
-// Calculates faceMap and rotation. Returns true if all ok.
 bool Foam::oldCyclicPolyPatch::matchAnchors
 (
     const bool report,
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 3664ce976f..8ab5848a55 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -611,10 +611,6 @@ void Foam::processorPolyPatch::initOrder
 }
 
 
-// Returns rotation.
-// + -1 : no match
-// +  0 : match
-// + >0 : match if rotated clockwise by this amount
 Foam::label Foam::processorPolyPatch::matchFace
 (
     const face& a,
@@ -721,10 +717,6 @@ Foam::label Foam::processorPolyPatch::matchFace
 }
 
 
-// Return new ordering. Ordering is -faceMap: for every face index
-// the new face -rotation:for every new face the clockwise shift
-// of the original face. Return false if nothing changes (faceMap
-// is identity, rotation is 0)
 bool Foam::processorPolyPatch::order
 (
     PstreamBuffers& pBufs,
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index 0876c72b5a..99dc029602 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
@@ -342,6 +342,10 @@ public:
         //  refer to *this (except for name() and type() etc.)
         virtual void initOrder(PstreamBuffers&, const primitivePatch&) const;
 
+        //- Returns rotation.
+        //    -1 : no match
+        //     0 : match
+        //    >0 : match if rotated clockwise by this amount
         static label matchFace
         (
             const face& localFace,
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
index ba62b7bb25..02dcc6294a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
@@ -321,10 +321,6 @@ void Foam::processorCyclicPolyPatch::initOrder
 }
 
 
-// Return new ordering. Ordering is -faceMap: for every face index
-// the new face -rotation:for every new face the clockwise shift
-// of the original face. Return false if nothing changes (faceMap
-// is identity, rotation is 0)
 bool Foam::processorCyclicPolyPatch::order
 (
     PstreamBuffers& pBufs,
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index fcfb9d6c64..ad8e33d401 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -293,7 +293,6 @@ const Foam::vectorField::subField Foam::polyPatch::faceAreas() const
 }
 
 
-// Return the patch face neighbour cell centres
 Foam::tmp<Foam::vectorField> Foam::polyPatch::faceCellCentres() const
 {
     tmp<vectorField> tcc(new vectorField(size()));
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index a1e2b2dc59..4f2de619e9 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Combine val with existing value at index
 template<class T, class CombineOp>
 void Foam::syncTools::combine
 (
@@ -58,7 +57,6 @@ void Foam::syncTools::combine
 }
 
 
-// Combine val with existing value at (implicit index) e.
 template<class T, class CombineOp>
 void Foam::syncTools::combine
 (
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index efb2dc3ab7..181ddec3cb 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -132,7 +132,6 @@ bool Foam::ZoneMesh<ZoneType, MeshType>::read()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Read constructor given IOobject and a MeshType reference
 template<class ZoneType, class MeshType>
 Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh
 (
@@ -149,7 +148,6 @@ Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh
 }
 
 
-// Construct given size. Zones will be set later
 template<class ZoneType, class MeshType>
 Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh
 (
@@ -205,7 +203,6 @@ Foam::ZoneMesh<ZoneType, MeshType>::~ZoneMesh()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Map of zones for quick zone lookup
 template<class ZoneType, class MeshType>
 const Foam::Map<Foam::label>&
 Foam::ZoneMesh<ZoneType, MeshType>::zoneMap() const
@@ -219,8 +216,6 @@ Foam::ZoneMesh<ZoneType, MeshType>::zoneMap() const
 }
 
 
-// Given a global object index, return the zone it is in.
-// If object does not belong to any zones, return -1
 template<class ZoneType, class MeshType>
 Foam::label Foam::ZoneMesh<ZoneType, MeshType>::whichZone
 (
@@ -241,7 +236,6 @@ Foam::label Foam::ZoneMesh<ZoneType, MeshType>::whichZone
 }
 
 
-// Return a list of zone names
 template<class ZoneType, class MeshType>
 Foam::wordList Foam::ZoneMesh<ZoneType, MeshType>::types() const
 {
@@ -258,7 +252,6 @@ Foam::wordList Foam::ZoneMesh<ZoneType, MeshType>::types() const
 }
 
 
-// Return a list of zone names
 template<class ZoneType, class MeshType>
 Foam::wordList Foam::ZoneMesh<ZoneType, MeshType>::names() const
 {
@@ -412,7 +405,6 @@ void Foam::ZoneMesh<ZoneType, MeshType>::clear()
 }
 
 
-// Check zone definition
 template<class ZoneType, class MeshType>
 bool Foam::ZoneMesh<ZoneType, MeshType>::checkDefinition
 (
@@ -509,7 +501,6 @@ bool Foam::ZoneMesh<ZoneType, MeshType>::checkParallelSync
 }
 
 
-// Correct zone mesh after moving points
 template<class ZoneType, class MeshType>
 void Foam::ZoneMesh<ZoneType, MeshType>::movePoints(const pointField& p)
 {
@@ -522,7 +513,6 @@ void Foam::ZoneMesh<ZoneType, MeshType>::movePoints(const pointField& p)
 }
 
 
-// writeData member function required by regIOobject
 template<class ZoneType, class MeshType>
 bool Foam::ZoneMesh<ZoneType, MeshType>::writeData(Ostream& os) const
 {
@@ -530,6 +520,7 @@ bool Foam::ZoneMesh<ZoneType, MeshType>::writeData(Ostream& os) const
     return os.good();
 }
 
+
 // * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
 
 template<class ZoneType, class MeshType>
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
index 6533c3ca17..17ea3e17c2 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,8 +32,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Finds area, starting at faceI, delimited by borderEdge.
-// Marks all visited faces (from face-edge-face walk) with currentZone.
 template
 <
     class BoolListType,
@@ -42,9 +40,7 @@ template
     class PointField,
     class PointType
 >
-
-void
-Foam::PatchTools::markZone
+void Foam::PatchTools::markZone
 (
     const PrimitivePatch<Face, FaceList, PointField, PointType>& p,
     const BoolListType& borderEdge,
@@ -112,8 +108,6 @@ Foam::PatchTools::markZone
 }
 
 
-// Finds areas delimited by borderEdge (or 'real' edges).
-// Fills faceZone accordingly
 template
 <
     class BoolListType,
@@ -154,9 +148,6 @@ Foam::PatchTools::markZones
 }
 
 
-
-// Finds areas delimited by borderEdge (or 'real' edges).
-// Fills faceZone accordingly
 template
 <
     class BoolListType,
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
index a55421d5e8..fe85106c2b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
@@ -73,8 +73,6 @@ Foam::primitiveMesh::primitiveMesh()
 {}
 
 
-// Construct from components
-// WARNING: ASSUMES CORRECT ORDERING OF DATA.
 Foam::primitiveMesh::primitiveMesh
 (
     const label nPoints,
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index 78702ecaf5..143b38419d 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -360,6 +360,10 @@ protected:
             ) const;
 
             //- Check face angles
+            //  Allows a slight non-convexity.  E.g. maxDeg = 10 allows for
+            //  angles < 190 (or 10 degrees concavity) (if truly concave and
+            //  points not visible from face centre the face-pyramid check in
+            //  checkMesh will fail)
             bool checkFaceAngles
             (
                 const pointField& points,
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index 9f26dd28a8..a25bf4da61 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -664,10 +664,6 @@ bool Foam::primitiveMesh::checkFaceSkewness
 }
 
 
-// Check convexity of angles in a face. Allow a slight non-convexity.
-// E.g. maxDeg = 10 allows for angles < 190 (or 10 degrees concavity)
-// (if truly concave and points not visible from face centre the face-pyramid
-//  check in checkMesh will fail)
 bool Foam::primitiveMesh::checkFaceAngles
 (
     const pointField& points,
@@ -966,8 +962,6 @@ bool Foam::primitiveMesh::checkConcaveCells
 }
 
 
-// Topological tests
-
 bool Foam::primitiveMesh::checkUpperTriangular
 (
     const bool report,
@@ -1229,7 +1223,6 @@ bool Foam::primitiveMesh::checkCellsZipUp
 }
 
 
-// Vertices of face within point range and unique.
 bool Foam::primitiveMesh::checkFaceVertices
 (
     const bool report,
@@ -1375,7 +1368,6 @@ bool Foam::primitiveMesh::checkPoints
 }
 
 
-// Check if all points on face are shared between faces.
 bool Foam::primitiveMesh::checkDuplicateFaces
 (
     const label faceI,
@@ -1417,7 +1409,6 @@ bool Foam::primitiveMesh::checkDuplicateFaces
 }
 
 
-// Check that shared points are in consecutive order.
 bool Foam::primitiveMesh::checkCommonOrder
 (
     const label faceI,
@@ -1579,8 +1570,6 @@ bool Foam::primitiveMesh::checkCommonOrder
 }
 
 
-// Checks common vertices between faces. If more than 2 they should be
-// consecutive on both faces.
 bool Foam::primitiveMesh::checkFaceFaces
 (
     const bool report,
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
index cb51679385..4c0a708317 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
@@ -31,7 +31,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Returns edgeI between two points.
 Foam::label Foam::primitiveMesh::getEdge
 (
     List<DynamicList<label>>& pe,
@@ -670,6 +669,4 @@ const Foam::labelList& Foam::primitiveMesh::cellEdges(const label cellI) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
index fba0466599..563a77a75e 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,14 +29,12 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(patchZones, 0);
+    defineTypeNameAndDebug(patchZones, 0);
 }
 
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-// Gets labels of changed faces and propagates them to the edges. Returns
-// labels of edges changed.
 Foam::labelList Foam::patchZones::faceToEdge
 (
     const labelList& changedFaces,
@@ -71,7 +69,6 @@ Foam::labelList Foam::patchZones::faceToEdge
 }
 
 
-// Reverse of faceToEdge: gets edges and returns faces
 Foam::labelList Foam::patchZones::edgeToFace(const labelList& changedEdges)
 {
     labelList changedFaces(pp_.size(), -1);
@@ -102,7 +99,6 @@ Foam::labelList Foam::patchZones::edgeToFace(const labelList& changedEdges)
 }
 
 
-// Finds area, starting at faceI, delimited by borderEdge
 void Foam::patchZones::markZone(label faceI)
 {
     // List of faces whose faceZone has been set.
@@ -148,7 +144,6 @@ void Foam::patchZones::markZone(label faceI)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::patchZones::patchZones
 (
     const primitivePatch& pp,
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
index 5b721d7326..b35f016c2d 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,13 +30,12 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(walkPatch, 0);
+    defineTypeNameAndDebug(walkPatch, 0);
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Get other face using v0, v1 (in localFaces numbering). Or -1.
 Foam::label Foam::walkPatch::getNeighbour
 (
     const label faceI,
@@ -124,8 +123,6 @@ Foam::label Foam::walkPatch::getNeighbour
 }
 
 
-// Gets labels of changed faces and enterVertices on faces.
-// Returns labels of faces changed and enterVertices on them.
 void Foam::walkPatch::faceToFace
 (
     const labelList& changedFaces,
@@ -186,7 +183,6 @@ void Foam::walkPatch::faceToFace
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::walkPatch::walkPatch
 (
     const primitivePatch& pp,
diff --git a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
index 7f222fb8a8..aa101235d5 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
+++ b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Calculate base point and unit normal vector from plane equation
 void Foam::plane::calcPntAndVec(const scalarList& C)
 {
     if (mag(C[0]) > VSMALL)
@@ -110,7 +109,6 @@ void Foam::plane::calcPntAndVec
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from normal vector through the origin
 Foam::plane::plane(const vector& normalVector)
 :
     unitVector_(normalVector),
@@ -131,7 +129,6 @@ Foam::plane::plane(const vector& normalVector)
 }
 
 
-// Construct from point and normal vector
 Foam::plane::plane(const point& basePoint, const vector& normalVector)
 :
     unitVector_(normalVector),
@@ -152,14 +149,12 @@ Foam::plane::plane(const point& basePoint, const vector& normalVector)
 }
 
 
-// Construct from plane equation
 Foam::plane::plane(const scalarList& C)
 {
     calcPntAndVec(C);
 }
 
 
-// Construct from three points
 Foam::plane::plane
 (
     const point& a,
@@ -171,7 +166,6 @@ Foam::plane::plane
 }
 
 
-// Construct from dictionary
 Foam::plane::plane(const dictionary& dict)
 :
     unitVector_(vector::zero),
@@ -221,7 +215,6 @@ Foam::plane::plane(const dictionary& dict)
 }
 
 
-// Construct from Istream. Assumes point and normal vector.
 Foam::plane::plane(Istream& is)
 :
     unitVector_(is),
@@ -244,21 +237,18 @@ Foam::plane::plane(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Return plane normal vector
 const Foam::vector& Foam::plane::normal() const
 {
     return unitVector_;
 }
 
 
-// Return plane base point
 const Foam::point& Foam::plane::refPoint() const
 {
     return basePoint_;
 }
 
 
-// Return coefficients for plane equation: ax + by + cz + d = 0
 Foam::FixedList<Foam::scalar, 4> Foam::plane::planeCoeffs() const
 {
     FixedList<scalar, 4> C(4);
@@ -306,21 +296,18 @@ Foam::FixedList<Foam::scalar, 4> Foam::plane::planeCoeffs() const
 }
 
 
-// Return nearest point in the plane for the given point
 Foam::point Foam::plane::nearestPoint(const point& p) const
 {
     return p - unitVector_*((p - basePoint_) & unitVector_);
 }
 
 
-// Return distance from the given point to the plane
 Foam::scalar Foam::plane::distance(const point& p) const
 {
     return mag((p - basePoint_) & unitVector_);
 }
 
 
-// Cutting point for plane and line defined by origin and direction
 Foam::scalar Foam::plane::normalIntersect
 (
     const point& pnt0,
@@ -333,7 +320,6 @@ Foam::scalar Foam::plane::normalIntersect
 }
 
 
-// Cutting line of two planes
 Foam::plane::ray Foam::plane::planeIntersect(const plane& plane2) const
 {
     // Mathworld plane-plane intersection. Assume there is a point on the
@@ -401,7 +387,6 @@ Foam::plane::ray Foam::plane::planeIntersect(const plane& plane2) const
 }
 
 
-// Cutting point of three planes
 Foam::point Foam::plane::planePlaneIntersect
 (
     const plane& plane2,
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C
index 9180eb0986..163476a6b3 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,18 +119,19 @@ void Foam::tetrahedron<Point, PointRef>::tetOverlap
 }
 
 
-// (Probably very inefficient) minimum containment sphere calculation.
-// From http://www.imr.sandia.gov/papers/imr11/shewchuk2.pdf:
-// Sphere ctr is smallest one of
-// - tet circumcentre
-// - triangle circumcentre
-// - edge mids
 template<class Point, class PointRef>
 Foam::pointHit Foam::tetrahedron<Point, PointRef>::containmentSphere
 (
     const scalar tol
 ) const
 {
+    // (Probably very inefficient) minimum containment sphere calculation.
+    // From http://www.imr.sandia.gov/papers/imr11/shewchuk2.pdf:
+    // Sphere ctr is smallest one of
+    // - tet circumcentre
+    // - triangle circumcentre
+    // - edge mids
+
     const scalar fac = 1 + tol;
 
     // Halve order of tolerance for comparisons of sqr.
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
index 766aa50727..d7bc032e4c 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
@@ -180,7 +180,6 @@ Foam::treeBoundBox Foam::treeBoundBox::subBbox(const direction octant) const
 }
 
 
-// Octant to bounding box using permutation only.
 Foam::treeBoundBox Foam::treeBoundBox::subBbox
 (
     const point& mid,
@@ -230,24 +229,6 @@ Foam::treeBoundBox Foam::treeBoundBox::subBbox
 }
 
 
-// line intersection. Returns true if line (start to end) inside
-// bb or intersects bb. Sets pt to intersection.
-//
-// Sutherlands algorithm:
-//   loop
-//     - start = intersection of line with one of the planes bounding
-//       the bounding box
-//     - stop if start inside bb (return true)
-//     - stop if start and end in same 'half' (e.g. both above bb)
-//       (return false)
-//
-// Uses posBits to efficiently determine 'half' in which start and end
-// point are.
-//
-// Note:
-//   - sets coordinate to exact position: e.g. pt.x() = min().x()
-//     since plane intersect routine might have truncation error.
-//     This makes sure that posBits tests 'inside'
 bool Foam::treeBoundBox::intersects
 (
     const point& overallStart,
@@ -258,6 +239,22 @@ bool Foam::treeBoundBox::intersects
     direction& ptOnFaces
 ) const
 {
+    // Sutherlands algorithm:
+    //   loop
+    //     - start = intersection of line with one of the planes bounding
+    //       the bounding box
+    //     - stop if start inside bb (return true)
+    //     - stop if start and end in same 'half' (e.g. both above bb)
+    //       (return false)
+    //
+    // Uses posBits to efficiently determine 'half' in which start and end
+    // point are.
+    //
+    // Note:
+    //   - sets coordinate to exact position: e.g. pt.x() = min().x()
+    //     since plane intersect routine might have truncation error.
+    //     This makes sure that posBits tests 'inside'
+
     const direction endBits = posBits(end);
     pt = start;
 
@@ -393,9 +390,8 @@ bool Foam::treeBoundBox::intersects
 
 bool Foam::treeBoundBox::contains(const vector& dir, const point& pt) const
 {
-    //
     // Compare all components against min and max of bb
-    //
+
     for (direction cmpt=0; cmpt<3; cmpt++)
     {
         if (pt[cmpt] < min()[cmpt])
@@ -430,7 +426,6 @@ bool Foam::treeBoundBox::contains(const vector& dir, const point& pt) const
 }
 
 
-// Code position of pt on bounding box faces
 Foam::direction Foam::treeBoundBox::faceBits(const point& pt) const
 {
     direction faceBits = 0;
@@ -464,7 +459,6 @@ Foam::direction Foam::treeBoundBox::faceBits(const point& pt) const
 }
 
 
-// Code position of point relative to box
 Foam::direction Foam::treeBoundBox::posBits(const point& pt) const
 {
     direction posBits = 0;
@@ -499,8 +493,6 @@ Foam::direction Foam::treeBoundBox::posBits(const point& pt) const
 }
 
 
-// nearest and furthest corner coordinate.
-// !names of treeBoundBox::min() and treeBoundBox::max() are confusing!
 void Foam::treeBoundBox::calcExtremities
 (
     const point& pt,
@@ -558,9 +550,6 @@ Foam::scalar Foam::treeBoundBox::maxDist(const point& pt) const
 }
 
 
-// Distance comparator
-// Compare all vertices of bounding box against all of other bounding
-// box to see if all vertices of one are nearer
 Foam::label Foam::treeBoundBox::distanceCmp
 (
     const point& pt,
diff --git a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
index 4ac7a9dcb5..96ff1a3194 100644
--- a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
+++ b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,53 +25,48 @@ License
 
 #include "tensor2D.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const tensor2D::typeName = "tensor2D";
+const char* const Foam::tensor2D::typeName = "tensor2D";
 
 template<>
-const char* tensor2D::componentNames[] =
+const char* Foam::tensor2D::componentNames[] =
 {
     "xx", "xy",
     "yx", "yy"
 };
 
 template<>
-const tensor2D tensor2D::zero
+const Foam::tensor2D Foam::tensor2D::zero
 (
     0, 0,
     0, 0
 );
 
 template<>
-const tensor2D tensor2D::one
+const Foam::tensor2D Foam::tensor2D::one
 (
     1, 1,
     1, 1
 );
 
 template<>
-const tensor2D tensor2D::max
+const Foam::tensor2D Foam::tensor2D::max
 (
     VGREAT, VGREAT,
     VGREAT, VGREAT
 );
 
 template<>
-const tensor2D tensor2D::min
+const Foam::tensor2D Foam::tensor2D::min
 (
     -VGREAT, -VGREAT,
     -VGREAT, -VGREAT
 );
 
 template<>
-const tensor2D tensor2D::I
+const Foam::tensor2D Foam::tensor2D::I
 (
     1, 0,
     0, 1
@@ -80,8 +75,7 @@ const tensor2D tensor2D::I
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Return eigenvalues in ascending order of absolute values
-vector2D eigenValues(const tensor2D& t)
+Foam::vector2D Foam::eigenValues(const tensor2D& t)
 {
     scalar i = 0;
     scalar ii = 0;
@@ -132,7 +126,7 @@ vector2D eigenValues(const tensor2D& t)
 }
 
 
-vector2D eigenVector(const tensor2D& t, const scalar lambda)
+Foam::vector2D Foam::eigenVector(const tensor2D& t, const scalar lambda)
 {
     if (lambda < SMALL)
     {
@@ -161,7 +155,7 @@ vector2D eigenVector(const tensor2D& t, const scalar lambda)
 }
 
 
-tensor2D eigenVectors(const tensor2D& t)
+Foam::tensor2D Foam::eigenVectors(const tensor2D& t)
 {
     vector2D evals(eigenValues(t));
 
@@ -175,8 +169,4 @@ tensor2D eigenVectors(const tensor2D& t)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
index 6eec73b476..49c855fcde 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from Istream
 template<class Form, class Cmpt, int nCmpt>
 Foam::VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
 (
@@ -53,7 +52,6 @@ Foam::VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
 }
 
 
-// Return a string representation
 template<class Form, class Cmpt, int nCmpt>
 Foam::word
 Foam::name
diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.C b/src/OpenFOAM/primitives/bools/Switch/Switch.C
index 1ff04b5316..f5be21f941 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.C
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,8 +29,6 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-// NB: values chosen such that bitwise '&' 0x1 yields the bool value
-// INVALID is also evaluates to false, but don't rely on that
 const char* Foam::Switch::names[Foam::Switch::INVALID+1] =
 {
     "false", "true",
@@ -38,7 +36,7 @@ const char* Foam::Switch::names[Foam::Switch::INVALID+1] =
     "no",    "yes",
     "n",     "y",
     "f",     "t",
-    "none",  "true",  // is there a reasonable counterpart to "none"?
+    "none",  "true",  // Is there a reasonable counterpart to "none"?
     "invalid"
 };
 
diff --git a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
index b9f16b6b35..f0c51aa45a 100644
--- a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
+++ b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
@@ -187,7 +187,7 @@ Description
 // acceptable.  Do NOT use for cryptographic purposes.
 // ----------------------------------------------------------------------------
 
-//- Specialized little-endian code
+// Specialized little-endian code
 #if !defined (__BYTE_ORDER) || (__BYTE_ORDER == __LITTLE_ENDIAN)
 static unsigned jenkins_hashlittle
 (
diff --git a/src/OpenFOAM/primitives/strings/string/string.C b/src/OpenFOAM/primitives/strings/string/string.C
index 9e17488d1e..7645a4d668 100644
--- a/src/OpenFOAM/primitives/strings/string/string.C
+++ b/src/OpenFOAM/primitives/strings/string/string.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,6 @@ const Foam::string Foam::string::null;
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Count and return the number of a given character in the string
 Foam::string::size_type Foam::string::count(const char c) const
 {
     size_type cCount = 0;
@@ -53,7 +52,6 @@ Foam::string::size_type Foam::string::count(const char c) const
 }
 
 
-// Replace first occurence of sub-string oldStr with newStr
 Foam::string& Foam::string::replace
 (
     const string& oldStr,
@@ -72,7 +70,6 @@ Foam::string& Foam::string::replace
 }
 
 
-// Replace all occurences of sub-string oldStr with newStr
 Foam::string& Foam::string::replaceAll
 (
     const string& oldStr,
@@ -102,7 +99,6 @@ Foam::string& Foam::string::expand(const bool allowEmpty)
 }
 
 
-// Remove repeated characters returning true if string changed
 bool Foam::string::removeRepeated(const char character)
 {
     bool changed = false;
@@ -141,7 +137,6 @@ bool Foam::string::removeRepeated(const char character)
 }
 
 
-// Return string with repeated characters removed
 Foam::string Foam::string::removeRepeated(const char character) const
 {
     string str(*this);
@@ -150,7 +145,6 @@ Foam::string Foam::string::removeRepeated(const char character) const
 }
 
 
-// Remove trailing character returning true if string changed
 bool Foam::string::removeTrailing(const char character)
 {
     bool changed = false;
@@ -166,7 +160,6 @@ bool Foam::string::removeTrailing(const char character)
 }
 
 
-// Return string with trailing character removed
 Foam::string Foam::string::removeTrailing(const char character) const
 {
     string str(*this);
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C
index 915173a142..887b5ac028 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,8 +30,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-//- Calculate map from new patch faces to old patch faces. -1 where
-//  could not map.
 Foam::labelList Foam::fvMeshAdder::calcPatchMap
 (
     const label oldStart,
@@ -61,7 +59,6 @@ Foam::labelList Foam::fvMeshAdder::calcPatchMap
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Inplace add mesh1 to mesh0
 Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::fvMeshAdder::add
 (
     fvMesh& mesh0,
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index 449f1f24c4..4aa9b2f99d 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -39,7 +39,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(meshCutAndRemove, 0);
+    defineTypeNameAndDebug(meshCutAndRemove, 0);
 }
 
 
@@ -89,7 +89,6 @@ bool Foam::meshCutAndRemove::isIn
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Returns the cell in cellLabels that is cut. Or -1.
 Foam::label Foam::meshCutAndRemove::findCutCell
 (
     const cellCuts& cuts,
@@ -109,10 +108,6 @@ Foam::label Foam::meshCutAndRemove::findCutCell
 }
 
 
-//- Returns first pointI in pointLabels that uses an internal
-//  face. Used to find point to inflate cell/face from (has to be
-//  connected to internal face). Returns -1 (so inflate from nothing) if
-//  none found.
 Foam::label Foam::meshCutAndRemove::findInternalFacePoint
 (
     const labelList& pointLabels
@@ -145,8 +140,6 @@ Foam::label Foam::meshCutAndRemove::findInternalFacePoint
 }
 
 
-// Find point on face that is part of original mesh and that is point connected
-// to the patch
 Foam::label Foam::meshCutAndRemove::findPatchFacePoint
 (
     const face& f,
@@ -177,8 +170,6 @@ Foam::label Foam::meshCutAndRemove::findPatchFacePoint
 }
 
 
-// Get new owner and neighbour of face. Checks anchor points to see if
-// cells have been removed.
 void Foam::meshCutAndRemove::faceCells
 (
     const cellCuts& cuts,
@@ -244,7 +235,6 @@ void Foam::meshCutAndRemove::getZoneInfo
 }
 
 
-// Adds a face from point.
 void Foam::meshCutAndRemove::addFace
 (
     polyTopoChange& meshMod,
@@ -407,7 +397,6 @@ void Foam::meshCutAndRemove::modFace
 }
 
 
-// Copies face starting from startFp up to and including endFp.
 void Foam::meshCutAndRemove::copyFace
 (
     const face& f,
@@ -474,8 +463,6 @@ void Foam::meshCutAndRemove::splitFace
 }
 
 
-// Adds additional vertices (from edge cutting) to face. Used for faces which
-// are not split but still might use edge that has been cut.
 Foam::face Foam::meshCutAndRemove::addEdgeCutsToFace(const label faceI) const
 {
     const face& f = mesh().faces()[faceI];
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
index f7a9174d8e..46250fb6b0 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
@@ -133,7 +133,6 @@ void Foam::motionSmootherAlgo::checkConstraints
 }
 
 
-// Average of connected points.
 template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::motionSmootherAlgo::avg
@@ -232,7 +231,6 @@ Foam::motionSmootherAlgo::avg
 }
 
 
-// smooth field (point-jacobi)
 template<class Type>
 void Foam::motionSmootherAlgo::smooth
 (
@@ -257,7 +255,6 @@ void Foam::motionSmootherAlgo::smooth
 }
 
 
-//- Test synchronisation of generic field (not positions!) on points
 template<class Type, class CombineOp>
 void Foam::motionSmootherAlgo::testSyncField
 (
diff --git a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
index 017fc1ec13..2bd277acac 100644
--- a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
+++ b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,11 +33,7 @@ License
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(polyMeshGeometry, 0);
-
+    defineTypeNameAndDebug(polyMeshGeometry, 0);
 }
 
 
@@ -349,7 +345,6 @@ Foam::polyMeshGeometry::polyMeshGeometry(const polyMesh& mesh)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//- Take over properties from mesh
 void Foam::polyMeshGeometry::correct()
 {
     faceAreas_ = mesh_.faceAreas();
@@ -359,7 +354,6 @@ void Foam::polyMeshGeometry::correct()
 }
 
 
-//- Recalculate on selected faces
 void Foam::polyMeshGeometry::correct
 (
     const pointField& p,
diff --git a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
index eb4a2eb36d..6805daf959 100644
--- a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,6 @@ Foam::attachPolyTopoChanger::attachPolyTopoChanger
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//- Attach mesh
 void Foam::attachPolyTopoChanger::attach(const bool removeEmptyPatches)
 {
     if (debug)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
index ff47fa4224..66288cc0ce 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
@@ -34,9 +34,7 @@ License
 
 namespace Foam
 {
-
-defineTypeNameAndDebug(refinementHistory, 0);
-
+    defineTypeNameAndDebug(refinementHistory, 0);
 }
 
 
@@ -108,7 +106,6 @@ void Foam::refinementHistory::writeDebug
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct null
 Foam::refinementHistory::splitCell8::splitCell8()
 :
     parent_(-1),
@@ -116,7 +113,6 @@ Foam::refinementHistory::splitCell8::splitCell8()
 {}
 
 
-//- Construct as child element of parent
 Foam::refinementHistory::splitCell8::splitCell8(const label parent)
 :
     parent_(parent),
@@ -124,14 +120,12 @@ Foam::refinementHistory::splitCell8::splitCell8(const label parent)
 {}
 
 
-//- Construct from Istream
 Foam::refinementHistory::splitCell8::splitCell8(Istream& is)
 {
     is >> *this;
 }
 
 
-//- Construct as (deep) copy.
 Foam::refinementHistory::splitCell8::splitCell8(const splitCell8& sc)
 :
     parent_(sc.parent_),
@@ -362,7 +356,6 @@ Foam::refinementHistory::refinementHistory(const IOobject& io)
 }
 
 
-//- Read or construct
 Foam::refinementHistory::refinementHistory
 (
     const IOobject& io,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
index 425a0afffe..bce0dade15 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
@@ -42,8 +42,8 @@ namespace Foam
 
 defineTypeNameAndDebug(removePoints, 0);
 
-//- Combine-reduce operator to combine data on faces. Takes care
-//  of reverse orientation on coupled face.
+// Combine-reduce operator to combine data on faces. Takes care
+// of reverse orientation on coupled face.
 template<class T, template<class> class CombineOp>
 class faceEqOp
 {
@@ -71,31 +71,11 @@ public:
     }
 };
 
-
-//// Dummy transform for List. Used in synchronisation.
-//template<class T>
-//class dummyTransformList
-//{
-//public:
-//    void operator()(const coupledPolyPatch&, Field<List<T>>&) const
-//    {}
-//};
-//// Dummy template specialisation. Used in synchronisation.
-//template<>
-//class pTraits<boolList>
-//{
-//public:
-//
-//    //- Component type
-//    typedef label cmptType;
-//};
-
-
 }
 
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Change the vertices of the face whilst keeping everything else the same.
 void Foam::removePoints::modifyFace
 (
     const label faceI,
@@ -148,7 +128,6 @@ void Foam::removePoints::modifyFace
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from mesh
 Foam::removePoints::removePoints
 (
     const polyMesh& mesh,
diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
index 3a797dbb9a..f34c29745f 100644
--- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
+++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,9 +29,7 @@ License
 
 namespace Foam
 {
-
-defineTypeNameAndDebug(featureEdgeMesh, 0);
-
+    defineTypeNameAndDebug(featureEdgeMesh, 0);
 }
 
 
@@ -64,7 +62,6 @@ Foam::featureEdgeMesh::featureEdgeMesh(const IOobject& io)
 }
 
 
-//- Construct from components
 Foam::featureEdgeMesh::featureEdgeMesh
 (
     const IOobject& io,
diff --git a/src/engine/engineTime/engineTime.C b/src/engine/engineTime/engineTime.C
index 0933218bd7..a70f6bba77 100644
--- a/src/engine/engineTime/engineTime.C
+++ b/src/engine/engineTime/engineTime.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,6 @@ void Foam::engineTime::timeAdjustment()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct from objectRegistry arguments
 Foam::engineTime::engineTime
 (
     const word& name,
diff --git a/src/fileFormats/coordSet/coordSet.C b/src/fileFormats/coordSet/coordSet.C
index c65ae246b1..5d7dd92b79 100644
--- a/src/fileFormats/coordSet/coordSet.C
+++ b/src/fileFormats/coordSet/coordSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,6 @@ const Foam::NamedEnum<Foam::coordSet::coordFormat, 5>
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct from components
 Foam::coordSet::coordSet
 (
     const word& name,
@@ -65,7 +64,6 @@ Foam::coordSet::coordSet
 {}
 
 
-//- Construct from components
 Foam::coordSet::coordSet
 (
     const word& name,
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index a6ccd8ab03..1b26f9a55d 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -864,7 +864,6 @@ bool Foam::fvMesh::writeObjects
 }
 
 
-//- Write mesh using IO settings from the time
 bool Foam::fvMesh::write() const
 {
     bool ok = true;
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index 91ce9cce75..f6b5508eb1 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -2390,7 +2390,6 @@ Foam::label Foam::autoLayerDriver::checkAndUnmark
 }
 
 
-//- Count global number of extruded faces
 Foam::label Foam::autoLayerDriver::countExtrusion
 (
     const indirectPrimitivePatch& pp,
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index b84da4a752..1847f050ea 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -1743,7 +1743,6 @@ Foam::labelList Foam::meshRefinement::intersectedPoints() const
 }
 
 
-//- Create patch from set of patches
 Foam::autoPtr<Foam::indirectPrimitivePatch> Foam::meshRefinement::makePatch
 (
     const polyMesh& mesh,
@@ -2757,7 +2756,6 @@ const
 }
 
 
-//- Return either time().constant() or oldInstance
 Foam::word Foam::meshRefinement::timeName() const
 {
     if (overwrite_ && mesh_.time().timeIndex() == 0)
diff --git a/src/meshTools/indexedOctree/treeDataEdge.C b/src/meshTools/indexedOctree/treeDataEdge.C
index dc84c4d7ea..7649aef26c 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.C
+++ b/src/meshTools/indexedOctree/treeDataEdge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(treeDataEdge, 0);
+    defineTypeNameAndDebug(treeDataEdge, 0);
 }
 
 
@@ -128,8 +128,6 @@ Foam::pointField Foam::treeDataEdge::shapePoints() const
 }
 
 
-//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface.
-//  Only makes sense for closed surfaces.
 Foam::volumeType Foam::treeDataEdge::getVolumeType
 (
     const indexedOctree<treeDataEdge>& oc,
@@ -140,7 +138,6 @@ Foam::volumeType Foam::treeDataEdge::getVolumeType
 }
 
 
-// Check if any point on shape is inside cubeBb.
 bool Foam::treeDataEdge::overlaps
 (
     const label index,
@@ -158,7 +155,6 @@ bool Foam::treeDataEdge::overlaps
 }
 
 
-// Check if any point on shape is inside sphere.
 bool Foam::treeDataEdge::overlaps
 (
     const label index,
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index e80b563586..6a9c188988 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,9 +31,9 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(treeDataFace, 0);
+    defineTypeNameAndDebug(treeDataFace, 0);
 
-scalar treeDataFace::tolSqr = sqr(1e-6);
+    scalar treeDataFace::tolSqr = sqr(1e-6);
 }
 
 
@@ -178,8 +178,6 @@ Foam::pointField Foam::treeDataFace::shapePoints() const
 }
 
 
-//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface.
-//  Only makes sense for closed surfaces.
 Foam::volumeType Foam::treeDataFace::getVolumeType
 (
     const indexedOctree<treeDataFace>& oc,
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index 999ad1856d..e4c6beda2a 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,8 +88,6 @@ Foam::pointField Foam::treeDataPoint::shapePoints() const
 }
 
 
-//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface.
-//  Only makes sense for closed surfaces.
 Foam::volumeType Foam::treeDataPoint::getVolumeType
 (
     const indexedOctree<treeDataPoint>& oc,
@@ -100,7 +98,6 @@ Foam::volumeType Foam::treeDataPoint::getVolumeType
 }
 
 
-// Check if any point on shape is inside cubeBb.
 bool Foam::treeDataPoint::overlaps
 (
     const label index,
@@ -112,7 +109,6 @@ bool Foam::treeDataPoint::overlaps
 }
 
 
-// Check if any point on shape is inside sphere.
 bool Foam::treeDataPoint::overlaps
 (
     const label index,
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index 40d0c4f17e..2beba5e37e 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -146,8 +146,6 @@ Foam::pointField Foam::treeDataPrimitivePatch<PatchType>::shapePoints() const
 }
 
 
-//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface.
-//  Only makes sense for closed surfaces.
 template<class PatchType>
 Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
 (
diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C
index 01b726586e..24753a108b 100644
--- a/src/meshTools/meshTools/meshTools.C
+++ b/src/meshTools/meshTools/meshTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Check if n is in same direction as normals of all faceLabels
 bool Foam::meshTools::visNormal
 (
     const vector& n,
@@ -668,7 +667,6 @@ void Foam::meshTools::constrainToMeshCentre
 }
 
 
-//- Set the constrained components of directions/velocity to zero
 void Foam::meshTools::constrainDirection
 (
     const polyMesh& mesh,
diff --git a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
index 6f6f23b75c..24e7d39a17 100644
--- a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
+++ b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -230,7 +230,6 @@ Foam::primitiveMeshGeometry::primitiveMeshGeometry
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//- Take over properties from mesh
 void Foam::primitiveMeshGeometry::correct()
 {
     faceAreas_ = mesh_.faceAreas();
@@ -240,7 +239,6 @@ void Foam::primitiveMeshGeometry::correct()
 }
 
 
-//- Recalculate on selected faces
 void Foam::primitiveMeshGeometry::correct
 (
     const pointField& p,
diff --git a/src/meshTools/searchableSurface/searchableSurfaces.C b/src/meshTools/searchableSurface/searchableSurfaces.C
index 507b3d3826..0b9672fa03 100644
--- a/src/meshTools/searchableSurface/searchableSurfaces.C
+++ b/src/meshTools/searchableSurface/searchableSurfaces.C
@@ -27,9 +27,7 @@ License
 #include "searchableSurfacesQueries.H"
 #include "ListOps.H"
 #include "Time.H"
-//#include "vtkSetWriter.H"
 #include "DynamicField.H"
-//#include "OBJstream.H"
 #include "PatchTools.H"
 #include "triSurfaceMesh.H"
 
@@ -37,13 +35,12 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(searchableSurfaces, 0);
+    defineTypeNameAndDebug(searchableSurfaces, 0);
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-//- Is edge connected to triangle
 bool Foam::searchableSurfaces::connected
 (
     const triSurface& s,
@@ -325,8 +322,6 @@ void Foam::searchableSurfaces::findAnyIntersection
 }
 
 
-//- Find all intersections in order from start to end. Returns for
-//  every hit the surface and the hit info.
 void Foam::searchableSurfaces::findAllIntersections
 (
     const pointField& start,
@@ -372,7 +367,6 @@ void Foam::searchableSurfaces::findNearestIntersection
 }
 
 
-// Find nearest. Return -1 or nearest point
 void Foam::searchableSurfaces::findNearest
 (
     const pointField& samples,
@@ -393,7 +387,6 @@ void Foam::searchableSurfaces::findNearest
 }
 
 
-// Find nearest. Return -1 or nearest point
 void Foam::searchableSurfaces::findNearest
 (
     const pointField& samples,
@@ -415,7 +408,7 @@ void Foam::searchableSurfaces::findNearest
     );
 }
 
-//- Calculate bounding box
+
 Foam::boundBox Foam::searchableSurfaces::bounds() const
 {
     return searchableSurfacesQueries::bounds
@@ -426,7 +419,6 @@ Foam::boundBox Foam::searchableSurfaces::bounds() const
 }
 
 
-//- Calculate point which is on a set of surfaces.
 Foam::pointIndexHit Foam::searchableSurfaces::facesIntersection
 (
     const scalar initDistSqr,
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index 4a3a8dcf41..9220198b5f 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -33,7 +33,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(searchableSurfacesQueries, 0);
+    defineTypeNameAndDebug(searchableSurfacesQueries, 0);
 }
 
 
@@ -849,7 +849,6 @@ Foam::boundBox Foam::searchableSurfacesQueries::bounds
 }
 
 
-//- Calculate point which is on a set of surfaces.
 Foam::pointIndexHit Foam::searchableSurfacesQueries::facesIntersection
 (
     const PtrList<searchableSurface>& allSurfaces,
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.C b/src/meshTools/sets/topoSets/cellZoneSet.C
index 80528e3192..cd52d72ed9 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.C
+++ b/src/meshTools/sets/topoSets/cellZoneSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -238,7 +238,6 @@ label cellZoneSet::maxSize(const polyMesh& mesh) const
 }
 
 
-//- Write using given format, version and compression
 bool cellZoneSet::writeObject
 (
     IOstream::streamFormat s,
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.C b/src/meshTools/sets/topoSets/faceZoneSet.C
index 0467956ef7..34ce4249af 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.C
+++ b/src/meshTools/sets/topoSets/faceZoneSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -331,7 +331,6 @@ label faceZoneSet::maxSize(const polyMesh& mesh) const
 }
 
 
-//- Write using given format, version and compression
 bool faceZoneSet::writeObject
 (
     IOstream::streamFormat s,
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.C b/src/meshTools/sets/topoSets/pointZoneSet.C
index 8a02f718a2..7bfc299ca4 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.C
+++ b/src/meshTools/sets/topoSets/pointZoneSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -239,7 +239,6 @@ label pointZoneSet::maxSize(const polyMesh& mesh) const
 }
 
 
-//- Write using given format, version and compression
 bool pointZoneSet::writeObject
 (
     IOstream::streamFormat s,
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 8212899215..2462180a12 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,15 +39,14 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(surfaceFeatures, 0);
+    defineTypeNameAndDebug(surfaceFeatures, 0);
 
-const scalar surfaceFeatures::parallelTolerance = sin(degToRad(1.0));
+    const scalar surfaceFeatures::parallelTolerance = sin(degToRad(1.0));
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-//- Get nearest point on edge and classify position on edge.
 Foam::pointIndexHit Foam::surfaceFeatures::edgeNearest
 (
     const point& start,
@@ -498,7 +497,6 @@ Foam::surfaceFeatures::surfaceFeatures
 }
 
 
-//- Construct from dictionary
 Foam::surfaceFeatures::surfaceFeatures
 (
     const triSurface& surf,
@@ -513,7 +511,6 @@ Foam::surfaceFeatures::surfaceFeatures
 {}
 
 
-//- Construct from file
 Foam::surfaceFeatures::surfaceFeatures
 (
     const triSurface& surf,
@@ -618,7 +615,6 @@ Foam::surfaceFeatures::surfaceFeatures
 }
 
 
-//- Construct as copy
 Foam::surfaceFeatures::surfaceFeatures(const surfaceFeatures& sf)
 :
     surf_(sf.surface()),
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index 0c21a1b380..029b28c5a9 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -624,8 +624,6 @@ Foam::scalar Foam::triSurfaceTools::edgeCosAngle
 }
 
 
-//- Calculate minimum (cos of) edge angle using addressing from collapsing
-//  edge to v1 at pt.
 Foam::scalar Foam::triSurfaceTools::collapseMinCosAngle
 (
     const triSurface& surf,
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
index dc4cb717d7..c63a9a1422 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,12 +126,6 @@ void Foam::wallBoundedParticle::patchInteraction
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//- Track particle to a given position and returns 1.0 if the
-//  trajectory is completed without hitting a face otherwise
-//  stops at the face and returns the fraction of the trajectory
-//  completed.
-//  on entry 'stepFraction()' should be set to the fraction of the
-//  time-step at which the tracking starts.
 template<class TrackData>
 Foam::scalar Foam::wallBoundedParticle::trackToEdge
 (
@@ -139,6 +133,13 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge
     const vector& endPosition
 )
 {
+    // Track particle to a given position and returns 1.0 if the
+    // trajectory is completed without hitting a face otherwise
+    // stops at the face and returns the fraction of the trajectory
+    // completed.
+    // on entry 'stepFraction()' should be set to the fraction of the
+    // time-step at which the tracking starts.
+
     // Are we on a track face? If not we do a topological walk.
 
     // Particle:
diff --git a/src/sampling/probes/probesTemplates.C b/src/sampling/probes/probesTemplates.C
index 37d0bd98d5..9f13325478 100644
--- a/src/sampling/probes/probesTemplates.C
+++ b/src/sampling/probes/probesTemplates.C
@@ -34,7 +34,6 @@ License
 namespace Foam
 {
 
-//- Comparison operator for probes class
 template<class T>
 class isNotEqOp
 {
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
index 3d59eda215..ecd9105aa6 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,6 @@ namespace Foam
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
-//- Calculate and return the laminar viscosity
 void Foam::incompressibleTwoPhaseMixture::calcNu()
 {
     nuModel1_->correct();

From 8b9fd5643921989ca85f04f4dfd447bb0d5dc7b1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 29 Feb 2016 18:36:37 +0000
Subject: [PATCH 236/447] OpenFOAM: Added experimental version of 'tmp' which
 does not use reference counting

---
 src/OpenFOAM/memory/tmpNrc/tmpNrc.H  | 171 ++++++++++++++
 src/OpenFOAM/memory/tmpNrc/tmpNrcI.H | 320 +++++++++++++++++++++++++++
 2 files changed, 491 insertions(+)
 create mode 100644 src/OpenFOAM/memory/tmpNrc/tmpNrc.H
 create mode 100644 src/OpenFOAM/memory/tmpNrc/tmpNrcI.H

diff --git a/src/OpenFOAM/memory/tmpNrc/tmpNrc.H b/src/OpenFOAM/memory/tmpNrc/tmpNrc.H
new file mode 100644
index 0000000000..8a8ae021e0
--- /dev/null
+++ b/src/OpenFOAM/memory/tmpNrc/tmpNrc.H
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::tmpNrc
+
+Description
+    A class for managing temporary objects without reference counting.
+
+SourceFiles
+    tmpNrcI.H
+
+SeeAlso
+    Foam::autoPtr
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef tmpNrc_H
+#define tmpNrc_H
+
+#include "word.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                             Class tmpNrc Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class T>
+class tmpNrc
+{
+    // Private data
+
+        //- Object types
+        enum type
+        {
+            TMP,
+            CONST_REF
+        };
+
+        //- Type of object
+        mutable type type_;
+
+        //- Pointer to object
+        mutable T* ptr_;
+
+
+public:
+
+    // Null reference counter class
+    class refCount
+    {
+    public:
+
+        refCount()
+        {}
+    };
+
+
+    // Constructors
+
+        //- Store object pointer
+        inline explicit tmpNrc(T* = 0);
+
+        //- Store object const reference
+        inline tmpNrc(const T&);
+
+        //- Construct copy and increment reference count
+        inline tmpNrc(const tmpNrc<T>&);
+
+        //- Construct copy transferring content of temporary if required
+        inline tmpNrc(const tmpNrc<T>&, bool allowTransfer);
+
+
+    //- Destructor: deletes temporary object when the reference count is 0
+    inline ~tmpNrc();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return true if this is really a temporary object
+            inline bool isTmp() const;
+
+            //- Return true if this temporary object empty,
+            //  ie, a temporary without allocation
+            inline bool empty() const;
+
+            //- Is this temporary object valid,
+            //  ie, it is a reference or a temporary that has been allocated
+            inline bool valid() const;
+
+            //- Return the type name of the tmpNrc
+            //  constructed from the type name of T
+            inline word typeName() const;
+
+
+        // Edit
+
+            //- Return non-const reference or generate a fatal error
+            //  if the object is const.
+            inline T& ref();
+
+            //- Return tmpNrc pointer for reuse.
+            //  Returns a clone if the object is not a temporary
+            inline T* ptr() const;
+
+            //- If object pointer points to valid object:
+            //  delete object and set pointer to NULL
+            inline void clear() const;
+
+
+    // Member operators
+
+        //- Const dereference operator
+        inline const T& operator()() const;
+
+        //- Const cast to the underlying type reference
+        inline operator const T&() const;
+
+        //- Return object pointer
+        inline T* operator->();
+
+        //- Return const object pointer
+        inline const T* operator->() const;
+
+        //- Assignment to pointer changing this tmpNrc to a temporary T
+        inline void operator=(T*);
+
+        //- Assignment transfering the temporary T to this tmpNrc
+        inline void operator=(const tmpNrc<T>&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "tmpNrcI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H b/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H
new file mode 100644
index 0000000000..b56a4c4407
--- /dev/null
+++ b/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H
@@ -0,0 +1,320 @@
+/*--------------------------------------------------------------------r-------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "error.H"
+#include <typeinfo>
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class T>
+inline Foam::tmpNrc<T>::tmpNrc(T* tPtr)
+:
+    type_(TMP),
+    ptr_(tPtr)
+{}
+
+
+template<class T>
+inline Foam::tmpNrc<T>::tmpNrc(const T& tRef)
+:
+    type_(CONST_REF),
+    ptr_(const_cast<T*>(&tRef))
+{}
+
+
+template<class T>
+inline Foam::tmpNrc<T>::tmpNrc(const tmpNrc<T>& t)
+:
+    type_(t.type_),
+    ptr_(t.ptr_)
+{
+    if (isTmp())
+    {
+        if (ptr_)
+        {
+            t.type_ = CONST_REF;
+        }
+        else
+        {
+            FatalErrorInFunction
+                << "Attempted copy of a deallocated " << typeName()
+                << abort(FatalError);
+        }
+    }
+}
+
+
+template<class T>
+inline Foam::tmpNrc<T>::tmpNrc(const tmpNrc<T>& t, bool allowTransfer)
+:
+    type_(t.type_),
+    ptr_(t.ptr_)
+{
+    if (isTmp())
+    {
+        if (ptr_)
+        {
+            if (allowTransfer)
+            {
+                t.ptr_ = 0;
+            }
+            else
+            {
+                t.type_ = CONST_REF;
+            }
+        }
+        else
+        {
+            FatalErrorInFunction
+                << "Attempted copy of a deallocated " << typeName()
+                << abort(FatalError);
+        }
+    }
+}
+
+
+template<class T>
+inline Foam::tmpNrc<T>::~tmpNrc()
+{
+    clear();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class T>
+inline bool Foam::tmpNrc<T>::isTmp() const
+{
+    return type_ == TMP;
+}
+
+
+template<class T>
+inline bool Foam::tmpNrc<T>::empty() const
+{
+    return (isTmp() && !ptr_);
+}
+
+
+template<class T>
+inline bool Foam::tmpNrc<T>::valid() const
+{
+    return (!isTmp() || (isTmp() && ptr_));
+}
+
+
+template<class T>
+inline Foam::word Foam::tmpNrc<T>::typeName() const
+{
+    return "tmpNrc<" + word(typeid(T).name()) + '>';
+}
+
+
+template<class T>
+inline T& Foam::tmpNrc<T>::ref()
+{
+    if (isTmp())
+    {
+        if (!ptr_)
+        {
+            FatalErrorInFunction
+                << typeName() << " deallocated"
+                << abort(FatalError);
+        }
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Attempt to acquire non-const reference to const object"
+            << " from a " << typeName()
+            << abort(FatalError);
+    }
+
+    return *ptr_;
+}
+
+
+template<class T>
+inline T* Foam::tmpNrc<T>::ptr() const
+{
+    if (isTmp())
+    {
+        if (!ptr_)
+        {
+            FatalErrorInFunction
+                << typeName() << " deallocated"
+                << abort(FatalError);
+        }
+
+        T* ptr = ptr_;
+        ptr_ = 0;
+
+        return ptr;
+    }
+    else
+    {
+        return new T(*ptr_);
+    }
+}
+
+
+template<class T>
+inline void Foam::tmpNrc<T>::clear() const
+{
+    if (isTmp() && ptr_)
+    {
+        delete ptr_;
+        ptr_ = 0;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class T>
+inline const T& Foam::tmpNrc<T>::operator()() const
+{
+    if (isTmp())
+    {
+        if (!ptr_)
+        {
+            FatalErrorInFunction
+                << typeName() << " deallocated"
+                << abort(FatalError);
+        }
+    }
+
+    // Return const reference
+    return *ptr_;
+}
+
+
+template<class T>
+inline Foam::tmpNrc<T>::operator const T&() const
+{
+    return operator()();
+}
+
+
+template<class T>
+inline T* Foam::tmpNrc<T>::operator->()
+{
+    if (isTmp())
+    {
+        if (!ptr_)
+        {
+            FatalErrorInFunction
+                << typeName() << " deallocated"
+                << abort(FatalError);
+        }
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Attempt to cast const object to non-const for a " << typeName()
+            << abort(FatalError);
+    }
+
+    return ptr_;
+}
+
+
+template<class T>
+inline const T* Foam::tmpNrc<T>::operator->() const
+{
+    if (isTmp() && !ptr_)
+    {
+        FatalErrorInFunction
+            << typeName() << " deallocated"
+            << abort(FatalError);
+    }
+
+    return ptr_;
+}
+
+
+template<class T>
+inline void Foam::tmpNrc<T>::operator=(T* tPtr)
+{
+    clear();
+
+    if (!tPtr)
+    {
+        FatalErrorInFunction
+            << "Attempted copy of a deallocated " << typeName()
+            << abort(FatalError);
+    }
+
+    type_ = TMP;
+    ptr_ = tPtr;
+}
+
+
+template<class T>
+inline void Foam::tmpNrc<T>::operator=(const tmpNrc<T>& t)
+{
+    clear();
+
+    if (t.isTmp())
+    {
+        type_ = TMP;
+
+        if (!t.ptr_)
+        {
+            FatalErrorInFunction
+                << "Attempted assignment to a deallocated " << typeName()
+                << abort(FatalError);
+        }
+
+        ptr_ = t.ptr_;
+        t.ptr_ = 0;
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Attempted assignment to a const reference to an object"
+            << " of type " << typeid(T).name()
+            << abort(FatalError);
+    }
+}
+
+
+//- Return the const reference of the non-const reference argument
+template<typename T>
+inline const T& Const(T& t)
+{
+    return t;
+}
+
+
+//- Return the const reference of the non-const rvalue reference argument
+template<typename T>
+inline const T& Const(T&& t)
+{
+    return t;
+}
+
+
+// ************************************************************************* //

From 1317a716e13d95d6df67848058483c16b920755d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 29 Feb 2016 19:58:50 +0000
Subject: [PATCH 237/447] src/finiteVolume: Moved function documentation
 comments into .H files and removed duplicates

---
 .../processor/processorFvPatchField.C         |  1 -
 .../processorCyclicFvPatchField.C             |  9 +--------
 .../fvPatchFields/fvPatchField/fvPatchField.C |  1 -
 .../extendedCentredCellToCellStencil.C        |  1 -
 .../CECCellToCellStencil.C                    |  5 +----
 .../CECCellToCellStencil.H                    |  5 ++++-
 .../CFCCellToCellStencil.C                    | 11 +++++-----
 .../CFCCellToCellStencil.H                    |  6 +++++-
 .../CPCCellToCellStencil.C                    |  5 +----
 .../CPCCellToCellStencil.H                    |  5 ++++-
 .../globalIndexStencils/cellToCellStencil.C   |  4 +---
 .../globalIndexStencils/cellToCellStencil.H   | 20 ++++++++++++-------
 .../extendedCentredCellToFaceStencil.C        |  3 ++-
 .../FECCellToFaceStencil.C                    |  5 +----
 .../FECCellToFaceStencil.H                    |  4 +++-
 .../globalIndexStencils/cellToFaceStencil.C   |  7 +++----
 .../globalIndexStencils/cellToFaceStencil.H   | 20 ++++++++++++-------
 .../extendedCentredFaceToCellStencil.C        |  1 -
 .../CFCFaceToCellStencil.C                    | 14 ++++++-------
 .../CFCFaceToCellStencil.H                    |  7 ++++++-
 .../fvMesh/fvMeshMapper/fvPatchMapper.C       | 11 +---------
 .../fvMesh/fvMeshMapper/fvSurfaceMapper.C     |  3 +--
 .../fvMesh/fvMeshSubset/fvMeshSubset.C        |  8 ++++----
 .../singleCellFvMesh/singleCellFvMesh.C       | 11 +++++-----
 .../meshWave/wallDistData/wallDistData.C      |  2 --
 .../surfaceInterpolation.C                    |  3 +--
 26 files changed, 82 insertions(+), 90 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 9d18509418..75d5e710ce 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -67,7 +67,6 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 {}
 
 
-// Construct by mapping given processorFvPatchField<Type>
 template<class Type>
 Foam::processorFvPatchField<Type>::processorFvPatchField
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
index 59483e6ee9..c3092af3e5 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,13 +50,11 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
     const Field<Type>& f
 )
 :
-    //coupledFvPatchField<Type>(p, iF, f),
     processorFvPatchField<Type>(p, iF, f),
     procPatch_(refCast<const processorCyclicFvPatch>(p))
 {}
 
 
-// Construct by mapping given processorCyclicFvPatchField<Type>
 template<class Type>
 Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
 (
@@ -66,7 +64,6 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
     const fvPatchFieldMapper& mapper
 )
 :
-    //coupledFvPatchField<Type>(ptf, p, iF, mapper),
     processorFvPatchField<Type>(ptf, p, iF, mapper),
     procPatch_(refCast<const processorCyclicFvPatch>(p))
 {
@@ -90,7 +87,6 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
     const dictionary& dict
 )
 :
-    //coupledFvPatchField<Type>(p, iF, dict),
     processorFvPatchField<Type>(p, iF, dict),
     procPatch_(refCast<const processorCyclicFvPatch>(p))
 {
@@ -122,8 +118,6 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
     const processorCyclicFvPatchField<Type>& ptf
 )
 :
-    //processorLduInterfaceField(),
-    //coupledFvPatchField<Type>(ptf),
     processorFvPatchField<Type>(ptf),
     procPatch_(refCast<const processorCyclicFvPatch>(ptf.patch()))
 {}
@@ -136,7 +130,6 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
     const DimensionedField<Type, volMesh>& iF
 )
 :
-    //coupledFvPatchField<Type>(ptf, iF),
     processorFvPatchField<Type>(ptf, iF),
     procPatch_(refCast<const processorCyclicFvPatch>(ptf.patch()))
 {}
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 7c80ead82d..856c1a174f 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -558,7 +558,6 @@ void Foam::fvPatchField<Type>::operator/=
 }
 
 
-// Force an assignment, overriding fixedValue status
 template<class Type>
 void Foam::fvPatchField<Type>::operator==
 (
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
index aae25f9769..1b9c347b6f 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
@@ -53,7 +53,6 @@ Foam::extendedCentredCellToCellStencil::extendedCentredCellToCellStencil
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Per cell which elements of the stencil to keep.
 void Foam::extendedCentredCellToCellStencil::compact()
 {
     boolList isInStencil(map().constructSize(), false);
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C
index 7d2d6648c4..41e03b552d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Calculates per edge the neighbour data (= edgeCells)
 void Foam::CECCellToCellStencil::calcEdgeBoundaryData
 (
     const boolList& isValidBFace,
@@ -61,8 +60,6 @@ void Foam::CECCellToCellStencil::calcEdgeBoundaryData
 }
 
 
-// Calculates per cell the neighbour data (= cell or boundary in global
-// numbering). First element is always cell itself!
 void Foam::CECCellToCellStencil::calcCellStencil
 (
     labelListList& globalCellCells
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.H
index df7733c46d..4cd4ac1389 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,6 +63,9 @@ class CECCellToCellStencil
             EdgeMap<labelList>& neiGlobal
         ) const;
 
+        //- Calculates per cell the neighbour data
+        //  (= cell or boundary in global numbering).
+        //  First element is always cell itself!
         void calcCellStencil(labelListList& globalCellCells) const;
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
index d034b9549c..7cbde7abf8 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Calculates per face the neighbour data (= cell or boundary face)
 void Foam::CFCCellToCellStencil::calcFaceBoundaryData
 (
     labelList& neiGlobal
@@ -82,10 +81,10 @@ void Foam::CFCCellToCellStencil::calcFaceBoundaryData
 }
 
 
-// Calculates per cell the neighbour data (= cell or boundary in global
-// numbering). First element is always cell itself!
-void Foam::CFCCellToCellStencil::calcCellStencil(labelListList& globalCellCells)
- const
+void Foam::CFCCellToCellStencil::calcCellStencil
+(
+    labelListList& globalCellCells
+) const
 {
     const label nBnd = mesh().nFaces()-mesh().nInternalFaces();
     const labelList& own = mesh().faceOwner();
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.H
index 6c7edac71e..fde8b11ca0 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,8 +51,12 @@ class CFCCellToCellStencil
 {
     // Private Member Functions
 
+        //- Calculates per face the neighbour data (= cell or boundary face)
         void calcFaceBoundaryData(labelList& neiGlobal) const;
 
+        //- Calculates per cell the neighbour data
+        //  (= cell or boundary in global numbering).
+        //  First element is always cell itself!
         void calcCellStencil(labelListList& globalCellCells) const;
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
index 024bb7e2ac..660a04d6d6 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Calculates per point the neighbour data (= pointCells)
 void Foam::CPCCellToCellStencil::calcPointBoundaryData
 (
     const boolList& isValidBFace,
@@ -67,8 +66,6 @@ void Foam::CPCCellToCellStencil::calcPointBoundaryData
 }
 
 
-// Calculates per cell the neighbour data (= cell or boundary in global
-// numbering). First element is always cell itself!
 void Foam::CPCCellToCellStencil::calcCellStencil
 (
     labelListList& globalCellCells
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.H
index 4bb75f2ddf..6d82a432a8 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,6 +62,9 @@ class CPCCellToCellStencil
             Map<labelList>& neiGlobal
         ) const;
 
+        //- Calculates per cell the neighbour data
+        //  (= cell or boundary in global numbering).
+        //  First element is always cell itself!
         void calcCellStencil(labelListList& globalCellCells) const;
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
index fd48842f43..1aad1b4e20 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Merge two list and guarantee global0,global1 are first.
 void Foam::cellToCellStencil::merge
 (
     const label global0,
@@ -131,7 +130,6 @@ void Foam::cellToCellStencil::merge
 }
 
 
-// Merge two list and guarantee globalI is first.
 void Foam::cellToCellStencil::merge
 (
     const label globalI,
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H
index cb8dd85927..8360178c2d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,16 +67,22 @@ class cellToCellStencil
 protected:
 
         //- Merge two lists.
+        //  Guarantee global0, global1 are first.
         static void merge
         (
-            const label,
-            const label,
-            const labelList&,
-            labelList&
+            const label global0,
+            const label global1,
+            const labelList& listA,
+            labelList& listB
         );
 
-        //- Merge two lists.
-        static void merge(const label, const labelList&, labelList&);
+        //- Merge two lists and guarantee globalI is first.
+        static void merge
+        (
+            const label globalI,
+            const labelList& pGlobals,
+            labelList& cCells
+        );
 
         //- Valid boundary faces (not empty and not coupled)
         void validBoundaryFaces(boolList& isValidBFace) const;
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C
index 06060c19b6..5fe891d078 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C
@@ -53,9 +53,10 @@ Foam::extendedCentredCellToFaceStencil::extendedCentredCellToFaceStencil
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Per face which elements of the stencil to keep.
 void Foam::extendedCentredCellToFaceStencil::compact()
 {
+    // Per face which elements of the stencil to keep.
+
     boolList isInStencil(map().constructSize(), false);
 
     forAll(stencil_, faceI)
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
index 235091fa3a..29f929c01f 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Calculates per edge the neighbour data (= edgeCells)
 void Foam::FECCellToFaceStencil::calcEdgeBoundaryData
 (
     const boolList& isValidBFace,
@@ -62,8 +61,6 @@ void Foam::FECCellToFaceStencil::calcEdgeBoundaryData
 }
 
 
-// Calculates per face the edge connected data (= cell or boundary in global
-// numbering).
 void Foam::FECCellToFaceStencil::calcFaceStencil
 (
     labelListList& faceStencil
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.H
index 6d85ea414e..d7c6d5c5b6 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,6 +61,8 @@ class FECCellToFaceStencil
             EdgeMap<labelList>& neiGlobal
         ) const;
 
+        //- Calculates per face the edge connected data
+        //  (= cell or boundary in global numbering).
         void calcFaceStencil(labelListList& faceStencil) const;
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
index f61744941e..c9ac094164 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Merge two list and guarantee global0,global1 are first.
 void Foam::cellToFaceStencil::merge
 (
     const label global0,
@@ -132,7 +131,6 @@ void Foam::cellToFaceStencil::merge
 }
 
 
-// Merge two list and guarantee globalI is first.
 void Foam::cellToFaceStencil::merge
 (
     const label globalI,
@@ -338,13 +336,14 @@ Foam::labelList Foam::cellToFaceStencil::calcFaceCells
 }
 
 
-// Calculates per face a list of global cell/face indices.
 void Foam::cellToFaceStencil::calcFaceStencil
 (
     const labelListList& globalCellCells,
     labelListList& faceStencil
 ) const
 {
+    // Calculates per face a list of global cell/face indices.
+
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
     const label nBnd = mesh_.nFaces()-mesh_.nInternalFaces();
     const labelList& own = mesh_.faceOwner();
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H
index 1b325ac3f5..62b7db6f81 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,16 +67,22 @@ class cellToFaceStencil
 protected:
 
         //- Merge two lists.
+        //  Guarantee global0, global1 are first.
         static void merge
         (
-            const label,
-            const label,
-            const labelList&,
-            labelList&
+            const label global0,
+            const label global1,
+            const labelList& listA,
+            labelList& listB
         );
 
-        //- Merge two lists.
-        static void merge(const label, const labelList&, labelList&);
+        //- Merge two lists and guarantee globalI is first.
+        static void merge
+        (
+            const label globalI,
+            const labelList& pGlobals,
+            labelList& cCells
+        );
 
         //- Valid boundary faces (not empty and not coupled)
         void validBoundaryFaces(boolList& isValidBFace) const;
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
index 1b1073cb8c..a2d40b5871 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
@@ -53,7 +53,6 @@ Foam::extendedCentredFaceToCellStencil::extendedCentredFaceToCellStencil
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Per face which elements of the stencil to keep.
 void Foam::extendedCentredFaceToCellStencil::compact()
 {
     boolList isInStencil(map().constructSize(), false);
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.C
index 7e49959a8b..8a60abd437 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,8 +30,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Calculates per face the neighbour data (= faces of cell). Leaves out the
-// face itself since this is already in stencil.
 void Foam::CFCFaceToCellStencil::calcFaceBoundaryData
 (
     labelListList& neiGlobal
@@ -81,7 +79,7 @@ void Foam::CFCFaceToCellStencil::calcFaceBoundaryData
             // Do nothing since face itself already in stencil
         }
     }
-    //syncTools::swapBoundaryFaceList(mesh(), neiGlobal);
+
     syncTools::syncBoundaryFaceList
     (
         mesh(),
@@ -92,10 +90,10 @@ void Foam::CFCFaceToCellStencil::calcFaceBoundaryData
 }
 
 
-// Calculates per cell the neighbour data (= cell or boundary in global
-// numbering). First element is always cell itself!
-void Foam::CFCFaceToCellStencil::calcCellStencil(labelListList& globalCellFaces)
- const
+void Foam::CFCFaceToCellStencil::calcCellStencil
+(
+    labelListList& globalCellFaces
+) const
 {
     const label nBnd = mesh().nFaces()-mesh().nInternalFaces();
     const labelList& own = mesh().faceOwner();
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.H
index 29c083449e..b451b6e673 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,8 +51,13 @@ class CFCFaceToCellStencil
 {
     // Private Member Functions
 
+        //- Calculates per face the neighbour data (= faces of cell).
+        //  Leaves out the face itself since this is already in stencil.
         void calcFaceBoundaryData(labelListList& neiGlobal) const;
 
+        //- Calculates per cell the neighbour data
+        //  (= cell or boundary in global numbering).
+        //  First element is always cell itself!
         void calcCellStencil(labelListList& globalCellFaces) const;
 
 
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
index a1039f2a71..cd7502a100 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,14 +156,6 @@ void Foam::fvPatchMapper::calcAddressing() const
                     }
                 }
 
-                //// Cater for bad mapping
-                //if (nActive == 0)
-                //{
-                //    newAddr[nActive] = 0;
-                //    newWeights[nActive] = 1;
-                //    nActive++;
-                //}
-
                 newAddr.setSize(nActive);
                 newWeights.setSize(nActive);
 
@@ -211,7 +203,6 @@ void Foam::fvPatchMapper::clearOut()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::fvPatchMapper::fvPatchMapper
 (
     const fvPatch& patch,
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
index c9889b7030..c2d5fbcfca 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,7 +144,6 @@ void Foam::fvSurfaceMapper::clearOut()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::fvSurfaceMapper::fvSurfaceMapper
 (
     const fvMesh& mesh,
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index bb88b6c09a..0356902222 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,14 +87,15 @@ void Foam::fvMeshSubset::markPoints
 }
 
 
-// Synchronize nCellsUsingFace on both sides of coupled patches. Marks
-// faces that become 'uncoupled' with 3.
 void Foam::fvMeshSubset::doCoupledPatches
 (
     const bool syncPar,
     labelList& nCellsUsingFace
 ) const
 {
+    // Synchronize nCellsUsingFace on both sides of coupled patches.
+    // Marks faces that become 'uncoupled' with 3.
+
     const polyBoundaryMesh& oldPatches = baseMesh().boundaryMesh();
 
     label nUncoupled = 0;
@@ -355,7 +356,6 @@ void Foam::fvMeshSubset::subsetZones()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::fvMeshSubset::fvMeshSubset(const fvMesh& baseMesh)
 :
     baseMesh_(baseMesh),
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
index 6cb95ee928..a4287b8675 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,16 +29,17 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Conversion is a two step process:
-// - from original (fine) patch faces to agglomerations (aggloms might not
-//   be in correct patch order)
-// - from agglomerations to coarse patch faces
 void Foam::singleCellFvMesh::agglomerateMesh
 (
     const fvMesh& mesh,
     const labelListList& agglom
 )
 {
+    // Conversion is a two step process:
+    // - from original (fine) patch faces to agglomerations (aggloms might not
+    //   be in correct patch order)
+    // - from agglomerations to coarse patch faces
+
     const polyBoundaryMesh& oldPatches = mesh.boundaryMesh();
 
     // Check agglomeration within patch face range and continuous
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C
index b02e1d38f4..4c105b1025 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C
@@ -30,7 +30,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 template<class TransferType>
 Foam::wallDistData<TransferType>::wallDistData
 (
@@ -68,7 +67,6 @@ Foam::wallDistData<TransferType>::~wallDistData()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Correct for mesh geom/topo changes
 template<class TransferType>
 void Foam::wallDistData<TransferType>::correct()
 {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
index 5fc0b4fa9d..2895e1256e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,7 +121,6 @@ Foam::surfaceInterpolation::nonOrthCorrectionVectors() const
 }
 
 
-// Do what is neccessary if the mesh has moved
 bool Foam::surfaceInterpolation::movePoints()
 {
     deleteDemandDrivenData(weights_);

From 3963149c0559f38ce041f4d61c2f2243f29b2da8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 29 Feb 2016 21:21:41 +0000
Subject: [PATCH 238/447] src/OpenFOAM: Moved function documentation comments
 into .H files and removed duplicates

---
 .../dynamicIndexedOctree.C                    | 263 +---------------
 .../dynamicIndexedOctree.H                    |  23 +-
 .../dynamicTreeDataPoint.C                    |   4 -
 .../algorithms/indexedOctree/indexedOctree.C  | 296 +-----------------
 .../algorithms/indexedOctree/indexedOctree.H  |  14 +-
 .../db/IOobjects/IOdictionary/IOdictionary.H  |   4 +-
 .../IOobjects/IOdictionary/IOdictionaryIO.C   |   4 +-
 src/OpenFOAM/db/IOstreams/IOstreams/Istream.C |   6 +-
 src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C |   7 +-
 src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H |   4 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C |  77 ++---
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  13 +
 .../IOstreams/Pstreams/combineGatherScatter.C |  45 +--
 src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C |   3 +-
 src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C |  13 +-
 src/OpenFOAM/db/Time/Time.C                   |  15 +-
 src/OpenFOAM/db/error/messageStream.C         |   4 +-
 src/OpenFOAM/db/regIOobject/regIOobject.C     |   6 -
 .../dimensionedType/dimensionedType.C         |   3 -
 src/OpenFOAM/fields/Fields/Field/Field.C      |   1 -
 .../GeometricField/GeometricBoundaryField.C   |   6 -
 src/OpenFOAM/fields/ReadFields/ReadFields.C   |   4 +-
 src/OpenFOAM/fields/ReadFields/ReadFields.H   |   2 +
 .../basic/value/valuePointPatchField.C        |   1 -
 src/OpenFOAM/global/JobInfo/JobInfo.C         |   3 +-
 src/OpenFOAM/graph/curve/curve.C              | 114 +------
 .../PatchToPatchInterpolation.C               |   1 -
 src/OpenFOAM/matrices/Matrix/Matrix.C         |   3 +-
 .../lduMatrix/lduAddressing/lduAddressing.C   |   3 +-
 .../procFacesGAMGProcAgglomeration.C          |   1 -
 .../GAMG/GAMGSolverAgglomerateMatrix.C        |   3 -
 .../ProcessorTopology/ProcessorTopology.C     |   3 +-
 .../meshes/ProcessorTopology/commSchedule.C   |   3 +-
 .../meshes/bandCompression/bandCompression.C  |   3 +-
 .../meshShapes/cellMatcher/cellMatcher.C      |   6 +-
 .../meshShapes/cellMatcher/pyrMatcher.C       |   8 +-
 .../meshShapes/cellModeller/cellModeller.C    |   7 +-
 .../cellModeller/globalCellModeller.C         |  19 +-
 .../meshes/meshShapes/cellShape/cellShape.C   |   3 +-
 src/OpenFOAM/meshes/meshShapes/face/face.C    |   1 -
 .../meshShapes/face/faceAreaInContact.C       |   9 +-
 .../meshes/meshShapes/face/faceIntersection.C |  20 +-
 .../pointMesh/pointMeshMapper/pointMapper.C   |   6 +-
 .../pointMeshMapper/pointPatchMapper.C        |   3 +-
 .../cyclicSlip/cyclicSlipPointPatch.C         |   3 +-
 .../nonuniformTransformCyclicPointPatch.C     |   3 +-
 .../derived/wall/wallPointPatch.C             |   3 +-
 .../polyMesh/globalMeshData/globalMeshData.C  |  21 +-
 .../polyMesh/globalMeshData/globalPoints.C    |  46 +--
 .../mapPolyMesh/cellMapper/cellMapper.C       |   3 +-
 .../mapPolyMesh/faceMapper/faceMapper.C       |   3 +-
 .../polyMesh/mapPolyMesh/mapAddedPolyMesh.C   |   3 +-
 .../mapPolyMesh/mapDistribute/mapDistribute.C |   3 -
 .../mapPolyMesh/mapDistribute/mapDistribute.H |   4 +
 54 files changed, 193 insertions(+), 936 deletions(-)

diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
index c38bdfa814..043ea1558d 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
@@ -33,11 +33,8 @@ License
 template<class Type>
 Foam::scalar Foam::dynamicIndexedOctree<Type>::perturbTol_ = 10*SMALL;
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Does bb intersect a sphere around sample? Or is any corner point of bb
-// closer than nearestDistSqr to sample.
 template<class Type>
 bool Foam::dynamicIndexedOctree<Type>::overlaps
 (
@@ -80,8 +77,6 @@ bool Foam::dynamicIndexedOctree<Type>::overlaps
 }
 
 
-// Does bb intersect a sphere around sample? Or is any corner point of bb
-// closer than nearestDistSqr to sample.
 template<class Type>
 bool Foam::dynamicIndexedOctree<Type>::overlaps
 (
@@ -139,12 +134,6 @@ bool Foam::dynamicIndexedOctree<Type>::overlaps
 }
 
 
-//
-// Construction helper routines
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-
-// Split list of indices into 8 bins
 template<class Type>
 void Foam::dynamicIndexedOctree<Type>::divide
 (
@@ -186,7 +175,6 @@ void Foam::dynamicIndexedOctree<Type>::divide
 }
 
 
-// Subdivide the (content) node.
 template<class Type>
 typename Foam::dynamicIndexedOctree<Type>::node
 Foam::dynamicIndexedOctree<Type>::divide
@@ -330,15 +318,16 @@ void Foam::dynamicIndexedOctree<Type>::recursiveSubDivision
 }
 
 
-// Pre-calculates wherever possible the volume status per node/subnode.
-// Recurses to determine status of lowest level boxes. Level above is
-// combination of octants below.
 template<class Type>
 Foam::volumeType Foam::dynamicIndexedOctree<Type>::calcVolumeType
 (
     const label nodeI
 ) const
 {
+    // Pre-calculates wherever possible the volume status per node/subnode.
+    // Recurses to determine status of lowest level boxes. Level above is
+    // combination of octants below.
+
     const node& nod = nodes_[nodeI];
 
     volumeType myType = volumeType::UNKNOWN;
@@ -477,12 +466,6 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getSide
 }
 
 
-//
-// Query routines
-// ~~~~~~~~~~~~~~
-//
-
-// Find nearest point starting from nodeI
 template<class Type>
 void Foam::dynamicIndexedOctree<Type>::findNearest
 (
@@ -554,7 +537,6 @@ void Foam::dynamicIndexedOctree<Type>::findNearest
 }
 
 
-// Find nearest point to line.
 template<class Type>
 void Foam::dynamicIndexedOctree<Type>::findNearest
 (
@@ -645,8 +627,6 @@ Foam::treeBoundBox Foam::dynamicIndexedOctree<Type>::subBbox
 }
 
 
-// Takes a bb and a point on/close to the edge of the bb and pushes the point
-// inside by a small fraction.
 template<class Type>
 Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
 (
@@ -655,6 +635,9 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
     const bool pushInside
 )
 {
+    // Takes a bb and a point on/close to the edge of the bb and pushes the
+    // point inside by a small fraction.
+
     // Get local length scale.
     const vector perturbVec = perturbTol_*bb.span();
 
@@ -716,8 +699,6 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
 }
 
 
-// Takes a bb and a point on the edge of the bb and pushes the point
-// outside by a small fraction.
 template<class Type>
 Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
 (
@@ -727,6 +708,9 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
     const bool pushInside
 )
 {
+    // Takes a bb and a point on the edge of the bb and pushes the point
+    // outside by a small fraction.
+
     // Get local length scale.
     const vector perturbVec = perturbTol_*bb.span();
 
@@ -828,9 +812,6 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
 }
 
 
-// Guarantees that if pt is on a face it gets perturbed so it is away
-// from the face edges.
-// If pt is not on a face does nothing.
 template<class Type>
 Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
 (
@@ -988,205 +969,6 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
 }
 
 
-//// Takes a bb and a point on the outside of the bb. Checks if on multiple
-// faces
-//// and if so perturbs point so it is only on one face.
-//template<class Type>
-//void Foam::dynamicIndexedOctree<Type>::checkMultipleFaces
-//(
-//    const treeBoundBox& bb,
-//    const vector& dir,          // end-start
-//    pointIndexHit& faceHitInfo,
-//    direction& faceID
-//)
-//{
-//    // Do the quick elimination of no or one face.
-//    if
-//    (
-//        (faceID == 0)
-//     || (faceID == treeBoundBox::LEFTBIT)
-//     || (faceID == treeBoundBox::RIGHTBIT)
-//     || (faceID == treeBoundBox::BOTTOMBIT)
-//     || (faceID == treeBoundBox::TOPBIT)
-//     || (faceID == treeBoundBox::BACKBIT)
-//     || (faceID == treeBoundBox::FRONTBIT)
-//    )
-//    {
-//        return;
-//    }
-//
-//
-//    // Check the direction of vector w.r.t. faces being intersected.
-//    FixedList<scalar, 6> inproducts(-GREAT);
-//
-//    direction nFaces = 0;
-//
-//    if (faceID & treeBoundBox::LEFTBIT)
-//    {
-//        inproducts[treeBoundBox::LEFT] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::LEFT]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//    if (faceID & treeBoundBox::RIGHTBIT)
-//    {
-//        inproducts[treeBoundBox::RIGHT] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::RIGHT]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//
-//    if (faceID & treeBoundBox::BOTTOMBIT)
-//    {
-//        inproducts[treeBoundBox::BOTTOM] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::BOTTOM]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//    if (faceID & treeBoundBox::TOPBIT)
-//    {
-//        inproducts[treeBoundBox::TOP] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::TOP]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//
-//    if (faceID & treeBoundBox::BACKBIT)
-//    {
-//        inproducts[treeBoundBox::BACK] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::BACK]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//    if (faceID & treeBoundBox::FRONTBIT)
-//    {
-//        inproducts[treeBoundBox::FRONT] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::FRONT]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//
-//    if (nFaces == 0 || nFaces == 1 || nFaces > 3)
-//    {
-//        FatalErrorInFunction
-//            << "Problem : nFaces:" << nFaces << abort(FatalError);
-//    }
-//
-//    // Keep point on most perpendicular face; shift it away from the aligned
-//    // ones.
-//    // E.g. line hits top and left face:
-//    //     a
-//    // ----+----+
-//    //     |    |
-//    //     |    |
-//    //     +----+
-//    // Shift point down (away from top):
-//    //
-//    //    a+----+
-//    // ----|    |
-//    //     |    |
-//    //     +----+
-//
-//    label maxIndex = -1;
-//    scalar maxInproduct = -GREAT;
-//
-//    for (direction i = 0; i < 6; i++)
-//    {
-//        if (inproducts[i] > maxInproduct)
-//        {
-//            maxInproduct = inproducts[i];
-//            maxIndex = i;
-//        }
-//    }
-//
-//    if (maxIndex == -1)
-//    {
-//        FatalErrorInFunction
-//            << "Problem maxIndex:" << maxIndex << " inproducts:" << inproducts
-//            << abort(FatalError);
-//    }
-//
-//    const point oldPoint(faceHitInfo.rawPoint());
-//    const direction oldFaceID = faceID;
-//
-//    // 1. Push point into bb, away from all corners
-//
-//    faceHitInfo.rawPoint() = pushPoint(bb, oldFaceID, oldPoint, true);
-//
-//    // 2. Snap it back onto the preferred face
-//
-//    if (maxIndex == treeBoundBox::LEFT)
-//    {
-//        faceHitInfo.rawPoint().x() = bb.min().x();
-//        faceID = treeBoundBox::LEFTBIT;
-//    }
-//    else if (maxIndex == treeBoundBox::RIGHT)
-//    {
-//        faceHitInfo.rawPoint().x() = bb.max().x();
-//        faceID = treeBoundBox::RIGHTBIT;
-//    }
-//    else if (maxIndex == treeBoundBox::BOTTOM)
-//    {
-//        faceHitInfo.rawPoint().y() = bb.min().y();
-//        faceID = treeBoundBox::BOTTOMBIT;
-//    }
-//    else if (maxIndex == treeBoundBox::TOP)
-//    {
-//        faceHitInfo.rawPoint().y() = bb.max().y();
-//        faceID = treeBoundBox::TOPBIT;
-//    }
-//    else if (maxIndex == treeBoundBox::BACK)
-//    {
-//        faceHitInfo.rawPoint().z() = bb.min().z();
-//        faceID = treeBoundBox::BACKBIT;
-//    }
-//    else if (maxIndex == treeBoundBox::FRONT)
-//    {
-//        faceHitInfo.rawPoint().z() = bb.max().z();
-//        faceID = treeBoundBox::FRONTBIT;
-//    }
-//
-//    Pout<< "From ray:" << dir
-//        << " from point:" << oldPoint
-//        << " on faces:" << faceString(oldFaceID)
-//        << " of bb:" << bb
-//        << " with inprods:" << inproducts
-//        << " maxIndex:" << maxIndex << endl
-//        << "perturbed to point:" << faceHitInfo.rawPoint()
-//        << " on face:" << faceString(faceID)
-//        << endl;
-//
-//
-//    if (debug)
-//    {
-//        if (faceID != bb.faceBits(faceHitInfo.rawPoint()))
-//        {
-//            FatalErrorInFunction
-//                << "Pushed point from " << oldPoint
-//                << " on face:" << oldFaceID << " of bb:" << bb << endl
-//                << "onto " << faceHitInfo.rawPoint()
-//                << " on face:" << faceID
-//                << " which is not consistent with geometric face "
-//                <<  bb.faceBits(faceHitInfo.rawPoint())
-//                << abort(FatalError);
-//        }
-//    }
-//}
-
-
-// Get parent node and octant. Return false if top of tree reached.
 template<class Type>
 bool Foam::dynamicIndexedOctree<Type>::walkToParent
 (
@@ -1233,10 +1015,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToParent
 }
 
 
-// Walk tree to neighbouring node. Gets current position as
-// node and octant in this node and walks in the direction given by
-// the facePointBits (combination of treeBoundBox::LEFTBIT, TOPBIT etc.)
-// Returns false if edge of tree hit.
+
 template<class Type>
 bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour
 (
@@ -1246,6 +1025,11 @@ bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour
     direction& octant
 ) const
 {
+    // Walk tree to neighbouring node. Gets current position as node and octant
+    // in this node and walks in the direction given by the facePointBits
+    // (combination of treeBoundBox::LEFTBIT, TOPBIT etc.)  Returns false if
+    // edge of tree hit.
+
     label oldNodeI = nodeI;
     direction oldOctant = octant;
 
@@ -1521,12 +1305,6 @@ Foam::word Foam::dynamicIndexedOctree<Type>::faceString
 }
 
 
-// Traverse a node. If intersects a triangle return first intersection point:
-//  hitInfo.index = index of shape
-//  hitInfo.point = point on shape
-// Else return a miss and the bounding box face hit:
-//  hitInfo.point = coordinate of intersection of ray with bounding box
-//  hitBits  = posbits of point on bounding box
 template<class Type>
 void Foam::dynamicIndexedOctree<Type>::traverseNode
 (
@@ -1689,7 +1467,6 @@ void Foam::dynamicIndexedOctree<Type>::traverseNode
 }
 
 
-// Find first intersection
 template<class Type>
 Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
 (
@@ -1877,7 +1654,6 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
 }
 
 
-// Find first intersection
 template<class Type>
 Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
 (
@@ -2218,7 +1994,6 @@ void Foam::dynamicIndexedOctree<Type>::findNear
 }
 
 
-// Number of elements in node.
 template<class Type>
 Foam::label Foam::dynamicIndexedOctree<Type>::countElements
 (
@@ -2406,7 +2181,6 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findNearest
 }
 
 
-// Find nearest intersection
 template<class Type>
 Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
 (
@@ -2418,7 +2192,6 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
 }
 
 
-// Find nearest intersection
 template<class Type>
 Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLineAny
 (
@@ -2467,7 +2240,6 @@ Foam::labelList Foam::dynamicIndexedOctree<Type>::findSphere
 }
 
 
-// Find node (as parent+octant) containing point
 template<class Type>
 Foam::labelBits Foam::dynamicIndexedOctree<Type>::findNode
 (
@@ -2571,7 +2343,6 @@ const Foam::labelList& Foam::dynamicIndexedOctree<Type>::findIndices
 }
 
 
-// Determine type (inside/outside/mixed) per node.
 template<class Type>
 Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType
 (
@@ -2885,7 +2656,6 @@ Foam::label Foam::dynamicIndexedOctree<Type>::removeIndex
 }
 
 
-// Print contents of nodeI
 template<class Type>
 void Foam::dynamicIndexedOctree<Type>::print
 (
@@ -2985,7 +2755,6 @@ void Foam::dynamicIndexedOctree<Type>::writeTreeInfo() const
 }
 
 
-// Print contents of nodeI
 template<class Type>
 bool Foam::dynamicIndexedOctree<Type>::write(Ostream& os) const
 {
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
index c54493d5ef..8017a943fb 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
@@ -206,17 +206,6 @@ private:
                 label& nLevels
             );
 
-//            static label compactContents
-//            (
-//                DynamicList<node>& nodes,
-//                DynamicList<labelList>& contents,
-//                const label compactLevel,
-//                const label nodeI,
-//                const label level,
-//                List<labelList>& compactedContents,
-//                label& compactI
-//            );
-
             //- Determine inside/outside per node (mixed if cannot be
             //  determined). Only valid for closed shapes.
             volumeType calcVolumeType(const label nodeI) const;
@@ -266,7 +255,7 @@ private:
             );
 
             //- Helper: take point on face(s) of bb and push it away from
-            //  edges of face.
+            //  edges of face.  If pt is not on a face does nothing.
             static point pushPointIntoFace
             (
                 const treeBoundBox& bb,
@@ -274,16 +263,8 @@ private:
                 const point& pt
             );
 
-            ////- Push point on multiple faces away from any corner/edge.
-            //static void checkMultipleFaces
-            //(
-            //    const treeBoundBox& bb,
-            //    const vector& dir,          // end-start
-            //    pointIndexHit& faceHitInfo,
-            //    direction& faceID
-            //);
-
             //- Walk to parent of node+octant.
+            //  Return false if top of tree reached.
             bool walkToParent
             (
                 const label nodeI,
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C
index 4eca98a813..94f1b6f02e 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C
@@ -65,7 +65,6 @@ Foam::volumeType Foam::dynamicTreeDataPoint::getVolumeType
 }
 
 
-// Check if any point on shape is inside cubeBb.
 bool Foam::dynamicTreeDataPoint::overlaps
 (
     const label index,
@@ -76,7 +75,6 @@ bool Foam::dynamicTreeDataPoint::overlaps
 }
 
 
-// Check if any point on shape is inside sphere.
 bool Foam::dynamicTreeDataPoint::overlaps
 (
     const label index,
@@ -97,8 +95,6 @@ bool Foam::dynamicTreeDataPoint::overlaps
 }
 
 
-// Calculate nearest point to sample. Updates (if any) nearestDistSqr, minIndex,
-// nearestPoint.
 void Foam::dynamicTreeDataPoint::findNearest
 (
     const labelUList& indices,
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index 3e2968117a..4d79eef695 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
@@ -37,8 +37,6 @@ Foam::scalar Foam::indexedOctree<Type>::perturbTol_ = 10*SMALL;
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Does bb intersect a sphere around sample? Or is any corner point of bb
-// closer than nearestDistSqr to sample.
 template<class Type>
 bool Foam::indexedOctree<Type>::overlaps
 (
@@ -54,8 +52,6 @@ bool Foam::indexedOctree<Type>::overlaps
 }
 
 
-// Does bb intersect a sphere around sample? Or is any corner point of bb
-// closer than nearestDistSqr to sample.
 template<class Type>
 bool Foam::indexedOctree<Type>::overlaps
 (
@@ -113,12 +109,6 @@ bool Foam::indexedOctree<Type>::overlaps
 }
 
 
-//
-// Construction helper routines
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-
-// Split list of indices into 8 bins
 template<class Type>
 void Foam::indexedOctree<Type>::divide
 (
@@ -161,7 +151,6 @@ void Foam::indexedOctree<Type>::divide
 }
 
 
-// Subdivide the (content) node.
 template<class Type>
 typename Foam::indexedOctree<Type>::node
 Foam::indexedOctree<Type>::divide
@@ -231,7 +220,6 @@ Foam::indexedOctree<Type>::divide
 }
 
 
-// Split any contents node with more than minSize elements.
 template<class Type>
 void Foam::indexedOctree<Type>::splitNodes
 (
@@ -284,8 +272,6 @@ void Foam::indexedOctree<Type>::splitNodes
 }
 
 
-// Reorder contents to be in same order as nodes. Returns number of nodes on
-// the compactLevel.
 template<class Type>
 Foam::label Foam::indexedOctree<Type>::compactContents
 (
@@ -353,15 +339,16 @@ Foam::label Foam::indexedOctree<Type>::compactContents
 }
 
 
-// Pre-calculates wherever possible the volume status per node/subnode.
-// Recurses to determine status of lowest level boxes. Level above is
-// combination of octants below.
 template<class Type>
 Foam::volumeType Foam::indexedOctree<Type>::calcVolumeType
 (
     const label nodeI
 ) const
 {
+    // Pre-calculates wherever possible the volume status per node/subnode.
+    // Recurses to determine status of lowest level boxes. Level above is
+    // combination of octants below.
+
     const node& nod = nodes_[nodeI];
 
     volumeType myType = volumeType::UNKNOWN;
@@ -497,13 +484,6 @@ Foam::volumeType Foam::indexedOctree<Type>::getSide
 }
 
 
-//
-// Query routines
-// ~~~~~~~~~~~~~~
-//
-
-
-// Find nearest point starting from nodeI
 template<class Type>
 template<class FindNearestOp>
 void Foam::indexedOctree<Type>::findNearest
@@ -580,7 +560,6 @@ void Foam::indexedOctree<Type>::findNearest
 }
 
 
-// Find nearest point to line.
 template<class Type>
 template<class FindNearestOp>
 void Foam::indexedOctree<Type>::findNearest
@@ -676,8 +655,6 @@ Foam::treeBoundBox Foam::indexedOctree<Type>::subBbox
 }
 
 
-// Takes a bb and a point on/close to the edge of the bb and pushes the point
-// inside by a small fraction.
 template<class Type>
 Foam::point Foam::indexedOctree<Type>::pushPoint
 (
@@ -747,8 +724,6 @@ Foam::point Foam::indexedOctree<Type>::pushPoint
 }
 
 
-// Takes a bb and a point on the edge of the bb and pushes the point
-// outside by a small fraction.
 template<class Type>
 Foam::point Foam::indexedOctree<Type>::pushPoint
 (
@@ -859,9 +834,6 @@ Foam::point Foam::indexedOctree<Type>::pushPoint
 }
 
 
-// Guarantees that if pt is on a face it gets perturbed so it is away
-// from the face edges.
-// If pt is not on a face does nothing.
 template<class Type>
 Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
 (
@@ -1019,205 +991,6 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
 }
 
 
-//// Takes a bb and a point on the outside of the bb. Checks if on multiple
-// faces
-//// and if so perturbs point so it is only on one face.
-//template<class Type>
-//void Foam::indexedOctree<Type>::checkMultipleFaces
-//(
-//    const treeBoundBox& bb,
-//    const vector& dir,          // end-start
-//    pointIndexHit& faceHitInfo,
-//    direction& faceID
-//)
-//{
-//    // Do the quick elimination of no or one face.
-//    if
-//    (
-//        (faceID == 0)
-//     || (faceID == treeBoundBox::LEFTBIT)
-//     || (faceID == treeBoundBox::RIGHTBIT)
-//     || (faceID == treeBoundBox::BOTTOMBIT)
-//     || (faceID == treeBoundBox::TOPBIT)
-//     || (faceID == treeBoundBox::BACKBIT)
-//     || (faceID == treeBoundBox::FRONTBIT)
-//    )
-//    {
-//        return;
-//    }
-//
-//
-//    // Check the direction of vector w.r.t. faces being intersected.
-//    FixedList<scalar, 6> inproducts(-GREAT);
-//
-//    direction nFaces = 0;
-//
-//    if (faceID & treeBoundBox::LEFTBIT)
-//    {
-//        inproducts[treeBoundBox::LEFT] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::LEFT]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//    if (faceID & treeBoundBox::RIGHTBIT)
-//    {
-//        inproducts[treeBoundBox::RIGHT] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::RIGHT]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//
-//    if (faceID & treeBoundBox::BOTTOMBIT)
-//    {
-//        inproducts[treeBoundBox::BOTTOM] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::BOTTOM]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//    if (faceID & treeBoundBox::TOPBIT)
-//    {
-//        inproducts[treeBoundBox::TOP] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::TOP]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//
-//    if (faceID & treeBoundBox::BACKBIT)
-//    {
-//        inproducts[treeBoundBox::BACK] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::BACK]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//    if (faceID & treeBoundBox::FRONTBIT)
-//    {
-//        inproducts[treeBoundBox::FRONT] = mag
-//        (
-//            treeBoundBox::faceNormals[treeBoundBox::FRONT]
-//          & dir
-//        );
-//        nFaces++;
-//    }
-//
-//    if (nFaces == 0 || nFaces == 1 || nFaces > 3)
-//    {
-//        FatalErrorInFunction
-//            << "Problem : nFaces:" << nFaces << abort(FatalError);
-//    }
-//
-//    // Keep point on most perpendicular face; shift it away from the aligned
-//    // ones.
-//    // E.g. line hits top and left face:
-//    //     a
-//    // ----+----+
-//    //     |    |
-//    //     |    |
-//    //     +----+
-//    // Shift point down (away from top):
-//    //
-//    //    a+----+
-//    // ----|    |
-//    //     |    |
-//    //     +----+
-//
-//    label maxIndex = -1;
-//    scalar maxInproduct = -GREAT;
-//
-//    for (direction i = 0; i < 6; i++)
-//    {
-//        if (inproducts[i] > maxInproduct)
-//        {
-//            maxInproduct = inproducts[i];
-//            maxIndex = i;
-//        }
-//    }
-//
-//    if (maxIndex == -1)
-//    {
-//        FatalErrorInFunction
-//            << "Problem maxIndex:" << maxIndex << " inproducts:" << inproducts
-//            << abort(FatalError);
-//    }
-//
-//    const point oldPoint(faceHitInfo.rawPoint());
-//    const direction oldFaceID = faceID;
-//
-//    // 1. Push point into bb, away from all corners
-//
-//    faceHitInfo.rawPoint() = pushPoint(bb, oldFaceID, oldPoint, true);
-//
-//    // 2. Snap it back onto the preferred face
-//
-//    if (maxIndex == treeBoundBox::LEFT)
-//    {
-//        faceHitInfo.rawPoint().x() = bb.min().x();
-//        faceID = treeBoundBox::LEFTBIT;
-//    }
-//    else if (maxIndex == treeBoundBox::RIGHT)
-//    {
-//        faceHitInfo.rawPoint().x() = bb.max().x();
-//        faceID = treeBoundBox::RIGHTBIT;
-//    }
-//    else if (maxIndex == treeBoundBox::BOTTOM)
-//    {
-//        faceHitInfo.rawPoint().y() = bb.min().y();
-//        faceID = treeBoundBox::BOTTOMBIT;
-//    }
-//    else if (maxIndex == treeBoundBox::TOP)
-//    {
-//        faceHitInfo.rawPoint().y() = bb.max().y();
-//        faceID = treeBoundBox::TOPBIT;
-//    }
-//    else if (maxIndex == treeBoundBox::BACK)
-//    {
-//        faceHitInfo.rawPoint().z() = bb.min().z();
-//        faceID = treeBoundBox::BACKBIT;
-//    }
-//    else if (maxIndex == treeBoundBox::FRONT)
-//    {
-//        faceHitInfo.rawPoint().z() = bb.max().z();
-//        faceID = treeBoundBox::FRONTBIT;
-//    }
-//
-//    Pout<< "From ray:" << dir
-//        << " from point:" << oldPoint
-//        << " on faces:" << faceString(oldFaceID)
-//        << " of bb:" << bb
-//        << " with inprods:" << inproducts
-//        << " maxIndex:" << maxIndex << endl
-//        << "perturbed to point:" << faceHitInfo.rawPoint()
-//        << " on face:" << faceString(faceID)
-//        << endl;
-//
-//
-//    if (debug)
-//    {
-//        if (faceID != bb.faceBits(faceHitInfo.rawPoint()))
-//        {
-//            FatalErrorInFunction
-//                << "Pushed point from " << oldPoint
-//                << " on face:" << oldFaceID << " of bb:" << bb << endl
-//                << "onto " << faceHitInfo.rawPoint()
-//                << " on face:" << faceID
-//                << " which is not consistent with geometric face "
-//                <<  bb.faceBits(faceHitInfo.rawPoint())
-//                << abort(FatalError);
-//        }
-//    }
-//}
-
-
-// Get parent node and octant. Return false if top of tree reached.
 template<class Type>
 bool Foam::indexedOctree<Type>::walkToParent
 (
@@ -1264,10 +1037,6 @@ bool Foam::indexedOctree<Type>::walkToParent
 }
 
 
-// Walk tree to neighbouring node. Gets current position as
-// node and octant in this node and walks in the direction given by
-// the facePointBits (combination of treeBoundBox::LEFTBIT, TOPBIT etc.)
-// Returns false if edge of tree hit.
 template<class Type>
 bool Foam::indexedOctree<Type>::walkToNeighbour
 (
@@ -1277,6 +1046,10 @@ bool Foam::indexedOctree<Type>::walkToNeighbour
     direction& octant
 ) const
 {
+    // Gets current position as node and octant in this node and walks in the
+    // direction given by the facePointBits (combination of
+    // treeBoundBox::LEFTBIT, TOPBIT etc.)  Returns false if edge of tree hit.
+
     label oldNodeI = nodeI;
     direction oldOctant = octant;
 
@@ -1552,12 +1325,6 @@ Foam::word Foam::indexedOctree<Type>::faceString
 }
 
 
-// Traverse a node. If intersects a triangle return first intersection point:
-//  hitInfo.index = index of shape
-//  hitInfo.point = point on shape
-// Else return a miss and the bounding box face hit:
-//  hitInfo.point = coordinate of intersection of ray with bounding box
-//  hitBits  = posbits of point on bounding box
 template<class Type>
 template<class FindIntersectOp>
 void Foam::indexedOctree<Type>::traverseNode
@@ -1577,6 +1344,14 @@ void Foam::indexedOctree<Type>::traverseNode
     const FindIntersectOp& fiOp
 ) const
 {
+    // Traverse a node. If intersects a triangle return first intersection
+    // point:
+    //  hitInfo.index = index of shape
+    //  hitInfo.point = point on shape
+    // Else return a miss and the bounding box face hit:
+    //  hitInfo.point = coordinate of intersection of ray with bounding box
+    //  hitBits  = posbits of point on bounding box
+
     if (debug)
     {
         const treeBoundBox octantBb(subBbox(nodeI, octant));
@@ -1718,7 +1493,6 @@ void Foam::indexedOctree<Type>::traverseNode
 }
 
 
-// Find first intersection
 template<class Type>
 template<class FindIntersectOp>
 Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
@@ -1911,7 +1685,6 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
 }
 
 
-// Find first intersection
 template<class Type>
 template<class FindIntersectOp>
 Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
@@ -2255,7 +2028,6 @@ void Foam::indexedOctree<Type>::findNear
 }
 
 
-// Number of elements in node.
 template<class Type>
 Foam::label Foam::indexedOctree<Type>::countElements
 (
@@ -2550,27 +2322,6 @@ Foam::scalar& Foam::indexedOctree<Type>::perturbTol()
 }
 
 
-//template<class Type>
-//bool Foam::indexedOctree<Type>::findAnyOverlap
-//(
-//    const point& sample,
-//    const scalar startDistSqr
-//) const
-//{
-//    if (nodes_.size())
-//    {
-//        return findAnyOverlap
-//        (
-//            0,
-//            sample,
-//            startDistSqr
-//        );
-//    }
-//
-//    return false;
-//}
-
-
 template<class Type>
 Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
 (
@@ -2672,7 +2423,6 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
 }
 
 
-// Find nearest intersection
 template<class Type>
 Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
 (
@@ -2690,7 +2440,6 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
 }
 
 
-// Find nearest intersection
 template<class Type>
 Foam::pointIndexHit Foam::indexedOctree<Type>::findLineAny
 (
@@ -2708,7 +2457,6 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLineAny
 }
 
 
-// Find nearest intersection
 template<class Type>
 template<class FindIntersectOp>
 Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
@@ -2722,7 +2470,6 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
 }
 
 
-// Find nearest intersection
 template<class Type>
 template<class FindIntersectOp>
 Foam::pointIndexHit Foam::indexedOctree<Type>::findLineAny
@@ -2773,7 +2520,6 @@ Foam::labelList Foam::indexedOctree<Type>::findSphere
 }
 
 
-// Find node (as parent+octant) containing point
 template<class Type>
 Foam::labelBits Foam::indexedOctree<Type>::findNode
 (
@@ -2874,7 +2620,6 @@ const Foam::labelList& Foam::indexedOctree<Type>::findIndices
 }
 
 
-// Determine type (inside/outside/mixed) per node.
 template<class Type>
 Foam::volumeType Foam::indexedOctree<Type>::getVolumeType
 (
@@ -2886,13 +2631,6 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType
         return volumeType::UNKNOWN;
     }
 
-//    // If the sample is not within the octree, then have to query shapes
-//    // directly
-//    if (!nodes_[0].bb_.contains(sample))
-//    {
-//        return volumeType(shapes_.getVolumeType(*this, sample));
-//    }
-
     if (nodeTypes_.size() != 8*nodes_.size())
     {
         // Calculate type for every octant of node.
@@ -2975,7 +2713,6 @@ void Foam::indexedOctree<Type>::findNear
 }
 
 
-// Print contents of nodeI
 template<class Type>
 void Foam::indexedOctree<Type>::print
 (
@@ -3049,7 +2786,6 @@ void Foam::indexedOctree<Type>::print
 }
 
 
-// Print contents of nodeI
 template<class Type>
 bool Foam::indexedOctree<Type>::write(Ostream& os) const
 {
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
index e0ead6cf00..0fb024f2d1 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
@@ -181,6 +181,8 @@ private:
                 DynamicList<labelList>& contents
             ) const;
 
+            //- Reorder contents to be in same order as nodes.
+            //  Returns number of nodes on the compactLevel.
             static label compactContents
             (
                 DynamicList<node>& nodes,
@@ -245,6 +247,9 @@ private:
 
             //- Helper: take point on face(s) of bb and push it away from
             //  edges of face.
+            //  Guarantees that if pt is on a face it gets perturbed
+            //  so it is away from the face edges.
+            //  If pt is not on a face does nothing.
             static point pushPointIntoFace
             (
                 const treeBoundBox& bb,
@@ -252,15 +257,6 @@ private:
                 const point& pt
             );
 
-            ////- Push point on multiple faces away from any corner/edge.
-            //static void checkMultipleFaces
-            //(
-            //    const treeBoundBox& bb,
-            //    const vector& dir,          // end-start
-            //    pointIndexHit& faceHitInfo,
-            //    direction& faceID
-            //);
-
             //- Walk to parent of node+octant.
             bool walkToParent
             (
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
index 6f32f291a6..c9f6aefe81 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,6 +64,8 @@ class IOdictionary
     // Private Member Functions
 
         //- Read dictionary from file
+        //  Parallel aware reading, using non-virtual type information
+        //  (typeName instead of type()) because of use in constructor.
         void readFile(const bool);
 
 
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C
index d18a0e2934..9920451007 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Parallel aware reading, using non-virtual type information (typeName instead
-// of type()) because of use in constructor.
 void Foam::IOdictionary::readFile(const bool masterOnly)
 {
     if (Pstream::master() || !masterOnly)
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.C b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.C
index 06dcc9200e..25ee28e005 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.C
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,8 +83,6 @@ bool Foam::Istream::peekBack(token& t)
 }
 
 
-// Functions for reading object delimiters ( ... )
-
 Foam::Istream& Foam::Istream::readBegin(const char* funcName)
 {
     token delimiter(*this);
@@ -126,8 +124,6 @@ Foam::Istream& Foam::Istream::readEndBegin(const char* funcName)
 }
 
 
-// Functions for reading List delimiters ( ... ) or { ... }
-
 char Foam::Istream::readBeginList(const char* funcName)
 {
     token delimiter(*this);
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C
index 2651526336..ab95c8c19f 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Decrement the indent level
 void Foam::Ostream::decrIndent()
 {
     if (indentLevel_ == 0)
@@ -46,16 +45,12 @@ void Foam::Ostream::decrIndent()
 }
 
 
-// Write keyType
-// write regular expression as quoted string
-// write plain word as word (unquoted)
 Foam::Ostream& Foam::Ostream::write(const keyType& kw)
 {
     return writeQuoted(kw, kw.isPattern());
 }
 
 
-// Write the keyword followed by appropriate indentation
 Foam::Ostream& Foam::Ostream::writeKeyword(const keyType& kw)
 {
     indent();
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
index bf808f2578..aada0b4f9a 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,6 +109,8 @@ public:
             virtual Ostream& write(const word&) = 0;
 
             //- Write keyType
+            //  write regular expression as quoted string
+            //  write plain word as word (unquoted)
             virtual Ostream& write(const keyType&);
 
             //- Write string
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 6a332a1f4e..af61a05dec 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -115,7 +115,6 @@ Foam::List<Foam::UPstream::commsStruct> Foam::UPstream::calcLinearComm
 }
 
 
-// Append my children (and my children children etc.) to allReceives.
 void Foam::UPstream::collectReceives
 (
     const label procID,
@@ -123,6 +122,8 @@ void Foam::UPstream::collectReceives
     DynamicList<label>& allReceives
 )
 {
+    // Append my children (and my children children etc.) to allReceives.
+
     const DynamicList<label>& myChildren = receives[procID];
 
     forAll(myChildren, childI)
@@ -133,37 +134,38 @@ void Foam::UPstream::collectReceives
 }
 
 
-// Tree like schedule. For 8 procs:
-// (level 0)
-//      0 receives from 1
-//      2 receives from 3
-//      4 receives from 5
-//      6 receives from 7
-// (level 1)
-//      0 receives from 2
-//      4 receives from 6
-// (level 2)
-//      0 receives from 4
-//
-// The sends/receives for all levels are collected per processor (one send per
-// processor; multiple receives possible) creating a table:
-//
-// So per processor:
-// proc     receives from   sends to
-// ----     -------------   --------
-//  0       1,2,4           -
-//  1       -               0
-//  2       3               0
-//  3       -               2
-//  4       5               0
-//  5       -               4
-//  6       7               4
-//  7       -               6
 Foam::List<Foam::UPstream::commsStruct> Foam::UPstream::calcTreeComm
 (
     label nProcs
 )
 {
+    // Tree like schedule. For 8 procs:
+    // (level 0)
+    //      0 receives from 1
+    //      2 receives from 3
+    //      4 receives from 5
+    //      6 receives from 7
+    // (level 1)
+    //      0 receives from 2
+    //      4 receives from 6
+    // (level 2)
+    //      0 receives from 4
+    //
+    // The sends/receives for all levels are collected per processor
+    //  (one send per processor; multiple receives possible) creating a table:
+    //
+    // So per processor:
+    // proc     receives from   sends to
+    // ----     -------------   --------
+    //  0       1,2,4           -
+    //  1       -               0
+    //  2       3               0
+    //  3       -               2
+    //  4       5               0
+    //  5       -               4
+    //  6       7               4
+    //  7       -               6
+
     label nLevels = 1;
     while ((1 << nLevels) < nProcs)
     {
@@ -378,29 +380,22 @@ Foam::label Foam::UPstream::procNo
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-// By default this is not a parallel run
 bool Foam::UPstream::parRun_(false);
 
-// Free communicators
 Foam::LIFOStack<Foam::label> Foam::UPstream::freeComms_;
 
-// My processor number
 Foam::DynamicList<int> Foam::UPstream::myProcNo_(10);
 
-// List of process IDs
 Foam::DynamicList<Foam::List<int>> Foam::UPstream::procIDs_(10);
 
-// Parent communicator
 Foam::DynamicList<Foam::label> Foam::UPstream::parentCommunicator_(10);
 
-// Standard transfer message type
 int Foam::UPstream::msgType_(1);
 
-// Linear communication schedule
+
 Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct>>
 Foam::UPstream::linearCommunication_(10);
 
-// Multi level communication schedule
 Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct>>
 Foam::UPstream::treeCommunication_(10);
 
@@ -415,10 +410,6 @@ Foam::UPstream::communicator serialComm
 );
 
 
-
-// Should compact transfer be used in which floats replace doubles
-// reducing the bandwidth requirement at the expense of some loss
-// in accuracy
 bool Foam::UPstream::floatTransfer
 (
     Foam::debug::optimisationSwitch("floatTransfer", 0)
@@ -430,8 +421,6 @@ registerOptSwitch
     Foam::UPstream::floatTransfer
 );
 
-// Number of processors at which the reduce algorithm changes from linear to
-// tree
 int Foam::UPstream::nProcsSimpleSum
 (
     Foam::debug::optimisationSwitch("nProcsSimpleSum", 16)
@@ -443,7 +432,6 @@ registerOptSwitch
     Foam::UPstream::nProcsSimpleSum
 );
 
-// Default commsType
 Foam::UPstream::commsTypes Foam::UPstream::defaultCommsType
 (
     commsTypeNames.read(Foam::debug::optimisationSwitches().lookup("commsType"))
@@ -483,15 +471,10 @@ namespace Foam
     addcommsTypeToOpt addcommsTypeToOpt_("commsType");
 }
 
-// Default communicator
 Foam::label Foam::UPstream::worldComm(0);
 
-
-// Warn for use of any communicator
 Foam::label Foam::UPstream::warnComm(-1);
 
-
-// Number of polling cycles in processor updates
 int Foam::UPstream::nPollProcInterfaces
 (
     Foam::debug::optimisationSwitch("nPollProcInterfaces", 0)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 615f9a6fb5..67450666d2 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -181,17 +181,30 @@ private:
 
     // Private data
 
+        //- By default this is not a parallel run
         static bool parRun_;
+
+        //- Standard transfer message type
         static int msgType_;
 
         // Communicator specific data
 
+        //- Free communicators
         static LIFOStack<label> freeComms_;
+
+        //- My processor number
         static DynamicList<int> myProcNo_;
+
+        //- List of process IDs
         static DynamicList<List<int>> procIDs_;
+
+        //- Parent communicator
         static DynamicList<label> parentCommunicator_;
 
+        //- Linear communication schedule
         static DynamicList<List<commsStruct>> linearCommunication_;
+
+        //- Multi level communication schedule
         static DynamicList<List<commsStruct>> treeCommunication_;
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
index 48036e7c52..323dc8d3c3 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,15 +38,10 @@ Description
 #include "IOstreams.H"
 #include "contiguous.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T, class CombineOp>
-void Pstream::combineGather
+void Foam::Pstream::combineGather
 (
     const List<UPstream::commsStruct>& comms,
     T& Value,
@@ -140,7 +135,7 @@ void Pstream::combineGather
 
 
 template <class T, class CombineOp>
-void Pstream::combineGather
+void Foam::Pstream::combineGather
 (
     T& Value,
     const CombineOp& cop,
@@ -174,7 +169,7 @@ void Pstream::combineGather
 
 
 template<class T>
-void Pstream::combineScatter
+void Foam::Pstream::combineScatter
 (
     const List<UPstream::commsStruct>& comms,
     T& Value,
@@ -255,7 +250,7 @@ void Pstream::combineScatter
 
 
 template <class T>
-void Pstream::combineScatter
+void Foam::Pstream::combineScatter
 (
     T& Value,
     const int tag,
@@ -273,12 +268,8 @@ void Pstream::combineScatter
 }
 
 
-// Same thing but for whole list at a time
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
 template<class T, class CombineOp>
-void Pstream::listCombineGather
+void Foam::Pstream::listCombineGather
 (
     const List<UPstream::commsStruct>& comms,
     List<T>& Values,
@@ -379,7 +370,7 @@ void Pstream::listCombineGather
 
 
 template<class T, class CombineOp>
-void Pstream::listCombineGather
+void Foam::Pstream::listCombineGather
 (
     List<T>& Values,
     const CombineOp& cop,
@@ -413,7 +404,7 @@ void Pstream::listCombineGather
 
 
 template<class T>
-void Pstream::listCombineScatter
+void Foam::Pstream::listCombineScatter
 (
     const List<UPstream::commsStruct>& comms,
     List<T>& Values,
@@ -494,7 +485,7 @@ void Pstream::listCombineScatter
 
 
 template <class T>
-void Pstream::listCombineScatter
+void Foam::Pstream::listCombineScatter
 (
     List<T>& Values,
     const int tag,
@@ -524,14 +515,8 @@ void Pstream::listCombineScatter
 }
 
 
-
-
-// Same thing but for sparse list (map)
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
 template<class Container, class CombineOp>
-void Pstream::mapCombineGather
+void Foam::Pstream::mapCombineGather
 (
     const List<UPstream::commsStruct>& comms,
     Container& Values,
@@ -598,7 +583,7 @@ void Pstream::mapCombineGather
 
 
 template<class Container, class CombineOp>
-void Pstream::mapCombineGather
+void Foam::Pstream::mapCombineGather
 (
     Container& Values,
     const CombineOp& cop,
@@ -632,7 +617,7 @@ void Pstream::mapCombineGather
 
 
 template<class Container>
-void Pstream::mapCombineScatter
+void Foam::Pstream::mapCombineScatter
 (
     const List<UPstream::commsStruct>& comms,
     Container& Values,
@@ -683,7 +668,7 @@ void Pstream::mapCombineScatter
 
 
 template <class Container>
-void Pstream::mapCombineScatter
+void Foam::Pstream::mapCombineScatter
 (
     Container& Values,
     const int tag,
@@ -713,8 +698,4 @@ void Pstream::mapCombineScatter
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
index 1cfabe128c..94cf60f4fb 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -579,7 +579,6 @@ Foam::Istream& Foam::ISstream::read(string& str)
 }
 
 
-// Special handling of '{' in variables
 Foam::Istream& Foam::ISstream::readVariable(string& str)
 {
     static const int maxLen = 1024;
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
index 2d35ae1193..0feb835340 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -249,7 +249,6 @@ void Foam::OSstream::flush()
 }
 
 
-// Add carriage return and flush stream
 void Foam::OSstream::endl()
 {
     write('\n');
@@ -257,14 +256,12 @@ void Foam::OSstream::endl()
 }
 
 
-// Get flags of output stream
 std::ios_base::fmtflags Foam::OSstream::flags() const
 {
     return os_.flags();
 }
 
 
-// Set flags of output stream
 std::ios_base::fmtflags Foam::OSstream::flags(const ios_base::fmtflags f)
 {
     return os_.flags(f);
@@ -273,26 +270,24 @@ std::ios_base::fmtflags Foam::OSstream::flags(const ios_base::fmtflags f)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
-// Get width of output field
 int Foam::OSstream::width() const
 {
     return os_.width();
 }
 
-// Set width of output field (and return old width)
+
 int Foam::OSstream::width(const int w)
 {
     return os_.width(w);
 }
 
-// Get precision of output field
+
 int Foam::OSstream::precision() const
 {
     return os_.precision();
 }
 
-// Set precision of output field (and return old precision)
+
 int Foam::OSstream::precision(const int p)
 {
     return os_.precision(p);
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index da9a9807c3..b0b147465b 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -754,7 +754,6 @@ Foam::word Foam::Time::timeName() const
 }
 
 
-// Search the construction path for times
 Foam::instantList Foam::Time::times() const
 {
     return findTimes(path(), constant());
@@ -795,7 +794,7 @@ Foam::instant Foam::Time::findClosestTime(const scalar t) const
 {
     instantList timeDirs = findTimes(path(), constant());
 
-    // there is only one time (likely "constant") so return it
+    // There is only one time (likely "constant") so return it
     if (timeDirs.size() == 1)
     {
         return timeDirs[0];
@@ -827,16 +826,6 @@ Foam::instant Foam::Time::findClosestTime(const scalar t) const
 }
 
 
-// This should work too,
-// if we don't worry about checking "constant" explicitly
-//
-// Foam::instant Foam::Time::findClosestTime(const scalar t) const
-// {
-//     instantList timeDirs = findTimes(path(), constant());
-//     label timeIndex = min(findClosestTimeIndex(timeDirs, t), 0, constant());
-//     return timeDirs[timeIndex];
-// }
-
 Foam::label Foam::Time::findClosestTimeIndex
 (
     const instantList& timeDirs,
diff --git a/src/OpenFOAM/db/error/messageStream.C b/src/OpenFOAM/db/error/messageStream.C
index 90d196ac6e..7ca86cc7aa 100644
--- a/src/OpenFOAM/db/error/messageStream.C
+++ b/src/OpenFOAM/db/error/messageStream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 
 int Foam::messageStream::level(Foam::debug::debugSwitch("level", 2));
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Foam::messageStream::messageStream
@@ -239,7 +238,6 @@ Foam::messageStream::operator Foam::OSstream&()
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Global messageStream definitions
 
 Foam::messageStream Foam::SeriousError
 (
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index 5a239f5642..b2447447d1 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -63,7 +63,6 @@ registerOptSwitch
 const Foam::NamedEnum<Foam::regIOobject::fileCheckTypes, 4>
     Foam::regIOobject::fileCheckTypesNames;
 
-// Default fileCheck type
 Foam::regIOobject::fileCheckTypes Foam::regIOobject::fileModificationChecking
 (
     fileCheckTypesNames.read
@@ -117,7 +116,6 @@ bool Foam::regIOobject::masterOnlyReading = false;
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from IOobject
 Foam::regIOobject::regIOobject(const IOobject& io, const bool isTime)
 :
     IOobject(io),
@@ -140,7 +138,6 @@ Foam::regIOobject::regIOobject(const IOobject& io, const bool isTime)
 }
 
 
-// Construct as copy
 Foam::regIOobject::regIOobject(const regIOobject& rio)
 :
     IOobject(rio),
@@ -154,8 +151,6 @@ Foam::regIOobject::regIOobject(const regIOobject& rio)
 }
 
 
-// Construct as copy, and transfering objectRegistry registration to copy
-// if registerCopy is true
 Foam::regIOobject::regIOobject(const regIOobject& rio, bool registerCopy)
 :
     IOobject(rio),
@@ -216,7 +211,6 @@ Foam::regIOobject::regIOobject
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-// Delete read stream, checkout from objectRegistry and destroy
 Foam::regIOobject::~regIOobject()
 {
     if (objectRegistry::debug)
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 69a2ecb50a..220b7256c6 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -729,9 +729,6 @@ Foam::dimensioned<Type> Foam::operator/
 }
 
 
-// Products
-// ~~~~~~~~
-
 #define PRODUCT_OPERATOR(product, op, opFunc)                                  \
                                                                                \
 template<class Type1, class Type2>                                             \
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 4739e3fa3c..4a7569bc01 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -229,7 +229,6 @@ Foam::Field<Type>::Field(const UList<Type>& list)
 {}
 
 
-// Construct as copy of tmp<Field>
 #ifndef NoConstructFromTmp
 template<class Type>
 Foam::Field<Type>::Field(const tmp<Field<Type>>& tf)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index 88fc8b81d2..717f7d609f 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -359,11 +359,6 @@ GeometricBoundaryField
 }
 
 
-// Construct as copy
-// Dangerous because Field may be set to a field which gets deleted.
-// Need new type of GeometricBoundaryField, one which IS part of a geometric
-// field for which snGrad etc. may be called and a free standing
-// GeometricBoundaryField for which such operations are unavailable.
 template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
 GeometricBoundaryField
@@ -631,7 +626,6 @@ operator=
 }
 
 
-// Forced assignments
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
 operator==
diff --git a/src/OpenFOAM/fields/ReadFields/ReadFields.C b/src/OpenFOAM/fields/ReadFields/ReadFields.C
index ab7779f28a..a76ca79a8e 100644
--- a/src/OpenFOAM/fields/ReadFields/ReadFields.C
+++ b/src/OpenFOAM/fields/ReadFields/ReadFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,8 +30,6 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-// Read all fields of type. Returns names of fields read. Guarantees all
-// processors to read fields in same order.
 template<class GeoField, class Mesh>
 Foam::wordList Foam::ReadFields
 (
diff --git a/src/OpenFOAM/fields/ReadFields/ReadFields.H b/src/OpenFOAM/fields/ReadFields/ReadFields.H
index 5d6e9db570..eb246701bd 100644
--- a/src/OpenFOAM/fields/ReadFields/ReadFields.H
+++ b/src/OpenFOAM/fields/ReadFields/ReadFields.H
@@ -46,6 +46,8 @@ namespace Foam
 class IOobjectList;
 
 //- Helper routine to read fields
+//  Reads all fields of type. Returns names of fields read. Guarantees all
+//  processors to read fields in same order.
 template<class GeoField, class Mesh>
 wordList ReadFields
 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index d72d22b81a..c22c91f79d 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -225,7 +225,6 @@ void Foam::valuePointPatchField<Type>::operator=
 }
 
 
-// Force an assignment
 template<class Type>
 void Foam::valuePointPatchField<Type>::operator==
 (
diff --git a/src/OpenFOAM/global/JobInfo/JobInfo.C b/src/OpenFOAM/global/JobInfo/JobInfo.C
index a37ae7613a..7d17218841 100644
--- a/src/OpenFOAM/global/JobInfo/JobInfo.C
+++ b/src/OpenFOAM/global/JobInfo/JobInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,6 @@ Foam::JobInfo Foam::jobInfo;
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Null constructor
 Foam::JobInfo::JobInfo()
 :
     runningJobPath_(),
diff --git a/src/OpenFOAM/graph/curve/curve.C b/src/OpenFOAM/graph/curve/curve.C
index 738179a777..aadff19fce 100644
--- a/src/OpenFOAM/graph/curve/curve.C
+++ b/src/OpenFOAM/graph/curve/curve.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,76 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "curve.H"
-//#include "curveTools.H"
 #include "Ostream.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// construct as interpolation
-/*
-curve::curve(const curve& Curve, const label nFacets)
-:
-    Name("Interpolated" + Curve.Name),
-    Style(Curve.Style),
-    X(2*nFacets),
-    Y(2*nFacets)
-{
-    // Calculate curve length
-    scalar curveLength=0;
-    label i;
-    for (i=0; i<Curve.size()-1; i++)
-    {
-        curveLength += distance(Curve[i], Curve[i+1]);
-    }
-
-    scalar stepLength = curveLength/nFacets;
-    label nPoints = 0;
-    label previous=0, next=1;
-    bool endOfCurve;
-    vector presentPoint=Curve[0], nextPoint;
-
-    do
-    {
-        endOfCurve =
-        stepForwardsToNextPoint
-        (
-            presentPoint,
-            nextPoint,
-            previous,
-            next,
-            stepLength,
-            Curve
-        );
-
-        if (!endOfCurve)
-        {
-            if (nPoints >= size()-1)
-            {
-                setSize(label(1.5*size()));
-            }
-
-            presentPoint = nextPoint;
-
-            x()[nPoints] = nextPoint.x();
-            y()[nPoints] = nextPoint.y();
-
-            nPoints++;
-        }
-
-    } while (!endOfCurve);
-
-    setSize(nPoints);
-}
-*/
-
-
-// construct given name, style and size
-curve::curve
+Foam::curve::curve
 (
     const string& name,
     const curveStyle& style,
@@ -106,8 +41,7 @@ curve::curve
 {}
 
 
-// construct from the bits
-curve::curve
+Foam::curve::curve
 (
     const string& name,
     const curveStyle& style,
@@ -120,45 +54,9 @@ curve::curve
 {}
 
 
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-// Gradient operation
-/*
-curve grad(const curve& Curve)
-{
-    curve gradCurve(Curve);
-
-    label i;
-    for (i=1; i<Curve.size()-1; i++)
-    {
-        scalar deltaIm1 = Curve[i].x() - Curve[i-1].x();
-        scalar deltaI = Curve[i+1].x() - Curve[i].x();
-
-        scalar deltaAv = 1.0/deltaIm1 + 1.0/deltaI;
-
-        gradCurve.y()[i] =
-            (
-                (Curve[i+1].y() - Curve[i].y())/sqr(deltaI)
-              + (Curve[i].y() - Curve[i-1].y())/sqr(deltaIm1)
-            )/deltaAv;
-    }
-
-    gradCurve.y()[0] =
-        (Curve[1].y() - Curve[0].y())/(Curve[1].x() - Curve[0].x());
-
-    label n = Curve.size()-1;
-
-    gradCurve.y()[n] =
-        (Curve[n].y() - Curve[n-1].y())/(Curve[n].x() - Curve[n-1].x());
-
-    return gradCurve;
-}
-*/
-
-
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Ostream& operator<<(Ostream& os, const curve& c)
+Foam::Ostream& Foam::operator<<(Ostream& os, const curve& c)
 {
     os  << nl
         << c.name_ << nl
@@ -171,8 +69,4 @@ Ostream& operator<<(Ostream& os, const curve& c)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C
index 3f5d9baba1..3324e9af3c 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C
@@ -105,7 +105,6 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::clearOut()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 template<class FromPatch, class ToPatch>
 PatchToPatchInterpolation<FromPatch, ToPatch>::PatchToPatchInterpolation
 (
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index ec6aba8a09..3937f9cb1e 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,7 +194,6 @@ void Foam::Matrix<Form, Type>::operator=(const Type& t)
 }
 
 
-// Assignment operator. Takes linear time.
 template<class Form, class Type>
 void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
 {
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
index b7cb0153c5..091b6b2695 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -215,7 +215,6 @@ const Foam::labelUList& Foam::lduAddressing::losortStartAddr() const
 }
 
 
-// Return edge index given owner and neighbour label
 Foam::label Foam::lduAddressing::triIndex(const label a, const label b) const
 {
     label own = min(a, b);
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index 31eb6fdc88..ddd79ad6ab 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -49,7 +49,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Create single cell mesh
 Foam::autoPtr<Foam::lduPrimitiveMesh>
 Foam::procFacesGAMGProcAgglomeration::singleCellMesh
 (
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index e12be87d61..d472b98ded 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -193,7 +193,6 @@ void Foam::GAMGSolver::agglomerateMatrix
 }
 
 
-// Agglomerate only the interface coefficients.
 void Foam::GAMGSolver::agglomerateInterfaceCoefficients
 (
     const label fineLevelIndex,
@@ -279,8 +278,6 @@ void Foam::GAMGSolver::agglomerateInterfaceCoefficients
 }
 
 
-// Gather matrices.
-// Note: matrices get constructed with dummy mesh
 void Foam::GAMGSolver::gatherMatrices
 (
     const labelList& procIDs,
diff --git a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C
index b6f3824543..678194dd24 100644
--- a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C
+++ b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,6 @@ Foam::labelList Foam::ProcessorTopology<Container, ProcPatch>::procNeighbours
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 template<class Container, class ProcPatch>
 Foam::ProcessorTopology<Container, ProcPatch>::ProcessorTopology
 (
diff --git a/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C b/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
index c7992b7823..67911ea21d 100644
--- a/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
+++ b/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
@@ -35,7 +35,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(commSchedule, 0);
+    defineTypeNameAndDebug(commSchedule, 0);
 }
 
 
@@ -62,7 +62,6 @@ Foam::label Foam::commSchedule::outstandingComms
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from separate addressing
 Foam::commSchedule::commSchedule
 (
     const label nProcs,
diff --git a/src/OpenFOAM/meshes/bandCompression/bandCompression.C b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
index 6a74fdf58a..339938fb7c 100644
--- a/src/OpenFOAM/meshes/bandCompression/bandCompression.C
+++ b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Constructor from components
 Foam::labelList Foam::bandCompression(const labelListList& cellCellAddressing)
 {
     labelList newOrder(cellCellAddressing.size());
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
index 5d7ff59ba8..5a048dc0e3 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,6 @@ Foam::cellMatcher::cellMatcher
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Create localFaces_ , pointMap_ , faceMap_
 Foam::label Foam::cellMatcher::calcLocalFaces
 (
     const faceList& faces,
@@ -136,7 +135,6 @@ Foam::label Foam::cellMatcher::calcLocalFaces
 }
 
 
-// Create edgeFaces_ : map from edge to two localFaces for single cell.
 void Foam::cellMatcher::calcEdgeAddressing(const label numVert)
 {
     edgeFaces_ = -1;
@@ -186,7 +184,6 @@ void Foam::cellMatcher::calcEdgeAddressing(const label numVert)
 }
 
 
-// Create pointFaceIndex_ : map from vertI, faceI to index of vertI on faceI.
 void Foam::cellMatcher::calcPointFaceIndex()
 {
     // Fill pointFaceIndex_ with -1
@@ -215,7 +212,6 @@ void Foam::cellMatcher::calcPointFaceIndex()
 }
 
 
-// Given edge(v0,v1) and (local)faceI return the other face
 Foam::label Foam::cellMatcher::otherFace
 (
     const label numVert,
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.C
index 55bf92e7c0..68278af08b 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,6 @@ const Foam::label Foam::pyrMatcher::maxVertPerFace = 4;
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct null
 Foam::pyrMatcher::pyrMatcher()
 :
     cellMatcher
@@ -49,14 +48,15 @@ Foam::pyrMatcher::pyrMatcher()
         maxVertPerFace,
         "pyr"
     )
-{
-}
+{}
+
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::pyrMatcher::~pyrMatcher()
 {}
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::pyrMatcher::matchShape
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.C b/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.C
index c43aa0abaf..1cfd988d7f 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,9 +85,6 @@ Foam::cellModeller::~cellModeller()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-// Returns a pointer to a model which matches the string symbol
-// supplied. A null pointer is returned if there is no suitable match.
-
 const Foam::cellModel* Foam::cellModeller::lookup(const word& name)
 {
     HashTable<const cellModel*>::iterator iter = modelDictionary_.find(name);
@@ -102,7 +99,5 @@ const Foam::cellModel* Foam::cellModeller::lookup(const word& name)
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModeller/globalCellModeller.C b/src/OpenFOAM/meshes/meshShapes/cellModeller/globalCellModeller.C
index 02787472f6..04652de888 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModeller/globalCellModeller.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellModeller/globalCellModeller.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,30 +32,23 @@ Description
 
 // * * * * * * * * * * * * * * * Static data * * * * * * * * * * * * * * * * //
 
-
-// PtrList of models
 Foam::PtrList<Foam::cellModel> Foam::cellModeller::models_
 (
     IFstream(findEtcFile("cellModels", true))()
 );
 
-// List of model pointers
 Foam::List<Foam::cellModel*> Foam::cellModeller::modelPtrs_;
 
-// HashTable of model pointers
 Foam::HashTable<const Foam::cellModel*> Foam::cellModeller::modelDictionary_;
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// Construct a dummy cellModeller which reads the models and fills
-// the above tables
-cellModeller globalCellModeller_;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    // Construct a dummy cellModeller which reads the models and fills
+    // the above tables
+    cellModeller globalCellModeller_;
+}
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.C b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.C
index 45165056fd..cb328fe983 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Remove duplicate vertices and reset correct cell model
 void Foam::cellShape::collapse()
 {
     operator=(degenerateMatcher::match(*this));
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index 4e9abeb033..d4bf604b5c 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -819,7 +819,6 @@ int Foam::face::edgeDirection(const edge& e) const
 }
 
 
-// Number of triangles directly known from number of vertices
 Foam::label Foam::face::nTriangles(const pointField&) const
 {
     return nTriangles();
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
index 504feb5cf2..b49ad74fe1 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,15 +29,16 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Calculate area in contact given displacement of vertices relative to
-// the face plane. Positive displacement is above the face (no contact);
-// negative is in contact
 Foam::scalar Foam::face::areaInContact
 (
     const pointField& meshPoints,
     const scalarField& v
 ) const
 {
+    // Calculate area in contact given displacement of vertices relative to
+    // the face plane. Positive displacement is above the face (no contact);
+    // negative is in contact
+
     // Assemble the vertex values
     const labelList& labels = *this;
 
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C b/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
index cb85049142..eb730e70b2 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,15 +30,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Return potential intersection with face with a ray starting
-// at p, direction n (does not need to be normalized)
-// Does face-center decomposition and returns triangle intersection
-// point closest to p.
-
-// In case of miss the point is the nearest point intersection of the
-// face plane and the ray and the distance is the distance between the
-// intersection point and the nearest point on the face
-
 Foam::pointHit Foam::face::ray
 (
     const point& p,
@@ -48,6 +39,15 @@ Foam::pointHit Foam::face::ray
     const intersection::direction dir
 ) const
 {
+    // Return potential intersection with face with a ray starting
+    // at p, direction n (does not need to be normalized)
+    // Does face-center decomposition and returns triangle intersection
+    // point closest to p.
+
+    // In case of miss the point is the nearest point intersection of the
+    // face plane and the ray and the distance is the distance between the
+    // intersection point and the nearest point on the face
+
     // If the face is a triangle, do a direct calculation
     if (size() == 3)
     {
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
index 51eaab0d25..2610376a34 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,9 +28,6 @@ License
 #include "pointMesh.H"
 #include "mapPolyMesh.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::pointMapper::calcAddressing() const
@@ -161,7 +158,6 @@ void Foam::pointMapper::clearOut()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::pointMapper::pointMapper(const pointMesh& pMesh, const mapPolyMesh& mpm)
 :
     pMesh_(pMesh),
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
index 1732a7ba0c..b157ecbc2d 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,6 @@ void Foam::pointPatchMapper::clearOut()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::pointPatchMapper::pointPatchMapper
 (
     const pointPatch& patch,
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclicSlip/cyclicSlipPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclicSlip/cyclicSlipPointPatch.C
index 2700e7fea9..3a2200aa96 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclicSlip/cyclicSlipPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclicSlip/cyclicSlipPointPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,6 @@ namespace Foam
 
 defineTypeNameAndDebug(cyclicSlipPointPatch, 0);
 
-// Add the patch constructor functions to the hash tables
 addToRunTimeSelectionTable
 (
     facePointPatch,
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C
index 085df98804..3979ef17c0 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,6 @@ namespace Foam
 
 defineTypeNameAndDebug(nonuniformTransformCyclicPointPatch, 0);
 
-// Add the patch constructor functions to the hash tables
 addToRunTimeSelectionTable
 (
     facePointPatch,
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/wall/wallPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/wall/wallPointPatch.C
index 285e355931..332e93837d 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/wall/wallPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/wall/wallPointPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,6 @@ namespace Foam
 
 defineTypeNameAndDebug(wallPointPatch, 0);
 
-// Add the patch constructor functions to the hash tables
 addToRunTimeSelectionTable
 (
     facePointPatch,
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 59705a16e1..26e369cff8 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -45,7 +45,6 @@ namespace Foam
 {
 defineTypeNameAndDebug(globalMeshData, 0);
 
-// Geometric matching tolerance. Factor of mesh bounding box.
 const scalar globalMeshData::matchTol_ = 1e-8;
 
 template<>
@@ -63,7 +62,6 @@ public:
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Collect processor patch addressing.
 void Foam::globalMeshData::initProcAddr()
 {
     processorPatchIndices_.setSize(mesh_.boundaryMesh().size());
@@ -251,7 +249,6 @@ void Foam::globalMeshData::calcSharedPoints() const
 }
 
 
-// Given information about locally used edges allocate global shared edges.
 void Foam::globalMeshData::countSharedEdges
 (
     const EdgeMap<labelList>& procSharedEdges,
@@ -294,12 +291,13 @@ void Foam::globalMeshData::countSharedEdges
 }
 
 
-// Shared edges are shared between multiple processors. By their nature both
-// of their endpoints are shared points. (but not all edges using two shared
-// points are shared edges! There might e.g. be an edge between two unrelated
-// clusters of shared points)
 void Foam::globalMeshData::calcSharedEdges() const
 {
+    // Shared edges are shared between multiple processors. By their nature both
+    // of their endpoints are shared points. (but not all edges using two shared
+    // points are shared edges! There might e.g. be an edge between two
+    // unrelated clusters of shared points)
+
     if
     (
         nGlobalEdges_ != -1
@@ -806,8 +804,6 @@ void Foam::globalMeshData::calcGlobalPointEdges
 }
 
 
-// Find transformation to take remotePoint to localPoint. Use info to find
-// the transforms.
 Foam::label Foam::globalMeshData::findTransform
 (
     const labelPairList& info,
@@ -1199,8 +1195,6 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
 }
 
 
-// Calculate uncoupled boundary faces (without calculating
-// primitiveMesh::pointFaces())
 void Foam::globalMeshData::calcPointBoundaryFaces
 (
     labelListList& pointBoundaryFaces
@@ -1737,7 +1731,6 @@ void Foam::globalMeshData::calcGlobalCoPointSlaves() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from polyMesh
 Foam::globalMeshData::globalMeshData(const polyMesh& mesh)
 :
     processorTopology(mesh.boundaryMesh(), UPstream::worldComm),
@@ -1820,7 +1813,6 @@ void Foam::globalMeshData::clearOut()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Return shared point global labels.
 const Foam::labelList& Foam::globalMeshData::sharedPointGlobalLabels() const
 {
     if (!sharedPointGlobalLabelsPtr_.valid())
@@ -1871,7 +1863,6 @@ const Foam::labelList& Foam::globalMeshData::sharedPointGlobalLabels() const
 }
 
 
-// Collect coordinates of shared points. (does parallel communication!)
 Foam::pointField Foam::globalMeshData::sharedPoints() const
 {
     // Get all processors to send their shared points to master.
@@ -1954,7 +1945,6 @@ Foam::pointField Foam::globalMeshData::sharedPoints() const
 }
 
 
-// Collect coordinates of shared points. (does parallel communication!)
 Foam::pointField Foam::globalMeshData::geometricSharedPoints() const
 {
     // Get coords of my shared points
@@ -2728,7 +2718,6 @@ void Foam::globalMeshData::movePoints(const pointField& newPoints)
 }
 
 
-// Update all data after morph
 void Foam::globalMeshData::updateMesh()
 {
     // Clear out old data
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index 53399ca8d2..fa753427ec 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -33,14 +33,12 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(globalPoints, 0);
+    defineTypeNameAndDebug(globalPoints, 0);
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Total number of points on coupled patches. Is upper limit for number
-// of shared points
 Foam::label Foam::globalPoints::countPatchPoints
 (
     const polyBoundaryMesh& patches
@@ -125,9 +123,6 @@ Foam::labelPairList Foam::globalPoints::addSendTransform
 }
 
 
-// Collect all topological information about a point on a patch.
-// (this information is the patch faces using the point and the relative
-// position of the point in the face)
 void Foam::globalPoints::addToSend
 (
     const polyPatch& pp,
@@ -139,6 +134,10 @@ void Foam::globalPoints::addToSend
     DynamicList<labelPairList>& allInfo
 ) const
 {
+    // Collect all topological information about a point on a patch.  (this
+    // information is the patch faces using the point and the relative position
+    // of the point in the face)
+
     label meshPointI = pp.meshPoints()[patchPointI];
 
     // Add all faces using the point so we are sure we find it on the
@@ -160,8 +159,6 @@ void Foam::globalPoints::addToSend
 }
 
 
-// Add nbrInfo to myInfo. Return true if anything changed.
-// nbrInfo is for a point a list of all the global points using it
 bool Foam::globalPoints::mergeInfo
 (
     const labelPairList& nbrInfo,
@@ -169,6 +166,9 @@ bool Foam::globalPoints::mergeInfo
     labelPairList& myInfo
 ) const
 {
+    // Add nbrInfo to myInfo. Return true if anything changed.  nbrInfo is for a
+    // point a list of all the global points using it
+
     bool anyChanged = false;
 
     // Extend to make space for the nbrInfo (trimmed later)
@@ -267,14 +267,15 @@ Foam::label Foam::globalPoints::localToMeshPoint
 }
 
 
-// Updates database of current information on meshpoints with nbrInfo.
-// Uses mergeInfo above. Returns true if data kept for meshPointI changed.
 bool Foam::globalPoints::mergeInfo
 (
     const labelPairList& nbrInfo,
     const label localPointI
 )
 {
+    // Updates database of current information on meshpoints with nbrInfo.  Uses
+    // mergeInfo above. Returns true if data kept for meshPointI changed.
+
     label infoChanged = false;
 
     // Get the index into the procPoints list.
@@ -315,14 +316,15 @@ bool Foam::globalPoints::mergeInfo
 }
 
 
-// Updates database of current information on meshpoints with nbrInfo.
-// Uses mergeInfo above. Returns true if data kept for meshPointI changed.
 bool Foam::globalPoints::storeInitialInfo
 (
     const labelPairList& nbrInfo,
     const label localPointI
 )
 {
+    // Updates database of current information on meshpoints with nbrInfo.  Uses
+    // mergeInfo above. Returns true if data kept for meshPointI changed.
+
     label infoChanged = false;
 
     // Get the index into the procPoints list.
@@ -387,7 +389,6 @@ void Foam::globalPoints::printProcPoints
 }
 
 
-// Insert my own points into structure and mark as changed.
 void Foam::globalPoints::initOwnPoints
 (
     const Map<label>& meshToPatchPoint,
@@ -475,7 +476,6 @@ void Foam::globalPoints::initOwnPoints
 }
 
 
-// Send all my info on changedPoints_ to my neighbours.
 void Foam::globalPoints::sendPatchPoints
 (
     const bool mergeSeparated,
@@ -563,11 +563,6 @@ void Foam::globalPoints::sendPatchPoints
 }
 
 
-// Receive all my neighbours' information and merge with mine.
-// After finishing will have updated
-// - procPoints_ : all neighbour information merged in.
-// - meshToProcPoint_
-// - changedPoints: all points for which something changed.
 void Foam::globalPoints::receivePatchPoints
 (
     const bool mergeSeparated,
@@ -577,6 +572,12 @@ void Foam::globalPoints::receivePatchPoints
     labelHashSet& changedPoints
 )
 {
+    // Receive all my neighbours' information and merge with mine.
+    // After finishing will have updated
+    // - procPoints_ : all neighbour information merged in.
+    // - meshToProcPoint_
+    // - changedPoints: all points for which something changed.
+
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
     const labelPairList& patchInfo = globalTransforms_.patchTransformSign();
 
@@ -721,14 +722,15 @@ void Foam::globalPoints::receivePatchPoints
 }
 
 
-// Remove entries which are handled by normal face-face communication. I.e.
-// those points where the equivalence list is only me and my (face)neighbour
 void Foam::globalPoints::remove
 (
     const labelList& patchToMeshPoint,
     const Map<label>& directNeighbours
 )
 {
+    // Remove entries which are handled by normal face-face communication. I.e.
+    // those points where the equivalence list is only me and my (face)neighbour
+
     // Save old ones.
     Map<label> oldMeshToProcPoint(meshToProcPoint_.xfer());
     meshToProcPoint_.resize(oldMeshToProcPoint.size());
@@ -1087,7 +1089,6 @@ void Foam::globalPoints::calculateSharedPoints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from mesh
 Foam::globalPoints::globalPoints
 (
     const polyMesh& mesh,
@@ -1116,7 +1117,6 @@ Foam::globalPoints::globalPoints
 }
 
 
-// Construct from mesh and patch of coupled faces
 Foam::globalPoints::globalPoints
 (
     const polyMesh& mesh,
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
index ed8f78c259..d43410ec9d 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -286,7 +286,6 @@ void Foam::cellMapper::clearOut()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::cellMapper::cellMapper(const mapPolyMesh& mpm)
 :
     mesh_(mpm.mesh()),
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
index 71ca27fa85..aa80be4c36 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -201,7 +201,6 @@ void Foam::faceMapper::clearOut()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::faceMapper::faceMapper(const mapPolyMesh& mpm)
 :
     mesh_(mpm.mesh()),
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapAddedPolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapAddedPolyMesh.C
index 07ee3f874c..202eaeceb0 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapAddedPolyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapAddedPolyMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::mapAddedPolyMesh::mapAddedPolyMesh
 (
     const label nOldPoints,
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index 2624d9a696..bbb4c0ceb8 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -358,9 +358,6 @@ void Foam::mapDistribute::printLayout(Ostream& os) const
 }
 
 
-// Construct per processor compact addressing of the global elements
-// needed. The ones from the local processor are not included since
-// these are always all needed.
 void Foam::mapDistribute::calcCompactAddressing
 (
     const globalIndex& globalNumbering,
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
index f209610e0f..072fe3f6c8 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
@@ -186,12 +186,16 @@ class mapDistribute
             const label receivedSize
         );
 
+        //- Construct per processor compact addressing of the global elements
+        //  needed. The ones from the local processor are not included since
+        //  these are always all needed.
         void calcCompactAddressing
         (
             const globalIndex& globalNumbering,
             const labelList& elements,
             List<Map<label>>& compactMap
         ) const;
+
         void calcCompactAddressing
         (
             const globalIndex& globalNumbering,

From 5db3116a744a76f42374ab4ed5d31e84b45b30e2 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 1 Mar 2016 12:29:01 +0000
Subject: [PATCH 239/447] src/OpenFOAM: Moved function documentation comments
 into .H files and removed duplicates

---
 .../generation/foamyMesh/foamyQuadMesh/CV2D.C | 333 +++++++++---------
 src/OpenFOAM/db/error/StaticAssert.H          |   6 -
 .../construction/runTimeSelectionTables.H     |  90 ++---
 .../memberFunctionSelectionTables.H           |  96 ++---
 src/OpenFOAM/db/typeInfo/className.H          |  24 +-
 .../dimensionedType/dimensionedType.H         |   3 -
 src/OpenFOAM/global/debug/defineDebugSwitch.H |   9 +-
 src/OpenFOAM/include/addDictOption.H          |  16 +-
 src/OpenFOAM/include/addOverwriteOption.H     |  15 +-
 src/OpenFOAM/include/addRegionOption.H        |  17 +-
 src/OpenFOAM/include/addTimeOptions.H         |  47 ++-
 src/OpenFOAM/include/checkConstantOption.H    |  23 +-
 src/OpenFOAM/include/checkTimeOption.H        |   3 -
 src/OpenFOAM/include/checkTimeOptions.H       |   4 -
 .../include/checkTimeOptionsNoConstant.H      |   4 -
 src/OpenFOAM/include/createMesh.H             |  28 +-
 src/OpenFOAM/include/createMeshNoClear.H      |  29 +-
 src/OpenFOAM/include/createNamedMesh.H        |  50 ++-
 src/OpenFOAM/include/createNamedPolyMesh.H    |  50 ++-
 src/OpenFOAM/include/createPolyMesh.H         |  28 +-
 src/OpenFOAM/include/createTime.H             |   8 +-
 .../include/setConstantMeshDictionaryIO.H     |  46 ++-
 src/OpenFOAM/include/setRootCase.H            |  14 +-
 .../include/setSystemMeshDictionaryIO.H       |  46 ++-
 .../include/setSystemRunTimeDictionaryIO.H    |  46 ++-
 .../polyTopoChange/polyTopoChange/hexRef8.C   |   7 -
 .../autoHexMeshDriver/autoSnapDriver.H        |  53 ++-
 .../autoHexMeshDriver/autoSnapDriverFeature.C |  41 +--
 28 files changed, 473 insertions(+), 663 deletions(-)

diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
index f8cdecfd6f..8a0443e1a8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -749,212 +749,211 @@ void Foam::CV2D::newPoints()
     boundaryConform();
 
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Old Method
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Old Method
+    /*
+    for
+    (
+        Triangulation::Finite_vertices_iterator vit = finite_vertices_begin();
+        vit != finite_vertices_end();
+        ++vit
+    )
+    {
+        if (vit->internalPoint())
+        {
+            // Current dual-cell defining vertex ("centre")
+            point2DFromPoint defVert0 = toPoint2D(vit->point());
 
-// for
-// (
-//     Triangulation::Finite_vertices_iterator vit = finite_vertices_begin();
-//     vit != finite_vertices_end();
-//     ++vit
-// )
-// {
-//     if (vit->internalPoint())
-//     {
-//         // Current dual-cell defining vertex ("centre")
-//         point2DFromPoint defVert0 = toPoint2D(vit->point());
+            Triangulation::Edge_circulator ec = incident_edges(vit);
+            Triangulation::Edge_circulator ecStart = ec;
 
-//         Triangulation::Edge_circulator ec = incident_edges(vit);
-//         Triangulation::Edge_circulator ecStart = ec;
+            // Circulate around the edges to find the first which is not
+            // infinite
+            do
+            {
+                if (!is_infinite(ec)) break;
+            } while (++ec != ecStart);
 
-//         // Circulate around the edges to find the first which is not
-//         // infinite
-//         do
-//         {
-//             if (!is_infinite(ec)) break;
-//         } while (++ec != ecStart);
+            // Store the start-end of the first non-infinte edge
+            point2D de0 = toPoint2D(circumcenter(ec->first));
 
-//         // Store the start-end of the first non-infinte edge
-//         point2D de0 = toPoint2D(circumcenter(ec->first));
+            // Keep track of the maximum edge length^2
+            scalar maxEdgeLen2 = 0.0;
 
-//         // Keep track of the maximum edge length^2
-//         scalar maxEdgeLen2 = 0.0;
+            // Keep track of the index of the longest edge
+            label edgecd0i = -1;
 
-//         // Keep track of the index of the longest edge
-//         label edgecd0i = -1;
+            // Edge counter
+            label edgei = 0;
 
-//         // Edge counter
-//         label edgei = 0;
+            do
+            {
+                if (!is_infinite(ec))
+                {
+                    // Get the end of the current edge
+                    point2D de1 = toPoint2D
+                    (
+                        circumcenter(ec->first->neighbor(ec->second))
+                    );
 
-//         do
-//         {
-//             if (!is_infinite(ec))
-//             {
-//                 // Get the end of the current edge
-//                 point2D de1 = toPoint2D
-//                 (
-//                     circumcenter(ec->first->neighbor(ec->second))
-//                 );
+                    // Store the current edge vector
+                    edges[edgei] = de1 - de0;
 
-//                 // Store the current edge vector
-//                 edges[edgei] = de1 - de0;
+                    // Store the edge mid-point in the vertices array
+                    vertices[edgei] = 0.5*(de1 + de0);
 
-//                 // Store the edge mid-point in the vertices array
-//                 vertices[edgei] = 0.5*(de1 + de0);
+                    // Move the current edge end into the edge start for the
+                    // next iteration
+                    de0 = de1;
 
-//                 // Move the current edge end into the edge start for the
-//                 // next iteration
-//                 de0 = de1;
+                    // Keep track of the longest edge
 
-//                 // Keep track of the longest edge
+                    scalar edgeLen2 = magSqr(edges[edgei]);
 
-//                 scalar edgeLen2 = magSqr(edges[edgei]);
+                    if (edgeLen2 > maxEdgeLen2)
+                    {
+                        maxEdgeLen2 = edgeLen2;
+                        edgecd0i = edgei;
+                    }
 
-//                 if (edgeLen2 > maxEdgeLen2)
-//                 {
-//                     maxEdgeLen2 = edgeLen2;
-//                     edgecd0i = edgei;
-//                 }
+                    edgei++;
+                }
+            } while (++ec != ecStart);
 
-//                 edgei++;
-//             }
-//         } while (++ec != ecStart);
+            // Initialise cd0 such that the mesh will align
+            // in in the x-y directions
+            vector2D cd0(1, 0);
 
-//         // Initialise cd0 such that the mesh will align
-//         // in in the x-y directions
-//         vector2D cd0(1, 0);
+            if (meshControls().relaxOrientation())
+            {
+                // Get the longest edge from the array and use as the primary
+                // direction of the coordinate system of the "square" cell
+                cd0 = edges[edgecd0i];
+            }
 
-//         if (meshControls().relaxOrientation())
-//         {
-//             // Get the longest edge from the array and use as the primary
-//             // direction of the coordinate system of the "square" cell
-//             cd0 = edges[edgecd0i];
-//         }
+            if (meshControls().nearWallAlignedDist() > 0)
+            {
+                pointIndexHit pHit = qSurf_.tree().findNearest
+                (
+                    toPoint3D(defVert0),
+                    meshControls().nearWallAlignedDist2()
+                );
 
-//         if (meshControls().nearWallAlignedDist() > 0)
-//         {
-//             pointIndexHit pHit = qSurf_.tree().findNearest
-//             (
-//                 toPoint3D(defVert0),
-//                 meshControls().nearWallAlignedDist2()
-//             );
+                if (pHit.hit())
+                {
+                    cd0 = toPoint2D(faceNormals[pHit.index()]);
+                }
+            }
 
-//             if (pHit.hit())
-//             {
-//                 cd0 = toPoint2D(faceNormals[pHit.index()]);
-//             }
-//         }
+            // Rotate by 45deg needed to create an averaging procedure which
+            // encourages the cells to be square
+            cd0 = vector2D(cd0.x() + cd0.y(), cd0.y() - cd0.x());
 
-//         // Rotate by 45deg needed to create an averaging procedure which
-//         // encourages the cells to be square
-//         cd0 = vector2D(cd0.x() + cd0.y(), cd0.y() - cd0.x());
+            // Normalise the primary coordinate direction
+            cd0 /= mag(cd0);
 
-//         // Normalise the primary coordinate direction
-//         cd0 /= mag(cd0);
-
-//         // Calculate the orthogonal coordinate direction
-//         vector2D cd1(-cd0.y(), cd0.x());
+            // Calculate the orthogonal coordinate direction
+            vector2D cd1(-cd0.y(), cd0.x());
 
 
-//         // Restart the circulator
-//         ec = ecStart;
+            // Restart the circulator
+            ec = ecStart;
 
-//         // ... and the counter
-//         edgei = 0;
+            // ... and the counter
+            edgei = 0;
 
-//         // Initialise the displacement for the centre and sum-weights
-//         vector2D disp = vector2D::zero;
-//         scalar sumw = 0;
+            // Initialise the displacement for the centre and sum-weights
+            vector2D disp = vector2D::zero;
+            scalar sumw = 0;
 
-//         do
-//         {
-//             if (!is_infinite(ec))
-//             {
-//                 // Pick up the current edge
-//                 const vector2D& ei = edges[edgei];
+            do
+            {
+                if (!is_infinite(ec))
+                {
+                    // Pick up the current edge
+                    const vector2D& ei = edges[edgei];
 
-//                 // Calculate the centre to edge-centre vector
-//                 vector2D deltai = vertices[edgei] - defVert0;
+                    // Calculate the centre to edge-centre vector
+                    vector2D deltai = vertices[edgei] - defVert0;
 
-//                 // Set the weight for this edge contribution
-//                 scalar w = 1;
+                    // Set the weight for this edge contribution
+                    scalar w = 1;
 
-//                 if (meshControls().squares())
-//                 {
-//                     w = magSqr(deltai.x()*ei.y() - deltai.y()*ei.x());
-//                     // alternative weights
-//                     //w = mag(deltai.x()*ei.y() - deltai.y()*ei.x());
-//                     //w = magSqr(ei)*mag(deltai);
+                    if (meshControls().squares())
+                    {
+                        w = magSqr(deltai.x()*ei.y() - deltai.y()*ei.x());
+                        // alternative weights
+                        //w = mag(deltai.x()*ei.y() - deltai.y()*ei.x());
+                        //w = magSqr(ei)*mag(deltai);
 
-//                     // Use the following for an ~square mesh
-//                     // Find the coordinate contributions for this edge delta
-//                     scalar cd0deltai = cd0 & deltai;
-//                     scalar cd1deltai = cd1 & deltai;
+                        // Use the following for an ~square mesh
+                        // Find the coordinate contributions for this edge delta
+                        scalar cd0deltai = cd0 & deltai;
+                        scalar cd1deltai = cd1 & deltai;
 
-//                     // Create a "square" displacement
-//                     if (mag(cd0deltai) > mag(cd1deltai))
-//                     {
-//                         disp += (w*cd0deltai)*cd0;
-//                     }
-//                     else
-//                     {
-//                         disp += (w*cd1deltai)*cd1;
-//                     }
-//                 }
-//                 else
-//                 {
-//                     // Use this for a hexagon/pentagon mesh
-//                     disp += w*deltai;
-//                 }
+                        // Create a "square" displacement
+                        if (mag(cd0deltai) > mag(cd1deltai))
+                        {
+                            disp += (w*cd0deltai)*cd0;
+                        }
+                        else
+                        {
+                            disp += (w*cd1deltai)*cd1;
+                        }
+                    }
+                    else
+                    {
+                        // Use this for a hexagon/pentagon mesh
+                        disp += w*deltai;
+                    }
 
-//                 // Sum the weights
-//                 sumw += w;
-//             }
-//             else
-//             {
-//                 FatalErrorInFunction
-//                     << "Infinite triangle found in internal mesh"
-//                     << exit(FatalError);
-//             }
+                    // Sum the weights
+                    sumw += w;
+                }
+                else
+                {
+                    FatalErrorInFunction
+                        << "Infinite triangle found in internal mesh"
+                        << exit(FatalError);
+                }
 
-//             edgei++;
+                edgei++;
 
-//         } while (++ec != ecStart);
+            } while (++ec != ecStart);
 
-//         // Calculate the average displacement
-//         disp /= sumw;
-//         totalDisp += disp;
-//         totalDist += mag(disp);
+            // Calculate the average displacement
+            disp /= sumw;
+            totalDisp += disp;
+            totalDist += mag(disp);
 
-//         // Move the point by a fraction of the average displacement
-//         movePoint(vit, defVert0 + relaxation*disp);
-//     }
-// }
+            // Move the point by a fraction of the average displacement
+            movePoint(vit, defVert0 + relaxation*disp);
+        }
+    }
 
-// Info << "\nTotal displacement = " << totalDisp
-//      << " total distance = " << totalDist << endl;
+    Info << "\nTotal displacement = " << totalDisp
+         << " total distance = " << totalDist << endl;
+    */
 }
 
+/*
+void Foam::CV2D::moveInternalPoints(const point2DField& newPoints)
+{
+    label pointI = 0;
 
-//void Foam::CV2D::moveInternalPoints(const point2DField& newPoints)
-//{
-//    label pointI = 0;
-
-//    for
-//    (
-//        Triangulation::Finite_vertices_iterator vit = finite_vertices_begin();
-//        vit != finite_vertices_end();
-//        ++vit
-//    )
-//    {
-//        if (vit->internalPoint())
-//        {
-//            movePoint(vit, newPoints[pointI++]);
-//        }
-//    }
-//}
-
+    for
+    (
+        Triangulation::Finite_vertices_iterator vit = finite_vertices_begin();
+        vit != finite_vertices_end();
+        ++vit
+    )
+    {
+        if (vit->internalPoint())
+        {
+            movePoint(vit, newPoints[pointI++]);
+        }
+    }
+}
+*/
 
 void Foam::CV2D::write() const
 {
diff --git a/src/OpenFOAM/db/error/StaticAssert.H b/src/OpenFOAM/db/error/StaticAssert.H
index daf2522de5..c6cf1e7b23 100644
--- a/src/OpenFOAM/db/error/StaticAssert.H
+++ b/src/OpenFOAM/db/error/StaticAssert.H
@@ -62,17 +62,11 @@ class StaticAssertionTest {};
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Internal use:
-// ~~~~~~~~~~~~~
-
 // Paste together strings, even if an argument is itself a macro
 #define StaticAssertMacro(X,Y)  StaticAssertMacro1(X,Y)
 #define StaticAssertMacro1(X,Y) StaticAssertMacro2(X,Y)
 #define StaticAssertMacro2(X,Y) X##Y
 
-// External use:
-// ~~~~~~~~~~~~~
-
 //- Assert that some test is true at compile-time
 #define StaticAssert(Test)                                                     \
     typedef ::Foam::StaticAssertionTest                                        \
diff --git a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
index 9ec26a4426..6386c460fb 100644
--- a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
@@ -42,12 +42,8 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
-// external use:
-// ~~~~~~~~~~~~~
-// declare a run-time selection:
-#define declareRunTimeSelectionTable\
-(autoPtr,baseType,argNames,argList,parList)                                    \
+//- Declare a run-time selection
+#define declareRunTimeSelectionTable(autoPtr,baseType,argNames,argList,parList)\
                                                                                \
     /* Construct from argList function pointer type */                         \
     typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList;              \
@@ -134,11 +130,9 @@ Description
 
 
 
-// external use:
-// ~~~~~~~~~~~~~
-// declare a run-time selection for derived classes:
-#define declareRunTimeNewSelectionTable\
-(autoPtr,baseType,argNames,argList,parList)                                    \
+//- Declare a run-time selection for derived classes
+#define declareRunTimeNewSelectionTable(                                       \
+    autoPtr,baseType,argNames,argList,parList)                                 \
                                                                                \
     /* Construct from argList function pointer type */                         \
     typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList;              \
@@ -234,10 +228,8 @@ Description
     };
 
 
-// internal use:
-// constructor aid
-#define defineRunTimeSelectionTableConstructor\
-(baseType,argNames)                                                            \
+// Constructor aid
+#define defineRunTimeSelectionTableConstructor(baseType,argNames)              \
                                                                                \
     /* Table constructor called from the table add function */                 \
     void baseType::construct##argNames##ConstructorTables()                    \
@@ -252,10 +244,8 @@ Description
     }
 
 
-// internal use:
-// destructor aid
-#define defineRunTimeSelectionTableDestructor\
-(baseType,argNames)                                                            \
+// Destructor aid
+#define defineRunTimeSelectionTableDestructor(baseType,argNames)               \
                                                                                \
     /* Table destructor called from the table add function destructor */       \
     void baseType::destroy##argNames##ConstructorTables()                      \
@@ -268,44 +258,28 @@ Description
     }
 
 
-// internal use:
-// create pointer to hash-table of functions
-#define defineRunTimeSelectionTablePtr\
-(baseType,argNames)                                                            \
+// Create pointer to hash-table of functions
+#define defineRunTimeSelectionTablePtr(baseType,argNames)                      \
                                                                                \
     /* Define the constructor function table */                                \
     baseType::argNames##ConstructorTable*                                      \
         baseType::argNames##ConstructorTablePtr_ = NULL
 
 
-// not much in use:
-#define defineTemplateRunTimeSelectionTablePtr(baseType,argNames)              \
-                                                                               \
-    /* Define the constructor function table */                                \
-    typename baseType::argNames##ConstructorTable*                             \
-        baseType::argNames##ConstructorTablePtr_ = NULL
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
-// external use:
-// ~~~~~~~~~~~~~
-// define run-time selection table
-#define defineRunTimeSelectionTable\
-(baseType,argNames)                                                            \
+//- Define run-time selection table
+#define defineRunTimeSelectionTable(baseType,argNames)                         \
                                                                                \
     defineRunTimeSelectionTablePtr(baseType,argNames);                         \
     defineRunTimeSelectionTableConstructor(baseType,argNames);                 \
     defineRunTimeSelectionTableDestructor(baseType,argNames)
 
 
-// external use:
-// ~~~~~~~~~~~~~
-// define run-time selection table for template classes
-// use when baseType doesn't need a template argument (eg, is a typedef)
-#define defineTemplateRunTimeSelectionTable\
-(baseType,argNames)                                                            \
+//- Define run-time selection table for template classes
+//  use when baseType doesn't need a template argument (eg, is a typedef)
+#define defineTemplateRunTimeSelectionTable(baseType,argNames)                 \
                                                                                \
     template<>                                                                 \
     defineRunTimeSelectionTablePtr(baseType,argNames);                         \
@@ -317,12 +291,8 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
-// internal use:
-// constructor aid
-// use when baseType requires the Targ template argument
-#define defineTemplatedRunTimeSelectionTableConstructor\
-(baseType,argNames,Targ)                                                       \
+// Constructor aid: use when baseType requires the Targ template argument
+#define defineTemplatedRunTimeSelectionTableConstructor(baseType,argNames,Targ)\
                                                                                \
     /* Table constructor called from the table add function */                 \
     void baseType<Targ>::construct##argNames##ConstructorTables()              \
@@ -337,11 +307,8 @@ Description
     }
 
 
-// internal use:
-// destructor aid
-// use when baseType requires the Targ template argument
-#define defineTemplatedRunTimeSelectionTableDestructor\
-(baseType,argNames,Targ)                                                       \
+// Destructor aid: use when baseType requires the Targ template argument
+#define defineTemplatedRunTimeSelectionTableDestructor(baseType,argNames,Targ) \
                                                                                \
     /* Table destructor called from the table add function destructor */       \
     void baseType<Targ>::destroy##argNames##ConstructorTables()                \
@@ -354,23 +321,18 @@ Description
     }
 
 
-// internal use:
-// create pointer to hash-table of functions
-// use when baseType requires the Targ template argument
-#define defineTemplatedRunTimeSelectionTablePtr\
-(baseType,argNames,Targ)                                                       \
+//- Create pointer to hash-table of functions
+//  use when baseType requires the Targ template argument
+#define defineTemplatedRunTimeSelectionTablePtr(baseType,argNames,Targ)        \
                                                                                \
     /* Define the constructor function table */                                \
     baseType<Targ>::argNames##ConstructorTable*                                \
         baseType<Targ>::argNames##ConstructorTablePtr_ = NULL
 
 
-// external use:
-// ~~~~~~~~~~~~~
-// define run-time selection table for template classes
-// use when baseType requires the Targ template argument
-#define defineTemplatedRunTimeSelectionTable\
-(baseType,argNames,Targ)                                                       \
+//- Define run-time selection table for template classes
+//  use when baseType requires the Targ template argument
+#define defineTemplatedRunTimeSelectionTable(baseType,argNames,Targ)           \
                                                                                \
     template<>                                                                 \
     defineTemplatedRunTimeSelectionTablePtr(baseType,argNames,Targ);           \
diff --git a/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
index 2bef103e93..ebf1d79b6b 100644
--- a/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
@@ -38,15 +38,12 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
-// external use:
-// ~~~~~~~~~~~~~
-// declare a run-time selection:
-#define declareMemberFunctionSelectionTable\
-(returnType,baseType,memberFunction,argNames,argList,parList)                  \
+//- Declare a run-time selection:
+#define declareMemberFunctionSelectionTable(                                   \
+    returnType,baseType,memberFunction,argNames,argList,parList)               \
                                                                                \
     /* Construct from argList function pointer type */                         \
-    typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList; \
+    typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList;  \
                                                                                \
     /* Construct from argList function table type */                           \
     typedef HashTable                                                          \
@@ -89,28 +86,26 @@ Description
     static void destroy##memberFunction##argNames##MemberFunctionTables()
 
 
-// internal use:
-// constructor aid
-#define defineMemberFunctionSelectionTableMemberFunction\
-(baseType,memberFunction,argNames)                                             \
+// Constructor aid
+#define defineMemberFunctionSelectionTableMemberFunction(                      \
+    baseType,memberFunction,argNames)                                          \
                                                                                \
     /* Table memberFunction called from the table add function */              \
-    void baseType::construct##memberFunction##argNames##MemberFunctionTables()\
+    void baseType::construct##memberFunction##argNames##MemberFunctionTables() \
     {                                                                          \
         static bool constructed = false;                                       \
         if (!constructed)                                                      \
         {                                                                      \
             constructed = true;                                                \
             baseType::memberFunction##argNames##MemberFunctionTablePtr_        \
-                = new baseType::memberFunction##argNames##MemberFunctionTable;\
+                = new baseType::memberFunction##argNames##MemberFunctionTable; \
         }                                                                      \
     }
 
 
-// internal use:
-// destructor aid
-#define defineMemberFunctionSelectionTableDestructor\
-(baseType,memberFunction,argNames)                                             \
+// Destructor aid
+#define defineMemberFunctionSelectionTableDestructor(                          \
+    baseType,memberFunction,argNames)                                          \
                                                                                \
     /* Table destructor called from the table add function destructor */       \
     void baseType::destroy##memberFunction##argNames##MemberFunctionTables()   \
@@ -123,32 +118,19 @@ Description
     }
 
 
-// internal use:
-// create pointer to hash-table of functions
-#define defineMemberFunctionSelectionTablePtr\
-(baseType,memberFunction,argNames)                                             \
+// Create pointer to hash-table of functions
+#define defineMemberFunctionSelectionTablePtr(baseType,memberFunction,argNames)\
                                                                                \
     /* Define the memberFunction table */                                      \
     baseType::memberFunction##argNames##MemberFunctionTable*                   \
         baseType::memberFunction##argNames##MemberFunctionTablePtr_ = NULL
 
 
-// not much in use:
-#define defineTemplateMemberFunctionSelectionTablePtr\
-(baseType,memberFunction,argNames)                                             \
-                                                                               \
-    /* Define the memberFunction table */                                      \
-    typename baseType::memberFunction##argNames##MemberFunctionTable*          \
-        baseType::memberFunction##argNames##MemberFunctionTablePtr_ = NULL
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// external use:
-// ~~~~~~~~~~~~~
-// define run-time selection table
-#define defineMemberFunctionSelectionTable\
-(baseType,memberFunction,argNames)                                             \
+//- Define run-time selection table
+#define defineMemberFunctionSelectionTable(baseType,memberFunction,argNames)   \
                                                                                \
     defineMemberFunctionSelectionTablePtr                                      \
         (baseType,memberFunction,argNames);                                    \
@@ -158,12 +140,10 @@ Description
         (baseType,memberFunction,argNames)
 
 
-// external use:
-// ~~~~~~~~~~~~~
-// define run-time selection table for template classes
-// use when baseType doesn't need a template argument (eg, is a typedef)
-#define defineTemplateMemberFunctionSelectionTable\
-(baseType,memberFunction,argNames)                                             \
+//- Define run-time selection table for template classes
+//  use when baseType doesn't need a template argument (eg, is a typedef)
+#define defineTemplateMemberFunctionSelectionTable(                            \
+    baseType,memberFunction,argNames)                                          \
                                                                                \
     template<>                                                                 \
     defineMemberFunctionSelectionTablePtr                                      \
@@ -178,11 +158,9 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// internal use:
-// constructor aid
-// use when baseType requires the Targ template argument
-#define defineTemplatedMemberFunctionSelectionTableMemberFunction\
-(baseType,memberFunction,argNames,Targ)                                        \
+// Constructor aid: use when baseType requires the Targ template argument
+#define defineTemplatedMemberFunctionSelectionTableMemberFunction(             \
+    baseType,memberFunction,argNames,Targ)                                     \
                                                                                \
     /* Table memberFunction called from the table add function */              \
     void baseType<Targ>::construct##memberFunction##argNames##                 \
@@ -192,18 +170,17 @@ Description
         if (!constructed)                                                      \
         {                                                                      \
             constructed = true;                                                \
-            baseType<Targ>::memberFunction##argNames##MemberFunctionTablePtr_ \
+            baseType<Targ>::memberFunction##argNames##MemberFunctionTablePtr_  \
                 = new baseType<Targ>::memberFunction##argNames##               \
                   MemberFunctionTable;                                         \
         }                                                                      \
     }
 
 
-// internal use:
-// destructor aid
+// Destructor aid
 // use when baseType requires the Targ template argument
-#define defineTemplatedMemberFunctionSelectionTableDestructor\
-(baseType,memberFunction,argNames,Targ)                                        \
+#define defineTemplatedMemberFunctionSelectionTableDestructor(                 \
+    baseType,memberFunction,argNames,Targ)                                     \
                                                                                \
     /* Table destructor called from the table add function destructor */       \
     void baseType<Targ>::destroy##memberFunction##argNames##                   \
@@ -211,7 +188,7 @@ Description
     {                                                                          \
         if                                                                     \
         (                                                                      \
-            baseType<Targ>::memberFunction##argNames##MemberFunctionTablePtr_ \
+            baseType<Targ>::memberFunction##argNames##MemberFunctionTablePtr_  \
         )                                                                      \
         {                                                                      \
             delete baseType<Targ>::memberFunction##argNames##                  \
@@ -222,23 +199,20 @@ Description
     }
 
 
-// internal use:
-// create pointer to hash-table of functions
+// Create pointer to hash-table of functions
 // use when baseType requires the Targ template argument
-#define defineTemplatedMemberFunctionSelectionTablePtr\
-(baseType,memberFunction,argNames,Targ)                                        \
+#define defineTemplatedMemberFunctionSelectionTablePtr(                        \
+    baseType,memberFunction,argNames,Targ)                                     \
                                                                                \
     /* Define the memberFunction table */                                      \
     baseType<Targ>::memberFunction##argNames##MemberFunctionTable*             \
         baseType<Targ>::memberFunction##argNames##MemberFunctionTablePtr_ = NULL
 
 
-// external use:
-// ~~~~~~~~~~~~~
-// define run-time selection table for template classes
-// use when baseType requires the Targ template argument
-#define defineTemplatedMemberFunctionSelectionTable\
-(baseType,memberFunction,argNames,Targ)                                        \
+//- Define run-time selection table for template classes
+//  use when baseType requires the Targ template argument
+#define defineTemplatedMemberFunctionSelectionTable(                           \
+    baseType,memberFunction,argNames,Targ)                                     \
                                                                                \
     template<>                                                                 \
     defineTemplatedMemberFunctionSelectionTablePtr                             \
diff --git a/src/OpenFOAM/db/typeInfo/className.H b/src/OpenFOAM/db/typeInfo/className.H
index 46ab38152b..23813ecfcd 100644
--- a/src/OpenFOAM/db/typeInfo/className.H
+++ b/src/OpenFOAM/db/typeInfo/className.H
@@ -32,10 +32,7 @@ Description
 #include "defineDebugSwitch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// declarations (without debug information)
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Declarations (without debug information)
 
 //- Add typeName information from argument \a TypeNameString to a class.
 //  Without debug information
@@ -60,9 +57,8 @@ public:                                                                        \
 }
 
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// declarations (with debug information)
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Declarations (with debug information)
 
 //- Add typeName information from argument \a TypeNameString to a class.
 //  Also declares debug information.
@@ -87,9 +83,8 @@ public:                                                                        \
 }
 
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// definitions (without debug information)
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Definitions (without debug information)
 
 //- Define the typeName, with alternative lookup as \a Name
 #define defineTypeNameWithName(Type, Name)                                     \
@@ -117,9 +112,8 @@ public:                                                                        \
     defineTemplateTypeNameWithName(Type, Type::typeName_())
 
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// definitions (with debug information)
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Definitions (with debug information)
 
 //- Define the typeName and debug information
 #define defineTypeNameAndDebug(Type, DebugSwitch)                              \
@@ -141,7 +135,9 @@ public:                                                                        \
     defineNamedTemplateTypeName(Type);                                         \
     defineNamedTemplateDebugSwitch(Type, DebugSwitch)
 
-// for templated sub-classes
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// For templated sub-classes
 
 //- Define the typeName and debug information, lookup as \a Name
 #define defineTemplate2TypeNameAndDebugWithName(Type, Name, DebugSwitch)       \
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 946b28baf8..f94aa39829 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -300,9 +300,6 @@ dimensioned<Type> operator/
 );
 
 
-// Products
-// ~~~~~~~~
-
 #define PRODUCT_OPERATOR(product, op, opFunc)                                  \
                                                                                \
 template<class Type1, class Type2>                                             \
diff --git a/src/OpenFOAM/global/debug/defineDebugSwitch.H b/src/OpenFOAM/global/debug/defineDebugSwitch.H
index f71e960f40..c61e7180b3 100644
--- a/src/OpenFOAM/global/debug/defineDebugSwitch.H
+++ b/src/OpenFOAM/global/debug/defineDebugSwitch.H
@@ -35,10 +35,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// definitions (debug information only)
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 namespace Foam
 {
 
@@ -74,6 +70,8 @@ public:
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #define registerTemplateDebugSwitchWithName(Type,Name)                         \
     template<>                                                                 \
     const Foam::RegisterDebugSwitch<Type>                                      \
@@ -119,6 +117,7 @@ public:
     template<>                                                                 \
     defineDebugSwitchWithName(Type, Name, DebugSwitch);                        \
     registerTemplateDebugSwitchWithName(Type, Name)
+
 //- Define the debug information for templates sub-classes, lookup as \a Name
 #define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch)            \
     template<>                                                                 \
@@ -135,8 +134,6 @@ public:
     defineTemplateDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch)
 
 
-// For templated sub-classes
-
 //- Define the debug information for templates
 //  Useful with typedefs
 #define defineTemplate2DebugSwitch(Type, DebugSwitch)                          \
diff --git a/src/OpenFOAM/include/addDictOption.H b/src/OpenFOAM/include/addDictOption.H
index f538e57294..055983396a 100644
--- a/src/OpenFOAM/include/addDictOption.H
+++ b/src/OpenFOAM/include/addDictOption.H
@@ -1,10 +1,6 @@
-//
-// addDictOption.H
-// ~~~~~~~~~~~~~~~~~
-
-    Foam::argList::addOption
-    (
-        "dict",
-        "file",
-        "read control dictionary from specified location"
-    );
+Foam::argList::addOption
+(
+    "dict",
+    "file",
+    "read control dictionary from specified location"
+);
diff --git a/src/OpenFOAM/include/addOverwriteOption.H b/src/OpenFOAM/include/addOverwriteOption.H
index 0c05c01c93..a1ac669928 100644
--- a/src/OpenFOAM/include/addOverwriteOption.H
+++ b/src/OpenFOAM/include/addOverwriteOption.H
@@ -1,10 +1,5 @@
-//
-// addOverwriteOption.H
-// ~~~~~~~~~~~~~~~~~~~~
-
-    Foam::argList::addBoolOption
-    (
-        "overwrite",
-        "overwrite existing mesh/results files"
-    );
-
+Foam::argList::addBoolOption
+(
+    "overwrite",
+    "overwrite existing mesh/results files"
+);
diff --git a/src/OpenFOAM/include/addRegionOption.H b/src/OpenFOAM/include/addRegionOption.H
index d801dd0de6..8aaca18e98 100644
--- a/src/OpenFOAM/include/addRegionOption.H
+++ b/src/OpenFOAM/include/addRegionOption.H
@@ -1,11 +1,6 @@
-//
-// addRegionOption.H
-// ~~~~~~~~~~~~~~~~~
-
-    Foam::argList::addOption
-    (
-        "region",
-        "name",
-        "specify alternative mesh region"
-    );
-
+Foam::argList::addOption
+(
+    "region",
+    "name",
+    "specify alternative mesh region"
+);
diff --git a/src/OpenFOAM/include/addTimeOptions.H b/src/OpenFOAM/include/addTimeOptions.H
index 6110015c70..42d4543d83 100644
--- a/src/OpenFOAM/include/addTimeOptions.H
+++ b/src/OpenFOAM/include/addTimeOptions.H
@@ -1,29 +1,24 @@
-//
-// addTimeOptions.H
-// ~~~~~~~~~~~~~~~~
+Foam::argList::addBoolOption
+(
+    "constant",
+    "include the 'constant/' dir in the times list"
+);
 
-    Foam::argList::addBoolOption
-    (
-        "constant",
-        "include the 'constant/' dir in the times list"
-    );
+Foam::argList::addBoolOption
+(
+    "latestTime",
+    "select the latest time"
+);
 
-    Foam::argList::addBoolOption
-    (
-        "latestTime",
-        "select the latest time"
-    );
-
-    Foam::argList::addBoolOption
-    (
-        "noZero",
-        "exclude the '0/' dir from the times list"
-    );
-
-    Foam::argList::addOption
-    (
-        "time",
-        "time",
-        "specify a single time value to select"
-    );
+Foam::argList::addBoolOption
+(
+    "noZero",
+    "exclude the '0/' dir from the times list"
+);
 
+Foam::argList::addOption
+(
+    "time",
+    "time",
+    "specify a single time value to select"
+);
diff --git a/src/OpenFOAM/include/checkConstantOption.H b/src/OpenFOAM/include/checkConstantOption.H
index 9f39ac6541..578df75350 100644
--- a/src/OpenFOAM/include/checkConstantOption.H
+++ b/src/OpenFOAM/include/checkConstantOption.H
@@ -1,14 +1,11 @@
-//
-// checkConstantOption.H
-// ~~~~~~~~~~~~~~~~~~~~~
-// unless -constant is present, skip startTime if it is "constant"
+// Unless -constant is present, skip startTime if it is "constant"
 
-    if
-    (
-        !args.optionFound("constant")
-     && (startTime < Times.size()-1)
-     && (Times[startTime].name() == "constant")
-    )
-    {
-        startTime++;
-    }
+if
+(
+   !args.optionFound("constant")
+ && (startTime < Times.size()-1)
+ && (Times[startTime].name() == "constant")
+)
+{
+    startTime++;
+}
diff --git a/src/OpenFOAM/include/checkTimeOption.H b/src/OpenFOAM/include/checkTimeOption.H
index 412d44ef0e..b8b170a822 100644
--- a/src/OpenFOAM/include/checkTimeOption.H
+++ b/src/OpenFOAM/include/checkTimeOption.H
@@ -1,6 +1,3 @@
-//
-// checkTimeOption.H
-// ~~~~~~~~~~~~~~~~~
 // Check -time and -latestTime options
 
 if (args.optionFound("time"))
diff --git a/src/OpenFOAM/include/checkTimeOptions.H b/src/OpenFOAM/include/checkTimeOptions.H
index d0d2051ae4..7891356035 100644
--- a/src/OpenFOAM/include/checkTimeOptions.H
+++ b/src/OpenFOAM/include/checkTimeOptions.H
@@ -1,7 +1,3 @@
-//
-// checkTimeOptions.H
-// ~~~~~~~~~~~~~~~~~~
-
 Foam::label startTime = 0;
 
 // Unless -constant is present, skip startTime if it is "constant"
diff --git a/src/OpenFOAM/include/checkTimeOptionsNoConstant.H b/src/OpenFOAM/include/checkTimeOptionsNoConstant.H
index 6b4e836f5a..02312375df 100644
--- a/src/OpenFOAM/include/checkTimeOptionsNoConstant.H
+++ b/src/OpenFOAM/include/checkTimeOptionsNoConstant.H
@@ -1,7 +1,3 @@
-//
-// checkTimeOptionsNoConstant.H
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Foam::label startTime = 0;
 
 // Check -time and -latestTime options
diff --git a/src/OpenFOAM/include/createMesh.H b/src/OpenFOAM/include/createMesh.H
index 630494649d..8c3d989849 100644
--- a/src/OpenFOAM/include/createMesh.H
+++ b/src/OpenFOAM/include/createMesh.H
@@ -1,18 +1,14 @@
-//
-// createMesh.H
-// ~~~~~~~~~~~~
+Foam::Info
+    << "Create mesh for time = "
+    << runTime.timeName() << Foam::nl << Foam::endl;
 
-    Foam::Info
-        << "Create mesh for time = "
-        << runTime.timeName() << Foam::nl << Foam::endl;
-
-    Foam::fvMesh mesh
+Foam::fvMesh mesh
+(
+    Foam::IOobject
     (
-        Foam::IOobject
-        (
-            Foam::fvMesh::defaultRegion,
-            runTime.timeName(),
-            runTime,
-            Foam::IOobject::MUST_READ
-        )
-    );
+        Foam::fvMesh::defaultRegion,
+        runTime.timeName(),
+        runTime,
+        Foam::IOobject::MUST_READ
+    )
+);
diff --git a/src/OpenFOAM/include/createMeshNoClear.H b/src/OpenFOAM/include/createMeshNoClear.H
index 8526a37be6..ebdb3fc3bc 100644
--- a/src/OpenFOAM/include/createMeshNoClear.H
+++ b/src/OpenFOAM/include/createMeshNoClear.H
@@ -1,19 +1,16 @@
-//
-// createMeshNoClear.H
-// ~~~~~~~~~~~~~~~~~~~
-// currently identical to createMesh.H
+// Currently identical to createMesh.H
 
-    Foam::Info
-        << "Create mesh, no clear-out for time = "
-        << runTime.timeName() << Foam::nl << Foam::endl;
+Foam::Info
+    << "Create mesh, no clear-out for time = "
+    << runTime.timeName() << Foam::nl << Foam::endl;
 
-    Foam::fvMesh mesh
+Foam::fvMesh mesh
+(
+    Foam::IOobject
     (
-        Foam::IOobject
-        (
-            Foam::fvMesh::defaultRegion,
-            runTime.timeName(),
-            runTime,
-            Foam::IOobject::MUST_READ
-        )
-    );
+        Foam::fvMesh::defaultRegion,
+        runTime.timeName(),
+        runTime,
+        Foam::IOobject::MUST_READ
+    )
+);
diff --git a/src/OpenFOAM/include/createNamedMesh.H b/src/OpenFOAM/include/createNamedMesh.H
index f61ec2bd6e..bfaa243e10 100644
--- a/src/OpenFOAM/include/createNamedMesh.H
+++ b/src/OpenFOAM/include/createNamedMesh.H
@@ -1,30 +1,26 @@
-//
-// createNamedMesh.H
-// ~~~~~~~~~~~~~~~~~
+Foam::word regionName;
 
-    Foam::word regionName;
+if (args.optionReadIfPresent("region", regionName))
+{
+    Foam::Info
+        << "Create mesh " << regionName << " for time = "
+        << runTime.timeName() << Foam::nl << Foam::endl;
+}
+else
+{
+    regionName = Foam::fvMesh::defaultRegion;
+    Foam::Info
+        << "Create mesh for time = "
+        << runTime.timeName() << Foam::nl << Foam::endl;
+}
 
-    if (args.optionReadIfPresent("region", regionName))
-    {
-        Foam::Info
-            << "Create mesh " << regionName << " for time = "
-            << runTime.timeName() << Foam::nl << Foam::endl;
-    }
-    else
-    {
-        regionName = Foam::fvMesh::defaultRegion;
-        Foam::Info
-            << "Create mesh for time = "
-            << runTime.timeName() << Foam::nl << Foam::endl;
-    }
-
-    Foam::fvMesh mesh
+Foam::fvMesh mesh
+(
+    Foam::IOobject
     (
-        Foam::IOobject
-        (
-            regionName,
-            runTime.timeName(),
-            runTime,
-            Foam::IOobject::MUST_READ
-        )
-    );
+        regionName,
+        runTime.timeName(),
+        runTime,
+        Foam::IOobject::MUST_READ
+    )
+);
diff --git a/src/OpenFOAM/include/createNamedPolyMesh.H b/src/OpenFOAM/include/createNamedPolyMesh.H
index bee8601c74..2413a427f2 100644
--- a/src/OpenFOAM/include/createNamedPolyMesh.H
+++ b/src/OpenFOAM/include/createNamedPolyMesh.H
@@ -1,30 +1,26 @@
-//
-// createNamedPolyMesh.H
-// ~~~~~~~~~~~~~~~~~~~~~
+Foam::word regionName;
 
-    Foam::word regionName;
+if (args.optionReadIfPresent("region", regionName))
+{
+    Foam::Info
+        << "Create polyMesh " << regionName << " for time = "
+        << runTime.timeName() << Foam::nl << Foam::endl;
+}
+else
+{
+    regionName = Foam::polyMesh::defaultRegion;
+    Foam::Info
+        << "Create polyMesh for time = "
+        << runTime.timeName() << Foam::nl << Foam::endl;
+}
 
-    if (args.optionReadIfPresent("region", regionName))
-    {
-        Foam::Info
-            << "Create polyMesh " << regionName << " for time = "
-            << runTime.timeName() << Foam::nl << Foam::endl;
-    }
-    else
-    {
-        regionName = Foam::polyMesh::defaultRegion;
-        Foam::Info
-            << "Create polyMesh for time = "
-            << runTime.timeName() << Foam::nl << Foam::endl;
-    }
-
-    Foam::polyMesh mesh
+Foam::polyMesh mesh
+(
+    Foam::IOobject
     (
-        Foam::IOobject
-        (
-            regionName,
-            runTime.timeName(),
-            runTime,
-            Foam::IOobject::MUST_READ
-        )
-    );
+        regionName,
+        runTime.timeName(),
+        runTime,
+        Foam::IOobject::MUST_READ
+    )
+);
diff --git a/src/OpenFOAM/include/createPolyMesh.H b/src/OpenFOAM/include/createPolyMesh.H
index 02e25d1c51..8563860ac4 100644
--- a/src/OpenFOAM/include/createPolyMesh.H
+++ b/src/OpenFOAM/include/createPolyMesh.H
@@ -1,18 +1,14 @@
-//
-// createPolyMesh.H
-// ~~~~~~~~~~~~~~~~
+Foam::Info
+    << "Create polyMesh for time = "
+    << runTime.timeName() << Foam::nl << Foam::endl;
 
-    Foam::Info
-        << "Create polyMesh for time = "
-        << runTime.timeName() << Foam::nl << Foam::endl;
-
-    Foam::polyMesh mesh
+Foam::polyMesh mesh
+(
+    Foam::IOobject
     (
-        Foam::IOobject
-        (
-            Foam::polyMesh::defaultRegion,
-            runTime.timeName(),
-            runTime,
-            Foam::IOobject::MUST_READ
-        )
-    );
+        Foam::polyMesh::defaultRegion,
+        runTime.timeName(),
+        runTime,
+        Foam::IOobject::MUST_READ
+    )
+);
diff --git a/src/OpenFOAM/include/createTime.H b/src/OpenFOAM/include/createTime.H
index 36fc675dc3..4ea4a6be69 100644
--- a/src/OpenFOAM/include/createTime.H
+++ b/src/OpenFOAM/include/createTime.H
@@ -1,7 +1,3 @@
-//
-// createTime.H
-// ~~~~~~~~~~~~
+Foam::Info<< "Create time\n" << Foam::endl;
 
-    Foam::Info<< "Create time\n" << Foam::endl;
-
-    Foam::Time runTime(Foam::Time::controlDictName, args);
+Foam::Time runTime(Foam::Time::controlDictName, args);
diff --git a/src/OpenFOAM/include/setConstantMeshDictionaryIO.H b/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
index 4f97cf1694..aa5a68004c 100644
--- a/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
+++ b/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
@@ -1,33 +1,29 @@
-//
-// setConstantMeshDictionaryIO.H
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    fileName dictPath = "";
-    if (args.optionFound("dict"))
+fileName dictPath = "";
+if (args.optionFound("dict"))
+{
+    dictPath = args["dict"];
+    if (isDir(dictPath))
     {
-        dictPath = args["dict"];
-        if (isDir(dictPath))
-        {
-            dictPath = dictPath / dictName;
-        }
+        dictPath = dictPath / dictName;
     }
+}
 
-    IOobject dictIO
+IOobject dictIO
+(
+    dictName,
+    runTime.constant(),
+    mesh,
+    IOobject::MUST_READ_IF_MODIFIED,
+    IOobject::NO_WRITE
+);
+
+if (dictPath.size())
+{
+    dictIO = IOobject
     (
-        dictName,
-        runTime.constant(),
+        dictPath,
         mesh,
         IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE
     );
-
-    if (dictPath.size())
-    {
-        dictIO = IOobject
-        (
-            dictPath,
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        );
-    }
+}
diff --git a/src/OpenFOAM/include/setRootCase.H b/src/OpenFOAM/include/setRootCase.H
index 587374d067..e1b76cfe68 100644
--- a/src/OpenFOAM/include/setRootCase.H
+++ b/src/OpenFOAM/include/setRootCase.H
@@ -1,9 +1,5 @@
-//
-// setRootCase.H
-// ~~~~~~~~~~~~~
-
-    Foam::argList args(argc, argv);
-    if (!args.checkRootCase())
-    {
-        Foam::FatalError.exit();
-    }
+Foam::argList args(argc, argv);
+if (!args.checkRootCase())
+{
+    Foam::FatalError.exit();
+}
diff --git a/src/OpenFOAM/include/setSystemMeshDictionaryIO.H b/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
index 6e89f94c33..4d5f2e68ec 100644
--- a/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
+++ b/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
@@ -1,33 +1,29 @@
-//
-// setSystemMeshDictionaryIO.H
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    fileName dictPath = "";
-    if (args.optionFound("dict"))
+fileName dictPath = "";
+if (args.optionFound("dict"))
+{
+    dictPath = args["dict"];
+    if (isDir(dictPath))
     {
-        dictPath = args["dict"];
-        if (isDir(dictPath))
-        {
-            dictPath = dictPath / dictName;
-        }
+        dictPath = dictPath / dictName;
     }
+}
 
-    IOobject dictIO
+IOobject dictIO
+(
+    dictName,
+    runTime.system(),
+    mesh,
+    IOobject::MUST_READ_IF_MODIFIED,
+    IOobject::NO_WRITE
+);
+
+if (dictPath.size())
+{
+    dictIO = IOobject
     (
-        dictName,
-        runTime.system(),
+        dictPath,
         mesh,
         IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE
     );
-
-    if (dictPath.size())
-    {
-        dictIO = IOobject
-        (
-            dictPath,
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        );
-    }
+}
diff --git a/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H b/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
index e594e83d96..ceebb43815 100644
--- a/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
+++ b/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
@@ -1,33 +1,29 @@
-//
-// setSystemRunTimeDictionaryIO.H
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    fileName dictPath = "";
-    if (args.optionFound("dict"))
+fileName dictPath = "";
+if (args.optionFound("dict"))
+{
+    dictPath = args["dict"];
+    if (isDir(dictPath))
     {
-        dictPath = args["dict"];
-        if (isDir(dictPath))
-        {
-            dictPath = dictPath / dictName;
-        }
+        dictPath = dictPath / dictName;
     }
+}
 
-    IOobject dictIO
+IOobject dictIO
+(
+    dictName,
+    runTime.system(),
+    runTime,
+    IOobject::MUST_READ_IF_MODIFIED,
+    IOobject::NO_WRITE
+);
+
+if (dictPath.size())
+{
+    dictIO = IOobject
     (
-        dictName,
-        runTime.system(),
+        dictPath,
         runTime,
         IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE
     );
-
-    if (dictPath.size())
-    {
-        dictIO = IOobject
-        (
-            dictPath,
-            runTime,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        );
-    }
+}
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index 1fadffcb71..36747fefa9 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -5118,13 +5118,6 @@ const Foam::cellShapeList& Foam::hexRef8::cellShapes() const
 }
 
 
-
-//
-// Unrefinement
-// ~~~~~~~~~~~~
-//
-
-
 Foam::labelList Foam::hexRef8::getSplitPoints() const
 {
     if (debug)
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
index d04c5ac43e..4b24092e77 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
@@ -87,20 +87,6 @@ class autoSnapDriver
                 const List<labelPair>&
             );
 
-            //static tmp<pointField> avg
-            //(
-            //    const indirectPrimitivePatch&,
-            //    const pointField&
-            //);
-
-            //- Calculate displacement per patch point. Wip.
-            //static tmp<pointField> smoothLambdaMuPatchDisplacement
-            //(
-            //    const motionSmoother& meshMover,
-            //    const List<labelPair>& baffles
-            //);
-
-
             //- Check that face zones are synced
             void checkCoupledFaceZones() const;
 
@@ -155,13 +141,7 @@ class autoSnapDriver
                     const List<pointConstraint>& constraints,
                     vectorField& disp
                 ) const;
-                //void smoothAndConstrain2
-                //(
-                //    const bool applyConstraints,
-                //    const indirectPrimitivePatch& pp,
-                //    const List<pointConstraint>& constraints,
-                //    vectorField& disp
-                //) const;
+
                 void calcNearest
                 (
                     const label iter,
@@ -170,6 +150,7 @@ class autoSnapDriver
                     vectorField& pointSurfaceNormal,
                     vectorField& pointRotation
                 ) const;
+
                 void calcNearestFace
                 (
                     const label iter,
@@ -180,6 +161,12 @@ class autoSnapDriver
                     labelList& faceSurfaceRegion,
                     vectorField& faceRotation
                 ) const;
+
+                //- Collect (possibly remote) per point data of all surrounding
+                //  faces
+                //  - faceSurfaceNormal
+                //  - faceDisp
+                //  - faceCentres&faceNormal
                 void calcNearestFacePointProperties
                 (
                     const label iter,
@@ -194,6 +181,11 @@ class autoSnapDriver
                     List<List<point>>& pointFaceCentres,
                     List<labelList>&    pointFacePatchID
                 ) const;
+
+                //- Gets passed in offset to nearest point on feature
+                //  edge. Calculates if the point has a different number of
+                //  faces on either side of the feature and if so attracts the
+                //  point to that non-dominant plane.
                 void correctAttraction
                 (
                     const DynamicList<point>& surfacePoints,
@@ -274,6 +266,12 @@ class autoSnapDriver
 
                 //- Return hit if faces-on-the-same-normalplane are on multiple
                 //  patches
+                //  - false, index=-1 : single patch
+                //  - true , index=0  : multiple patches but on different
+                //                      normals planes (so geometric feature
+                //                      edge is also a region edge)
+                //  - true , index=1  : multiple patches on same normals plane
+                //                      i.e. flat region edge
                 pointIndexHit findMultiPatchPoint
                 (
                     const point& pt,
@@ -381,6 +379,7 @@ class autoSnapDriver
                     vectorField& patchAttraction,
                     List<pointConstraint>& patchConstraints
                 ) const;
+
                 void reverseAttractMeshPoints
                 (
                     const label iter,
@@ -465,6 +464,7 @@ class autoSnapDriver
                     vectorField& patchAttraction,
                     List<pointConstraint>& patchConstraints
                 ) const;
+
                 void preventFaceSqueeze
                 (
                     const label iter,
@@ -582,16 +582,6 @@ public:
                 vectorField& nearestNormal
             );
 
-            ////- Per patch point calculate point on nearest surface. Set as
-            ////  boundary conditions of motionSmoother displacement field.
-            ////  Return displacement of patch points.
-            //static vectorField calcNearestLocalSurface
-            //(
-            //    const meshRefinement& meshRefiner,
-            //    const scalarField& snapDist,
-            //    const indirectPrimitivePatch&
-            //);
-
             //- Smooth the displacement field to the internal.
             void smoothDisplacement
             (
@@ -626,7 +616,6 @@ public:
                 const scalar planarAngle,
                 const snapParameters& snapParams
             );
-
 };
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
index c8571fb210..28567ccc8f 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
@@ -436,11 +436,6 @@ void Foam::autoSnapDriver::calcNearestFace
 }
 
 
-// Collect (possibly remote) per point data of all surrounding faces
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// - faceSurfaceNormal
-// - faceDisp
-// - faceCentres&faceNormal
 void Foam::autoSnapDriver::calcNearestFacePointProperties
 (
     const label iter,
@@ -639,9 +634,6 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
 }
 
 
-// Gets passed in offset to nearest point on feature edge. Calculates
-// if the point has a different number of faces on either side of the feature
-// and if so attracts the point to that non-dominant plane.
 void Foam::autoSnapDriver::correctAttraction
 (
     const DynamicList<point>& surfacePoints,
@@ -731,12 +723,6 @@ Foam::label Foam::autoSnapDriver::findNormal
 }
 
 
-// Detect multiple patches. Returns pointIndexHit:
-// - false, index=-1 : single patch
-// - true , index=0  : multiple patches but on different normals planes
-//                     (so geometric feature edge is also a region edge)
-// - true , index=1  : multiple patches on same normals plane i.e. flat region
-//                     edge
 Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
 (
     const point& pt,
@@ -1009,7 +995,6 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
 }
 
 
-// Special version that calculates attraction in one go
 void Foam::autoSnapDriver::featureAttractionUsingReconstruction
 (
     const label iter,
@@ -1437,7 +1422,6 @@ void Foam::autoSnapDriver::releasePointsNextToMultiPatch
 }
 
 
-// If only two attractions and across face return the face indices
 Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
 (
     const indirectPrimitivePatch& pp,
@@ -1447,6 +1431,7 @@ Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
 ) const
 {
     const face& f = pp.localFaces()[faceI];
+
     // For now just detect any attraction. Improve this to look at
     // actual attraction position and orientation
 
@@ -1771,8 +1756,6 @@ Foam::autoSnapDriver::findNearFeaturePoint
 }
 
 
-// Determines for every pp point - that is on multiple faces that form
-// a feature - the nearest feature edge/point.
 void Foam::autoSnapDriver::determineFeatures
 (
     const label iter,
@@ -2184,17 +2167,6 @@ void Foam::autoSnapDriver::determineFeatures
 }
 
 
-// Baffle handling
-// ~~~~~~~~~~~~~~~
-// Override pointAttractor, edgeAttractor, patchAttration etc. to
-// implement 'baffle' handling.
-// Baffle: the mesh pp point originates from a loose standing
-// baffle.
-// Sampling the surface with the surrounding face-centres only picks up
-// a single triangle normal so above determineFeatures will not have
-// detected anything. So explicitly pick up feature edges on the pp
-// (after duplicating points & smoothing so will already have been
-// expanded) and match these to the features.
 void Foam::autoSnapDriver::determineBaffleFeatures
 (
     const label iter,
@@ -2214,6 +2186,16 @@ void Foam::autoSnapDriver::determineBaffleFeatures
     List<pointConstraint>& patchConstraints
 ) const
 {
+    // Override pointAttractor, edgeAttractor, patchAttration etc. to
+    // implement 'baffle' handling.
+    // Baffle: the mesh pp point originates from a loose standing
+    // baffle.
+    // Sampling the surface with the surrounding face-centres only picks up
+    // a single triangle normal so above determineFeatures will not have
+    // detected anything. So explicitly pick up feature edges on the pp
+    // (after duplicating points & smoothing so will already have been
+    // expanded) and match these to the features.
+
     const fvMesh& mesh = meshRefiner_.mesh();
     const refinementFeatures& features = meshRefiner_.features();
 
@@ -2966,7 +2948,6 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
 }
 
 
-// Correct for squeezing of face
 void Foam::autoSnapDriver::preventFaceSqueeze
 (
     const label iter,

From 3d295e9eff4a3941c65e0399250e8bf4240b5014 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 1 Mar 2016 12:29:33 +0000
Subject: [PATCH 240/447] src/OpenFOAM: Removed unused files

---
 .../addToGlobalFunctionSelectionTable.H       |  51 ------
 .../globalFunctionSelectionTables.H           | 144 -----------------
 .../addToStaticMemberFunctionSelectionTable.H |  53 -------
 .../staticMemberFunctionSelectionTables.H     | 145 ------------------
 4 files changed, 393 deletions(-)
 delete mode 100644 src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
 delete mode 100644 src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
 delete mode 100644 src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
 delete mode 100644 src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H

diff --git a/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
deleted file mode 100644
index 95914f3b56..0000000000
--- a/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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/>.
-
-Global
-    Foam::addToGlobalFunctionSelectionTable
-
-Description
-    Macros for easy insertion into global function selection tables
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef addToGlobalFunctionSelectionTable_H
-#define addToGlobalFunctionSelectionTable_H
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// add to hash-table of functions with 'lookup' as the key
-#define addNamedToGlobalFunctionSelectionTable\
-(memberFunction,argNames,lookup,functionPtr)                                   \
-                                                                               \
-    /* Add to the table, find by lookup name */                                \
-    add##memberFunction##argNames##GlobalMemberFunctionToTable                 \
-    add_##lookup##_##memberFunction##argNames##GlobalMemberFunctionTo##Table_ \
-    (#lookup, functionPtr)
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
deleted file mode 100644
index 8e07ef5009..0000000000
--- a/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
+++ /dev/null
@@ -1,144 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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/>.
-
-Global
-    Foam::globalFunctionSelectionTables
-
-Description
-    Macros to enable the easy declaration of global function selection tables.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef globalMemberFunctionSelectionTables_H
-#define globalMemberFunctionSelectionTables_H
-
-#include "memberFunctionSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// external use:
-// ~~~~~~~~~~~~~
-// declare a run-time selection:
-#define declareGlobalFunctionSelectionTable\
-(returnType,memberFunction,argNames,argList,parList)                           \
-                                                                               \
-    /* Construct from argList function pointer type */                         \
-    typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList; \
-                                                                               \
-    /* Construct from argList function table type */                           \
-    typedef HashTable                                                          \
-        <memberFunction##argNames##MemberFunctionPtr, word, string::hash>      \
-        memberFunction##argNames##MemberFunctionTable;                         \
-                                                                               \
-    /* Construct from argList function pointer table pointer */                \
-    extern memberFunction##argNames##MemberFunctionTable*                      \
-        memberFunction##argNames##MemberFunctionTablePtr_;                     \
-                                                                               \
-    /* Table memberFunction called from the table add function */              \
-    void construct##memberFunction##argNames##MemberFunctionTables();          \
-                                                                               \
-    /* Table destructor called from the table add function destructor */       \
-    void destroy##memberFunction##argNames##MemberFunctionTables();            \
-                                                                               \
-    /* Class to add constructor from argList to table */                       \
-    class add##memberFunction##argNames##GlobalMemberFunctionToTable           \
-    {                                                                          \
-    public:                                                                    \
-                                                                               \
-        add##memberFunction##argNames##GlobalMemberFunctionToTable             \
-        (                                                                      \
-            const word& lookup,                                                \
-            memberFunction##argNames##MemberFunctionPtr function               \
-        )                                                                      \
-        {                                                                      \
-            construct##memberFunction##argNames##MemberFunctionTables();       \
-            memberFunction##argNames##MemberFunctionTablePtr_->insert          \
-            (                                                                  \
-                lookup,                                                        \
-                function                                                       \
-            );                                                                 \
-        }                                                                      \
-                                                                               \
-        ~add##memberFunction##argNames##GlobalMemberFunctionToTable()          \
-        {                                                                      \
-            destroy##memberFunction##argNames##MemberFunctionTables();         \
-        }                                                                      \
-    }
-
-
-// internal use:
-// constructor/destructor aid
-#define defineGlobalFunctionSelectionTableConstructDestruct\
-(memberFunction,argNames)                                                      \
-                                                                               \
-    /* Table constructor called from the table add function */                 \
-    void construct##memberFunction##argNames##MemberFunctionTables()           \
-    {                                                                          \
-        static bool constructed = false;                                       \
-        if (!constructed)                                                      \
-        {                                                                      \
-            constructed = true;                                                \
-            memberFunction##argNames##MemberFunctionTablePtr_                  \
-                = new memberFunction##argNames##MemberFunctionTable;           \
-        }                                                                      \
-    }                                                                          \
-                                                                               \
-    /* Table destructor called from the table add function destructor */       \
-    void destroy##memberFunction##argNames##MemberFunctionTables()             \
-    {                                                                          \
-        if (memberFunction##argNames##MemberFunctionTablePtr_)                 \
-        {                                                                      \
-            delete memberFunction##argNames##MemberFunctionTablePtr_;          \
-            memberFunction##argNames##MemberFunctionTablePtr_ = NULL;          \
-        }                                                                      \
-    }
-
-
-// internal use:
-// create pointer to hash-table of functions
-#define defineGlobalFunctionSelectionTablePtr\
-(memberFunction,argNames)                                                      \
-                                                                               \
-    /* Define the memberFunction table */                                      \
-    memberFunction##argNames##MemberFunctionTable*                             \
-        memberFunction##argNames##MemberFunctionTablePtr_ = NULL
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// external use:
-// ~~~~~~~~~~~~~
-// define run-time selection table
-#define defineGlobalFunctionSelectionTable\
-(memberFunction,argNames)                                                      \
-                                                                               \
-    defineGlobalFunctionSelectionTablePtr                                      \
-        (memberFunction,argNames);                                             \
-    defineGlobalFunctionSelectionTableConstructDestruct                        \
-        (memberFunction,argNames)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
deleted file mode 100644
index 29976b0447..0000000000
--- a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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/>.
-
-Global
-    Foam::addToStaticMemberFunctionSelectionTable
-
-Description
-    Macros for easy insertion into member function selection tables
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef addToStaticMemberFunctionSelectionTable_H
-#define addToStaticMemberFunctionSelectionTable_H
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-// add to hash-table of functions with 'lookup' as the key
-#define addNamedToStaticMemberFunctionSelectionTable\
-(baseType,thisType,memberFunction,argNames,lookup,functionPtr)                 \
-                                                                               \
-    /* Add the thisType memberFunction to the table, find by lookup name */    \
-    baseType::add##memberFunction##argNames##                                  \
-    StaticMemberFunctionToTable<thisType>                                      \
-    add_##lookup##_##thisType##memberFunction##argNames##                      \
-    StaticMemberFunctionTo##baseType##Table_(#lookup, functionPtr)
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
deleted file mode 100644
index 4a634b2f3c..0000000000
--- a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
+++ /dev/null
@@ -1,145 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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/>.
-
-Global
-    Foam::staticMemberFunctionSelectionTables
-
-Description
-    Macros to enable the easy declaration of member function selection tables.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef staticMemberFunctionSelectionTables_H
-#define staticMemberFunctionSelectionTables_H
-
-#include "memberFunctionSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// external use:
-// ~~~~~~~~~~~~~
-// declare a run-time selection:
-#define declareStaticMemberFunctionSelectionTable\
-(returnType,baseType,memberFunction,argNames,argList,parList)                  \
-                                                                               \
-    /* Construct from argList function pointer type */                         \
-    typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList; \
-                                                                               \
-    /* Construct from argList function table type */                           \
-    typedef HashTable                                                          \
-        <memberFunction##argNames##MemberFunctionPtr, word, string::hash>      \
-        memberFunction##argNames##MemberFunctionTable;                         \
-                                                                               \
-    /* Construct from argList function pointer table pointer */                \
-    static memberFunction##argNames##MemberFunctionTable*                      \
-        memberFunction##argNames##MemberFunctionTablePtr_;                     \
-                                                                               \
-    /* Table memberFunction called from the table add function */              \
-    static void construct##memberFunction##argNames##MemberFunctionTables();   \
-                                                                               \
-    /* Table destructor called from the table add function destructor */       \
-    static void destroy##memberFunction##argNames##MemberFunctionTables();     \
-                                                                               \
-    /* Class to add constructor from argList to table */                       \
-    template<class baseType##Type>                                             \
-    class add##memberFunction##argNames##StaticMemberFunctionToTable           \
-    {                                                                          \
-    public:                                                                    \
-                                                                               \
-        add##memberFunction##argNames##StaticMemberFunctionToTable             \
-        (                                                                      \
-            const word& lookup,                                                \
-            memberFunction##argNames##MemberFunctionPtr function               \
-        )                                                                      \
-        {                                                                      \
-            construct##memberFunction##argNames##MemberFunctionTables();       \
-            memberFunction##argNames##MemberFunctionTablePtr_->insert          \
-            (                                                                  \
-                lookup,                                                        \
-                function                                                       \
-            );                                                                 \
-        }                                                                      \
-                                                                               \
-        ~add##memberFunction##argNames##StaticMemberFunctionToTable()          \
-        {                                                                      \
-            destroy##memberFunction##argNames##MemberFunctionTables();         \
-        }                                                                      \
-    }
-
-
-// internal use:
-// constructor/destructor aid
-#define defineStaticMemberFunctionSelectionTableConstructDestruct\
-(baseType,memberFunction,argNames)                                             \
-                                                                               \
-    /* Table constructor called from the table add function constructor */     \
-    void baseType::construct##memberFunction##argNames##MemberFunctionTables()\
-    {                                                                          \
-        static bool constructed = false;                                       \
-        if (!constructed)                                                      \
-        {                                                                      \
-            constructed = true;                                                \
-            baseType::memberFunction##argNames##MemberFunctionTablePtr_        \
-                = new baseType::memberFunction##argNames##MemberFunctionTable;\
-        }                                                                      \
-    };                                                                         \
-                                                                               \
-    /* Table destructor called from the table add function destructor */       \
-    void baseType::destroy##memberFunction##argNames##MemberFunctionTables()   \
-    {                                                                          \
-        if (baseType::memberFunction##argNames##MemberFunctionTablePtr_)       \
-        {                                                                      \
-            delete baseType::memberFunction##argNames##MemberFunctionTablePtr_;\
-            baseType::memberFunction##argNames##MemberFunctionTablePtr_ = NULL;\
-        }                                                                      \
-    }
-
-
-// internal use:
-// create pointer to hash-table of functions
-#define defineStaticMemberFunctionSelectionTablePtr\
-(baseType,memberFunction,argNames)                                             \
-                                                                               \
-    /* Define the memberFunction table */                                      \
-    baseType::memberFunction##argNames##MemberFunctionTable*                   \
-        baseType::memberFunction##argNames##MemberFunctionTablePtr_ = NULL
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// external use:
-// ~~~~~~~~~~~~~
-// define run-time selection table
-#define defineStaticMemberFunctionSelectionTable\
-(baseType,memberFunction,argNames)                                             \
-                                                                               \
-    defineStaticMemberFunctionSelectionTablePtr                                \
-        (baseType,memberFunction,argNames);                                    \
-    defineStaticMemberFunctionSelectionTableConstructDestruct                  \
-        (baseType,memberFunction,argNames)                                     \
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

From eb5d349242b9a08f623b0d9261f9e10a09b567c0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 1 Mar 2016 16:01:42 +0000
Subject: [PATCH 241/447] Rationalize the autoMesh library: autoMesh ->
 snappyHexMesh

---
 .../cellSizeAndAlignmentGrid/Make/options     |  2 +-
 .../conformalVoronoiMesh/Make/options         |  4 +--
 .../foamyMesh/foamyHexMesh/Make/options       |  2 +-
 .../foamyHexMeshBackgroundMesh/Make/options   |  2 +-
 .../foamyHexMeshSurfaceSimplify/Make/options  |  2 +-
 .../foamyMesh/foamyQuadMesh/Make/options      |  2 +-
 .../generation/snappyHexMesh/Make/options     |  4 +--
 .../manipulation/orientFaceZone/Make/options  |  4 +--
 .../foamDebugSwitches/Make/options            |  2 +-
 src/mesh/Allwmake                             |  2 +-
 src/mesh/autoMesh/Make/files                  | 36 -------------------
 src/mesh/snappyHexMesh/Make/files             | 31 ++++++++++++++++
 .../{autoMesh => snappyHexMesh}/Make/options  |  0
 .../autoHexMeshDriver/autoLayerDriver.C       |  0
 .../autoHexMeshDriver/autoLayerDriver.H       |  0
 .../autoHexMeshDriver/autoLayerDriverShrink.C |  0
 .../autoLayerDriverTemplates.C                |  2 +-
 .../autoHexMeshDriver/autoRefineDriver.C      |  2 +-
 .../autoHexMeshDriver/autoRefineDriver.H      |  2 +-
 .../autoHexMeshDriver/autoSnapDriver.C        |  0
 .../autoHexMeshDriver/autoSnapDriver.H        |  0
 .../autoHexMeshDriver/autoSnapDriverFeature.C |  0
 .../layerParameters/layerParameters.C         |  2 +-
 .../layerParameters/layerParameters.H         |  2 +-
 .../autoHexMeshDriver/pointData/pointData.C   |  2 +-
 .../autoHexMeshDriver/pointData/pointData.H   |  2 +-
 .../autoHexMeshDriver/pointData/pointDataI.H  |  2 +-
 .../refinementParameters.C                    |  2 +-
 .../refinementParameters.H                    |  2 +-
 .../snapParameters/snapParameters.C           |  2 +-
 .../snapParameters/snapParameters.H           |  2 +-
 .../displacementMeshMoverMotionSolver.C       |  2 +-
 .../displacementMeshMoverMotionSolver.H       |  2 +-
 .../externalDisplacementMeshMover.C           |  2 +-
 .../externalDisplacementMeshMover.H           |  2 +-
 .../medialAxisMeshMover.C                     |  0
 .../medialAxisMeshMover.H                     |  2 +-
 .../zeroFixedValuePointPatchField.C           |  2 +-
 .../zeroFixedValuePointPatchField.H           |  0
 .../zeroFixedValuePointPatchFields.C          |  2 +-
 .../zeroFixedValuePointPatchFields.H          |  2 +-
 .../meshRefinement/meshRefinement.C           |  0
 .../meshRefinement/meshRefinement.H           |  0
 .../meshRefinement/meshRefinementBaffles.C    |  2 +-
 .../meshRefinement/meshRefinementMerge.C      |  2 +-
 .../meshRefinementProblemCells.C              |  2 +-
 .../meshRefinement/meshRefinementRefine.C     |  2 +-
 .../meshRefinement/meshRefinementTemplates.C  |  2 +-
 .../meshRefinement/patchFaceOrientation.C     |  2 +-
 .../meshRefinement/patchFaceOrientation.H     |  2 +-
 .../meshRefinement/patchFaceOrientationI.H    |  2 +-
 .../refinementFeatures/refinementFeatures.C   |  0
 .../refinementFeatures/refinementFeatures.H   |  0
 .../refinementSurfaces/refinementSurfaces.C   |  0
 .../refinementSurfaces/refinementSurfaces.H   |  2 +-
 .../refinementSurfaces/surfaceZonesInfo.C     |  2 +-
 .../refinementSurfaces/surfaceZonesInfo.H     |  2 +-
 .../shellSurfaces/shellSurfaces.C             |  0
 .../shellSurfaces/shellSurfaces.H             |  0
 .../trackedParticle/trackedParticle.C         |  2 +-
 .../trackedParticle/trackedParticle.H         |  0
 .../trackedParticle/trackedParticleCloud.C    |  2 +-
 62 files changed, 77 insertions(+), 82 deletions(-)
 delete mode 100644 src/mesh/autoMesh/Make/files
 create mode 100644 src/mesh/snappyHexMesh/Make/files
 rename src/mesh/{autoMesh => snappyHexMesh}/Make/options (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/autoLayerDriver.C (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/autoLayerDriver.H (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/autoLayerDriverShrink.C (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/autoLayerDriverTemplates.C (97%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/autoRefineDriver.C (99%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/autoRefineDriver.H (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/autoSnapDriver.C (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/autoSnapDriver.H (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/autoSnapDriverFeature.C (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/layerParameters/layerParameters.C (99%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/layerParameters/layerParameters.H (99%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/pointData/pointData.C (96%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/pointData/pointData.H (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/pointData/pointDataI.H (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/refinementParameters/refinementParameters.C (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/refinementParameters/refinementParameters.H (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/snapParameters/snapParameters.C (96%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/autoHexMeshDriver/snapParameters/snapParameters.H (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H (97%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/externalDisplacementMeshMover/externalDisplacementMeshMover.C (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/externalDisplacementMeshMover/externalDisplacementMeshMover.H (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/externalDisplacementMeshMover/medialAxisMeshMover.C (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/externalDisplacementMeshMover/medialAxisMeshMover.H (99%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C (97%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C (95%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H (96%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/meshRefinement/meshRefinement.C (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/meshRefinement/meshRefinement.H (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/meshRefinement/meshRefinementBaffles.C (99%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/meshRefinement/meshRefinementMerge.C (99%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/meshRefinement/meshRefinementProblemCells.C (99%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/meshRefinement/meshRefinementRefine.C (99%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/meshRefinement/meshRefinementTemplates.C (99%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/meshRefinement/patchFaceOrientation.C (95%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/meshRefinement/patchFaceOrientation.H (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/meshRefinement/patchFaceOrientationI.H (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/refinementFeatures/refinementFeatures.C (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/refinementFeatures/refinementFeatures.H (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/refinementSurfaces/refinementSurfaces.C (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/refinementSurfaces/refinementSurfaces.H (99%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/refinementSurfaces/surfaceZonesInfo.C (99%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/refinementSurfaces/surfaceZonesInfo.H (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/shellSurfaces/shellSurfaces.C (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/shellSurfaces/shellSurfaces.H (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/trackedParticle/trackedParticle.C (98%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/trackedParticle/trackedParticle.H (100%)
 rename src/mesh/{autoMesh/autoHexMesh => snappyHexMesh}/trackedParticle/trackedParticleCloud.C (95%)

diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
index 8fe8686f66..f9a4d17aaf 100644
--- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
@@ -20,7 +20,7 @@ EXE_INC =  \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I../conformalVoronoiMesh/lnInclude
 
 EXE_LIBS =  \
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
index 44c1d87758..d2bdc98f84 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
@@ -22,7 +22,7 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -IPrintTable \
     -I/usr/include
 
@@ -35,4 +35,4 @@ LIB_LIBS = \
     -ldynamicMesh \
     -lsurfMesh \
     -lsampling \
-    -lautoMesh
+    -lsnappyHexMesh
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
index b3f2e7dd7c..6cbbd9a4ab 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
@@ -22,7 +22,7 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -IvectorTools
 
 EXE_LIBS = \
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
index 07f6800de6..dae842a311 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
@@ -10,7 +10,7 @@ EXE_INC = \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options
index 18ce8326c7..5cb1f8676d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
     -I$(FASTDUALOCTREE_SRC_PATH) \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
index 0c04fa99be..1dace00f1e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
@@ -21,7 +21,7 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I/usr/include
 
 EXE_LIBS = \
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index 219e3d419c..c233730d42 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -1,7 +1,7 @@
 EXE_INC = \
     /* -g -DFULLDEBUG -O0 */ \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
@@ -18,4 +18,4 @@ EXE_LIBS = \
     -lsurfMesh \
     -lfileFormats \
     -ldynamicMesh \
-    -lautoMesh
+    -lsnappyHexMesh
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/Make/options b/applications/utilities/mesh/manipulation/orientFaceZone/Make/options
index 30fde688e5..56e8dc4f17 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/Make/options
+++ b/applications/utilities/mesh/manipulation/orientFaceZone/Make/options
@@ -1,9 +1,9 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
-    -lautoMesh \
+    -lsnappyHexMesh \
     -ltriSurface
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index 2324ff61d0..0a415b6bfb 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -1,5 +1,5 @@
 EXE_LIBS = \
-    -lautoMesh \
+    -lsnappyHexMesh \
     -lbarotropicCompressibilityModel \
     -lsolidThermo \
     -lcompressibleTransportModels \
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
index 0b948da366..9fc260a1a1 100755
--- a/src/mesh/Allwmake
+++ b/src/mesh/Allwmake
@@ -6,7 +6,7 @@ targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $targetType autoMesh
+wmake $targetType snappyHexMesh
 wmake $targetType blockMesh
 wmake $targetType extrudeModel
 
diff --git a/src/mesh/autoMesh/Make/files b/src/mesh/autoMesh/Make/files
deleted file mode 100644
index 2bc9cd80a1..0000000000
--- a/src/mesh/autoMesh/Make/files
+++ /dev/null
@@ -1,36 +0,0 @@
-autoHexMesh             = autoHexMesh
-autoHexMeshDriver       = $(autoHexMesh)/autoHexMeshDriver
-
-$(autoHexMeshDriver)/autoLayerDriver.C
-/* $(autoHexMeshDriver)/autoLayerDriverShrink.C */
-$(autoHexMeshDriver)/autoSnapDriver.C
-$(autoHexMeshDriver)/autoSnapDriverFeature.C
-$(autoHexMeshDriver)/autoRefineDriver.C
-
-$(autoHexMeshDriver)/layerParameters/layerParameters.C
-$(autoHexMeshDriver)/refinementParameters/refinementParameters.C
-$(autoHexMeshDriver)/snapParameters/snapParameters.C
-$(autoHexMeshDriver)/pointData/pointData.C
-
-$(autoHexMesh)/meshRefinement/meshRefinementBaffles.C
-$(autoHexMesh)/meshRefinement/meshRefinement.C
-$(autoHexMesh)/meshRefinement/meshRefinementMerge.C
-$(autoHexMesh)/meshRefinement/meshRefinementProblemCells.C
-$(autoHexMesh)/meshRefinement/meshRefinementRefine.C
-$(autoHexMesh)/meshRefinement/patchFaceOrientation.C
-
-$(autoHexMesh)/refinementFeatures/refinementFeatures.C
-$(autoHexMesh)/refinementSurfaces/surfaceZonesInfo.C
-$(autoHexMesh)/refinementSurfaces/refinementSurfaces.C
-$(autoHexMesh)/shellSurfaces/shellSurfaces.C
-$(autoHexMesh)/trackedParticle/trackedParticle.C
-$(autoHexMesh)/trackedParticle/trackedParticleCloud.C
-
-meshMover = $(autoHexMesh)/externalDisplacementMeshMover
-$(meshMover)/displacementMeshMoverMotionSolver.C
-$(meshMover)/externalDisplacementMeshMover.C
-$(meshMover)/medialAxisMeshMover.C
-$(meshMover)/zeroFixedValue/zeroFixedValuePointPatchFields.C
-
-LIB = $(FOAM_LIBBIN)/libautoMesh
-
diff --git a/src/mesh/snappyHexMesh/Make/files b/src/mesh/snappyHexMesh/Make/files
new file mode 100644
index 0000000000..476ecc79da
--- /dev/null
+++ b/src/mesh/snappyHexMesh/Make/files
@@ -0,0 +1,31 @@
+autoHexMeshDriver/autoLayerDriver.C
+/* autoHexMeshDriver/autoLayerDriverShrink.C */
+autoHexMeshDriver/autoSnapDriver.C
+autoHexMeshDriver/autoSnapDriverFeature.C
+autoHexMeshDriver/autoRefineDriver.C
+
+autoHexMeshDriver/layerParameters/layerParameters.C
+autoHexMeshDriver/refinementParameters/refinementParameters.C
+autoHexMeshDriver/snapParameters/snapParameters.C
+autoHexMeshDriver/pointData/pointData.C
+
+meshRefinement/meshRefinementBaffles.C
+meshRefinement/meshRefinement.C
+meshRefinement/meshRefinementMerge.C
+meshRefinement/meshRefinementProblemCells.C
+meshRefinement/meshRefinementRefine.C
+meshRefinement/patchFaceOrientation.C
+
+refinementFeatures/refinementFeatures.C
+refinementSurfaces/surfaceZonesInfo.C
+refinementSurfaces/refinementSurfaces.C
+shellSurfaces/shellSurfaces.C
+trackedParticle/trackedParticle.C
+trackedParticle/trackedParticleCloud.C
+
+externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
+externalDisplacementMeshMover/externalDisplacementMeshMover.C
+externalDisplacementMeshMover/medialAxisMeshMover.C
+externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
+
+LIB = $(FOAM_LIBBIN)/libsnappyHexMesh
diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/snappyHexMesh/Make/options
similarity index 100%
rename from src/mesh/autoMesh/Make/options
rename to src/mesh/snappyHexMesh/Make/options
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.C
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.H
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
similarity index 97%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
index afb66396c8..adae523722 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.C
index 8c63239f39..81fda9a3a2 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.H
index a72f3c0796..a4cb07506d 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.C
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.H
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
index 49125589a3..d2b12b8780 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
index 52b4855ae2..a9bd6a64a1 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.C
similarity index 96%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.C
index e3d36bfcb3..7306051e37 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.H
index 9b933d744c..8541a5cd3e 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointDataI.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointDataI.H
index 69d59bcb00..14fa39fe94 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointDataI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
index b87015effa..3bb4ade11d 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
index 06b90b0758..beb3a0039e 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
similarity index 96%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
index 364a6aae49..40f1453a07 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
index 5dc4ca34e8..8913e8fcf8 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
index 84d212e425..1c90909ebe 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
similarity index 97%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
index 273f5fc301..e056ec807a 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
index 14916efc9c..4045036329 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
index 9d98b435b8..4a6074683e 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
index 71c66c5c3c..2af66f6dc0 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
similarity index 97%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
index 8ee5b49f04..0caa4f166c 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
similarity index 95%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
index 71ed2c092c..1ec629a11d 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H
similarity index 96%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H
index d0826b73d4..59afbb82b2 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index 1f2101155e..b637a0f6d4 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
index 4fc1b40077..3f4880f03a 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
index f1b8776f8a..7d81e62011 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index e2224f7cd4..a46c41a412 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
index 1bdb191299..7e42869451 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.C b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.C
similarity index 95%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.C
rename to src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.C
index 8bdd1c4106..0cce24342e 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.H b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.H
rename to src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.H
index 116a68ee39..e86eae1c03 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientationI.H b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientationI.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientationI.H
rename to src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientationI.H
index c66e696d4a..f8a4429a49 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientationI.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientationI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
rename to src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.H b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.H
rename to src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
rename to src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
rename to src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H
index 7f777daf33..f19fa4949e 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.C b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.C
rename to src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
index cb247ede20..0669d2fb5f 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.H b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.H
rename to src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
index eb59aad34f..467d4331ba 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.H
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
rename to src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
diff --git a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H
rename to src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
rename to src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
index a883c39d42..686593e3b5 100644
--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
+++ b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
rename to src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C b/src/mesh/snappyHexMesh/trackedParticle/trackedParticleCloud.C
similarity index 95%
rename from src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
rename to src/mesh/snappyHexMesh/trackedParticle/trackedParticleCloud.C
index 109a7bd870..29bdad32fd 100644
--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
+++ b/src/mesh/snappyHexMesh/trackedParticle/trackedParticleCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 2bbc844ea0c0716ff4a51614bb05c76e22107818 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 1 Mar 2016 16:21:31 +0000
Subject: [PATCH 242/447] Rationalize the autoMesh library: autoHexMesh ->
 snappyHexMesh autoRefine -> snappyRefine autoLayer -> snappyLayer autoSnap ->
 snappySnap

---
 .../mesh/advanced/autoRefineMesh/Make/files   |  4 +-
 .../{autoRefineMesh.C => snappyRefineMesh.C}  |  6 +-
 ...utoRefineMeshDict => snappyRefineMeshDict} |  2 +-
 .../generation/snappyHexMesh/snappyHexMesh.C  | 18 ++---
 etc/controlDict                               |  8 +--
 src/mesh/snappyHexMesh/Make/files             | 18 ++---
 .../medialAxisMeshMover.C                     | 48 ++++++-------
 .../medialAxisMeshMover.H                     | 12 ++--
 .../meshRefinementProblemCells.C              | 10 +--
 .../layerParameters/layerParameters.C         |  0
 .../layerParameters/layerParameters.H         |  0
 .../pointData/pointData.C                     |  0
 .../pointData/pointData.H                     |  0
 .../pointData/pointDataI.H                    |  0
 .../refinementParameters.C                    |  0
 .../refinementParameters.H                    |  0
 .../snapParameters/snapParameters.C           |  0
 .../snapParameters/snapParameters.H           |  0
 .../snappyLayerDriver.C}                      | 68 +++++++++----------
 .../snappyLayerDriver.H}                      | 22 +++---
 .../snappyLayerDriverShrink.C}                | 24 +++----
 .../snappyLayerDriverTemplates.C}             |  4 +-
 .../snappyRefineDriver.C}                     | 28 ++++----
 .../snappyRefineDriver.H}                     | 20 +++---
 .../snappySnapDriver.C}                       | 52 +++++++-------
 .../snappySnapDriver.H}                       | 22 +++---
 .../snappySnapDriverFeature.C}                | 46 ++++++-------
 27 files changed, 206 insertions(+), 206 deletions(-)
 rename applications/utilities/mesh/advanced/autoRefineMesh/{autoRefineMesh.C => snappyRefineMesh.C} (99%)
 rename applications/utilities/mesh/advanced/autoRefineMesh/{autoRefineMeshDict => snappyRefineMeshDict} (98%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver => snappyHexMeshDriver}/layerParameters/layerParameters.C (100%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver => snappyHexMeshDriver}/layerParameters/layerParameters.H (100%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver => snappyHexMeshDriver}/pointData/pointData.C (100%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver => snappyHexMeshDriver}/pointData/pointData.H (100%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver => snappyHexMeshDriver}/pointData/pointDataI.H (100%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver => snappyHexMeshDriver}/refinementParameters/refinementParameters.C (100%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver => snappyHexMeshDriver}/refinementParameters/refinementParameters.H (100%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver => snappyHexMeshDriver}/snapParameters/snapParameters.C (100%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver => snappyHexMeshDriver}/snapParameters/snapParameters.H (100%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver/autoLayerDriver.C => snappyHexMeshDriver/snappyLayerDriver.C} (98%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver/autoLayerDriver.H => snappyHexMeshDriver/snappyLayerDriver.H} (98%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver/autoLayerDriverShrink.C => snappyHexMeshDriver/snappyLayerDriverShrink.C} (98%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver/autoLayerDriverTemplates.C => snappyHexMeshDriver/snappyLayerDriverTemplates.C} (96%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver/autoRefineDriver.C => snappyHexMeshDriver/snappyRefineDriver.C} (98%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver/autoRefineDriver.H => snappyHexMeshDriver/snappyRefineDriver.H} (93%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver/autoSnapDriver.C => snappyHexMeshDriver/snappySnapDriver.C} (98%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver/autoSnapDriver.H => snappyHexMeshDriver/snappySnapDriver.H} (98%)
 rename src/mesh/snappyHexMesh/{autoHexMeshDriver/autoSnapDriverFeature.C => snappyHexMeshDriver/snappySnapDriverFeature.C} (98%)

diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/Make/files b/applications/utilities/mesh/advanced/autoRefineMesh/Make/files
index 666a1c6b10..2d0b43d342 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/Make/files
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/Make/files
@@ -1,4 +1,4 @@
-autoRefineMesh.C
+snappyRefineMesh.C
 
-EXE = $(FOAM_APPBIN)/autoRefineMesh
+EXE = $(FOAM_APPBIN)/snappyRefineMesh
 
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C
similarity index 99%
rename from applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
rename to applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C
index ed30517153..e3f8bc4169 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    autoRefineMesh
+    snappyRefineMesh
 
 Description
     Utility to refine cells near to a surface.
@@ -670,7 +670,7 @@ int main(int argc, char *argv[])
     (
         IOobject
         (
-            "autoRefineMeshDict",
+            "snappyRefineMeshDict",
             runTime.system(),
             mesh,
             IOobject::MUST_READ_IF_MODIFIED,
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict b/applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMeshDict
similarity index 98%
rename from applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
rename to applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMeshDict
index adfee94118..9d93214c33 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMeshDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      autoRefineMeshDict;
+    object      snappyRefineMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index edd87561fd..37f508633b 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -32,9 +32,9 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "fvMesh.H"
-#include "autoRefineDriver.H"
-#include "autoSnapDriver.H"
-#include "autoLayerDriver.H"
+#include "snappyRefineDriver.H"
+#include "snappySnapDriver.H"
+#include "snappyLayerDriver.H"
 #include "searchableSurfaces.H"
 #include "refinementSurfaces.H"
 #include "refinementFeatures.H"
@@ -868,9 +868,9 @@ int main(int argc, char *argv[])
     if (debugLevel > 0)
     {
         meshRefinement::debug   = debugLevel;
-        autoRefineDriver::debug = debugLevel;
-        autoSnapDriver::debug   = debugLevel;
-        autoLayerDriver::debug  = debugLevel;
+        snappyRefineDriver::debug = debugLevel;
+        snappySnapDriver::debug   = debugLevel;
+        snappyLayerDriver::debug  = debugLevel;
     }
 
     // Set file writing level
@@ -1326,7 +1326,7 @@ int main(int argc, char *argv[])
     {
         cpuTime timer;
 
-        autoRefineDriver refineDriver
+        snappyRefineDriver refineDriver
         (
             meshRefiner,
             decomposer,
@@ -1367,7 +1367,7 @@ int main(int argc, char *argv[])
     {
         cpuTime timer;
 
-        autoSnapDriver snapDriver
+        snappySnapDriver snapDriver
         (
             meshRefiner,
             globalToMasterPatch,
@@ -1408,7 +1408,7 @@ int main(int argc, char *argv[])
     {
         cpuTime timer;
 
-        autoLayerDriver layerDriver
+        snappyLayerDriver layerDriver
         (
             meshRefiner,
             globalToMasterPatch,
diff --git a/etc/controlDict b/etc/controlDict
index fac98db233..eedb6119e8 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -313,10 +313,10 @@ DebugSwitches
     atomizationModel    0;
     attachDetach        0;
     autoDensity         0;
-    autoHexMeshDriver   0;
-    autoLayerDriver     0;
-    autoRefineDriver    0;
-    autoSnapDriver      0;
+    snappyHexMeshDriver 0;
+    snappyLayerDriver     0;
+    snappyRefineDriver    0;
+    snappySnapDriver      0;
     bC11H10             0;
     backgroundMeshDecomposition 0;
     backward            0;
diff --git a/src/mesh/snappyHexMesh/Make/files b/src/mesh/snappyHexMesh/Make/files
index 476ecc79da..78cc278112 100644
--- a/src/mesh/snappyHexMesh/Make/files
+++ b/src/mesh/snappyHexMesh/Make/files
@@ -1,13 +1,13 @@
-autoHexMeshDriver/autoLayerDriver.C
-/* autoHexMeshDriver/autoLayerDriverShrink.C */
-autoHexMeshDriver/autoSnapDriver.C
-autoHexMeshDriver/autoSnapDriverFeature.C
-autoHexMeshDriver/autoRefineDriver.C
+snappyHexMeshDriver/snappyLayerDriver.C
+/* snappyHexMeshDriver/snappyLayerDriverShrink.C */
+snappyHexMeshDriver/snappySnapDriver.C
+snappyHexMeshDriver/snappySnapDriverFeature.C
+snappyHexMeshDriver/snappyRefineDriver.C
 
-autoHexMeshDriver/layerParameters/layerParameters.C
-autoHexMeshDriver/refinementParameters/refinementParameters.C
-autoHexMeshDriver/snapParameters/snapParameters.C
-autoHexMeshDriver/pointData/pointData.C
+snappyHexMeshDriver/layerParameters/layerParameters.C
+snappyHexMeshDriver/refinementParameters/refinementParameters.C
+snappyHexMeshDriver/snapParameters/snapParameters.C
+snappyHexMeshDriver/pointData/pointData.C
 
 meshRefinement/meshRefinementBaffles.C
 meshRefinement/meshRefinement.C
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index 80afad310d..fc70998861 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -862,18 +862,18 @@ bool Foam::medialAxisMeshMover::unmarkExtrusion
 (
     const label patchPointI,
     pointField& patchDisp,
-    List<autoLayerDriver::extrudeMode>& extrudeStatus
+    List<snappyLayerDriver::extrudeMode>& extrudeStatus
 )
 {
-    if (extrudeStatus[patchPointI] == autoLayerDriver::EXTRUDE)
+    if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDE)
     {
-        extrudeStatus[patchPointI] = autoLayerDriver::NOEXTRUDE;
+        extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
         patchDisp[patchPointI] = vector::zero;
         return true;
     }
-    else if (extrudeStatus[patchPointI] == autoLayerDriver::EXTRUDEREMOVE)
+    else if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDEREMOVE)
     {
-        extrudeStatus[patchPointI] = autoLayerDriver::NOEXTRUDE;
+        extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
         patchDisp[patchPointI] = vector::zero;
         return true;
     }
@@ -888,7 +888,7 @@ void Foam::medialAxisMeshMover::syncPatchDisplacement
 (
     const scalarField& minThickness,
     pointField& patchDisp,
-    List<autoLayerDriver::extrudeMode>& extrudeStatus
+    List<snappyLayerDriver::extrudeMode>& extrudeStatus
 ) const
 {
     const indirectPrimitivePatch& pp = adaptPatchPtr_();
@@ -1081,7 +1081,7 @@ handleFeatureAngleLayerTerminations
     const scalar minCos,
     const PackedBoolList& isPatchMasterPoint,
     const labelList& meshEdges,
-    List<autoLayerDriver::extrudeMode>& extrudeStatus,
+    List<snappyLayerDriver::extrudeMode>& extrudeStatus,
     pointField& patchDisp,
     label& nPointCounter
 ) const
@@ -1099,7 +1099,7 @@ handleFeatureAngleLayerTerminations
 
         forAll(f, fp)
         {
-            if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
+            if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
             {
                 extrudedFaces[faceI] = false;
                 break;
@@ -1168,8 +1168,8 @@ handleFeatureAngleLayerTerminations
 
             if
             (
-                extrudeStatus[v0] != autoLayerDriver::NOEXTRUDE
-             || extrudeStatus[v1] != autoLayerDriver::NOEXTRUDE
+                extrudeStatus[v0] != snappyLayerDriver::NOEXTRUDE
+             || extrudeStatus[v1] != snappyLayerDriver::NOEXTRUDE
             )
             {
                 if (!eFaceExtrude[0] || !eFaceExtrude[1])
@@ -1215,7 +1215,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
     const PackedBoolList& isPatchMasterEdge,
     const labelList& meshEdges,
     const scalarField& minThickness,
-    List<autoLayerDriver::extrudeMode>& extrudeStatus,
+    List<snappyLayerDriver::extrudeMode>& extrudeStatus,
     pointField& patchDisp
 ) const
 {
@@ -1288,7 +1288,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
 
                 forAll(f, fp)
                 {
-                    if (extrudeStatus[f[fp]] != autoLayerDriver::NOEXTRUDE)
+                    if (extrudeStatus[f[fp]] != snappyLayerDriver::NOEXTRUDE)
                     {
                         if (islandPoint[faceI] == -1)
                         {
@@ -1312,7 +1312,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
             // Check all surrounding faces that I am the islandPoint
             forAll(pointFaces, patchPointI)
             {
-                if (extrudeStatus[patchPointI] != autoLayerDriver::NOEXTRUDE)
+                if (extrudeStatus[patchPointI] != snappyLayerDriver::NOEXTRUDE)
                 {
                     const labelList& pFaces = pointFaces[patchPointI];
 
@@ -1340,7 +1340,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
                 const face& f = pp.localFaces()[faceI];
                 forAll(f, fp)
                 {
-                    if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
+                    if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
                     {
                         extrudedFaces[faceI] = false;
                         break;
@@ -1419,11 +1419,11 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
             label v0 = e[0];
             label v1 = e[1];
 
-            if (extrudeStatus[v1] != autoLayerDriver::NOEXTRUDE)
+            if (extrudeStatus[v1] != snappyLayerDriver::NOEXTRUDE)
             {
                 isolatedPoint[v0] += 1;
             }
-            if (extrudeStatus[v0] != autoLayerDriver::NOEXTRUDE)
+            if (extrudeStatus[v0] != snappyLayerDriver::NOEXTRUDE)
             {
                 isolatedPoint[v1] += 1;
             }
@@ -1458,7 +1458,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
         {
             forAll(f, fp)
             {
-                if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
+                if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
                 {
                     allPointsExtruded = false;
                     break;
@@ -1700,7 +1700,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
 (
     const dictionary& coeffDict,
     const scalarField& minThickness,
-    List<autoLayerDriver::extrudeMode>& extrudeStatus,
+    List<snappyLayerDriver::extrudeMode>& extrudeStatus,
     pointField& patchDisp
 )
 {
@@ -1794,7 +1794,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
 
     forAll(thickness, patchPointI)
     {
-        if (extrudeStatus[patchPointI] == autoLayerDriver::NOEXTRUDE)
+        if (extrudeStatus[patchPointI] == snappyLayerDriver::NOEXTRUDE)
         {
             thickness[patchPointI] = 0.0;
         }
@@ -1843,7 +1843,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
 
     forAll(meshPoints, patchPointI)
     {
-        if (extrudeStatus[patchPointI] != autoLayerDriver::NOEXTRUDE)
+        if (extrudeStatus[patchPointI] != snappyLayerDriver::NOEXTRUDE)
         {
             label pointI = meshPoints[patchPointI];
 
@@ -1937,7 +1937,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     // Update thickess for changed extrusion
     forAll(thickness, patchPointI)
     {
-        if (extrudeStatus[patchPointI] == autoLayerDriver::NOEXTRUDE)
+        if (extrudeStatus[patchPointI] == snappyLayerDriver::NOEXTRUDE)
         {
             thickness[patchPointI] = 0.0;
         }
@@ -2146,16 +2146,16 @@ bool Foam::medialAxisMeshMover::move
         pp.meshPoints()
     );
 
-    List<autoLayerDriver::extrudeMode> extrudeStatus
+    List<snappyLayerDriver::extrudeMode> extrudeStatus
     (
         pp.nPoints(),
-        autoLayerDriver::EXTRUDE
+        snappyLayerDriver::EXTRUDE
     );
     forAll(extrudeStatus, pointI)
     {
         if (mag(patchDisp[pointI]) <= minThickness[pointI]+SMALL)
         {
-            extrudeStatus[pointI] = autoLayerDriver::NOEXTRUDE;
+            extrudeStatus[pointI] = snappyLayerDriver::NOEXTRUDE;
         }
     }
 
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
index 2af66f6dc0..96541453d6 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
@@ -43,7 +43,7 @@ SourceFiles
 
 #include "externalDisplacementMeshMover.H"
 #include "motionSmootherAlgo.H"
-#include "autoLayerDriver.H"
+#include "snappyLayerDriver.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -150,7 +150,7 @@ class medialAxisMeshMover
             (
                 const label patchPointI,
                 pointField& patchDisp,
-                List<autoLayerDriver::extrudeMode>& extrudeStatus
+                List<snappyLayerDriver::extrudeMode>& extrudeStatus
             );
 
             //- Synchronise extrusion
@@ -158,7 +158,7 @@ class medialAxisMeshMover
             (
                 const scalarField& minThickness,
                 pointField& patchDisp,
-                List<autoLayerDriver::extrudeMode>& extrudeStatus
+                List<snappyLayerDriver::extrudeMode>& extrudeStatus
             ) const;
 
             void smoothLambdaMuDisplacement
@@ -184,7 +184,7 @@ class medialAxisMeshMover
                 const scalar minCos,
                 const PackedBoolList& isMasterPoint,
                 const labelList& meshEdges,
-                List<autoLayerDriver::extrudeMode>& extrudeStatus,
+                List<snappyLayerDriver::extrudeMode>& extrudeStatus,
                 pointField& patchDisp,
                 label& nPointCounter
             ) const;
@@ -200,7 +200,7 @@ class medialAxisMeshMover
                 const PackedBoolList& isMasterEdge,
                 const labelList& meshEdges,
                 const scalarField& minThickness,
-                List<autoLayerDriver::extrudeMode>& extrudeStatus,
+                List<snappyLayerDriver::extrudeMode>& extrudeStatus,
                 pointField& patchDisp
             ) const;
 
@@ -212,7 +212,7 @@ class medialAxisMeshMover
         (
             const dictionary&,
             const scalarField& minThickness,
-            List<autoLayerDriver::extrudeMode>& extrudeStatus,
+            List<snappyLayerDriver::extrudeMode>& extrudeStatus,
             pointField& patchDisp
         );
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
index 7d81e62011..df8ec3d554 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -36,7 +36,7 @@ License
 #include "polyMeshGeometry.H"
 #include "IOmanip.H"
 #include "unitConversion.H"
-#include "autoSnapDriver.H"
+#include "snappySnapDriver.H"
 
 #include "snapParameters.H"
 #include "motionSmoother.H"
@@ -1090,7 +1090,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
 {
     pointField oldPoints(mesh_.points());
 
-    // Repeat (most of) autoSnapDriver::doSnap
+    // Repeat (most of) snappySnapDriver::doSnap
     {
         labelList adaptPatchIDs(meshedPatches());
 
@@ -1108,7 +1108,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
         // Distance to attract to nearest feature on surface
         const scalarField snapDist
         (
-            autoSnapDriver::calcSnapDistance(mesh_, snapParams, pp)
+            snappySnapDriver::calcSnapDistance(mesh_, snapParams, pp)
         );
 
 
@@ -1147,7 +1147,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
             << mesh_.time().cpuTimeIncrement() << " s\n" << nl << endl;
 
         // Pre-smooth patch vertices (so before determining nearest)
-        autoSnapDriver::preSmoothPatch
+        snappySnapDriver::preSmoothPatch
         (
             *this,
             snapParams,
@@ -1160,7 +1160,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
         vectorField nearestNormal;
         const vectorField disp
         (
-            autoSnapDriver::calcNearestSurface
+            snappySnapDriver::calcNearestSurface
             (
                 *this,
                 snapDist,   // attraction
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
similarity index 100%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H
similarity index 100%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.C
similarity index 100%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.C
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.C
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.H
similarity index 100%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.H
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.H
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointDataI.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointDataI.H
similarity index 100%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointDataI.H
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointDataI.H
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
similarity index 100%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H
similarity index 100%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.C
similarity index 100%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.C
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.H
similarity index 100%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.H
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
similarity index 98%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.C
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index f6b5508eb1..1d1620e9d6 100644
--- a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -26,7 +26,7 @@ Description
 
 \*----------------------------------------------------------------------------*/
 
-#include "autoLayerDriver.H"
+#include "snappyLayerDriver.H"
 #include "fvMesh.H"
 #include "Time.H"
 #include "meshRefinement.H"
@@ -65,7 +65,7 @@ Description
 namespace Foam
 {
 
-defineTypeNameAndDebug(autoLayerDriver, 0);
+defineTypeNameAndDebug(snappyLayerDriver, 0);
 
 } // End namespace Foam
 
@@ -73,7 +73,7 @@ defineTypeNameAndDebug(autoLayerDriver, 0);
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // For debugging: Dump displacement to .obj files
-void Foam::autoLayerDriver::dumpDisplacement
+void Foam::snappyLayerDriver::dumpDisplacement
 (
     const fileName& prefix,
     const indirectPrimitivePatch& pp,
@@ -105,7 +105,7 @@ void Foam::autoLayerDriver::dumpDisplacement
 }
 
 
-Foam::tmp<Foam::scalarField> Foam::autoLayerDriver::avgPointData
+Foam::tmp<Foam::scalarField> Foam::snappyLayerDriver::avgPointData
 (
     const indirectPrimitivePatch& pp,
     const scalarField& pointFld
@@ -132,7 +132,7 @@ Foam::tmp<Foam::scalarField> Foam::autoLayerDriver::avgPointData
 
 // Check that primitivePatch is not multiply connected. Collect non-manifold
 // points in pointSet.
-void Foam::autoLayerDriver::checkManifold
+void Foam::snappyLayerDriver::checkManifold
 (
     const indirectPrimitivePatch& fp,
     pointSet& nonManifoldPoints
@@ -159,7 +159,7 @@ void Foam::autoLayerDriver::checkManifold
 }
 
 
-void Foam::autoLayerDriver::checkMeshManifold() const
+void Foam::snappyLayerDriver::checkMeshManifold() const
 {
     const fvMesh& mesh = meshRefiner_.mesh();
 
@@ -213,7 +213,7 @@ void Foam::autoLayerDriver::checkMeshManifold() const
 
 
 // Unset extrusion on point. Returns true if anything unset.
-bool Foam::autoLayerDriver::unmarkExtrusion
+bool Foam::snappyLayerDriver::unmarkExtrusion
 (
     const label patchPointI,
     pointField& patchDisp,
@@ -243,7 +243,7 @@ bool Foam::autoLayerDriver::unmarkExtrusion
 
 
 // Unset extrusion on face. Returns true if anything unset.
-bool Foam::autoLayerDriver::unmarkExtrusion
+bool Foam::snappyLayerDriver::unmarkExtrusion
 (
     const face& localFace,
     pointField& patchDisp,
@@ -274,7 +274,7 @@ bool Foam::autoLayerDriver::unmarkExtrusion
 
 
 // No extrusion at non-manifold points.
-void Foam::autoLayerDriver::handleNonManifolds
+void Foam::snappyLayerDriver::handleNonManifolds
 (
     const indirectPrimitivePatch& pp,
     const labelList& meshEdges,
@@ -385,7 +385,7 @@ void Foam::autoLayerDriver::handleNonManifolds
 
 
 // Parallel feature edge detection. Assumes non-manifold edges already handled.
-void Foam::autoLayerDriver::handleFeatureAngle
+void Foam::snappyLayerDriver::handleFeatureAngle
 (
     const indirectPrimitivePatch& pp,
     const labelList& meshEdges,
@@ -504,7 +504,7 @@ void Foam::autoLayerDriver::handleFeatureAngle
 // layer and compares it to the space the warped face takes up. Disables
 // extrusion if layer thickness is more than faceRatio of the thickness of
 // the face.
-void Foam::autoLayerDriver::handleWarpedFaces
+void Foam::snappyLayerDriver::handleWarpedFaces
 (
     const indirectPrimitivePatch& pp,
     const scalar faceRatio,
@@ -578,7 +578,7 @@ void Foam::autoLayerDriver::handleWarpedFaces
 
 //// No extrusion on cells with multiple patch faces. There ususally is a reason
 //// why combinePatchFaces hasn't succeeded.
-//void Foam::autoLayerDriver::handleMultiplePatchFaces
+//void Foam::snappyLayerDriver::handleMultiplePatchFaces
 //(
 //    const indirectPrimitivePatch& pp,
 //    pointField& patchDisp,
@@ -679,7 +679,7 @@ void Foam::autoLayerDriver::handleWarpedFaces
 //}
 
 
-void Foam::autoLayerDriver::setNumLayers
+void Foam::snappyLayerDriver::setNumLayers
 (
     const labelList& patchToNLayers,
     const labelList& patchIDs,
@@ -803,7 +803,7 @@ void Foam::autoLayerDriver::setNumLayers
 // Construct pointVectorField with correct boundary conditions for adding
 // layers
 Foam::tmp<Foam::pointVectorField>
-Foam::autoLayerDriver::makeLayerDisplacementField
+Foam::snappyLayerDriver::makeLayerDisplacementField
 (
     const pointMesh& pMesh,
     const labelList& numLayers
@@ -877,7 +877,7 @@ Foam::autoLayerDriver::makeLayerDisplacementField
 }
 
 
-void Foam::autoLayerDriver::growNoExtrusion
+void Foam::snappyLayerDriver::growNoExtrusion
 (
     const indirectPrimitivePatch& pp,
     pointField& patchDisp,
@@ -967,7 +967,7 @@ void Foam::autoLayerDriver::growNoExtrusion
 }
 
 
-void Foam::autoLayerDriver::determineSidePatches
+void Foam::snappyLayerDriver::determineSidePatches
 (
     const globalIndex& globalFaces,
     const labelListList& edgeGlobalFaces,
@@ -1057,7 +1057,7 @@ void Foam::autoLayerDriver::determineSidePatches
 }
 
 
-void Foam::autoLayerDriver::calculateLayerThickness
+void Foam::snappyLayerDriver::calculateLayerThickness
 (
     const indirectPrimitivePatch& pp,
     const labelList& patchIDs,
@@ -1345,7 +1345,7 @@ void Foam::autoLayerDriver::calculateLayerThickness
 
 
 // Synchronize displacement among coupled patches.
-void Foam::autoLayerDriver::syncPatchDisplacement
+void Foam::snappyLayerDriver::syncPatchDisplacement
 (
     const indirectPrimitivePatch& pp,
     const scalarField& minThickness,
@@ -1476,7 +1476,7 @@ void Foam::autoLayerDriver::syncPatchDisplacement
 // of the faces using it.
 // extrudeStatus is both input and output and gives the status of each
 // patch point.
-void Foam::autoLayerDriver::getPatchDisplacement
+void Foam::snappyLayerDriver::getPatchDisplacement
 (
     const indirectPrimitivePatch& pp,
     const scalarField& thickness,
@@ -1612,7 +1612,7 @@ void Foam::autoLayerDriver::getPatchDisplacement
 }
 
 
-bool Foam::autoLayerDriver::sameEdgeNeighbour
+bool Foam::snappyLayerDriver::sameEdgeNeighbour
 (
     const labelListList& globalEdgeFaces,
     const label myGlobalFaceI,
@@ -1632,7 +1632,7 @@ bool Foam::autoLayerDriver::sameEdgeNeighbour
 }
 
 
-void Foam::autoLayerDriver::getVertexString
+void Foam::snappyLayerDriver::getVertexString
 (
     const indirectPrimitivePatch& pp,
     const labelListList& globalEdgeFaces,
@@ -1711,7 +1711,7 @@ void Foam::autoLayerDriver::getVertexString
 // Truncates displacement
 // - for all patchFaces in the faceset displacement gets set to zero
 // - all displacement < minThickness gets set to zero
-Foam::label Foam::autoLayerDriver::truncateDisplacement
+Foam::label Foam::snappyLayerDriver::truncateDisplacement
 (
     const globalIndex& globalFaces,
     const labelListList& edgeGlobalFaces,
@@ -2026,7 +2026,7 @@ Foam::label Foam::autoLayerDriver::truncateDisplacement
 
 // Setup layer information (at points and faces) to modify mesh topology in
 // regions where layer mesh terminates.
-void Foam::autoLayerDriver::setupLayerInfoTruncation
+void Foam::snappyLayerDriver::setupLayerInfoTruncation
 (
     const indirectPrimitivePatch& pp,
     const labelList& patchNLayers,
@@ -2230,7 +2230,7 @@ void Foam::autoLayerDriver::setupLayerInfoTruncation
 
 
 // Does any of the cells use a face from faces?
-bool Foam::autoLayerDriver::cellsUseFace
+bool Foam::snappyLayerDriver::cellsUseFace
 (
     const polyMesh& mesh,
     const labelList& cellLabels,
@@ -2256,7 +2256,7 @@ bool Foam::autoLayerDriver::cellsUseFace
 // Checks the newly added cells and locally unmarks points so they
 // will not get extruded next time round. Returns global number of unmarked
 // points (0 if all was fine)
-Foam::label Foam::autoLayerDriver::checkAndUnmark
+Foam::label Foam::snappyLayerDriver::checkAndUnmark
 (
     const addPatchCellLayer& addLayer,
     const dictionary& meshQualityDict,
@@ -2390,7 +2390,7 @@ Foam::label Foam::autoLayerDriver::checkAndUnmark
 }
 
 
-Foam::label Foam::autoLayerDriver::countExtrusion
+Foam::label Foam::snappyLayerDriver::countExtrusion
 (
     const indirectPrimitivePatch& pp,
     const List<extrudeMode>& extrudeStatus
@@ -2421,7 +2421,7 @@ Foam::label Foam::autoLayerDriver::countExtrusion
 
 
 // Collect layer faces and layer cells into mesh fields for ease of handling
-void Foam::autoLayerDriver::getLayerCellsFaces
+void Foam::snappyLayerDriver::getLayerCellsFaces
 (
     const polyMesh& mesh,
     const addPatchCellLayer& addLayer,
@@ -2475,7 +2475,7 @@ void Foam::autoLayerDriver::getLayerCellsFaces
 }
 
 
-void Foam::autoLayerDriver::printLayerData
+void Foam::snappyLayerDriver::printLayerData
 (
     const fvMesh& mesh,
     const labelList& patchIDs,
@@ -2570,7 +2570,7 @@ void Foam::autoLayerDriver::printLayerData
 }
 
 
-bool Foam::autoLayerDriver::writeLayerData
+bool Foam::snappyLayerDriver::writeLayerData
 (
     const fvMesh& mesh,
     const labelList& patchIDs,
@@ -2773,7 +2773,7 @@ bool Foam::autoLayerDriver::writeLayerData
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoLayerDriver::autoLayerDriver
+Foam::snappyLayerDriver::snappyLayerDriver
 (
     meshRefinement& meshRefiner,
     const labelList& globalToMasterPatch,
@@ -2788,7 +2788,7 @@ Foam::autoLayerDriver::autoLayerDriver
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::autoLayerDriver::mergePatchFacesUndo
+void Foam::snappyLayerDriver::mergePatchFacesUndo
 (
     const layerParameters& layerParams,
     const dictionary& motionDict
@@ -2840,7 +2840,7 @@ void Foam::autoLayerDriver::mergePatchFacesUndo
 }
 
 
-void Foam::autoLayerDriver::addLayers
+void Foam::snappyLayerDriver::addLayers
 (
     const layerParameters& layerParams,
     const dictionary& motionDict,
@@ -3238,7 +3238,7 @@ void Foam::autoLayerDriver::addLayers
             Info<< "Writing shrunk mesh to time "
                 << meshRefiner_.timeName() << endl;
 
-            // See comment in autoSnapDriver why we should not remove meshPhi
+            // See comment in snappySnapDriver why we should not remove meshPhi
             // using mesh.clearOut().
 
             meshRefiner_.write
@@ -3582,7 +3582,7 @@ void Foam::autoLayerDriver::addLayers
 }
 
 
-void Foam::autoLayerDriver::doLayers
+void Foam::snappyLayerDriver::doLayers
 (
     const dictionary& shrinkDict,
     const dictionary& motionDict,
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
similarity index 98%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.H
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
index c35aa7a737..1f3aca40fc 100644
--- a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
@@ -22,18 +22,18 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::autoLayerDriver
+    Foam::snappyLayerDriver
 
 Description
     All to do with adding layers
 
 SourceFiles
-    autoLayerDriver.C
+    snappyLayerDriver.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef autoLayerDriver_H
-#define autoLayerDriver_H
+#ifndef snappyLayerDriver_H
+#define snappyLayerDriver_H
 
 #include "meshRefinement.H"
 
@@ -52,10 +52,10 @@ class faceSet;
 class layerParameters;
 
 /*---------------------------------------------------------------------------*\
-                           Class autoLayerDriver Declaration
+                           Class snappyLayerDriver Declaration
 \*---------------------------------------------------------------------------*/
 
-class autoLayerDriver
+class snappyLayerDriver
 {
 public:
 
@@ -547,21 +547,21 @@ private:
 
 
         //- Disallow default bitwise copy construct
-        autoLayerDriver(const autoLayerDriver&);
+        snappyLayerDriver(const snappyLayerDriver&);
 
         //- Disallow default bitwise assignment
-        void operator=(const autoLayerDriver&);
+        void operator=(const snappyLayerDriver&);
 
 
 public:
 
     //- Runtime type information
-    ClassName("autoLayerDriver");
+    ClassName("snappyLayerDriver");
 
     // Constructors
 
         //- Construct from components
-        autoLayerDriver
+        snappyLayerDriver
         (
             meshRefinement& meshRefiner,
             const labelList& globalToMasterPatch,
@@ -610,7 +610,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "autoLayerDriverTemplates.C"
+    #include "snappyLayerDriverTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
similarity index 98%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
index adb49d5a93..5568f09025 100644
--- a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
@@ -26,7 +26,7 @@ Description
 
 \*----------------------------------------------------------------------------*/
 
-#include "autoLayerDriver.H"
+#include "snappyLayerDriver.H"
 #include "fvMesh.H"
 #include "Time.H"
 #include "pointFields.H"
@@ -41,7 +41,7 @@ Description
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // Calculate inverse sum of edge weights (currently always 1.0)
-void Foam::autoLayerDriver::sumWeights
+void Foam::snappyLayerDriver::sumWeights
 (
     const PackedBoolList& isMasterEdge,
     const labelList& meshEdges,
@@ -100,7 +100,7 @@ void Foam::autoLayerDriver::sumWeights
 
 
 // Smooth field on moving patch
-void Foam::autoLayerDriver::smoothField
+void Foam::snappyLayerDriver::smoothField
 (
     const motionSmoother& meshMover,
     const PackedBoolList& isMasterPoint,
@@ -175,7 +175,7 @@ void Foam::autoLayerDriver::smoothField
     }
 }
 //XXXXXXXXX
-//void Foam::autoLayerDriver::smoothField
+//void Foam::snappyLayerDriver::smoothField
 //(
 //    const motionSmoother& meshMover,
 //    const PackedBoolList& isMasterEdge,
@@ -267,7 +267,7 @@ void Foam::autoLayerDriver::smoothField
 //XXXXXXXXX
 
 // Smooth normals on moving patch.
-void Foam::autoLayerDriver::smoothPatchNormals
+void Foam::snappyLayerDriver::smoothPatchNormals
 (
     const motionSmoother& meshMover,
     const PackedBoolList& isMasterPoint,
@@ -337,7 +337,7 @@ void Foam::autoLayerDriver::smoothPatchNormals
 
 
 // Smooth normals in interior.
-void Foam::autoLayerDriver::smoothNormals
+void Foam::snappyLayerDriver::smoothNormals
 (
     const label nSmoothDisp,
     const PackedBoolList& isMasterPoint,
@@ -428,7 +428,7 @@ void Foam::autoLayerDriver::smoothNormals
 
 // Tries and find a medial axis point. Done by comparing vectors to nearest
 // wall point for both vertices of edge.
-bool Foam::autoLayerDriver::isMaxEdge
+bool Foam::snappyLayerDriver::isMaxEdge
 (
     const List<pointData>& pointWallDist,
     const label edgeI,
@@ -489,7 +489,7 @@ bool Foam::autoLayerDriver::isMaxEdge
 
 // Stop layer growth where mesh wraps around edge with a
 // large feature angle
-void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
+void Foam::snappyLayerDriver::handleFeatureAngleLayerTerminations
 (
     const scalar minCos,
     const PackedBoolList& isMasterPoint,
@@ -641,7 +641,7 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
 
 // Find isolated islands (points, edges and faces and layer terminations)
 // in the layer mesh and stop any layer growth at these points.
-void Foam::autoLayerDriver::findIsolatedRegions
+void Foam::snappyLayerDriver::findIsolatedRegions
 (
     const scalar minCosLayerTermination,
     const PackedBoolList& isMasterPoint,
@@ -859,7 +859,7 @@ void Foam::autoLayerDriver::findIsolatedRegions
 // medialDist  : distance to medial axis
 // medialRatio : ratio of medial distance to wall distance.
 //               (1 at wall, 0 at medial axis)
-void Foam::autoLayerDriver::medialAxisSmoothingInfo
+void Foam::snappyLayerDriver::medialAxisSmoothingInfo
 (
     const motionSmoother& meshMover,
     const label nSmoothNormals,
@@ -1346,7 +1346,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
 }
 
 
-void Foam::autoLayerDriver::shrinkMeshMedialDistance
+void Foam::snappyLayerDriver::shrinkMeshMedialDistance
 (
     motionSmoother& meshMover,
     const dictionary& meshQualityDict,
@@ -1764,7 +1764,7 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
         // Above move will have changed the instance only on the points (which
         // is correct).
         // However the previous mesh written will be the mesh with layers
-        // (see autoLayerDriver.C) so we now have to force writing all files
+        // (see snappyLayerDriver.C) so we now have to force writing all files
         // so we can easily step through time steps. Note that if you
         // don't write the mesh with layers this is not necessary.
         meshRefiner_.mesh().setInstance(meshRefiner_.timeName());
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C
similarity index 96%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C
index adae523722..a8eb5fff8c 100644
--- a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C
@@ -23,13 +23,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "autoLayerDriver.H"
+#include "snappyLayerDriver.H"
 #include "syncTools.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void Foam::autoLayerDriver::averageNeighbours
+void Foam::snappyLayerDriver::averageNeighbours
 (
     const polyMesh& mesh,
     const PackedBoolList& isMasterEdge,
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
similarity index 98%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.C
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index 81fda9a3a2..a020a2a86a 100644
--- a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "autoRefineDriver.H"
+#include "snappyRefineDriver.H"
 #include "meshRefinement.H"
 #include "fvMesh.H"
 #include "Time.H"
@@ -43,7 +43,7 @@ License
 namespace Foam
 {
 
-defineTypeNameAndDebug(autoRefineDriver, 0);
+defineTypeNameAndDebug(snappyRefineDriver, 0);
 
 } // End namespace Foam
 
@@ -51,7 +51,7 @@ defineTypeNameAndDebug(autoRefineDriver, 0);
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct from components
-Foam::autoRefineDriver::autoRefineDriver
+Foam::snappyRefineDriver::snappyRefineDriver
 (
     meshRefinement& meshRefiner,
     decompositionMethod& decomposer,
@@ -70,7 +70,7 @@ Foam::autoRefineDriver::autoRefineDriver
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::label Foam::autoRefineDriver::featureEdgeRefine
+Foam::label Foam::snappyRefineDriver::featureEdgeRefine
 (
     const refinementParameters& refineParams,
     const label maxIter,
@@ -177,7 +177,7 @@ Foam::label Foam::autoRefineDriver::featureEdgeRefine
 }
 
 
-Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
+Foam::label Foam::snappyRefineDriver::surfaceOnlyRefine
 (
     const refinementParameters& refineParams,
     const label maxIter
@@ -297,7 +297,7 @@ Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
 }
 
 
-Foam::label Foam::autoRefineDriver::gapOnlyRefine
+Foam::label Foam::snappyRefineDriver::gapOnlyRefine
 (
     const refinementParameters& refineParams,
     const label maxIter
@@ -525,7 +525,7 @@ Foam::label Foam::autoRefineDriver::gapOnlyRefine
 }
 
 
-Foam::label Foam::autoRefineDriver::danglingCellRefine
+Foam::label Foam::snappyRefineDriver::danglingCellRefine
 (
     const refinementParameters& refineParams,
     const label nFaces,
@@ -669,7 +669,7 @@ Foam::label Foam::autoRefineDriver::danglingCellRefine
 }
 
 
-void Foam::autoRefineDriver::removeInsideCells
+void Foam::snappyRefineDriver::removeInsideCells
 (
     const refinementParameters& refineParams,
     const label nBufferLayers
@@ -715,7 +715,7 @@ void Foam::autoRefineDriver::removeInsideCells
 }
 
 
-Foam::label Foam::autoRefineDriver::shellRefine
+Foam::label Foam::snappyRefineDriver::shellRefine
 (
     const refinementParameters& refineParams,
     const label maxIter
@@ -885,7 +885,7 @@ Foam::label Foam::autoRefineDriver::shellRefine
 }
 
 
-void Foam::autoRefineDriver::baffleAndSplitMesh
+void Foam::snappyRefineDriver::baffleAndSplitMesh
 (
     const refinementParameters& refineParams,
     const snapParameters& snapParams,
@@ -926,7 +926,7 @@ void Foam::autoRefineDriver::baffleAndSplitMesh
 }
 
 
-void Foam::autoRefineDriver::zonify
+void Foam::snappyRefineDriver::zonify
 (
     const refinementParameters& refineParams
 )
@@ -982,7 +982,7 @@ void Foam::autoRefineDriver::zonify
 }
 
 
-void Foam::autoRefineDriver::splitAndMergeBaffles
+void Foam::snappyRefineDriver::splitAndMergeBaffles
 (
     const refinementParameters& refineParams,
     const snapParameters& snapParams,
@@ -1092,7 +1092,7 @@ void Foam::autoRefineDriver::splitAndMergeBaffles
 }
 
 
-void Foam::autoRefineDriver::mergePatchFaces
+void Foam::snappyRefineDriver::mergePatchFaces
 (
     const refinementParameters& refineParams,
     const dictionary& motionDict
@@ -1128,7 +1128,7 @@ void Foam::autoRefineDriver::mergePatchFaces
 }
 
 
-void Foam::autoRefineDriver::doRefine
+void Foam::snappyRefineDriver::doRefine
 (
     const dictionary& refineDict,
     const refinementParameters& refineParams,
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H
similarity index 93%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.H
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H
index a4cb07506d..490e50fae5 100644
--- a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H
@@ -22,17 +22,17 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::autoRefineDriver
+    Foam::snappyRefineDriver
 
 Description
 
 SourceFiles
-    autoRefineDriver.C
+    snappyRefineDriver.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef autoRefineDriver_H
-#define autoRefineDriver_H
+#ifndef snappyRefineDriver_H
+#define snappyRefineDriver_H
 
 #include "treeBoundBox.H"
 
@@ -50,10 +50,10 @@ class decompositionMethod;
 class fvMeshDistribute;
 
 /*---------------------------------------------------------------------------*\
-                           Class autoRefineDriver Declaration
+                           Class snappyRefineDriver Declaration
 \*---------------------------------------------------------------------------*/
 
-class autoRefineDriver
+class snappyRefineDriver
 {
     // Private data
 
@@ -148,22 +148,22 @@ class autoRefineDriver
 
 
         //- Disallow default bitwise copy construct
-        autoRefineDriver(const autoRefineDriver&);
+        snappyRefineDriver(const snappyRefineDriver&);
 
         //- Disallow default bitwise assignment
-        void operator=(const autoRefineDriver&);
+        void operator=(const snappyRefineDriver&);
 
 
 public:
 
     //- Runtime type information
-    ClassName("autoRefineDriver");
+    ClassName("snappyRefineDriver");
 
 
     // Constructors
 
         //- Construct from components
-        autoRefineDriver
+        snappyRefineDriver
         (
             meshRefinement& meshRefiner,
             decompositionMethod& decomposer,
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
similarity index 98%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.C
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 29475a3958..53f234c98f 100644
--- a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -26,7 +26,7 @@ Description
 
 \*----------------------------------------------------------------------------*/
 
-#include "autoSnapDriver.H"
+#include "snappySnapDriver.H"
 #include "motionSmoother.H"
 #include "polyTopoChange.H"
 #include "syncTools.H"
@@ -49,7 +49,7 @@ Description
 namespace Foam
 {
 
-defineTypeNameAndDebug(autoSnapDriver, 0);
+defineTypeNameAndDebug(snappySnapDriver, 0);
 
 } // End namespace Foam
 
@@ -58,7 +58,7 @@ defineTypeNameAndDebug(autoSnapDriver, 0);
 
 // Calculate geometrically collocated points, Requires PackedList to be
 // sized and initalised!
-Foam::label Foam::autoSnapDriver::getCollocatedPoints
+Foam::label Foam::snappySnapDriver::getCollocatedPoints
 (
     const scalar tol,
     const pointField& points,
@@ -119,7 +119,7 @@ Foam::label Foam::autoSnapDriver::getCollocatedPoints
 
 
 // Calculate displacement as average of patch points.
-Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
+Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
 (
     const motionSmoother& meshMover,
     const List<labelPair>& baffles
@@ -417,7 +417,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
     return patchDisp;
 }
 //XXXXXXX
-//Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avg
+//Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avg
 //(
 //    const indirectPrimitivePatch& pp,
 //    const pointField& localPoints
@@ -449,7 +449,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
 //    return tavg;
 //}
 //Foam::tmp<Foam::pointField>
-//Foam::autoSnapDriver::smoothLambdaMuPatchDisplacement
+//Foam::snappySnapDriver::smoothLambdaMuPatchDisplacement
 //(
 //    const motionSmoother& meshMover,
 //    const List<labelPair>& baffles
@@ -479,7 +479,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
 //XXXXXXX
 
 
-Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::edgePatchDist
+Foam::tmp<Foam::scalarField> Foam::snappySnapDriver::edgePatchDist
 (
     const pointMesh& pMesh,
     const indirectPrimitivePatch& pp
@@ -561,7 +561,7 @@ Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::edgePatchDist
 }
 
 
-void Foam::autoSnapDriver::dumpMove
+void Foam::snappySnapDriver::dumpMove
 (
     const fileName& fName,
     const pointField& meshPts,
@@ -590,7 +590,7 @@ void Foam::autoSnapDriver::dumpMove
 
 // Check whether all displacement vectors point outwards of patch. Return true
 // if so.
-bool Foam::autoSnapDriver::outwardsDisplacement
+bool Foam::snappySnapDriver::outwardsDisplacement
 (
     const indirectPrimitivePatch& pp,
     const vectorField& patchDisp
@@ -633,7 +633,7 @@ bool Foam::autoSnapDriver::outwardsDisplacement
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoSnapDriver::autoSnapDriver
+Foam::snappySnapDriver::snappySnapDriver
 (
     meshRefinement& meshRefiner,
     const labelList& globalToMasterPatch,
@@ -648,7 +648,7 @@ Foam::autoSnapDriver::autoSnapDriver
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::mergeZoneBaffles
+Foam::autoPtr<Foam::mapPolyMesh> Foam::snappySnapDriver::mergeZoneBaffles
 (
     const List<labelPair>& baffles
 )
@@ -677,7 +677,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::mergeZoneBaffles
 }
 
 
-Foam::scalarField Foam::autoSnapDriver::calcSnapDistance
+Foam::scalarField Foam::snappySnapDriver::calcSnapDistance
 (
     const fvMesh& mesh,
     const snapParameters& snapParams,
@@ -717,7 +717,7 @@ Foam::scalarField Foam::autoSnapDriver::calcSnapDistance
 }
 
 
-void Foam::autoSnapDriver::preSmoothPatch
+void Foam::snappySnapDriver::preSmoothPatch
 (
     const meshRefinement& meshRefiner,
     const snapParameters& snapParams,
@@ -814,7 +814,7 @@ void Foam::autoSnapDriver::preSmoothPatch
 
 
 // Get (pp-local) indices of points that are both on zone and on patched surface
-Foam::labelList Foam::autoSnapDriver::getZoneSurfacePoints
+Foam::labelList Foam::snappySnapDriver::getZoneSurfacePoints
 (
     const fvMesh& mesh,
     const indirectPrimitivePatch& pp,
@@ -861,7 +861,7 @@ Foam::labelList Foam::autoSnapDriver::getZoneSurfacePoints
 }
 
 
-Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avgCellCentres
+Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avgCellCentres
 (
     const fvMesh& mesh,
     const indirectPrimitivePatch& pp
@@ -917,14 +917,14 @@ Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avgCellCentres
 }
 
 
-//Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::calcEdgeLen
+//Foam::tmp<Foam::scalarField> Foam::snappySnapDriver::calcEdgeLen
 //(
 //    const indirectPrimitivePatch& pp
 //) const
 //{
 //    // Get local edge length based on refinement level
 //    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//    // (Ripped from autoLayerDriver)
+//    // (Ripped from snappyLayerDriver)
 //
 //    tmp<scalarField> tedgeLen(new scalarField(pp.nPoints()));
 //    scalarField& edgeLen = tedgeLen();
@@ -965,7 +965,7 @@ Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avgCellCentres
 //}
 
 
-void Foam::autoSnapDriver::detectNearSurfaces
+void Foam::snappySnapDriver::detectNearSurfaces
 (
     const scalar planarCos,
     const indirectPrimitivePatch& pp,
@@ -1563,7 +1563,7 @@ void Foam::autoSnapDriver::detectNearSurfaces
 }
 
 
-Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
+Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
 (
     const meshRefinement& meshRefiner,
     const scalarField& snapDist,
@@ -1817,7 +1817,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
 
 ////XXXXXXXXX
 //// Get (pp-local) indices of points that are on both patches
-//Foam::labelList Foam::autoSnapDriver::getPatchSurfacePoints
+//Foam::labelList Foam::snappySnapDriver::getPatchSurfacePoints
 //(
 //    const fvMesh& mesh,
 //    const indirectPrimitivePatch& allPp,
@@ -1850,7 +1850,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
 //
 //    return findIndices(pointOnZone, true);
 //}
-//Foam::vectorField Foam::autoSnapDriver::calcNearestLocalSurface
+//Foam::vectorField Foam::snappySnapDriver::calcNearestLocalSurface
 //(
 //    const meshRefinement& meshRefiner,
 //    const scalarField& snapDist,
@@ -2063,7 +2063,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
 //}
 ////XXXXXXXXX
 
-void Foam::autoSnapDriver::smoothDisplacement
+void Foam::snappySnapDriver::smoothDisplacement
 (
     const snapParameters& snapParams,
     motionSmoother& meshMover
@@ -2132,7 +2132,7 @@ void Foam::autoSnapDriver::smoothDisplacement
 }
 
 
-bool Foam::autoSnapDriver::scaleMesh
+bool Foam::snappySnapDriver::scaleMesh
 (
     const snapParameters& snapParams,
     const label nInitErrors,
@@ -2198,7 +2198,7 @@ bool Foam::autoSnapDriver::scaleMesh
 // - calculate face-wise snap distance as max of point-wise
 // - calculate face-wise nearest surface point
 // - repatch face according to patch for surface point.
-Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
+Foam::autoPtr<Foam::mapPolyMesh> Foam::snappySnapDriver::repatchToSurface
 (
     const snapParameters& snapParams,
     const labelList& adaptPatchIDs,
@@ -2368,7 +2368,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
 }
 
 
-void Foam::autoSnapDriver::detectWarpedFaces
+void Foam::snappySnapDriver::detectWarpedFaces
 (
     const scalar featureCos,
     const indirectPrimitivePatch& pp,
@@ -2462,7 +2462,7 @@ void Foam::autoSnapDriver::detectWarpedFaces
 }
 
 
-void Foam::autoSnapDriver::doSnap
+void Foam::snappySnapDriver::doSnap
 (
     const dictionary& snapDict,
     const dictionary& motionDict,
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
similarity index 98%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.H
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
index 4b24092e77..7d98b35a7d 100644
--- a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::autoSnapDriver
+    Foam::snappySnapDriver
 
 Description
     All to do with snapping to surface
 
 SourceFiles
-    autoSnapDriver.C
-    autoSnapDriverFeature.C
+    snappySnapDriver.C
+    snappySnapDriverFeature.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef autoSnapDriver_H
-#define autoSnapDriver_H
+#ifndef snappySnapDriver_H
+#define snappySnapDriver_H
 
 #include "meshRefinement.H"
 
@@ -49,10 +49,10 @@ class snapParameters;
 class pointConstraint;
 
 /*---------------------------------------------------------------------------*\
-                           Class autoSnapDriver Declaration
+                           Class snappySnapDriver Declaration
 \*---------------------------------------------------------------------------*/
 
-class autoSnapDriver
+class snappySnapDriver
 {
     // Private data
 
@@ -496,22 +496,22 @@ class autoSnapDriver
 
 
         //- Disallow default bitwise copy construct
-        autoSnapDriver(const autoSnapDriver&);
+        snappySnapDriver(const snappySnapDriver&);
 
         //- Disallow default bitwise assignment
-        void operator=(const autoSnapDriver&);
+        void operator=(const snappySnapDriver&);
 
 
 public:
 
     //- Runtime type information
-    ClassName("autoSnapDriver");
+    ClassName("snappySnapDriver");
 
 
     // Constructors
 
         //- Construct from components
-        autoSnapDriver
+        snappySnapDriver
         (
             meshRefinement& meshRefiner,
             const labelList& globalToMasterPatch,
diff --git a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
similarity index 98%
rename from src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
rename to src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index 28567ccc8f..96cd3c5a51 100644
--- a/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "autoSnapDriver.H"
+#include "snappySnapDriver.H"
 #include "polyTopoChange.H"
 #include "syncTools.H"
 #include "fvMesh.H"
@@ -63,7 +63,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-bool Foam::autoSnapDriver::isFeaturePoint
+bool Foam::snappySnapDriver::isFeaturePoint
 (
     const scalar featureCos,
     const indirectPrimitivePatch& pp,
@@ -124,7 +124,7 @@ bool Foam::autoSnapDriver::isFeaturePoint
 }
 
 
-void Foam::autoSnapDriver::smoothAndConstrain
+void Foam::snappySnapDriver::smoothAndConstrain
 (
     const PackedBoolList& isPatchMasterEdge,
     const indirectPrimitivePatch& pp,
@@ -215,7 +215,7 @@ void Foam::autoSnapDriver::smoothAndConstrain
 }
 
 
-void Foam::autoSnapDriver::calcNearestFace
+void Foam::snappySnapDriver::calcNearestFace
 (
     const label iter,
     const indirectPrimitivePatch& pp,
@@ -436,7 +436,7 @@ void Foam::autoSnapDriver::calcNearestFace
 }
 
 
-void Foam::autoSnapDriver::calcNearestFacePointProperties
+void Foam::snappySnapDriver::calcNearestFacePointProperties
 (
     const label iter,
     const indirectPrimitivePatch& pp,
@@ -634,7 +634,7 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
 }
 
 
-void Foam::autoSnapDriver::correctAttraction
+void Foam::snappySnapDriver::correctAttraction
 (
     const DynamicList<point>& surfacePoints,
     const DynamicList<label>& surfaceCounts,
@@ -672,7 +672,7 @@ void Foam::autoSnapDriver::correctAttraction
 }
 
 
-Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
+Foam::pointIndexHit Foam::snappySnapDriver::findMultiPatchPoint
 (
     const point& pt,
     const labelList& patchIDs,
@@ -696,7 +696,7 @@ Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
 }
 
 
-Foam::label Foam::autoSnapDriver::findNormal
+Foam::label Foam::snappySnapDriver::findNormal
 (
     const scalar featureCos,
     const vector& n,
@@ -723,7 +723,7 @@ Foam::label Foam::autoSnapDriver::findNormal
 }
 
 
-Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
+Foam::pointIndexHit Foam::snappySnapDriver::findMultiPatchPoint
 (
     const point& pt,
     const labelList& patchIDs,
@@ -803,7 +803,7 @@ Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
 }
 
 
-void Foam::autoSnapDriver::featureAttractionUsingReconstruction
+void Foam::snappySnapDriver::featureAttractionUsingReconstruction
 (
     const label iter,
     const scalar featureCos,
@@ -995,7 +995,7 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
 }
 
 
-void Foam::autoSnapDriver::featureAttractionUsingReconstruction
+void Foam::snappySnapDriver::featureAttractionUsingReconstruction
 (
     const label iter,
     const bool avoidSnapProblems,
@@ -1102,7 +1102,7 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
 }
 
 
-void Foam::autoSnapDriver::stringFeatureEdges
+void Foam::snappySnapDriver::stringFeatureEdges
 (
     const label iter,
     const scalar featureCos,
@@ -1291,7 +1291,7 @@ void Foam::autoSnapDriver::stringFeatureEdges
 }
 
 
-void Foam::autoSnapDriver::releasePointsNextToMultiPatch
+void Foam::snappySnapDriver::releasePointsNextToMultiPatch
 (
     const label iter,
     const scalar featureCos,
@@ -1422,7 +1422,7 @@ void Foam::autoSnapDriver::releasePointsNextToMultiPatch
 }
 
 
-Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
+Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
 (
     const indirectPrimitivePatch& pp,
     const vectorField& patchAttraction,
@@ -1486,7 +1486,7 @@ Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
 }
 
 
-void Foam::autoSnapDriver::avoidDiagonalAttraction
+void Foam::snappySnapDriver::avoidDiagonalAttraction
 (
     const label iter,
     const scalar featureCos,
@@ -1585,7 +1585,7 @@ void Foam::autoSnapDriver::avoidDiagonalAttraction
 
 
 Foam::Tuple2<Foam::label, Foam::pointIndexHit>
-Foam::autoSnapDriver::findNearFeatureEdge
+Foam::snappySnapDriver::findNearFeatureEdge
 (
     const bool isRegionEdge,
 
@@ -1653,7 +1653,7 @@ Foam::autoSnapDriver::findNearFeatureEdge
 
 
 Foam::Tuple2<Foam::label, Foam::pointIndexHit>
-Foam::autoSnapDriver::findNearFeaturePoint
+Foam::snappySnapDriver::findNearFeaturePoint
 (
     const bool isRegionPoint,
 
@@ -1756,7 +1756,7 @@ Foam::autoSnapDriver::findNearFeaturePoint
 }
 
 
-void Foam::autoSnapDriver::determineFeatures
+void Foam::snappySnapDriver::determineFeatures
 (
     const label iter,
     const scalar featureCos,
@@ -2167,7 +2167,7 @@ void Foam::autoSnapDriver::determineFeatures
 }
 
 
-void Foam::autoSnapDriver::determineBaffleFeatures
+void Foam::snappySnapDriver::determineBaffleFeatures
 (
     const label iter,
     const scalar featureCos,
@@ -2435,7 +2435,7 @@ void Foam::autoSnapDriver::determineBaffleFeatures
 }
 
 
-void Foam::autoSnapDriver::reverseAttractMeshPoints
+void Foam::snappySnapDriver::reverseAttractMeshPoints
 (
     const label iter,
 
@@ -2694,7 +2694,7 @@ void Foam::autoSnapDriver::reverseAttractMeshPoints
 }
 
 
-void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
+void Foam::snappySnapDriver::featureAttractionUsingFeatureEdges
 (
     const label iter,
     const bool avoidSnapProblems,
@@ -2948,7 +2948,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
 }
 
 
-void Foam::autoSnapDriver::preventFaceSqueeze
+void Foam::snappySnapDriver::preventFaceSqueeze
 (
     const label iter,
     const scalar featureCos,
@@ -3022,7 +3022,7 @@ void Foam::autoSnapDriver::preventFaceSqueeze
 }
 
 
-Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
+Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
 (
     const snapParameters& snapParams,
     const bool avoidSnapProblems,

From d6396ec5d2ceacd9214ca7bbb65ab8a1955189e8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 4 Mar 2016 11:28:35 +0000
Subject: [PATCH 243/447] DynamicList: Added initialized constructor and STL
 erase function

---
 .../Lists/DynamicList/DynamicList.H           |  9 +++++
 .../Lists/DynamicList/DynamicListI.H          | 40 +++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 893804bb32..f62ba3a41a 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -104,6 +104,9 @@ public:
         //- Construct given size.
         explicit inline DynamicList(const label);
 
+        //- Construct with given size and value for all elements.
+        inline DynamicList(const label, const T&);
+
         //- Construct copy.
         inline DynamicList(const DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
 
@@ -224,6 +227,12 @@ public:
             inline void operator=(const UIndirectList<T>&);
 
 
+        // STL member functions
+
+            //- Erase an element, move the remaining elements to fill the gap
+            //  and resize the List
+            typename UList<T>::iterator erase(typename UList<T>::iterator);
+
 
         // IOstream operators
 
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index d62f00006c..fdd4ec571a 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -49,6 +49,18 @@ inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 }
 
 
+template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
+inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
+(
+    const label nElem,
+    const T& a
+)
+:
+    List<T>(nElem, a),
+    capacity_(nElem)
+{}
+
+
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 (
@@ -483,4 +495,32 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
 }
 
 
+// * * * * * * * * * * * * * * STL Member Functions  * * * * * * * * * * * * //
+
+template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
+typename Foam::UList<T>::iterator
+Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::erase
+(
+    typename UList<T>::iterator curIter
+)
+{
+    typename Foam::UList<T>::iterator iter = curIter;
+    typename Foam::UList<T>::iterator nextIter = curIter;
+
+    if (iter != this->end())
+    {
+        ++iter;
+
+        while (iter != this->end())
+        {
+            *nextIter++ = *iter++;
+        }
+
+        this->setSize(this->size() - 1);
+    }
+
+    return curIter;
+}
+
+
 // ************************************************************************* //

From 0f49eb44d5f1892e7ad35bbb08b1ea3d8d735e63 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 4 Mar 2016 11:29:14 +0000
Subject: [PATCH 244/447] CocoParserErrors.H: No longer used

---
 src/OpenFOAM/db/error/CocoParserErrors.H | 140 -----------------------
 1 file changed, 140 deletions(-)
 delete mode 100644 src/OpenFOAM/db/error/CocoParserErrors.H

diff --git a/src/OpenFOAM/db/error/CocoParserErrors.H b/src/OpenFOAM/db/error/CocoParserErrors.H
deleted file mode 100644
index d693f4efde..0000000000
--- a/src/OpenFOAM/db/error/CocoParserErrors.H
+++ /dev/null
@@ -1,140 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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::CocoParserErrors
-
-Description
-    Templated class to shadow the error handling for Coco/R parsers
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef CocoParserErrors_H
-#define CocoParserErrors_H
-
-#include "error.H"
-#include "wchar.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                      Class CocoParserErrors Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class BaseClass, class StringClass=std::wstring>
-class CocoParserErrors
-:
-    public BaseClass
-{
-    // Private data
-
-        //- The name issued in warnings and errors
-        word   name_;
-
-public:
-
-    // Constructors
-
-        //- Construct with given name
-        CocoParserErrors(const word& name)
-        :
-            BaseClass(),
-            name_(name)
-        {}
-
-
-    //- Destructor
-    virtual ~CocoParserErrors()
-    {}
-
-
-    // Member functions
-
-        //- Return the name issued for warnings
-        virtual const word& name() const
-        {
-            return name_;
-        }
-
-        //- Return the name issued for warnings
-        virtual word& name()
-        {
-            return name_;
-        }
-
-
-    // Error Handling
-
-        //- Handle a general warning 'msg'
-        virtual void Warning(const StringClass& msg)
-        {
-            WarningInFunction
-                << msg << endl;
-        }
-
-        //- Handle a general warning 'msg'
-        virtual void Warning(int line, int col, const StringClass& msg)
-        {
-            WarningInFunction
-                <<"line " << line << " col " << col << ": "
-                << msg << endl;
-        }
-
-        //- Handle general error 'msg' (eg, a semantic error)
-        virtual void Error(int line, int col, const StringClass& msg)
-        {
-            FatalErrorInFunction
-                << "line " << line << " col " << col <<": " << msg << endl
-                << exit(FatalError);
-        }
-
-        //- Handle general error 'msg' (eg, a semantic error)
-        virtual void Error(const StringClass& msg)
-        {
-            FatalErrorInFunction
-                << msg << endl
-                << exit(FatalError);
-        }
-
-        //- Handle a general exception 'msg'
-        virtual void Exception(const StringClass& msg)
-        {
-            this->Error(msg);
-        }
-
-};
-
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

From 0e7278ad5b6cf23689731bad23bf612f8af63e3d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 4 Mar 2016 11:29:37 +0000
Subject: [PATCH 245/447] StaticAssert: Avoid unused typedef messages from gcc

---
 src/OpenFOAM/db/error/StaticAssert.H | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/db/error/StaticAssert.H b/src/OpenFOAM/db/error/StaticAssert.H
index c6cf1e7b23..58fa86c170 100644
--- a/src/OpenFOAM/db/error/StaticAssert.H
+++ b/src/OpenFOAM/db/error/StaticAssert.H
@@ -67,12 +67,18 @@ class StaticAssertionTest {};
 #define StaticAssertMacro1(X,Y) StaticAssertMacro2(X,Y)
 #define StaticAssertMacro2(X,Y) X##Y
 
+#ifdef __GNUC__
+    #define StaticAssertUnusedTypedef __attribute__((unused))
+#else
+    #define StaticAssertUnusedTypedef
+#endif
+
 //- Assert that some test is true at compile-time
 #define StaticAssert(Test)                                                     \
     typedef ::Foam::StaticAssertionTest                                        \
     <                                                                          \
         sizeof( ::Foam::StaticAssertionFailed<((Test) ? true : false)>)        \
-    > StaticAssertMacro(StaticAssertionTest, __LINE__)
+    > StaticAssertMacro(StaticAssertionTest, __LINE__) StaticAssertUnusedTypedef
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From 9a8a1c83b05a00e84aa51dce68e9a791a219f418 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 4 Mar 2016 11:30:13 +0000
Subject: [PATCH 246/447] messageStream: Added DebugInfo and DebugInFunction:

DebugInfo:
    Report an information message using Foam::Info if the local debug
    switch is true

DebugInFunction:
    Report an information message using Foam::Info for FUNCTION_NAME in
    file __FILE__ at line __LINE__ if the local debug switch is true
---
 applications/test/tensor/Test-tensor.C        | 48 +++++++++----------
 src/OpenFOAM/db/error/messageStream.H         | 20 ++++++--
 .../energyRegionCoupledFvPatchScalarField.C   |  2 -
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/applications/test/tensor/Test-tensor.C b/applications/test/tensor/Test-tensor.C
index 6449adb8a2..5d576c0f16 100644
--- a/applications/test/tensor/Test-tensor.C
+++ b/applications/test/tensor/Test-tensor.C
@@ -91,11 +91,11 @@ int main()
         0.9745196104049683, 0.0369445420801640, 0.0846728682518005,
         0.6474838852882385, 0.1617118716239929, 0.2041363865137100
     );
-    Debug(T_rand_real);
+    DebugVar(T_rand_real);
     vector L_rand_real(eigenValues(T_rand_real));
-    Debug(L_rand_real);
+    DebugVar(L_rand_real);
     tensor U_rand_real(eigenVectors(T_rand_real));
-    Debug(U_rand_real);
+    DebugVar(U_rand_real);
 
     Info << endl << endl;
 
@@ -105,11 +105,11 @@ int main()
         0.9126510620117188, 0.7408077120780945, 0.1499115079641342,
         0.0936608463525772, 0.7615650296211243, 0.8953040242195129
     );
-    Debug(T_rand_imag);
+    DebugVar(T_rand_imag);
     vector L_rand_imag(eigenValues(T_rand_imag));
-    Debug(L_rand_imag);
+    DebugVar(L_rand_imag);
     tensor U_rand_imag(eigenVectors(T_rand_imag));
-    Debug(U_rand_imag);
+    DebugVar(U_rand_imag);
 
     Info << endl << endl;
 
@@ -119,11 +119,11 @@ int main()
         1.3076051771640778, 0.0738890841603279, 0.2463847398757935,
         1.3121289014816284, 0.2463847398757935, 0.4082727730274200
     );
-    Debug(T_rand_symm);
+    DebugVar(T_rand_symm);
     vector L_rand_symm(eigenValues(T_rand_symm));
-    Debug(L_rand_symm);
+    DebugVar(L_rand_symm);
     tensor U_rand_symm(eigenVectors(T_rand_symm));
-    Debug(U_rand_symm);
+    DebugVar(U_rand_symm);
 
     Info << endl << endl;
 
@@ -133,11 +133,11 @@ int main()
                             0.0738890841603279, 0.2463847398757935,
                                                 0.4082727730274200
     );
-    Debug(T_rand_Symm);
+    DebugVar(T_rand_Symm);
     vector L_rand_Symm(eigenValues(T_rand_Symm));
-    Debug(L_rand_Symm);
+    DebugVar(L_rand_Symm);
     tensor U_rand_Symm(eigenVectors(T_rand_Symm));
-    Debug(U_rand_Symm);
+    DebugVar(U_rand_Symm);
 
     Info << endl << endl;
 
@@ -147,11 +147,11 @@ int main()
         0, 0.7408077120780945, 0,
         0, 0, 0.8953040242195129
     );
-    Debug(T_rand_diag);
+    DebugVar(T_rand_diag);
     vector L_rand_diag(eigenValues(T_rand_diag));
-    Debug(L_rand_diag);
+    DebugVar(L_rand_diag);
     tensor U_rand_diag(eigenVectors(T_rand_diag));
-    Debug(U_rand_diag);
+    DebugVar(U_rand_diag);
 
     Info << endl << endl;
 
@@ -161,11 +161,11 @@ int main()
         1, 0, 1,
         1, 1, 0
     );
-    Debug(T_repeated);
+    DebugVar(T_repeated);
     vector L_repeated(eigenValues(T_repeated));
-    Debug(L_repeated);
+    DebugVar(L_repeated);
     tensor U_repeated(eigenVectors(T_repeated));
-    Debug(U_repeated);
+    DebugVar(U_repeated);
 
     Info << endl << endl;
 
@@ -175,11 +175,11 @@ int main()
         1, 1, 1,
         1, 1, 1
     );
-    Debug(T_repeated_zero);
+    DebugVar(T_repeated_zero);
     vector L_repeated_zero(eigenValues(T_repeated_zero));
-    Debug(L_repeated_zero);
+    DebugVar(L_repeated_zero);
     tensor U_repeated_zero(eigenVectors(T_repeated_zero));
-    Debug(U_repeated_zero);
+    DebugVar(U_repeated_zero);
 
     Info << endl << endl;
 
@@ -189,11 +189,11 @@ int main()
         0, 2, 0,
         0, 0, 2
     );
-    Debug(T_triple);
+    DebugVar(T_triple);
     vector L_triple(eigenValues(T_triple));
-    Debug(L_triple);
+    DebugVar(L_triple);
     tensor U_triple(eigenVectors(T_triple));
-    Debug(U_triple);
+    DebugVar(U_triple);
     */
 
     return 0;
diff --git a/src/OpenFOAM/db/error/messageStream.H b/src/OpenFOAM/db/error/messageStream.H
index c16e811d48..cb14af1aa3 100644
--- a/src/OpenFOAM/db/error/messageStream.H
+++ b/src/OpenFOAM/db/error/messageStream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -272,12 +272,12 @@ extern messageStream Info;
 #define IOWarningInFunction(ios) IOWarningIn(FUNCTION_NAME, ios)
 
 
-//- Report a information message using Foam::Info
+//- Report an information message using Foam::Info
 //  for functionName in file __FILE__ at line __LINE__
 #define InfoIn(functionName)                                                   \
     ::Foam::Info((functionName), __FILE__, __LINE__)
 
-//- Report a information message using Foam::Info
+//- Report an information message using Foam::Info
 //  for FUNCTION_NAME in file __FILE__ at line __LINE__
 #define InfoInFunction InfoIn(FUNCTION_NAME)
 
@@ -294,9 +294,21 @@ extern messageStream Info;
 #define IOInfoInFunction(ios) IOInfoIn(FUNCTION_NAME, ios)
 
 
+//- Report an information message using Foam::Info
+//  if the local debug switch is true
+#define DebugInfo                                                              \
+    if (debug) Info
+
+//- Report an information message using Foam::Info
+//  for FUNCTION_NAME in file __FILE__ at line __LINE__
+//  if the local debug switch is true
+#define DebugInFunction                                                        \
+    if (debug) InfoInFunction
+
+
 //- Report a variable name and value
 //  using Foam::Pout in file __FILE__ at line __LINE__
-#define Debug(var)                                                             \
+#define DebugVar(var)                                                          \
     ::Foam::Pout<< "["<< __FILE__ << ":" << __LINE__ << "] "                   \
     << #var " " << var << ::Foam::endl
 
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
index 004fecb0e2..fc4c5a8e8f 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
@@ -299,7 +299,6 @@ energyRegionCoupledFvPatchScalarField
 Foam::tmp<Foam::scalarField> Foam::energyRegionCoupledFvPatchScalarField::
 snGrad() const
 {
-    Debug("snGrad");
     return
         regionCoupledPatch_.patch().deltaCoeffs()
        *(*this - patchInternalField());
@@ -309,7 +308,6 @@ snGrad() const
 Foam::tmp<Foam::scalarField> Foam::energyRegionCoupledFvPatchScalarField::
 snGrad(const scalarField&) const
 {
-    Debug("snGrad");
     return snGrad();
 }
 

From 0f5059927ca7b5cc75cf02cfd1c675052f70ffcf Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 6 Mar 2016 19:02:43 +0000
Subject: [PATCH 247/447] reactingTwoPhaseEulerFoam: Corrected mass exchange
 terms in the face-momentum equation Thanks to Juho Peltola for the patch

---
 .../reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H
index 83c3a9ce7f..00a0fb8cfe 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H
@@ -25,7 +25,7 @@ fvVectorMatrix U2Eqn(U2, rho2.dimensions()*U2.dimensions()*dimVol/dimTime);
         U1Eqn =
         (
             fvm::div(alphaRhoPhi1, U1) - fvm::Sp(fvc::div(alphaRhoPhi1), U1)
-          + fvm::Sp(dmdt12, U1) + dmdt21*U2
+          + fvm::Sp(dmdt12, U1) - dmdt12*U2
           + MRF.DDt(alpha1*rho1, U1)
           + phase1.turbulence().divDevRhoReff(U1)
           + Vm*(UgradU1 - (UgradU2 & U2))
@@ -40,7 +40,7 @@ fvVectorMatrix U2Eqn(U2, rho2.dimensions()*U2.dimensions()*dimVol/dimTime);
         U2Eqn =
         (
             fvm::div(alphaRhoPhi2, U2) - fvm::Sp(fvc::div(alphaRhoPhi2), U2)
-          - fvm::Sp(dmdt21, U2) - dmdt12*U1
+          - fvm::Sp(dmdt21, U2) + dmdt21*U1
           + MRF.DDt(alpha2*rho2, U2)
           + phase2.turbulence().divDevRhoReff(U2)
           + Vm*(UgradU2 - (UgradU1 & U1))

From e18ac8ff506e95b5f04ca7ce24b31165645b10c8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 6 Mar 2016 19:04:53 +0000
Subject: [PATCH 248/447] Matrix: Improved readability of the code

---
 src/OpenFOAM/matrices/Matrix/Matrix.C   | 56 ++++++++++++-------------
 src/OpenFOAM/matrices/Matrix/Matrix.H   |  2 +-
 src/OpenFOAM/matrices/Matrix/MatrixI.H  | 22 +++++-----
 src/OpenFOAM/matrices/Matrix/MatrixIO.C | 14 +++----
 4 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index 3937f9cb1e..d06cef41e6 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -30,14 +30,14 @@ License
 template<class Form, class Type>
 void Foam::Matrix<Form, Type>::allocate()
 {
-    if (n_ && m_)
+    if (nRows_ && nCols_)
     {
-        v_ = new Type*[n_];
-        v_[0] = new Type[n_*m_];
+        v_ = new Type*[nRows_];
+        v_[0] = new Type[nRows_*nCols_];
 
-        for (label i=1; i<n_; i++)
+        for (label i=1; i<nRows_; i++)
         {
-            v_[i] = v_[i-1] + m_;
+            v_[i] = v_[i-1] + nCols_;
         }
     }
 }
@@ -61,14 +61,14 @@ Foam::Matrix<Form, Type>::~Matrix()
 template<class Form, class Type>
 Foam::Matrix<Form, Type>::Matrix(const label n, const label m)
 :
-    n_(n),
-    m_(m),
+    nRows_(n),
+    nCols_(m),
     v_(NULL)
 {
-    if (n_ < 0 || m_ < 0)
+    if (nRows_ < 0 || nCols_ < 0)
     {
         FatalErrorInFunction
-            << "bad n, m " << n_ << ", " << m_
+            << "bad n, m " << nRows_ << ", " << nCols_
             << abort(FatalError);
     }
 
@@ -79,14 +79,14 @@ Foam::Matrix<Form, Type>::Matrix(const label n, const label m)
 template<class Form, class Type>
 Foam::Matrix<Form, Type>::Matrix(const label n, const label m, const Type& a)
 :
-    n_(n),
-    m_(m),
+    nRows_(n),
+    nCols_(m),
     v_(NULL)
 {
-    if (n_ < 0 || m_ < 0)
+    if (nRows_ < 0 || nCols_ < 0)
     {
         FatalErrorInFunction
-            << "bad n, m " << n_ << ", " << m_
+            << "bad n, m " << nRows_ << ", " << nCols_
             << abort(FatalError);
     }
 
@@ -96,7 +96,7 @@ Foam::Matrix<Form, Type>::Matrix(const label n, const label m, const Type& a)
     {
         Type* v = v_[0];
 
-        label nm = n_*m_;
+        label nm = nRows_*nCols_;
 
         for (label i=0; i<nm; i++)
         {
@@ -109,8 +109,8 @@ Foam::Matrix<Form, Type>::Matrix(const label n, const label m, const Type& a)
 template<class Form, class Type>
 Foam::Matrix<Form, Type>::Matrix(const Matrix<Form, Type>& a)
 :
-    n_(a.n_),
-    m_(a.m_),
+    nRows_(a.nRows_),
+    nCols_(a.nCols_),
     v_(NULL)
 {
     if (a.v_)
@@ -119,7 +119,7 @@ Foam::Matrix<Form, Type>::Matrix(const Matrix<Form, Type>& a)
         Type* v = v_[0];
         const Type* av = a.v_[0];
 
-        label nm = n_*m_;
+        label nm = nRows_*nCols_;
         for (label i=0; i<nm; i++)
         {
             v[i] = av[i];
@@ -136,8 +136,8 @@ void Foam::Matrix<Form, Type>::clear()
         delete[] (v_[0]);
         delete[] v_;
     }
-    n_ = 0;
-    m_ = 0;
+    nRows_ = 0;
+    nCols_ = 0;
     v_ = NULL;
 }
 
@@ -147,11 +147,11 @@ void Foam::Matrix<Form, Type>::transfer(Matrix<Form, Type>& a)
 {
     clear();
 
-    n_ = a.n_;
-    a.n_ = 0;
+    nRows_ = a.nRows_;
+    a.nRows_ = 0;
 
-    m_ = a.m_;
-    a.m_ = 0;
+    nCols_ = a.nCols_;
+    a.nCols_ = 0;
 
     v_ = a.v_;
     a.v_ = NULL;
@@ -185,7 +185,7 @@ void Foam::Matrix<Form, Type>::operator=(const Type& t)
     {
         Type* v = v_[0];
 
-        label nm = n_*m_;
+        label nm = nRows_*nCols_;
         for (label i=0; i<nm; i++)
         {
             v[i] = t;
@@ -204,11 +204,11 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
             << abort(FatalError);
     }
 
-    if (n_ != a.n_ || m_ != a.m_)
+    if (nRows_ != a.nRows_ || nCols_ != a.nCols_)
     {
         clear();
-        n_ = a.n_;
-        m_ = a.m_;
+        nRows_ = a.nRows_;
+        nCols_ = a.nCols_;
         allocate();
     }
 
@@ -217,7 +217,7 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
         Type* v = v_[0];
         const Type* av = a.v_[0];
 
-        label nm = n_*m_;
+        label nm = nRows_*nCols_;
         for (label i=0; i<nm; i++)
         {
             v[i] = av[i];
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 8455ac997f..87652bdd6b 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -76,7 +76,7 @@ class Matrix
     // Private data
 
         //- Number of rows and columns in Matrix.
-        label n_, m_;
+        label nRows_, nCols_;
 
         //- Row pointers
         Type** __restrict__ v_;
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index 613285c707..5286b98f42 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H
@@ -28,8 +28,8 @@ License
 template<class Form, class Type>
 inline Foam::Matrix<Form, Type>::Matrix()
 :
-    n_(0),
-    m_(0),
+    nRows_(0),
+    nCols_(0),
     v_(NULL)
 {}
 
@@ -55,37 +55,37 @@ inline const Foam::Matrix<Form, Type>& Foam::Matrix<Form, Type>::null()
 template<class Form, class Type>
 inline Foam::label Foam::Matrix<Form, Type>::n() const
 {
-    return n_;
+    return nRows_;
 }
 
 
 template<class Form, class Type>
 inline Foam::label Foam::Matrix<Form, Type>::m() const
 {
-    return m_;
+    return nCols_;
 }
 
 
 template<class Form, class Type>
 inline Foam::label Foam::Matrix<Form, Type>::size() const
 {
-    return n_*m_;
+    return nRows_*nCols_;
 }
 
 
 template<class Form, class Type>
 inline void Foam::Matrix<Form, Type>::checki(const label i) const
 {
-    if (!n_)
+    if (!nRows_)
     {
         FatalErrorInFunction
             << "attempt to access element from zero sized row"
             << abort(FatalError);
     }
-    else if (i<0 || i>=n_)
+    else if (i<0 || i>=nRows_)
     {
         FatalErrorInFunction
-            << "index " << i << " out of range 0 ... " << n_-1
+            << "index " << i << " out of range 0 ... " << nRows_-1
             << abort(FatalError);
     }
 }
@@ -94,16 +94,16 @@ inline void Foam::Matrix<Form, Type>::checki(const label i) const
 template<class Form, class Type>
 inline void Foam::Matrix<Form, Type>::checkj(const label j) const
 {
-    if (!m_)
+    if (!nCols_)
     {
         FatalErrorInFunction
             << "attempt to access element from zero sized column"
             << abort(FatalError);
     }
-    else if (j<0 || j>=m_)
+    else if (j<0 || j>=nCols_)
     {
         FatalErrorInFunction
-            << "index " << j << " out of range 0 ... " << m_-1
+            << "index " << j << " out of range 0 ... " << nCols_-1
             << abort(FatalError);
     }
 }
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixIO.C b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
index 8c52bdebc5..60df684937 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixIO.C
+++ b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,8 +34,8 @@ License
 template<class Form, class Type>
 Foam::Matrix<Form, Type>::Matrix(Istream& is)
 :
-    n_(0),
-    m_(0),
+    nRows_(0),
+    nCols_(0),
     v_(NULL)
 {
     operator>>(is, *this);
@@ -59,10 +59,10 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
 
     if (firstToken.isLabel())
     {
-        M.n_ = firstToken.labelToken();
-        M.m_ = readLabel(is);
+        M.nRows_ = firstToken.labelToken();
+        M.nCols_ = readLabel(is);
 
-        label nm = M.n_*M.m_;
+        label nm = M.nRows_*M.nCols_;
 
         // Read list contents depending on data format
         if (is.format() == IOstream::ASCII || !contiguous<Type>())
@@ -151,7 +151,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
 template<class Form, class Type>
 Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
 {
-    label nm = M.n_*M.m_;
+    label nm = M.nRows_*M.nCols_;
 
     os  << M.n() << token::SPACE << M.m();
 

From e7bac07e141088a8d32198b477861e2cc7b88882 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 6 Mar 2016 19:05:14 +0000
Subject: [PATCH 249/447] Tensor: Added operator&=

---
 src/OpenFOAM/primitives/Tensor/Tensor.H  |  3 +++
 src/OpenFOAM/primitives/Tensor/TensorI.H | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index 046ebfba19..45906cdd0c 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -164,6 +164,9 @@ public:
 
     // Member Operators
 
+        //- Inner-product with a Tensor
+        inline void operator&=(const Tensor<Cmpt>&);
+
         //- Assign to a SphericalTensor
         inline void operator=(const SphericalTensor<Cmpt>&);
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index b128d0eebd..d08d91a969 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -296,6 +296,29 @@ inline Tensor<Cmpt> Tensor<Cmpt>::T() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class Cmpt>
+inline void Tensor<Cmpt>::operator&=(const Tensor<Cmpt>& t)
+{
+    *this =
+    (
+        Tensor<Cmpt>
+        (
+            this->xx()*t.xx() + this->xy()*t.yx() + this->xz()*t.zx(),
+            this->xx()*t.xy() + this->xy()*t.yy() + this->xz()*t.zy(),
+            this->xx()*t.xz() + this->xy()*t.yz() + this->xz()*t.zz(),
+
+            this->yx()*t.xx() + this->yy()*t.yx() + this->yz()*t.zx(),
+            this->yx()*t.xy() + this->yy()*t.yy() + this->yz()*t.zy(),
+            this->yx()*t.xz() + this->yy()*t.yz() + this->yz()*t.zz(),
+
+            this->zx()*t.xx() + this->zy()*t.yx() + this->zz()*t.zx(),
+            this->zx()*t.xy() + this->zy()*t.yy() + this->zz()*t.zy(),
+            this->zx()*t.xz() + this->zy()*t.yz() + this->zz()*t.zz()
+        )
+    );
+}
+
+
 template<class Cmpt>
 inline void Tensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 {

From 7fc1915e1dc670f38c3168cabb890b0c8b97b5df Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 6 Mar 2016 19:05:34 +0000
Subject: [PATCH 250/447] Vector: added operator=(scalar)

---
 src/OpenFOAM/primitives/Vector/Vector.H            |  5 +++++
 src/OpenFOAM/primitives/Vector/VectorI.H           | 12 ++++++++++++
 src/OpenFOAM/primitives/VectorSpace/VectorSpace.H  |  1 +
 src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H | 10 ++++++++++
 4 files changed, 28 insertions(+)

diff --git a/src/OpenFOAM/primitives/Vector/Vector.H b/src/OpenFOAM/primitives/Vector/Vector.H
index 3cfa3e3c05..b79dd8d6f7 100644
--- a/src/OpenFOAM/primitives/Vector/Vector.H
+++ b/src/OpenFOAM/primitives/Vector/Vector.H
@@ -123,6 +123,11 @@ public:
         (
             const Foam::List<Vector<Cmpt>>&
         ) const;
+
+
+    // Member Operators
+
+        inline void operator=(const scalar);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Vector/VectorI.H b/src/OpenFOAM/primitives/Vector/VectorI.H
index 1135e31c34..3133057461 100644
--- a/src/OpenFOAM/primitives/Vector/VectorI.H
+++ b/src/OpenFOAM/primitives/Vector/VectorI.H
@@ -111,6 +111,18 @@ inline const Vector<Cmpt>& Vector<Cmpt>::centre
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline void Vector<Cmpt>::operator=
+(
+    const scalar s
+)
+{
+    VectorSpace<Vector<Cmpt>, Cmpt, 3>::operator=(s);
+}
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index 7a2bf4f91b..05822b0fb8 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -133,6 +133,7 @@ public:
         inline void operator+=(const VectorSpace<Form, Cmpt, nCmpt>&);
         inline void operator-=(const VectorSpace<Form, Cmpt, nCmpt>&);
 
+        inline void operator=(const scalar);
         inline void operator*=(const scalar);
         inline void operator/=(const scalar);
 
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index 7ba4fe1690..846c6e7f56 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -218,6 +218,16 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::operator-=
 }
 
 
+template<class Form, class Cmpt, int nCmpt>
+inline void VectorSpace<Form, Cmpt, nCmpt>::operator=
+(
+    const scalar s
+)
+{
+    VectorSpaceOps<nCmpt,0>::eqOpS(*this, s, eqOp<Cmpt>());
+}
+
+
 template<class Form, class Cmpt, int nCmpt>
 inline void VectorSpace<Form, Cmpt, nCmpt>::operator*=
 (

From 4bc77e6aff32b92f24767ea9e9f5445dcb474f4e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 6 Mar 2016 19:06:44 +0000
Subject: [PATCH 251/447] Sprucing up the tutorials folder and adding -dict to
 "collapseEdges" Patch provided by Bruno Santos Resolves patch application
 request http://www.openfoam.org/mantisbt/view.php?id=2015

---
 .../advanced/collapseEdges/collapseEdges.C    | 25 +++++-
 bin/tools/RunFunctions                        | 46 ++++++----
 .../polyMeshFilter/polyMeshFilter.C           | 20 ++++-
 .../polyMeshFilter/polyMeshFilter.H           | 10 ++-
 tutorials/Allrun                              |  2 +-
 .../fireFoam/les/oppositeBurningPanels/Allrun | 21 +++--
 .../multiRegionHeater/Allrun                  |  2 +-
 .../snappyMultiRegionHeater/Allrun            |  2 +-
 .../heatExchanger/Allrun-parallel             | 14 +--
 .../heatExchanger/Allrun.pre                  | 14 ++-
 .../multiRegionHeaterRadiation/Allrun         |  6 +-
 .../Allrun-parallel                           |  6 +-
 .../multiRegionHeaterRadiation/Allrun.pre     |  2 +-
 .../boundaryWallFunctionsProfile/Allrun       |  8 +-
 .../straightDuctImplicit/Allrun.pre           | 11 +--
 .../cylinder/Allrun.pre                       |  1 -
 .../hotBoxes/Allrun-parallel                  | 12 +--
 .../hotBoxes/Allrun.pre                       |  3 +-
 .../rivuletPanel/Allrun.pre                   |  1 -
 .../splashPanel/Allrun.pre                    | 24 ++++--
 tutorials/mesh/foamyHexMesh/blob/Allrun       |  8 +-
 .../mesh/foamyHexMesh/blob/Allrun-parallel    |  8 +-
 tutorials/mesh/foamyHexMesh/flange/Allrun     |  8 +-
 .../mesh/foamyHexMesh/flange/Allrun-parallel  |  8 +-
 .../mesh/foamyHexMesh/mixerVessel/Allrun-pre  | 32 ++++---
 .../mixerVessel/Allrun-simulation             |  4 +-
 .../mixerVessel/system/collapseDict           | 86 +------------------
 .../mesh/foamyHexMesh/simpleShapes/Allrun     | 32 +++----
 .../mesh/refineMesh/refineFieldDirs/Allrun    | 23 +++--
 .../interDyMFoam/ras/DTCHull/Allrun           | 24 ++----
 .../interFoam/les/nozzleFlow2D/Allrun         | 27 ++----
 .../multiphase/interFoam/ras/DTCHull/Allrun   | 24 ++----
 .../propeller/Allrun.pre                      |  4 +-
 .../oscillatingBox/Allrun                     | 10 ++-
 34 files changed, 233 insertions(+), 295 deletions(-)
 mode change 100644 => 120000 tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict

diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index 9df985f42e..b3099f4f28 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,6 +80,7 @@ int main(int argc, char *argv[])
         "Collapse faces that are in the supplied face set"
     );
 
+    #include "addDictOption.H"
     #include "addOverwriteOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
@@ -91,6 +92,13 @@ int main(int argc, char *argv[])
 
     const word oldInstance = mesh.pointsInstance();
 
+    const word dictName("collapseDict");
+    #include "setSystemMeshDictionaryIO.H"
+
+    Info<< "Reading " << dictName << nl << endl;
+
+    IOdictionary collapseDict(dictIO);
+
     const bool overwrite = args.optionFound("overwrite");
 
     const bool collapseFaces = args.optionFound("collapseFaces");
@@ -155,7 +163,10 @@ int main(int argc, char *argv[])
 
 
         {
-            meshFilterPtr.set(new polyMeshFilter(mesh, pointPriority));
+            meshFilterPtr.set
+            (
+                new polyMeshFilter(mesh, pointPriority, collapseDict)
+            );
             polyMeshFilter& meshFilter = meshFilterPtr();
 
             // newMesh will be empty until it is filtered
@@ -177,7 +188,10 @@ int main(int argc, char *argv[])
 
         if (collapseFaceSet)
         {
-            meshFilterPtr.reset(new polyMeshFilter(mesh, pointPriority));
+            meshFilterPtr.reset
+            (
+                new polyMeshFilter(mesh, pointPriority, collapseDict)
+            );
             polyMeshFilter& meshFilter = meshFilterPtr();
 
             const autoPtr<fvMesh>& newMesh = meshFilter.filteredMesh();
@@ -198,7 +212,10 @@ int main(int argc, char *argv[])
 
         if (collapseFaces)
         {
-            meshFilterPtr.reset(new polyMeshFilter(mesh, pointPriority));
+            meshFilterPtr.reset
+            (
+                new polyMeshFilter(mesh, pointPriority, collapseDict)
+            );
             polyMeshFilter& meshFilter = meshFilterPtr();
 
             const autoPtr<fvMesh>& newMesh = meshFilter.filteredMesh();
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 3c074c7267..cdf4af6fe9 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -55,35 +55,43 @@ runApplication()
     APP_RUN=
     LOG_IGNORE=false
     LOG_APPEND=false
+    LOG_SUFFIX=
 
     # Parse options and executable
     while [ $# -gt 0 ] && [ -z "$APP_RUN" ]; do
         key="$1"
         case "$key" in
-            -append)
+            -append|-a)
                 LOG_IGNORE=true
                 LOG_APPEND=true
                 ;;
-            -overwrite)
+            -overwrite|-o)
                 LOG_IGNORE=true
                 ;;
+            -suffix|-s)
+                LOG_SUFFIX=".$2"
+                shift
+                ;;
             *)
                 APP_RUN="$key"
                 APP_NAME="${key##*/}"
+                LOG_SUFFIX="${APP_NAME}${LOG_SUFFIX}"
                 ;;
         esac
-    shift
+
+        shift
     done
 
-    if [ -f log.$APP_NAME ] && [ "$LOG_IGNORE" = "false" ]
+    if [ -f log.$LOG_SUFFIX ] && [ "$LOG_IGNORE" = "false" ]
     then
-        echo "$APP_NAME already run on $PWD: remove log file to re-run"
+        echo "$APP_NAME already run on $PWD:" \
+             "remove log file 'log.$LOG_SUFFIX' to re-run"
     else
         echo "Running $APP_RUN on $PWD"
         if [ "$LOG_APPEND" = "true" ]; then
-            $APP_RUN "$@" >> log.$APP_NAME 2>&1
+            $APP_RUN "$@" >> log.$LOG_SUFFIX 2>&1
         else
-            $APP_RUN "$@" > log.$APP_NAME 2>&1
+            $APP_RUN "$@" > log.$LOG_SUFFIX 2>&1
         fi
     fi
 }
@@ -93,40 +101,48 @@ runParallel()
     APP_RUN=
     LOG_IGNORE=false
     LOG_APPEND=false
+    LOG_SUFFIX=
     nProcs=$(getNumberOfProcessors)
 
     # Parse options and executable
     while [ $# -gt 0 ] && [ -z "$APP_RUN" ]; do
         key="$1"
         case "$key" in
-            -append)
+            -append|-a)
                 LOG_IGNORE=true
                 LOG_APPEND=true
                 ;;
-            -overwrite)
+            -overwrite|-o)
                 LOG_IGNORE=true
                 ;;
-            -np)
+            -suffix|-s)
+                LOG_SUFFIX=".$2"
+                shift
+                ;;
+            -np|-n)
                 nProcs="$2"
                 shift
                 ;;
             *)
                 APP_RUN="$key"
                 APP_NAME="${key##*/}"
+                LOG_SUFFIX="${APP_NAME}${LOG_SUFFIX}"
                 ;;
         esac
-    shift
+
+        shift
     done
 
-    if [ -f log.$APP_NAME ] && [ "$LOG_IGNORE" = "false" ]
+    if [ -f log.$SUFFIX ] && [ "$LOG_IGNORE" = "false" ]
     then
-        echo "$APP_NAME already run on $PWD: remove log file to re-run"
+        echo "$APP_NAME already run on $PWD:" \
+             "remove log file 'log.$LOG_SUFFIX' to re-run"
     else
         echo "Running $APP_RUN in parallel on $PWD using $nProcs processes"
         if [ "$LOG_APPEND" = "true" ]; then
-            ( mpirun -np $nProcs $APP_RUN -parallel "$@" < /dev/null >> log.$APP_NAME 2>&1 )
+            ( mpirun -np $nProcs $APP_RUN -parallel "$@" < /dev/null >> log.$LOG_SUFFIX 2>&1 )
         else
-            ( mpirun -np $nProcs $APP_RUN -parallel "$@" < /dev/null > log.$APP_NAME 2>&1 )
+            ( mpirun -np $nProcs $APP_RUN -parallel "$@" < /dev/null > log.$LOG_SUFFIX 2>&1 )
         fi
     fi
 }
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
index 28398bdc92..ced6d24aeb 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -946,6 +946,24 @@ Foam::polyMeshFilter::polyMeshFilter
     writeSettings(Info);
 }
 
+Foam::polyMeshFilter::polyMeshFilter
+(
+    const fvMesh& mesh,
+    const labelList& pointPriority,
+    const dictionary& dict
+)
+:
+    polyMeshFilterSettings(dict),
+    mesh_(mesh),
+    newMeshPtr_(),
+    originalPointPriority_(pointPriority),
+    pointPriority_(),
+    minEdgeLen_(),
+    faceFilterFactor_()
+{
+    writeSettings(Info);
+}
+
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
index ffae205634..a61cb1e93b 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
@@ -207,6 +207,14 @@ public:
         //- Construct from fvMesh and a label list of point priorities
         polyMeshFilter(const fvMesh& mesh, const labelList& pointPriority);
 
+        //- Construct from fvMesh and a label list of point priorities
+        polyMeshFilter
+        (
+            const fvMesh& mesh,
+            const labelList& pointPriority,
+            const dictionary& dict
+        );
+
 
     //- Destructor
     ~polyMeshFilter();
@@ -257,7 +265,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "polyMeshFilterTemplates.C"
+#   include "polyMeshFilterTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/Allrun b/tutorials/Allrun
index 6b600d4eb6..1f8f12eec0 100755
--- a/tutorials/Allrun
+++ b/tutorials/Allrun
@@ -38,7 +38,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 logReport()
 {
     caseName=`dirname $1 | sed s/"\(.*\)\.\/"/""/g`
-    app=`echo $1 | sed s/"\(.*\)\."/""/g`
+    app=`echo $1 | sed s/"\(.*\)log\."/""/g`
     appAndCase="Application $app - case $caseName"
 
     fatalError=`grep "FOAM FATAL" $1`
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
index e5bcb245fa..befcb5a01d 100755
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
@@ -9,26 +9,31 @@ application=`getApplication`
 
 runApplication blockMesh
 
-runApplication topoSet -dict system/cRefine.topoSetDict
+runApplication -s cRefine \
+    topoSet -dict system/cRefine.topoSetDict
+
 runApplication refineMesh -overwrite -dict system/refineMeshDict
 
-rm log.topoSet
-runApplication topoSet -dict system/f.topoSetDict
+runApplication -s f \
+    topoSet -dict system/f.topoSetDict
 
 # create the pyrolysis region.
 runApplication extrudeToRegionMesh -overwrite
 
 
-rm log.topoSet
-runApplication topoSet -dict system/fBurner.topoSetDict
+runApplication -s fBurner \
+    topoSet -dict system/fBurner.topoSetDict
 
 runApplication createPatch -overwrite
 
-decomposePar -force > log.decomposePar 2>&1
+runApplication -s master \
+    decomposePar -force
 
-decomposePar -region panelRegion > log.decomposeParPanelRegion 2>&1
+runApplication -s panelRegion \
+    decomposePar -region panelRegion
 
-decomposePar -fields > log.decomposePar 2>&1
+runApplication -s fields \
+    decomposePar -fields
 
 runParallel `getApplication`
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index bd8074f33a..602f7159e2 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -18,7 +18,7 @@ done
 
 for i in bottomWater topAir heater leftSolid rightSolid
 do
-   changeDictionary -region $i > log.changeDictionary.$i 2>&1
+   runApplication -s $i  changeDictionary -region $i
 done
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
index b7e64e4525..6e65d85280 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
@@ -22,7 +22,7 @@ done
 
 for i in bottomAir topAir heater leftSolid rightSolid
 do
-   changeDictionary -region $i > log.changeDictionary.$i 2>&1
+   runApplication -s $i  changeDictionary -region $i
 done
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel
index 32143f46ad..9e5b931edc 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel
@@ -7,16 +7,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-runApplication decomposePar -region air
-mv log.decomposePar log.decomposePar.air
-
-runApplication decomposePar -region porous
-mv log.decomposePar log.decomposePar.porous
+runApplication -s air    decomposePar -region air
+runApplication -s porous decomposePar -region porous
 
 runParallel $(getApplication)
 
-runApplication reconstructPar -latestTime -region air
-mv log.reconstructPar log.reconstructPar.air
-
-runApplication reconstructPar -latestTime -region porous
-mv log.reconstructPar log.reconstructPar.porous
+runApplication -s air    reconstructPar -latestTime -region air
+runApplication -s porous reconstructPar -latestTime -region porous
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre
index 87f198c629..020b201778 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre
@@ -6,20 +6,18 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 #create meshes
-runApplication blockMesh -region air
-mv log.blockMesh log.blockMesh.air
-runApplication blockMesh -region porous
-mv log.blockMesh log.blockMesh.porous
+runApplication -s air    blockMesh -region air
+runApplication -s porous blockMesh -region porous
 
 # create rotor blades in air region
-runApplication topoSet -region air -dict system/topoSetDict.1
-mv log.topoSet log.topoSet.air.1
+runApplication -s air.1 \
+    topoSet -region air -dict system/topoSetDict.1
 
 runApplication createBaffles -region air -overwrite
 
 # create rotor zone in air region for MRF
-runApplication topoSet -region air -dict system/topoSetDict.2
-mv log.topoSet log.topoSet.air.2
+runApplication -s air.2 \
+    topoSet -region air -dict system/topoSetDict.2
 
 rm -rf constant/air/polyMesh/sets
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
index 9a15ba12db..1b32e96d00 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
@@ -15,13 +15,15 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Agglomerate patch faces
 for i in bottomAir topAir
 do
-    faceAgglomerate -region $i -dict constant/viewFactorsDict > log.faceAgglomerate.$i 2>&1
+    runApplication -s $i \
+        faceAgglomerate -region $i -dict constant/viewFactorsDict
 done
 
 # Generate view factors
 for i in bottomAir topAir
 do
-    viewFactorsGen -region $i > log.viewFactorsGen.$i 2>&1
+    runApplication -s $i \
+        viewFactorsGen -region $i
 done
 
 runApplication `getApplication`
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
index 29340be8b7..f248b4fb32 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
@@ -18,13 +18,15 @@ runApplication decomposePar -allRegions
 # Agglomerate patch faces
 for i in bottomAir topAir
 do
-    mpirun -np 4 faceAgglomerate -region $i -dict constant/viewFactorsDict -parallel>   log.faceAgglomerate.$i 2>&1
+    runParallel -s $i -np 4 \
+        faceAgglomerate -region $i -dict constant/viewFactorsDict
 done
 
 # Generate view factors
 for i in bottomAir topAir
 do
-    mpirun -np 4 viewFactorsGen -region $i -parallel > log.viewFactorsGen.$i 2>&1
+    runParallel -s $i -np 4 \
+        viewFactorsGen -region $i
 done
 
 # Run
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
index ae1d9ff751..22b2e59f12 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
@@ -17,7 +17,7 @@ done
 
 for i in bottomAir topAir heater leftSolid rightSolid
 do
-    changeDictionary -region $i > log.changeDictionary.$i 2>&1
+    runApplication -s $i  changeDictionary -region $i
 done
 
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
index a61f812ff4..26d2834e81 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
@@ -17,15 +17,11 @@ do
     sed "s/XXX/$e/g" constant/transportProperties.template \
         > constant/transportProperties
 
-    runApplication `getApplication`
-
-    mv log.boundaryFoam log.boundaryFoam_$e
+    runApplication -s $e  `getApplication`
 
     # extract y+, U+
     # note: both must be added to foamLog.db
-    runApplication foamLog log.boundaryFoam_$e
-
-    mv log.foamLog log.foamLog_$e
+    runApplication -s $e  foamLog log.boundaryFoam.$e
 
     if [ -e logs/yPlus_0 ]
     then
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
index eff1c822a7..b43a890399 100755
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
@@ -9,13 +9,14 @@ runApplication surfaceFeatureExtract
 runApplication foamyHexMesh
 
 # Collapse only patch faces from incomplete conformation
-cp system/collapseDict.indirectPatchFaces system/collapseDict
-runApplication collapseEdges -collapseFaceSet indirectPatchFaces -latestTime -overwrite
-mv log.collapseEdges log.collapseEdges-indirectPatchFaces
+runApplication -s indirectPatchFaces \
+    collapseEdges -collapseFaceSet indirectPatchFaces -latestTime -overwrite \
+                  -dict system/collapseDict.indirectPatchFaces
 
 # Collapse small edges and sliver faces
-cp system/collapseDict.collapseFaces system/collapseDict
-runApplication collapseEdges -collapseFaces -latestTime -overwrite
+runApplication -s collapseFaces \
+    collapseEdges -collapseFaces -latestTime -overwrite \
+                  -dict system/collapseDict.collapseFaces
 
 runApplication checkMesh -allTopology -allGeometry -latestTime
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
index 70e1cd081e..ae65df0e25 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
@@ -5,7 +5,6 @@ cp -rf 0.org 0
 runApplication blockMesh
 
 #runApplication setSet -batch wallFilmRegion.setSet
-#mv log.setSet log.wallFilmRegion.setSet
 runApplication topoSet
 
 runApplication extrudeToRegionMesh -overwrite
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
index 79670e84ee..29817ff80b 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
@@ -8,15 +8,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 application=`getApplication`
 
-runApplication decomposePar -region wallFilmRegion
-mv log.decomposePar log.decomposePar.wallFilmRegion
-runApplication decomposePar
-mv log.decomposePar log.decomposePar.primaryRegion
+runApplication -s wallFilmRegion decomposePar -region wallFilmRegion
+runApplication -s primaryRegion  decomposePar
 
 runParallel $application
 
-runApplication reconstructPar -region wallFilmRegion
-mv log.reconstructPar log.reconstructPar.wallFilmRegion
-runApplication reconstructPar
-mv log.reconstructPar log.reconstructPar.primaryRegion
+runApplication -s wallFilmRegion reconstructPar -region wallFilmRegion
+runApplication -s primaryRegion  reconstructPar
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
index 06e9e9ec5f..784b007b2c 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
@@ -16,8 +16,7 @@ runApplication topoSet
 runApplication subsetMesh c0 -patch wallFilm -overwrite
 
 # split the obstacle patches into cube[1-6]_patch[1-6]
-echo "running patchifyObstacles"
-./patchifyObstacles > log.patchifyObstacles 2>&1
+runApplication ./patchifyObstacles
 
 # Create the wall film region via extrusion
 runApplication extrudeToRegionMesh -overwrite
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
index 3ab62f90f5..d00e6b23ff 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
@@ -6,7 +6,6 @@ cp -rf 0.org 0
 runApplication blockMesh
 
 #runApplication setSet -batch wallFilmRegion.setSet
-#mv log.setSet log.wallFilmRegion.setSet
 runApplication topoSet -dict system/wallFilmRegion.topoSet
 
 runApplication extrudeToRegionMesh -overwrite
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
index 6924ed9001..512715678f 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
@@ -5,17 +5,25 @@ cp -rf 0.org 0
 
 runApplication blockMesh
 
-#runApplication setSet -batch wallFilmRegion.setSet
-#mv log.setSet log.wallFilmRegion.setSet
-runApplication topoSet -dict system/wallFilmRegion.topoSet
-mv log.topoSet log.wallFilmRegion.topoSet
+#If using batch mode
+#runApplication -s wallFilmRegion \
+#    setSet -batch wallFilmRegion.setSet
+
+#If using dictionary mode
+runApplication -s wallFilmRegion \
+    topoSet -dict system/wallFilmRegion.topoSet
 
 runApplication extrudeToRegionMesh -overwrite
 
-#runApplication setSet -region wallFilmRegion -batch createWallFilmRegionPatches.setSet
-#mv log.setSet log.createWallFilmRegionPatches.setSet
-runApplication topoSet -region wallFilmRegion -dict system/createWallFilmRegionPatches.topoSet
-mv log.topoSet log.createWallFilmRegionPatches.topoSet
+#If using batch mode
+#runApplication -s createWallFilmRegionPatches \
+#    setSet -region wallFilmRegion \
+#           -batch createWallFilmRegionPatches.setSet
+
+#If using dictionary mode
+runApplication -s createWallFilmRegionPatches \
+    topoSet -region wallFilmRegion \
+            -dict system/createWallFilmRegionPatches.topoSet
 
 runApplication createPatch -region wallFilmRegion -overwrite
 
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun b/tutorials/mesh/foamyHexMesh/blob/Allrun
index 5b36f0de08..a4d7bd61d5 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun
@@ -9,11 +9,11 @@ cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
 
 runApplication foamyHexMesh
 
-runApplication collapseEdges -latestTime -collapseFaces
-mv log.collapseEdges log.collapseFaces
+runApplication -s collapseFaces \
+    collapseEdges -latestTime -collapseFaces
 
-runApplication collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
-mv log.collapseEdges log.collapseFaceSet
+runApplication -s collapseFaceSet \
+    collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
 
 runApplication checkMesh -latestTime -allGeometry -allTopology
 
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
index bcc119f240..7947ab35f2 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
@@ -12,11 +12,11 @@ runApplication decomposePar -region backgroundMeshDecomposition
 
 runParallel foamyHexMesh
 
-runParallel collapseEdges -latestTime -collapseFaces
-mv log.collapseEdges log.collapseFaces
+runParallel -s collapseFaces \
+    collapseEdges -latestTime -collapseFaces
 
-runParallel collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
-mv log.collapseEdges log.collapseFaceSet
+runParallel -s collapseFaceSet \
+    collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
 
 runParallel checkMesh -latestTime -allTopology -allGeometry
 
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun b/tutorials/mesh/foamyHexMesh/flange/Allrun
index fff3c12977..414ca8f4a3 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allrun
+++ b/tutorials/mesh/foamyHexMesh/flange/Allrun
@@ -9,11 +9,11 @@ cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
 
 runApplication foamyHexMesh
 
-runApplication collapseEdges -latestTime -collapseFaces
-mv log.collapseEdges log.collapseFaces
+runApplication -s collapseFaces \
+    collapseEdges -latestTime -collapseFaces
 
-runApplication collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
-mv log.collapseEdges log.collapseFaceSet
+runApplication -s collapseFaceSet \
+    collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
 
 runApplication checkMesh -latestTime -allGeometry -allTopology
 
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
index bd04a36575..fb57faff8e 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
@@ -13,11 +13,11 @@ runApplication decomposePar -region backgroundMeshDecomposition
 
 runParallel foamyHexMesh
 
-runParallel collapseEdges -latestTime -collapseFaces
-mv log.collapseEdges log.collapseFaces
+runParallel -s collapseFaces \
+    collapseEdges -latestTime -collapseFaces
 
-runParallel collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
-mv log.collapseEdges log.collapseFaceSet
+runParallel -s collapseFaceSet \
+    collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
 
 runParallel checkMesh -latestTime -allTopology -allGeometry
 
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
index 58e149a749..b95aabe645 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
@@ -6,19 +6,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 intersectSurfaces()
 {
-    runApplication              \
-        surfaceBooleanFeatures  \
-        intersection            \
-        "$@"
-
     outputName1=$(basename $1)
     outputName1=${outputName1%.*}
 
     outputName2=$(basename $2)
     outputName2=${outputName2%.*}
 
-    mv log.surfaceBooleanFeatures \
-       log.surfaceBooleanFeatures.$outputName1:$outputName2
+    runApplication -s $outputName1:$outputName2 \
+        surfaceBooleanFeatures intersection "$@"
 }
 
 # Set application name
@@ -77,30 +72,33 @@ done
 
 # Meshing
 \cp system/controlDict.mesh system/controlDict
-\cp system/collapseDict.collapseFaces system/collapseDict
 
 runApplication blockMesh -region backgroundMeshDecomposition
 
-runApplication decomposePar -region backgroundMeshDecomposition
+runApplication -s backgroundMeshDecomposition \
+    decomposePar -region backgroundMeshDecomposition
 
 runApplication surfaceFeatureExtract
 
 runParallel foamyHexMesh
 
-runParallel collapseEdges -collapseFaces -latestTime
-mv log.collapseEdges log.collapseFaces
+runParallel -s faces \
+    collapseEdges -collapseFaces -latestTime \
+                  -dict system/collapseDict.collapseFaces
 
-#\cp system/collapseDict.indirectPatchFaces system/collapseDict
-#runParallel collapseEdges -collapseFaceSet indirectPatchFaces -latestTime
-#mv log.collapseEdges log.collapseFaceSet
+#runParallel -s faceSet  \
+#    collapseEdges -collapseFaceSet indirectPatchFaces -latestTime \
+#                  -dict system/collapseDict.indirectPatchFaces
 
 runParallel checkMesh -allTopology -allGeometry -latestTime
 
 runApplication reconstructParMesh -latestTime
 
-# Copy the mesh into polyMesh and delete the 102 directory
-\cp -r 101/polyMesh constant
-\rm -rf 101
+# Copy the mesh from the latest time folder into polyMesh and delete that
+# latest time folder
+latestTime=$(foamListTimes -latestTime)
+\cp -r $latestTime/polyMesh constant
+\rm -rf $latestTime
 
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
index 69e6c8f61e..6d2f719787 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
@@ -24,8 +24,8 @@ runApplication createPatch -overwrite
 runApplication setFields
 
 # Decompose
-\rm log.decomposePar
-runApplication decomposePar -force
+runApplication -s main \
+    decomposePar -force
 
 # Run
 runParallel $application
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict
deleted file mode 100644
index 0389a33b5a..0000000000
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict
+++ /dev/null
@@ -1,85 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version         2.0;
-    format          ascii;
-    class           dictionary;
-    object          collapseDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// If on, after collapsing check the quality of the mesh. If bad faces are
-// generated then redo the collapsing with stricter filtering.
-controlMeshQuality      on;
-
-collapseEdgesCoeffs
-{
-    // Edges shorter than this absolute value will be merged
-    minimumEdgeLength   1e-6;
-
-    // The maximum angle between two edges that share a point attached to
-    // no other edges
-    maximumMergeAngle   180;
-}
-
-
-collapseFacesCoeffs
-{
-    // The initial face length factor
-    initialFaceLengthFactor                 1;
-
-    // If the face can't be collapsed to an edge, and it has a span less than
-    // the target face length multiplied by this coefficient, collapse it
-    // to a point.
-    maxCollapseFaceToPointSideLengthCoeff   0.3;
-
-    // Allow early collapse of edges to a point
-    allowEarlyCollapseToPoint               on;
-
-    // Fraction to premultiply maxCollapseFaceToPointSideLengthCoeff by if
-    // allowEarlyCollapseToPoint is enabled
-    allowEarlyCollapseCoeff                 0.2;
-
-    // Defining how close to the midpoint (M) of the projected
-    // vertices line a projected vertex (X) can be before making this
-    // an invalid edge collapse
-    //
-    // X---X-g----------------M----X-----------g----X--X
-    //
-    // Only allow a collapse if all projected vertices are outwith
-    // guardFraction (g) of the distance form the face centre to the
-    // furthest vertex in the considered direction
-    guardFraction                           0.1;
-}
-
-
-controlMeshQualityCoeffs
-{
-    // Name of the dictionary that has the mesh quality coefficients used
-    // by motionSmoother::checkMesh
-    #include                    "meshQualityDict";
-
-    // The amount that minimumEdgeLength will be reduced by for each
-    // edge if that edge's collapse generates a poor quality face
-    edgeReductionFactor         0.5;
-
-    // The amount that initialFaceLengthFactor will be reduced by for each
-    // face if its collapse generates a poor quality face
-    faceReductionFactor         0.5;
-
-    // Maximum number of outer iterations is mesh quality checking is enabled
-    maximumIterations           10;
-
-    maximumSmoothingIterations  1;
-
-    maxPointErrorCount          3;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict
new file mode 120000
index 0000000000..b1789d920b
--- /dev/null
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict
@@ -0,0 +1 @@
+collapseDict.collapseFaces
\ No newline at end of file
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
index c0d7aab678..1254efdb61 100755
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
@@ -4,28 +4,28 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-runApplication surfaceOrient \
-    constant/triSurface/cone.stl \
-    -inside '(0 -0.5 0)' \
-    constant/triSurface/cone_orient.stl
-mv log.surfaceOrient log.surfaceOrient.cone
+runApplication -s cone \
+    surfaceOrient constant/triSurface/cone.stl \
+                  -inside '(0 -0.5 0)' \
+                  constant/triSurface/cone_orient.stl
 
-runApplication surfaceOrient \
-    constant/triSurface/sphere.stl \
-    -inside '(0 -0.5 0)' \
-    constant/triSurface/sphere_orient.stl
-mv log.surfaceOrient log.surfaceOrient.sphere
+runApplication -s sphere \
+    surfaceOrient constant/triSurface/sphere.stl \
+                  -inside '(0 -0.5 0)' \
+                  constant/triSurface/sphere_orient.stl
 
-runApplication surfaceBooleanFeatures intersection \
-                       constant/triSurface/cone_orient.stl \
-                       constant/triSurface/sphere_orient.stl
+runApplication \
+    surfaceBooleanFeatures intersection \
+                           constant/triSurface/cone_orient.stl \
+                           constant/triSurface/sphere_orient.stl
 
 runApplication foamyHexMesh
 
-runApplication collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
-mv log.collapseEdges log.collapseFaceSet
+runApplication -s collapseFaceSet \
+    collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
 
-runApplication collapseEdges -latestTime -collapseFaces
+runApplication -s collapseFaces \
+    collapseEdges -latestTime -collapseFaces
 
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/Allrun b/tutorials/mesh/refineMesh/refineFieldDirs/Allrun
index 3498d6b3bb..c3bdd39961 100755
--- a/tutorials/mesh/refineMesh/refineFieldDirs/Allrun
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/Allrun
@@ -17,16 +17,15 @@ mkdir 0
 # Refine over Z, in 6 passes
 for index in 1 2 3 4 5 6; do
 
-  runApplication calcRadiusField
-  mv log.calcRadiusField log.calcRadiusField.tier$index
+  runApplication -s tier$index  calcRadiusField
 
-  runApplication topoSet -dict system/topoSetDict.tier$index
-  mv log.topoSet log.topoSet.tier$index
+  runApplication -s tier$index \
+      topoSet -dict system/topoSetDict.tier$index
 
   ## foamToVTK -cellSet tier$index
 
-  runApplication refineMesh -dict system/refineMeshDict.tier$index -overwrite
-  mv log.refineMesh log.refineMesh.tier$index
+  runApplication -s tier$index \
+      refineMesh -dict system/refineMeshDict.tier$index -overwrite
 
   rm -r 0/*
 
@@ -35,17 +34,15 @@ done
 # Refine over cylindrical coordinates, in 3 passes
 for index in 1 2 3; do
 
-  runApplication calcRadiusField -calcDirections
-  mv log.calcRadiusField log.calcRadiusField.range$index
+  runApplication -s range$index  calcRadiusField -calcDirections
 
-  runApplication topoSet -dict system/topoSetDict.range$index
-  mv log.topoSet log.topoSet.range$index
+  runApplication -s range$index \
+      topoSet -dict system/topoSetDict.range$index
 
   ## foamToVTK -cellSet tier$index
 
-  runApplication refineMesh -dict system/refineMeshDict.range$index \
-      -overwrite
-  mv log.refineMesh log.refineMesh.range$index
+  runApplication -s range$index \
+      refineMesh -dict system/refineMeshDict.range$index -overwrite
 
   rm -r 0/*
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun b/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
index 636c425d4c..49e618ecd4 100755
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
@@ -4,12 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-runRefineMesh ()
-{
-    echo "Running refineMesh on $PWD"
-    refineMesh -dict system/refineMeshDict -overwrite > log.refineMesh 2>&1
-}
-
 # copy DTC hull surface from resources folder
 cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/
 
@@ -17,17 +11,13 @@ runApplication surfaceFeatureExtract
 
 runApplication blockMesh
 
-i=1
-if [ -f log.topoSet.6 ] ; then
-   i=7
-fi
-while [ "$i" -lt 7 ] ; do
-    cp system/topoSetDict.${i} system/topoSetDict
-    runApplication topoSet
-    runRefineMesh
-    mv log.topoSet log.topoSet.$i
-    mv log.refineMesh log.refineMesh.$i
-    i=$(expr $i + 1)
+for i in 1 2 3 4 5 6
+do
+    runApplication -s $i \
+        topoSet -dict system/topoSetDict.${i}
+
+    runApplication -s $i \
+        refineMesh -dict system/refineMeshDict -overwrite
 done
 
 runApplication snappyHexMesh -overwrite
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
index 3c04c72a4e..5b0b162e78 100755
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
@@ -7,28 +7,15 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Get application name
 application=`getApplication`
 
-runRefineMesh ()
-{
-    echo "Running refineMesh on $PWD"
-    refineMesh -dict system/refineMeshDict > log.refineMesh 2>&1
-}
-
 runApplication blockMesh
 
-i=1
-if [ -f log.topoSet ] ; then
-   i=3
-fi
-while [ "$i" -lt 3 ] ; do
-    if [ -f log.topoSet ] ; then
-        mv log.topoSet log.topoSet.1
-    fi
-    cp system/topoSetDict.${i} system/topoSetDict
-    runApplication topoSet
-    runRefineMesh
-    cp -r 1e-08/polyMesh/* constant/polyMesh
-    rm -rf 1e-08
-    i=`expr $i + 1`
+for i in 1 2
+do
+    runApplication -s $i \
+        topoSet -dict system/topoSetDict.${i}
+
+    runApplication -s $i \
+        refineMesh -dict system/refineMeshDict -overwrite
 done
 
 runApplication $application
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/Allrun b/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
index 636c425d4c..49e618ecd4 100755
--- a/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/Allrun
@@ -4,12 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-runRefineMesh ()
-{
-    echo "Running refineMesh on $PWD"
-    refineMesh -dict system/refineMeshDict -overwrite > log.refineMesh 2>&1
-}
-
 # copy DTC hull surface from resources folder
 cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/
 
@@ -17,17 +11,13 @@ runApplication surfaceFeatureExtract
 
 runApplication blockMesh
 
-i=1
-if [ -f log.topoSet.6 ] ; then
-   i=7
-fi
-while [ "$i" -lt 7 ] ; do
-    cp system/topoSetDict.${i} system/topoSetDict
-    runApplication topoSet
-    runRefineMesh
-    mv log.topoSet log.topoSet.$i
-    mv log.refineMesh log.refineMesh.$i
-    i=$(expr $i + 1)
+for i in 1 2 3 4 5 6
+do
+    runApplication -s $i \
+        topoSet -dict system/topoSetDict.${i}
+
+    runApplication -s $i \
+        refineMesh -dict system/refineMeshDict -overwrite
 done
 
 runApplication snappyHexMesh -overwrite
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
index 2b47281b6c..40f5f5f1d4 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
@@ -25,9 +25,7 @@ runApplication renumberMesh -overwrite
 # - generate face/cell sets and zones
 
 #runApplication setSet -batch createInletOutletSets.setSet
-#mv log.setSet log.createInletOutletSets.setSet
 runApplication topoSet -dict system/createInletOutletSets.topoSetDict
-#mv log.topoSet log.createInletOutletSets.topoSet
 
 
 # - create the inlet/outlet and AMI patches
@@ -35,7 +33,7 @@ runApplication topoSet -dict system/createInletOutletSets.topoSetDict
 runApplication createPatch -overwrite
 
 
-# - test by running moveDynamicMes
+# - test by running moveDynamicMesh
 #runApplication moveDynamicMesh -checkAMI
 
 
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
index 0e00b6b1a3..4358c30059 100755
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
@@ -8,10 +8,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 application=`getApplication`
 
 runApplication blockMesh
-runApplication topoSet
-mv log.topoSet log.topoSet.1
+
+runApplication -s 1  topoSet
+
 runApplication subsetMesh -overwrite c0 -patch floatingObject
-runApplication topoSet -dict system/topoSetDict-selectBottom
+
+runApplication -s selectBottom \
+    topoSet -dict system/topoSetDict-selectBottom
+
 runApplication createPatch -overwrite
 
 cp -r 0.org 0 > /dev/null 2>&1

From ef86cd63d14c1cba40c9bdace5357b0216942ee1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 6 Mar 2016 19:13:45 +0000
Subject: [PATCH 252/447] Update "wrmdep -update" to remove dead symbolic links
 Patch provided by Bruno Santos Resolved bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2016

---
 wmake/wrmdep | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/wmake/wrmdep b/wmake/wrmdep
index b390205d8c..d5bf4f2658 100755
--- a/wmake/wrmdep
+++ b/wmake/wrmdep
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -196,11 +196,11 @@ updateMode)
         || usage "Not in the project top-level directory"
 
     echo "Purging all dep files that relate to files that no longer exist..."
-    fileNameList=$(find -L src applications -name '*.[CHL]' -type l \
-                        -exec basename {} \;)
+    fileNameList=$(find -L src applications -name '*.[CHL]' -type l)
 
-    for fileName in $fileNameList
+    for filePathAndName in $fileNameList
     do
+        fileName=$(basename $filePathAndName)
         echo "Purging from 'src': $fileName"
         cd src
         $Script -a $fileName
@@ -210,6 +210,9 @@ updateMode)
         $Script -a $fileName
 
         cd ..
+
+        # Just in case, remove the symbolic link as the last step
+        unlink $filePathAndName
     done
 
     ;;

From ed2cff905caff1acfddf51a3537c636e10a2861c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 6 Mar 2016 21:34:31 +0000
Subject: [PATCH 253/447] 
 tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre:
 Updated for latest version of collapseEdges

---
 .../porousSimpleFoam/straightDuctImplicit/Allrun.pre        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
index b43a890399..cbf9866f1a 100755
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
@@ -10,13 +10,11 @@ runApplication foamyHexMesh
 
 # Collapse only patch faces from incomplete conformation
 runApplication -s indirectPatchFaces \
-    collapseEdges -collapseFaceSet indirectPatchFaces -latestTime -overwrite \
-                  -dict system/collapseDict.indirectPatchFaces
+    collapseEdges -collapseFaceSet indirectPatchFaces -latestTime -overwrite
 
 # Collapse small edges and sliver faces
 runApplication -s collapseFaces \
-    collapseEdges -collapseFaces -latestTime -overwrite \
-                  -dict system/collapseDict.collapseFaces
+    collapseEdges -collapseFaces -latestTime -overwrite
 
 runApplication checkMesh -allTopology -allGeometry -latestTime
 

From 0e1787e44a1ee77a9fbea8edc439247e9aeb90d2 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 6 Mar 2016 21:35:02 +0000
Subject: [PATCH 254/447] polyMeshFilter.H: Updated indentation

---
 src/dynamicMesh/polyMeshFilter/polyMeshFilter.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
index a61cb1e93b..a49d6f63f9 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
@@ -265,7 +265,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "polyMeshFilterTemplates.C"
+    #include "polyMeshFilterTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

From d62351f53cd0483f2b7bfae32402ab2812230870 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 7 Mar 2016 15:25:27 +0000
Subject: [PATCH 255/447] Tensor: Added inv() member function

---
 src/OpenFOAM/primitives/Tensor/Tensor.H  | 5 ++++-
 src/OpenFOAM/primitives/Tensor/TensorI.H | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index 45906cdd0c..0d0ba7e04d 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -158,9 +158,12 @@ public:
             inline Vector<Cmpt> z() const;
             inline Vector<Cmpt> vectorComponent(const direction) const;
 
-        //- Transpose
+        //- Return transpose
         inline Tensor<Cmpt> T() const;
 
+        //- Return inverse
+        inline Tensor<Cmpt> inv() const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index d08d91a969..85b33a4952 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -587,6 +587,13 @@ inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t)
 }
 
 
+template<class Cmpt>
+inline Tensor<Cmpt> Tensor<Cmpt>::inv() const
+{
+    return Foam::inv(*this);
+}
+
+
 //- Return the 1st invariant of a tensor
 template<class Cmpt>
 inline Cmpt invariantI(const Tensor<Cmpt>& t)

From ea1593477a67342720bbda901d7e7412960ecd94 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 7 Mar 2016 15:25:52 +0000
Subject: [PATCH 256/447] SRFWallVelocityFvPatchVectorField: New BC for walls
 rotating in the SRF

    Wall-velocity condition to be used in conjunction with the single rotating
    frame (SRF) model (see: FOAM::SRFModel)

    The condition applies the appropriate rotation transformation in time and
    space to determine the local SRF velocity of the wall.

        \f[
            U_p = - U_{p,srf}
        \f]

    where
    \vartable
        U_p     = patch velocity [m/s]
        U_{p,srf} = SRF velocity
    \endvartable

    The normal component of \f$ U_p \f$ is removed to ensure 0 wall-flux even
    if the wall patch faces are irregular.

    \heading Patch usage

    Example of the boundary condition specification:
    \verbatim
    myPatch
    {
        type            SRFWallVelocity;
        value           uniform (0 0 0);    // Initial value
    }
    \endverbatim
---
 src/finiteVolume/Make/files                   |   1 +
 .../SRFWallVelocityFvPatchVectorField.C       | 150 +++++++++++++
 .../SRFWallVelocityFvPatchVectorField.H       | 199 ++++++++++++++++++
 3 files changed, 350 insertions(+)
 create mode 100644 src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
 create mode 100644 src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.H

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index f94219df92..97295969b9 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -426,6 +426,7 @@ $(SRF)/SRFModel/SRFModel/SRFModel.C
 $(SRF)/SRFModel/SRFModel/SRFModelNew.C
 $(SRF)/SRFModel/rpm/rpm.C
 $(SRF)/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
+$(SRF)/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
 $(SRF)/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
 
 fvOptions = $(general)/fvOptions
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
new file mode 100644
index 0000000000..17c0dc700f
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
@@ -0,0 +1,150 @@
+/*---------------------------------------------------------------------------* \
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "SRFWallVelocityFvPatchVectorField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+
+#include "SRFModel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchVectorField(p, iF)
+{}
+
+
+Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField
+(
+    const SRFWallVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchVectorField(ptf, p, iF, mapper)
+{}
+
+
+Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchVectorField(p, iF)
+{
+    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+}
+
+
+Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField
+(
+    const SRFWallVelocityFvPatchVectorField& srfvpvf
+)
+:
+    fixedValueFvPatchVectorField(srfvpvf)
+{}
+
+
+Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField
+(
+    const SRFWallVelocityFvPatchVectorField& srfvpvf,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchVectorField(srfvpvf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::SRFWallVelocityFvPatchVectorField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    vectorField::autoMap(m);
+}
+
+
+void Foam::SRFWallVelocityFvPatchVectorField::rmap
+(
+    const fvPatchVectorField& ptf,
+    const labelList& addr
+)
+{
+    fixedValueFvPatchVectorField::rmap(ptf, addr);
+}
+
+
+void Foam::SRFWallVelocityFvPatchVectorField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Get reference to the SRF model
+    const SRF::SRFModel& srf =
+        db().lookupObject<SRF::SRFModel>("SRFProperties");
+
+    // Determine patch velocity due to SRF
+    const vectorField Up(-srf.velocity(patch().Cf()));
+
+    // Remove the component of Up normal to the wall
+    // just in case it is not exactly circular
+    const vectorField n(patch().nf());
+    vectorField::operator=(Up - n*(n & Up));
+
+    fixedValueFvPatchVectorField::updateCoeffs();
+}
+
+
+void Foam::SRFWallVelocityFvPatchVectorField::write(Ostream& os) const
+{
+    fvPatchVectorField::write(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchVectorField,
+        SRFWallVelocityFvPatchVectorField
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.H b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.H
new file mode 100644
index 0000000000..060898c65e
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.H
@@ -0,0 +1,199 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::SRFWallVelocityFvPatchVectorField
+
+Group
+    grpWallBoundaryConditions
+
+Description
+    Wall-velocity condition to be used in conjunction with the single rotating
+    frame (SRF) model (see: FOAM::SRFModel)
+
+    The condition applies the appropriate rotation transformation in time and
+    space to determine the local SRF velocity of the wall.
+
+        \f[
+            U_p = - U_{p,srf}
+        \f]
+
+    where
+    \vartable
+        U_p     = patch velocity [m/s]
+        U_{p,srf} = SRF velocity
+    \endvartable
+
+    The normal component of \f$ U_p \f$ is removed to ensure 0 wall-flux even
+    if the wall patch faces are irregular.
+
+    \heading Patch usage
+
+    Example of the boundary condition specification:
+    \verbatim
+    myPatch
+    {
+        type            SRFWallVelocity;
+        value           uniform (0 0 0);    // Initial value
+    }
+    \endverbatim
+
+SeeAlso
+    Foam::SRFModel
+    Foam::SRFVelocityFvPatchVectorField
+    Foam::fixedValueFvPatchField
+
+SourceFiles
+    SRFWallVelocityFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SRFWallVelocityFvPatchVectorField_H
+#define SRFWallVelocityFvPatchVectorField_H
+
+#include "fvPatchFields.H"
+#include "fixedValueFvPatchFields.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+               Class SRFWallVelocityFvPatchVectorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class SRFWallVelocityFvPatchVectorField
+:
+    public fixedValueFvPatchVectorField
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("SRFWallVelocity");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        SRFWallVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        SRFWallVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given SRFWallVelocityFvPatchVectorField
+        //  onto a new patch
+        SRFWallVelocityFvPatchVectorField
+        (
+            const SRFWallVelocityFvPatchVectorField&,
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        SRFWallVelocityFvPatchVectorField
+        (
+            const SRFWallVelocityFvPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new SRFWallVelocityFvPatchVectorField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        SRFWallVelocityFvPatchVectorField
+        (
+            const SRFWallVelocityFvPatchVectorField&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
+        (
+            const DimensionedField<vector, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new SRFWallVelocityFvPatchVectorField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const fvPatchFieldMapper&
+            );
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchVectorField&,
+                const labelList&
+            );
+
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 8a93701ef281d13060f3c9078bcaa7a4edcbb24d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 7 Mar 2016 15:27:01 +0000
Subject: [PATCH 257/447] simpleFoam, SRFSimpleFoam: Added momentumPredictor
 option

---
 .../incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H      | 7 +++++--
 applications/solvers/incompressible/simpleFoam/UEqn.H      | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H
index 6a2070eb4e..5e1b141030 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H
@@ -14,6 +14,9 @@
 
     fvOptions.constrain(UrelEqn);
 
-    solve(UrelEqn == -fvc::grad(p));
+    if (simple.momentumPredictor())
+    {
+        solve(UrelEqn == -fvc::grad(p));
 
-    fvOptions.correct(Urel);
+        fvOptions.correct(Urel);
+    }
diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H
index 31c081792c..81e83b55d7 100644
--- a/applications/solvers/incompressible/simpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/UEqn.H
@@ -16,6 +16,9 @@
 
     fvOptions.constrain(UEqn);
 
-    solve(UEqn == -fvc::grad(p));
+    if (simple.momentumPredictor())
+    {
+        solve(UEqn == -fvc::grad(p));
 
-    fvOptions.correct(U);
+        fvOptions.correct(U);
+    }

From 93285d5fe197d64db9e467c03fec88e10e9b666e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 8 Mar 2016 10:57:41 +0000
Subject: [PATCH 258/447] src/OpenFOAM/primitives: Moved the standard static
 data members for vector and tensor types into VectorSpace

This simplifies the code easing maintenance and the addition of other
VectorSpace types.
---
 .../primitives/DiagTensor/DiagTensor.H        | 16 ++--
 .../primitives/DiagTensor/DiagTensorI.H       | 32 +++----
 .../DiagTensor/diagTensor/diagTensor.C        | 46 +++++++---
 src/OpenFOAM/primitives/Scalar/Scalar.C       |  4 +-
 src/OpenFOAM/primitives/Scalar/Scalar.H       |  4 +-
 .../SphericalTensor/SphericalTensor.H         |  8 +-
 .../SphericalTensor/SphericalTensorI.H        | 25 +++---
 .../labelSphericalTensor.C                    | 54 +++++++++---
 .../sphericalTensor/sphericalTensor.C         | 49 +++++++----
 .../SphericalTensor2D/SphericalTensor2D.H     |  8 +-
 .../SphericalTensor2D/SphericalTensor2DI.H    | 26 +++---
 .../sphericalTensor2D/sphericalTensor2D.C     | 56 ++++++++----
 .../primitives/SymmTensor/SymmTensor.H        |  9 +-
 .../primitives/SymmTensor/SymmTensorI.H       | 47 +++++-----
 .../labelSymmTensor/labelSymmTensor.C         | 57 ++++++++----
 .../SymmTensor/symmTensor/symmTensor.C        | 53 ++++++------
 .../primitives/SymmTensor2D/SymmTensor2D.H    |  9 +-
 .../primitives/SymmTensor2D/SymmTensor2DI.H   | 39 +++++----
 .../SymmTensor2D/symmTensor2D/symmTensor2D.C  | 49 ++++++-----
 src/OpenFOAM/primitives/Tensor/Tensor.H       |  7 --
 src/OpenFOAM/primitives/Tensor/TensorI.H      | 86 ++++++++++---------
 .../Tensor/labelTensor/labelTensor.C          | 69 +++++++++------
 .../primitives/Tensor/tensor/tensor.C         | 77 +++++++----------
 src/OpenFOAM/primitives/Tensor2D/Tensor2D.H   | 13 ++-
 src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H  | 52 +++++------
 .../primitives/Tensor2D/tensor2D/tensor2D.C   | 36 +++++---
 src/OpenFOAM/primitives/Vector/Vector.H       | 14 +--
 src/OpenFOAM/primitives/Vector/VectorI.H      | 47 +++++-----
 .../Vector/complexVector/complexVector.C      | 51 +++++++----
 .../Vector/floatVector/floatVector.C          | 57 ++++++------
 .../Vector/labelVector/labelVector.C          | 53 +++++++++---
 .../primitives/Vector/vector/vector.C         | 26 ++----
 src/OpenFOAM/primitives/Vector2D/Vector2D.H   | 16 ++--
 src/OpenFOAM/primitives/Vector2D/Vector2DI.H  | 33 ++++---
 .../primitives/Vector2D/vector2D/vector2D.C   | 44 +++++++---
 .../primitives/VectorSpace/VectorSpace.H      | 23 ++++-
 .../primitives/VectorSpace/VectorSpaceI.H     | 16 ++--
 src/OpenFOAM/primitives/bools/bool/bool.C     |  4 +-
 src/OpenFOAM/primitives/bools/bool/bool.H     |  4 +-
 src/OpenFOAM/primitives/ints/int32/int32.C    |  4 +-
 src/OpenFOAM/primitives/ints/int32/int32.H    |  4 +-
 src/OpenFOAM/primitives/ints/int64/int64.C    |  4 +-
 src/OpenFOAM/primitives/ints/int64/int64.H    |  4 +-
 src/OpenFOAM/primitives/ints/uint32/uint32.C  |  4 +-
 src/OpenFOAM/primitives/ints/uint32/uint32.H  |  4 +-
 src/OpenFOAM/primitives/ints/uint64/uint64.C  |  4 +-
 src/OpenFOAM/primitives/ints/uint64/uint64.H  |  4 +-
 src/OpenFOAM/primitives/triad/triad.C         | 61 ++++++-------
 src/OpenFOAM/primitives/triad/triad.H         |  8 +-
 49 files changed, 771 insertions(+), 649 deletions(-)

diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
index 2d64825ed7..0a2138cea4 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,6 +58,10 @@ class DiagTensor
 
 public:
 
+    //- Equivalent type of labels used for valid component indexing
+    typedef DiagTensor<label> labelType;
+
+
     // Member constants
 
         enum
@@ -66,16 +70,6 @@ public:
         };
 
 
-    // Static data members
-
-        static const char* const typeName;
-        static const char* componentNames[];
-        static const DiagTensor zero;
-        static const DiagTensor one;
-        static const DiagTensor max;
-        static const DiagTensor min;
-
-
     //- Component labeling enumeration
     enum components { XX, YY, ZZ };
 
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
index 63497e7a24..49ed7b8998 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,21 +26,16 @@ License
 #include "SphericalTensor.H"
 #include "SymmTensor.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline DiagTensor<Cmpt>::DiagTensor()
+inline Foam::DiagTensor<Cmpt>::DiagTensor()
 {}
 
 
 template<class Cmpt>
 template<class Cmpt2>
-inline DiagTensor<Cmpt>::DiagTensor
+inline Foam::DiagTensor<Cmpt>::DiagTensor
 (
     const VectorSpace<DiagTensor<Cmpt2>, Cmpt2, 3>& vs
 )
@@ -50,7 +45,7 @@ inline DiagTensor<Cmpt>::DiagTensor
 
 
 template<class Cmpt>
-inline DiagTensor<Cmpt>::DiagTensor
+inline Foam::DiagTensor<Cmpt>::DiagTensor
 (
     const Cmpt& vxx,
     const Cmpt& vyy,
@@ -64,7 +59,7 @@ inline DiagTensor<Cmpt>::DiagTensor
 
 
 template<class Cmpt>
-inline DiagTensor<Cmpt>::DiagTensor(Istream& is)
+inline Foam::DiagTensor<Cmpt>::DiagTensor(Istream& is)
 :
     VectorSpace<DiagTensor<Cmpt>, Cmpt, 3>(is)
 {}
@@ -73,43 +68,48 @@ inline DiagTensor<Cmpt>::DiagTensor(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline const Cmpt&  DiagTensor<Cmpt>::xx() const
+inline const Cmpt& Foam::DiagTensor<Cmpt>::xx() const
 {
     return this->v_[XX];
 }
 
 template<class Cmpt>
-inline const Cmpt&  DiagTensor<Cmpt>::yy() const
+inline const Cmpt& Foam::DiagTensor<Cmpt>::yy() const
 {
     return this->v_[YY];
 }
 
 template<class Cmpt>
-inline const Cmpt&  DiagTensor<Cmpt>::zz() const
+inline const Cmpt& Foam::DiagTensor<Cmpt>::zz() const
 {
     return this->v_[ZZ];
 }
 
 
 template<class Cmpt>
-inline Cmpt& DiagTensor<Cmpt>::xx()
+inline Cmpt& Foam::DiagTensor<Cmpt>::xx()
 {
     return this->v_[XX];
 }
 
 template<class Cmpt>
-inline Cmpt& DiagTensor<Cmpt>::yy()
+inline Cmpt& Foam::DiagTensor<Cmpt>::yy()
 {
     return this->v_[YY];
 }
 
 template<class Cmpt>
-inline Cmpt& DiagTensor<Cmpt>::zz()
+inline Cmpt& Foam::DiagTensor<Cmpt>::zz()
 {
     return this->v_[ZZ];
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
diff --git a/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.C b/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.C
index f5fe69dedc..bcc9c1af3d 100644
--- a/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.C
+++ b/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,34 +28,52 @@ Description
 
 #include "diagTensor.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const diagTensor::typeName = "diagTensor";
+const char* const Foam::diagTensor::vsType::typeName = "diagTensor";
 
 template<>
-const char* diagTensor::componentNames[] = {"xx", "yy", "zz"};
+const char* const Foam::diagTensor::vsType::componentNames[] =
+{
+    "xx", "yy", "zz"
+};
 
 template<>
-const diagTensor diagTensor::zero(0, 0, 0);
+const Foam::diagTensor Foam::diagTensor::vsType::vsType::zero
+(
+    diagTensor::uniform(0)
+);
 
 template<>
-const diagTensor diagTensor::one(1, 1, 1);
+const Foam::diagTensor Foam::diagTensor::vsType::one
+(
+    diagTensor::uniform(1)
+);
 
 template<>
-const diagTensor diagTensor::max(VGREAT, VGREAT, VGREAT);
+const Foam::diagTensor Foam::diagTensor::vsType::max
+(
+    diagTensor::uniform(VGREAT)
+);
 
 template<>
-const diagTensor diagTensor::min(-VGREAT, -VGREAT, -VGREAT);
+const Foam::diagTensor Foam::diagTensor::vsType::min
+(
+    diagTensor::uniform(-VGREAT)
+);
 
+template<>
+const Foam::diagTensor Foam::diagTensor::vsType::rootMax
+(
+    diagTensor::uniform(ROOTVGREAT)
+);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+const Foam::diagTensor Foam::diagTensor::vsType::rootMin
+(
+    diagTensor::uniform(-ROOTVGREAT)
+);
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.C b/src/OpenFOAM/primitives/Scalar/Scalar.C
index 05db9a2d80..0a3e09b0b1 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.C
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ const Scalar pTraits<Scalar>::max = ScalarVGREAT;
 const Scalar pTraits<Scalar>::rootMin = -ScalarROOTVGREAT;
 const Scalar pTraits<Scalar>::rootMax = ScalarROOTVGREAT;
 
-const char* pTraits<Scalar>::componentNames[] = { "" };
+const char* const pTraits<Scalar>::componentNames[] = { "" };
 
 pTraits<Scalar>::pTraits(const Scalar& p)
 :
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index c25a92b209..54b8ec5785 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ public:
     // Static data members
 
         static const char* const typeName;
-        static const char* componentNames[];
+        static const char* const componentNames[];
         static const Scalar zero;
         static const Scalar one;
         static const Scalar max;
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
index a2bb56e3f4..cd16d3026e 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,12 +70,6 @@ public:
 
     // Static data members
 
-        static const char* const typeName;
-        static const char* componentNames[];
-        static const SphericalTensor zero;
-        static const SphericalTensor one;
-        static const SphericalTensor max;
-        static const SphericalTensor min;
         static const SphericalTensor I;
         static const SphericalTensor oneThirdI;
         static const SphericalTensor twoThirdsI;
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
index c22f547895..409b3961b2 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
@@ -25,21 +25,16 @@ License
 
 #include "Vector.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline SphericalTensor<Cmpt>::SphericalTensor()
+inline Foam::SphericalTensor<Cmpt>::SphericalTensor()
 {}
 
 
 template<class Cmpt>
 template<class Cmpt2>
-inline SphericalTensor<Cmpt>::SphericalTensor
+inline Foam::SphericalTensor<Cmpt>::SphericalTensor
 (
     const VectorSpace<SphericalTensor<Cmpt2>, Cmpt2, 1>& vs
 )
@@ -49,14 +44,14 @@ inline SphericalTensor<Cmpt>::SphericalTensor
 
 
 template<class Cmpt>
-inline SphericalTensor<Cmpt>::SphericalTensor(const Cmpt& stii)
+inline Foam::SphericalTensor<Cmpt>::SphericalTensor(const Cmpt& stii)
 {
     this->v_[II] = stii;
 }
 
 
 template<class Cmpt>
-inline SphericalTensor<Cmpt>::SphericalTensor(Istream& is)
+inline Foam::SphericalTensor<Cmpt>::SphericalTensor(Istream& is)
 :
     VectorSpace<SphericalTensor<Cmpt>, Cmpt, 1>(is)
 {}
@@ -65,26 +60,32 @@ inline SphericalTensor<Cmpt>::SphericalTensor(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline const Cmpt&  SphericalTensor<Cmpt>::ii() const
+inline const Cmpt& Foam::SphericalTensor<Cmpt>::ii() const
 {
     return this->v_[II];
 }
 
 
 template<class Cmpt>
-inline Cmpt& SphericalTensor<Cmpt>::ii()
+inline Cmpt& Foam::SphericalTensor<Cmpt>::ii()
 {
     return this->v_[II];
 }
 
 
 template<class Cmpt>
-inline const SphericalTensor<Cmpt>& SphericalTensor<Cmpt>::T() const
+inline const Foam::SphericalTensor<Cmpt>&
+Foam::SphericalTensor<Cmpt>::T() const
 {
     return *this;
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Inner-product between two spherical tensors
diff --git a/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.C b/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.C
index 59f01c6192..c7ce40447f 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.C
+++ b/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,31 +25,59 @@ License
 
 #include "labelSphericalTensor.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const labelSphericalTensor::typeName = "labelSphericalTensor";
+const char* const Foam::labelSphericalTensor::vsType::typeName
+(
+    "labelSphericalTensor"
+);
 
 template<>
-const char* labelSphericalTensor::componentNames[] = {"ii"};
+const char* const Foam::labelSphericalTensor::vsType::componentNames[] =
+{
+    "ii"
+};
 
 template<>
-const labelSphericalTensor labelSphericalTensor::zero(0);
+const Foam::labelSphericalTensor
+Foam::labelSphericalTensor::vsType::vsType::zero
+(
+    labelSphericalTensor::uniform(0)
+);
 
 template<>
-const labelSphericalTensor labelSphericalTensor::one(1);
+const Foam::labelSphericalTensor Foam::labelSphericalTensor::vsType::one
+(
+    labelSphericalTensor::uniform(1)
+);
 
 template<>
-const labelSphericalTensor labelSphericalTensor::I(1);
+const Foam::labelSphericalTensor Foam::labelSphericalTensor::vsType::max
+(
+    labelSphericalTensor::uniform(labelMax)
+);
 
+template<>
+const Foam::labelSphericalTensor Foam::labelSphericalTensor::vsType::min
+(
+    labelSphericalTensor::uniform(-labelMax)
+);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+const Foam::labelSphericalTensor Foam::labelSphericalTensor::vsType::rootMax
+(
+    labelSphericalTensor::uniform(sqrt(scalar(labelMax)))
+);
+
+template<>
+const Foam::labelSphericalTensor Foam::labelSphericalTensor::vsType::rootMin
+(
+    labelSphericalTensor::uniform(-sqrt(scalar(labelMax)))
+);
+
+template<>
+const Foam::labelSphericalTensor Foam::labelSphericalTensor::I(1);
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.C b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.C
index b5d3bc59fc..826fb0cc22 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.C
+++ b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,42 +25,57 @@ License
 
 #include "sphericalTensor.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const sphericalTensor::typeName = "sphericalTensor";
+const char* const Foam::sphericalTensor::vsType::typeName = "sphericalTensor";
 
 template<>
-const char* sphericalTensor::componentNames[] = {"ii"};
+const char* const Foam::sphericalTensor::vsType::componentNames[] = {"ii"};
 
 template<>
-const sphericalTensor sphericalTensor::zero(0);
+const Foam::sphericalTensor Foam::sphericalTensor::vsType::zero
+(
+    sphericalTensor::uniform(0)
+);
 
 template<>
-const sphericalTensor sphericalTensor::one(1);
+const Foam::sphericalTensor Foam::sphericalTensor::vsType::one
+(
+    sphericalTensor::uniform(1)
+);
 
 template<>
-const sphericalTensor sphericalTensor::max(VGREAT);
+const Foam::sphericalTensor Foam::sphericalTensor::vsType::max
+(
+    sphericalTensor::uniform(VGREAT)
+);
 
 template<>
-const sphericalTensor sphericalTensor::min(-VGREAT);
+const Foam::sphericalTensor Foam::sphericalTensor::vsType::min
+(
+    sphericalTensor::uniform(-VGREAT)
+);
 
 template<>
-const sphericalTensor sphericalTensor::I(1);
+const Foam::sphericalTensor Foam::sphericalTensor::vsType::rootMax
+(
+    sphericalTensor::uniform(ROOTVGREAT)
+);
 
 template<>
-const sphericalTensor sphericalTensor::oneThirdI(1.0/3.0);
+const Foam::sphericalTensor Foam::sphericalTensor::vsType::rootMin
+(
+    sphericalTensor::uniform(-ROOTVGREAT)
+);
 
 template<>
-const sphericalTensor sphericalTensor::twoThirdsI(2.0/3.0);
+const Foam::sphericalTensor Foam::sphericalTensor::I(1);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+const Foam::sphericalTensor Foam::sphericalTensor::oneThirdI(1.0/3.0);
 
-} // End namespace Foam
+template<>
+const Foam::sphericalTensor Foam::sphericalTensor::twoThirdsI(2.0/3.0);
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
index 0ecae53a58..474777c1c3 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,12 +66,6 @@ public:
 
     // Static data members
 
-        static const char* const typeName;
-        static const char* componentNames[];
-        static const SphericalTensor2D zero;
-        static const SphericalTensor2D one;
-        static const SphericalTensor2D max;
-        static const SphericalTensor2D min;
         static const SphericalTensor2D I;
         static const SphericalTensor2D oneThirdI;
         static const SphericalTensor2D twoThirdsI;
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
index 18bf88f0a5..9a8b6daff7 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
@@ -25,22 +25,15 @@ License
 
 #include "Vector2D.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct null
 template<class Cmpt>
-inline SphericalTensor2D<Cmpt>::SphericalTensor2D()
+inline Foam::SphericalTensor2D<Cmpt>::SphericalTensor2D()
 {}
 
 
-// Construct given VectorSpace
 template<class Cmpt>
-inline SphericalTensor2D<Cmpt>::SphericalTensor2D
+inline Foam::SphericalTensor2D<Cmpt>::SphericalTensor2D
 (
     const VectorSpace<SphericalTensor2D<Cmpt>, Cmpt, 1>& vs
 )
@@ -49,17 +42,15 @@ inline SphericalTensor2D<Cmpt>::SphericalTensor2D
 {}
 
 
-// Construct given three Cmpts
 template<class Cmpt>
-inline SphericalTensor2D<Cmpt>::SphericalTensor2D(const Cmpt& stii)
+inline Foam::SphericalTensor2D<Cmpt>::SphericalTensor2D(const Cmpt& stii)
 {
     this->v_[II] = stii;
 }
 
 
-// Construct from Istream
 template<class Cmpt>
-inline SphericalTensor2D<Cmpt>::SphericalTensor2D(Istream& is)
+inline Foam::SphericalTensor2D<Cmpt>::SphericalTensor2D(Istream& is)
 :
     VectorSpace<SphericalTensor2D<Cmpt>, Cmpt, 1>(is)
 {}
@@ -68,19 +59,24 @@ inline SphericalTensor2D<Cmpt>::SphericalTensor2D(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline const Cmpt&  SphericalTensor2D<Cmpt>::ii() const
+inline const Cmpt& Foam::SphericalTensor2D<Cmpt>::ii() const
 {
     return this->v_[II];
 }
 
 
 template<class Cmpt>
-inline Cmpt& SphericalTensor2D<Cmpt>::ii()
+inline Cmpt& Foam::SphericalTensor2D<Cmpt>::ii()
 {
     return this->v_[II];
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Inner-product between two spherical tensors
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C b/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C
index c8c597f32c..538e9d437f 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,42 +25,64 @@ License
 
 #include "sphericalTensor2D.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const sphericalTensor2D::typeName = "sphericalTensor2D";
+const char* const Foam::sphericalTensor2D::vsType::typeName
+(
+    "sphericalTensor2D"
+);
 
 template<>
-const char* sphericalTensor2D::componentNames[] = {"ii"};
+const char* const Foam::sphericalTensor2D::vsType::componentNames[] =
+{
+    "ii"
+};
 
 template<>
-const sphericalTensor2D sphericalTensor2D::zero(0);
+const Foam::sphericalTensor2D Foam::sphericalTensor2D::vsType::vsType::zero
+(
+    sphericalTensor2D::uniform(0)
+);
 
 template<>
-const sphericalTensor2D sphericalTensor2D::one(1);
+const Foam::sphericalTensor2D Foam::sphericalTensor2D::vsType::one
+(
+    sphericalTensor2D::uniform(1)
+);
 
 template<>
-const sphericalTensor2D sphericalTensor2D::max(VGREAT);
+const Foam::sphericalTensor2D Foam::sphericalTensor2D::vsType::max
+(
+    sphericalTensor2D::uniform(VGREAT)
+);
 
 template<>
-const sphericalTensor2D sphericalTensor2D::min(-VGREAT);
+const Foam::sphericalTensor2D Foam::sphericalTensor2D::vsType::min
+(
+    sphericalTensor2D::uniform(-VGREAT)
+);
 
 template<>
-const sphericalTensor2D sphericalTensor2D::I(1);
+const Foam::sphericalTensor2D Foam::sphericalTensor2D::vsType::rootMax
+(
+    sphericalTensor2D::uniform(ROOTVGREAT)
+);
 
 template<>
-const sphericalTensor2D sphericalTensor2D::oneThirdI(1.0/3.0);
+const Foam::sphericalTensor2D Foam::sphericalTensor2D::vsType::rootMin
+(
+    sphericalTensor2D::uniform(-ROOTVGREAT)
+);
 
 template<>
-const sphericalTensor2D sphericalTensor2D::twoThirdsI(2.0/3.0);
+const Foam::sphericalTensor2D Foam::sphericalTensor2D::I(1);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+const Foam::sphericalTensor2D Foam::sphericalTensor2D::oneThirdI(1.0/3.0);
+
+template<>
+const Foam::sphericalTensor2D Foam::sphericalTensor2D::twoThirdsI(2.0/3.0);
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index afa1dbb622..952536ac8c 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,13 +72,6 @@ public:
 
     // Static data members
 
-        static const char* const typeName;
-        static const char* componentNames[];
-
-        static const SymmTensor zero;
-        static const SymmTensor one;
-        static const SymmTensor max;
-        static const SymmTensor min;
         static const SymmTensor I;
 
 
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index b0e64c9009..6caa6aec26 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -26,21 +26,16 @@ License
 #include "Vector.H"
 #include "Tensor.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline SymmTensor<Cmpt>::SymmTensor()
+inline Foam::SymmTensor<Cmpt>::SymmTensor()
 {}
 
 
 template<class Cmpt>
 template<class Cmpt2>
-inline SymmTensor<Cmpt>::SymmTensor
+inline Foam::SymmTensor<Cmpt>::SymmTensor
 (
     const VectorSpace<SymmTensor<Cmpt2>, Cmpt2, 6>& vs
 )
@@ -50,7 +45,7 @@ inline SymmTensor<Cmpt>::SymmTensor
 
 
 template<class Cmpt>
-inline SymmTensor<Cmpt>::SymmTensor(const SphericalTensor<Cmpt>& st)
+inline Foam::SymmTensor<Cmpt>::SymmTensor(const SphericalTensor<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0;       this->v_[XZ] = 0;
                             this->v_[YY] = st.ii(); this->v_[YZ] = 0;
@@ -59,7 +54,7 @@ inline SymmTensor<Cmpt>::SymmTensor(const SphericalTensor<Cmpt>& st)
 
 
 template<class Cmpt>
-inline SymmTensor<Cmpt>::SymmTensor
+inline Foam::SymmTensor<Cmpt>::SymmTensor
 (
     const Cmpt txx, const Cmpt txy, const Cmpt txz,
                     const Cmpt tyy, const Cmpt tyz,
@@ -73,7 +68,7 @@ inline SymmTensor<Cmpt>::SymmTensor
 
 
 template<class Cmpt>
-inline SymmTensor<Cmpt>::SymmTensor(Istream& is)
+inline Foam::SymmTensor<Cmpt>::SymmTensor(Istream& is)
 :
     VectorSpace<SymmTensor<Cmpt>, Cmpt, 6>(is)
 {}
@@ -82,81 +77,81 @@ inline SymmTensor<Cmpt>::SymmTensor(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline const Cmpt&  SymmTensor<Cmpt>::xx() const
+inline const Cmpt& Foam::SymmTensor<Cmpt>::xx() const
 {
     return this->v_[XX];
 }
 
 template<class Cmpt>
-inline const Cmpt&  SymmTensor<Cmpt>::xy() const
+inline const Cmpt& Foam::SymmTensor<Cmpt>::xy() const
 {
     return this->v_[XY];
 }
 
 template<class Cmpt>
-inline const Cmpt&  SymmTensor<Cmpt>::xz() const
+inline const Cmpt& Foam::SymmTensor<Cmpt>::xz() const
 {
     return this->v_[XZ];
 }
 
 template<class Cmpt>
-inline const Cmpt&  SymmTensor<Cmpt>::yy() const
+inline const Cmpt& Foam::SymmTensor<Cmpt>::yy() const
 {
     return this->v_[YY];
 }
 
 template<class Cmpt>
-inline const Cmpt&  SymmTensor<Cmpt>::yz() const
+inline const Cmpt& Foam::SymmTensor<Cmpt>::yz() const
 {
     return this->v_[YZ];
 }
 
 template<class Cmpt>
-inline const Cmpt&  SymmTensor<Cmpt>::zz() const
+inline const Cmpt& Foam::SymmTensor<Cmpt>::zz() const
 {
     return this->v_[ZZ];
 }
 
 
 template<class Cmpt>
-inline Cmpt& SymmTensor<Cmpt>::xx()
+inline Cmpt& Foam::SymmTensor<Cmpt>::xx()
 {
     return this->v_[XX];
 }
 
 template<class Cmpt>
-inline Cmpt& SymmTensor<Cmpt>::xy()
+inline Cmpt& Foam::SymmTensor<Cmpt>::xy()
 {
     return this->v_[XY];
 }
 
 template<class Cmpt>
-inline Cmpt& SymmTensor<Cmpt>::xz()
+inline Cmpt& Foam::SymmTensor<Cmpt>::xz()
 {
     return this->v_[XZ];
 }
 
 template<class Cmpt>
-inline Cmpt& SymmTensor<Cmpt>::yy()
+inline Cmpt& Foam::SymmTensor<Cmpt>::yy()
 {
     return this->v_[YY];
 }
 
 template<class Cmpt>
-inline Cmpt& SymmTensor<Cmpt>::yz()
+inline Cmpt& Foam::SymmTensor<Cmpt>::yz()
 {
     return this->v_[YZ];
 }
 
 template<class Cmpt>
-inline Cmpt& SymmTensor<Cmpt>::zz()
+inline Cmpt& Foam::SymmTensor<Cmpt>::zz()
 {
     return this->v_[ZZ];
 }
 
 
 template<class Cmpt>
-inline const SymmTensor<Cmpt>& SymmTensor<Cmpt>::T() const
+inline const Foam::SymmTensor<Cmpt>& Foam::SymmTensor<Cmpt>::T() const
 {
     return *this;
 }
@@ -165,7 +160,7 @@ inline const SymmTensor<Cmpt>& SymmTensor<Cmpt>::T() const
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline void SymmTensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
+inline void Foam::SymmTensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0;       this->v_[XZ] = 0;
                             this->v_[YY] = st.ii(); this->v_[YZ] = 0;
@@ -173,6 +168,10 @@ inline void SymmTensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.C b/src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.C
index 0e5deb2705..ea20917f26 100644
--- a/src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.C
+++ b/src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,18 +25,13 @@ License
 
 #include "labelSymmTensor.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const labelSymmTensor::typeName = "labelSymmTensor";
+const char* const Foam::labelSymmTensor::vsType::typeName = "labelSymmTensor";
 
 template<>
-const char* labelSymmTensor::componentNames[] =
+const char* const Foam::labelSymmTensor::vsType::componentNames[] =
 {
     "xx", "xy", "xz",
           "yy", "yz",
@@ -44,24 +39,48 @@ const char* labelSymmTensor::componentNames[] =
 };
 
 template<>
-const labelSymmTensor labelSymmTensor::zero
+const Foam::labelSymmTensor Foam::labelSymmTensor::vsType::vsType::zero
 (
-    0, 0, 0,
-       0, 0,
-          0
+    labelSymmTensor::uniform(0)
 );
 
 template<>
-const labelSymmTensor labelSymmTensor::one
+const Foam::labelSymmTensor Foam::labelSymmTensor::vsType::one
 (
-    1, 1, 1,
-       1, 1,
+    labelSymmTensor::uniform(1)
+);
+
+template<>
+const Foam::labelSymmTensor Foam::labelSymmTensor::vsType::max
+(
+    labelSymmTensor::uniform(labelMax)
+);
+
+template<>
+const Foam::labelSymmTensor Foam::labelSymmTensor::vsType::min
+(
+    labelSymmTensor::uniform(-labelMax)
+);
+
+template<>
+const Foam::labelSymmTensor Foam::labelSymmTensor::vsType::rootMax
+(
+    labelSymmTensor::uniform(sqrt(scalar(labelMax)))
+);
+
+template<>
+const Foam::labelSymmTensor Foam::labelSymmTensor::vsType::rootMin
+(
+    labelSymmTensor::uniform(-sqrt(scalar(labelMax)))
+);
+
+template<>
+const Foam::labelSymmTensor Foam::labelSymmTensor::I
+(
+    1, 0, 0,
+       1, 0,
           1
 );
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
index 22f2b9eb8d..cc5b6975e0 100644
--- a/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
+++ b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,18 +25,13 @@ License
 
 #include "symmTensor.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const symmTensor::typeName = "symmTensor";
+const char* const Foam::symmTensor::vsType::typeName = "symmTensor";
 
 template<>
-const char* symmTensor::componentNames[] =
+const char* const Foam::symmTensor::vsType::componentNames[] =
 {
     "xx", "xy", "xz",
           "yy", "yz",
@@ -44,39 +39,43 @@ const char* symmTensor::componentNames[] =
 };
 
 template<>
-const symmTensor symmTensor::zero
+const Foam::symmTensor Foam::symmTensor::vsType::vsType::zero
 (
-    0, 0, 0,
-       0, 0,
-          0
+    symmTensor::uniform(0)
 );
 
 template<>
-const symmTensor symmTensor::one
+const Foam::symmTensor Foam::symmTensor::vsType::one
 (
-    1, 1, 1,
-       1, 1,
-          1
+    symmTensor::uniform(1)
 );
 
 template<>
-const symmTensor symmTensor::max
+const Foam::symmTensor Foam::symmTensor::vsType::max
 (
-    VGREAT, VGREAT, VGREAT,
-            VGREAT, VGREAT,
-                    VGREAT
+    symmTensor::uniform(VGREAT)
 );
 
 template<>
-const symmTensor symmTensor::min
+const Foam::symmTensor Foam::symmTensor::vsType::min
 (
-    -VGREAT, -VGREAT, -VGREAT,
-             -VGREAT, -VGREAT,
-                      -VGREAT
+    symmTensor::uniform(-VGREAT)
 );
 
 template<>
-const symmTensor symmTensor::I
+const Foam::symmTensor Foam::symmTensor::vsType::rootMax
+(
+    symmTensor::uniform(ROOTVGREAT)
+);
+
+template<>
+const Foam::symmTensor Foam::symmTensor::vsType::rootMin
+(
+    symmTensor::uniform(-ROOTVGREAT)
+);
+
+template<>
+const Foam::symmTensor Foam::symmTensor::I
 (
     1, 0, 0,
        1, 0,
@@ -84,8 +83,4 @@ const symmTensor symmTensor::I
 );
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
index 550e9bfec0..1d747caa2d 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,13 +72,6 @@ public:
 
     // 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;
 
 
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
index 2212a6f13d..674a6a6975 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
@@ -26,20 +26,15 @@ License
 #include "Vector2D.H"
 #include "Tensor2D.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline SymmTensor2D<Cmpt>::SymmTensor2D()
+inline Foam::SymmTensor2D<Cmpt>::SymmTensor2D()
 {}
 
 
 template<class Cmpt>
-inline SymmTensor2D<Cmpt>::SymmTensor2D
+inline Foam::SymmTensor2D<Cmpt>::SymmTensor2D
 (
     const VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>& vs
 )
@@ -49,7 +44,7 @@ inline SymmTensor2D<Cmpt>::SymmTensor2D
 
 
 template<class Cmpt>
-inline SymmTensor2D<Cmpt>::SymmTensor2D(const SphericalTensor2D<Cmpt>& st)
+inline Foam::SymmTensor2D<Cmpt>::SymmTensor2D(const SphericalTensor2D<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0;
                             this->v_[YY] = st.ii();
@@ -57,7 +52,7 @@ inline SymmTensor2D<Cmpt>::SymmTensor2D(const SphericalTensor2D<Cmpt>& st)
 
 
 template<class Cmpt>
-inline SymmTensor2D<Cmpt>::SymmTensor2D
+inline Foam::SymmTensor2D<Cmpt>::SymmTensor2D
 (
     const Cmpt txx, const Cmpt txy,
                     const Cmpt tyy
@@ -69,7 +64,7 @@ inline SymmTensor2D<Cmpt>::SymmTensor2D
 
 
 template<class Cmpt>
-inline SymmTensor2D<Cmpt>::SymmTensor2D(Istream& is)
+inline Foam::SymmTensor2D<Cmpt>::SymmTensor2D(Istream& is)
 :
     VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>(is)
 {}
@@ -78,45 +73,45 @@ inline SymmTensor2D<Cmpt>::SymmTensor2D(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline const Cmpt& SymmTensor2D<Cmpt>::xx() const
+inline const Cmpt& Foam::SymmTensor2D<Cmpt>::xx() const
 {
     return this->v_[XX];
 }
 
 template<class Cmpt>
-inline const Cmpt& SymmTensor2D<Cmpt>::xy() const
+inline const Cmpt& Foam::SymmTensor2D<Cmpt>::xy() const
 {
     return this->v_[XY];
 }
 
 template<class Cmpt>
-inline const Cmpt& SymmTensor2D<Cmpt>::yy() const
+inline const Cmpt& Foam::SymmTensor2D<Cmpt>::yy() const
 {
     return this->v_[YY];
 }
 
 
 template<class Cmpt>
-inline Cmpt& SymmTensor2D<Cmpt>::xx()
+inline Cmpt& Foam::SymmTensor2D<Cmpt>::xx()
 {
     return this->v_[XX];
 }
 
 template<class Cmpt>
-inline Cmpt& SymmTensor2D<Cmpt>::xy()
+inline Cmpt& Foam::SymmTensor2D<Cmpt>::xy()
 {
     return this->v_[XY];
 }
 
 template<class Cmpt>
-inline Cmpt& SymmTensor2D<Cmpt>::yy()
+inline Cmpt& Foam::SymmTensor2D<Cmpt>::yy()
 {
     return this->v_[YY];
 }
 
 
 template<class Cmpt>
-inline const SymmTensor2D<Cmpt>& SymmTensor2D<Cmpt>::T() const
+inline const Foam::SymmTensor2D<Cmpt>& Foam::SymmTensor2D<Cmpt>::T() const
 {
     return *this;
 }
@@ -125,13 +120,21 @@ inline const SymmTensor2D<Cmpt>& SymmTensor2D<Cmpt>::T() const
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline void SymmTensor2D<Cmpt>::operator=(const SphericalTensor2D<Cmpt>& st)
+inline void Foam::SymmTensor2D<Cmpt>::operator=
+(
+    const SphericalTensor2D<Cmpt>& st
+)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0;
                             this->v_[YY] = st.ii();
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Inner-product between two symmetric tensors
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C b/src/OpenFOAM/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C
index 32f6d9ca6a..f2d870261b 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C
+++ b/src/OpenFOAM/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,61 +25,60 @@ License
 
 #include "symmTensor2D.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const symmTensor2D::typeName = "symmTensor2D";
+const char* const Foam::symmTensor2D::vsType::typeName = "symmTensor2D";
 
 template<>
-const char* symmTensor2D::componentNames[] =
+const char* const Foam::symmTensor2D::vsType::componentNames[] =
 {
     "xx", "xy",
           "yy"
 };
 
 template<>
-const symmTensor2D symmTensor2D::zero
+const Foam::symmTensor2D Foam::symmTensor2D::vsType::vsType::zero
 (
-    0, 0,
-       0
+    symmTensor2D::uniform(0)
 );
 
 template<>
-const symmTensor2D symmTensor2D::one
+const Foam::symmTensor2D Foam::symmTensor2D::vsType::one
 (
-    1, 1,
-       1
+    symmTensor2D::uniform(1)
 );
 
 template<>
-const symmTensor2D symmTensor2D::max
+const Foam::symmTensor2D Foam::symmTensor2D::vsType::max
 (
-    VGREAT, VGREAT,
-            VGREAT
+    symmTensor2D::uniform(VGREAT)
 );
 
 template<>
-const symmTensor2D symmTensor2D::min
+const Foam::symmTensor2D Foam::symmTensor2D::vsType::min
 (
-    -VGREAT, -VGREAT,
-             -VGREAT
+    symmTensor2D::uniform(-VGREAT)
 );
 
 template<>
-const symmTensor2D symmTensor2D::I
+const Foam::symmTensor2D Foam::symmTensor2D::vsType::rootMax
+(
+    symmTensor2D::uniform(ROOTVGREAT)
+);
+
+template<>
+const Foam::symmTensor2D Foam::symmTensor2D::vsType::rootMin
+(
+    symmTensor2D::uniform(-ROOTVGREAT)
+);
+
+template<>
+const Foam::symmTensor2D Foam::symmTensor2D::I
 (
     1, 0,
        1
 );
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index 0d0ba7e04d..9cd83fd09b 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -75,13 +75,6 @@ public:
 
     // Static data members
 
-        static const char* const typeName;
-        static const char* componentNames[];
-
-        static const Tensor zero;
-        static const Tensor one;
-        static const Tensor max;
-        static const Tensor min;
         static const Tensor I;
 
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 85b33a4952..35bfdef0c4 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -25,28 +25,26 @@ License
 
 #include "SymmTensor.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline Tensor<Cmpt>::Tensor()
+inline Foam::Tensor<Cmpt>::Tensor()
 {}
 
 
 template<class Cmpt>
 template<class Cmpt2>
-inline Tensor<Cmpt>::Tensor(const VectorSpace<Tensor<Cmpt2>, Cmpt2, 9>& vs)
+inline Foam::Tensor<Cmpt>::Tensor
+(
+    const VectorSpace<Tensor<Cmpt2>, Cmpt2, 9>& vs
+)
 :
     VectorSpace<Tensor<Cmpt>, Cmpt, 9>(vs)
 {}
 
 
 template<class Cmpt>
-inline Tensor<Cmpt>::Tensor(const SphericalTensor<Cmpt>& st)
+inline Foam::Tensor<Cmpt>::Tensor(const SphericalTensor<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0; this->v_[XZ] = 0;
     this->v_[YX] = 0; this->v_[YY] = st.ii(); this->v_[YZ] = 0;
@@ -55,7 +53,7 @@ inline Tensor<Cmpt>::Tensor(const SphericalTensor<Cmpt>& st)
 
 
 template<class Cmpt>
-inline Tensor<Cmpt>::Tensor(const SymmTensor<Cmpt>& st)
+inline Foam::Tensor<Cmpt>::Tensor(const SymmTensor<Cmpt>& st)
 {
     this->v_[XX] = st.xx(); this->v_[XY] = st.xy(); this->v_[XZ] = st.xz();
     this->v_[YX] = st.xy(); this->v_[YY] = st.yy(); this->v_[YZ] = st.yz();
@@ -64,7 +62,7 @@ inline Tensor<Cmpt>::Tensor(const SymmTensor<Cmpt>& st)
 
 
 template<class Cmpt>
-inline Tensor<Cmpt>::Tensor(const Vector<Vector<Cmpt>>& tr)
+inline Foam::Tensor<Cmpt>::Tensor(const Vector<Vector<Cmpt>>& tr)
 {
     this->v_[XX] = tr.x().x();
     this->v_[XY] = tr.x().y();
@@ -81,7 +79,7 @@ inline Tensor<Cmpt>::Tensor(const Vector<Vector<Cmpt>>& tr)
 
 
 template<class Cmpt>
-inline Tensor<Cmpt>::Tensor
+inline Foam::Tensor<Cmpt>::Tensor
 (
     const Vector<Cmpt>& x,
     const Vector<Cmpt>& y,
@@ -95,7 +93,7 @@ inline Tensor<Cmpt>::Tensor
 
 
 template<class Cmpt>
-inline Tensor<Cmpt>::Tensor
+inline Foam::Tensor<Cmpt>::Tensor
 (
     const Cmpt txx, const Cmpt txy, const Cmpt txz,
     const Cmpt tyx, const Cmpt tyy, const Cmpt tyz,
@@ -109,7 +107,7 @@ inline Tensor<Cmpt>::Tensor
 
 
 template<class Cmpt>
-inline Tensor<Cmpt>::Tensor(Istream& is)
+inline Foam::Tensor<Cmpt>::Tensor(Istream& is)
 :
     VectorSpace<Tensor<Cmpt>, Cmpt, 9>(is)
 {}
@@ -118,28 +116,31 @@ inline Tensor<Cmpt>::Tensor(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline Vector<Cmpt> Tensor<Cmpt>::x() const
+inline Foam::Vector<Cmpt> Foam::Tensor<Cmpt>::x() const
 {
     return Vector<Cmpt>(this->v_[XX], this->v_[XY], this->v_[XZ]);
 }
 
 
 template<class Cmpt>
-inline Vector<Cmpt> Tensor<Cmpt>::y() const
+inline Foam::Vector<Cmpt> Foam::Tensor<Cmpt>::y() const
 {
     return Vector<Cmpt>(this->v_[YX], this->v_[YY], this->v_[YZ]);
 }
 
 
 template<class Cmpt>
-inline Vector<Cmpt>  Tensor<Cmpt>::z() const
+inline Foam::Vector<Cmpt> Foam::Tensor<Cmpt>::z() const
 {
     return Vector<Cmpt>(this->v_[ZX], this->v_[ZY], this->v_[ZZ]);
 }
 
 
 template<class Cmpt>
-inline Vector<Cmpt>  Tensor<Cmpt>::vectorComponent(const direction cmpt) const
+inline Foam::Vector<Cmpt> Foam::Tensor<Cmpt>::vectorComponent
+(
+    const direction cmpt
+) const
 {
     switch (cmpt)
     {
@@ -157,133 +158,133 @@ inline Vector<Cmpt>  Tensor<Cmpt>::vectorComponent(const direction cmpt) const
 
 
 template<class Cmpt>
-inline const Cmpt&  Tensor<Cmpt>::xx() const
+inline const Cmpt& Foam::Tensor<Cmpt>::xx() const
 {
     return this->v_[XX];
 }
 
 
 template<class Cmpt>
-inline const Cmpt&  Tensor<Cmpt>::xy() const
+inline const Cmpt& Foam::Tensor<Cmpt>::xy() const
 {
     return this->v_[XY];
 }
 
 
 template<class Cmpt>
-inline const Cmpt&  Tensor<Cmpt>::xz() const
+inline const Cmpt& Foam::Tensor<Cmpt>::xz() const
 {
     return this->v_[XZ];
 }
 
 
 template<class Cmpt>
-inline const Cmpt&  Tensor<Cmpt>::yx() const
+inline const Cmpt& Foam::Tensor<Cmpt>::yx() const
 {
     return this->v_[YX];
 }
 
 
 template<class Cmpt>
-inline const Cmpt&  Tensor<Cmpt>::yy() const
+inline const Cmpt& Foam::Tensor<Cmpt>::yy() const
 {
     return this->v_[YY];
 }
 
 
 template<class Cmpt>
-inline const Cmpt&  Tensor<Cmpt>::yz() const
+inline const Cmpt& Foam::Tensor<Cmpt>::yz() const
 {
     return this->v_[YZ];
 }
 
 
 template<class Cmpt>
-inline const Cmpt&  Tensor<Cmpt>::zx() const
+inline const Cmpt& Foam::Tensor<Cmpt>::zx() const
 {
     return this->v_[ZX];
 }
 
 
 template<class Cmpt>
-inline const Cmpt&  Tensor<Cmpt>::zy() const
+inline const Cmpt& Foam::Tensor<Cmpt>::zy() const
 {
     return this->v_[ZY];
 }
 
 
 template<class Cmpt>
-inline const Cmpt&  Tensor<Cmpt>::zz() const
+inline const Cmpt& Foam::Tensor<Cmpt>::zz() const
 {
     return this->v_[ZZ];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Tensor<Cmpt>::xx()
+inline Cmpt& Foam::Tensor<Cmpt>::xx()
 {
     return this->v_[XX];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Tensor<Cmpt>::xy()
+inline Cmpt& Foam::Tensor<Cmpt>::xy()
 {
     return this->v_[XY];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Tensor<Cmpt>::xz()
+inline Cmpt& Foam::Tensor<Cmpt>::xz()
 {
     return this->v_[XZ];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Tensor<Cmpt>::yx()
+inline Cmpt& Foam::Tensor<Cmpt>::yx()
 {
     return this->v_[YX];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Tensor<Cmpt>::yy()
+inline Cmpt& Foam::Tensor<Cmpt>::yy()
 {
     return this->v_[YY];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Tensor<Cmpt>::yz()
+inline Cmpt& Foam::Tensor<Cmpt>::yz()
 {
     return this->v_[YZ];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Tensor<Cmpt>::zx()
+inline Cmpt& Foam::Tensor<Cmpt>::zx()
 {
     return this->v_[ZX];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Tensor<Cmpt>::zy()
+inline Cmpt& Foam::Tensor<Cmpt>::zy()
 {
     return this->v_[ZY];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Tensor<Cmpt>::zz()
+inline Cmpt& Foam::Tensor<Cmpt>::zz()
 {
     return this->v_[ZZ];
 }
 
 
 template<class Cmpt>
-inline Tensor<Cmpt> Tensor<Cmpt>::T() const
+inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::T() const
 {
     return Tensor<Cmpt>
     (
@@ -297,7 +298,7 @@ inline Tensor<Cmpt> Tensor<Cmpt>::T() const
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline void Tensor<Cmpt>::operator&=(const Tensor<Cmpt>& t)
+inline void Foam::Tensor<Cmpt>::operator&=(const Tensor<Cmpt>& t)
 {
     *this =
     (
@@ -320,7 +321,7 @@ inline void Tensor<Cmpt>::operator&=(const Tensor<Cmpt>& t)
 
 
 template<class Cmpt>
-inline void Tensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
+inline void Foam::Tensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0; this->v_[XZ] = 0;
     this->v_[YX] = 0; this->v_[YY] = st.ii(); this->v_[YZ] = 0;
@@ -329,7 +330,7 @@ inline void Tensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 
 
 template<class Cmpt>
-inline void Tensor<Cmpt>::operator=(const SymmTensor<Cmpt>& st)
+inline void Foam::Tensor<Cmpt>::operator=(const SymmTensor<Cmpt>& st)
 {
     this->v_[XX] = st.xx(); this->v_[XY] = st.xy(); this->v_[XZ] = st.xz();
     this->v_[YX] = st.xy(); this->v_[YY] = st.yy(); this->v_[YZ] = st.yz();
@@ -338,7 +339,7 @@ inline void Tensor<Cmpt>::operator=(const SymmTensor<Cmpt>& st)
 
 
 template<class Cmpt>
-inline void Tensor<Cmpt>::operator=(const Vector<Vector<Cmpt>>& tr)
+inline void Foam::Tensor<Cmpt>::operator=(const Vector<Vector<Cmpt>>& tr)
 {
     this->v_[XX] = tr.x().x();
     this->v_[XY] = tr.x().y();
@@ -354,6 +355,11 @@ inline void Tensor<Cmpt>::operator=(const Vector<Vector<Cmpt>>& tr)
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
diff --git a/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C b/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C
index 4274e78a3e..4f15ceda59 100644
--- a/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C
+++ b/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,35 +28,52 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+template<>
+const char* const Foam::labelTensor::vsType::typeName = "labelTensor";
+
+template<>
+const char* const Foam::labelTensor::vsType::componentNames[] =
 {
-    template<>
-    const char* const Foam::labelTensor::typeName = "labelTensor";
+    "xx", "xy", "xz",
+    "yx", "yy", "yz",
+    "zx", "zy", "zz"
+};
 
-    template<>
-    const char* Foam::labelTensor::componentNames[] =
-    {
-        "xx", "xy", "xz",
-        "yx", "yy", "yz",
-        "zx", "zy", "zz"
-    };
+template<>
+const Foam::labelTensor Foam::labelTensor::vsType::zero
+(
+    labelTensor::uniform(0)
+);
 
-    template<>
-    const Foam::labelTensor Foam::labelTensor::zero
-    (
-        0, 0, 0,
-        0, 0, 0,
-        0, 0, 0
-    );
+template<>
+const Foam::labelTensor Foam::labelTensor::vsType::one
+(
+    labelTensor::uniform(1)
+);
 
-    template<>
-    const Foam::labelTensor Foam::labelTensor::one
-    (
-        1, 1, 1,
-        1, 1, 1,
-        1, 1, 1
-    );
-}
+template<>
+const Foam::labelTensor Foam::labelTensor::vsType::max
+(
+    labelTensor::uniform(labelMax)
+);
+
+template<>
+const Foam::labelTensor Foam::labelTensor::vsType::min
+(
+    labelTensor::uniform(-labelMax)
+);
+
+template<>
+const Foam::labelTensor Foam::labelTensor::vsType::rootMax
+(
+    labelTensor::uniform(sqrt(scalar(labelMax)))
+);
+
+template<>
+const Foam::labelTensor Foam::labelTensor::vsType::rootMin
+(
+    labelTensor::uniform(-sqrt(scalar(labelMax)))
+);
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Tensor/tensor/tensor.C b/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
index fd636a2529..cadbef6a9b 100644
--- a/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
+++ b/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,59 +30,42 @@ using namespace Foam::constant::mathematical;
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+template<>
+const char* const Foam::tensor::vsType::typeName = "tensor";
+
+template<>
+const char* const Foam::tensor::vsType::componentNames[] =
 {
-    template<>
-    const char* const tensor::typeName = "tensor";
+    "xx", "xy", "xz",
+    "yx", "yy", "yz",
+    "zx", "zy", "zz"
+};
 
-    template<>
-    const char* tensor::componentNames[] =
-    {
-        "xx", "xy", "xz",
-        "yx", "yy", "yz",
-        "zx", "zy", "zz"
-    };
+template<>
+const Foam::tensor Foam::tensor::vsType::zero(tensor::uniform(0));
 
-    template<>
-    const tensor tensor::zero
-    (
-        0, 0, 0,
-        0, 0, 0,
-        0, 0, 0
-    );
+template<>
+const Foam::tensor Foam::tensor::vsType::one(tensor::uniform(1));
 
-    template<>
-    const tensor tensor::one
-    (
-        1, 1, 1,
-        1, 1, 1,
-        1, 1, 1
-    );
+template<>
+const Foam::tensor Foam::tensor::vsType::max(tensor::uniform(VGREAT));
 
-    template<>
-    const tensor tensor::max
-    (
-        VGREAT, VGREAT, VGREAT,
-        VGREAT, VGREAT, VGREAT,
-        VGREAT, VGREAT, VGREAT
-    );
+template<>
+const Foam::tensor Foam::tensor::vsType::min(tensor::uniform(-VGREAT));
 
-    template<>
-    const tensor tensor::min
-    (
-        -VGREAT, -VGREAT, -VGREAT,
-        -VGREAT, -VGREAT, -VGREAT,
-        -VGREAT, -VGREAT, -VGREAT
-    );
+template<>
+const Foam::tensor Foam::tensor::vsType::rootMax(tensor::uniform(ROOTVGREAT));
 
-    template<>
-    const tensor tensor::I
-    (
-        1, 0, 0,
-        0, 1, 0,
-        0, 0, 1
-    );
-}
+template<>
+const Foam::tensor Foam::tensor::vsType::rootMin(tensor::uniform(-ROOTVGREAT));
+
+template<>
+const Foam::tensor Foam::tensor::I
+(
+    1, 0, 0,
+    0, 1, 0,
+    0, 0, 1
+);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
index ac49d74d53..bc1f3906e5 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,6 +61,10 @@ class Tensor2D
 
 public:
 
+    //- Equivalent type of labels used for valid component indexing
+    typedef Tensor2D<label> labelType;
+
+
     // Member constants
 
         enum
@@ -71,13 +75,6 @@ public:
 
     // Static data members
 
-        static const char* const typeName;
-        static const char* componentNames[];
-
-        static const Tensor2D zero;
-        static const Tensor2D one;
-        static const Tensor2D max;
-        static const Tensor2D min;
         static const Tensor2D I;
 
 
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
index 230ebe7005..bc68f00ad3 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
@@ -23,27 +23,25 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline Tensor2D<Cmpt>::Tensor2D()
+inline Foam::Tensor2D<Cmpt>::Tensor2D()
 {}
 
 
 template<class Cmpt>
-inline Tensor2D<Cmpt>::Tensor2D(const VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>& vs)
+inline Foam::Tensor2D<Cmpt>::Tensor2D
+(
+    const VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>& vs
+)
 :
     VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>(vs)
 {}
 
 
 template<class Cmpt>
-inline Tensor2D<Cmpt>::Tensor2D(const SymmTensor2D<Cmpt>& st)
+inline Foam::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();
@@ -51,7 +49,7 @@ inline Tensor2D<Cmpt>::Tensor2D(const SymmTensor2D<Cmpt>& st)
 
 
 template<class Cmpt>
-inline Tensor2D<Cmpt>::Tensor2D(const SphericalTensor2D<Cmpt>& st)
+inline Foam::Tensor2D<Cmpt>::Tensor2D(const SphericalTensor2D<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0;
     this->v_[YX] = 0; this->v_[YY] = st.ii();
@@ -59,7 +57,7 @@ inline Tensor2D<Cmpt>::Tensor2D(const SphericalTensor2D<Cmpt>& st)
 
 
 template<class Cmpt>
-inline Tensor2D<Cmpt>::Tensor2D
+inline Foam::Tensor2D<Cmpt>::Tensor2D
 (
     const Vector2D<Cmpt>& x,
     const Vector2D<Cmpt>& y
@@ -71,7 +69,7 @@ inline Tensor2D<Cmpt>::Tensor2D
 
 
 template<class Cmpt>
-inline Tensor2D<Cmpt>::Tensor2D
+inline Foam::Tensor2D<Cmpt>::Tensor2D
 (
     const Cmpt txx, const Cmpt txy,
     const Cmpt tyx, const Cmpt tyy
@@ -83,7 +81,7 @@ inline Tensor2D<Cmpt>::Tensor2D
 
 
 template<class Cmpt>
-inline Tensor2D<Cmpt>::Tensor2D(Istream& is)
+inline Foam::Tensor2D<Cmpt>::Tensor2D(Istream& is)
 :
     VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>(is)
 {}
@@ -92,70 +90,70 @@ inline Tensor2D<Cmpt>::Tensor2D(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline Vector2D<Cmpt> Tensor2D<Cmpt>::x() const
+inline Foam::Vector2D<Cmpt> Foam::Tensor2D<Cmpt>::x() const
 {
     return Vector2D<Cmpt>(this->v_[XX], this->v_[XY]);
 }
 
 template<class Cmpt>
-inline Vector2D<Cmpt> Tensor2D<Cmpt>::y() const
+inline Foam::Vector2D<Cmpt> Foam::Tensor2D<Cmpt>::y() const
 {
     return Vector2D<Cmpt>(this->v_[YX], this->v_[YY]);
 }
 
 
 template<class Cmpt>
-inline const Cmpt& Tensor2D<Cmpt>::xx() const
+inline const Cmpt& Foam::Tensor2D<Cmpt>::xx() const
 {
     return this->v_[XX];
 }
 
 template<class Cmpt>
-inline const Cmpt& Tensor2D<Cmpt>::xy() const
+inline const Cmpt& Foam::Tensor2D<Cmpt>::xy() const
 {
     return this->v_[XY];
 }
 
 template<class Cmpt>
-inline const Cmpt& Tensor2D<Cmpt>::yx() const
+inline const Cmpt& Foam::Tensor2D<Cmpt>::yx() const
 {
     return this->v_[YX];
 }
 
 template<class Cmpt>
-inline const Cmpt& Tensor2D<Cmpt>::yy() const
+inline const Cmpt& Foam::Tensor2D<Cmpt>::yy() const
 {
     return this->v_[YY];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Tensor2D<Cmpt>::xx()
+inline Cmpt& Foam::Tensor2D<Cmpt>::xx()
 {
     return this->v_[XX];
 }
 
 template<class Cmpt>
-inline Cmpt& Tensor2D<Cmpt>::xy()
+inline Cmpt& Foam::Tensor2D<Cmpt>::xy()
 {
     return this->v_[XY];
 }
 
 template<class Cmpt>
-inline Cmpt& Tensor2D<Cmpt>::yx()
+inline Cmpt& Foam::Tensor2D<Cmpt>::yx()
 {
     return this->v_[YX];
 }
 
 template<class Cmpt>
-inline Cmpt& Tensor2D<Cmpt>::yy()
+inline Cmpt& Foam::Tensor2D<Cmpt>::yy()
 {
     return this->v_[YY];
 }
 
 
 template<class Cmpt>
-inline Tensor2D<Cmpt> Tensor2D<Cmpt>::T() const
+inline Foam::Tensor2D<Cmpt> Foam::Tensor2D<Cmpt>::T() const
 {
     return Tensor2D<Cmpt>
     (
@@ -168,7 +166,7 @@ inline Tensor2D<Cmpt> Tensor2D<Cmpt>::T() const
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline void Tensor2D<Cmpt>::operator=(const SymmTensor2D<Cmpt>& st)
+inline void Foam::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();
@@ -176,13 +174,17 @@ inline void Tensor2D<Cmpt>::operator=(const SymmTensor2D<Cmpt>& st)
 
 
 template<class Cmpt>
-inline void Tensor2D<Cmpt>::operator=(const SphericalTensor2D<Cmpt>& st)
+inline void Foam::Tensor2D<Cmpt>::operator=(const SphericalTensor2D<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0;
     this->v_[YX] = 0; this->v_[YY] = st.ii();
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
index 96ff1a3194..36f9725255 100644
--- a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
+++ b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
@@ -28,41 +28,49 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const Foam::tensor2D::typeName = "tensor2D";
+const char* const Foam::tensor2D::vsType::typeName = "tensor2D";
 
 template<>
-const char* Foam::tensor2D::componentNames[] =
+const char* const Foam::tensor2D::vsType::componentNames[] =
 {
     "xx", "xy",
     "yx", "yy"
 };
 
 template<>
-const Foam::tensor2D Foam::tensor2D::zero
+const Foam::tensor2D Foam::tensor2D::vsType::vsType::zero
 (
-    0, 0,
-    0, 0
+    tensor2D::uniform(0)
 );
 
 template<>
-const Foam::tensor2D Foam::tensor2D::one
+const Foam::tensor2D Foam::tensor2D::vsType::one
 (
-    1, 1,
-    1, 1
+    tensor2D::uniform(1)
 );
 
 template<>
-const Foam::tensor2D Foam::tensor2D::max
+const Foam::tensor2D Foam::tensor2D::vsType::max
 (
-    VGREAT, VGREAT,
-    VGREAT, VGREAT
+    tensor2D::uniform(VGREAT)
 );
 
 template<>
-const Foam::tensor2D Foam::tensor2D::min
+const Foam::tensor2D Foam::tensor2D::vsType::min
 (
-    -VGREAT, -VGREAT,
-    -VGREAT, -VGREAT
+    tensor2D::uniform(-VGREAT)
+);
+
+template<>
+const Foam::tensor2D Foam::tensor2D::vsType::rootMax
+(
+    tensor2D::uniform(ROOTVGREAT)
+);
+
+template<>
+const Foam::tensor2D Foam::tensor2D::vsType::rootMin
+(
+    tensor2D::uniform(-ROOTVGREAT)
 );
 
 template<>
diff --git a/src/OpenFOAM/primitives/Vector/Vector.H b/src/OpenFOAM/primitives/Vector/Vector.H
index b79dd8d6f7..e4ba4c1fed 100644
--- a/src/OpenFOAM/primitives/Vector/Vector.H
+++ b/src/OpenFOAM/primitives/Vector/Vector.H
@@ -74,18 +74,6 @@ public:
         };
 
 
-    // Static data members
-
-        static const char* const typeName;
-        static const char* componentNames[];
-        static const Vector zero;
-        static const Vector one;
-        static const Vector max;
-        static const Vector min;
-        static const Vector rootMax;
-        static const Vector rootMin;
-
-
     //- Component labeling enumeration
     enum components { X, Y, Z };
 
@@ -127,7 +115,7 @@ public:
 
     // Member Operators
 
-        inline void operator=(const scalar);
+        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Vector/VectorI.H b/src/OpenFOAM/primitives/Vector/VectorI.H
index 3133057461..4d598dea36 100644
--- a/src/OpenFOAM/primitives/Vector/VectorI.H
+++ b/src/OpenFOAM/primitives/Vector/VectorI.H
@@ -23,28 +23,31 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline Vector<Cmpt>::Vector()
+inline Foam::Vector<Cmpt>::Vector()
 {}
 
 
 template<class Cmpt>
 template<class Cmpt2>
-inline Vector<Cmpt>::Vector(const VectorSpace<Vector<Cmpt2>, Cmpt2, 3>& vs)
+inline Foam::Vector<Cmpt>::Vector
+(
+    const VectorSpace<Vector<Cmpt2>, Cmpt2, 3>& vs
+)
 :
     VectorSpace<Vector<Cmpt>, Cmpt, 3>(vs)
 {}
 
 
 template<class Cmpt>
-inline Vector<Cmpt>::Vector(const Cmpt& vx, const Cmpt& vy, const Cmpt& vz)
+inline Foam::Vector<Cmpt>::Vector
+(
+    const Cmpt& vx,
+    const Cmpt& vy,
+    const Cmpt& vz
+)
 {
     this->v_[X] = vx;
     this->v_[Y] = vy;
@@ -53,7 +56,7 @@ inline Vector<Cmpt>::Vector(const Cmpt& vx, const Cmpt& vy, const Cmpt& vz)
 
 
 template<class Cmpt>
-inline Vector<Cmpt>::Vector(Istream& is)
+inline Foam::Vector<Cmpt>::Vector(Istream& is)
 :
     VectorSpace<Vector<Cmpt>, Cmpt, 3>(is)
 {}
@@ -62,38 +65,38 @@ inline Vector<Cmpt>::Vector(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline const Cmpt&  Vector<Cmpt>::x() const
+inline const Cmpt& Foam::Vector<Cmpt>::x() const
 {
     return this->v_[X];
 }
 
 template<class Cmpt>
-inline const Cmpt&  Vector<Cmpt>::y() const
+inline const Cmpt& Foam::Vector<Cmpt>::y() const
 {
     return this->v_[Y];
 }
 
 template<class Cmpt>
-inline const Cmpt&  Vector<Cmpt>::z() const
+inline const Cmpt& Foam::Vector<Cmpt>::z() const
 {
     return this->v_[Z];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Vector<Cmpt>::x()
+inline Cmpt& Foam::Vector<Cmpt>::x()
 {
     return this->v_[X];
 }
 
 template<class Cmpt>
-inline Cmpt& Vector<Cmpt>::y()
+inline Cmpt& Foam::Vector<Cmpt>::y()
 {
     return this->v_[Y];
 }
 
 template<class Cmpt>
-inline Cmpt& Vector<Cmpt>::z()
+inline Cmpt& Foam::Vector<Cmpt>::z()
 {
     return this->v_[Z];
 }
@@ -102,7 +105,7 @@ inline Cmpt& Vector<Cmpt>::z()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline const Vector<Cmpt>& Vector<Cmpt>::centre
+inline const Foam::Vector<Cmpt>& Foam::Vector<Cmpt>::centre
 (
     const Foam::List<Vector<Cmpt>>&
 )const
@@ -114,17 +117,19 @@ inline const Vector<Cmpt>& Vector<Cmpt>::centre
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline void Vector<Cmpt>::operator=
-(
-    const scalar s
-)
+inline void Foam::Vector<Cmpt>::operator=(const Foam::zero z)
 {
-    VectorSpace<Vector<Cmpt>, Cmpt, 3>::operator=(s);
+    VectorSpace<Vector<Cmpt>, Cmpt, 3>::operator=(z);
 }
 
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 template<class Cmpt>
 inline typename innerProduct<Vector<Cmpt>, Vector<Cmpt>>::type
 operator&(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)
diff --git a/src/OpenFOAM/primitives/Vector/complexVector/complexVector.C b/src/OpenFOAM/primitives/Vector/complexVector/complexVector.C
index 7e5d04144b..f3241df696 100644
--- a/src/OpenFOAM/primitives/Vector/complexVector/complexVector.C
+++ b/src/OpenFOAM/primitives/Vector/complexVector/complexVector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,37 +28,52 @@ Description
 
 #include "complexVector.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const complexVector::typeName = "complexVector";
+const char* const Foam::complexVector::vsType::typeName = "complexVector";
 
 template<>
-const char* complexVector::componentNames[] = {"x", "y", "z"};
+const char* const Foam::complexVector::vsType::componentNames[] =
+{
+    "x", "y", "z"
+};
 
 template<>
-const complexVector complexVector::zero
+const Foam::complexVector Foam::complexVector::vsType::zero
 (
-    complex(0, 0),
-    complex(0, 0),
-    complex(0, 0)
+    complexVector::uniform(complex(0, 0))
 );
 
 template<>
-const complexVector complexVector::one
+const Foam::complexVector Foam::complexVector::vsType::one
 (
-    complex(1, 1),
-    complex(1, 1),
-    complex(1, 1)
+    complexVector::uniform(complex(1, 1))
 );
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+const Foam::complexVector Foam::complexVector::vsType::max
+(
+    complexVector::uniform(complex(VGREAT, VGREAT))
+);
+
+template<>
+const Foam::complexVector Foam::complexVector::vsType::min
+(
+    complexVector::uniform(complex(-VGREAT, -VGREAT))
+);
+
+template<>
+const Foam::complexVector Foam::complexVector::vsType::rootMax
+(
+    complexVector::uniform(complex(ROOTVGREAT, ROOTVGREAT))
+);
+
+template<>
+const Foam::complexVector Foam::complexVector::vsType::rootMin
+(
+    complexVector::uniform(complex(-ROOTVGREAT, -ROOTVGREAT))
+);
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Vector/floatVector/floatVector.C b/src/OpenFOAM/primitives/Vector/floatVector/floatVector.C
index d88ac70f1f..13ab567ba4 100644
--- a/src/OpenFOAM/primitives/Vector/floatVector/floatVector.C
+++ b/src/OpenFOAM/primitives/Vector/floatVector/floatVector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,43 +28,52 @@ Description
 
 #include "floatVector.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const floatVector::typeName = "floatVector";
+const char* const Foam::floatVector::vsType::typeName = "floatVector";
 
 template<>
-const char* floatVector::componentNames[] = {"x", "y", "z"};
+const char* const Foam::floatVector::vsType::componentNames[] =
+{
+    "x", "y", "z"
+};
 
 template<>
-const floatVector floatVector::zero(0, 0, 0);
-
-template<>
-const floatVector floatVector::one(1, 1, 1);
-
-template<>
-const floatVector floatVector::max
+const Foam::floatVector Foam::floatVector::vsType::zero
 (
-    floatScalarVGREAT,
-    floatScalarVGREAT,
-    floatScalarVGREAT
+    floatVector::uniform(0)
 );
 
 template<>
-const floatVector floatVector::min
+const Foam::floatVector Foam::floatVector::vsType::one
 (
-    -floatScalarVGREAT,
-    -floatScalarVGREAT,
-    -floatScalarVGREAT
+    floatVector::uniform(1)
 );
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+const Foam::floatVector Foam::floatVector::vsType::max
+(
+    floatVector::uniform(floatScalarVGREAT)
+);
+
+template<>
+const Foam::floatVector Foam::floatVector::vsType::min
+(
+    floatVector::uniform(-floatScalarVGREAT)
+);
+
+template<>
+const Foam::floatVector Foam::floatVector::vsType::rootMax
+(
+    floatVector::uniform(floatScalarROOTVGREAT)
+);
+
+template<>
+const Foam::floatVector Foam::floatVector::vsType::rootMin
+(
+    floatVector::uniform(-floatScalarROOTVGREAT)
+);
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
index 248f6601de..231c3a69ef 100644
--- a/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
+++ b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,19 +27,50 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+template<>
+const char* const Foam::labelVector::vsType::typeName = "labelVector";
+
+template<>
+const char* const Foam::labelVector::vsType::componentNames[] =
 {
-    template<>
-    const char* const Foam::labelVector::typeName = "labelVector";
+    "x", "y", "z"
+};
 
-    template<>
-    const char* Foam::labelVector::componentNames[] = {"x", "y", "z"};
+template<>
+const Foam::labelVector Foam::labelVector::vsType::zero
+(
+    labelVector::uniform(0)
+);
 
-    template<>
-    const Foam::labelVector Foam::labelVector::zero(0, 0, 0);
+template<>
+const Foam::labelVector Foam::labelVector::vsType::one
+(
+    labelVector::uniform(1)
+);
+
+template<>
+const Foam::labelVector Foam::labelVector::vsType::max
+(
+    labelVector::uniform(labelMax)
+);
+
+template<>
+const Foam::labelVector Foam::labelVector::vsType::min
+(
+    labelVector::uniform(-labelMax)
+);
+
+template<>
+const Foam::labelVector Foam::labelVector::vsType::rootMax
+(
+    labelVector::uniform(sqrt(scalar(labelMax)))
+);
+
+template<>
+const Foam::labelVector Foam::labelVector::vsType::rootMin
+(
+    labelVector::uniform(-sqrt(scalar(labelMax)))
+);
 
-    template<>
-    const Foam::labelVector Foam::labelVector::one(1, 1, 1);
-}
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Vector/vector/vector.C b/src/OpenFOAM/primitives/Vector/vector/vector.C
index 40b6e79c31..646f34c35d 100644
--- a/src/OpenFOAM/primitives/Vector/vector/vector.C
+++ b/src/OpenFOAM/primitives/Vector/vector/vector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,39 +28,31 @@ Description
 
 #include "vector.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const vector::typeName = "vector";
+const char* const Foam::vector::vsType::typeName = "vector";
 
 template<>
-const char* vector::componentNames[] = {"x", "y", "z"};
+const char* const Foam::vector::vsType::componentNames[] = {"x", "y", "z"};
 
 template<>
-const vector vector::zero(0, 0, 0);
+const Foam::vector Foam::vector::vsType::vsType::zero(vector::uniform(0));
 
 template<>
-const vector vector::one(1, 1, 1);
+const Foam::vector Foam::vector::vsType::one(vector::uniform(1));
 
 template<>
-const vector vector::max(VGREAT, VGREAT, VGREAT);
+const Foam::vector Foam::vector::vsType::max(vector::uniform(VGREAT));
 
 template<>
-const vector vector::min(-VGREAT, -VGREAT, -VGREAT);
+const Foam::vector Foam::vector::vsType::min(vector::uniform(-VGREAT));
 
 template<>
-const vector vector::rootMax(ROOTVGREAT, ROOTVGREAT, ROOTVGREAT);
+const Foam::vector Foam::vector::vsType::rootMax(vector::uniform(ROOTVGREAT));
 
 template<>
-const vector vector::rootMin(-ROOTVGREAT, -ROOTVGREAT, -ROOTVGREAT);
+const Foam::vector Foam::vector::vsType::rootMin(vector::uniform(-ROOTVGREAT));
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2D.H b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
index e63fbad951..ca77ed8ce1 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2D.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,6 +56,10 @@ class Vector2D
 
 public:
 
+    //- Equivalent type of labels used for valid component indexing
+    typedef Vector2D<label> labelType;
+
+
     // Member constants
 
         enum
@@ -64,16 +68,6 @@ public:
         };
 
 
-    // Static data members
-
-        static const char* const typeName;
-        static const char* componentNames[];
-        static const Vector2D zero;
-        static const Vector2D one;
-        static const Vector2D max;
-        static const Vector2D min;
-
-
     //- Component labeling enumeration
     enum components { X, Y };
 
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
index b3e5f6c63a..8ccf067c26 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
@@ -23,39 +23,33 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct null
 template<class Cmpt>
-inline Vector2D<Cmpt>::Vector2D()
+inline Foam::Vector2D<Cmpt>::Vector2D()
 {}
 
 
-// Construct given VectorSpace
 template<class Cmpt>
-inline Vector2D<Cmpt>::Vector2D(const VectorSpace<Vector2D<Cmpt>, Cmpt, 2>& vs)
+inline Foam::Vector2D<Cmpt>::Vector2D
+(
+    const VectorSpace<Vector2D<Cmpt>, Cmpt, 2>& vs
+)
 :
     VectorSpace<Vector2D<Cmpt>, Cmpt, 2>(vs)
 {}
 
 
-// Construct given three Cmpts
 template<class Cmpt>
-inline Vector2D<Cmpt>::Vector2D(const Cmpt& vx, const Cmpt& vy)
+inline Foam::Vector2D<Cmpt>::Vector2D(const Cmpt& vx, const Cmpt& vy)
 {
     this->v_[X] = vx;
     this->v_[Y] = vy;
 }
 
 
-// Construct from Istream
 template<class Cmpt>
-inline Vector2D<Cmpt>::Vector2D(Istream& is)
+inline Foam::Vector2D<Cmpt>::Vector2D(Istream& is)
 :
     VectorSpace<Vector2D<Cmpt>, Cmpt, 2>(is)
 {}
@@ -64,31 +58,36 @@ inline Vector2D<Cmpt>::Vector2D(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline const Cmpt&  Vector2D<Cmpt>::x() const
+inline const Cmpt& Foam::Vector2D<Cmpt>::x() const
 {
     return this->v_[X];
 }
 
 template<class Cmpt>
-inline const Cmpt&  Vector2D<Cmpt>::y() const
+inline const Cmpt& Foam::Vector2D<Cmpt>::y() const
 {
     return this->v_[Y];
 }
 
 
 template<class Cmpt>
-inline Cmpt& Vector2D<Cmpt>::x()
+inline Cmpt& Foam::Vector2D<Cmpt>::x()
 {
     return this->v_[X];
 }
 
 template<class Cmpt>
-inline Cmpt& Vector2D<Cmpt>::y()
+inline Cmpt& Foam::Vector2D<Cmpt>::y()
 {
     return this->v_[Y];
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
diff --git a/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.C b/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.C
index e773e19608..4a73dada31 100644
--- a/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.C
+++ b/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,33 +28,49 @@ Description
 
 #include "vector2D.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const vector2D::typeName = "vector2D";
+const char* const Foam::vector2D::vsType::typeName = "vector2D";
 
 template<>
-const char* vector2D::componentNames[] = {"x", "y"};
+const char* const Foam::vector2D::vsType::componentNames[] = {"x", "y"};
 
 template<>
-const vector2D vector2D::zero(0, 0);
+const Foam::vector2D Foam::vector2D::vsType::vsType::zero
+(
+    vector2D::uniform(0)
+);
 
 template<>
-const vector2D vector2D::one(1, 1);
+const Foam::vector2D Foam::vector2D::vsType::one
+(
+    vector2D::uniform(1)
+);
 
 template<>
-const vector2D vector2D::max(VGREAT, VGREAT);
+const Foam::vector2D Foam::vector2D::vsType::max
+(
+    vector2D::uniform(VGREAT)
+);
 
 template<>
-const vector2D vector2D::min(-VGREAT, -VGREAT);
+const Foam::vector2D Foam::vector2D::vsType::min
+(
+    vector2D::uniform(-VGREAT)
+);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+const Foam::vector2D Foam::vector2D::vsType::rootMax
+(
+    vector2D::uniform(ROOTVGREAT)
+);
+
+template<>
+const Foam::vector2D Foam::vector2D::vsType::rootMin
+(
+    vector2D::uniform(-ROOTVGREAT)
+);
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index 05822b0fb8..2d650f43ae 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -42,6 +42,7 @@ SourceFiles
 #include "direction.H"
 #include "scalar.H"
 #include "word.H"
+#include "zero.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,6 +78,13 @@ class VectorSpace
 
 public:
 
+    //- The components of this vector space
+    Cmpt v_[nCmpt];
+
+
+    //- VectorSpace type
+    typedef VectorSpace<Form, Cmpt, nCmpt> vsType;
+
     //- Component type
     typedef Cmpt cmptType;
 
@@ -92,8 +100,14 @@ public:
 
     // Static data members
 
-        //- The components of this vector space
-        Cmpt v_[nCmpt];
+        static const char* const typeName;
+        static const char* const componentNames[];
+        static const Form zero;
+        static const Form one;
+        static const Form max;
+        static const Form min;
+        static const Form rootMax;
+        static const Form rootMin;
 
 
     // Constructors
@@ -123,6 +137,9 @@ public:
         inline void component(Cmpt&, const direction) const;
         inline void replace(const direction, const Cmpt&);
 
+        //- Return a VectorSpace with all elements = s
+        inline static Form uniform(const Cmpt& s);
+
 
     // Member Operators
 
@@ -133,7 +150,7 @@ public:
         inline void operator+=(const VectorSpace<Form, Cmpt, nCmpt>&);
         inline void operator-=(const VectorSpace<Form, Cmpt, nCmpt>&);
 
-        inline void operator=(const scalar);
+        inline void operator=(const Foam::zero);
         inline void operator*=(const scalar);
         inline void operator/=(const scalar);
 
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index 846c6e7f56..e1c88e61d8 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -148,6 +148,15 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::replace
 }
 
 
+template<class Form, class Cmpt, int nCmpt>
+inline Form VectorSpace<Form, Cmpt, nCmpt>::uniform(const Cmpt& s)
+{
+    Form v;
+    VectorSpaceOps<nCmpt,0>::eqOpS(v, s, eqOp<Cmpt>());
+    return v;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Form, class Cmpt, int nCmpt>
@@ -219,12 +228,9 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::operator-=
 
 
 template<class Form, class Cmpt, int nCmpt>
-inline void VectorSpace<Form, Cmpt, nCmpt>::operator=
-(
-    const scalar s
-)
+inline void VectorSpace<Form, Cmpt, nCmpt>::operator=(const Foam::zero)
 {
-    VectorSpaceOps<nCmpt,0>::eqOpS(*this, s, eqOp<Cmpt>());
+    VectorSpaceOps<nCmpt,0>::eqOpS(*this, 0, eqOp<Cmpt>());
 }
 
 
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.C b/src/OpenFOAM/primitives/bools/bool/bool.C
index 5969cadcea..267a8c1611 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.C
+++ b/src/OpenFOAM/primitives/bools/bool/bool.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ const char* const Foam::pTraits<bool>::typeName = "bool";
 const bool Foam::pTraits<bool>::zero = false;
 const bool Foam::pTraits<bool>::one = true;
 
-const char* Foam::pTraits<bool>::componentNames[] = { "" };
+const char* const Foam::pTraits<bool>::componentNames[] = { "" };
 
 Foam::pTraits<bool>::pTraits(const bool& p)
 :
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.H b/src/OpenFOAM/primitives/bools/bool/bool.H
index a7de5ecf46..b1638ec054 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.H
+++ b/src/OpenFOAM/primitives/bools/bool/bool.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ public:
     // Static data members
 
         static const char* const typeName;
-        static const char* componentNames[];
+        static const char* const componentNames[];
         static const bool zero;
         static const bool one;
 
diff --git a/src/OpenFOAM/primitives/ints/int32/int32.C b/src/OpenFOAM/primitives/ints/int32/int32.C
index 4883be46d5..4a209fc50b 100644
--- a/src/OpenFOAM/primitives/ints/int32/int32.C
+++ b/src/OpenFOAM/primitives/ints/int32/int32.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ const int32_t Foam::pTraits<int32_t>::max = INT32_MAX;
 const int32_t Foam::pTraits<int32_t>::rootMin = pTraits<int32_t>::min;
 const int32_t Foam::pTraits<int32_t>::rootMax = pTraits<int32_t>::max;
 
-const char* Foam::pTraits<int32_t>::componentNames[] = { "" };
+const char* const Foam::pTraits<int32_t>::componentNames[] = { "" };
 
 Foam::pTraits<int32_t>::pTraits(const int32_t& p)
 :
diff --git a/src/OpenFOAM/primitives/ints/int32/int32.H b/src/OpenFOAM/primitives/ints/int32/int32.H
index 694bfb57f7..0602a8e345 100644
--- a/src/OpenFOAM/primitives/ints/int32/int32.H
+++ b/src/OpenFOAM/primitives/ints/int32/int32.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ public:
     // Static data members
 
         static const char* const typeName;
-        static const char* componentNames[];
+        static const char* const componentNames[];
         static const int32_t zero;
         static const int32_t one;
         static const int32_t min;
diff --git a/src/OpenFOAM/primitives/ints/int64/int64.C b/src/OpenFOAM/primitives/ints/int64/int64.C
index 5b58fad539..f182c9d276 100644
--- a/src/OpenFOAM/primitives/ints/int64/int64.C
+++ b/src/OpenFOAM/primitives/ints/int64/int64.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ const int64_t Foam::pTraits<int64_t>::max = INT64_MAX;
 const int64_t Foam::pTraits<int64_t>::rootMin = pTraits<int64_t>::min;
 const int64_t Foam::pTraits<int64_t>::rootMax = pTraits<int64_t>::max;
 
-const char* Foam::pTraits<int64_t>::componentNames[] = { "" };
+const char* const Foam::pTraits<int64_t>::componentNames[] = { "" };
 
 Foam::pTraits<int64_t>::pTraits(const int64_t& p)
 :
diff --git a/src/OpenFOAM/primitives/ints/int64/int64.H b/src/OpenFOAM/primitives/ints/int64/int64.H
index 38cd105786..6006321a28 100644
--- a/src/OpenFOAM/primitives/ints/int64/int64.H
+++ b/src/OpenFOAM/primitives/ints/int64/int64.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ public:
     // Static data members
 
         static const char* const typeName;
-        static const char* componentNames[];
+        static const char* const componentNames[];
         static const int64_t zero;
         static const int64_t one;
         static const int64_t min;
diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32.C b/src/OpenFOAM/primitives/ints/uint32/uint32.C
index 2ffe5445dc..c195b355a4 100644
--- a/src/OpenFOAM/primitives/ints/uint32/uint32.C
+++ b/src/OpenFOAM/primitives/ints/uint32/uint32.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ const uint32_t Foam::pTraits<uint32_t>::max = INT32_MAX;
 const uint32_t Foam::pTraits<uint32_t>::rootMin = pTraits<uint32_t>::min;
 const uint32_t Foam::pTraits<uint32_t>::rootMax = pTraits<uint32_t>::max;
 
-const char* Foam::pTraits<uint32_t>::componentNames[] = { "" };
+const char* const Foam::pTraits<uint32_t>::componentNames[] = { "" };
 
 Foam::pTraits<uint32_t>::pTraits(const uint32_t& p)
 :
diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32.H b/src/OpenFOAM/primitives/ints/uint32/uint32.H
index 3b0ad01c7a..9c2a3b6833 100644
--- a/src/OpenFOAM/primitives/ints/uint32/uint32.H
+++ b/src/OpenFOAM/primitives/ints/uint32/uint32.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ public:
     // Static data members
 
         static const char* const typeName;
-        static const char* componentNames[];
+        static const char* const componentNames[];
         static const uint32_t zero;
         static const uint32_t one;
         static const uint32_t min;
diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64.C b/src/OpenFOAM/primitives/ints/uint64/uint64.C
index 63fd8b3194..b099c4b4e0 100644
--- a/src/OpenFOAM/primitives/ints/uint64/uint64.C
+++ b/src/OpenFOAM/primitives/ints/uint64/uint64.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ const uint64_t Foam::pTraits<uint64_t>::max = INT64_MAX;
 const uint64_t Foam::pTraits<uint64_t>::rootMin = pTraits<uint64_t>::min;
 const uint64_t Foam::pTraits<uint64_t>::rootMax = pTraits<uint64_t>::max;
 
-const char* Foam::pTraits<uint64_t>::componentNames[] = { "" };
+const char* const Foam::pTraits<uint64_t>::componentNames[] = { "" };
 
 Foam::pTraits<uint64_t>::pTraits(const uint64_t& p)
 :
diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64.H b/src/OpenFOAM/primitives/ints/uint64/uint64.H
index dc19659462..2d2e31f802 100644
--- a/src/OpenFOAM/primitives/ints/uint64/uint64.H
+++ b/src/OpenFOAM/primitives/ints/uint64/uint64.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ public:
     // Static data members
 
         static const char* const typeName;
-        static const char* componentNames[];
+        static const char* const componentNames[];
         static const uint64_t zero;
         static const uint64_t one;
         static const uint64_t min;
diff --git a/src/OpenFOAM/primitives/triad/triad.C b/src/OpenFOAM/primitives/triad/triad.C
index 8bb2f7cd73..f73e82f4d4 100644
--- a/src/OpenFOAM/primitives/triad/triad.C
+++ b/src/OpenFOAM/primitives/triad/triad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,73 +29,60 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
+template<>
+const char* const Foam::triad::vsType::typeName = "triad";
 
 template<>
-const char* const triad::Vector<vector>::typeName = "triad";
+const char* const Foam::triad::vsType::componentNames[] = {"x", "y", "z"};
 
 template<>
-const char* triad::Vector<vector>::componentNames[] = {"x", "y", "z"};
-
-const triad triad::zero
+const Foam::Vector<Foam::vector> Foam::triad::vsType::zero
 (
-    vector(0, 0, 0),
-    vector(0, 0, 0),
-    vector(0, 0, 0)
+    triad::uniform(vector::uniform(0))
 );
 
-const triad triad::one
+template<>
+const Foam::Vector<Foam::vector> Foam::triad::vsType::one
 (
-    vector(1, 1, 1),
-    vector(1, 1, 1),
-    vector(1, 1, 1)
+    triad::uniform(vector::uniform(1))
 );
 
-const triad triad::max
+template<>
+const Foam::Vector<Foam::vector> Foam::triad::vsType::max
 (
-    vector(VGREAT, VGREAT, VGREAT),
-    vector(VGREAT, VGREAT, VGREAT),
-    vector(VGREAT, VGREAT, VGREAT)
+    triad::uniform(vector::uniform(VGREAT))
 );
 
-const triad triad::min
+template<>
+const Foam::Vector<Foam::vector> Foam::triad::vsType::min
 (
-    vector(-VGREAT, -VGREAT, -VGREAT),
-    vector(-VGREAT, -VGREAT, -VGREAT),
-    vector(-VGREAT, -VGREAT, -VGREAT)
+    triad::uniform(vector::uniform(-VGREAT))
 );
 
-const triad triad::rootMax
+template<>
+const Foam::Vector<Foam::vector> Foam::triad::vsType::rootMax
 (
-    vector(ROOTVGREAT, ROOTVGREAT, ROOTVGREAT),
-    vector(ROOTVGREAT, ROOTVGREAT, ROOTVGREAT),
-    vector(ROOTVGREAT, ROOTVGREAT, ROOTVGREAT)
+    triad::uniform(vector::uniform(ROOTVGREAT))
 );
 
-const triad triad::rootMin
+template<>
+const Foam::Vector<Foam::vector> Foam::triad::vsType::rootMin
 (
-    vector(-ROOTVGREAT, -ROOTVGREAT, -ROOTVGREAT),
-    vector(-ROOTVGREAT, -ROOTVGREAT, -ROOTVGREAT),
-    vector(-ROOTVGREAT, -ROOTVGREAT, -ROOTVGREAT)
+    triad::uniform(vector::uniform(-ROOTVGREAT))
 );
 
-const triad triad::I
+const Foam::triad Foam::triad::I
 (
     vector(1, 0, 0),
     vector(0, 1, 0),
     vector(0, 0, 1)
 );
 
-const triad triad::unset
+const Foam::triad Foam::triad::unset
 (
-    vector(VGREAT, VGREAT, VGREAT),
-    vector(VGREAT, VGREAT, VGREAT),
-    vector(VGREAT, VGREAT, VGREAT)
+    triad::uniform(vector::uniform(VGREAT))
 );
 
-}
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/triad/triad.H b/src/OpenFOAM/primitives/triad/triad.H
index 8755b60bc1..abe8ad0d27 100644
--- a/src/OpenFOAM/primitives/triad/triad.H
+++ b/src/OpenFOAM/primitives/triad/triad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,12 +96,6 @@ public:
 
     // Static data members
 
-        static const triad zero;
-        static const triad one;
-        static const triad max;
-        static const triad min;
-        static const triad rootMax;
-        static const triad rootMin;
         static const triad I;
         static const triad unset;
 

From e5045949f6acac5a85f4a42e65dfa9aa2e656994 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 8 Mar 2016 14:13:05 +0000
Subject: [PATCH 259/447] JohnsonJacksonParticle*FvPatchScalarField.C:
 Corrected null-construction initialization Resolves bug-report
 http://openfoam.org/mantisbt/view.php?id=2022

---
 .../JohnsonJacksonParticleSlipFvPatchVectorField.C       | 4 ++--
 .../JohnsonJacksonParticleThetaFvPatchScalarField.C      | 6 +++---
 .../JohnsonJacksonParticleSlipFvPatchVectorField.C       | 4 ++--
 .../JohnsonJacksonParticleThetaFvPatchScalarField.C      | 9 ++++-----
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index c3d306738d..4aa484cb5f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ JohnsonJacksonParticleSlipFvPatchVectorField
 )
 :
     partialSlipFvPatchVectorField(p, iF),
-    specularityCoefficient_(p.size())
+    specularityCoefficient_("specularityCoefficient", dimless, 0)
 {}
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index f4d7dd4ee9..220c4c05eb 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,8 +48,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField
 )
 :
     mixedFvPatchScalarField(p, iF),
-    restitutionCoefficient_(p.size()),
-    specularityCoefficient_(p.size())
+    restitutionCoefficient_("restitutionCoefficient", dimless, 0),
+    specularityCoefficient_("specularityCoefficient", dimless, 0)
 {}
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index c3d306738d..4aa484cb5f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ JohnsonJacksonParticleSlipFvPatchVectorField
 )
 :
     partialSlipFvPatchVectorField(p, iF),
-    specularityCoefficient_(p.size())
+    specularityCoefficient_("specularityCoefficient", dimless, 0)
 {}
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index f4d7dd4ee9..95fc5b41bf 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,8 +48,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField
 )
 :
     mixedFvPatchScalarField(p, iF),
-    restitutionCoefficient_(p.size()),
-    specularityCoefficient_(p.size())
+    restitutionCoefficient_("restitutionCoefficient", dimless, 0),
+    specularityCoefficient_("specularityCoefficient", dimless, 0)
 {}
 
 
@@ -65,8 +65,7 @@ JohnsonJacksonParticleThetaFvPatchScalarField
     mixedFvPatchScalarField(ptf, p, iF, mapper),
     restitutionCoefficient_(ptf.restitutionCoefficient_),
     specularityCoefficient_(ptf.specularityCoefficient_)
-{
-}
+{}
 
 
 Foam::JohnsonJacksonParticleThetaFvPatchScalarField::

From 21f5499da9b2b453d749215f6cdd6710773ad4db Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 8 Mar 2016 14:14:39 +0000
Subject: [PATCH 260/447] fixedShearStressFvPatchVectorField: Corrected patch
 nuEff access Resolves bug-report
 http://openfoam.org/mantisbt/view.php?id=2020

---
 .../fixedShearStress/fixedShearStressFvPatchVectorField.C     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index db6e0ecd43..979bd51893 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ void Foam::fixedShearStressFvPatchVectorField::updateCoeffs()
         )
     );
 
-    scalarField nuEff(turbModel.nuEff()()[patch().index()]);
+    scalarField nuEff(turbModel.nuEff(patch().index()));
 
     const vectorField Uc(patchInternalField());
 

From 4e6f473a0169b87c8ddbab66ebba826f9d42c56f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 8 Mar 2016 14:24:11 +0000
Subject: [PATCH 261/447] wmake/src/Makefile: Override WM_COMPILE_OPTION with
 Opt for optimized compilation of the wmake utilities Resolves bug-report
 http://openfoam.org/mantisbt/view.php?id=2021

---
 wmake/src/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wmake/src/Makefile b/wmake/src/Makefile
index 4162a3b45d..f14baad937 100644
--- a/wmake/src/Makefile
+++ b/wmake/src/Makefile
@@ -46,6 +46,9 @@ SHELL      = /bin/sh
 # Set compilation and dependency building rules
 #------------------------------------------------------------------------------
 
+# Locally set optimized compilation
+WM_COMPILE_OPTION = Opt
+
 GENERAL_RULES   = $(WM_DIR)/rules/General
 include $(GENERAL_RULES)/general
 

From 4409a0ea5afebb04cb7d9e205d3db2762910fc28 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Mar 2016 09:01:09 +0000
Subject: [PATCH 262/447] etc/bashrc, etc/config.sh: Updates provided by Bruno
 Santos:

 1. "foamCompiler" was changed to a more permanent "WM_COMPILER_TYPE"
    environment variable, so that it can be used by 3rd party
    installation scripts, such as "makeGcc", "makeLLVM" and so on. More
    on this will be provided in issue #1215.

 2. The script functions such as "_foamSource()" and "_foamAddPath()"
    were moved to a new file "etc/config.sh/functions". It has the
    ability to set or unset, depending on whether "WM_BASH_FUNCTIONS" is
    defined or not. This allows for these functions to be reused by
    other scripts, such as "makeGcc".

 3. The script "etc/config.sh/CGAL" relies on whether a local
    environment variable "SOURCE_CGAL_VERSIONS_ONLY" is defined or not,
    so that it will load only the version settings if it's defined. This
    is to make it easier to call this script from "makeCGAL". Although
    it still feels a bit of a clunky hack, but I didn't manage to deduce
    any other way we could do this :( I didn't add indentation within
    the if-block, to make it easier to read the changes. In addition,
    the local variable "common_path" is used to shorten the length of
    the lines and use slightly less repeated code.

 4. Added another new script "etc/config.sh/compiler", which has only
    the version numbers for the compilers taken out from the "settings"
    file. It currently depends on "WM_COMPILER_TYPE" for setting the
    variables, the same way it did with "foamCompiler". This script is
    now always sourced from the "settings" file, for the following
    reasons:

   - "makeGCC" and "makeLLVM" can now take advantage of this script file.

   - The example "compiler" script (detailed next) can rely on this
     script file and then override parameters on-demand, as well as
     allowing for system compilers to have dedicated settings, such as
     setting "WM_CC". This is similar to how the example environment
     script for "paraview" works.

 5. To the script "etc/config.sh/example/compiler" were added a few more examples:

   - It now starts with a block where it first loads the default "compiler" script.

   - Has a "WM_COMPILER=Gcc48u" case example for when we try to use GCC
     4.8 in Ubuntu 15.10. This is just to give the idea that in a
     particular system, we might have several system-wide compiler
     versions. For example, in Ubuntu 15.10, there is GCC 4.7, 4.8 and
     5.2, which could be used for testing performances or compatibility
     with some other 3rd party library.

   - Has the "WM_COMPILER=Icc" case example, related to the original bug
     report, where "WM_CC=icc" and "WM_CXX=icpc", so that the user then
     simply copies this file to their own local preferences folder.

 6. Small bug fix in "etc/config.sh/mpi", where unsetting "minBufferSize" was missing at the end of the script.

 7. Small change in "etc/config.sh/paraview", where "CMAKE_ROOT" is set
    along with "CMAKE_HOME". This is due to a rare issue that occurs on
    people's systems where they have a custom system-wide CMake version
    installed and which is used by having "CMAKE_ROOT" set on that
    environment. This can mess up OpenFOAM's custom ParaView builds,
    given that conflicting CMake versions can lead to not building
    ParaView at all.

   - For more details about "CMAKE_ROOT":
     https://cmake.org/Wiki/CMake_Useful_Variables [^]

 8. The scripts "_foamAddPath _foamAddLib _foamAddMan" were not being
    unset at the end of "settings". They are now unset at the end of
    "bashrc", through a call to the new double-use "functions" script.

Additionally all references to "foamCompiler" have been changed to
"WM_COMPILER_TYPE".

See also http://www.openfoam.org/mantisbt/view.php?id=1232
---
 etc/bashrc                     |  61 +++--------------
 etc/config.sh/CGAL             |  13 +++-
 etc/config.sh/compiler         |  82 ++++++++++++++++++++++
 etc/config.sh/example/compiler |  22 +++++-
 etc/config.sh/example/prefs.sh |   4 +-
 etc/config.sh/functions        | 122 +++++++++++++++++++++++++++++++++
 etc/config.sh/mpi              |   5 ++
 etc/config.sh/paraview         |   1 +
 etc/config.sh/settings         | 101 +++------------------------
 9 files changed, 264 insertions(+), 147 deletions(-)
 create mode 100644 etc/config.sh/compiler
 create mode 100644 etc/config.sh/functions

diff --git a/etc/bashrc b/etc/bashrc
index 3517abfb69..2f76281083 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -58,8 +58,8 @@ foamInstall=$HOME/$WM_PROJECT
 : ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR
 
 #- Compiler location:
-#    foamCompiler= system | ThirdParty (OpenFOAM)
-foamCompiler=system
+#    WM_COMPILER_TYPE= system | ThirdParty (OpenFOAM)
+export WM_COMPILER_TYPE=system
 
 #- Compiler:
 #    WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Gcc48 | Gcc49| Clang | Icc
@@ -137,52 +137,9 @@ fi
 # ~~~~~~~~~~~~~~~~~~~~~~
 export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
 
-
-# Source files, possibly with some verbosity
-_foamSource()
-{
-    while [ $# -ge 1 ]
-    do
-        [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "Sourcing: $1" 1>&2
-        . $1
-       shift
-    done
-}
-
-# Evaluate command-line parameters
-_foamEval()
-{
-    while [ $# -gt 0 ]
-    do
-        case "$1" in
-        -*)
-            # stray option (not meant for us here) -> get out
-            break
-            ;;
-        *=)
-            # name=       -> unset name
-            [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "unset ${1%=}" 1>&2
-            eval "unset ${1%=}"
-            ;;
-        *=*)
-            # name=value  -> export name=value
-            [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "export $1" 1>&2
-            eval "export $1"
-            ;;
-        *)
-            # filename: source it
-            if [ -f "$1" ]
-            then
-                _foamSource "$1"
-            else
-                _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -silent "$1"`
-            fi
-            ;;
-        esac
-        shift
-    done
-}
-
+# Source initialization functions
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+. $WM_PROJECT_DIR/etc/config.sh/functions
 
 # Add in preset user or site preferences:
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh`
@@ -245,9 +202,13 @@ then
 fi
 
 
-# cleanup environment:
+# Cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
 unset cleaned foamClean foamInstall foamOldDirs
-unset _foamSource _foamEval
+
+
+# Unload initialization functions:
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+. $WM_PROJECT_DIR/etc/config.sh/functions
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index 5b6a32618c..c76aabe75e 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -32,8 +32,13 @@
 boost_version=boost-system
 cgal_version=CGAL-4.7
 
-export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
-export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
+if [ -z "$SOURCE_CGAL_VERSIONS_ONLY" ]
+then
+
+common_path=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
+
+export BOOST_ARCH_PATH=$common_path/$boost_version
+export CGAL_ARCH_PATH=$common_path/$cgal_version
 
 if [ "$FOAM_VERBOSE" -a "$PS1" ]
 then
@@ -52,6 +57,8 @@ then
     _foamAddLib $BOOST_ARCH_PATH/lib
 fi
 
-unset boost_version cgal_version
+unset boost_version cgal_version common_path
+
+fi
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler
new file mode 100644
index 0000000000..63099a7923
--- /dev/null
+++ b/etc/config.sh/compiler
@@ -0,0 +1,82 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2016 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/>.
+#
+# File
+#     etc/config.sh/compiler
+#
+# Description
+#     Startup file for custom compiler versions for OpenFOAM
+#     Sourced from OpenFOAM-<VERSION>/etc/config.sh/settings
+#
+#------------------------------------------------------------------------------
+
+case "$WM_COMPILER_TYPE" in
+OpenFOAM | ThirdParty)
+
+    # Default versions of GMP, MPFR and MPC, override as necessary
+    gmp_version=gmp-5.1.2
+    mpfr_version=mpfr-3.1.2
+    mpc_version=mpc-1.0.1
+
+    case "$WM_COMPILER" in
+    Gcc | Gcc48)
+        gcc_version=gcc-4.8.5
+        ;;
+    Gcc45)
+        gcc_version=gcc-4.5.4
+        ;;
+    Gcc46)
+        gcc_version=gcc-4.6.4
+        ;;
+    Gcc47)
+        gcc_version=gcc-4.7.4
+        ;;
+    Gcc49)
+        gcc_version=gcc-4.9.3
+        ;;
+    Gcc51)
+        gcc_version=gcc-5.1.0
+        ;;
+    Gcc52)
+        gcc_version=gcc-5.2.0
+        ;;
+    Gcc53)
+        gcc_version=gcc-5.3.0
+        ;;
+    Clang)
+        # Using clang - not gcc
+        export WM_CC='clang'
+        export WM_CXX='clang++'
+        clang_version=llvm-3.7.0
+        ;;
+    *)
+        echo 1>&2
+        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/compiler:" 1>&2
+        echo "    Unknown OpenFOAM compiler type '$WM_COMPILER'" 1>&2
+        echo "    Please check your settings" 1>&2
+        echo 1>&2
+        ;;
+    esac
+    ;;
+
+esac
diff --git a/etc/config.sh/example/compiler b/etc/config.sh/example/compiler
index 34658b8217..493cafb56e 100644
--- a/etc/config.sh/example/compiler
+++ b/etc/config.sh/example/compiler
@@ -25,12 +25,19 @@
 #     config.sh/example/compiler
 #
 # Description
-#     Example of fine tuning ThirdParty compiler settings for OpenFOAM
+#     Example of fine tuning compiler versions and settings for OpenFOAM
 #     Sourced from OpenFOAM-<VERSION>/etc/config.sh/settings
 #
 #------------------------------------------------------------------------------
 
-# Modified compiler settings
+# First load the standard versions, if necessary
+foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o config.sh/compiler \
+               2>/dev/null)
+[ $? -eq 0 ] && _foamSource $foamFile
+unset foamFile
+
+
+# Override compiler settings
 case "$WM_COMPILER" in
 Gcc46 | Gcc46++0x)
     gcc_version=gcc-4.6.0
@@ -44,6 +51,17 @@ Gcc45 | Gcc45++0x)
     mpfr_version=mpfr-2.4.2
     mpc_version=mpc-0.8.1
     ;;
+Gcc48u)
+    # Example of using the system GCC 4.8 in Ubuntu 15.10. Keep in mind you
+    # will also need to create respective directory in "wmake/rules"
+    export WM_CC='gcc-4.8'
+    export WM_CXX='g++-4.8'
+    ;;
+Icc)
+    # Example for ensuring that 3rd software uses the Icc compilers
+    export WM_CC='icc'
+    export WM_CXX='icpc'
+    ;;
 esac
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/example/prefs.sh b/etc/config.sh/example/prefs.sh
index a378712af5..58b1fd7661 100644
--- a/etc/config.sh/example/prefs.sh
+++ b/etc/config.sh/example/prefs.sh
@@ -38,7 +38,7 @@
 
 ## Specify OpenFOAM ThirdParty compiler
 ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# foamCompiler=ThirdParty
+#WM_COMPILER_TYPE=ThirdParty
 
 ## Specify compiler type
 ## ~~~~~~~~~~~~~~~~~~~~~
@@ -46,7 +46,7 @@
 
 ## Specify system openmpi
 ## ~~~~~~~~~~~~~~~~~~~~~~
-# export WM_MPLIB=SYSTEMOPENMPI
+#export WM_MPLIB=SYSTEMOPENMPI
 
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/functions b/etc/config.sh/functions
new file mode 100644
index 0000000000..dcec6549d4
--- /dev/null
+++ b/etc/config.sh/functions
@@ -0,0 +1,122 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2016 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/>.
+#
+# File
+#     etc/config.sh/functions
+#
+# Description
+#     Initialization script functions for the bashrc environment
+#     Sourced from OpenFOAM-<VERSION>/etc/config.sh/bashrc
+#
+#------------------------------------------------------------------------------
+
+if [ -z "$WM_BASH_FUNCTIONS" ]
+then
+
+    # Temporary environment variable for automatically (un)loading functions
+    WM_BASH_FUNCTIONS=loaded
+
+    # Source files, possibly with some verbosity
+    _foamSource()
+    {
+        while [ $# -ge 1 ]
+        do
+            [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "Sourcing: $1" 1>&2
+            . $1
+          shift
+        done
+    }
+
+    # Evaluate command-line parameters
+    _foamEval()
+    {
+        while [ $# -gt 0 ]
+        do
+            case "$1" in
+            -*)
+                # stray option (not meant for us here) -> get out
+                break
+                ;;
+            *=)
+                # name=       -> unset name
+                [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "unset ${1%=}" 1>&2
+                eval "unset ${1%=}"
+                ;;
+            *=*)
+                # name=value  -> export name=value
+                [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "export $1" 1>&2
+                eval "export $1"
+                ;;
+            *)
+                # filename: source it
+                if [ -f "$1" ]
+                then
+                    _foamSource "$1"
+                else
+                    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -silent "$1"`
+                fi
+                ;;
+            esac
+            shift
+        done
+    }
+
+    # Prefix to PATH
+    _foamAddPath()
+    {
+        while [ $# -ge 1 ]
+        do
+            export PATH=$1:$PATH
+            shift
+        done
+    }
+
+    # Prefix to LD_LIBRARY_PATH
+    _foamAddLib()
+    {
+        while [ $# -ge 1 ]
+        do
+            export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
+            shift
+        done
+    }
+
+    # Prefix to MANPATH
+    _foamAddMan()
+    {
+        while [ $# -ge 1 ]
+        do
+            export MANPATH=$1:$MANPATH
+            shift
+        done
+    }
+
+else
+
+    # Cleanup environment:
+    # ~~~~~~~~~~~~~~~~~~~~
+    unset WM_BASH_FUNCTIONS
+    unset _foamAddPath _foamAddLib _foamAddMan
+    unset _foamSource _foamEval
+
+fi
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index f31c0018f6..36b651e0fc 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -267,4 +267,9 @@ then
 fi
 export MPI_BUFFER_SIZE
 
+
+# Cleanup environment:
+# ~~~~~~~~~~~~~~~~~~~~
+unset minBufferSize
+
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index c686b32702..0d14688677 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -49,6 +49,7 @@ do
     if [ -r $cmake ]
     then
         export CMAKE_HOME=$cmake
+        export CMAKE_ROOT=$cmake
         export PATH=$CMAKE_HOME/bin:$PATH
         break
     fi
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index cdd3b21f20..aff65057c3 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -30,37 +30,6 @@
 #
 #------------------------------------------------------------------------------
 
-# Prefix to PATH
-_foamAddPath()
-{
-    while [ $# -ge 1 ]
-    do
-        export PATH=$1:$PATH
-        shift
-    done
-}
-
-# Prefix to LD_LIBRARY_PATH
-_foamAddLib()
-{
-    while [ $# -ge 1 ]
-    do
-        export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
-        shift
-    done
-}
-
-# Prefix to MANPATH
-_foamAddMan()
-{
-    while [ $# -ge 1 ]
-    do
-        export MANPATH=$1:$MANPATH
-        shift
-    done
-}
-
-#------------------------------------------------------------------------------
 # Set environment variables according to system type
 export WM_ARCH=`uname -s`
 
@@ -233,61 +202,19 @@ unset MPFR_ARCH_PATH GMP_ARCH_PATH
 
 # Location of compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-if [ -z "$foamCompiler" ]
+if [ -z "$WM_COMPILER_TYPE" ]
 then
-    foamCompiler=system
+    WM_COMPILER_TYPE=system
     echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
-    echo "    foamCompiler not set, using '$foamCompiler'" 1>&2
+    echo "    WM_COMPILER_TYPE not set, using '$WM_COMPILER_TYPE'" 1>&2
 fi
 
-case "${foamCompiler}" in
-OpenFOAM | ThirdParty)
-    # Default versions of GMP, MPFR and MPC, overide as necessary
-    gmp_version=gmp-5.1.2
-    mpfr_version=mpfr-3.1.2
-    mpc_version=mpc-1.0.1
-    case "$WM_COMPILER" in
-    Gcc | Gcc48)
-        gcc_version=gcc-4.8.5
-        ;;
-    Gcc45)
-        gcc_version=gcc-4.5.4
-        ;;
-    Gcc46)
-        gcc_version=gcc-4.6.4
-        ;;
-    Gcc47)
-        gcc_version=gcc-4.7.4
-        ;;
-    Gcc49)
-        gcc_version=gcc-4.9.3
-        ;;
-    Gcc51)
-        gcc_version=gcc-5.1.0
-        ;;
-    Gcc52)
-        gcc_version=gcc-5.2.0
-        ;;
-    Gcc53)
-        gcc_version=gcc-5.3.0
-        ;;
-    Clang)
-        # Using clang - not gcc
-        export WM_CC='clang'
-        export WM_CXX='clang++'
-        clang_version=llvm-3.7.0
-        ;;
-    *)
-        echo 1>&2
-        echo "Warning in $WM_PROJECT_DIR/etc/config.sh/settings:" 1>&2
-        echo "    Unknown OpenFOAM compiler type '$WM_COMPILER'" 1>&2
-        echo "    Please check your settings" 1>&2
-        echo 1>&2
-        ;;
-    esac
+# Load configured compiler versions, regardless of the compiler type
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler`
 
-    # Optional configuration tweaks:
-    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler`
+case "$WM_COMPILER_TYPE" in
+OpenFOAM | ThirdParty)
 
     if [ -n "$gcc_version" ]
     then
@@ -303,7 +230,7 @@ OpenFOAM | ThirdParty)
             echo "    Cannot find $gccDir installation." 1>&2
             echo "    Please install this compiler version or if you wish to" \
                  " use the system compiler," 1>&2
-            echo "    change the 'foamCompiler' setting to 'system'" 1>&2
+            echo "    change the 'WM_COMPILER_TYPE' setting to 'system'" 1>&2
             echo
         }
 
@@ -341,7 +268,7 @@ OpenFOAM | ThirdParty)
             echo "    Cannot find $clangDir installation." 1>&2
             echo "    Please install this compiler version or if you wish to" \
                  " use the system compiler," 1>&2
-            echo "    change the 'foamCompiler' setting to 'system'" 1>&2
+            echo "    change the 'WM_COMPILER_TYPE' setting to 'system'" 1>&2
             echo 1>&2
         }
 
@@ -354,15 +281,9 @@ system)
     # Use system compiler
     ;;
 *)
-    echo "Warn: foamCompiler='$foamCompiler' is unsupported" 1>&2
+    echo "Warn: WM_COMPILER_TYPE='$WM_COMPILER_TYPE' is unsupported" 1>&2
     echo "   treating as 'system' instead" 1>&2
     ;;
 esac
 
-
-# Cleanup environment:
-# ~~~~~~~~~~~~~~~~~~~~
-#keep _foamAddPath _foamAddLib _foamAddMan
-unset foamCompiler minBufferSize
-
 #------------------------------------------------------------------------------

From 80c3bcff48f414a50ff12ecf5f6e699ca1e8ce47 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Mar 2016 09:05:07 +0000
Subject: [PATCH 263/447] bin/tools/foamConfigurePaths: foamCompiler ->
 WM_COMPILER_TYPE

---
 bin/tools/foamConfigurePaths | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths
index 57e714c9c4..41f82f277d 100755
--- a/bin/tools/foamConfigurePaths
+++ b/bin/tools/foamConfigurePaths
@@ -204,11 +204,11 @@ _inlineSed \
     'export WM_MPLIB=SYSTEMOPENMPI' \
     "Replacing WM_MPLIB setting by 'SYSTEMOPENMPI'"
 
-## set foamCompiler=system always
+## set WM_COMPILER_TYPE=system always
 #_inlineSed \
 #    etc/bashrc \
-#    'foamCompiler=.*' \
-#    'foamCompiler=system' \
-#    "Replacing foamCompiler setting by 'system'"
+#    'WM_COMPILER_TYPE=.*' \
+#    'WM_COMPILER_TYPE=system' \
+#    "Replacing WM_COMPILER_TYPE setting by 'system'"
 
 #------------------------------------------------------------------------------

From c28a0c0d94b97e70c219731c4a371df8924e8fe3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Mar 2016 09:05:35 +0000
Subject: [PATCH 264/447] etc/cshrc, etc/config.csh: foamCompiler ->
 WM_COMPILER_TYPE for consistency with etc/bashrc and etc/config.sh

See commit 4409a0ea5afebb04cb7d9e205d3db2762910fc28
---
 etc/config.csh/example/prefs.csh |  2 +-
 etc/config.csh/settings          | 16 ++++++++--------
 etc/cshrc                        |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/etc/config.csh/example/prefs.csh b/etc/config.csh/example/prefs.csh
index c5e7cd7fa3..20ac1a67be 100644
--- a/etc/config.csh/example/prefs.csh
+++ b/etc/config.csh/example/prefs.csh
@@ -38,7 +38,7 @@
 
 ## Specify OpenFOAM ThirdParty compiler
 ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# set foamCompiler=ThirdParty
+# set WM_COMPILER_TYPE=ThirdParty
 
 ## Specify compiler type
 ## ~~~~~~~~~~~~~~~~~~~~~
diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index 499c3b5dc8..55d100610c 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -207,13 +207,13 @@ unsetenv MPFR_ARCH_PATH GMP_ARCH_PATH
 
 # Location of compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-if ( ! $?foamCompiler ) then
-    set foamCompiler=system
+if ( ! $?WM_COMPILER_TYPE ) then
+    set WM_COMPILER_TYPE=system
     echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
-    echo "    foamCompiler not set, using '$foamCompiler'"
+    echo "    WM_COMPILER_TYPE not set, using '$WM_COMPILER_TYPE'"
 endif
 
-switch ("$foamCompiler")
+switch ("$WM_COMPILER_TYPE")
 case OpenFOAM:
 case ThirdParty:
     # Default versions of GMP, MPFR and MPC, overide as necessary
@@ -279,7 +279,7 @@ case ThirdParty:
             echo "    Cannot find $gccDir installation."
             echo "    Please install this compiler version or if you wish to" \
                  " use the system compiler,"
-            echo "    change the 'foamCompiler' setting to 'system'"
+            echo "    change the 'WM_COMPILER_TYPE' setting to 'system'"
             echo
         endif
 
@@ -315,7 +315,7 @@ case ThirdParty:
             echo "    Cannot find $clangDir installation."
             echo "    Please install this compiler version or if you wish to" \
                  " use the system compiler,"
-            echo "    change the 'foamCompiler' setting to 'system'"
+            echo "    change the 'WM_COMPILER_TYPE' setting to 'system'"
             echo
         endif
 
@@ -331,7 +331,7 @@ case system:
     breaksw
 
 default:
-    echo "Warn: foamCompiler='$foamCompiler' is unsupported"
+    echo "Warn: WM_COMPILER_TYPE='$WM_COMPILER_TYPE' is unsupported"
     echo "   treating as 'system' instead"
     breaksw
 endsw
@@ -341,6 +341,6 @@ endsw
 # ~~~~~~~~~~~~~~~~~~~~
 #- keep _foamAddPath _foamAddLib _foamAddMan
 unset minBufferSize
-unsetenv foamCompiler
+unsetenv WM_COMPILER_TYPE
 
 #------------------------------------------------------------------------------
diff --git a/etc/cshrc b/etc/cshrc
index dd31a33b99..3390248980 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -57,8 +57,8 @@ set foamInstall = $HOME/$WM_PROJECT
 if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
 
 #- Compiler location:
-#    foamCompiler = system | ThirdParty (OpenFOAM)
-setenv foamCompiler system
+#    WM_COMPILER_TYPE = system | ThirdParty (OpenFOAM)
+setenv WM_COMPILER_TYPE system
 
 #- Compiler:
 #    WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Gcc48 | Gcc49 | Clang | Icc

From 2027059b63a617dcae86f5ddf6a5b636a1519127 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Mar 2016 10:10:28 +0000
Subject: [PATCH 265/447] src/OpenFOAM: changed template rank type from int to
 Foam::direction

Foam::direction is an unsigned type which makes it easier for the
compiler to pickup and report errors in the instantiation of
VectorSpaces and associated types.
---
 .../dimensionedType/dimensionedType.C         |   6 +-
 .../dimensionedType/dimensionedType.H         |   6 +-
 .../DimensionedFieldFunctions.C               |  12 +-
 .../DimensionedFieldFunctions.H               |  12 +-
 .../FieldField/FieldFieldFunctions.C          |  54 ++++++--
 .../FieldField/FieldFieldFunctions.H          |  54 ++++++--
 src/OpenFOAM/fields/Fields/Field/Field.C      |   2 +-
 src/OpenFOAM/fields/Fields/Field/Field.H      |   2 +-
 .../fields/Fields/Field/FieldFunctions.C      |  18 +--
 .../fields/Fields/Field/FieldFunctions.H      |  20 +--
 .../GeometricField/GeometricFieldFunctions.C  |  32 ++++-
 .../GeometricField/GeometricFieldFunctions.H  |  32 ++++-
 .../pointPatchFieldFunctions.H                |   6 +-
 .../primitives/DiagTensor/DiagTensor.H        |   6 +-
 src/OpenFOAM/primitives/Scalar/Scalar.H       |  17 ++-
 .../SphericalTensor/SphericalTensor.H         |   6 +-
 .../SphericalTensor2D/SphericalTensor2D.H     |   6 +-
 .../primitives/SymmTensor/SymmTensor.H        |   6 +-
 .../primitives/SymmTensor2D/SymmTensor2D.H    |   6 +-
 src/OpenFOAM/primitives/Tensor/Tensor.H       |   6 +-
 src/OpenFOAM/primitives/Tensor2D/Tensor2D.H   |   6 +-
 src/OpenFOAM/primitives/Vector/Vector.H       |   6 +-
 src/OpenFOAM/primitives/Vector2D/Vector2D.H   |   6 +-
 .../primitives/VectorSpace/VectorSpace.C      |  25 ++--
 .../primitives/VectorSpace/VectorSpace.H      |  13 +-
 .../primitives/VectorSpace/VectorSpaceI.H     | 123 +++++++++---------
 .../primitives/VectorSpace/VectorSpaceOps.H   |   4 +-
 .../primitives/VectorSpace/products.H         |  16 +--
 src/OpenFOAM/primitives/bools/bool/bool.H     |  15 ++-
 src/OpenFOAM/primitives/ints/int32/int32.H    |  15 ++-
 src/OpenFOAM/primitives/ints/int64/int64.H    |  15 ++-
 src/OpenFOAM/primitives/ints/uint32/uint32.H  |  15 ++-
 src/OpenFOAM/primitives/ints/uint64/uint64.H  |  15 ++-
 .../primitives/quaternion/quaternion.H        |   9 +-
 34 files changed, 355 insertions(+), 237 deletions(-)

diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 220b7256c6..f110dd803d 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -447,7 +447,7 @@ void Foam::dimensioned<Type>::operator/=
 
 // * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
 
-template<class Type, int r>
+template<class Type, Foam::direction r>
 Foam::dimensioned<typename Foam::powProduct<Type, r>::type>
 Foam::pow(const dimensioned<Type>& dt, typename powProduct<Type, r>::type)
 {
@@ -747,7 +747,7 @@ Foam::operator op                                                              \
     );                                                                         \
 }                                                                              \
                                                                                \
-template<class Type, class Form, class Cmpt, int nCmpt>                        \
+template<class Type, class Form, class Cmpt, Foam::direction nCmpt>            \
 Foam::dimensioned<typename Foam::product<Type, Form>::type>                    \
 Foam::operator op                                                              \
 (                                                                              \
@@ -763,7 +763,7 @@ Foam::operator op                                                              \
     );                                                                         \
 }                                                                              \
                                                                                \
-template<class Type, class Form, class Cmpt, int nCmpt>                        \
+template<class Type, class Form, class Cmpt, Foam::direction nCmpt>            \
 Foam::dimensioned<typename Foam::product<Form, Type>::type>                    \
 Foam::operator op                                                              \
 (                                                                              \
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index f94aa39829..7d1549f4b2 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -231,7 +231,7 @@ public:
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
-template<class Type, int r>
+template<class Type, direction r>
 dimensioned<typename powProduct<Type, r>::type>
 pow
 (
@@ -306,7 +306,7 @@ template<class Type1, class Type2>                                             \
 dimensioned<typename product<Type1, Type2>::type>                              \
 operator op(const dimensioned<Type1>&, const dimensioned<Type2>&);             \
                                                                                \
-template<class Type, class Form, class Cmpt, int nCmpt>                        \
+template<class Type, class Form, class Cmpt, direction nCmpt>                  \
 dimensioned<typename product<Type, Form>::type>                                \
 operator op                                                                    \
 (                                                                              \
@@ -314,7 +314,7 @@ operator op                                                                    \
     const VectorSpace<Form,Cmpt,nCmpt>&                                        \
 );                                                                             \
                                                                                \
-template<class Type, class Form, class Cmpt, int nCmpt>                        \
+template<class Type, class Form, class Cmpt, direction nCmpt>                  \
 dimensioned<typename product<Form, Type>::type>                                \
 operator op                                                                    \
 (                                                                              \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
index dc2a68de38..f1bd35b9d2 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
@@ -35,7 +35,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * //
 
-template<class Type, class GeoMesh, int r>
+template<class Type, class GeoMesh, direction r>
 tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
@@ -66,7 +66,7 @@ pow
 }
 
 
-template<class Type, class GeoMesh, int r>
+template<class Type, class GeoMesh, direction r>
 tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
@@ -510,7 +510,7 @@ operator op                                                                    \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
 operator op                                                                    \
 (                                                                              \
@@ -549,7 +549,7 @@ operator op                                                                    \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
 operator op                                                                    \
 (                                                                              \
@@ -590,7 +590,7 @@ operator op                                                                    \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
 operator op                                                                    \
 (                                                                              \
@@ -628,7 +628,7 @@ operator op                                                                    \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
 operator op                                                                    \
 (                                                                              \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
index 6501bcf51f..f39dff925d 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
@@ -35,7 +35,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * //
 
-template<class Type, class GeoMesh, int r>
+template<class Type, class GeoMesh, direction r>
 tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
@@ -43,7 +43,7 @@ pow
     typename powProduct<Type, r>::type
 );
 
-template<class Type, class GeoMesh, int r>
+template<class Type, class GeoMesh, direction r>
 tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
@@ -191,7 +191,7 @@ operator op                                                                    \
     const dimensioned<Form>& dvs                                               \
 );                                                                             \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
 operator op                                                                    \
 (                                                                              \
@@ -207,7 +207,7 @@ operator op                                                                    \
     const dimensioned<Form>& dvs                                               \
 );                                                                             \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
 operator op                                                                    \
 (                                                                              \
@@ -223,7 +223,7 @@ operator op                                                                    \
     const DimensionedField<Type, GeoMesh>& df1                                 \
 );                                                                             \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
 operator op                                                                    \
 (                                                                              \
@@ -239,7 +239,7 @@ operator op                                                                    \
     const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
 );                                                                             \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>         \
+template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
 operator op                                                                    \
 (                                                                              \
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index 14e1d79ff3..affb77661b 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -61,7 +61,7 @@ void T(FieldField<Field, Type>& f1, const FieldField<Field, Type>& f2)
 }
 
 
-template<template<class> class Field, class Type, int r>
+template<template<class> class Field, class Type, direction r>
 void pow
 (
     FieldField<Field, typename powProduct<Type, r>::type>& f,
@@ -74,7 +74,7 @@ void pow
     }
 }
 
-template<template<class> class Field, class Type, int r>
+template<template<class> class Field, class Type, direction r>
 tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
@@ -90,7 +90,7 @@ pow
     return tRes;
 }
 
-template<template<class> class Field, class Type, int r>
+template<template<class> class Field, class Type, direction r>
 tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
@@ -761,7 +761,13 @@ operator op                                                                    \
 }                                                                              \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 void opFunc                                                                    \
 (                                                                              \
     FieldField<Field, typename product<Type, Form>::type>& f,                  \
@@ -776,7 +782,13 @@ void opFunc                                                                    \
 }                                                                              \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 tmp<FieldField<Field, typename product<Type, Form>::type>>                     \
 operator op                                                                    \
 (                                                                              \
@@ -794,7 +806,13 @@ operator op                                                                    \
 }                                                                              \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 tmp<FieldField<Field, typename product<Type, Form>::type>>                     \
 operator op                                                                    \
 (                                                                              \
@@ -813,7 +831,13 @@ operator op                                                                    \
 }                                                                              \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 void opFunc                                                                    \
 (                                                                              \
     FieldField<Field, typename product<Form, Type>::type>& f,                  \
@@ -828,7 +852,13 @@ void opFunc                                                                    \
 }                                                                              \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 tmp<FieldField<Field, typename product<Form, Type>::type>>                     \
 operator op                                                                    \
 (                                                                              \
@@ -846,7 +876,13 @@ operator op                                                                    \
 }                                                                              \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 tmp<FieldField<Field, typename product<Form, Type>::type>>                     \
 operator op                                                                    \
 (                                                                              \
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
index 0800ab9869..7934f86092 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
@@ -47,14 +47,14 @@ template<template<class> class Field, class Type>
 void T(FieldField<Field, Type>& f1, const FieldField<Field, Type>& f2);
 
 
-template<template<class> class Field, class Type, int r>
+template<template<class> class Field, class Type, direction r>
 void pow
 (
     FieldField<Field, typename powProduct<Type, r>::type>& f,
     const FieldField<Field, Type>& vf
 );
 
-template<template<class> class Field, class Type, int r>
+template<template<class> class Field, class Type, direction r>
 tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
@@ -62,7 +62,7 @@ pow
         = pTraits<typename powProduct<Type, r>::type>::zero
 );
 
-template<template<class> class Field, class Type, int r>
+template<template<class> class Field, class Type, direction r>
 tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
@@ -346,7 +346,13 @@ operator op                                                                    \
 );                                                                             \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 void opFunc                                                                    \
 (                                                                              \
     FieldField<Field, typename product<Type, Form>::type>& f,                  \
@@ -355,7 +361,13 @@ void opFunc                                                                    \
 );                                                                             \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 tmp<FieldField<Field, typename product<Type, Form>::type>>                     \
 operator op                                                                    \
 (                                                                              \
@@ -364,7 +376,13 @@ operator op                                                                    \
 );                                                                             \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 tmp<FieldField<Field, typename product<Type, Form>::type>>                     \
 operator op                                                                    \
 (                                                                              \
@@ -373,7 +391,13 @@ operator op                                                                    \
 );                                                                             \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 void opFunc                                                                    \
 (                                                                              \
     FieldField<Field, typename product<Form, Type>::type>& f,                  \
@@ -382,7 +406,13 @@ void opFunc                                                                    \
 );                                                                             \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 tmp<FieldField<Field, typename product<Form, Type>::type>>                     \
 operator op                                                                    \
 (                                                                              \
@@ -391,7 +421,13 @@ operator op                                                                    \
 );                                                                             \
                                                                                \
 template                                                                       \
-<template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
+<                                                                              \
+    template<class> class Field,                                               \
+    class Type,                                                                \
+    class Form,                                                                \
+    class Cmpt,                                                                \
+    direction nCmpt                                                            \
+>                                                                              \
 tmp<FieldField<Field, typename product<Form, Type>::type>>                     \
 operator op                                                                    \
 (                                                                              \
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 4a7569bc01..0ca41e54a0 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -701,7 +701,7 @@ void Foam::Field<Type>::operator=(const Type& t)
 
 
 template<class Type>
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, Foam::direction nCmpt>
 void Foam::Field<Type>::operator=(const VectorSpace<Form,Cmpt,nCmpt>& vs)
 {
     TFOR_ALL_F_OP_S(Type, *this, =, VSType, vs)
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index a5d01b47f7..6f08f05926 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -345,7 +345,7 @@ public:
         void operator=(const tmp<Field<Type>>&);
         void operator=(const Type&);
 
-        template<class Form, class Cmpt, int nCmpt>
+        template<class Form, class Cmpt, direction nCmpt>
         void operator=(const VectorSpace<Form,Cmpt,nCmpt>&);
 
         void operator+=(const UList<Type>&);
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index d2b3e2d6b1..c75a045f5d 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -59,7 +59,7 @@ void T(Field<Type>& res, const UList<Type>& f)
 }
 
 
-template<class Type, int r>
+template<class Type, direction r>
 void pow
 (
     Field<typename powProduct<Type, r>::type>& res,
@@ -74,7 +74,7 @@ void pow
     )
 }
 
-template<class Type, int r>
+template<class Type, direction r>
 tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
@@ -91,7 +91,7 @@ pow
     return tRes;
 }
 
-template<class Type, int r>
+template<class Type, direction r>
 tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
@@ -692,7 +692,7 @@ operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2)        \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
-template<class Type, class Form, class Cmpt, int nCmpt>                        \
+template<class Type, class Form, class Cmpt, direction nCmpt>                  \
 void OpFunc                                                                    \
 (                                                                              \
     Field<typename product<Type, Form>::type>& res,                            \
@@ -705,7 +705,7 @@ void OpFunc                                                                    \
         (productType, res, =,Type, f1, Op, Form, static_cast<const Form&>(vs)) \
 }                                                                              \
                                                                                \
-template<class Type, class Form, class Cmpt, int nCmpt>                        \
+template<class Type, class Form, class Cmpt, direction nCmpt>                  \
 tmp<Field<typename product<Type, Form>::type>>                                 \
 operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs)     \
 {                                                                              \
@@ -715,7 +715,7 @@ operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs)     \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
-template<class Type, class Form, class Cmpt, int nCmpt>                        \
+template<class Type, class Form, class Cmpt, direction nCmpt>                  \
 tmp<Field<typename product<Type, Form>::type>>                                 \
 operator Op                                                                    \
 (                                                                              \
@@ -730,7 +730,7 @@ operator Op                                                                    \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type>                        \
+template<class Form, class Cmpt, direction nCmpt, class Type>                  \
 void OpFunc                                                                    \
 (                                                                              \
     Field<typename product<Form, Type>::type>& res,                            \
@@ -743,7 +743,7 @@ void OpFunc                                                                    \
         (productType, res, =,Form,static_cast<const Form&>(vs), Op, Type, f1)  \
 }                                                                              \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type>                        \
+template<class Form, class Cmpt, direction nCmpt, class Type>                  \
 tmp<Field<typename product<Form, Type>::type>>                                 \
 operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1)     \
 {                                                                              \
@@ -753,7 +753,7 @@ operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1)     \
     return tRes;                                                               \
 }                                                                              \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type>                        \
+template<class Form, class Cmpt, direction nCmpt, class Type>                  \
 tmp<Field<typename product<Form, Type>::type>>                                 \
 operator Op                                                                    \
 (                                                                              \
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
index 56c422a5fd..29f52c49e0 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
@@ -47,7 +47,7 @@ template<class Type>
 void T(Field<Type>& res, const UList<Type>& f);
 
 
-template<class Type, int r>
+template<class Type, direction r>
 void pow
 (
     Field<typename powProduct<Type, r>::type>& res,
@@ -55,7 +55,7 @@ void pow
 );
 
 
-template<class Type, int r>
+template<class Type, direction r>
 tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
@@ -64,7 +64,7 @@ pow
       = pTraits<typename powProduct<Type, r>::type>::zero
 );
 
-template<class Type, int r>
+template<class Type, direction r>
 tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
@@ -307,7 +307,7 @@ template<class Type1, class Type2>                                             \
 tmp<Field<typename product<Type1, Type2>::type>>                               \
 operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2);       \
                                                                                \
-template<class Type, class Form, class Cmpt, int nCmpt>                        \
+template<class Type, class Form, class Cmpt, direction nCmpt>                  \
 void OpFunc                                                                    \
 (                                                                              \
     Field<typename product<Type, Form>::type>& res,                            \
@@ -315,15 +315,15 @@ void OpFunc                                                                    \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 );                                                                             \
                                                                                \
-template<class Type, class Form, class Cmpt, int nCmpt>                        \
+template<class Type, class Form, class Cmpt, direction nCmpt>                  \
 tmp<Field<typename product<Type, Form>::type>>                                 \
 operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs);    \
                                                                                \
-template<class Type, class Form, class Cmpt, int nCmpt>                        \
+template<class Type, class Form, class Cmpt, direction nCmpt>                  \
 tmp<Field<typename product<Type, Form>::type>>                                 \
-operator Op(const tmp<Field<Type>>&tf1,const VectorSpace<Form,Cmpt,nCmpt>&vs);\
+operator Op(const tmp<Field<Type>>&tf1,const VectorSpace<Form,Cmpt,nCmpt>&vs); \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type>                        \
+template<class Form, class Cmpt, direction nCmpt, class Type>                  \
 void OpFunc                                                                    \
 (                                                                              \
     Field<typename product<Form, Type>::type>& res,                            \
@@ -331,11 +331,11 @@ void OpFunc                                                                    \
     const UList<Type>& f1                                                      \
 );                                                                             \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type>                        \
+template<class Form, class Cmpt, direction nCmpt, class Type>                  \
 tmp<Field<typename product<Form, Type>::type>>                                 \
 operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1);    \
                                                                                \
-template<class Form, class Cmpt, int nCmpt, class Type>                        \
+template<class Form, class Cmpt, direction nCmpt, class Type>                  \
 tmp<Field<typename product<Form, Type>::type>>                                 \
 operator Op(const VectorSpace<Form,Cmpt,nCmpt>&vs,const tmp<Field<Type>>&tf1);
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
index cb723b0aed..e04a1588b5 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
@@ -66,7 +66,13 @@ void T
 }
 
 
-template<class Type, template<class> class PatchField, class GeoMesh, int r>
+template
+<
+    class Type,
+    template<class> class PatchField,
+    class GeoMesh,
+    direction r
+>
 void pow
 (
     GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>& gf,
@@ -77,7 +83,13 @@ void pow
     pow(gf.boundaryField(), gf1.boundaryField(), r);
 }
 
-template<class Type, template<class> class PatchField, class GeoMesh, int r>
+template
+<
+    class Type,
+    template<class> class PatchField,
+    class GeoMesh,
+    direction r
+>
 tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>>
 pow
 (
@@ -110,7 +122,13 @@ pow
 }
 
 
-template<class Type, template<class> class PatchField, class GeoMesh, int r>
+template
+<
+    class Type,
+    template<class> class PatchField,
+    class GeoMesh,
+    direction r
+>
 tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>>
 pow
 (
@@ -768,7 +786,7 @@ template                                                                       \
 <                                                                              \
     class Form,                                                                \
     class Cmpt,                                                                \
-    int nCmpt,                                                                 \
+    direction nCmpt,                                                           \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
@@ -815,7 +833,7 @@ template                                                                       \
 <                                                                              \
     class Form,                                                                \
     class Cmpt,                                                                \
-    int nCmpt,                                                                 \
+    direction nCmpt,                                                           \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
@@ -880,7 +898,7 @@ template                                                                       \
 <                                                                              \
     class Form,                                                                \
     class Cmpt,                                                                \
-    int nCmpt,                                                                 \
+    direction nCmpt,                                                           \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
@@ -926,7 +944,7 @@ template                                                                       \
 <                                                                              \
     class Form,                                                                \
     class Cmpt,                                                                \
-    int nCmpt,                                                                 \
+    direction nCmpt,                                                           \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
index 51205ba292..a98f4a6083 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
@@ -56,14 +56,26 @@ void T
      const GeometricField<Type, PatchField, GeoMesh>& gf1
 );
 
-template<class Type, template<class> class PatchField, class GeoMesh, int r>
+template
+<
+    class Type,
+    template<class> class PatchField,
+    class GeoMesh,
+    direction r
+>
 void pow
 (
     GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>& gf,
     const GeometricField<Type, PatchField, GeoMesh>& gf1
 );
 
-template<class Type, template<class> class PatchField, class GeoMesh, int r>
+template
+<
+    class Type,
+    template<class> class PatchField,
+    class GeoMesh,
+    direction r
+>
 tmp
 <
     GeometricField
@@ -75,7 +87,13 @@ pow
     typename powProduct<Type, r>::type
 );
 
-template<class Type, template<class> class PatchField, class GeoMesh, int r>
+template
+<
+    class Type,
+    template<class> class PatchField,
+    class GeoMesh,
+    direction r
+>
 tmp
 <
     GeometricField
@@ -353,7 +371,7 @@ template                                                                       \
 <                                                                              \
     class Form,                                                                \
     class Cmpt,                                                                \
-    int nCmpt,                                                                 \
+    direction nCmpt,                                                           \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
@@ -385,7 +403,7 @@ template                                                                       \
 <                                                                              \
     class Form,                                                                \
     class Cmpt,                                                                \
-    int nCmpt,                                                                 \
+    direction nCmpt,                                                           \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
@@ -427,7 +445,7 @@ template                                                                       \
 <                                                                              \
     class Form,                                                                \
     class Cmpt,                                                                \
-    int nCmpt,                                                                 \
+    direction nCmpt,                                                           \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
@@ -459,7 +477,7 @@ template                                                                       \
 <                                                                              \
     class Form,                                                                \
     class Cmpt,                                                                \
-    int nCmpt,                                                                 \
+    direction nCmpt,                                                           \
     class Type, template<class> class PatchField,                              \
     class GeoMesh                                                              \
 >                                                                              \
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H
index 02ed0d8736..f521635546 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldFunctions.H
@@ -47,7 +47,7 @@ inline void T
 {}
 
 
-template<class Type, int r>
+template<class Type, direction r>
 inline void pow
 (
     Field<typename powProduct<Type, r>::type>& f,
@@ -206,7 +206,7 @@ template                                                                       \
     class Type,                                                                \
     class Form,                                                                \
     class Cmpt,                                                                \
-    int nCmpt                                                                  \
+    direction nCmpt                                                            \
 >                                                                              \
 inline void opFunc                                                             \
 (                                                                              \
@@ -221,7 +221,7 @@ template                                                                       \
 <                                                                              \
     class Form,                                                                \
     class Cmpt,                                                                \
-    int nCmpt,                                                                 \
+    direction nCmpt,                                                           \
     class Type                                                                 \
 >                                                                              \
 inline void opFunc                                                             \
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
index 0a2138cea4..cd61a57988 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
@@ -64,10 +64,8 @@ public:
 
     // Member constants
 
-        enum
-        {
-            rank = 2 // Rank of DiagTensor is 2
-        };
+        //- Rank of DiagTensor is 2
+        static const direction rank = 2;
 
 
     //- Component labeling enumeration
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index 54b8ec5785..502a57c3b2 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -53,14 +53,18 @@ public:
     //- Equivalent type of labels used for valid component indexing
     typedef label labelType;
 
+
     // Member constants
 
-        enum
-        {
-            dim = 3,         //!< Dimensionality of space
-            rank = 0,        //!< Rank of Scalar is 0
-            nComponents = 1  //!< Number of components in Scalar is 1
-        };
+        //- Dimensionality of space
+        static const direction dim = 3;
+
+        //- Rank of Scalar is 0
+        static const direction rank = 0;
+
+        //- Number of components in Scalar is 1
+        static const direction nComponents = 1;
+
 
     // Static data members
 
@@ -73,6 +77,7 @@ public:
         static const Scalar rootMax;
         static const Scalar rootMin;
 
+
     // Constructors
 
         //- Construct from primitive
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
index cd16d3026e..2fa7b9b4ed 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
@@ -62,10 +62,8 @@ public:
 
     // Member constants
 
-        enum
-        {
-            rank = 2 // Rank of SphericalTensor is 2
-        };
+        //- Rank of SphericalTensor is 2
+        static const direction rank = 2;
 
 
     // Static data members
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
index 474777c1c3..ecebdf2625 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
@@ -58,10 +58,8 @@ public:
 
     // Member constants
 
-        enum
-        {
-            rank = 2 // Rank of SphericalTensor2D is 2
-        };
+        //- Rank of SphericalTensor2D is 2
+        static const direction rank = 2;
 
 
     // Static data members
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index 952536ac8c..58eca1da22 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -64,10 +64,8 @@ public:
 
     // Member constants
 
-        enum
-        {
-            rank = 2 // Rank of SymmTensor is 2
-        };
+        //- Rank of SymmTensor is 2
+        static const direction rank = 2;
 
 
     // Static data members
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
index 1d747caa2d..55a455ddc3 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
@@ -64,10 +64,8 @@ public:
 
     // Member constants
 
-        enum
-        {
-            rank = 2 // Rank of SymmTensor2D is 2
-        };
+        //- Rank of SymmTensor2D is 2
+        static const direction rank = 2;
 
 
     // Static data members
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index 9cd83fd09b..cf92644c16 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -67,10 +67,8 @@ public:
 
     // Member constants
 
-        enum
-        {
-            rank = 2 // Rank of Tensor is 2
-        };
+        //- Rank of Tensor is 2
+        static const direction rank = 2;
 
 
     // Static data members
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
index bc1f3906e5..098f52ef9d 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
@@ -67,10 +67,8 @@ public:
 
     // Member constants
 
-        enum
-        {
-            rank = 2 // Rank of Tensor2D is 2
-        };
+        //- Rank of Tensor2D is 2
+        static const direction rank = 2;
 
 
     // Static data members
diff --git a/src/OpenFOAM/primitives/Vector/Vector.H b/src/OpenFOAM/primitives/Vector/Vector.H
index e4ba4c1fed..d80e5790fc 100644
--- a/src/OpenFOAM/primitives/Vector/Vector.H
+++ b/src/OpenFOAM/primitives/Vector/Vector.H
@@ -68,10 +68,8 @@ public:
 
     // Member constants
 
-        enum
-        {
-            rank = 1 // Rank of Vector is 1
-        };
+        //- Rank of Vector is 1
+        static const direction rank = 1;
 
 
     //- Component labeling enumeration
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2D.H b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
index ca77ed8ce1..d1c7852b8f 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2D.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
@@ -62,10 +62,8 @@ public:
 
     // Member constants
 
-        enum
-        {
-            rank = 1 // Rank of Vector2D is 1
-        };
+        //- Rank of Vector2D is 1
+        static const direction rank = 1;
 
 
     //- Component labeling enumeration
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
index 49c855fcde..d634b78ade 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
@@ -30,7 +30,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, Foam::direction nCmpt>
 Foam::VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
 (
     Istream& is
@@ -39,7 +39,7 @@ Foam::VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
     // Read beginning of VectorSpace<Cmpt>
     is.readBegin("VectorSpace<Form, Cmpt, nCmpt>");
 
-    for (int i=0; i<nCmpt; i++)
+    for (direction i=0; i<nCmpt; i++)
     {
         is >> v_[i];
     }
@@ -52,9 +52,8 @@ Foam::VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
-Foam::word
-Foam::name
+template<class Form, class Cmpt, Foam::direction nCmpt>
+Foam::word Foam::name
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
 )
@@ -63,7 +62,7 @@ Foam::name
 
     buf << '(';
 
-    for (int i=0; i<nCmpt-1; i++)
+    for (direction i=0; i<nCmpt-1; i++)
     {
         buf << vs.v_[i] << ',';
     }
@@ -76,7 +75,7 @@ Foam::name
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, Foam::direction nCmpt>
 Foam::Istream& Foam::operator>>
 (
     Istream& is,
@@ -86,7 +85,7 @@ Foam::Istream& Foam::operator>>
     // Read beginning of VectorSpace<Cmpt, nCmpt>
     is.readBegin("VectorSpace<Form, Cmpt, nCmpt>");
 
-    for (int i=0; i<nCmpt; i++)
+    for (direction i=0; i<nCmpt; i++)
     {
         is >> vs.v_[i];
     }
@@ -101,21 +100,21 @@ Foam::Istream& Foam::operator>>
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, Foam::direction nCmpt>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
     const VectorSpace<Form, Cmpt, nCmpt>& vs
 )
 {
-    os << token::BEGIN_LIST;
+    os << token::BEGIN_LIST << vs.v_[0];
 
-    for (int i=0; i<nCmpt-1; i++)
+    for (direction i=1; i<nCmpt; i++)
     {
-        os << vs.v_[i] << token::SPACE;
+        os << token::SPACE << vs.v_[i];
     }
 
-    os << vs.v_[nCmpt-1] << token::END_LIST;
+    os << token::END_LIST;
 
     // Check state of Ostream
     os.check("operator<<(Ostream&, const VectorSpace<Form, Cmpt, nCmpt>&)");
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index 2d650f43ae..e8c4cbf16a 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -51,16 +51,16 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-template<class Form, class Cmpt, int nCmpt> class VectorSpace;
+template<class Form, class Cmpt, direction nCmpt> class VectorSpace;
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 Istream& operator>>
 (
     Istream&,
     VectorSpace<Form, Cmpt, nCmpt>&
 );
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 Ostream& operator<<
 (
     Ostream&,
@@ -72,7 +72,7 @@ Ostream& operator<<
                            Class VectorSpace Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 class VectorSpace
 {
 
@@ -115,6 +115,9 @@ public:
         //- Construct null
         inline VectorSpace();
 
+        //- Construct initialized to zero
+        inline VectorSpace(const Foam::zero);
+
         //- Construct from Istream
         VectorSpace(Istream&);
 
@@ -174,7 +177,7 @@ public:
 // * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * * //
 
 //- Return a string representation of a VectorSpace
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 word name(const VectorSpace<Form, Cmpt, nCmpt>&);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index e1c88e61d8..1b9c62798a 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -35,12 +35,19 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace()
 {}
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
+inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace(const Foam::zero z)
+{
+    VectorSpaceOps<nCmpt,0>::eqOpS(*this, 0, eqOp<Cmpt>());
+}
+
+
+template<class Form, class Cmpt, direction nCmpt>
 inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -50,7 +57,7 @@ inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 template<class Form2, class Cmpt2>
 inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
 (
@@ -63,14 +70,14 @@ inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline label VectorSpace<Form, Cmpt, nCmpt>::size() const
 {
     return nCmpt;
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
 (
     const direction d
@@ -89,7 +96,7 @@ inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
 (
     const direction d
@@ -108,7 +115,7 @@ inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline void VectorSpace<Form, Cmpt, nCmpt>::component
 (
     Cmpt& c,
@@ -128,7 +135,7 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::component
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline void VectorSpace<Form, Cmpt, nCmpt>::replace
 (
     const direction d,
@@ -148,7 +155,7 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::replace
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form VectorSpace<Form, Cmpt, nCmpt>::uniform(const Cmpt& s)
 {
     Form v;
@@ -159,7 +166,7 @@ inline Form VectorSpace<Form, Cmpt, nCmpt>::uniform(const Cmpt& s)
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
 (
     const direction d
@@ -178,7 +185,7 @@ inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
 (
     const direction d
@@ -197,7 +204,7 @@ inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline void VectorSpace<Form, Cmpt, nCmpt>::operator=
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -207,7 +214,7 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::operator=
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline void VectorSpace<Form, Cmpt, nCmpt>::operator+=
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -217,7 +224,7 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::operator+=
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline void VectorSpace<Form, Cmpt, nCmpt>::operator-=
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -227,14 +234,14 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::operator-=
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline void VectorSpace<Form, Cmpt, nCmpt>::operator=(const Foam::zero)
 {
     VectorSpaceOps<nCmpt,0>::eqOpS(*this, 0, eqOp<Cmpt>());
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline void VectorSpace<Form, Cmpt, nCmpt>::operator*=
 (
     const scalar s
@@ -244,7 +251,7 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::operator*=
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline void VectorSpace<Form, Cmpt, nCmpt>::operator/=
 (
     const scalar s
@@ -256,7 +263,7 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::operator/=
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Cmpt& setComponent
 (
     VectorSpace<Form, Cmpt, nCmpt>& vs,
@@ -267,7 +274,7 @@ inline Cmpt& setComponent
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline const Cmpt& component
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs,
@@ -281,7 +288,7 @@ inline const Cmpt& component
 // Powers of a Form
 // Equivalent to outer-products between the Form and itself
 // Form^0 = 1.0
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline typename powProduct<Form, 0>::type pow
 (
     const VectorSpace<Form, Cmpt, nCmpt>&,
@@ -293,7 +300,7 @@ inline typename powProduct<Form, 0>::type pow
 }
 
 // Form^1 = Form
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline typename powProduct<Form, 1>::type pow
 (
     const VectorSpace<Form, Cmpt, nCmpt>& v,
@@ -306,7 +313,7 @@ inline typename powProduct<Form, 1>::type pow
 
 
 // Form^2 = sqr(Form)
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline typename powProduct<Form, 2>::type pow
 (
     const VectorSpace<Form, Cmpt, nCmpt>& v,
@@ -318,7 +325,7 @@ inline typename powProduct<Form, 2>::type pow
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline scalar magSqr
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -330,7 +337,7 @@ inline scalar magSqr
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline scalar mag
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -340,7 +347,7 @@ inline scalar mag
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline VectorSpace<Form, Cmpt, nCmpt> cmptMultiply
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -353,7 +360,7 @@ inline VectorSpace<Form, Cmpt, nCmpt> cmptMultiply
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline VectorSpace<Form, Cmpt, nCmpt> cmptPow
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -366,7 +373,7 @@ inline VectorSpace<Form, Cmpt, nCmpt> cmptPow
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline VectorSpace<Form, Cmpt, nCmpt> cmptDivide
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -379,7 +386,7 @@ inline VectorSpace<Form, Cmpt, nCmpt> cmptDivide
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline VectorSpace<Form, Cmpt, nCmpt> stabilise
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs,
@@ -392,7 +399,7 @@ inline VectorSpace<Form, Cmpt, nCmpt> stabilise
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Cmpt cmptMax
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -404,7 +411,7 @@ inline Cmpt cmptMax
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Cmpt cmptMin
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -416,7 +423,7 @@ inline Cmpt cmptMin
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Cmpt cmptSum
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -428,7 +435,7 @@ inline Cmpt cmptSum
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Cmpt cmptAv
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -437,7 +444,7 @@ inline Cmpt cmptAv
     return cmptSum(vs)/nCmpt;
 }
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Cmpt cmptProduct
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -449,7 +456,7 @@ inline Cmpt cmptProduct
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form cmptMag
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -461,7 +468,7 @@ inline Form cmptMag
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form max
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -474,7 +481,7 @@ inline Form max
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form min
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -487,7 +494,7 @@ inline Form min
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form minMod
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -516,8 +523,8 @@ inline Type dot(const Type& t, const scalar s)
 
 template
 <
-    class Form1, class Cmpt1, int nCmpt1,
-    class Form2, class Cmpt2, int nCmpt2
+    class Form1, class Cmpt1, direction nCmpt1,
+    class Form2, class Cmpt2, direction nCmpt2
 >
 inline typename innerProduct<Form1, Form2>::type dot
 (
@@ -531,7 +538,7 @@ inline typename innerProduct<Form1, Form2>::type dot
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form operator-
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -543,7 +550,7 @@ inline Form operator-
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form operator+
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -555,7 +562,7 @@ inline Form operator+
     return v;
 }
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form operator-
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -568,7 +575,7 @@ inline Form operator-
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form operator*
 (
     scalar s,
@@ -581,7 +588,7 @@ inline Form operator*
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form operator*
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs,
@@ -594,7 +601,7 @@ inline Form operator*
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form operator/
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs,
@@ -607,7 +614,7 @@ inline Form operator/
 }
 
 /*
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form operator/
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -620,7 +627,7 @@ inline Form operator/
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Form operator/
 (
     scalar s,
@@ -634,7 +641,7 @@ inline Form operator/
 */
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline Cmpt operator&&
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -642,7 +649,7 @@ inline Cmpt operator&&
 )
 {
     Cmpt ddProd = vs1.v_[0]*vs2.v_[0];
-    for (int i=1; i<nCmpt; ++i)
+    for (direction i=1; i<nCmpt; ++i)
     {
         ddProd += vs1.v_[i]*vs2.v_[i];
     }
@@ -650,7 +657,7 @@ inline Cmpt operator&&
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline bool operator==
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -658,7 +665,7 @@ inline bool operator==
 )
 {
     bool eq = true;
-    for (int i=0; i<nCmpt; ++i)
+    for (direction i=0; i<nCmpt; ++i)
     {
         if (!(eq &= (equal(vs1.v_[i], vs2.v_[i])))) break;
     }
@@ -666,7 +673,7 @@ inline bool operator==
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline bool operator!=
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -677,7 +684,7 @@ inline bool operator!=
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline bool operator>
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -685,7 +692,7 @@ inline bool operator>
 )
 {
     bool gt = true;
-    for (int i=0; i<nCmpt; ++i)
+    for (direction i=0; i<nCmpt; ++i)
     {
         if (!(gt &= vs1.v_[i] > vs2.v_[i])) break;
     }
@@ -693,7 +700,7 @@ inline bool operator>
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline bool operator<
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -701,7 +708,7 @@ inline bool operator<
 )
 {
     bool lt = true;
-    for (int i=0; i<nCmpt; ++i)
+    for (direction i=0; i<nCmpt; ++i)
     {
         if (!(lt &= vs1.v_[i] < vs2.v_[i])) break;
     }
@@ -709,7 +716,7 @@ inline bool operator<
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline bool operator>=
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
@@ -720,7 +727,7 @@ inline bool operator>=
 }
 
 
-template<class Form, class Cmpt, int nCmpt>
+template<class Form, class Cmpt, direction nCmpt>
 inline bool operator<=
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs1,
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceOps.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceOps.H
index 7f6d3e1199..5df70b1e5b 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceOps.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<int N, int I>
+template<direction N, direction I>
 class VectorSpaceOps
 {
 public:
diff --git a/src/OpenFOAM/primitives/VectorSpace/products.H b/src/OpenFOAM/primitives/VectorSpace/products.H
index 4d657874aa..4214f32f0f 100644
--- a/src/OpenFOAM/primitives/VectorSpace/products.H
+++ b/src/OpenFOAM/primitives/VectorSpace/products.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,12 +41,12 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class Cmpt, int rank>
+template<class Cmpt, direction rank>
 class typeOfRank
 {};
 
 
-template<class Cmpt, int rank>
+template<class Cmpt, direction rank>
 class symmTypeOfRank
 {};
 
@@ -68,7 +68,7 @@ public:
     typedef typename typeOfRank
     <
         typename pTraits<arg1>::cmptType,
-        int(pTraits<arg1>::rank) + int(pTraits<arg2>::rank)
+        direction(pTraits<arg1>::rank) + direction(pTraits<arg2>::rank)
     >::type type;
 };
 
@@ -81,7 +81,7 @@ public:
     typedef typename typeOfRank
     <
         typename pTraits<arg2>::cmptType,
-        int(pTraits<arg1>::rank) + int(pTraits<arg2>::rank) - 1
+        direction(pTraits<arg1>::rank) + direction(pTraits<arg2>::rank) - 1
     >::type type;
 };
 
@@ -93,7 +93,7 @@ public:
     typedef typename typeOfRank
     <
         typename pTraits<arg1>::cmptType,
-        int(pTraits<arg1>::rank) + int(pTraits<arg2>::rank) - 2
+        direction(pTraits<arg1>::rank) + direction(pTraits<arg2>::rank) - 2
     >::type type;
 };
 
@@ -106,7 +106,7 @@ public:
 };
 
 
-template<class arg1, int arg2>
+template<class arg1, direction arg2>
 class powProduct
 {
 public:
@@ -114,7 +114,7 @@ public:
     typedef typename symmTypeOfRank
     <
         typename pTraits<arg1>::cmptType,
-        arg2*int(pTraits<arg1>::rank)
+        arg2*direction(pTraits<arg1>::rank)
     >::type type;
 };
 
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.H b/src/OpenFOAM/primitives/bools/bool/bool.H
index b1638ec054..19d8fb63de 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.H
+++ b/src/OpenFOAM/primitives/bools/bool/bool.H
@@ -56,6 +56,7 @@ bool readBool(Istream&);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "pTraits.H"
+#include "direction.H"
 
 namespace Foam
 {
@@ -73,12 +74,14 @@ public:
 
     // Member constants
 
-        enum
-        {
-            dim = 3,         //!< Dimensionality of space
-            rank = 0,        //!< Rank of bool is 0
-            nComponents = 1  //!< Number of components in bool is 1
-        };
+        //- Dimensionality of space
+        static const direction dim = 3;
+
+        //- Rank of bool is 0
+        static const direction rank = 0;
+
+        //- Number of components in bool is 1
+        static const direction nComponents = 1;
 
 
     // Static data members
diff --git a/src/OpenFOAM/primitives/ints/int32/int32.H b/src/OpenFOAM/primitives/ints/int32/int32.H
index 0602a8e345..d2601ad67c 100644
--- a/src/OpenFOAM/primitives/ints/int32/int32.H
+++ b/src/OpenFOAM/primitives/ints/int32/int32.H
@@ -89,14 +89,17 @@ public:
     //- Component type
     typedef int32_t cmptType;
 
+
     // Member constants
 
-        enum
-        {
-            dim = 3,         //!< Dimensionality of space
-            rank = 0,        //!< Rank of int32_t is 0
-            nComponents = 1  //!< Number of components in int32_t is 1
-        };
+        //- Dimensionality of space
+        static const direction dim = 3;
+
+        //- Rank of int32_t is 0
+        static const direction rank = 0;
+
+        //- Number of components in int32_t is 1
+        static const direction nComponents = 1;
 
 
     // Static data members
diff --git a/src/OpenFOAM/primitives/ints/int64/int64.H b/src/OpenFOAM/primitives/ints/int64/int64.H
index 6006321a28..2bb5a05804 100644
--- a/src/OpenFOAM/primitives/ints/int64/int64.H
+++ b/src/OpenFOAM/primitives/ints/int64/int64.H
@@ -80,14 +80,17 @@ public:
     //- Component type
     typedef int64_t cmptType;
 
+
     // Member constants
 
-        enum
-        {
-            dim = 3,         //!< Dimensionality of space
-            rank = 0,        //!< Rank of int64_t is 0
-            nComponents = 1  //!< Number of components in int64_t is 1
-        };
+        //- Dimensionality of space
+        static const direction dim = 3;
+
+        //- Rank of int64_t is 0
+        static const direction rank = 0;
+
+        //- Number of components in int64_t is 1
+        static const direction nComponents = 1;
 
 
     // Static data members
diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32.H b/src/OpenFOAM/primitives/ints/uint32/uint32.H
index 9c2a3b6833..83c3b18c67 100644
--- a/src/OpenFOAM/primitives/ints/uint32/uint32.H
+++ b/src/OpenFOAM/primitives/ints/uint32/uint32.H
@@ -80,14 +80,17 @@ public:
     //- Component type
     typedef uint32_t cmptType;
 
+
     // Member constants
 
-        enum
-        {
-            dim = 3,         //!< Dimensionality of space
-            rank = 0,        //!< Rank of uint32_t is 0
-            nComponents = 1  //!< Number of components in uint32_t is 1
-        };
+        //- Dimensionality of space
+        static const direction dim = 3;
+
+        //- Rank of uint32_t is 0
+        static const direction rank = 0;
+
+        //- Number of components in uint32_t is 1
+        static const direction nComponents = 1;
 
 
     // Static data members
diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64.H b/src/OpenFOAM/primitives/ints/uint64/uint64.H
index 2d2e31f802..e1a742b6c2 100644
--- a/src/OpenFOAM/primitives/ints/uint64/uint64.H
+++ b/src/OpenFOAM/primitives/ints/uint64/uint64.H
@@ -80,14 +80,17 @@ public:
     //- Component type
     typedef uint64_t cmptType;
 
+
     // Member constants
 
-        enum
-        {
-            dim = 3,         //!< Dimensionality of space
-            rank = 0,        //!< Rank of uint64_t is 0
-            nComponents = 1  //!< Number of components in uint64_t is 1
-        };
+        //- Dimensionality of space
+        static const direction dim = 3;
+
+        //- Rank of uint64_t is 0
+        static const direction rank = 0;
+
+        //- Number of components in uint64_t is 1
+        static const direction nComponents = 1;
 
 
     // Static data members
diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.H b/src/OpenFOAM/primitives/quaternion/quaternion.H
index 4a4b9f080f..1e67c9bbcf 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,12 +78,11 @@ public:
     //- Component type
     typedef scalar cmptType;
 
+
     // Member constants
 
-        enum
-        {
-            rank = 1 // Rank of quaternion is 1
-        };
+        //- Rank of quaternion is 1
+        static const direction rank = 1;
 
 
     // Static data members

From 7c692c18d8d87b5b684a7efdb9cfeb49c0a81923 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 10 Mar 2016 12:44:25 +0000
Subject: [PATCH 266/447] Vector: Add constructor from Foam::zero

---
 src/OpenFOAM/primitives/Vector/Vector.H  | 3 +++
 src/OpenFOAM/primitives/Vector/VectorI.H | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/src/OpenFOAM/primitives/Vector/Vector.H b/src/OpenFOAM/primitives/Vector/Vector.H
index d80e5790fc..6a6495c249 100644
--- a/src/OpenFOAM/primitives/Vector/Vector.H
+++ b/src/OpenFOAM/primitives/Vector/Vector.H
@@ -81,6 +81,9 @@ public:
         //- Construct null
         inline Vector();
 
+        //- Construct initialized to zero
+        inline explicit Vector(const Foam::zero);
+
         //- Construct given VectorSpace of the same rank
         template<class Cmpt2>
         inline Vector(const VectorSpace<Vector<Cmpt2>, Cmpt2, 3>&);
diff --git a/src/OpenFOAM/primitives/Vector/VectorI.H b/src/OpenFOAM/primitives/Vector/VectorI.H
index 4d598dea36..e6d72fa6b2 100644
--- a/src/OpenFOAM/primitives/Vector/VectorI.H
+++ b/src/OpenFOAM/primitives/Vector/VectorI.H
@@ -30,6 +30,13 @@ inline Foam::Vector<Cmpt>::Vector()
 {}
 
 
+template<class Cmpt>
+inline Foam::Vector<Cmpt>::Vector(const Foam::zero z)
+:
+    Vector::vsType(z)
+{}
+
+
 template<class Cmpt>
 template<class Cmpt2>
 inline Foam::Vector<Cmpt>::Vector

From 2ddcb12c67e96e08999616568a7aa23003237306 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 10 Mar 2016 12:44:53 +0000
Subject: [PATCH 267/447] VectorSpace: Change template parameter from nCmpt to
 Ncmpts for consistency with other template classes

---
 .../primitives/VectorSpace/VectorSpace.C      |  44 +--
 .../primitives/VectorSpace/VectorSpace.H      |  55 ++-
 .../primitives/VectorSpace/VectorSpaceI.H     | 356 +++++++++---------
 3 files changed, 227 insertions(+), 228 deletions(-)

diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
index d634b78ade..4129c50262 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
@@ -30,44 +30,44 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, Foam::direction nCmpt>
-Foam::VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
+template<class Form, class Cmpt, Foam::direction Ncmpts>
+Foam::VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace
 (
     Istream& is
 )
 {
     // Read beginning of VectorSpace<Cmpt>
-    is.readBegin("VectorSpace<Form, Cmpt, nCmpt>");
+    is.readBegin("VectorSpace<Form, Cmpt, Ncmpts>");
 
-    for (direction i=0; i<nCmpt; i++)
+    for (direction i=0; i<Ncmpts; i++)
     {
         is >> v_[i];
     }
 
     // Read end of VectorSpace<Cmpt>
-    is.readEnd("VectorSpace<Form, Cmpt, nCmpt>");
+    is.readEnd("VectorSpace<Form, Cmpt, Ncmpts>");
 
     // Check state of Istream
-    is.check("VectorSpace<Form, Cmpt, nCmpt>::VectorSpace(Istream&)");
+    is.check("VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace(Istream&)");
 }
 
 
-template<class Form, class Cmpt, Foam::direction nCmpt>
+template<class Form, class Cmpt, Foam::direction Ncmpts>
 Foam::word Foam::name
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     std::ostringstream buf;
 
     buf << '(';
 
-    for (direction i=0; i<nCmpt-1; i++)
+    for (direction i=0; i<Ncmpts-1; i++)
     {
         buf << vs.v_[i] << ',';
     }
 
-    buf << vs.v_[nCmpt-1] << ')';
+    buf << vs.v_[Ncmpts-1] << ')';
 
     return buf.str();
 }
@@ -75,41 +75,41 @@ Foam::word Foam::name
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, Foam::direction nCmpt>
+template<class Form, class Cmpt, Foam::direction Ncmpts>
 Foam::Istream& Foam::operator>>
 (
     Istream& is,
-    VectorSpace<Form, Cmpt, nCmpt>& vs
+    VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
-    // Read beginning of VectorSpace<Cmpt, nCmpt>
-    is.readBegin("VectorSpace<Form, Cmpt, nCmpt>");
+    // Read beginning of VectorSpace<Cmpt, Ncmpts>
+    is.readBegin("VectorSpace<Form, Cmpt, Ncmpts>");
 
-    for (direction i=0; i<nCmpt; i++)
+    for (direction i=0; i<Ncmpts; i++)
     {
         is >> vs.v_[i];
     }
 
-    // Read end of VectorSpace<Cmpt, nCmpt>
-    is.readEnd("VectorSpace<Form, Cmpt, nCmpt>");
+    // Read end of VectorSpace<Cmpt, Ncmpts>
+    is.readEnd("VectorSpace<Form, Cmpt, Ncmpts>");
 
     // Check state of Istream
-    is.check("operator>>(Istream&, VectorSpace<Form, Cmpt, nCmpt>&)");
+    is.check("operator>>(Istream&, VectorSpace<Form, Cmpt, Ncmpts>&)");
 
     return is;
 }
 
 
-template<class Form, class Cmpt, Foam::direction nCmpt>
+template<class Form, class Cmpt, Foam::direction Ncmpts>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     os << token::BEGIN_LIST << vs.v_[0];
 
-    for (direction i=1; i<nCmpt; i++)
+    for (direction i=1; i<Ncmpts; i++)
     {
         os << token::SPACE << vs.v_[i];
     }
@@ -117,7 +117,7 @@ Foam::Ostream& Foam::operator<<
     os << token::END_LIST;
 
     // Check state of Ostream
-    os.check("operator<<(Ostream&, const VectorSpace<Form, Cmpt, nCmpt>&)");
+    os.check("operator<<(Ostream&, const VectorSpace<Form, Cmpt, Ncmpts>&)");
 
     return os;
 }
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index e8c4cbf16a..27c1bff3c1 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -51,20 +51,20 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-template<class Form, class Cmpt, direction nCmpt> class VectorSpace;
+template<class Form, class Cmpt, direction Ncmpts> class VectorSpace;
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 Istream& operator>>
 (
     Istream&,
-    VectorSpace<Form, Cmpt, nCmpt>&
+    VectorSpace<Form, Cmpt, Ncmpts>&
 );
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 Ostream& operator<<
 (
     Ostream&,
-    const VectorSpace<Form, Cmpt, nCmpt>&
+    const VectorSpace<Form, Cmpt, Ncmpts>&
 );
 
 
@@ -72,18 +72,17 @@ Ostream& operator<<
                            Class VectorSpace Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 class VectorSpace
 {
 
 public:
 
     //- The components of this vector space
-    Cmpt v_[nCmpt];
-
+    Cmpt v_[Ncmpts];
 
     //- VectorSpace type
-    typedef VectorSpace<Form, Cmpt, nCmpt> vsType;
+    typedef VectorSpace<Form, Cmpt, Ncmpts> vsType;
 
     //- Component type
     typedef Cmpt cmptType;
@@ -91,11 +90,11 @@ public:
 
     // Member constants
 
-        enum
-        {
-            dim = 3,            //!< Dimensionality of space
-            nComponents = nCmpt //!< Number of components in this vector space
-        };
+        //- Dimensionality of space
+        static const direction dim = 3;
+
+        //- Number of components in this vector space
+        static const direction nComponents = Ncmpts;
 
 
     // Static data members
@@ -116,23 +115,23 @@ public:
         inline VectorSpace();
 
         //- Construct initialized to zero
-        inline VectorSpace(const Foam::zero);
+        inline explicit VectorSpace(const Foam::zero);
 
         //- Construct from Istream
         VectorSpace(Istream&);
 
         //- Construct as copy
-        inline VectorSpace(const VectorSpace<Form, Cmpt, nCmpt>&);
+        inline VectorSpace(const VectorSpace<Form, Cmpt, Ncmpts>&);
 
         //- Construct as copy of another VectorSpace type of the same rank
         template<class Form2, class Cmpt2>
-        inline VectorSpace(const VectorSpace<Form2, Cmpt2, nCmpt>&);
+        inline VectorSpace(const VectorSpace<Form2, Cmpt2, Ncmpts>&);
 
 
     // Member Functions
 
-        //- Return the number of elements in the VectorSpace = nCmpt.
-        inline label size() const;
+        //- Return the number of elements in the VectorSpace = Ncmpts.
+        inline static direction size();
 
         inline const Cmpt& component(const direction) const;
         inline Cmpt& component(const direction);
@@ -149,9 +148,9 @@ public:
         inline const Cmpt& operator[](const direction) const;
         inline Cmpt& operator[](const direction);
 
-        inline void operator=(const VectorSpace<Form, Cmpt, nCmpt>&);
-        inline void operator+=(const VectorSpace<Form, Cmpt, nCmpt>&);
-        inline void operator-=(const VectorSpace<Form, Cmpt, nCmpt>&);
+        inline void operator=(const VectorSpace<Form, Cmpt, Ncmpts>&);
+        inline void operator+=(const VectorSpace<Form, Cmpt, Ncmpts>&);
+        inline void operator-=(const VectorSpace<Form, Cmpt, Ncmpts>&);
 
         inline void operator=(const Foam::zero);
         inline void operator*=(const scalar);
@@ -160,16 +159,16 @@ public:
 
     // IOstream Operators
 
-        friend Istream& operator>> <Form, Cmpt, nCmpt>
+        friend Istream& operator>> <Form, Cmpt, Ncmpts>
         (
             Istream&,
-            VectorSpace<Form, Cmpt, nCmpt>&
+            VectorSpace<Form, Cmpt, Ncmpts>&
         );
 
-        friend Ostream& operator<< <Form, Cmpt, nCmpt>
+        friend Ostream& operator<< <Form, Cmpt, Ncmpts>
         (
             Ostream&,
-            const VectorSpace<Form, Cmpt, nCmpt>&
+            const VectorSpace<Form, Cmpt, Ncmpts>&
         );
 };
 
@@ -177,8 +176,8 @@ public:
 // * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * * //
 
 //- Return a string representation of a VectorSpace
-template<class Form, class Cmpt, direction nCmpt>
-word name(const VectorSpace<Form, Cmpt, nCmpt>&);
+template<class Form, class Cmpt, direction Ncmpts>
+word name(const VectorSpace<Form, Cmpt, Ncmpts>&);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index 1b9c62798a..fe4a47be48 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -35,56 +35,56 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, direction nCmpt>
-inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace()
+template<class Form, class Cmpt, direction Ncmpts>
+inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace()
 {}
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace(const Foam::zero z)
+template<class Form, class Cmpt, direction Ncmpts>
+inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace(const Foam::zero z)
 {
-    VectorSpaceOps<nCmpt,0>::eqOpS(*this, 0, eqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::eqOpS(*this, 0, eqOp<Cmpt>());
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
+template<class Form, class Cmpt, direction Ncmpts>
+inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
-    VectorSpaceOps<nCmpt,0>::eqOp(*this, vs, eqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::eqOp(*this, vs, eqOp<Cmpt>());
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 template<class Form2, class Cmpt2>
-inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
+inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace
 (
-    const VectorSpace<Form2, Cmpt2, nCmpt>& vs
+    const VectorSpace<Form2, Cmpt2, Ncmpts>& vs
 )
 {
-    VectorSpaceOps<nCmpt,0>::eqOp(*this, vs, eqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::eqOp(*this, vs, eqOp<Cmpt>());
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, direction nCmpt>
-inline label VectorSpace<Form, Cmpt, nCmpt>::size() const
+template<class Form, class Cmpt, direction Ncmpts>
+inline direction VectorSpace<Form, Cmpt, Ncmpts>::size()
 {
-    return nCmpt;
+    return Ncmpts;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
+template<class Form, class Cmpt, direction Ncmpts>
+inline const Cmpt& VectorSpace<Form, Cmpt, Ncmpts>::component
 (
     const direction d
 ) const
 {
     #ifdef FULLDEBUG
-    if (d >= nCmpt)
+    if (d >= Ncmpts)
     {
         FatalErrorInFunction
             << "index out of range"
@@ -96,14 +96,14 @@ inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
+template<class Form, class Cmpt, direction Ncmpts>
+inline Cmpt& VectorSpace<Form, Cmpt, Ncmpts>::component
 (
     const direction d
 )
 {
     #ifdef FULLDEBUG
-    if (d >= nCmpt)
+    if (d >= Ncmpts)
     {
         FatalErrorInFunction
             << "index out of range"
@@ -115,15 +115,15 @@ inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline void VectorSpace<Form, Cmpt, nCmpt>::component
+template<class Form, class Cmpt, direction Ncmpts>
+inline void VectorSpace<Form, Cmpt, Ncmpts>::component
 (
     Cmpt& c,
     const direction d
 ) const
 {
     #ifdef FULLDEBUG
-    if (d >= nCmpt)
+    if (d >= Ncmpts)
     {
         FatalErrorInFunction
             << "index out of range"
@@ -135,15 +135,15 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::component
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline void VectorSpace<Form, Cmpt, nCmpt>::replace
+template<class Form, class Cmpt, direction Ncmpts>
+inline void VectorSpace<Form, Cmpt, Ncmpts>::replace
 (
     const direction d,
     const Cmpt& c
 )
 {
     #ifdef FULLDEBUG
-    if (d >= nCmpt)
+    if (d >= Ncmpts)
     {
         FatalErrorInFunction
             << "index out of range"
@@ -155,25 +155,25 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::replace
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline Form VectorSpace<Form, Cmpt, nCmpt>::uniform(const Cmpt& s)
+template<class Form, class Cmpt, direction Ncmpts>
+inline Form VectorSpace<Form, Cmpt, Ncmpts>::uniform(const Cmpt& s)
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::eqOpS(v, s, eqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::eqOpS(v, s, eqOp<Cmpt>());
     return v;
 }
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, direction nCmpt>
-inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
+template<class Form, class Cmpt, direction Ncmpts>
+inline const Cmpt& VectorSpace<Form, Cmpt, Ncmpts>::operator[]
 (
     const direction d
 ) const
 {
     #ifdef FULLDEBUG
-    if (d >= nCmpt)
+    if (d >= Ncmpts)
     {
         FatalErrorInFunction
             << "index out of range"
@@ -185,14 +185,14 @@ inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
+template<class Form, class Cmpt, direction Ncmpts>
+inline Cmpt& VectorSpace<Form, Cmpt, Ncmpts>::operator[]
 (
     const direction d
 )
 {
     #ifdef FULLDEBUG
-    if (d >= nCmpt)
+    if (d >= Ncmpts)
     {
         FatalErrorInFunction
             << "index out of range"
@@ -204,69 +204,69 @@ inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline void VectorSpace<Form, Cmpt, nCmpt>::operator=
+template<class Form, class Cmpt, direction Ncmpts>
+inline void VectorSpace<Form, Cmpt, Ncmpts>::operator=
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
-    VectorSpaceOps<nCmpt,0>::eqOp(*this, vs, eqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::eqOp(*this, vs, eqOp<Cmpt>());
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline void VectorSpace<Form, Cmpt, nCmpt>::operator+=
+template<class Form, class Cmpt, direction Ncmpts>
+inline void VectorSpace<Form, Cmpt, Ncmpts>::operator+=
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
-    VectorSpaceOps<nCmpt,0>::eqOp(*this, vs, plusEqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::eqOp(*this, vs, plusEqOp<Cmpt>());
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline void VectorSpace<Form, Cmpt, nCmpt>::operator-=
+template<class Form, class Cmpt, direction Ncmpts>
+inline void VectorSpace<Form, Cmpt, Ncmpts>::operator-=
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
-    VectorSpaceOps<nCmpt,0>::eqOp(*this, vs, minusEqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::eqOp(*this, vs, minusEqOp<Cmpt>());
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline void VectorSpace<Form, Cmpt, nCmpt>::operator=(const Foam::zero)
+template<class Form, class Cmpt, direction Ncmpts>
+inline void VectorSpace<Form, Cmpt, Ncmpts>::operator=(const Foam::zero)
 {
-    VectorSpaceOps<nCmpt,0>::eqOpS(*this, 0, eqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::eqOpS(*this, 0, eqOp<Cmpt>());
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline void VectorSpace<Form, Cmpt, nCmpt>::operator*=
+template<class Form, class Cmpt, direction Ncmpts>
+inline void VectorSpace<Form, Cmpt, Ncmpts>::operator*=
 (
     const scalar s
 )
 {
-    VectorSpaceOps<nCmpt,0>::eqOpS(*this, s, multiplyEqOp2<Cmpt, scalar>());
+    VectorSpaceOps<Ncmpts,0>::eqOpS(*this, s, multiplyEqOp2<Cmpt, scalar>());
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline void VectorSpace<Form, Cmpt, nCmpt>::operator/=
+template<class Form, class Cmpt, direction Ncmpts>
+inline void VectorSpace<Form, Cmpt, Ncmpts>::operator/=
 (
     const scalar s
 )
 {
-    VectorSpaceOps<nCmpt,0>::eqOpS(*this, s, divideEqOp2<Cmpt, scalar>());
+    VectorSpaceOps<Ncmpts,0>::eqOpS(*this, s, divideEqOp2<Cmpt, scalar>());
 }
 
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Cmpt& setComponent
 (
-    VectorSpace<Form, Cmpt, nCmpt>& vs,
+    VectorSpace<Form, Cmpt, Ncmpts>& vs,
     const direction d
 )
 {
@@ -274,10 +274,10 @@ inline Cmpt& setComponent
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline const Cmpt& component
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs,
     const direction d
 )
 {
@@ -288,10 +288,10 @@ inline const Cmpt& component
 // Powers of a Form
 // Equivalent to outer-products between the Form and itself
 // Form^0 = 1.0
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline typename powProduct<Form, 0>::type pow
 (
-    const VectorSpace<Form, Cmpt, nCmpt>&,
+    const VectorSpace<Form, Cmpt, Ncmpts>&,
     typename powProduct<Form, 0>::type
     = pTraits<typename powProduct<Form, 0>::type>::zero
 )
@@ -300,10 +300,10 @@ inline typename powProduct<Form, 0>::type pow
 }
 
 // Form^1 = Form
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline typename powProduct<Form, 1>::type pow
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& v,
+    const VectorSpace<Form, Cmpt, Ncmpts>& v,
     typename powProduct<Form, 1>::type
   = pTraits<typename powProduct<Form, 1>::type>::zero
 )
@@ -313,10 +313,10 @@ inline typename powProduct<Form, 1>::type pow
 
 
 // Form^2 = sqr(Form)
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline typename powProduct<Form, 2>::type pow
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& v,
+    const VectorSpace<Form, Cmpt, Ncmpts>& v,
     typename powProduct<Form, 2>::type
   = pTraits<typename powProduct<Form, 2>::type>::zero
 )
@@ -325,184 +325,184 @@ inline typename powProduct<Form, 2>::type pow
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline scalar magSqr
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     scalar ms = magSqr(vs.v_[0]);
-    VectorSpaceOps<nCmpt,1>::SeqOp(ms, vs, plusEqMagSqrOp2<scalar, Cmpt>());
+    VectorSpaceOps<Ncmpts,1>::SeqOp(ms, vs, plusEqMagSqrOp2<scalar, Cmpt>());
     return ms;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline scalar mag
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     return ::sqrt(magSqr(static_cast<const Form&>(vs)));
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline VectorSpace<Form, Cmpt, nCmpt> cmptMultiply
+template<class Form, class Cmpt, direction Ncmpts>
+inline VectorSpace<Form, Cmpt, Ncmpts> cmptMultiply
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::op(v, vs1, vs2, cmptMultiplyOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::op(v, vs1, vs2, cmptMultiplyOp<Cmpt>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline VectorSpace<Form, Cmpt, nCmpt> cmptPow
+template<class Form, class Cmpt, direction Ncmpts>
+inline VectorSpace<Form, Cmpt, Ncmpts> cmptPow
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::op(v, vs1, vs2, cmptPowOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::op(v, vs1, vs2, cmptPowOp<Cmpt>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline VectorSpace<Form, Cmpt, nCmpt> cmptDivide
+template<class Form, class Cmpt, direction Ncmpts>
+inline VectorSpace<Form, Cmpt, Ncmpts> cmptDivide
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::op(v, vs1, vs2, cmptDivideOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::op(v, vs1, vs2, cmptDivideOp<Cmpt>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
-inline VectorSpace<Form, Cmpt, nCmpt> stabilise
+template<class Form, class Cmpt, direction Ncmpts>
+inline VectorSpace<Form, Cmpt, Ncmpts> stabilise
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs,
     const Cmpt& small
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::opVS(v, vs, small, stabiliseOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::opVS(v, vs, small, stabiliseOp<Cmpt>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Cmpt cmptMax
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     Cmpt cMax = vs.v_[0];
-    VectorSpaceOps<nCmpt,1>::SeqOp(cMax, vs, maxEqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,1>::SeqOp(cMax, vs, maxEqOp<Cmpt>());
     return cMax;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Cmpt cmptMin
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     Cmpt cMin = vs.v_[0];
-    VectorSpaceOps<nCmpt,1>::SeqOp(cMin, vs, minEqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,1>::SeqOp(cMin, vs, minEqOp<Cmpt>());
     return cMin;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Cmpt cmptSum
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     Cmpt sum = vs.v_[0];
-    VectorSpaceOps<nCmpt,1>::SeqOp(sum, vs, plusEqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,1>::SeqOp(sum, vs, plusEqOp<Cmpt>());
     return sum;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Cmpt cmptAv
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
-    return cmptSum(vs)/nCmpt;
+    return cmptSum(vs)/Ncmpts;
 }
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Cmpt cmptProduct
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     Cmpt product = vs.v_[0];
-    VectorSpaceOps<nCmpt,1>::SeqOp(product, vs, multiplyEqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,1>::SeqOp(product, vs, multiplyEqOp<Cmpt>());
     return product;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form cmptMag
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::eqOp(v, vs, eqMagOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::eqOp(v, vs, eqMagOp<Cmpt>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form max
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::op(v, vs1, vs2, maxOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::op(v, vs1, vs2, maxOp<Cmpt>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form min
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::op(v, vs1, vs2, minOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::op(v, vs1, vs2, minOp<Cmpt>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form minMod
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::op(v, vs1, vs2, minModOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::op(v, vs1, vs2, minModOp<Cmpt>());
     return v;
 }
 
@@ -523,13 +523,13 @@ inline Type dot(const Type& t, const scalar s)
 
 template
 <
-    class Form1, class Cmpt1, direction nCmpt1,
-    class Form2, class Cmpt2, direction nCmpt2
+    class Form1, class Cmpt1, direction Ncmpts1,
+    class Form2, class Cmpt2, direction Ncmpts2
 >
 inline typename innerProduct<Form1, Form2>::type dot
 (
-    const VectorSpace<Form1, Cmpt1, nCmpt1>& t1,
-    const VectorSpace<Form2, Cmpt2, nCmpt2>& t2
+    const VectorSpace<Form1, Cmpt1, Ncmpts1>& t1,
+    const VectorSpace<Form2, Cmpt2, Ncmpts2>& t2
 )
 {
     return static_cast<const Form1&>(t1) & static_cast<const Form2&>(t2);
@@ -538,118 +538,118 @@ inline typename innerProduct<Form1, Form2>::type dot
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form operator-
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::eqOp(v, vs, eqMinusOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::eqOp(v, vs, eqMinusOp<Cmpt>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form operator+
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::op(v, vs1, vs2, plusOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::op(v, vs1, vs2, plusOp<Cmpt>());
     return v;
 }
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form operator-
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::op(v, vs1, vs2, minusOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::op(v, vs1, vs2, minusOp<Cmpt>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form operator*
 (
     scalar s,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::opSV(v, s, vs, multiplyOp3<Cmpt, scalar, Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::opSV(v, s, vs, multiplyOp3<Cmpt, scalar, Cmpt>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form operator*
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs,
     scalar s
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::opVS(v, vs, s, multiplyOp3<Cmpt, Cmpt, scalar>());
+    VectorSpaceOps<Ncmpts,0>::opVS(v, vs, s, multiplyOp3<Cmpt, Cmpt, scalar>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form operator/
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs,
     scalar s
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::opVS(v, vs, s, divideOp3<Cmpt, Cmpt, scalar>());
+    VectorSpaceOps<Ncmpts,0>::opVS(v, vs, s, divideOp3<Cmpt, Cmpt, scalar>());
     return v;
 }
 
 /*
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form operator/
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::op(v, vs1, vs2, divideOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::op(v, vs1, vs2, divideOp<Cmpt>());
     return v;
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Form operator/
 (
     scalar s,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
     Form v;
-    VectorSpaceOps<nCmpt,0>::opSV(v, s, vs, divideOp2<scalar, Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::opSV(v, s, vs, divideOp2<scalar, Cmpt>());
     return v;
 }
 */
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline Cmpt operator&&
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     Cmpt ddProd = vs1.v_[0]*vs2.v_[0];
-    for (direction i=1; i<nCmpt; ++i)
+    for (direction i=1; i<Ncmpts; ++i)
     {
         ddProd += vs1.v_[i]*vs2.v_[i];
     }
@@ -657,15 +657,15 @@ inline Cmpt operator&&
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline bool operator==
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     bool eq = true;
-    for (direction i=0; i<nCmpt; ++i)
+    for (direction i=0; i<Ncmpts; ++i)
     {
         if (!(eq &= (equal(vs1.v_[i], vs2.v_[i])))) break;
     }
@@ -673,26 +673,26 @@ inline bool operator==
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline bool operator!=
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     return !(vs1 == vs2);
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline bool operator>
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     bool gt = true;
-    for (direction i=0; i<nCmpt; ++i)
+    for (direction i=0; i<Ncmpts; ++i)
     {
         if (!(gt &= vs1.v_[i] > vs2.v_[i])) break;
     }
@@ -700,15 +700,15 @@ inline bool operator>
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline bool operator<
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     bool lt = true;
-    for (direction i=0; i<nCmpt; ++i)
+    for (direction i=0; i<Ncmpts; ++i)
     {
         if (!(lt &= vs1.v_[i] < vs2.v_[i])) break;
     }
@@ -716,22 +716,22 @@ inline bool operator<
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline bool operator>=
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     return !(vs1 < vs2);
 }
 
 
-template<class Form, class Cmpt, direction nCmpt>
+template<class Form, class Cmpt, direction Ncmpts>
 inline bool operator<=
 (
-    const VectorSpace<Form, Cmpt, nCmpt>& vs1,
-    const VectorSpace<Form, Cmpt, nCmpt>& vs2
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs1,
+    const VectorSpace<Form, Cmpt, Ncmpts>& vs2
 )
 {
     return !(vs1 > vs2);

From a018e83e75302dbaf0db8e75c6cc0c24ee3c9627 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 10 Mar 2016 12:45:42 +0000
Subject: [PATCH 268/447] floatTensor: Tensor<float>

---
 src/OpenFOAM/Make/files                       |  1 +
 .../Tensor/floatTensor/floatTensor.C          | 86 +++++++++++++++++++
 .../Tensor/floatTensor/floatTensor.H          | 63 ++++++++++++++
 3 files changed, 150 insertions(+)
 create mode 100644 src/OpenFOAM/primitives/Tensor/floatTensor/floatTensor.C
 create mode 100644 src/OpenFOAM/primitives/Tensor/floatTensor/floatTensor.H

diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 3f325fd453..ebe063819e 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -52,6 +52,7 @@ primitives/Tensor/lists/tensorList.C
 primitives/Vector/complexVector/complexVector.C
 #if !defined(WM_SP)
 primitives/Vector/floatVector/floatVector.C
+primitives/Tensor/floatTensor/floatTensor.C
 #endif
 primitives/Vector/labelVector/labelVector.C
 primitives/Vector/vector/vector.C
diff --git a/src/OpenFOAM/primitives/Tensor/floatTensor/floatTensor.C b/src/OpenFOAM/primitives/Tensor/floatTensor/floatTensor.C
new file mode 100644
index 0000000000..cdcf7d4aa5
--- /dev/null
+++ b/src/OpenFOAM/primitives/Tensor/floatTensor/floatTensor.C
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "floatTensor.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<>
+const char* const Foam::floatTensor::vsType::typeName = "floatTensor";
+
+template<>
+const char* const Foam::floatTensor::vsType::componentNames[] =
+{
+    "xx", "xy", "xz",
+    "yx", "yy", "yz",
+    "zx", "zy", "zz"
+};
+
+template<>
+const Foam::floatTensor Foam::floatTensor::vsType::zero
+(
+    floatTensor::uniform(0)
+);
+
+template<>
+const Foam::floatTensor Foam::floatTensor::vsType::one
+(
+    floatTensor::uniform(1)
+);
+
+template<>
+const Foam::floatTensor Foam::floatTensor::vsType::max
+(
+    floatTensor::uniform(floatScalarVGREAT)
+);
+
+template<>
+const Foam::floatTensor Foam::floatTensor::vsType::min
+(
+    floatTensor::uniform(-floatScalarVGREAT)
+);
+
+template<>
+const Foam::floatTensor Foam::floatTensor::vsType::rootMax
+(
+    floatTensor::uniform(floatScalarROOTVGREAT)
+);
+
+template<>
+const Foam::floatTensor Foam::floatTensor::vsType::rootMin
+(
+    floatTensor::uniform(-floatScalarROOTVGREAT)
+);
+
+template<>
+const Foam::floatTensor Foam::floatTensor::I
+(
+    1, 0, 0,
+    0, 1, 0,
+    0, 0, 1
+);
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Tensor/floatTensor/floatTensor.H b/src/OpenFOAM/primitives/Tensor/floatTensor/floatTensor.H
new file mode 100644
index 0000000000..53f25ca22e
--- /dev/null
+++ b/src/OpenFOAM/primitives/Tensor/floatTensor/floatTensor.H
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::floatTensor
+
+Description
+    FloatTensor of scalars.
+
+SourceFiles
+    floatTensor.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef floatTensor_H
+#define floatTensor_H
+
+#include "Tensor.H"
+#include "contiguous.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef Tensor<float> floatTensor;
+
+//- Data associated with floatTensor type are contiguous
+template<>
+inline bool contiguous<floatTensor>() {return true;}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 97489df33dc77fbd53bd31e815b72727c01c227d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 10 Mar 2016 22:53:09 +0000
Subject: [PATCH 269/447] Matrix: Switch n() and m() so that now m() = number
 of rows and n() = number of columns For consistency with current references
 and other numerics libraries

---
 src/OpenFOAM/dimensionSet/dimensionSets.C     |   6 +-
 .../matrices/DiagonalMatrix/DiagonalMatrix.C  |   4 +-
 .../matrices/LUscalarMatrix/LUscalarMatrix.C  |  14 +--
 .../LUscalarMatrix/LUscalarMatrixTemplates.C  |   4 +-
 src/OpenFOAM/matrices/Matrix/Matrix.C         | 114 +++++++++---------
 src/OpenFOAM/matrices/Matrix/Matrix.H         |   4 +-
 src/OpenFOAM/matrices/Matrix/MatrixI.H        |   4 +-
 src/OpenFOAM/matrices/Matrix/MatrixIO.C       |  38 +++---
 .../matrices/SquareMatrix/SquareMatrix.C      |   8 +-
 .../SymmetricSquareMatrix.C                   |   8 +-
 .../matrices/scalarMatrices/SVD/SVD.C         | 113 ++++++++---------
 .../matrices/scalarMatrices/SVD/SVD.H         |   3 +-
 .../matrices/scalarMatrices/scalarMatrices.C  |  64 +++++-----
 .../scalarMatrices/scalarMatricesTemplates.C  |  50 ++++----
 .../matrices/simpleMatrix/simpleMatrix.C      |   4 +-
 .../CentredFitSnGrad/CentredFitSnGradData.C   |   6 +-
 .../schemes/FitData/FitData.C                 |   8 +-
 .../radiationModels/viewFactor/viewFactor.C   |   2 +-
 18 files changed, 227 insertions(+), 227 deletions(-)

diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C
index 2a76260c57..85ccde6947 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.C
@@ -234,17 +234,17 @@ Foam::dimensionSets::dimensionSets
         valid_ = true;
 
         // Determine conversion from basic units to write units
-        for (label rowI = 0; rowI < conversion_.n(); rowI++)
+        for (label rowI = 0; rowI < conversion_.m(); rowI++)
         {
             scalar* row = conversion_[rowI];
 
-            for (label columnI = 0; columnI < conversion_.m(); columnI++)
+            for (label columnI = 0; columnI < conversion_.n(); columnI++)
             {
                 const dimensionedScalar& dSet = units_[columnI];
                 row[columnI] = dSet.dimensions()[rowI];
             }
         }
-        conversionPivots_.setSize(conversion_.n());
+        conversionPivots_.setSize(conversion_.m());
         LUDecompose(conversion_, conversionPivots_);
     }
 }
diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
index d6bc7f7b71..69844cd403 100644
--- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
+++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ template<class Type>
 template<class Form>
 Foam::DiagonalMatrix<Type>::DiagonalMatrix(const Matrix<Form, Type>& a)
 :
-    List<Type>(min(a.n(), a.m()))
+    List<Type>(min(a.m(), a.n()))
 {
     forAll(*this, i)
     {
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
index b5e37d441b..dc68209202 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::LUscalarMatrix::LUscalarMatrix(const scalarSquareMatrix& matrix)
 :
     scalarSquareMatrix(matrix),
     comm_(Pstream::worldComm),
-    pivotIndices_(n())
+    pivotIndices_(m())
 {
     LUDecompose(*this, pivotIndices_);
 }
@@ -144,8 +144,8 @@ Foam::LUscalarMatrix::LUscalarMatrix
 
     if (Pstream::master(comm_))
     {
-        label nRows = n();
-        label nColumns = m();
+        label nRows = m();
+        label nColumns = n();
 
         if (debug)
         {
@@ -180,7 +180,7 @@ Foam::LUscalarMatrix::LUscalarMatrix
             Pout<< endl;
         }
 
-        pivotIndices_.setSize(n());
+        pivotIndices_.setSize(m());
         LUDecompose(*this, pivotIndices_);
     }
 }
@@ -387,10 +387,10 @@ void Foam::LUscalarMatrix::convert
 
 void Foam::LUscalarMatrix::printDiagonalDominance() const
 {
-    for (label i=0; i<n(); i++)
+    for (label i=0; i<m(); i++)
     {
         scalar sum = 0.0;
-        for (label j=0; j<n(); j++)
+        for (label j=0; j<m(); j++)
         {
             if (i != j)
             {
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C
index 8948d37675..4d327faeee 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ void Foam::LUscalarMatrix::solve(Field<Type>& sourceSol) const
 {
     if (Pstream::parRun())
     {
-        Field<Type> completeSourceSol(n());
+        Field<Type> completeSourceSol(m());
 
         if (Pstream::master(comm_))
         {
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index d06cef41e6..39761e49da 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -96,9 +96,9 @@ Foam::Matrix<Form, Type>::Matrix(const label n, const label m, const Type& a)
     {
         Type* v = v_[0];
 
-        label nm = nRows_*nCols_;
+        label mn = nRows_*nCols_;
 
-        for (label i=0; i<nm; i++)
+        for (label i=0; i<mn; i++)
         {
             v[i] = a;
         }
@@ -119,8 +119,8 @@ Foam::Matrix<Form, Type>::Matrix(const Matrix<Form, Type>& a)
         Type* v = v_[0];
         const Type* av = a.v_[0];
 
-        label nm = nRows_*nCols_;
-        for (label i=0; i<nm; i++)
+        label mn = nRows_*nCols_;
+        for (label i=0; i<mn; i++)
         {
             v[i] = av[i];
         }
@@ -162,11 +162,11 @@ template<class Form, class Type>
 Form Foam::Matrix<Form, Type>::T() const
 {
     const Matrix<Form, Type>& A = *this;
-    Form At(m(), n());
+    Form At(n(), m());
 
-    for (label i=0; i<n(); i++)
+    for (label i=0; i<m(); i++)
     {
-        for (label j=0; j<m(); j++)
+        for (label j=0; j<n(); j++)
         {
             At[j][i] = A[i][j];
         }
@@ -185,8 +185,8 @@ void Foam::Matrix<Form, Type>::operator=(const Type& t)
     {
         Type* v = v_[0];
 
-        label nm = nRows_*nCols_;
-        for (label i=0; i<nm; i++)
+        label mn = nRows_*nCols_;
+        for (label i=0; i<mn; i++)
         {
             v[i] = t;
         }
@@ -200,7 +200,7 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
     if (this == &a)
     {
         FatalErrorInFunction
-            << "attempted assignment to self"
+            << "attempted assigmnent to self"
             << abort(FatalError);
     }
 
@@ -217,8 +217,8 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
         Type* v = v_[0];
         const Type* av = a.v_[0];
 
-        label nm = nRows_*nCols_;
-        for (label i=0; i<nm; i++)
+        label mn = nRows_*nCols_;
+        for (label i=0; i<mn; i++)
         {
             v[i] = av[i];
         }
@@ -231,14 +231,14 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
 template<class Form, class Type>
 const Type& Foam::max(const Matrix<Form, Type>& a)
 {
-    label nm = a.n()*a.m();
+    label mn = a.m()*a.n();
 
-    if (nm)
+    if (mn)
     {
         label curMaxI = 0;
         const Type* v = a[0];
 
-        for (label i=1; i<nm; i++)
+        for (label i=1; i<mn; i++)
         {
             if (v[i] > v[curMaxI])
             {
@@ -263,14 +263,14 @@ const Type& Foam::max(const Matrix<Form, Type>& a)
 template<class Form, class Type>
 const Type& Foam::min(const Matrix<Form, Type>& a)
 {
-    label nm = a.n()*a.m();
+    label mn = a.m()*a.n();
 
-    if (nm)
+    if (mn)
     {
         label curMinI = 0;
         const Type* v = a[0];
 
-        for (label i=1; i<nm; i++)
+        for (label i=1; i<mn; i++)
         {
             if (v[i] < v[curMinI])
             {
@@ -297,15 +297,15 @@ const Type& Foam::min(const Matrix<Form, Type>& a)
 template<class Form, class Type>
 Form Foam::operator-(const Matrix<Form, Type>& a)
 {
-    Form na(a.n(), a.m());
+    Form na(a.m(), a.n());
 
-    if (a.n() && a.m())
+    if (a.m() && a.n())
     {
         Type* nav = na[0];
         const Type* av = a[0];
 
-        label nm = a.n()*a.m();
-        for (label i=0; i<nm; i++)
+        label mn = a.m()*a.n();
+        for (label i=0; i<mn; i++)
         {
             nav[i] = -av[i];
         }
@@ -318,30 +318,30 @@ Form Foam::operator-(const Matrix<Form, Type>& a)
 template<class Form, class Type>
 Form Foam::operator+(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 {
-    if (a.n() != b.n())
-    {
-        FatalErrorInFunction
-            << "attempted add matrices with different number of rows: "
-            << a.n() << ", " << b.n()
-            << abort(FatalError);
-    }
-
     if (a.m() != b.m())
     {
         FatalErrorInFunction
-            << "attempted add matrices with different number of columns: "
+            << "attempted add matrices with different number of rows: "
             << a.m() << ", " << b.m()
             << abort(FatalError);
     }
 
-    Form ab(a.n(), a.m());
+    if (a.n() != b.n())
+    {
+        FatalErrorInFunction
+            << "attempted add matrices with different number of columns: "
+            << a.n() << ", " << b.n()
+            << abort(FatalError);
+    }
+
+    Form ab(a.m(), a.n());
 
     Type* abv = ab[0];
     const Type* av = a[0];
     const Type* bv = b[0];
 
-    label nm = a.n()*a.m();
-    for (label i=0; i<nm; i++)
+    label mn = a.m()*a.n();
+    for (label i=0; i<mn; i++)
     {
         abv[i] = av[i] + bv[i];
     }
@@ -353,30 +353,30 @@ Form Foam::operator+(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 template<class Form, class Type>
 Form Foam::operator-(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 {
-    if (a.n() != b.n())
-    {
-        FatalErrorInFunction
-            << "attempted add matrices with different number of rows: "
-            << a.n() << ", " << b.n()
-            << abort(FatalError);
-    }
-
     if (a.m() != b.m())
     {
         FatalErrorInFunction
-            << "attempted add matrices with different number of columns: "
+            << "attempted add matrices with different number of rows: "
             << a.m() << ", " << b.m()
             << abort(FatalError);
     }
 
-    Form ab(a.n(), a.m());
+    if (a.n() != b.n())
+    {
+        FatalErrorInFunction
+            << "attempted add matrices with different number of columns: "
+            << a.n() << ", " << b.n()
+            << abort(FatalError);
+    }
+
+    Form ab(a.m(), a.n());
 
     Type* abv = ab[0];
     const Type* av = a[0];
     const Type* bv = b[0];
 
-    label nm = a.n()*a.m();
-    for (label i=0; i<nm; i++)
+    label mn = a.m()*a.n();
+    for (label i=0; i<mn; i++)
     {
         abv[i] = av[i] - bv[i];
     }
@@ -388,15 +388,15 @@ Form Foam::operator-(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 template<class Form, class Type>
 Form Foam::operator*(const scalar s, const Matrix<Form, Type>& a)
 {
-    Form sa(a.n(), a.m());
+    Form sa(a.m(), a.n());
 
-    if (a.n() && a.m())
+    if (a.m() && a.n())
     {
         Type* sav = sa[0];
         const Type* av = a[0];
 
-        label nm = a.n()*a.m();
-        for (label i=0; i<nm; i++)
+        label mn = a.m()*a.n();
+        for (label i=0; i<mn; i++)
         {
             sav[i] = s*av[i];
         }
@@ -409,24 +409,24 @@ Form Foam::operator*(const scalar s, const Matrix<Form, Type>& a)
 template<class Form, class Type>
 Form Foam::operator*(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 {
-    if (a.m() != b.n())
+    if (a.n() != b.m())
     {
         FatalErrorInFunction
             << "attempted to multiply incompatible matrices:" << nl
-            << "Matrix A : " << a.n() << " rows, " << a.m() << " columns" << nl
-            << "Matrix B : " << b.n() << " rows, " << b.m() << " columns" << nl
+            << "Matrix A : " << a.m() << " rows, " << a.n() << " columns" << nl
+            << "Matrix B : " << b.m() << " rows, " << b.n() << " columns" << nl
             << "In order to multiply matrices, columns of A must equal "
             << "rows of B"
             << abort(FatalError);
     }
 
-    Form ab(a.n(), b.m(), scalar(0));
+    Form ab(a.m(), b.n(), scalar(0));
 
-    for (label i = 0; i < ab.n(); i++)
+    for (label i = 0; i < ab.m(); i++)
     {
-        for (label j = 0; j < ab.m(); j++)
+        for (label j = 0; j < ab.n(); j++)
         {
-            for (label l = 0; l < b.n(); l++)
+            for (label l = 0; l < b.m(); l++)
             {
                 ab[i][j] += a[i][l]*b[l][j];
             }
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 87652bdd6b..49bf41fc6f 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -125,10 +125,10 @@ public:
         // Access
 
             //- Return the number of rows
-            inline label n() const;
+            inline label m() const;
 
             //- Return the number of columns
-            inline label m() const;
+            inline label n() const;
 
             //- Return the number of elements in matrix (n*m)
             inline label size() const;
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index 5286b98f42..fbfd446281 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H
@@ -53,14 +53,14 @@ inline const Foam::Matrix<Form, Type>& Foam::Matrix<Form, Type>::null()
 
 //- Return the number of rows
 template<class Form, class Type>
-inline Foam::label Foam::Matrix<Form, Type>::n() const
+inline Foam::label Foam::Matrix<Form, Type>::m() const
 {
     return nRows_;
 }
 
 
 template<class Form, class Type>
-inline Foam::label Foam::Matrix<Form, Type>::m() const
+inline Foam::label Foam::Matrix<Form, Type>::n() const
 {
     return nCols_;
 }
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixIO.C b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
index 60df684937..edf2c54b22 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixIO.C
+++ b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
@@ -62,7 +62,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
         M.nRows_ = firstToken.labelToken();
         M.nCols_ = readLabel(is);
 
-        label nm = M.nRows_*M.nCols_;
+        label mn = M.nRows_*M.nCols_;
 
         // Read list contents depending on data format
         if (is.format() == IOstream::ASCII || !contiguous<Type>())
@@ -70,7 +70,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
             // Read beginning of contents
             char listDelimiter = is.readBeginList("Matrix");
 
-            if (nm)
+            if (mn)
             {
                 M.allocate();
                 Type* v = M.v_[0];
@@ -80,11 +80,11 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
                     label k = 0;
 
                     // loop over rows
-                    for (label i=0; i<M.n(); i++)
+                    for (label i=0; i<M.m(); i++)
                     {
                         listDelimiter = is.readBeginList("MatrixRow");
 
-                        for (label j=0; j<M.m(); j++)
+                        for (label j=0; j<M.n(); j++)
                         {
                             is >> v[k++];
 
@@ -109,7 +109,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
                         "reading the single entry"
                     );
 
-                    for (label i=0; i<nm; i++)
+                    for (label i=0; i<mn; i++)
                     {
                         v[i] = element;
                     }
@@ -121,12 +121,12 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
         }
         else
         {
-            if (nm)
+            if (mn)
             {
                 M.allocate();
                 Type* v = M.v_[0];
 
-                is.read(reinterpret_cast<char*>(v), nm*sizeof(Type));
+                is.read(reinterpret_cast<char*>(v), mn*sizeof(Type));
 
                 is.fatalCheck
                 (
@@ -151,24 +151,24 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
 template<class Form, class Type>
 Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
 {
-    label nm = M.nRows_*M.nCols_;
+    label mn = M.nRows_*M.nCols_;
 
-    os  << M.n() << token::SPACE << M.m();
+    os  << M.m() << token::SPACE << M.n();
 
     // Write list contents depending on data format
     if (os.format() == IOstream::ASCII || !contiguous<Type>())
     {
-        if (nm)
+        if (mn)
         {
             bool uniform = false;
 
             const Type* v = M.v_[0];
 
-            if (nm > 1 && contiguous<Type>())
+            if (mn > 1 && contiguous<Type>())
             {
                 uniform = true;
 
-                for (label i=0; i< nm; i++)
+                for (label i=0; i< mn; i++)
                 {
                     if (v[i] != v[0])
                     {
@@ -189,7 +189,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
                 // Write end of contents delimiter
                 os << token::END_BLOCK;
             }
-            else if (nm < 10 && contiguous<Type>())
+            else if (mn < 10 && contiguous<Type>())
             {
                 // Write size of list and start contents delimiter
                 os  << token::BEGIN_LIST;
@@ -197,12 +197,12 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
                 label k = 0;
 
                 // loop over rows
-                for (label i=0; i< M.n(); i++)
+                for (label i=0; i< M.m(); i++)
                 {
                     os  << token::BEGIN_LIST;
 
                     // Write row
-                    for (label j=0; j< M.m(); j++)
+                    for (label j=0; j< M.n(); j++)
                     {
                         if (j > 0) os << token::SPACE;
                         os << v[k++];
@@ -222,12 +222,12 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
                 label k = 0;
 
                 // loop over rows
-                for (label i=0; i< M.n(); i++)
+                for (label i=0; i< M.m(); i++)
                 {
                     os  << nl << token::BEGIN_LIST;
 
                     // Write row
-                    for (label j=0; j< M.m(); j++)
+                    for (label j=0; j< M.n(); j++)
                     {
                         os << nl << v[k++];
                     }
@@ -246,9 +246,9 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
     }
     else
     {
-        if (nm)
+        if (mn)
         {
-            os.write(reinterpret_cast<const char*>(M.v_[0]), nm*sizeof(Type));
+            os.write(reinterpret_cast<const char*>(M.v_[0]), mn*sizeof(Type));
         }
     }
 
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
index 439257fcb6..e8e7dd0e8c 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Foam::scalar Foam::detDecomposed
 {
     scalar diagProduct = 1.0;
 
-    for (label i = 0; i < matrix.n(); ++i)
+    for (label i = 0; i < matrix.m(); ++i)
     {
         diagProduct *= matrix[i][i];
     }
@@ -51,7 +51,7 @@ Foam::scalar Foam::det(const SquareMatrix<Type>& matrix)
 {
     SquareMatrix<Type> matrixTmp = matrix;
 
-    labelList pivotIndices(matrix.n());
+    labelList pivotIndices(matrix.m());
     label sign;
     LUDecompose(matrixTmp, pivotIndices, sign);
 
@@ -62,7 +62,7 @@ Foam::scalar Foam::det(const SquareMatrix<Type>& matrix)
 template<class Type>
 Foam::scalar Foam::det(SquareMatrix<Type>& matrix)
 {
-    labelList pivotIndices(matrix.n());
+    labelList pivotIndices(matrix.m());
     label sign;
     LUDecompose(matrix, pivotIndices, sign);
 
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
index bb6bea65c7..1ab99b1240 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,9 +33,9 @@ Foam::SymmetricSquareMatrix<Type> Foam::invDecomposed
     const SymmetricSquareMatrix<Type>& matrix
 )
 {
-    SymmetricSquareMatrix<Type> inv(matrix.n(), matrix.n(), 0.0);
+    SymmetricSquareMatrix<Type> inv(matrix.m(), matrix.m(), 0.0);
 
-    for (label i = 0; i < matrix.n(); ++i)
+    for (label i = 0; i < matrix.m(); ++i)
     {
         inv[i][i] = 1.0/matrix[i][i];
 
@@ -75,7 +75,7 @@ Foam::scalar Foam::detDecomposed(const SymmetricSquareMatrix<Type>& matrix)
 {
     scalar diagProduct = 1.0;
 
-    for (label i = 0; i < matrix.n(); ++i)
+    for (label i = 0; i < matrix.m(); ++i)
     {
         diagProduct *= matrix[i][i];
     }
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
index 3b3092f3a6..bbe1e21483 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,39 +33,39 @@ License
 Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
 :
     U_(A),
-    V_(A.m(), A.m()),
-    S_(A.m()),
-    VSinvUt_(A.m(), A.n()),
+    V_(A.n(), A.n()),
+    S_(A.n()),
+    VSinvUt_(A.n(), A.m()),
     nZeros_(0)
 {
     // SVDcomp to find U_, V_ and S_ - the singular values
 
-    const label Um = U_.m();
     const label Un = U_.n();
+    const label Um = U_.m();
 
-    scalarList rv1(Um);
+    scalarList rv1(Un);
     scalar g = 0;
     scalar scale = 0;
     scalar s = 0;
     scalar anorm = 0;
     label l = 0;
 
-    for (label i = 0; i < Um; i++)
+    for (label i = 0; i < Un; i++)
     {
         l = i+2;
         rv1[i] = scale*g;
         g = s = scale = 0;
 
-        if (i < Un)
+        if (i < Um)
         {
-            for (label k = i; k < Un; k++)
+            for (label k = i; k < Um; k++)
             {
                 scale += mag(U_[k][i]);
             }
 
             if (scale != 0)
             {
-                for (label k = i; k < Un; k++)
+                for (label k = i; k < Um; k++)
                 {
                     U_[k][i] /= scale;
                     s += U_[k][i]*U_[k][i];
@@ -76,22 +76,22 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                 scalar h = f*g - s;
                 U_[i][i] = f - g;
 
-                for (label j = l-1; j < Um; j++)
+                for (label j = l-1; j < Un; j++)
                 {
                     s = 0;
-                    for (label k = i; k < Un; k++)
+                    for (label k = i; k < Um; k++)
                     {
                         s += U_[k][i]*U_[k][j];
                     }
 
                     f = s/h;
-                    for (label k = i; k < A.n(); k++)
+                    for (label k = i; k < A.m(); k++)
                     {
                         U_[k][j] += f*U_[k][i];
                     }
                 }
 
-                for (label k = i; k < Un; k++)
+                for (label k = i; k < Um; k++)
                 {
                     U_[k][i] *= scale;
                 }
@@ -102,16 +102,16 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
 
         g = s = scale = 0;
 
-        if (i+1 <= Un && i != Um)
+        if (i+1 <= Um && i != Un)
         {
-            for (label k = l-1; k < Um; k++)
+            for (label k = l-1; k < Un; k++)
             {
                 scale += mag(U_[i][k]);
             }
 
             if (scale != 0)
             {
-                for (label k=l-1; k < Um; k++)
+                for (label k=l-1; k < Un; k++)
                 {
                     U_[i][k] /= scale;
                     s += U_[i][k]*U_[i][k];
@@ -122,25 +122,25 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                 scalar h = f*g - s;
                 U_[i][l-1] = f - g;
 
-                for (label k = l-1; k < Um; k++)
+                for (label k = l-1; k < Un; k++)
                 {
                     rv1[k] = U_[i][k]/h;
                 }
 
-                for (label j = l-1; j < Un; j++)
+                for (label j = l-1; j < Um; j++)
                 {
                     s = 0;
-                    for (label k = l-1; k < Um; k++)
+                    for (label k = l-1; k < Un; k++)
                     {
                         s += U_[j][k]*U_[i][k];
                     }
 
-                    for (label k = l-1; k < Um; k++)
+                    for (label k = l-1; k < Un; k++)
                     {
                         U_[j][k] += s*rv1[k];
                     }
                 }
-                for (label k = l-1; k < Um; k++)
+                for (label k = l-1; k < Un; k++)
                 {
                     U_[i][k] *= scale;
                 }
@@ -150,33 +150,33 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         anorm = max(anorm, mag(S_[i]) + mag(rv1[i]));
     }
 
-    for (label i = Um-1; i >= 0; i--)
+    for (label i = Un-1; i >= 0; i--)
     {
-        if (i < Um-1)
+        if (i < Un-1)
         {
             if (g != 0)
             {
-                for (label j = l; j < Um; j++)
+                for (label j = l; j < Un; j++)
                 {
                     V_[j][i] = (U_[i][j]/U_[i][l])/g;
                 }
 
-                for (label j=l; j < Um; j++)
+                for (label j=l; j < Un; j++)
                 {
                     s = 0;
-                    for (label k = l; k < Um; k++)
+                    for (label k = l; k < Un; k++)
                     {
                         s += U_[i][k]*V_[k][j];
                     }
 
-                    for (label k = l; k < Um; k++)
+                    for (label k = l; k < Un; k++)
                     {
                         V_[k][j] += s*V_[k][i];
                     }
                 }
             }
 
-            for (label j = l; j < Um;j++)
+            for (label j = l; j < Un;j++)
             {
                 V_[i][j] = V_[j][i] = 0.0;
             }
@@ -187,12 +187,12 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         l = i;
     }
 
-    for (label i = min(Um, Un) - 1; i >= 0; i--)
+    for (label i = min(Un, Um) - 1; i >= 0; i--)
     {
         l = i+1;
         g = S_[i];
 
-        for (label j = l; j < Um; j++)
+        for (label j = l; j < Un; j++)
         {
             U_[i][j] = 0.0;
         }
@@ -201,30 +201,30 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         {
             g = 1.0/g;
 
-            for (label j = l; j < Um; j++)
+            for (label j = l; j < Un; j++)
             {
                 s = 0;
-                for (label k = l; k < Un; k++)
+                for (label k = l; k < Um; k++)
                 {
                     s += U_[k][i]*U_[k][j];
                 }
 
                 scalar f = (s/U_[i][i])*g;
 
-                for (label k = i; k < Un; k++)
+                for (label k = i; k < Um; k++)
                 {
                     U_[k][j] += f*U_[k][i];
                 }
             }
 
-            for (label j = i; j < Un; j++)
+            for (label j = i; j < Um; j++)
             {
                 U_[j][i] *= g;
             }
         }
         else
         {
-            for (label j = i; j < Un; j++)
+            for (label j = i; j < Um; j++)
             {
                 U_[j][i] = 0.0;
             }
@@ -233,22 +233,22 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         ++U_[i][i];
     }
 
-    for (label k = Um-1; k >= 0; k--)
+    for (label k = Un-1; k >= 0; k--)
     {
         for (label its = 0; its < 35; its++)
         {
             bool flag = true;
 
-            label nm;
+            label mn;
             for (l = k; l >= 0; l--)
             {
-                nm = l-1;
+                mn = l-1;
                 if (mag(rv1[l]) + anorm == anorm)
                 {
                     flag = false;
                     break;
                 }
-                if (mag(S_[nm]) + anorm == anorm) break;
+                if (mag(S_[mn]) + anorm == anorm) break;
             }
 
             if (flag)
@@ -269,11 +269,11 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                     c = g*h;
                     s = -f*h;
 
-                    for (label j = 0; j < Un; j++)
+                    for (label j = 0; j < Um; j++)
                     {
-                        scalar y = U_[j][nm];
+                        scalar y = U_[j][mn];
                         scalar z = U_[j][i];
-                        U_[j][nm] = y*c + z*s;
+                        U_[j][mn] = y*c + z*s;
                         U_[j][i] = z*c - y*s;
                     }
                 }
@@ -287,21 +287,21 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                 {
                     S_[k] = -z;
 
-                    for (label j = 0; j < Um; j++) V_[j][k] = -V_[j][k];
+                    for (label j = 0; j < Un; j++) V_[j][k] = -V_[j][k];
                 }
                 break;
             }
             if (its == 34)
             {
                 WarningInFunction
-                    << "no convergence in 35 SVD iterations"
+                    << "No convergence in 35 SVD iterations"
                     << endl;
             }
 
             scalar x = S_[l];
-            nm = k-1;
-            scalar y = S_[nm];
-            g = rv1[nm];
+            mn = k-1;
+            scalar y = S_[mn];
+            g = rv1[mn];
             scalar h = rv1[k];
             scalar f = ((y - z)*(y + z) + (g - h)*(g + h))/(2.0*h*y);
             g = sqrtSumSqr(f, scalar(1));
@@ -309,7 +309,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
             scalar c = 1.0;
             s = 1.0;
 
-            for (label j = l; j <= nm; j++)
+            for (label j = l; j <= mn; j++)
             {
                 label i = j + 1;
                 g = rv1[i];
@@ -325,7 +325,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                 h = y*s;
                 y *= c;
 
-                for (label jj = 0; jj < Um; jj++)
+                for (label jj = 0; jj < Un; jj++)
                 {
                     x = V_[jj][j];
                     z = V_[jj][i];
@@ -344,7 +344,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                 f = c*g + s*y;
                 x = c*y - s*g;
 
-                for (label jj=0; jj < Un; jj++)
+                for (label jj=0; jj < Um; jj++)
                 {
                     y = U_[jj][j];
                     z = U_[jj][i];
@@ -358,7 +358,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         }
     }
 
-    // zero singular values that are less than minCondition*maxS
+    // Zero singular values that are less than minCondition*maxS
     const scalar minS = minCondition*S_[findMax(S_)];
     forAll(S_, i)
     {
@@ -370,17 +370,18 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         }
     }
 
-    // now multiply out to find the pseudo inverse of A, VSinvUt_
+    // Now multiply out to find the pseudo inverse of A, VSinvUt_
     multiply(VSinvUt_, V_, inv(S_), U_.T());
 
     // test SVD
-    /*scalarRectangularMatrix SVDA(A.n(), A.m());
+    /*
+    scalarRectangularMatrix SVDA(A.m(), A.n());
     multiply(SVDA, U_, S_, transpose(V_));
     scalar maxDiff = 0;
     scalar diff = 0;
-    for (label i = 0; i < A.n(); i++)
+    for (label i = 0; i < A.m(); i++)
     {
-        for (label j = 0; j < A.m(); j++)
+        for (label j = 0; j < A.n(); j++)
         {
             diff = mag(A[i][j] - SVDA[i][j]);
             if (diff > maxDiff) maxDiff = diff;
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
index d1e38c9082..2f4a9dcb19 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 /*---------------------------------------------------------------------------*\
                       Class SVD Declaration
 \*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
index 46f4a3ee1d..46e972f729 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,17 +46,17 @@ void Foam::LUDecompose
     label& sign
 )
 {
-    label n = matrix.n();
-    scalar vv[n];
+    label m = matrix.m();
+    scalar vv[m];
     sign = 1;
 
-    for (label i=0; i<n; i++)
+    for (label i=0; i<m; i++)
     {
         scalar largestCoeff = 0.0;
         scalar temp;
         const scalar* __restrict__ matrixi = matrix[i];
 
-        for (label j=0; j<n; j++)
+        for (label j=0; j<m; j++)
         {
             if ((temp = mag(matrixi[j])) > largestCoeff)
             {
@@ -73,7 +73,7 @@ void Foam::LUDecompose
         vv[i] = 1.0/largestCoeff;
     }
 
-    for (label j=0; j<n; j++)
+    for (label j=0; j<m; j++)
     {
         scalar* __restrict__ matrixj = matrix[j];
 
@@ -92,7 +92,7 @@ void Foam::LUDecompose
         label iMax = 0;
 
         scalar largestCoeff = 0.0;
-        for (label i=j; i<n; i++)
+        for (label i=j; i<m; i++)
         {
             scalar* __restrict__ matrixi = matrix[i];
             scalar sum = matrixi[j];
@@ -118,7 +118,7 @@ void Foam::LUDecompose
         {
             scalar* __restrict__ matrixiMax = matrix[iMax];
 
-            for (label k=0; k<n; k++)
+            for (label k=0; k<m; k++)
             {
                 Swap(matrixj[k], matrixiMax[k]);
             }
@@ -132,11 +132,11 @@ void Foam::LUDecompose
             matrixj[j] = SMALL;
         }
 
-        if (j != n-1)
+        if (j != m-1)
         {
             scalar rDiag = 1.0/matrixj[j];
 
-            for (label i=j+1; i<n; i++)
+            for (label i=j+1; i<m; i++)
             {
                 matrix[i][j] *= rDiag;
             }
@@ -148,7 +148,7 @@ void Foam::LUDecompose
 void Foam::LUDecompose(scalarSymmetricSquareMatrix& matrix)
 {
     // Store result in upper triangular part of matrix
-    label size = matrix.n();
+    label size = matrix.m();
 
     // Set upper triangular parts to zero.
     for (label j = 0; j < size; j++)
@@ -205,32 +205,32 @@ void Foam::multiply
     const scalarRectangularMatrix& C
 )
 {
-    if (A.m() != B.n())
+    if (A.n() != B.m())
     {
         FatalErrorInFunction
-            << "A and B must have identical inner dimensions but A.m = "
-            << A.m() << " and B.n = " << B.n()
+            << "A and B must have identical inner dimensions but A.n = "
+            << A.n() << " and B.m = " << B.m()
             << abort(FatalError);
     }
 
-    if (B.m() != C.n())
+    if (B.n() != C.m())
     {
         FatalErrorInFunction
-            << "B and C must have identical inner dimensions but B.m = "
-            << B.m() << " and C.n = " << C.n()
+            << "B and C must have identical inner dimensions but B.n = "
+            << B.n() << " and C.m = " << C.m()
             << abort(FatalError);
     }
 
-    ans = scalarRectangularMatrix(A.n(), C.m(), scalar(0));
+    ans = scalarRectangularMatrix(A.m(), C.n(), scalar(0));
 
-    for (label i = 0; i < A.n(); i++)
+    for (label i = 0; i < A.m(); i++)
     {
-        for (label g = 0; g < C.m(); g++)
+        for (label g = 0; g < C.n(); g++)
         {
-            for (label l = 0; l < C.n(); l++)
+            for (label l = 0; l < C.m(); l++)
             {
                 scalar ab = 0;
-                for (label j = 0; j < A.m(); j++)
+                for (label j = 0; j < A.n(); j++)
                 {
                     ab += A[i][j]*B[j][l];
                 }
@@ -249,29 +249,29 @@ void Foam::multiply
     const scalarRectangularMatrix& C
 )
 {
-    if (A.m() != B.size())
+    if (A.n() != B.size())
     {
         FatalErrorInFunction
-            << "A and B must have identical inner dimensions but A.m = "
-            << A.m() << " and B.n = " << B.size()
+            << "A and B must have identical inner dimensions but A.n = "
+            << A.n() << " and B.m = " << B.size()
             << abort(FatalError);
     }
 
-    if (B.size() != C.n())
+    if (B.size() != C.m())
     {
         FatalErrorInFunction
-            << "B and C must have identical inner dimensions but B.m = "
-            << B.size() << " and C.n = " << C.n()
+            << "B and C must have identical inner dimensions but B.n = "
+            << B.size() << " and C.m = " << C.m()
             << abort(FatalError);
     }
 
-    ans = scalarRectangularMatrix(A.n(), C.m(), scalar(0));
+    ans = scalarRectangularMatrix(A.m(), C.n(), scalar(0));
 
-    for (label i = 0; i < A.n(); i++)
+    for (label i = 0; i < A.m(); i++)
     {
-        for (label g = 0; g < C.m(); g++)
+        for (label g = 0; g < C.n(); g++)
         {
-            for (label l = 0; l < C.n(); l++)
+            for (label l = 0; l < C.m(); l++)
             {
                 ans[i][g] += C[l][g] * A[i][l]*B[l];
             }
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
index 5f70c83b91..59ca2d34e5 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,16 +36,16 @@ void Foam::solve
     List<Type>& sourceSol
 )
 {
-    label n = tmpMatrix.n();
+    label m = tmpMatrix.m();
 
     // Elimination
-    for (label i=0; i<n; i++)
+    for (label i=0; i<m; i++)
     {
         label iMax = i;
         scalar largestCoeff = mag(tmpMatrix[iMax][i]);
 
         // Swap entries around to find a good pivot
-        for (label j=i+1; j<n; j++)
+        for (label j=i+1; j<m; j++)
         {
             if (mag(tmpMatrix[j][i]) > largestCoeff)
             {
@@ -58,7 +58,7 @@ void Foam::solve
         {
             //Info<< "Pivoted on " << i << " " << iMax << endl;
 
-            for (label k=i; k<n; k++)
+            for (label k=i; k<m; k++)
             {
                 Swap(tmpMatrix[i][k], tmpMatrix[iMax][k]);
             }
@@ -74,11 +74,11 @@ void Foam::solve
         }
 
         // Reduce to upper triangular form
-        for (label j=i+1; j<n; j++)
+        for (label j=i+1; j<m; j++)
         {
             sourceSol[j] -= sourceSol[i]*(tmpMatrix[j][i]/tmpMatrix[i][i]);
 
-            for (label k=n-1; k>=i; k--)
+            for (label k=m-1; k>=i; k--)
             {
                 tmpMatrix[j][k] -=
                     tmpMatrix[i][k]*tmpMatrix[j][i]/tmpMatrix[i][i];
@@ -87,11 +87,11 @@ void Foam::solve
     }
 
     // Back-substitution
-    for (label j=n-1; j>=0; j--)
+    for (label j=m-1; j>=0; j--)
     {
         Type ntempvec = pTraits<Type>::zero;
 
-        for (label k=j+1; k<n; k++)
+        for (label k=j+1; k<m; k++)
         {
             ntempvec += tmpMatrix[j][k]*sourceSol[k];
         }
@@ -123,11 +123,11 @@ void Foam::LUBacksubstitute
     List<Type>& sourceSol
 )
 {
-    label n = luMatrix.n();
+    label m = luMatrix.m();
 
     label ii = 0;
 
-    for (label i=0; i<n; i++)
+    for (label i=0; i<m; i++)
     {
         label ip = pivotIndices[i];
         Type sum = sourceSol[ip];
@@ -149,12 +149,12 @@ void Foam::LUBacksubstitute
         sourceSol[i] = sum;
     }
 
-    for (label i=n-1; i>=0; i--)
+    for (label i=m-1; i>=0; i--)
     {
         Type sum = sourceSol[i];
         const scalar* __restrict__ luMatrixi = luMatrix[i];
 
-        for (label j=i+1; j<n; j++)
+        for (label j=i+1; j<m; j++)
         {
             sum -= luMatrixi[j]*sourceSol[j];
         }
@@ -171,11 +171,11 @@ void Foam::LUBacksubstitute
     List<Type>& sourceSol
 )
 {
-    label n = luMatrix.n();
+    label m = luMatrix.m();
 
     label ii = 0;
 
-    for (label i=0; i<n; i++)
+    for (label i=0; i<m; i++)
     {
         Type sum = sourceSol[i];
         const scalar* __restrict__ luMatrixi = luMatrix[i];
@@ -195,12 +195,12 @@ void Foam::LUBacksubstitute
         sourceSol[i] = sum/luMatrixi[i];
     }
 
-    for (label i=n-1; i>=0; i--)
+    for (label i=m-1; i>=0; i--)
     {
         Type sum = sourceSol[i];
         const scalar* __restrict__ luMatrixi = luMatrix[i];
 
-        for (label j=i+1; j<n; j++)
+        for (label j=i+1; j<m; j++)
         {
             sum -= luMatrixi[j]*sourceSol[j];
         }
@@ -217,7 +217,7 @@ void Foam::LUsolve
     List<Type>& sourceSol
 )
 {
-    labelList pivotIndices(matrix.n());
+    labelList pivotIndices(matrix.m());
     LUDecompose(matrix, pivotIndices);
     LUBacksubstitute(matrix, pivotIndices, sourceSol);
 }
@@ -243,21 +243,21 @@ void Foam::multiply
     const Matrix<Form, Type>& B
 )
 {
-    if (A.m() != B.n())
+    if (A.n() != B.m())
     {
         FatalErrorInFunction
-            << "A and B must have identical inner dimensions but A.m = "
-            << A.m() << " and B.n = " << B.n()
+            << "A and B must have identical inner dimensions but A.n = "
+            << A.n() << " and B.m = " << B.m()
             << abort(FatalError);
     }
 
-    ans = Matrix<Form, Type>(A.n(), B.m(), scalar(0));
+    ans = Matrix<Form, Type>(A.m(), B.n(), scalar(0));
 
-    for (label i = 0; i < A.n(); i++)
+    for (label i = 0; i < A.m(); i++)
     {
-        for (label j = 0; j < B.m(); j++)
+        for (label j = 0; j < B.n(); j++)
         {
-            for (label l = 0; l < B.n(); l++)
+            for (label l = 0; l < B.m(); l++)
             {
                 ans[i][j] += A[i][l]*B[l][j];
             }
diff --git a/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C b/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
index 727db535d5..960ba0d563 100644
--- a/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
+++ b/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,7 +106,7 @@ void Foam::simpleMatrix<Type>::operator=(const simpleMatrix<Type>& m)
             << abort(FatalError);
     }
 
-    if (n() != m.n())
+    if (m() != m.m())
     {
         FatalErrorInFunction
             << "Different size matrices"
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
index 96f5c8745c..8820a78e6c 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
@@ -120,7 +120,7 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit
     }
 
     // Additional weighting for constant and linear terms
-    for (label i = 0; i < B.n(); i++)
+    for (label i = 0; i < B.m(); i++)
     {
         B[i][0] *= wts[0];
         B[i][1] *= wts[0];
@@ -172,13 +172,13 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit
             wts[0] *= 10;
             wts[1] *= 10;
 
-            for (label j = 0; j < B.m(); j++)
+            for (label j = 0; j < B.n(); j++)
             {
                 B[0][j] *= 10;
                 B[1][j] *= 10;
             }
 
-            for (label i = 0; i < B.n(); i++)
+            for (label i = 0; i < B.m(); i++)
             {
                 B[i][0] *= 10;
                 B[i][1] *= 10;
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
index ba213d0d08..bc86903cbc 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,7 +194,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
     }
 
     // Additional weighting for constant and linear terms
-    for (label i = 0; i < B.n(); i++)
+    for (label i = 0; i < B.m(); i++)
     {
         B[i][0] *= wts[0];
         B[i][1] *= wts[0];
@@ -267,13 +267,13 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
                 wts[1] *= 10;
             }
 
-            for (label j = 0; j < B.m(); j++)
+            for (label j = 0; j < B.n(); j++)
             {
                 B[0][j] *= 10;
                 B[1][j] *= 10;
             }
 
-            for (label i = 0; i < B.n(); i++)
+            for (label i = 0; i < B.m(); i++)
             {
                 B[i][0] *= 10;
                 B[i][1] *= 10;
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index 56dd573370..71e34ab46d 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -232,7 +232,7 @@ void Foam::radiation::viewFactor::initialise()
                 )
             );
 
-            pivotIndices_.setSize(CLU_().n());
+            pivotIndices_.setSize(CLU_().m());
         }
     }
 }

From e1d67b244dbc4fcf15f851ed0b1040759e8e23c4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 11 Mar 2016 09:46:48 +0000
Subject: [PATCH 270/447] Corrected typo

---
 src/OpenFOAM/matrices/Matrix/Matrix.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index 39761e49da..ec9ae8b1b0 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -200,7 +200,7 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
     if (this == &a)
     {
         FatalErrorInFunction
-            << "attempted assigmnent to self"
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 

From c14ee0ade198fd21b70f362c22c2c011d1093732 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 12 Mar 2016 10:41:18 +0000
Subject: [PATCH 271/447] MatrixSpace: 2D (i-j) specialization of VectorSpace

Provides '(i, j)' element access and general forms of inner and outer
products, transpose etc. for square and rectangular VectorSpaces.

VectorSpaces default to be column-vectors as before whereas row-vectors
may be represented as 1xn MatrixSpaces.  In the future it may be
preferable to create a specializations of VectorSpace for column- and
maybe row-vectors but it would add complexity to MatrixSpace to handle
all the type combinations.

Tensor is now a 3x3 specialization of MatrixSpace.

Sub-block const and non-const access is provided via the
'.block<SubTensor, RowStart, ColStart>()' member functions.  Consistent
sub-block access is also provide for VectorSpace so that columns of
MatrixSpaces may be accessed and substituted.

These new classes will be used to create a more extensive set of
primitive vector and tensor types over the next few weeks.

Henry G. Weller
CFD Direct
---
 .../primitives/MatrixSpace/MatrixSpace.H      | 322 +++++++++
 .../primitives/MatrixSpace/MatrixSpaceI.H     | 609 ++++++++++++++++++
 src/OpenFOAM/primitives/Tensor/Tensor.H       |  47 +-
 src/OpenFOAM/primitives/Tensor/TensorI.H      | 133 ++--
 .../primitives/VectorSpace/VectorSpace.H      |  48 +-
 .../primitives/VectorSpace/VectorSpaceI.H     |  77 +++
 .../primitives/VectorSpace/products.H         |  18 +
 7 files changed, 1202 insertions(+), 52 deletions(-)
 create mode 100644 src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
 create mode 100644 src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H

diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
new file mode 100644
index 0000000000..1d7bcec20d
--- /dev/null
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
@@ -0,0 +1,322 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::MatrixSpace
+
+Description
+    Templated matrix space.
+
+    Template arguments are the Form the matrix space will be used to create,
+    the type of the elements and the number of rows and columns of the matrix.
+
+SourceFiles
+    MatrixSpaceI.H
+
+SeeAlso
+    Foam::VectorSpace
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef MatrixSpace_H
+#define MatrixSpace_H
+
+#include "VectorSpace.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class MatrixSpace Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Form, class Cmpt, direction Nrows, direction Ncols>
+class MatrixSpace
+:
+    public VectorSpace<Form, Cmpt, Nrows*Ncols>
+{
+
+public:
+
+    //- MatrixSpace type
+    typedef MatrixSpace<Form, Cmpt, Nrows, Ncols> msType;
+
+
+    // Member constants
+
+        static const direction nRows = Nrows;
+        static const direction nCols = Ncols;
+
+
+    // Static member functions
+
+        //- Return the number of rows
+        static direction m()
+        {
+            return Nrows;
+        }
+
+        //- Return the number of columns
+        static direction n()
+        {
+            return Ncols;
+        }
+
+        //- Return the identity matrix for square matrix spaces
+        inline static msType identity();
+
+
+    // Sub-Block Classes
+
+        //- Const sub-block type
+        template<class SubTensor, direction BRowStart, direction BColStart>
+        class ConstBlock
+        {
+            //- Reference to parent matrix
+            const msType& matrix_;
+
+        public:
+
+            static const direction nRows = SubTensor::nRows;
+            static const direction nCols = SubTensor::nCols;
+
+            //- Return the number of rows in the block
+            static direction m()
+            {
+                return nRows;
+            }
+
+            //- Return the number of columns in the block
+            static direction n()
+            {
+                return nCols;
+            }
+
+            //- Construct for the given matrix
+            inline ConstBlock(const msType& matrix);
+
+            //- (i, j) const element access operator
+            inline const Cmpt& operator()
+            (
+                const direction i,
+                const direction j
+            ) const;
+        };
+
+
+        //- Sub-block type
+        template
+        <
+            class SubTensor,
+            direction BRowStart,
+            direction BColStart
+        >
+        class Block
+        {
+            //- Reference to parent matrix
+            msType& matrix_;
+
+        public:
+
+            static const direction nRows = SubTensor::nRows;
+            static const direction nCols = SubTensor::nCols;
+
+            //- Return the number of rows in the block
+            static direction m()
+            {
+                return nRows;
+            }
+
+            //- Return the number of columns in the block
+            static direction n()
+            {
+                return nCols;
+            }
+
+            //- Construct for the given matrix
+            inline Block(msType& matrix);
+
+            //- Assignment to a matrix
+            template<class Form2>
+            inline void operator=
+            (
+                const MatrixSpace
+                <
+                    Form2,
+                    Cmpt,
+                    SubTensor::nRows,
+                    SubTensor::nCols
+                >& matrix
+            );
+
+            //- Assignment to a column vector
+            template<class VSForm>
+            inline void operator=
+            (
+                const VectorSpace<VSForm, Cmpt, SubTensor::nRows>& v
+            );
+
+            //- (i, j) const element access operator
+            inline const Cmpt& operator()
+            (
+                const direction i,
+                const direction j
+            ) const;
+
+            //- (i, j) element access operator
+            inline Cmpt& operator()(const direction i, const direction j);
+        };
+
+
+    // Constructors
+
+        //- Construct null
+        inline MatrixSpace();
+
+        //- Construct initialized to zero
+        inline explicit MatrixSpace(const Foam::zero);
+
+        //- Construct as copy of a VectorSpace with the same size
+        template<class Form2, class Cmpt2>
+        inline explicit MatrixSpace
+        (
+            const VectorSpace<Form2, Cmpt2, Nrows*Ncols>&
+        );
+
+        //- Construct from a block of another matrix space
+        template
+        <
+            template<class, direction, direction> class Block2,
+            direction BRowStart,
+            direction BColStart
+        >
+        inline MatrixSpace
+        (
+            const Block2<Form, BRowStart, BColStart>& block
+        );
+
+        //- Construct from Istream
+        MatrixSpace(Istream&);
+
+
+    // Member Functions
+
+        //- Fast const element access using compile-time addressing
+        template<direction Row, direction Col>
+        inline const Cmpt& elmt() const;
+
+        //- Fast element access using compile-time addressing
+        template<direction Row, direction Col>
+        inline Cmpt& elmt();
+
+        // Const element access functions for a 3x3
+        // Compile-time errors are generated for inappropriate use
+
+            inline const Cmpt& xx() const;
+            inline const Cmpt& xy() const;
+            inline const Cmpt& xz() const;
+            inline const Cmpt& yx() const;
+            inline const Cmpt& yy() const;
+            inline const Cmpt& yz() const;
+            inline const Cmpt& zx() const;
+            inline const Cmpt& zy() const;
+            inline const Cmpt& zz() const;
+
+        // Element access functions for a 3x3
+        // Compile-time errors are generated for inappropriate use
+
+            inline Cmpt& xx();
+            inline Cmpt& xy();
+            inline Cmpt& xz();
+            inline Cmpt& yx();
+            inline Cmpt& yy();
+            inline Cmpt& yz();
+            inline Cmpt& zx();
+            inline Cmpt& zy();
+            inline Cmpt& zz();
+
+        //- Return the transpose of the matrix
+        inline typename typeOfTranspose<Cmpt, Form>::type T() const;
+
+        //- Return a const sub-block corresponding to the specified type
+        //  starting at the specified row and column
+        template<class SubTensor, direction BRowStart, direction BColStart>
+        inline ConstBlock<SubTensor, BRowStart, BColStart> block() const;
+
+        //- Return a sub-block corresponding to the specified type
+        //  starting at the specified row and column
+        template<class SubTensor, direction BRowStart, direction BColStart>
+        inline Block<SubTensor, BRowStart, BColStart> block();
+
+        //- (i, j) const element access operator
+        inline const Cmpt& operator()
+        (
+            const direction& row,
+            const direction& col
+        ) const;
+
+        //- (i, j) element access operator
+        inline Cmpt& operator()(const direction& row, const direction& col);
+
+
+    // Member Operators
+
+        //- Assignment to zero
+        inline void operator=(const Foam::zero);
+
+        //- Assignment to a block of another matrix space
+        template
+        <
+            template<class, direction, direction> class Block2,
+            direction BRowStart,
+            direction BColStart
+        >
+        inline void operator=
+        (
+            const Block2<Form, BRowStart, BColStart>& block
+        );
+
+        //- Inner product with a compatible square matrix
+        template<class Form2>
+        inline void operator&=
+        (
+            const MatrixSpace<Form, Cmpt, Ncols, Ncols>& matrix
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "MatrixSpaceI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
new file mode 100644
index 0000000000..e8df098a94
--- /dev/null
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
@@ -0,0 +1,609 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "StaticAssert.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace()
+{}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace
+(
+    const Foam::zero z
+)
+:
+    MatrixSpace::vsType(z)
+{}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form2, class Cmpt2>
+inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace
+(
+    const VectorSpace<Form2, Cmpt2, Nrows*Ncols>& vs
+)
+:
+    MatrixSpace::vsType(vs)
+{}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template
+<
+    template<class, Foam::direction, Foam::direction> class Block2,
+    Foam::direction BRowStart,
+    Foam::direction BColStart
+>
+inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace
+(
+    const Block2<Form, BRowStart, BColStart>& block
+)
+{
+    for (direction i=0; i<Nrows; ++i)
+    {
+        for (direction j=0; j<Ncols; ++j)
+        {
+            operator()(i, j) = block(i, j);
+        }
+    }
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace(Istream& is)
+:
+    MatrixSpace::vsType(is)
+{}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
+inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+ConstBlock<SubTensor, BRowStart, BColStart>::
+ConstBlock(const msType& matrix)
+:
+    matrix_(matrix)
+{
+    StaticAssert(msType::nRows >= BRowStart + nRows);
+    StaticAssert(msType::nCols >= BColStart + nCols);
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
+inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Block<SubTensor, BRowStart, BColStart>::
+Block(msType& matrix)
+:
+    matrix_(matrix)
+{
+    StaticAssert(msType::nRows >= BRowStart + nRows);
+    StaticAssert(msType::nCols >= BColStart + nCols);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<Foam::direction Row, Foam::direction Col>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::elmt() const
+{
+    StaticAssert(Row < Nrows && Col < Ncols);
+    return this->v_[Row*Ncols + Col];
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<Foam::direction Row, Foam::direction Col>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::elmt()
+{
+    StaticAssert(Row < Nrows && Col < Ncols);
+    return this->v_[Row*Ncols + Col];
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xx() const
+{
+    return elmt<0, 0>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xx()
+{
+    return elmt<0, 0>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xy() const
+{
+    return elmt<0,1>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xy()
+{
+    return elmt<0,1>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xz() const
+{
+    return elmt<0,2>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xz()
+{
+    return elmt<0,2>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yx() const
+{
+    return elmt<1,0>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yx()
+{
+    return elmt<1,0>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yy() const
+{
+    return elmt<1,1>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yy()
+{
+    return elmt<1,1>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yz() const
+{
+    return elmt<1,2>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yz()
+{
+    return elmt<1,2>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zx() const
+{
+    return elmt<2,0>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zx()
+{
+    return elmt<2,0>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zy() const
+{
+    return elmt<2,1>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zy()
+{
+    return elmt<2,1>();
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zz() const
+{
+    return elmt<2,2>();
+}
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zz()
+{
+    return elmt<2,2>();
+}
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>
+Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::identity()
+{
+    StaticAssert(Nrows == Ncols);
+    msType result((Foam::zero()));
+
+    for (direction i=0; i<Ncols; ++i)
+    {
+        result(i, i) = 1;
+    }
+
+    return result;
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline typename Foam::typeOfTranspose<Cmpt, Form>::type
+Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::T() const
+{
+    typename typeOfTranspose<Cmpt, Form>::type result;
+
+    for (direction i=0; i<Nrows; ++i)
+    {
+        for (direction j=0; j<Ncols; ++j)
+        {
+            result(j,i) = operator()(i, j);
+        }
+    }
+
+    return result;
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template
+<
+    class SubTensor,
+    Foam::direction BRowStart,
+    Foam::direction BColStart
+>
+inline typename Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::template
+    ConstBlock<SubTensor, BRowStart, BColStart>
+Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::block() const
+{
+    return *this;
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template
+<
+    class SubTensor,
+    Foam::direction BRowStart,
+    Foam::direction BColStart
+>
+inline
+typename Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::template
+    Block<SubTensor, BRowStart, BColStart>
+Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::block()
+{
+    return *this;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
+(
+    const direction& row,
+    const direction& col
+) const
+{
+    #ifdef FULLDEBUG
+    if (row < 0 || row > Nrows-1 || col < 0 || col > Ncols-1)
+    {
+        FatalErrorInFunction
+            << "indices out of range"
+            << abort(FatalError);
+    }
+    #endif
+
+    return this->v_[row*Ncols + col];
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
+(
+    const direction& row,
+    const direction& col
+)
+{
+    #ifdef FULLDEBUG
+    if (row < 0 || row > Nrows-1 || col < 0 || col > Ncols-1)
+    {
+        FatalErrorInFunction
+            << "indices out of range"
+            << abort(FatalError);
+    }
+    #endif
+
+    return this->v_[row*Ncols + col];
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
+inline const Cmpt&
+Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+ConstBlock<SubTensor, BRowStart, BColStart>::
+operator()(const direction i, const direction j) const
+{
+    return matrix_(BRowStart + i, BColStart + j);
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
+inline const Cmpt&
+Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Block<SubTensor, BRowStart, BColStart>::
+operator()(const direction i, const direction j) const
+{
+    return matrix_(BRowStart + i, BColStart + j);
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
+inline Cmpt&
+Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Block<SubTensor, BRowStart, BColStart>::
+operator()(const direction i, const direction j)
+{
+    return matrix_(BRowStart + i, BColStart + j);
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+inline void Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator=
+(
+    const Foam::zero z
+)
+{
+    MatrixSpace::vsType::operator=(z);
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form2>
+inline void Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator&=
+(
+    const MatrixSpace<Form, Cmpt, Ncols, Ncols>& matrix
+)
+{
+    *this = *this & matrix;
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template
+<
+    template<class, Foam::direction, Foam::direction> class Block2,
+    Foam::direction BRowStart,
+    Foam::direction BColStart
+>
+inline void Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator=
+(
+    const Block2<Form, BRowStart, BColStart>& block
+)
+{
+    for (direction i = 0; i < Nrows; ++i)
+    {
+        for (direction j = 0; j < Ncols; ++j)
+        {
+            operator()(i, j) = block(i, j);
+        }
+    }
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
+template<class Form2>
+inline void
+Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Block<SubTensor, BRowStart, BColStart>::
+operator=
+(
+    const MatrixSpace<Form2, Cmpt, SubTensor::nRows, SubTensor::nCols>& matrix
+)
+{
+    for (direction i=0; i<nRows; ++i)
+    {
+        for (direction j=0; j<nCols; ++j)
+        {
+            operator()(i,j) = matrix(i,j);
+        }
+    }
+}
+
+
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
+template<class VSForm>
+inline void
+Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Block<SubTensor, BRowStart, BColStart>::
+operator=
+(
+    const VectorSpace<VSForm, Cmpt, SubTensor::nRows>& v
+)
+{
+    StaticAssert(nCols == 1);
+
+    for (direction i=0; i<SubTensor::nRows; ++i)
+    {
+        operator()(i,0) = v[i];
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+
+template<class Form, class Cmpt, direction Nrows, direction Ncols>
+inline typename typeOfTranspose<Cmpt, Form>::type T
+(
+    const MatrixSpace<Form, Cmpt, Ncols, Nrows>& matrix
+)
+{
+    return matrix.T();
+}
+
+
+template<class Form, class Cmpt, direction Ncmpts>
+inline typename typeOfTranspose<Cmpt, Form>::type T
+(
+    const VectorSpace<Form, Cmpt, Ncmpts>& v
+)
+{
+    typename typeOfTranspose<Cmpt, Form>::type result;
+
+    for (direction i=0; i<Ncmpts; ++i)
+    {
+        result[i] = v[i];
+    }
+
+    return result;
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+template
+<
+    class Form1,
+    class Form2,
+    class Cmpt,
+    direction Nrows1,
+    direction Ncols1,
+    direction Nrows2,
+    direction Ncols2
+>
+inline typename typeOfInnerProduct<Cmpt, Form1, Form2>::type operator&
+(
+    const MatrixSpace<Form1, Cmpt, Nrows1, Ncols1>& matrix1,
+    const MatrixSpace<Form2, Cmpt, Nrows2, Ncols2>& matrix2
+)
+{
+    StaticAssert(Ncols1 == Nrows2);
+
+    typename typeOfInnerProduct<Cmpt, Form1, Form2>::type result
+    (
+        (Foam::zero())
+    );
+
+    for (direction i=0; i<Nrows1; ++i)
+    {
+        for (direction j=0; j<Ncols2; ++j)
+        {
+            for (direction k=0; k<Nrows2; k++)
+            {
+                result(i, j) += matrix1(i, k)*matrix2(k, j);
+            }
+        }
+    }
+
+    return result;
+}
+
+
+template<class Form, class VSForm, class Cmpt, direction Nrows, direction Ncols>
+inline typename typeOfInnerProduct<Cmpt, Form, VSForm>::type operator&
+(
+    const MatrixSpace<Form, Cmpt, Nrows, Ncols>& matrix,
+    const VectorSpace<VSForm, Cmpt, Ncols>& v
+)
+{
+    typename typeOfInnerProduct<Cmpt, Form, VSForm>::type result
+    (
+        (Foam::zero())
+    );
+
+    for (direction i=0; i<Nrows; ++i)
+    {
+        for (direction j=0; j<Ncols; ++j)
+        {
+            result[i] += matrix(i, j)*v[j];
+        }
+    }
+
+    return result;
+}
+
+
+template
+<
+    class Form1,
+    class Form2,
+    class Cmpt,
+    direction Ncmpts1,
+    direction Ncmpts2
+>
+inline typename typeOfOuterProduct<Cmpt, Form1, Form2>::type operator*
+(
+    const VectorSpace<Form1, Cmpt, Ncmpts1>& v1,
+    const VectorSpace<Form2, Cmpt, Ncmpts2>& v2
+)
+{
+    typename typeOfOuterProduct<Cmpt, Form1, Form2>::type result;
+
+    for (direction i=0; i<Ncmpts1; ++i)
+    {
+        for (direction j=0; j<Ncmpts2; ++j)
+        {
+            result(i, j) = v1[i]*v2[j];
+        }
+    }
+
+    return result;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index cf92644c16..ce5d305be7 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -25,7 +25,7 @@ Class
     Foam::Tensor
 
 Description
-    Templated 3D tensor derived from VectorSpace adding construction from
+    Templated 3D tensor derived from MatrixSpace adding construction from
     9 components, element access using xx(), xy() etc. member functions and
     the inner-product (dot-product) and outer-product of two Vectors
     (tensor-product) operators.
@@ -33,11 +33,16 @@ Description
 SourceFiles
     TensorI.H
 
+SeeAlso
+    Foam::MatrixSpace
+    Foam::Vector
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef Tensor_H
 #define Tensor_H
 
+#include "MatrixSpace.H"
 #include "Vector.H"
 #include "SphericalTensor.H"
 
@@ -56,7 +61,7 @@ class SymmTensor;
 template<class Cmpt>
 class Tensor
 :
-    public VectorSpace<Tensor<Cmpt>, Cmpt, 9>
+    public MatrixSpace<Tensor<Cmpt>, Cmpt, 3, 3>
 {
 
 public:
@@ -85,6 +90,13 @@ public:
         //- Construct null
         inline Tensor();
 
+        //- Construct initialized to zero
+        inline explicit Tensor(const Foam::zero);
+
+        //- Construct given MatrixSpace of the same rank
+        template<class Cmpt2>
+        inline Tensor(const MatrixSpace<Tensor<Cmpt2>, Cmpt2, 3, 3>&);
+
         //- Construct given VectorSpace of the same rank
         template<class Cmpt2>
         inline Tensor(const VectorSpace<Tensor<Cmpt2>, Cmpt2, 9>&);
@@ -114,13 +126,25 @@ public:
             const Cmpt tzx, const Cmpt tzy, const Cmpt tzz
         );
 
+        //- Construct from a block of another matrix space
+        template
+        <
+            template<class, direction, direction> class Block2,
+            direction BRowStart,
+            direction BColStart
+        >
+        Tensor
+        (
+            const Block2<Tensor<Cmpt>, BRowStart, BColStart>& block
+        );
+
         //- Construct from Istream
-        Tensor(Istream&);
+        inline Tensor(Istream&);
 
 
     // Member Functions
 
-        // Access
+        // Component access
 
             inline const Cmpt& xx() const;
             inline const Cmpt& xy() const;
@@ -142,7 +166,7 @@ public:
             inline Cmpt& zy();
             inline Cmpt& zz();
 
-            // Access vector components.
+        // Row-vector access.
 
             inline Vector<Cmpt> x() const;
             inline Vector<Cmpt> y() const;
@@ -161,6 +185,10 @@ public:
         //- Inner-product with a Tensor
         inline void operator&=(const Tensor<Cmpt>&);
 
+        //- Assign to an equivalent vector space
+        template<class Cmpt2>
+        inline void operator=(const VectorSpace<Tensor<Cmpt2>, Cmpt2, 9>&);
+
         //- Assign to a SphericalTensor
         inline void operator=(const SphericalTensor<Cmpt>&);
 
@@ -181,6 +209,15 @@ public:
 };
 
 
+template<class Cmpt>
+class typeOfTranspose<Cmpt, Tensor<Cmpt>>
+{
+public:
+
+    typedef Tensor<Cmpt> type;
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 35bfdef0c4..5673703285 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -32,6 +32,24 @@ inline Foam::Tensor<Cmpt>::Tensor()
 {}
 
 
+template<class Cmpt>
+inline Foam::Tensor<Cmpt>::Tensor(const Foam::zero z)
+:
+    Tensor::msType(z)
+{}
+
+
+template<class Cmpt>
+template<class Cmpt2>
+inline Foam::Tensor<Cmpt>::Tensor
+(
+    const MatrixSpace<Tensor<Cmpt2>, Cmpt2, 3, 3>& vs
+)
+:
+    Tensor::msType(vs)
+{}
+
+
 template<class Cmpt>
 template<class Cmpt2>
 inline Foam::Tensor<Cmpt>::Tensor
@@ -39,7 +57,7 @@ inline Foam::Tensor<Cmpt>::Tensor
     const VectorSpace<Tensor<Cmpt2>, Cmpt2, 9>& vs
 )
 :
-    VectorSpace<Tensor<Cmpt>, Cmpt, 9>(vs)
+    Tensor::msType(vs)
 {}
 
 
@@ -106,57 +124,31 @@ inline Foam::Tensor<Cmpt>::Tensor
 }
 
 
+template<class Cmpt>
+template
+<
+    template<class, Foam::direction, Foam::direction> class Block2,
+    Foam::direction BRowStart,
+    Foam::direction BColStart
+>
+inline Foam::Tensor<Cmpt>::Tensor
+(
+    const Block2<Tensor<Cmpt>, BRowStart, BColStart>& block
+)
+:
+    Tensor::msType(block)
+{}
+
+
 template<class Cmpt>
 inline Foam::Tensor<Cmpt>::Tensor(Istream& is)
 :
-    VectorSpace<Tensor<Cmpt>, Cmpt, 9>(is)
+    Tensor::msType(is)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Cmpt>
-inline Foam::Vector<Cmpt> Foam::Tensor<Cmpt>::x() const
-{
-    return Vector<Cmpt>(this->v_[XX], this->v_[XY], this->v_[XZ]);
-}
-
-
-template<class Cmpt>
-inline Foam::Vector<Cmpt> Foam::Tensor<Cmpt>::y() const
-{
-    return Vector<Cmpt>(this->v_[YX], this->v_[YY], this->v_[YZ]);
-}
-
-
-template<class Cmpt>
-inline Foam::Vector<Cmpt> Foam::Tensor<Cmpt>::z() const
-{
-    return Vector<Cmpt>(this->v_[ZX], this->v_[ZY], this->v_[ZZ]);
-}
-
-
-template<class Cmpt>
-inline Foam::Vector<Cmpt> Foam::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& Foam::Tensor<Cmpt>::xx() const
 {
@@ -283,6 +275,48 @@ inline Cmpt& Foam::Tensor<Cmpt>::zz()
 }
 
 
+template<class Cmpt>
+inline Foam::Vector<Cmpt> Foam::Tensor<Cmpt>::x() const
+{
+    return Vector<Cmpt>(this->v_[XX], this->v_[XY], this->v_[XZ]);
+}
+
+
+template<class Cmpt>
+inline Foam::Vector<Cmpt> Foam::Tensor<Cmpt>::y() const
+{
+    return Vector<Cmpt>(this->v_[YX], this->v_[YY], this->v_[YZ]);
+}
+
+
+template<class Cmpt>
+inline Foam::Vector<Cmpt> Foam::Tensor<Cmpt>::z() const
+{
+    return Vector<Cmpt>(this->v_[ZX], this->v_[ZY], this->v_[ZZ]);
+}
+
+
+template<class Cmpt>
+inline Foam::Vector<Cmpt> Foam::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 Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::T() const
 {
@@ -320,6 +354,17 @@ inline void Foam::Tensor<Cmpt>::operator&=(const Tensor<Cmpt>& t)
 }
 
 
+template<class Cmpt>
+template<class Cmpt2>
+inline void Foam::Tensor<Cmpt>::operator=
+(
+    const VectorSpace<Tensor<Cmpt2>, Cmpt2, 9>& vs
+)
+{
+    VectorSpace<Tensor<Cmpt>, Cmpt, 9>::operator=(vs);
+}
+
+
 template<class Cmpt>
 inline void Foam::Tensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 {
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index 27c1bff3c1..1d47ae3a07 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -88,7 +88,7 @@ public:
     typedef Cmpt cmptType;
 
 
-    // Member constants
+    // Static constants
 
         //- Dimensionality of space
         static const direction dim = 3;
@@ -97,6 +97,13 @@ public:
         static const direction nComponents = Ncmpts;
 
 
+        // VectorSpace currently defaults to a column-vector
+        // This will be removed when column-vector is introduced
+        // as a specialization
+        static const direction nRows = Ncmpts;
+        static const direction nCols = 1;
+
+
     // Static data members
 
         static const char* const typeName;
@@ -109,6 +116,38 @@ public:
         static const Form rootMin;
 
 
+    // Sub-Block Classes
+
+        //- Const sub-block type
+        template
+        <
+            class SubVector,
+            direction BStart
+        >
+        class ConstBlock
+        {
+            const vsType& vs_;
+
+        public:
+
+            //- Number of components in this vector space
+            static const direction nComponents = SubVector::nComponents;
+
+            //- Construct for a given vector
+            inline ConstBlock(const vsType& vs);
+
+            //- [i] const element access operator
+            inline const Cmpt& operator[](const direction i) const;
+
+            //- (i, 0) const element access operator
+            inline const Cmpt& operator()
+            (
+                const direction i,
+                const direction
+            ) const;
+        };
+
+
     // Constructors
 
         //- Construct null
@@ -123,9 +162,9 @@ public:
         //- Construct as copy
         inline VectorSpace(const VectorSpace<Form, Cmpt, Ncmpts>&);
 
-        //- Construct as copy of another VectorSpace type of the same rank
+        //- Construct as copy of a VectorSpace with the same size
         template<class Form2, class Cmpt2>
-        inline VectorSpace(const VectorSpace<Form2, Cmpt2, Ncmpts>&);
+        inline explicit VectorSpace(const VectorSpace<Form2, Cmpt2, Ncmpts>&);
 
 
     // Member Functions
@@ -142,6 +181,9 @@ public:
         //- Return a VectorSpace with all elements = s
         inline static Form uniform(const Cmpt& s);
 
+        template<class SubVector, direction BStart>
+        inline const ConstBlock<SubVector, BStart> block() const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index fe4a47be48..10f6964e7b 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -27,6 +27,7 @@ License
 #include "products.H"
 #include "VectorSpaceOps.H"
 #include "ops.H"
+#include "StaticAssert.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,6 +69,20 @@ inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace
 }
 
 
+template<class Form, class Cmpt, direction Ncmpts>
+template<class SubVector, direction BStart>
+inline
+VectorSpace<Form, Cmpt, Ncmpts>::ConstBlock<SubVector, BStart>::ConstBlock
+(
+    const vsType& vs
+)
+:
+    vs_(vs)
+{
+    StaticAssert(vsType::nComponents >= BStart + nComponents);
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Form, class Cmpt, direction Ncmpts>
@@ -164,6 +179,16 @@ inline Form VectorSpace<Form, Cmpt, Ncmpts>::uniform(const Cmpt& s)
 }
 
 
+template<class Form, class Cmpt, direction Ncmpts>
+template<class SubVector, direction BStart>
+inline const typename VectorSpace<Form, Cmpt, Ncmpts>::template
+    ConstBlock<SubVector, BStart>
+VectorSpace<Form, Cmpt, Ncmpts>::block() const
+{
+    return *this;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Form, class Cmpt, direction Ncmpts>
@@ -204,6 +229,58 @@ inline Cmpt& VectorSpace<Form, Cmpt, Ncmpts>::operator[]
 }
 
 
+template<class Form, class Cmpt, direction Ncmpts>
+template<class SubVector, direction BStart>
+inline const Cmpt&
+VectorSpace<Form, Cmpt, Ncmpts>::
+ConstBlock<SubVector, BStart>::operator[]
+(
+    const direction i
+) const
+{
+    #ifdef FULLDEBUG
+    if (i >= Ncmpts)
+    {
+        FatalErrorInFunction
+            << "index out of range"
+            << abort(FatalError);
+    }
+    #endif
+
+    return vs_[BStart + i];
+}
+
+
+template<class Form, class Cmpt, direction Ncmpts>
+template<class SubVector, direction BStart>
+inline const Cmpt&
+VectorSpace<Form, Cmpt, Ncmpts>::
+ConstBlock<SubVector, BStart>::operator()
+(
+    const direction i,
+    const direction j
+) const
+{
+    #ifdef FULLDEBUG
+    if (i >= Ncmpts)
+    {
+        FatalErrorInFunction
+            << "index out of range"
+            << abort(FatalError);
+    }
+
+    if (j != 0)
+    {
+        FatalErrorInFunction
+            << "j != 0"
+            << abort(FatalError);
+    }
+    #endif
+
+    return vs_[BStart + i];
+}
+
+
 template<class Form, class Cmpt, direction Ncmpts>
 inline void VectorSpace<Form, Cmpt, Ncmpts>::operator=
 (
diff --git a/src/OpenFOAM/primitives/VectorSpace/products.H b/src/OpenFOAM/primitives/VectorSpace/products.H
index 4214f32f0f..5992444b8b 100644
--- a/src/OpenFOAM/primitives/VectorSpace/products.H
+++ b/src/OpenFOAM/primitives/VectorSpace/products.H
@@ -41,6 +41,24 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+//- Abstract template class to provide the form resulting from
+//  the inner-product of two forms
+template<class Cmpt, class Form1, class Form2>
+class typeOfInnerProduct
+{};
+
+//- Abstract template class to provide the form resulting from
+//  the outer-product of two forms
+template<class Cmpt, class Form1, class Form2>
+class typeOfOuterProduct
+{};
+
+//- Abstract template class to provide the transpose form of a form
+template<class Cmpt, class Form>
+class typeOfTranspose
+{};
+
+
 template<class Cmpt, direction rank>
 class typeOfRank
 {};

From 6e2e761d37f1d16f09cdc80a5b871d0ef80fb286 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 12 Mar 2016 11:50:04 +0000
Subject: [PATCH 272/447] src/sampling/sampledSurface/isoSurface: Correct
 referencing to temporary fields

Patch provided by Mattijs Janssens
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1487
---
 .../sampledSurface/isoSurface/isoSurface.C    | 701 ++----------------
 .../sampledSurface/isoSurface/isoSurface.H    |  87 +--
 .../isoSurface/isoSurfaceCell.C               | 238 ++----
 .../isoSurface/isoSurfaceCell.H               |  49 +-
 .../isoSurface/isoSurfaceCellTemplates.C      | 355 ++++-----
 .../isoSurface/isoSurfaceTemplates.C          | 293 ++++----
 .../isoSurface/sampledIsoSurface.C            |  72 +-
 .../isoSurface/sampledIsoSurface.H            |   1 -
 8 files changed, 484 insertions(+), 1312 deletions(-)

diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index a9d57ad500..bff64af5cf 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -37,7 +37,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(isoSurface, 0);
+    defineTypeNameAndDebug(isoSurface, 0);
 }
 
 
@@ -58,7 +58,6 @@ bool Foam::isoSurface::noTransform(const tensor& tt) const
 }
 
 
-// Calculates per face whether couple is collocated.
 bool Foam::isoSurface::collocatedPatch(const polyPatch& pp)
 {
     const coupledPolyPatch& cpp = refCast<const coupledPolyPatch>(pp);
@@ -66,7 +65,6 @@ bool Foam::isoSurface::collocatedPatch(const polyPatch& pp)
 }
 
 
-// Calculates per face whether couple is collocated.
 Foam::PackedBoolList Foam::isoSurface::collocatedFaces
 (
     const coupledPolyPatch& pp
@@ -297,7 +295,6 @@ bool Foam::isoSurface::isEdgeOfFaceCut
 }
 
 
-// Get neighbour value and position.
 void Foam::isoSurface::getNeighbour
 (
     const labelList& boundaryRegion,
@@ -331,7 +328,6 @@ void Foam::isoSurface::getNeighbour
 }
 
 
-// Determine for every face/cell whether it (possibly) generates triangles.
 void Foam::isoSurface::calcCutTypes
 (
     const labelList& boundaryRegion,
@@ -471,43 +467,6 @@ void Foam::isoSurface::calcCutTypes
 }
 
 
-// Return the two common points between two triangles
-Foam::labelPair Foam::isoSurface::findCommonPoints
-(
-    const labelledTri& tri0,
-    const labelledTri& tri1
-)
-{
-    labelPair common(-1, -1);
-
-    label fp0 = 0;
-    label fp1 = findIndex(tri1, tri0[fp0]);
-
-    if (fp1 == -1)
-    {
-        fp0 = 1;
-        fp1 = findIndex(tri1, tri0[fp0]);
-    }
-
-    if (fp1 != -1)
-    {
-        // So tri0[fp0] is tri1[fp1]
-
-        // Find next common point
-        label fp0p1 = tri0.fcIndex(fp0);
-        label fp1p1 = tri1.fcIndex(fp1);
-        label fp1m1 = tri1.rcIndex(fp1);
-
-        if (tri0[fp0p1] == tri1[fp1p1] || tri0[fp0p1] == tri1[fp1m1])
-        {
-            common[0] = tri0[fp0];
-            common[1] = tri0[fp0p1];
-        }
-    }
-    return common;
-}
-
-
 // Caculate centre of surface.
 Foam::point Foam::isoSurface::calcCentre(const triSurface& s)
 {
@@ -521,75 +480,6 @@ Foam::point Foam::isoSurface::calcCentre(const triSurface& s)
 }
 
 
-// Replace surface (localPoints, localTris) with single point. Returns
-// point. Destructs arguments.
-Foam::pointIndexHit Foam::isoSurface::collapseSurface
-(
-    pointField& localPoints,
-    DynamicList<labelledTri, 64>& localTris
-)
-{
-    pointIndexHit info(false, vector::zero, localTris.size());
-
-    if (localTris.size() == 1)
-    {
-        const labelledTri& tri = localTris[0];
-        info.setPoint(tri.centre(localPoints));
-        info.setHit();
-    }
-    else if (localTris.size() == 2)
-    {
-        // Check if the two triangles share an edge.
-        const labelledTri& tri0 = localTris[0];
-        const labelledTri& tri1 = localTris[0];
-
-        labelPair shared = findCommonPoints(tri0, tri1);
-
-        if (shared[0] != -1)
-        {
-            info.setPoint
-            (
-                0.5
-              * (
-                    tri0.centre(localPoints)
-                  + tri1.centre(localPoints)
-                )
-            );
-            info.setHit();
-        }
-    }
-    else if (localTris.size())
-    {
-        // Check if single region. Rare situation.
-        triSurface surf
-        (
-            localTris,
-            geometricSurfacePatchList(0),
-            localPoints,
-            true
-        );
-        localTris.clearStorage();
-
-        labelList faceZone;
-        label nZones = surf.markZones
-        (
-            boolList(surf.nEdges(), false),
-            faceZone
-        );
-
-        if (nZones == 1)
-        {
-            info.setPoint(calcCentre(surf));
-            info.setHit();
-        }
-    }
-
-    return info;
-}
-
-
-// Determine per cell centre whether all the intersections get collapsed
-// to a single point
 void Foam::isoSurface::calcSnappedCc
 (
     const labelList& boundaryRegion,
@@ -755,8 +645,6 @@ void Foam::isoSurface::calcSnappedCc
 }
 
 
-// Determine per meshpoint whether all the intersections get collapsed
-// to a single point
 void Foam::isoSurface::calcSnappedPoint
 (
     const PackedBoolList& isBoundaryPoint,
@@ -1131,7 +1019,6 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
 }
 
 
-// Does face use valid vertices?
 bool Foam::isoSurface::validTri(const triSurface& surf, const label faceI)
 {
     // Simple check on indices ok.
@@ -1202,435 +1089,6 @@ bool Foam::isoSurface::validTri(const triSurface& surf, const label faceI)
 }
 
 
-void Foam::isoSurface::calcAddressing
-(
-    const triSurface& surf,
-    List<FixedList<label, 3>>& faceEdges,
-    labelList& edgeFace0,
-    labelList& edgeFace1,
-    Map<labelList>& edgeFacesRest
-) const
-{
-    const pointField& points = surf.points();
-
-    pointField edgeCentres(3*surf.size());
-    label edgeI = 0;
-    forAll(surf, triI)
-    {
-        const labelledTri& tri = surf[triI];
-        edgeCentres[edgeI++] = 0.5*(points[tri[0]]+points[tri[1]]);
-        edgeCentres[edgeI++] = 0.5*(points[tri[1]]+points[tri[2]]);
-        edgeCentres[edgeI++] = 0.5*(points[tri[2]]+points[tri[0]]);
-    }
-
-    pointField mergedCentres;
-    labelList oldToMerged;
-    bool hasMerged = mergePoints
-    (
-        edgeCentres,
-        mergeDistance_,
-        false,
-        oldToMerged,
-        mergedCentres
-    );
-
-    if (debug)
-    {
-        Pout<< "isoSurface : detected "
-            << mergedCentres.size()
-            << " geometric edges on " << surf.size() << " triangles." << endl;
-    }
-
-    if (!hasMerged)
-    {
-        return;
-    }
-
-
-    // Determine faceEdges
-    faceEdges.setSize(surf.size());
-    edgeI = 0;
-    forAll(surf, triI)
-    {
-        faceEdges[triI][0] = oldToMerged[edgeI++];
-        faceEdges[triI][1] = oldToMerged[edgeI++];
-        faceEdges[triI][2] = oldToMerged[edgeI++];
-    }
-
-
-    // Determine edgeFaces
-    edgeFace0.setSize(mergedCentres.size());
-    edgeFace0 = -1;
-    edgeFace1.setSize(mergedCentres.size());
-    edgeFace1 = -1;
-    edgeFacesRest.clear();
-
-    // Overflow edge faces for geometric shared edges that turned
-    // out to be different anyway.
-    EdgeMap<labelList> extraEdgeFaces(mergedCentres.size()/100);
-
-    forAll(oldToMerged, oldEdgeI)
-    {
-        label triI = oldEdgeI / 3;
-        label edgeI = oldToMerged[oldEdgeI];
-
-        if (edgeFace0[edgeI] == -1)
-        {
-            // First triangle for edge
-            edgeFace0[edgeI] = triI;
-        }
-        else
-        {
-            //- Check that the two triangles actually topologically
-            //  share an edge
-            const labelledTri& prevTri = surf[edgeFace0[edgeI]];
-            const labelledTri& tri = surf[triI];
-
-            label fp = oldEdgeI % 3;
-
-            edge e(tri[fp], tri[tri.fcIndex(fp)]);
-
-            label prevTriIndex = -1;
-
-            forAll(prevTri, i)
-            {
-                if (edge(prevTri[i], prevTri[prevTri.fcIndex(i)]) == e)
-                {
-                    prevTriIndex = i;
-                    break;
-                }
-            }
-
-            if (prevTriIndex == -1)
-            {
-                // Different edge. Store for later.
-                EdgeMap<labelList>::iterator iter = extraEdgeFaces.find(e);
-
-                if (iter != extraEdgeFaces.end())
-                {
-                    labelList& eFaces = iter();
-                    label sz = eFaces.size();
-                    eFaces.setSize(sz+1);
-                    eFaces[sz] = triI;
-                }
-                else
-                {
-                    extraEdgeFaces.insert(e, labelList(1, triI));
-                }
-            }
-            else if (edgeFace1[edgeI] == -1)
-            {
-                edgeFace1[edgeI] = triI;
-            }
-            else
-            {
-                //WarningInFunction
-                //    << "Edge " << edgeI << " with centre "
-                //    << mergedCentres[edgeI]
-                //    << " used by more than two triangles: "
-                //    << edgeFace0[edgeI] << ", "
-                //    << edgeFace1[edgeI] << " and " << triI << endl;
-                Map<labelList>::iterator iter = edgeFacesRest.find(edgeI);
-
-                if (iter != edgeFacesRest.end())
-                {
-                    labelList& eFaces = iter();
-                    label sz = eFaces.size();
-                    eFaces.setSize(sz+1);
-                    eFaces[sz] = triI;
-                }
-                else
-                {
-                    edgeFacesRest.insert(edgeI, labelList(1, triI));
-                }
-            }
-        }
-    }
-
-    // Add extraEdgeFaces
-    edgeI = edgeFace0.size();
-
-    edgeFace0.setSize(edgeI + extraEdgeFaces.size());
-    edgeFace1.setSize(edgeI + extraEdgeFaces.size(), -1);
-
-    forAllConstIter(EdgeMap<labelList>, extraEdgeFaces, iter)
-    {
-        const labelList& eFaces = iter();
-
-        // The current edge will become edgeI. Replace all occurrences in
-        // faceEdges
-        forAll(eFaces, i)
-        {
-            label triI = eFaces[i];
-            const labelledTri& tri = surf[triI];
-
-            FixedList<label, 3>& fEdges = faceEdges[triI];
-            forAll(tri, fp)
-            {
-                edge e(tri[fp], tri[tri.fcIndex(fp)]);
-
-                if (e == iter.key())
-                {
-                    fEdges[fp] = edgeI;
-                    break;
-                }
-            }
-        }
-
-
-        // Add face to edgeFaces
-
-        edgeFace0[edgeI] = eFaces[0];
-
-        if (eFaces.size() >= 2)
-        {
-            edgeFace1[edgeI] = eFaces[1];
-
-            if (eFaces.size() > 2)
-            {
-                edgeFacesRest.insert
-                (
-                    edgeI,
-                    SubList<label>(eFaces, eFaces.size()-2, 2)
-                );
-            }
-        }
-
-        edgeI++;
-    }
-}
-
-
-void Foam::isoSurface::walkOrientation
-(
-    const triSurface& surf,
-    const List<FixedList<label, 3>>& faceEdges,
-    const labelList& edgeFace0,
-    const labelList& edgeFace1,
-    const label seedTriI,
-    labelList& flipState
-)
-{
-    // Do walk for consistent orientation.
-    DynamicList<label> changedFaces(surf.size());
-
-    changedFaces.append(seedTriI);
-
-    while (changedFaces.size())
-    {
-        DynamicList<label> newChangedFaces(changedFaces.size());
-
-        forAll(changedFaces, i)
-        {
-            label triI = changedFaces[i];
-            const labelledTri& tri = surf[triI];
-            const FixedList<label, 3>& fEdges = faceEdges[triI];
-
-            forAll(fEdges, fp)
-            {
-                label edgeI = fEdges[fp];
-
-                // my points:
-                label p0 = tri[fp];
-                label p1 = tri[tri.fcIndex(fp)];
-
-                label nbrI =
-                (
-                    edgeFace0[edgeI] != triI
-                  ? edgeFace0[edgeI]
-                  : edgeFace1[edgeI]
-                );
-
-                if (nbrI != -1 && flipState[nbrI] == -1)
-                {
-                    const labelledTri& nbrTri = surf[nbrI];
-
-                    // nbr points
-                    label nbrFp = findIndex(nbrTri, p0);
-
-                    if (nbrFp == -1)
-                    {
-                        FatalErrorInFunction
-                            << "triI:" << triI
-                            << " tri:" << tri
-                            << " p0:" << p0
-                            << " p1:" << p1
-                            << " fEdges:" << fEdges
-                            << " edgeI:" << edgeI
-                            << " edgeFace0:" << edgeFace0[edgeI]
-                            << " edgeFace1:" << edgeFace1[edgeI]
-                            << " nbrI:" << nbrI
-                            << " nbrTri:" << nbrTri
-                            << abort(FatalError);
-                    }
-
-
-                    label nbrP1 = nbrTri[nbrTri.rcIndex(nbrFp)];
-
-                    bool sameOrientation = (p1 == nbrP1);
-
-                    if (flipState[triI] == 0)
-                    {
-                        flipState[nbrI] = (sameOrientation ? 0 : 1);
-                    }
-                    else
-                    {
-                        flipState[nbrI] = (sameOrientation ? 1 : 0);
-                    }
-                    newChangedFaces.append(nbrI);
-                }
-            }
-        }
-
-        changedFaces.transfer(newChangedFaces);
-    }
-}
-
-
-void Foam::isoSurface::orientSurface
-(
-    triSurface& surf,
-    const List<FixedList<label, 3>>& faceEdges,
-    const labelList& edgeFace0,
-    const labelList& edgeFace1,
-    const Map<labelList>& edgeFacesRest
-)
-{
-    // -1 : unvisited
-    //  0 : leave as is
-    //  1 : flip
-    labelList flipState(surf.size(), -1);
-
-    label seedTriI = 0;
-
-    while (true)
-    {
-        // Find first unvisited triangle
-        for
-        (
-            ;
-            seedTriI < surf.size() && flipState[seedTriI] != -1;
-            seedTriI++
-        )
-        {}
-
-        if (seedTriI == surf.size())
-        {
-            break;
-        }
-
-        // Note: Determine orientation of seedTriI?
-        // for now assume it is ok
-        flipState[seedTriI] = 0;
-
-        walkOrientation
-        (
-            surf,
-            faceEdges,
-            edgeFace0,
-            edgeFace1,
-            seedTriI,
-            flipState
-        );
-    }
-
-    // Do actual flipping
-    surf.clearOut();
-    forAll(surf, triI)
-    {
-        if (flipState[triI] == 1)
-        {
-            labelledTri tri(surf[triI]);
-
-            surf[triI][0] = tri[0];
-            surf[triI][1] = tri[2];
-            surf[triI][2] = tri[1];
-        }
-        else if (flipState[triI] == -1)
-        {
-            FatalErrorInFunction
-                << "problem" << abort(FatalError);
-        }
-    }
-}
-
-
-// Checks if triangle is connected through edgeI only.
-bool Foam::isoSurface::danglingTriangle
-(
-    const FixedList<label, 3>& fEdges,
-    const labelList& edgeFace1
-)
-{
-    label nOpen = 0;
-    forAll(fEdges, i)
-    {
-        if (edgeFace1[fEdges[i]] == -1)
-        {
-            nOpen++;
-        }
-    }
-
-    if (nOpen == 1 || nOpen == 2 || nOpen == 3)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// Mark triangles to keep. Returns number of dangling triangles.
-Foam::label Foam::isoSurface::markDanglingTriangles
-(
-    const List<FixedList<label, 3>>& faceEdges,
-    const labelList& edgeFace0,
-    const labelList& edgeFace1,
-    const Map<labelList>& edgeFacesRest,
-    boolList& keepTriangles
-)
-{
-    keepTriangles.setSize(faceEdges.size());
-    keepTriangles = true;
-
-    label nDangling = 0;
-
-    // Remove any dangling triangles
-    forAllConstIter(Map<labelList>,  edgeFacesRest, iter)
-    {
-        // These are all the non-manifold edges. Filter out all triangles
-        // with only one connected edge (= this edge)
-
-        label edgeI = iter.key();
-        const labelList& otherEdgeFaces = iter();
-
-        // Remove all dangling triangles
-        if (danglingTriangle(faceEdges[edgeFace0[edgeI]], edgeFace1))
-        {
-            keepTriangles[edgeFace0[edgeI]] = false;
-            nDangling++;
-        }
-        if (danglingTriangle(faceEdges[edgeFace1[edgeI]], edgeFace1))
-        {
-            keepTriangles[edgeFace1[edgeI]] = false;
-            nDangling++;
-        }
-        forAll(otherEdgeFaces, i)
-        {
-            label triI = otherEdgeFaces[i];
-            if (danglingTriangle(faceEdges[triI], edgeFace1))
-            {
-                keepTriangles[triI] = false;
-                nDangling++;
-            }
-        }
-    }
-    return nDangling;
-}
-
-
 Foam::triSurface Foam::isoSurface::subsetMesh
 (
     const triSurface& s,
@@ -1953,57 +1411,58 @@ Foam::isoSurface::isoSurface
     }
 
 
-
-    DynamicList<point> triPoints(nCutCells_);
-    DynamicList<label> triMeshCells(nCutCells_);
-
-    generateTriPoints
-    (
-        cValsPtr_(),
-        pVals_,
-
-        meshC,
-        mesh_.points(),
-
-        snappedPoints,
-        snappedCc,
-        snappedPoint,
-
-        triPoints,
-        triMeshCells
-    );
-
-    if (debug)
     {
-        Pout<< "isoSurface : generated " << triMeshCells.size()
-            << " unmerged triangles from " << triPoints.size()
-            << " unmerged points." << endl;
-    }
+        DynamicList<point> triPoints(3*nCutCells_);
+        DynamicList<label> triMeshCells(nCutCells_);
 
-
-    // Merge points and compact out non-valid triangles
-    labelList triMap;           // merged to unmerged triangle
-    triSurface::operator=
-    (
-        stitchTriPoints
+        generateTriPoints
         (
-            true,               // check for duplicate tris
-            triPoints,
-            triPointMergeMap_,  // unmerged to merged point
-            triMap
-        )
-    );
+            cValsPtr_(),
+            pVals_,
 
-    if (debug)
-    {
-        Pout<< "isoSurface : generated " << triMap.size()
-            << " merged triangles." << endl;
-    }
+            meshC,
+            mesh_.points(),
 
-    meshCells_.setSize(triMap.size());
-    forAll(triMap, i)
-    {
-        meshCells_[i] = triMeshCells[triMap[i]];
+            snappedPoints,
+            snappedCc,
+            snappedPoint,
+
+            triPoints,      // 3 points of the triangle
+            triMeshCells    // per triangle the originating cell
+        );
+
+        if (debug)
+        {
+            Pout<< "isoSurface : generated " << triMeshCells.size()
+                << " unmerged triangles from " << triPoints.size()
+                << " unmerged points." << endl;
+        }
+
+
+        // Merge points and compact out non-valid triangles
+        labelList triMap;           // merged to unmerged triangle
+        triSurface::operator=
+        (
+            stitchTriPoints
+            (
+                true,               // check for duplicate tris
+                triPoints,
+                triPointMergeMap_,  // unmerged to merged point
+                triMap
+            )
+        );
+
+        if (debug)
+        {
+            Pout<< "isoSurface : generated " << triMap.size()
+                << " merged triangles." << endl;
+        }
+
+        meshCells_.setSize(triMap.size());
+        forAll(triMap, i)
+        {
+            meshCells_[i] = triMeshCells[triMap[i]];
+        }
     }
 
     if (debug)
@@ -2019,70 +1478,6 @@ Foam::isoSurface::isoSurface
     }
 
 
-    if (false)
-    {
-        List<FixedList<label, 3>> faceEdges;
-        labelList edgeFace0, edgeFace1;
-        Map<labelList> edgeFacesRest;
-
-
-        while (true)
-        {
-            // Calculate addressing
-            calcAddressing
-            (
-                *this,
-                faceEdges,
-                edgeFace0,
-                edgeFace1,
-                edgeFacesRest
-            );
-
-            // See if any dangling triangles
-            boolList keepTriangles;
-            label nDangling = markDanglingTriangles
-            (
-                faceEdges,
-                edgeFace0,
-                edgeFace1,
-                edgeFacesRest,
-                keepTriangles
-            );
-
-            if (debug)
-            {
-                Pout<< "isoSurface : detected " << nDangling
-                    << " dangling triangles." << endl;
-            }
-
-            if (nDangling == 0)
-            {
-                break;
-            }
-
-            // Create face map (new to old)
-            labelList subsetTriMap(findIndices(keepTriangles, true));
-
-            labelList subsetPointMap;
-            labelList reversePointMap;
-            triSurface::operator=
-            (
-                subsetMesh
-                (
-                    *this,
-                    subsetTriMap,
-                    reversePointMap,
-                    subsetPointMap
-                )
-            );
-            meshCells_ = labelField(meshCells_, subsetTriMap);
-            inplaceRenumber(reversePointMap, triPointMergeMap_);
-        }
-
-        orientSurface(*this, faceEdges, edgeFace0, edgeFace1, edgeFacesRest);
-    }
-
-
     if (debug)
     {
         fileName stlFile = mesh_.time().path() + ".stl";
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.H b/src/sampling/sampledSurface/isoSurface/isoSurface.H
index 967536b7c6..1493c2ccf9 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.H
@@ -173,6 +173,7 @@ class isoSurface
             const bool neiLower
         ) const;
 
+        //- Get neighbour value and position.
         void getNeighbour
         (
             const labelList& boundaryRegion,
@@ -184,7 +185,8 @@ class isoSurface
             point& nbrPoint
         ) const;
 
-        //- Set faceCutType,cellCutType.
+        //- Determine for every face/cell whether it (possibly) generates
+        //  triangles.
         void calcCutTypes
         (
             const labelList& boundaryRegion,
@@ -193,20 +195,8 @@ class isoSurface
             const scalarField& pVals
         );
 
-        static labelPair findCommonPoints
-        (
-            const labelledTri&,
-            const labelledTri&
-        );
-
         static point calcCentre(const triSurface&);
 
-        static pointIndexHit collapseSurface
-        (
-            pointField& localPoints,
-            DynamicList<labelledTri, 64>& localTris
-        );
-
         //- Determine per cc whether all near cuts can be snapped to single
         //  point.
         void calcSnappedCc
@@ -257,6 +247,9 @@ class isoSurface
             const Type& snapP1
         ) const;
 
+
+        //- Note: cannot use simpler isoSurfaceCell::generateTriPoints since
+        //  the need here to sometimes pass in remote 'snappedPoints'
         template<class Type>
         void generateTriPoints
         (
@@ -323,6 +316,14 @@ class isoSurface
             DynamicList<label>& triMeshCells
         ) const;
 
+        template<class Type>
+        static tmp<Field<Type>> interpolate
+        (
+            const label nPoints,
+            const labelList& triPointMergeMap,
+            const DynamicList<Type>& unmergedValues
+        );
+
         triSurface stitchTriPoints
         (
             const bool checkDuplicates,
@@ -334,54 +335,6 @@ class isoSurface
         //- Check single triangle for (topological) validity
         static bool validTri(const triSurface&, const label);
 
-        //- Determine edge-face addressing
-        void calcAddressing
-        (
-            const triSurface& surf,
-            List<FixedList<label, 3>>& faceEdges,
-            labelList& edgeFace0,
-            labelList& edgeFace1,
-            Map<labelList>& edgeFacesRest
-        ) const;
-
-        //- Determine orientation
-        static void walkOrientation
-        (
-            const triSurface& surf,
-            const List<FixedList<label, 3>>& faceEdges,
-            const labelList& edgeFace0,
-            const labelList& edgeFace1,
-            const label seedTriI,
-            labelList& flipState
-        );
-
-        //- Orient surface
-        static void orientSurface
-        (
-            triSurface&,
-            const List<FixedList<label, 3>>& faceEdges,
-            const labelList& edgeFace0,
-            const labelList& edgeFace1,
-            const Map<labelList>& edgeFacesRest
-        );
-
-        //- Is triangle (given by 3 edges) not fully connected?
-        static bool danglingTriangle
-        (
-            const FixedList<label, 3>& fEdges,
-            const labelList& edgeFace1
-        );
-
-        //- Mark all non-fully connected triangles
-        static label markDanglingTriangles
-        (
-            const List<FixedList<label, 3>>& faceEdges,
-            const labelList& edgeFace0,
-            const labelList& edgeFace1,
-            const Map<labelList>& edgeFacesRest,
-            boolList& keepTriangles
-        );
-
         static triSurface subsetMesh
         (
             const triSurface& s,
@@ -392,6 +345,10 @@ class isoSurface
 
 public:
 
+    //- Declare friendship with isoSurfaceCell to share some functionality
+    friend class isoSurfaceCell;
+
+
     //- Runtime type information
     TypeName("isoSurface");
 
@@ -413,18 +370,12 @@ public:
 
     // Member Functions
 
-        //- For every face original cell in mesh
+        //- For every triangle the original cell in mesh
         const labelList& meshCells() const
         {
             return meshCells_;
         }
 
-        //- For every unmerged triangle point the point in the triSurface
-        const labelList& triPointMergeMap() const
-        {
-            return triPointMergeMap_;
-        }
-
         //- Interpolates cCoords,pCoords. Uses the references to the original
         //  fields used to create the iso surface.
         template<class Type>
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index c2fec19741..afd756ac3c 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -35,7 +35,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(isoSurfaceCell, 0);
+    defineTypeNameAndDebug(isoSurfaceCell, 0);
 }
 
 
@@ -212,8 +212,6 @@ void Foam::isoSurfaceCell::calcCutTypes
 }
 
 
-
-// Return the two common points between two triangles
 Foam::labelPair Foam::isoSurfaceCell::findCommonPoints
 (
     const labelledTri& tri0,
@@ -250,7 +248,6 @@ Foam::labelPair Foam::isoSurfaceCell::findCommonPoints
 }
 
 
-// Caculate centre of surface.
 Foam::point Foam::isoSurfaceCell::calcCentre(const triSurface& s)
 {
     vector sum = vector::zero;
@@ -263,8 +260,6 @@ Foam::point Foam::isoSurfaceCell::calcCentre(const triSurface& s)
 }
 
 
-// Replace surface (localPoints, localTris) with single point. Returns
-// point. Destructs arguments.
 Foam::pointIndexHit Foam::isoSurfaceCell::collapseSurface
 (
     const label cellI,
@@ -532,7 +527,6 @@ void Foam::isoSurfaceCell::calcSnappedCc
 }
 
 
-// Generate triangles for face connected to pointI
 void Foam::isoSurfaceCell::genPointTris
 (
     const scalarField& cellValues,
@@ -605,7 +599,6 @@ void Foam::isoSurfaceCell::genPointTris
 }
 
 
-// Generate triangle for tet connected to pointI
 void Foam::isoSurfaceCell::genPointTris
 (
     const scalarField& pointValues,
@@ -1053,7 +1046,6 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
 }
 
 
-// Does face use valid vertices?
 bool Foam::isoSurfaceCell::validTri(const triSurface& surf, const label faceI)
 {
     // Simple check on indices ok.
@@ -1222,143 +1214,6 @@ void Foam::isoSurfaceCell::calcAddressing
 }
 
 
-//void Foam::isoSurfaceCell::walkOrientation
-//(
-//    const triSurface& surf,
-//    const List<FixedList<label, 3>>& faceEdges,
-//    const labelList& edgeFace0,
-//    const labelList& edgeFace1,
-//    const label seedTriI,
-//    labelList& flipState
-//)
-//{
-//    // Do walk for consistent orientation.
-//    DynamicList<label> changedFaces(surf.size());
-//
-//    changedFaces.append(seedTriI);
-//
-//    while (changedFaces.size())
-//    {
-//        DynamicList<label> newChangedFaces(changedFaces.size());
-//
-//        forAll(changedFaces, i)
-//        {
-//            label triI = changedFaces[i];
-//            const labelledTri& tri = surf[triI];
-//            const FixedList<label, 3>& fEdges = faceEdges[triI];
-//
-//            forAll(fEdges, fp)
-//            {
-//                label edgeI = fEdges[fp];
-//
-//                // my points:
-//                label p0 = tri[fp];
-//                label p1 = tri[tri.fcIndex(fp)];
-//
-//                label nbrI =
-//                (
-//                    edgeFace0[edgeI] != triI
-//                  ? edgeFace0[edgeI]
-//                  : edgeFace1[edgeI]
-//                );
-//
-//                if (nbrI != -1 && flipState[nbrI] == -1)
-//                {
-//                    const labelledTri& nbrTri = surf[nbrI];
-//
-//                    // nbr points
-//                    label nbrFp = findIndex(nbrTri, p0);
-//                    label nbrP1 = nbrTri[nbrTri.rcIndex(nbrFp)];
-//
-//                    bool sameOrientation = (p1 == nbrP1);
-//
-//                    if (flipState[triI] == 0)
-//                    {
-//                        flipState[nbrI] = (sameOrientation ? 0 : 1);
-//                    }
-//                    else
-//                    {
-//                        flipState[nbrI] = (sameOrientation ? 1 : 0);
-//                    }
-//                    newChangedFaces.append(nbrI);
-//                }
-//            }
-//        }
-//
-//        changedFaces.transfer(newChangedFaces);
-//    }
-//}
-//
-//
-//void Foam::isoSurfaceCell::orientSurface
-//(
-//    triSurface& surf,
-//    const List<FixedList<label, 3>>& faceEdges,
-//    const labelList& edgeFace0,
-//    const labelList& edgeFace1,
-//    const Map<labelList>& edgeFacesRest
-//)
-//{
-//    // -1 : unvisited
-//    //  0 : leave as is
-//    //  1 : flip
-//    labelList flipState(surf.size(), -1);
-//
-//    label seedTriI = 0;
-//
-//    while (true)
-//    {
-//        // Find first unvisited triangle
-//        for
-//        (
-//            ;
-//            seedTriI < surf.size() && flipState[seedTriI] != -1;
-//            seedTriI++
-//        )
-//        {}
-//
-//        if (seedTriI == surf.size())
-//        {
-//            break;
-//        }
-//
-//        // Note: Determine orientation of seedTriI?
-//        // for now assume it is ok
-//        flipState[seedTriI] = 0;
-//
-//        walkOrientation
-//        (
-//            surf,
-//            faceEdges,
-//            edgeFace0,
-//            edgeFace1,
-//            seedTriI,
-//            flipState
-//        );
-//    }
-//
-//    // Do actual flipping
-//    surf.clearOut();
-//    forAll(surf, triI)
-//    {
-//        if (flipState[triI] == 1)
-//        {
-//            labelledTri tri(surf[triI]);
-//
-//            surf[triI][0] = tri[0];
-//            surf[triI][1] = tri[2];
-//            surf[triI][2] = tri[1];
-//        }
-//        else if (flipState[triI] == -1)
-//        {
-//            FatalErrorInFunction
-//                << "problem" << abort(FatalError);
-//        }
-//    }
-//}
-
-
-// Checks if triangle is connected through edgeI only.
 bool Foam::isoSurfaceCell::danglingTriangle
 (
     const FixedList<label, 3>& fEdges,
@@ -1385,7 +1240,6 @@ bool Foam::isoSurfaceCell::danglingTriangle
 }
 
 
-// Mark triangles to keep. Returns number of dangling triangles.
 Foam::label Foam::isoSurfaceCell::markDanglingTriangles
 (
     const List<FixedList<label, 3>>& faceEdges,
@@ -1605,56 +1459,58 @@ Foam::isoSurfaceCell::isoSurfaceCell
     }
 
 
-
-    DynamicList<point> triPoints(nCutCells_);
-    DynamicList<label> triMeshCells(nCutCells_);
-
-    generateTriPoints
-    (
-        cVals,
-        pVals,
-
-        mesh_.cellCentres(),
-        mesh_.points(),
-
-        snappedPoints,
-        snappedCc,
-        snappedPoint,
-
-        triPoints,
-        triMeshCells
-    );
-
-    if (debug)
     {
-        Pout<< "isoSurfaceCell : generated " << triMeshCells.size()
-            << " unmerged triangles." << endl;
-    }
+        DynamicList<point> triPoints(nCutCells_);
+        DynamicList<label> triMeshCells(nCutCells_);
 
-    // Merge points and compact out non-valid triangles
-    labelList triMap;           // merged to unmerged triangle
-    triSurface::operator=
-    (
-        stitchTriPoints
+        generateTriPoints
         (
-            regularise,         // check for duplicate tris
+            cVals,
+            pVals,
+
+            mesh_.cellCentres(),
+            mesh_.points(),
+
+            snappedPoints,
+            snappedCc,
+            snappedPoint,
+
             triPoints,
-            triPointMergeMap_,  // unmerged to merged point
-            triMap
-        )
-    );
+            triMeshCells
+        );
 
-    if (debug)
-    {
-        Pout<< "isoSurfaceCell : generated " << triMap.size()
-            << " merged triangles." << endl;
+        if (debug)
+        {
+            Pout<< "isoSurfaceCell : generated " << triMeshCells.size()
+                << " unmerged triangles." << endl;
+        }
+
+        // Merge points and compact out non-valid triangles
+        labelList triMap;
+        triSurface::operator=
+        (
+            stitchTriPoints
+            (
+                regularise,         // check for duplicate tris
+                triPoints,
+                triPointMergeMap_,  // unmerged to merged point
+                triMap              // merged to unmerged triangle
+            )
+        );
+
+        if (debug)
+        {
+            Pout<< "isoSurfaceCell : generated " << triMap.size()
+                << " merged triangles." << endl;
+        }
+
+        meshCells_.setSize(triMap.size());
+        forAll(triMap, i)
+        {
+            meshCells_[i] = triMeshCells[triMap[i]];
+        }
     }
 
-    meshCells_.setSize(triMap.size());
-    forAll(triMap, i)
-    {
-        meshCells_[i] = triMeshCells[triMap[i]];
-    }
 
     if (debug)
     {
@@ -1728,8 +1584,6 @@ Foam::isoSurfaceCell::isoSurfaceCell
             meshCells_ = labelField(meshCells_, subsetTriMap);
             inplaceRenumber(reversePointMap, triPointMergeMap_);
         }
-
-        //orientSurface(*this, faceEdges, edgeFace0, edgeFace1, edgeFacesRest);
     }
 }
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
index 034fbd3171..91de7fc8e3 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
@@ -139,14 +139,18 @@ class isoSurfaceCell
             const scalarField& pointValues
         );
 
+        //- Return the two common points between two triangles
         static labelPair findCommonPoints
         (
             const labelledTri&,
             const labelledTri&
         );
 
+        //- Caculate centre of surface.
         static point calcCentre(const triSurface&);
 
+        //- Replace surface (localPoints, localTris) with single point.
+        //  Returns point.  Destroys arguments.
         pointIndexHit collapseSurface
         (
             const label cellI,
@@ -214,19 +218,15 @@ class isoSurfaceCell
         void generateTriPoints
         (
             const DynamicList<Type>& snapped,
-            const scalar isoVal0,
             const scalar s0,
             const Type& p0,
             const label p0Index,
-            const scalar isoVal1,
             const scalar s1,
             const Type& p1,
             const label p1Index,
-            const scalar isoVal2,
             const scalar s2,
             const Type& p2,
             const label p2Index,
-            const scalar isoVal3,
             const scalar s3,
             const Type& p3,
             const label p3Index,
@@ -271,27 +271,6 @@ class isoSurfaceCell
             Map<labelList>& edgeFacesRest
         ) const;
 
-        ////- Determine orientation
-        //static void walkOrientation
-        //(
-        //    const triSurface& surf,
-        //    const List<FixedList<label, 3>>& faceEdges,
-        //    const labelList& edgeFace0,
-        //    const labelList& edgeFace1,
-        //    const label seedTriI,
-        //    labelList& flipState
-        //);
-
-        ////- Orient surface
-        //static void orientSurface
-        //(
-        //    triSurface&,
-        //    const List<FixedList<label, 3>>& faceEdges,
-        //    const labelList& edgeFace0,
-        //    const labelList& edgeFace1,
-        //    const Map<labelList>& edgeFacesRest
-        //);
-
         //- Is triangle (given by 3 edges) not fully connected?
         static bool danglingTriangle
         (
@@ -317,8 +296,6 @@ class isoSurfaceCell
             labelList& newToOldPoints
         );
 
-        //- Combine all triangles inside a cell into a minimal triangulation
-        void combineCellTriangles();
 
 public:
 
@@ -348,24 +325,6 @@ public:
             return meshCells_;
         }
 
-        //- For every unmerged triangle point the point in the triSurface
-        const labelList triPointMergeMap() const
-        {
-            return triPointMergeMap_;
-        }
-
-
-        //- Interpolates cCoords,pCoords. Takes the original fields
-        //  used to create the iso surface.
-        template<class Type>
-        tmp<Field<Type>> interpolate
-        (
-            const scalarField& cVals,
-            const scalarField& pVals,
-            const Field<Type>& cCoords,
-            const Field<Type>& pCoords
-        ) const;
-
         //- Interpolates cCoords,pCoords.
         template<class Type>
         tmp<Field<Type>> interpolate
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
index 1eba2063c4..ea26461e5e 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
@@ -26,6 +26,7 @@ License
 #include "isoSurfaceCell.H"
 #include "polyMesh.H"
 #include "tetMatcher.H"
+#include "isoSurface.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -76,22 +77,18 @@ void Foam::isoSurfaceCell::generateTriPoints
 (
     const DynamicList<Type>& snapped,
 
-    const scalar isoVal0,
     const scalar s0,
     const Type& p0,
     const label p0Index,
 
-    const scalar isoVal1,
     const scalar s1,
     const Type& p1,
     const label p1Index,
 
-    const scalar isoVal2,
     const scalar s2,
     const Type& p2,
     const label p2Index,
 
-    const scalar isoVal3,
     const scalar s3,
     const Type& p3,
     const label p3Index,
@@ -117,167 +114,203 @@ void Foam::isoSurfaceCell::generateTriPoints
         triIndex |= 8;
     }
 
-    // Form the vertices of the triangles for each case
+    /* Form the vertices of the triangles for each case */
     switch (triIndex)
     {
         case 0x00:
         case 0x0F:
         break;
 
-        case 0x0E:
         case 0x01:
+        case 0x0E:
         {
-            // 0 is common point. Orient such that normal points in positive
-            // gradient direction
-            if (isoVal0 >= isoVal1)
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index)
+            );
+            if (triIndex == 0x0E)
             {
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index));
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index));
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
-            }
-            else
-            {
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index));
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index));
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x0D:
         case 0x02:
+        case 0x0D:
         {
-            // 1 is common point
-            if (isoVal1 >= isoVal0)
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s0,p0,p0Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index)
+            );
+
+            if (triIndex == 0x0D)
             {
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index));
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
-            }
-            else
-            {
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index));
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x0C:
         case 0x03:
+        case 0x0C:
         {
-            Type s02 = generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index);
-            Type s13 = generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index);
+            Type p0p2 =
+                generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index);
+            Type p1p3 =
+                generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index);
 
-            if (isoVal0 >= isoVal3)
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index)
+            );
+            pts.append(p1p3);
+            pts.append(p0p2);
+
+            pts.append(p1p3);
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index)
+            );
+            pts.append(p0p2);
+
+            if (triIndex == 0x0C)
             {
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
-                pts.append(s02);
-                pts.append(s13);
-                pts.append(s13);
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
-                pts.append(s02);
-            }
-            else
-            {
-                pts.append(s02);
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
-                pts.append(s13);
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
-                pts.append(s13);
-                pts.append(s02);
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-5], pts[sz-4]);
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x0B:
         case 0x04:
+        case 0x0B:
         {
-            // 2 is common point
-            if (isoVal2 >= isoVal0)
+            pts.append
+            (
+                generatePoint(snapped,s2,p2,p2Index,s0,p0,p0Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s2,p2,p2Index,s1,p1,p1Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index)
+            );
+
+            if (triIndex == 0x0B)
             {
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s1,p1,p1Index));
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index));
-            }
-            else
-            {
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s1,p1,p1Index));
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index));
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x0A:
         case 0x05:
+        case 0x0A:
         {
-            Type s01 = generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index);
-            Type s23 = generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index);
+            Type p0p1 =
+                generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index);
+            Type p2p3 =
+                generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index);
 
-            if (isoVal3 >= isoVal0)
+            pts.append(p0p1);
+            pts.append(p2p3);
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index)
+            );
+
+            pts.append(p0p1);
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index)
+            );
+            pts.append(p2p3);
+
+            if (triIndex == 0x0A)
             {
-                pts.append(s01);
-                pts.append(s23);
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
-                pts.append(s01);
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
-                pts.append(s23);
-            }
-            else
-            {
-                pts.append(s23);
-                pts.append(s01);
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
-                pts.append(s01);
-                pts.append(s23);
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-5], pts[sz-4]);
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x09:
         case 0x06:
+        case 0x09:
         {
-            Type s01 = generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index);
-            Type s23 = generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index);
+            Type p0p1 =
+                generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index);
+            Type p2p3 =
+                generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index);
 
-            if (isoVal3 >= isoVal1)
+            pts.append(p0p1);
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index)
+            );
+            pts.append(p2p3);
+
+            pts.append(p0p1);
+            pts.append(p2p3);
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index)
+            );
+
+            if (triIndex == 0x09)
             {
-                pts.append(s01);
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index));
-                pts.append(s23);
-                pts.append(s01);
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index));
-                pts.append(s23);
-            }
-            else
-            {
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index));
-                pts.append(s01);
-                pts.append(s23);
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index));
-                pts.append(s01);
-                pts.append(s23);
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-5], pts[sz-4]);
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x07:
         case 0x08:
+        case 0x07:
         {
-            // 3 is common point
-            if (isoVal3 >= isoVal0)
+            pts.append
+            (
+                generatePoint(snapped,s3,p3,p3Index,s0,p0,p0Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s3,p3,p3Index,s2,p2,p2Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s3,p3,p3Index,s1,p1,p1Index)
+            );
+            if (triIndex == 0x07)
             {
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s2,p2,p2Index));
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s1,p1,p1Index));
-            }
-            else
-            {
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s2,p2,p2Index));
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s1,p1,p1Index));
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
@@ -341,22 +374,18 @@ void Foam::isoSurfaceCell::generateTriPoints
                     (
                         snappedPoints,
 
-                        pVals_[f0[1]],
                         pVals[f0[1]],
                         pCoords[f0[1]],
                         snappedPoint[f0[1]],
 
-                        pVals_[f0[0]],
                         pVals[f0[0]],
                         pCoords[f0[0]],
                         snappedPoint[f0[0]],
 
-                        pVals_[f0[2]],
                         pVals[f0[2]],
                         pCoords[f0[2]],
                         snappedPoint[f0[2]],
 
-                        pVals_[oppositeI],
                         pVals[oppositeI],
                         pCoords[oppositeI],
                         snappedPoint[oppositeI],
@@ -370,22 +399,18 @@ void Foam::isoSurfaceCell::generateTriPoints
                     (
                         snappedPoints,
 
-                        pVals_[f0[0]],
                         pVals[f0[0]],
                         pCoords[f0[0]],
                         snappedPoint[f0[0]],
 
-                        pVals_[f0[1]],
                         pVals[f0[1]],
                         pCoords[f0[1]],
                         snappedPoint[f0[1]],
 
-                        pVals_[f0[2]],
                         pVals[f0[2]],
                         pCoords[f0[2]],
                         snappedPoint[f0[2]],
 
-                        pVals_[oppositeI],
                         pVals[oppositeI],
                         pCoords[oppositeI],
                         snappedPoint[oppositeI],
@@ -411,7 +436,6 @@ void Foam::isoSurfaceCell::generateTriPoints
                     }
 
                     label fp = f.fcIndex(fp0);
-
                     for (label i = 2; i < f.size(); i++)
                     {
                         label nextFp = f.fcIndex(fp);
@@ -425,22 +449,18 @@ void Foam::isoSurfaceCell::generateTriPoints
                             (
                                 snappedPoints,
 
-                                pVals_[tri[1]],
                                 pVals[tri[1]],
                                 pCoords[tri[1]],
                                 snappedPoint[tri[1]],
 
-                                pVals_[tri[0]],
                                 pVals[tri[0]],
                                 pCoords[tri[0]],
                                 snappedPoint[tri[0]],
 
-                                pVals_[tri[2]],
                                 pVals[tri[2]],
                                 pCoords[tri[2]],
                                 snappedPoint[tri[2]],
 
-                                cVals_[cellI],
                                 cVals[cellI],
                                 cCoords[cellI],
                                 snappedCc[cellI],
@@ -454,22 +474,18 @@ void Foam::isoSurfaceCell::generateTriPoints
                             (
                                 snappedPoints,
 
-                                pVals_[tri[0]],
                                 pVals[tri[0]],
                                 pCoords[tri[0]],
                                 snappedPoint[tri[0]],
 
-                                pVals_[tri[1]],
                                 pVals[tri[1]],
                                 pCoords[tri[1]],
                                 snappedPoint[tri[1]],
 
-                                pVals_[tri[2]],
                                 pVals[tri[2]],
                                 pCoords[tri[2]],
                                 snappedPoint[tri[2]],
 
-                                cVals_[cellI],
                                 cVals[cellI],
                                 cCoords[cellI],
                                 snappedCc[cellI],
@@ -495,7 +511,7 @@ void Foam::isoSurfaceCell::generateTriPoints
 
     if (countNotFoundTets > 0)
     {
-        WarningInFunction
+        WarningIn("Foam::isoSurfaceCell::generateTriPoints(..)")
             << "Could not find " << countNotFoundTets
             << " tet base points, which may lead to inverted triangles."
             << endl;
@@ -507,68 +523,14 @@ void Foam::isoSurfaceCell::generateTriPoints
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>>
-Foam::isoSurfaceCell::interpolate
-(
-    const scalarField& cVals,
-    const scalarField& pVals,
-    const Field<Type>& cCoords,
-    const Field<Type>& pCoords
-) const
-{
-    DynamicList<Type> triPoints(nCutCells_);
-    DynamicList<label> triMeshCells(nCutCells_);
-
-    // Dummy snap data
-    DynamicList<Type> snappedPoints;
-    labelList snappedCc(mesh_.nCells(), -1);
-    labelList snappedPoint(mesh_.nPoints(), -1);
-
-
-    generateTriPoints
-    (
-        cVals,
-        pVals,
-
-        cCoords,
-        pCoords,
-
-        snappedPoints,
-        snappedCc,
-        snappedPoint,
-
-        triPoints,
-        triMeshCells
-    );
-
-
-    // One value per point
-    tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
-    Field<Type>& values = tvalues();
-
-    forAll(triPoints, i)
-    {
-        label mergedPointI = triPointMergeMap_[i];
-
-        if (mergedPointI >= 0)
-        {
-            values[mergedPointI] = triPoints[i];
-        }
-    }
-
-    return tvalues;
-}
-
-
-template<class Type>
-Foam::tmp<Foam::Field<Type>>
+Foam::tmp<Foam::Field<Type> >
 Foam::isoSurfaceCell::interpolate
 (
     const Field<Type>& cCoords,
     const Field<Type>& pCoords
 ) const
 {
-    DynamicList<Type> triPoints(nCutCells_);
+    DynamicList<Type> triPoints(3*nCutCells_);
     DynamicList<label> triMeshCells(nCutCells_);
 
     // Dummy snap data
@@ -576,7 +538,6 @@ Foam::isoSurfaceCell::interpolate
     labelList snappedCc(mesh_.nCells(), -1);
     labelList snappedPoint(mesh_.nPoints(), -1);
 
-
     generateTriPoints
     (
         cVals_,
@@ -593,22 +554,12 @@ Foam::isoSurfaceCell::interpolate
         triMeshCells
     );
 
-
-    // One value per point
-    tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
-    Field<Type>& values = tvalues.ref();
-
-    forAll(triPoints, i)
-    {
-        label mergedPointI = triPointMergeMap_[i];
-
-        if (mergedPointI >= 0)
-        {
-            values[mergedPointI] = triPoints[i];
-        }
-    }
-
-    return tvalues;
+    return isoSurface::interpolate
+    (
+        points().size(),
+        triPointMergeMap_,
+        triPoints
+    );
 }
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
index ea92b65ef7..c0444401db 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
@@ -120,7 +120,7 @@ Foam::isoSurface::adaptPatchFields
         {
             fvPatchField<Type>& pfld = const_cast<fvPatchField<Type>&>
             (
-                fld.boundaryField()[patchI]
+                sliceFld.boundaryField()[patchI]
             );
 
             const scalarField& w = mesh.weights().boundaryField()[patchI];
@@ -240,8 +240,8 @@ void Foam::isoSurface::generateTriPoints
         case 0x0F:
         break;
 
-        case 0x0E:
         case 0x01:
+        case 0x0E:
             points.append
             (
                 generatePoint(s0,p0,hasSnap0,snapP0,s1,p1,hasSnap1,snapP1)
@@ -254,10 +254,16 @@ void Foam::isoSurface::generateTriPoints
             (
                 generatePoint(s0,p0,hasSnap0,snapP0,s3,p3,hasSnap3,snapP3)
             );
+            if (triIndex == 0x0E)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x0D:
         case 0x02:
+        case 0x0D:
             points.append
             (
                 generatePoint(s1,p1,hasSnap1,snapP1,s0,p0,hasSnap0,snapP0)
@@ -270,97 +276,133 @@ void Foam::isoSurface::generateTriPoints
             (
                 generatePoint(s1,p1,hasSnap1,snapP1,s2,p2,hasSnap2,snapP2)
             );
+            if (triIndex == 0x0D)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x0C:
         case 0x03:
-        {
-            Type tp1 =
-                generatePoint(s0,p0,hasSnap0,snapP0,s2,p2,hasSnap2,snapP2);
-            Type tp2 =
-                generatePoint(s1,p1,hasSnap1,snapP1,s3,p3,hasSnap3,snapP3);
+        case 0x0C:
+            {
+                Type p0p2 =
+                    generatePoint(s0,p0,hasSnap0,snapP0,s2,p2,hasSnap2,snapP2);
+                Type p1p3 =
+                    generatePoint(s1,p1,hasSnap1,snapP1,s3,p3,hasSnap3,snapP3);
 
-            points.append
-            (
-                generatePoint(s0,p0,hasSnap0,snapP0,s3,p3,hasSnap3,snapP3)
-            );
-            points.append(tp1);
-            points.append(tp2);
-            points.append(tp2);
-            points.append
-            (
-                generatePoint(s1,p1,hasSnap1,snapP1,s2,p2,hasSnap2,snapP2)
-            );
-            points.append(tp1);
-        }
+                points.append
+                (
+                    generatePoint(s0,p0,hasSnap0,snapP0,s3,p3,hasSnap3,snapP3)
+                );
+                points.append(p1p3);
+                points.append(p0p2);
+
+                points.append(p1p3);
+                points.append
+                (
+                    generatePoint(s1,p1,hasSnap1,snapP1,s2,p2,hasSnap2,snapP2)
+                );
+                points.append(p0p2);
+            }
+            if (triIndex == 0x0C)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-5], points[sz-4]);
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x0B:
         case 0x04:
-        {
-            points.append
-            (
-                generatePoint(s2,p2,hasSnap2,snapP2,s0,p0,hasSnap0,snapP0)
-            );
-            points.append
-            (
-                generatePoint(s2,p2,hasSnap2,snapP2,s1,p1,hasSnap1,snapP1)
-            );
-            points.append
-            (
-                generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3)
-            );
-        }
+        case 0x0B:
+            {
+                points.append
+                (
+                    generatePoint(s2,p2,hasSnap2,snapP2,s0,p0,hasSnap0,snapP0)
+                );
+                points.append
+                (
+                    generatePoint(s2,p2,hasSnap2,snapP2,s1,p1,hasSnap1,snapP1)
+                );
+                points.append
+                (
+                    generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3)
+                );
+            }
+            if (triIndex == 0x0B)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x0A:
         case 0x05:
-        {
-            Type tp0 =
-                generatePoint(s0,p0,hasSnap0,snapP0,s1,p1,hasSnap1,snapP1);
-            Type tp1 =
-                generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3);
+        case 0x0A:
+            {
+                Type p0p1 =
+                    generatePoint(s0,p0,hasSnap0,snapP0,s1,p1,hasSnap1,snapP1);
+                Type p2p3 =
+                    generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3);
 
-            points.append(tp0);
-            points.append(tp1);
-            points.append
-            (
-                generatePoint(s0,p0,hasSnap0,snapP0,s3,p3,hasSnap3,snapP3)
-            );
-            points.append(tp0);
-            points.append
-            (
-                generatePoint(s1,p1,hasSnap1,snapP1,s2,p2,hasSnap2,snapP2)
-            );
-            points.append(tp1);
-        }
+                points.append(p0p1);
+                points.append(p2p3);
+                points.append
+                (
+                    generatePoint(s0,p0,hasSnap0,snapP0,s3,p3,hasSnap3,snapP3)
+                );
+
+                points.append(p0p1);
+                points.append
+                (
+                    generatePoint(s1,p1,hasSnap1,snapP1,s2,p2,hasSnap2,snapP2)
+                );
+                points.append(p2p3);
+            }
+            if (triIndex == 0x0A)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-5], points[sz-4]);
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x09:
         case 0x06:
-        {
-            Type tp0 =
-                generatePoint(s0,p0,hasSnap0,snapP0,s1,p1,hasSnap1,snapP1);
-            Type tp1 =
-                generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3);
+        case 0x09:
+            {
+                Type p0p1 =
+                    generatePoint(s0,p0,hasSnap0,snapP0,s1,p1,hasSnap1,snapP1);
+                Type p2p3 =
+                    generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3);
 
-            points.append(tp0);
-            points.append
-            (
-                generatePoint(s1,p1,hasSnap1,snapP1,s3,p3,hasSnap3,snapP3)
-            );
-            points.append(tp1);
-            points.append(tp0);
-            points.append
-            (
-                generatePoint(s0,p0,hasSnap0,snapP0,s2,p2,hasSnap2,snapP2)
-            );
-            points.append(tp1);
-        }
+                points.append(p0p1);
+                points.append
+                (
+                    generatePoint(s1,p1,hasSnap1,snapP1,s3,p3,hasSnap3,snapP3)
+                );
+                points.append(p2p3);
+
+                points.append(p0p1);
+                points.append(p2p3);
+                points.append
+                (
+                    generatePoint(s0,p0,hasSnap0,snapP0,s2,p2,hasSnap2,snapP2)
+                );
+            }
+            if (triIndex == 0x09)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-5], points[sz-4]);
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x07:
         case 0x08:
+        case 0x07:
             points.append
             (
                 generatePoint(s3,p3,hasSnap3,snapP3,s0,p0,hasSnap0,snapP0)
@@ -373,6 +415,12 @@ void Foam::isoSurface::generateTriPoints
             (
                 generatePoint(s3,p3,hasSnap3,snapP3,s1,p1,hasSnap1,snapP1)
             );
+            if (triIndex == 0x07)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
     }
 }
@@ -681,16 +729,45 @@ void Foam::isoSurface::generateTriPoints
 }
 
 
-//template<class Type>
-//Foam::tmp<Foam::Field<Type>>
-//Foam::isoSurface::sample(const Field<Type>& vField) const
-//{
-//    return tmp<Field<Type>>(new Field<Type>(vField, meshCells()));
-//}
+template<class Type>
+Foam::tmp<Foam::Field<Type>>
+Foam::isoSurface::interpolate
+(
+    const label nPoints,
+    const labelList& triPointMergeMap,
+    const DynamicList<Type>& unmergedValues
+)
+{
+    // One value per point
+    tmp<Field<Type> > tvalues(new Field<Type>(nPoints, pTraits<Type>::zero));
+    Field<Type>& values = tvalues.ref();
+    labelList nValues(values.size(), 0);
+
+    forAll(unmergedValues, i)
+    {
+        label mergedPointI = triPointMergeMap[i];
+
+        if (mergedPointI >= 0)
+        {
+            values[mergedPointI] += unmergedValues[i];
+            nValues[mergedPointI]++;
+        }
+    }
+
+    forAll(values, i)
+    {
+        if (nValues[i] > 0)
+        {
+            values[i] /= scalar(nValues[i]);
+        }
+    }
+
+    return tvalues;
+}
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>>
+Foam::tmp<Foam::Field<Type> >
 Foam::isoSurface::interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& cCoords,
@@ -707,7 +784,7 @@ Foam::isoSurface::interpolate
     >> c2(adaptPatchFields(cCoords));
 
 
-    DynamicList<Type> triPoints(nCutCells_);
+    DynamicList<Type> triPoints(3*nCutCells_);
     DynamicList<label> triMeshCells(nCutCells_);
 
     // Dummy snap data
@@ -731,52 +808,12 @@ Foam::isoSurface::interpolate
         triMeshCells
     );
 
-
-    // One value per point
-    tmp<Field<Type>> tvalues
+    return interpolate
     (
-        new Field<Type>(points().size(), pTraits<Type>::zero)
+        points().size(),
+        triPointMergeMap_,
+        triPoints
     );
-    Field<Type>& values = tvalues.ref();
-    labelList nValues(values.size(), 0);
-
-    forAll(triPoints, i)
-    {
-        label mergedPointI = triPointMergeMap_[i];
-
-        if (mergedPointI >= 0)
-        {
-            values[mergedPointI] += triPoints[i];
-            nValues[mergedPointI]++;
-        }
-    }
-
-    if (debug)
-    {
-        Pout<< "nValues:" << values.size() << endl;
-        label nMult = 0;
-        forAll(nValues, i)
-        {
-            if (nValues[i] == 0)
-            {
-                FatalErrorInFunction
-                    << "point:" << i << " nValues:" << nValues[i]
-                    << abort(FatalError);
-            }
-            else if (nValues[i] > 1)
-            {
-                nMult++;
-            }
-        }
-        Pout<< "Of which mult:" << nMult << endl;
-    }
-
-    forAll(values, i)
-    {
-        values[i] /= scalar(nValues[i]);
-    }
-
-    return tvalues;
 }
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index 3f8486efa4..d789abed83 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -124,18 +124,52 @@ void Foam::sampledIsoSurface::getIsoFields() const
     // Get pointField
     // ~~~~~~~~~~~~~~
 
+    // In case of multiple iso values we don't want to calculate multiple e.g.
+    // "volPointInterpolate(p)" so register it and re-use it. This is the
+    // same as the 'cache' functionality from volPointInterpolate but
+    // unfortunately that one does not guarantee that the field pointer
+    // remain: e.g. some other functionObject might delete the cached version.
+    // (volPointInterpolation::interpolate with cache=false deletes any
+    //  registered one or if mesh.changing())
+
     if (!subMeshPtr_.valid())
     {
-        word pointFldName = "volPointInterpolate(" + isoField_ + ')';
+        const word pointFldName =
+            "volPointInterpolate_"
+          + type()
+          + "("
+          + isoField_
+          + ')';
 
         if (fvm.foundObject<pointScalarField>(pointFldName))
         {
             if (debug)
             {
                 InfoInFunction
-                    << "Lookup pointField " << pointFldName << endl;
+                    << "lookup pointField " << pointFldName << endl;
             }
-            pointFieldPtr_ = &fvm.lookupObject<pointScalarField>(pointFldName);
+            const pointScalarField& pfld = fvm.lookupObject<pointScalarField>
+            (
+                pointFldName
+            );
+
+            if (!pfld.upToDate(*volFieldPtr_))
+            {
+                if (debug)
+                {
+                    InfoInFunction
+                        << "updating pointField "
+                        << pointFldName << endl;
+                }
+                // Update the interpolated value
+                volPointInterpolation::New(fvm).interpolate
+                (
+                    *volFieldPtr_,
+                    const_cast<pointScalarField&>(pfld)
+                );
+            }
+
+            pointFieldPtr_ = &pfld;
         }
         else
         {
@@ -149,27 +183,20 @@ void Foam::sampledIsoSurface::getIsoFields() const
                     << endl;
             }
 
-            if
+            // Interpolate without cache. Note that we're registering it
+            // below so next time round it goes into the condition
+            // above.
+            tmp<pointScalarField> tpfld
             (
-                storedPointFieldPtr_.empty()
-             || (fvm.time().timeName() != storedPointFieldPtr_().instance())
-            )
-            {
-                if (debug)
-                {
-                    InfoInFunction
-                        << "Interpolating volField " << volFieldPtr_->name()
-                        << " to get pointField " << pointFldName << endl;
-                }
-
-                storedPointFieldPtr_.reset
+                volPointInterpolation::New(fvm).interpolate
                 (
-                    volPointInterpolation::New(fvm)
-                    .interpolate(*volFieldPtr_).ptr()
-                );
-                storedPointFieldPtr_->checkOut();
-                pointFieldPtr_ = storedPointFieldPtr_.operator->();
-            }
+                    *volFieldPtr_,
+                    pointFldName,
+                    false
+                )
+            );
+            pointFieldPtr_ = tpfld.ptr();
+            const_cast<pointScalarField*>(pointFieldPtr_)->store();
         }
 
 
@@ -427,7 +454,6 @@ Foam::sampledIsoSurface::sampledIsoSurface
     prevTimeIndex_(-1),
     storedVolFieldPtr_(NULL),
     volFieldPtr_(NULL),
-    storedPointFieldPtr_(NULL),
     pointFieldPtr_(NULL)
 {
     if (!sampledSurface::interpolate())
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
index d0a0b0ba98..e128560284 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
@@ -94,7 +94,6 @@ class sampledIsoSurface
             mutable const volScalarField* volFieldPtr_;
 
             //- Cached pointfield
-            mutable autoPtr<pointScalarField> storedPointFieldPtr_;
             mutable const pointScalarField* pointFieldPtr_;
 
             // And on subsetted mesh

From b4ebcd770f9ebd74b4e0f629f43e20b85999ecd4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 14 Mar 2016 08:07:42 +0000
Subject: [PATCH 273/447] quaternion: Added generalized construction from and
 conversion to Euler-angles

The particular rotation sequence is specified via the enumeration:

    //- Euler-angle rotation sequence
    enum rotationSequence
    {
        ZYX, ZYZ, ZXY, ZXZ, YXZ, YXY, YZX, YZY, XYZ, XYX, XZY, XZX
    };

and provided as an argument to the constructor from Euler-angles

    //- Construct a quaternion given the three Euler angles:
    inline quaternion
    (
        const rotationSequence rs,
        const vector& angles
    );

and conversion to Euler-angles:

    //- Return a vector of euler angles corresponding to the
    //  specified rotation sequence
    inline vector eulerAngles(const rotationSequence rs) const;
---
 .../test/quaternion/Test-quaternion.C         |  62 +++-
 .../primitives/quaternion/quaternion.H        |  37 ++-
 .../primitives/quaternion/quaternionI.H       | 307 +++++++++++++++---
 .../solidBodyMotionFunctions/SDA/SDA.C        |   2 +-
 .../linearMotion/linearMotion.C               |   2 +-
 .../oscillatingLinearMotion.C                 |   2 +-
 .../oscillatingRotatingMotion.C               |   2 +-
 .../tabulated6DoFMotion/tabulated6DoFMotion.C |   2 +-
 8 files changed, 366 insertions(+), 50 deletions(-)

diff --git a/applications/test/quaternion/Test-quaternion.C b/applications/test/quaternion/Test-quaternion.C
index df616dfa33..31a6d3ff46 100644
--- a/applications/test/quaternion/Test-quaternion.C
+++ b/applications/test/quaternion/Test-quaternion.C
@@ -1,10 +1,43 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2016 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/>.
+
+Application
+    Test-quaternion
+
+Description
+    Test application for quaternions.
+
+\*---------------------------------------------------------------------------*/
+
 #include "quaternion.H"
 #include "septernion.H"
 #include "IOstreams.H"
 
 using namespace Foam;
 
-int main()
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
 {
     quaternion q(vector(1, 0, 0), 0.7853981);
     Info<< "q " << q << endl;
@@ -36,5 +69,32 @@ int main()
            *septernion(vector(0, 1, 0))).transform(v)
         << endl;
 
+    Info<< "Test conversion from and to Euler-angles" << endl;
+    vector angles(0.1, 0.2, 0.3);
+    for (int rs=quaternion::ZYX; rs<quaternion::XZX; ++rs)
+    {
+        if
+        (
+            mag
+            (
+                angles
+              - quaternion(quaternion::rotationSequence(rs), angles)
+               .eulerAngles(quaternion::rotationSequence(rs))
+            )
+          > SMALL
+        )
+        {
+            FatalErrorInFunction
+                << "Inconsistent conversion for rotation sequence "
+                << rs << exit(FatalError)
+                << endl;
+        }
+    }
+
+    Info<< "End\n" << endl;
+
     return 0;
 }
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.H b/src/OpenFOAM/primitives/quaternion/quaternion.H
index 1e67c9bbcf..33e74c04a0 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.H
@@ -72,12 +72,38 @@ class quaternion
         //- Multiply vector v by quaternion as if v is a pure quaternion
         inline quaternion mulq0v(const vector& v) const;
 
+        //- Conversion of two-axis rotation components into Euler-angles
+        inline static vector twoAxes
+        (
+            const scalar t11,
+            const scalar t12,
+            const scalar c2,
+            const scalar t31,
+            const scalar t32
+        );
+
+        //- Conversion of three-axis rotation components into Euler-angles
+        inline static vector threeAxes
+        (
+            const scalar t11,
+            const scalar t12,
+            const scalar s2,
+            const scalar t31,
+            const scalar t32
+        );
+
 
 public:
 
     //- Component type
     typedef scalar cmptType;
 
+    //- Euler-angle rotation sequence
+    enum rotationSequence
+    {
+        ZYX, ZYZ, ZXY, ZXZ, YXZ, YXY, YZX, YZY, XYZ, XYX, XZY, XZX
+    };
+
 
     // Member constants
 
@@ -123,9 +149,8 @@ public:
         //- Construct a quaternion given the three Euler angles
         inline quaternion
         (
-            const scalar angleX,
-            const scalar angleY,
-            const scalar angleZ
+            const rotationSequence rs,
+            const vector& angles
         );
 
         //- Construct a quaternion from a rotation tensor
@@ -148,9 +173,9 @@ public:
                //- The rotation tensor corresponding the quaternion
                inline tensor R() const;
 
-               //- Return a vector of euler angles (rotations in radians about
-               //  the x, y and z axes.
-               inline vector eulerAngles(const quaternion& q) const;
+               //- Return a vector of euler angles corresponding to the
+               //  specified rotation sequence
+               inline vector eulerAngles(const rotationSequence rs) const;
 
                inline quaternion normalized() const;
 
diff --git a/src/OpenFOAM/primitives/quaternion/quaternionI.H b/src/OpenFOAM/primitives/quaternion/quaternionI.H
index 025fa638cd..3fa4013503 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternionI.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,18 +28,21 @@ License
 inline Foam::quaternion::quaternion()
 {}
 
+
 inline Foam::quaternion::quaternion(const scalar w, const vector& v)
 :
     w_(w),
     v_(v)
 {}
 
+
 inline Foam::quaternion::quaternion(const vector& d, const scalar theta)
 :
     w_(cos(0.5*theta)),
     v_((sin(0.5*theta)/mag(d))*d)
 {}
 
+
 inline Foam::quaternion::quaternion
 (
     const vector& d,
@@ -60,30 +63,109 @@ inline Foam::quaternion::quaternion
     }
 }
 
+
 inline Foam::quaternion::quaternion(const scalar w)
 :
     w_(w),
     v_(vector::zero)
 {}
 
+
 inline Foam::quaternion::quaternion(const vector& v)
 :
     w_(0),
     v_(v)
 {}
 
+
 inline Foam::quaternion::quaternion
 (
-    const scalar angleX,
-    const scalar angleY,
-    const scalar angleZ
+    const rotationSequence rs,
+    const vector& angles
 )
 {
-    operator=(quaternion(vector(1, 0, 0), angleX));
-    operator*=(quaternion(vector(0, 1, 0), angleY));
-    operator*=(quaternion(vector(0, 0, 1), angleZ));
+    switch(rs)
+    {
+        case ZYX:
+            operator=(quaternion(vector(0, 0, 1), angles.x()));
+            operator*=(quaternion(vector(0, 1, 0), angles.y()));
+            operator*=(quaternion(vector(1, 0, 0), angles.z()));
+            break;
+
+        case ZYZ:
+            operator=(quaternion(vector(0, 0, 1), angles.x()));
+            operator*=(quaternion(vector(0, 1, 0), angles.y()));
+            operator*=(quaternion(vector(0, 0, 1), angles.z()));
+            break;
+
+        case ZXY:
+            operator=(quaternion(vector(0, 0, 1), angles.x()));
+            operator*=(quaternion(vector(1, 0, 0), angles.y()));
+            operator*=(quaternion(vector(0, 1, 0), angles.z()));
+            break;
+
+        case ZXZ:
+            operator=(quaternion(vector(0, 0, 1), angles.x()));
+            operator*=(quaternion(vector(1, 0, 0), angles.y()));
+            operator*=(quaternion(vector(0, 0, 1), angles.z()));
+            break;
+
+        case YXZ:
+            operator=(quaternion(vector(0, 1, 0), angles.x()));
+            operator*=(quaternion(vector(1, 0, 0), angles.y()));
+            operator*=(quaternion(vector(0, 0, 1), angles.z()));
+            break;
+
+        case YXY:
+            operator=(quaternion(vector(0, 1, 0), angles.x()));
+            operator*=(quaternion(vector(1, 0, 0), angles.y()));
+            operator*=(quaternion(vector(0, 1, 0), angles.z()));
+            break;
+
+        case YZX:
+            operator=(quaternion(vector(0, 1, 0), angles.x()));
+            operator*=(quaternion(vector(0, 0, 1), angles.y()));
+            operator*=(quaternion(vector(1, 0, 0), angles.z()));
+            break;
+
+        case YZY:
+            operator=(quaternion(vector(0, 1, 0), angles.x()));
+            operator*=(quaternion(vector(0, 0, 1), angles.y()));
+            operator*=(quaternion(vector(0, 1, 0), angles.z()));
+            break;
+
+        case XYZ:
+            operator=(quaternion(vector(1, 0, 0), angles.x()));
+            operator*=(quaternion(vector(0, 1, 0), angles.y()));
+            operator*=(quaternion(vector(0, 0, 1), angles.z()));
+            break;
+
+        case XYX:
+            operator=(quaternion(vector(1, 0, 0), angles.x()));
+            operator*=(quaternion(vector(0, 1, 0), angles.y()));
+            operator*=(quaternion(vector(1, 0, 0), angles.z()));
+            break;
+
+        case XZY:
+            operator=(quaternion(vector(1, 0, 0), angles.x()));
+            operator*=(quaternion(vector(0, 0, 1), angles.y()));
+            operator*=(quaternion(vector(0, 1, 0), angles.z()));
+            break;
+
+        case XZX:
+            operator=(quaternion(vector(1, 0, 0), angles.x()));
+            operator*=(quaternion(vector(0, 0, 1), angles.y()));
+            operator*=(quaternion(vector(1, 0, 0), angles.z()));
+            break;
+
+        default:
+            FatalErrorInFunction
+                << "Unknown rotation sequence " << rs << abort(FatalError);
+            break;
+    }
 }
 
+
 inline Foam::quaternion::quaternion
 (
     const tensor& rotationTensor
@@ -234,17 +316,17 @@ inline Foam::quaternion Foam::quaternion::invTransform
 
 inline Foam::tensor Foam::quaternion::R() const
 {
-    scalar w2 = sqr(w());
-    scalar x2 = sqr(v().x());
-    scalar y2 = sqr(v().y());
-    scalar z2 = sqr(v().z());
+    const scalar w2 = sqr(w());
+    const scalar x2 = sqr(v().x());
+    const scalar y2 = sqr(v().y());
+    const scalar z2 = sqr(v().z());
 
-    scalar txy = 2*v().x()*v().y();
-    scalar twz = 2*w()*v().z();
-    scalar txz = 2*v().x()*v().z();
-    scalar twy = 2*w()*v().y();
-    scalar tyz = 2*v().y()*v().z();
-    scalar twx = 2*w()*v().x();
+    const scalar txy = 2*v().x()*v().y();
+    const scalar twz = 2*w()*v().z();
+    const scalar txz = 2*v().x()*v().z();
+    const scalar twy = 2*w()*v().y();
+    const scalar tyz = 2*v().y()*v().z();
+    const scalar twx = 2*w()*v().x();
 
     return tensor
     (
@@ -255,32 +337,181 @@ inline Foam::tensor Foam::quaternion::R() const
 }
 
 
-inline Foam::vector Foam::quaternion::eulerAngles(const quaternion& q) const
+inline Foam::vector Foam::quaternion::twoAxes
+(
+    const scalar t11,
+    const scalar t12,
+    const scalar c2,
+    const scalar t31,
+    const scalar t32
+)
 {
-    vector angles(vector::zero);
+    return vector(atan2(t11, t12), acos(c2), atan2(t31, t32));
+}
 
-    const scalar& w = q.w();
-    const vector& v = q.v();
 
-    angles[0] = Foam::atan2
-    (
-        2*(w*v.x() + v.y()*v.z()),
-        1 - 2*(sqr(v.x()) + sqr(v.y()))
-    );
-    angles[1] = Foam::asin(2*(w*v.y() - v.z()*v.x()));
-    angles[2] = Foam::atan2
-    (
-        2*(w*v.z() + v.x()*v.y()),
-        1 - 2*(sqr(v.y()) + sqr(v.z()))
-    );
+inline Foam::vector Foam::quaternion::threeAxes
+(
+    const scalar t11,
+    const scalar t12,
+    const scalar s2,
+    const scalar t31,
+    const scalar t32
+)
+{
+    return vector(atan2(t11, t12), asin(s2), atan2(t31, t32));
+}
 
-    // Convert to degrees
-//    forAll(angles, aI)
-//    {
-//        angles[aI] = Foam::radToDeg(angles[aI]);
-//    }
 
-    return angles;
+inline Foam::vector Foam::quaternion::eulerAngles
+(
+    const rotationSequence rs
+) const
+{
+    const scalar w2 = sqr(w());
+    const scalar x2 = sqr(v().x());
+    const scalar y2 = sqr(v().y());
+    const scalar z2 = sqr(v().z());
+
+    switch(rs)
+    {
+        case ZYX:
+            return threeAxes
+            (
+                2*(v().x()*v().y() + w()*v().z()),
+                w2 + x2 - y2 - z2,
+                2*(w()*v().y() - v().x()*v().z()),
+                2*(v().y()*v().z() + w()*v().x()),
+                w2 - x2 - y2 + z2
+            );
+            break;
+
+        case ZYZ:
+            return twoAxes
+            (
+                2*(v().y()*v().z() - w()*v().x()),
+                2*(v().x()*v().z() + w()*v().y()),
+                w2 - x2 - y2 + z2,
+                2*(v().y()*v().z() + w()*v().x()),
+                2*(w()*v().y() - v().x()*v().z())
+            );
+            break;
+
+        case ZXY:
+            return threeAxes
+            (
+                2*(w()*v().z() - v().x()*v().y()),
+                w2 - x2 + y2 - z2,
+                2*(v().y()*v().z() + w()*v().x()),
+                2*(w()*v().y() - v().x()*v().z()),
+                w2 - x2 - y2 + z2
+            );
+            break;
+
+        case ZXZ:
+            return twoAxes
+            (
+                2*(v().x()*v().z() + w()*v().y()),
+                2*(w()*v().x() - v().y()*v().z()),
+                w2 - x2 - y2 + z2,
+                2*(v().x()*v().z() - w()*v().y()),
+                2*(v().y()*v().z() + w()*v().x())
+            );
+            break;
+
+        case YXZ:
+            return threeAxes
+            (
+                2*(v().x()*v().z() + w()*v().y()),
+                w2 - x2 - y2 + z2,
+                2*(w()*v().x() - v().y()*v().z()),
+                2*(v().x()*v().y() + w()*v().z()),
+                w2 - x2 + y2 - z2
+            );
+            break;
+
+        case YXY:
+            return twoAxes
+            (
+                2*(v().x()*v().y() - w()*v().z()),
+                2*(v().y()*v().z() + w()*v().x()),
+                w2 - x2 + y2 - z2,
+                2*(v().x()*v().y() + w()*v().z()),
+                2*(w()*v().x() - v().y()*v().z())
+            );
+            break;
+
+        case YZX:
+            return threeAxes
+            (
+                2*(w()*v().y() - v().x()*v().z()),
+                w2 + x2 - y2 - z2,
+                2*(v().x()*v().y() + w()*v().z()),
+                2*(w()*v().x() - v().y()*v().z()),
+                w2 - x2 + y2 - z2
+            );
+            break;
+
+        case YZY:
+            return twoAxes
+            (
+                2*(v().y()*v().z() + w()*v().x()),
+                2*(w()*v().z() - v().x()*v().y()),
+                w2 - x2 + y2 - z2,
+                2*(v().y()*v().z() - w()*v().x()),
+                2*(v().x()*v().y() + w()*v().z())
+            );
+            break;
+
+        case XYZ:
+            return threeAxes
+            (
+                2*(w()*v().x() - v().y()*v().z()),
+                w2 - x2 - y2 + z2,
+                2*(v().x()*v().z() + w()*v().y()),
+                2*(w()*v().z() - v().x()*v().y()),
+                w2 + x2 - y2 - z2
+            );
+            break;
+
+        case XYX:
+            return twoAxes
+            (
+                2*(v().x()*v().y() + w()*v().z()),
+                2*(w()*v().y() - v().x()*v().z()),
+                w2 + x2 - y2 - z2,
+                2*(v().x()*v().y() - w()*v().z()),
+                2*(v().x()*v().z() + w()*v().y())
+            );
+            break;
+
+        case XZY:
+            return threeAxes
+            (
+                2*(v().y()*v().z() + w()*v().x()),
+                w2 - x2 + y2 - z2,
+                2*(w()*v().z() - v().x()*v().y()),
+                2*(v().x()*v().z() + w()*v().y()),
+                w2 + x2 - y2 - z2
+            );
+            break;
+
+        case XZX:
+            return twoAxes
+            (
+                2*(v().x()*v().z() - w()*v().y()),
+                2*(v().x()*v().y() + w()*v().z()),
+                w2 + x2 - y2 - z2,
+                2*(v().x()*v().z() + w()*v().y()),
+                2*(w()*v().z() - v().x()*v().y())
+            );
+            break;
+        default:
+            FatalErrorInFunction
+                << "Unknown rotation sequence " << rs << abort(FatalError);
+            return vector::zero;
+            break;
+    }
 }
 
 
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C
index 269cc3217a..cb8ac12385 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C
@@ -90,7 +90,7 @@ Foam::septernion Foam::solidBodyMotionFunctions::SDA::transformation() const
         swayA_*(sin(wr*time + phs) - sin(phs)),
         heaveA_*(sin(wr*time + phh) - sin(phh))
     );
-    quaternion R(rollA*sin(wr*time + phr), 0, 0);
+    quaternion R(quaternion::XYZ, vector(rollA*sin(wr*time + phr), 0, 0));
     septernion TR(septernion(CofG_ + T)*R*septernion(-CofG_));
 
     InfoInFunction << "Time = " << time << " transformation: " << TR << endl;
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C
index 6a9f7bc5b4..a3be9a8f83 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C
@@ -73,7 +73,7 @@ Foam::solidBodyMotionFunctions::linearMotion::transformation() const
     // Translation of centre of gravity with constant velocity
     const vector displacement = velocity_*t;
 
-    quaternion R(0, 0, 0);
+    quaternion R(1);
     septernion TR(septernion(displacement)*R);
 
     InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
index 5a090577ff..9e03d3b93f 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
@@ -73,7 +73,7 @@ Foam::solidBodyMotionFunctions::oscillatingLinearMotion::transformation() const
 
     const vector displacement = amplitude_*sin(omega_*t);
 
-    quaternion R(0, 0, 0);
+    quaternion R(1);
     septernion TR(septernion(displacement)*R);
 
     InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
index 64516acf99..fcceb2f0e4 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
@@ -81,7 +81,7 @@ transformation() const
     // Convert the rotational motion from deg to rad
     eulerAngles *= pi/180.0;
 
-    quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z());
+    quaternion R(quaternion::XYZ, eulerAngles);
     septernion TR(septernion(origin_)*R*septernion(-origin_));
 
     InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
index b25838c75d..356d2a8266 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
@@ -104,7 +104,7 @@ Foam::solidBodyMotionFunctions::tabulated6DoFMotion::transformation() const
     // Convert the rotational motion from deg to rad
     TRV[1] *= pi/180.0;
 
-    quaternion R(TRV[1].x(), TRV[1].y(), TRV[1].z());
+    quaternion R(quaternion::XYZ, TRV[1]);
     septernion TR(septernion(CofG_ + TRV[0])*R*septernion(-CofG_));
 
     InfoInFunction << "Time = " << t << " transformation: " << TR << endl;

From e57874859aee4904b83e787619a155df2698720f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 14 Mar 2016 11:00:24 +0000
Subject: [PATCH 274/447] Updated Doxygen documentation and files Contributed
 by Bruno Santos Resolves patch report
 http://www.openfoam.org/mantisbt/view.php?id=2023

Update online documentation http://openfoam.github.io/Documentation-dev/html/
---
 .../BCs/rho/fixedRhoFvPatchScalarField.H      |  4 +-
 .../foamToEnsightParts/foamToEnsightParts.C   |  2 +-
 doc/Doxygen/_Header                           |  6 +-
 doc/Doxygen/css/cfdLayout.css                 |  7 ++-
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H  |  2 +-
 .../db/IOstreams/Pstreams/PstreamReduceOps.H  |  8 ++-
 .../functionObjectList/functionObjectList.H   |  7 ++-
 .../FieldField/FieldFieldFunctions.C          |  2 -
 .../codedFixedValuePointPatchField.H          | 46 +++++++--------
 src/OpenFOAM/global/debug/debug.C             |  8 ++-
 src/OpenFOAM/graph/curve/curveTools.H         |  5 +-
 .../interpolationTable/interpolationTable.H   |  6 +-
 .../GAMGAgglomeration/GAMGAgglomeration.H     | 27 +++++----
 src/OpenFOAM/meshes/MeshObject/MeshObject.H   | 18 +++---
 .../primitiveMesh/PatchTools/PatchTools.H     |  3 +-
 .../meshes/treeBoundBox/treeBoundBox.C        |  6 +-
 ...tureCoupledBaffleMixedFvPatchScalarField.H | 17 +++---
 .../RASBoundaryConditionsDoc.H                |  4 +-
 .../extrudePatchMesh/extrudePatchMesh.H       |  5 +-
 .../cfdTools/general/fvOptions/fvOption.H     | 11 ++--
 .../totalPressureFvPatchScalarField.H         |  6 +-
 ...polatedDisplacementPointPatchVectorField.H | 11 +++-
 src/fvOptions/cellSetOption/cellSetOption.H   |  9 +--
 .../interRegionExplicitPorositySource.H       | 30 +++++-----
 .../ParticleTrap/ParticleTrap.H               | 17 +++---
 .../CellZoneInjection/CellZoneInjection.H     | 17 +++---
 .../ConeInjection/ConeInjection.H             | 18 +++---
 .../ConeNozzleInjection/ConeNozzleInjection.H | 37 +++++++-----
 .../FieldActivatedInjection.H                 | 14 ++---
 .../KinematicLookupTableInjection.H           | 14 +++--
 .../ManualInjection/ManualInjection.H         | 17 +++---
 .../PatchFlowRateInjection.H                  | 20 +++----
 .../PatchInjection/PatchInjection.H           | 19 +++---
 .../StandardWallInteraction.H                 | 22 +++----
 .../refinementFeatures/refinementFeatures.H   | 37 ++++++------
 .../layerParameters/layerParameters.H         | 22 +++----
 .../EulerCoordinateRotation.H                 | 15 +++--
 .../STARCDCoordinateRotation.H                | 15 +++--
 .../coordinateRotation/axesRotation.H         | 18 +++---
 .../coordinateRotation/coordinateRotation.H   | 25 ++++----
 .../coordinateRotation/cylindrical.H          | 22 +++----
 .../coordinateSystems/coordinateSystem.H      | 31 +++++-----
 .../mappedPolyPatch/mappedPatchBase.H         | 11 ++--
 .../surfaceLocation/surfaceLocation.H         | 13 ++--
 .../writeRegisteredObject.H                   | 15 ++---
 .../turbulenceFields/turbulenceFields.H       |  6 +-
 ...sRadiativeCoupledMixedFvPatchScalarField.H | 59 ++++++++++---------
 ...ysisTemperatureCoupledFvPatchScalarField.H | 18 +++---
 ...rolysisVelocityCoupledFvPatchVectorField.H | 18 +++---
 .../patchInjection/patchInjection.H           |  4 +-
 .../thermalBaffleFvPatchScalarField.H         | 18 +++---
 .../alphaContactAngleFvPatchScalarField.H     | 25 ++++----
 52 files changed, 456 insertions(+), 361 deletions(-)

diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H
index 6efbb4947d..cc5cd933b6 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
     This boundary condition provides a fixed density inlet condition for
     compressible solvers, where the density of calculated using:
 
-    \f{
+    \f[
         \rho = \psi p
     \f]
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index f2d0286bce..6aecc40fc2 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
@@ -35,7 +35,7 @@ Usage
     \param -ascii \n
     Write Ensight data in ASCII format instead of "C Binary"
 
-    \parm -name \<subdir\>\n
+    \param -name \<subdir\>\n
     define sub-directory name to use for Ensight data (default: "Ensight")
 
     \param -noZero \n
diff --git a/doc/Doxygen/_Header b/doc/Doxygen/_Header
index 985c43d52c..af6f4fdad9 100644
--- a/doc/Doxygen/_Header
+++ b/doc/Doxygen/_Header
@@ -2,15 +2,19 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UFT-8"/>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <title> OpenFOAM&reg; Programmer's C++ documentation </title>
 <!-- links -->
 <link href="../OpenFOAMdocIcon.png" rel="icon" type="image/png" />
 <link href="search/search.css" rel="stylesheet" type="text/css" />
 <link href="../css/openfoam.css" rel="stylesheet" type="text/css" />
+<script type="text/javaScript" src="search/searchdata.js"></script>
 <script type="text/javaScript" src="search/search.js"></script>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript">
+    $(document).ready(function() { init_search(); });
+</script>
 
 <!-- meta info -->
 <meta
diff --git a/doc/Doxygen/css/cfdLayout.css b/doc/Doxygen/css/cfdLayout.css
index b00bd68da4..57a1ff569d 100644
--- a/doc/Doxygen/css/cfdLayout.css
+++ b/doc/Doxygen/css/cfdLayout.css
@@ -11,6 +11,11 @@ body {
     font-size: 62.5%;
 } /*Font-size: 1.0em = 10px when browser default size is 16px*/
 
+/* Using the same as the code/verbatim blocks in doxygen.css */
+code {
+    font-family: "Courier New", Courier, monospace, fixed;
+}
+
 p:after {
     content:".";
     display:block;
@@ -243,7 +248,7 @@ p:after {
     padding-bottom:30px;
     border-left: 3px solid rgb(175,175,175);
     border-right:3px solid rgb(175,175,175);
-    background:transparent url(img/bg_main.gif) top left repeat-y;
+    background:transparent;
 }
 .main img {
     clear:both;
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index 266849bba8..abae46e9de 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -25,7 +25,7 @@ Class
     Foam::Pstream
 
 Description
-    Inter-processor communications stream
+    Inter-processor communications stream.
 
 SourceFiles
     Pstream.C
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
index 3ed4ee0b0a..53c4b6f344 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+InNamespace
+    Foam
+
+Description
+    Inter-processor communication reduction functions.
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef PstreamReduceOps_H
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 126a1f18bb..7d8f2d205d 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,12 +110,15 @@ public:
 
         //- Construct from Time, a dictionary with "functions" entry
         //  and the execution setting.
+        //  \param[in]  t - the other Time instance to construct from
         //  \param[in]  parentDict - the parent dictionary containing
         //    a "functions" entry, which can either be a list or a dictionary
         //    of functionObject specifications.
+        //  \param[in]  execution - whether the function objects should execute
+        //    or not. Default: true.
         functionObjectList
         (
-            const Time&,
+            const Time& t,
             const dictionary& parentDict,
             const bool execution=true
         );
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index affb77661b..330336b2af 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -543,8 +543,6 @@ Type average(const FieldField<Field, Type>& f)
 TMP_UNARY_FUNCTION(Type, average)
 
 
-#include "PstreamReduceOps.H"
-
 #define G_UNARY_FUNCTION(returnType, gFunc, func, rFunc)                       \
                                                                                \
 template<template<class> class Field, class Type>                              \
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
index 19c775ab71..36ff3fdf95 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
@@ -30,34 +30,34 @@ Description
 
     Example:
     \verbatim
-        movingWall
-        {
-            type            codedFixedValue;
-            value           uniform 0;
-            redirectType    rampedFixedValue;   // name of generated bc
+    movingWall
+    {
+        type            codedFixedValue;
+        value           uniform 0;
+        redirectType    rampedFixedValue;   // name of generated bc
 
-            code
-            #{
-                operator==
-                (
-                    vector(0,0,1)
-                   *min(10, 0.1*this->db().time().value())
-                );
-            #};
+        code
+        #{
+            operator==
+            (
+                vector(0,0,1)
+                *min(10, 0.1*this->db().time().value())
+            );
+        #};
 
-            //codeInclude
-            //#{
-            //    #include "fvCFD.H"
-            //#};
+        //codeInclude
+        //#{
+        //    #include "fvCFD.H"
+        //#};
 
-            //codeOptions
-            //#{
-            //    -I$(LIB_SRC)/finiteVolume/lnInclude
-            //#};
-        }
+        //codeOptions
+        //#{
+        //    -I$(LIB_SRC)/finiteVolume/lnInclude
+        //#};
+    }
     \endverbatim
 
-    A special form is if the 'code' section is not supplied. In this case
+    A special form is if the \c code section is not supplied. In this case
     the code gets read from a (runTimeModifiable!) dictionary system/codeDict
     which would have a corresponding entry
 
diff --git a/src/OpenFOAM/global/debug/debug.C b/src/OpenFOAM/global/debug/debug.C
index d7517922c0..b2f0dfd2fb 100644
--- a/src/OpenFOAM/global/debug/debug.C
+++ b/src/OpenFOAM/global/debug/debug.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,9 @@ namespace Foam
 namespace debug
 {
 
-//! \cond ignoreDocumentation - local scope
+//! \cond ignoreDocumentation
+//- Skip documentation : local scope only
+
 dictionary* controlDictPtr_(NULL);
 dictionary* debugSwitchesPtr_(NULL);
 dictionary* infoSwitchesPtr_(NULL);
@@ -55,7 +57,7 @@ simpleObjectRegistry* dimensionSetObjectsPtr_(NULL);
 simpleObjectRegistry* dimensionedConstantObjectsPtr_(NULL);
 
 
-// to ensure controlDictPtr_ is deleted at the end of the run
+// To ensure controlDictPtr_ is deleted at the end of the run
 class deleteControlDictPtr
 {
 public:
diff --git a/src/OpenFOAM/graph/curve/curveTools.H b/src/OpenFOAM/graph/curve/curveTools.H
index 6b56d1faa9..04787e4e80 100644
--- a/src/OpenFOAM/graph/curve/curveTools.H
+++ b/src/OpenFOAM/graph/curve/curveTools.H
@@ -4,6 +4,8 @@
 #include "scalar.H"
 #include "vector.H"
 #include "curve.H"
+#include "char.H"
+#include "List.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -13,9 +15,6 @@ namespace Foam
 #define curveSmall 1.0e-8
 #define curveGreat 1.0e8
 
-#include "char.H"
-#include "List.H"
-
 typedef List<char> charList;
 typedef List<charList> charListList;
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
index fc34afbd87..e76e6944ae 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
@@ -29,9 +29,9 @@ Description
     The reference scalar values must be monotonically increasing.
 
     The handling of out-of-bounds values depends on the current setting
-    of \a outOfBounds.
+    of \c outOfBounds.
 
-    If \a REPEAT is chosen for the out-of-bounds handling, the final time
+    If \c repeat is chosen for the out-of-bounds handling, the final time
     value is treated as being equivalent to time=0 for the following periods.
 
 
@@ -40,11 +40,13 @@ Description
     other format is csv (comma separated values):
 
     Read csv format:
+    \verbatim
         readerType      csv;
         fileName        "$FOAM_CASE/constant/p0vsTime.csv";
         hasHeaderLine   true;   // skip first line
         timeColumn      0;      // time is in column 0
         valueColumns    (1);    // value starts in column 1
+    \endverbatim
 
 
 Note
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
index ff9030ff89..fd94b55760 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
@@ -171,12 +171,13 @@ protected:
 
         // Processor agglomeration
 
-            //- Collect and combine processor meshes into allMesh.
-            //  - allMeshComm   : communicator for combined mesh.
-            //  - procAgglomMap : per processor the new agglomerated processor
-            //                    (rank in allMeshComm!). Global information.
-            //  - procIDs       : local information: same for all in
-            //                    agglomerated processor.
+            //- Collect and combine processor meshes into allMesh:
+            //
+            //    - allMeshComm   : communicator for combined mesh.
+            //    - procAgglomMap : per processor the new agglomerated
+            //        processor (rank in allMeshComm!). Global information.
+            //    - procIDs       : local information: same for all in
+            //        agglomerated processor.
             void procAgglomerateLduAddressing
             (
                 const label comm,
@@ -187,8 +188,9 @@ protected:
             );
 
             //- Collect and combine basic restriction addressing:
-            //      nCells_
-            //      restrictAddressing_
+            //
+            //    - nCells_
+            //    - restrictAddressing_
             void procAgglomerateRestrictAddressing
             (
                 const label comm,
@@ -426,10 +428,11 @@ public:
         // with GAMGSolver notation.
 
             //- Given fine to coarse processor map determine:
-            //  - for each coarse processor a master (minimum of the fine
-            //    processors)
-            //  - for each coarse processor the set of fine processors
-            //    (element 0 is the master processor)
+            //
+            //    - for each coarse processor a master (minimum of the fine
+            //        processors)
+            //    - for each coarse processor the set of fine processors
+            //        (element 0 is the master processor)
             static void calculateRegionMaster
             (
                 const label comm,
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.H b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
index d1e9cf1f48..79c90a37e3 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.H
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
@@ -33,6 +33,7 @@ Description
     MoveableMeshObject, UpdateableMeshObject) and the type of the actual object
     it is created for example:
 
+    \verbatim
     class leastSquaresVectors
     :
         public MeshObject<fvMesh, MoveableMeshObject, leastSquaresVectors>
@@ -43,17 +44,20 @@ Description
         //- Delete the least square vectors when the mesh moves
         virtual bool movePoints();
     };
+    \endverbatim
 
     MeshObject types:
 
-    TopologicalMeshObject: mesh object to be deleted on topology change
-    GeometricMeshObject: mesh object to be deleted on geometry change
-    MoveableMeshObject: mesh object to be updated in movePoints
-    UpdateableMeshObject: mesh object to be updated in updateMesh or movePoints
+    - TopologicalMeshObject: mesh object to be deleted on topology change
+    - GeometricMeshObject: mesh object to be deleted on geometry change
+    - MoveableMeshObject: mesh object to be updated in movePoints
+    - UpdateableMeshObject: mesh object to be updated in updateMesh or
+        movePoints
 
-    Note that movePoints must be provided for MeshObjects of type
-    MoveableMeshObject and both movePoints and updateMesh functions must exist
-    provided for MeshObjects of type UpdateableMeshObject.
+Note
+    movePoints must be provided for MeshObjects of type MoveableMeshObject
+    and both movePoints and updateMesh functions must exist, provided for
+    MeshObjects of type UpdateableMeshObject.
 
 SourceFiles
     MeshObject.C
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
index 648fd4a264..dd242f5c19 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
@@ -123,6 +123,7 @@ public:
 
     //- Determine the mapping for a sub-patch.
     //  Only include faces for which bool-list entry is true.
+    //  \param[in]  p patch to be searched on
     //  \param[in]  includeFaces faces to include
     //  \param[out] pointMap mapping new to old localPoints
     //  \param[out] faceMap  mapping new to old faces
@@ -136,7 +137,7 @@ public:
     >
     static void subsetMap
     (
-        const PrimitivePatch<Face, FaceList, PointField, PointType>&,
+        const PrimitivePatch<Face, FaceList, PointField, PointType>& p,
         const BoolListType& includeFaces,
         labelList& pointMap,
         labelList& faceMap
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
index d7bc032e4c..cd804fcf94 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
@@ -44,7 +44,8 @@ const Foam::treeBoundBox Foam::treeBoundBox::invertedBox
 );
 
 
-//! \cond - skip documentation : local scope only
+//! \cond ignoreDocumentation
+//- Skip documentation : local scope only
 const Foam::label facesArray[6][4] =
 {
     {0, 4, 6, 2}, // left
@@ -63,7 +64,8 @@ const Foam::faceList Foam::treeBoundBox::faces
 );
 
 
-//! \cond - skip documentation : local scope only
+//! \cond  ignoreDocumentation
+//- Skip documentation : local scope only
 const Foam::label edgesArray[12][2] =
 {
     {0, 1}, // 0
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
index 18d1d4cb4a..c541912d1e 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ Description
         type            compressible::turbulentTemperatureCoupledBaffleMixed;
         Tnbr            T;
         kappa           lookup;
-        KappaName       kappa;
+        kappaName       kappa;
         thicknessLayers (0.1 0.2 0.3 0.4);
         kappaLayers     (1 2 3 4)
         value           uniform 300;
@@ -71,14 +71,13 @@ Description
 
     Needs to be on underlying mapped(Wall)FvPatch.
 
-    Note: kappa : heat conduction at patch. Gets supplied how to lookup
-        calculate kappa:
+    Note:
 
-    - 'lookup' : lookup volScalarField (or volSymmTensorField) with name
-    - 'fluidThermo' : use fluidThermo and compressible::RASmodel to calculate
-        kappa
-    - 'solidThermo' : use solidThermo kappa()
-    - 'directionalSolidThermo' directionalKappa()
+    \li \c kappa and \c kappaName are inherited from temperatureCoupledBase.
+
+
+SeeAlso
+    Foam::temperatureCoupledBase
 
 SourceFiles
     turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H
index 4202f5f7af..bb8de63cf9 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
     This group contains RAS turbulence model boundary conditions
 @}
 
-\defgroup grpWallFunctions RAS wall functions
+\defgroup grpRASWallFunctions RAS wall functions
 @{
     \ingroup grpRASBoundaryConditions
     This group contains RAS turbulence model wall functions
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
index 4f0cb123b5..2a6a719afc 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,6 +28,8 @@ Description
     Mesh at a patch created on the fly. The following entry should be used
     on the field boundary dictionary:
 
+    Example:
+    \verbatim
         // New Shell mesh data
 
         extrudeModel    linearNormal;
@@ -61,6 +63,7 @@ Description
             name        "side";
             type        empty;
         }
+    \endverbatim
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H
index 8362aee7a0..56e3612b60 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,13 +25,14 @@ Class
     Foam::fv::option
 
 Description
-    Finite volume options abtract base class.  Provides a base set of controls,
-    e.g.
-
+    Finite volume options abstract base class.  Provides a base set of
+    controls, e.g.:
+    \verbatim
         type            scalarExplicitSource    // source type
         active          on;                     // on/off switch
+    \endverbatim
 
-Note:
+Note
     On evaluation, source/sink options are to be added to the equation R.H.S.
 
 SourceFiles
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H
index edf53bcede..3688572a86 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ Description
             U       | velocity
         \endvartable
 
-    3. compressible transonic (\gamma <= 1):
+    3. compressible transonic (\f$\gamma <= 1\f$):
         \f[
             p_p = \frac{p_0}{1 + 0.5 \psi |U|^2}
         \f]
@@ -65,7 +65,7 @@ Description
             G       | coefficient given by \f$\frac{\gamma}{1-\gamma}\f$
         \endvartable
 
-    4. compressible supersonic (\gamma > 1):
+    4. compressible supersonic (\f$\gamma > 1\f$):
         \f[
             p_p = \frac{p_0}{(1 + 0.5 \psi G |U|^2)^{\frac{1}{G}}}
         \f]
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
index 3e7ff244ca..2b73df7ebd 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
@@ -27,8 +27,12 @@ Class
 Description
     Interpolates pre-specified motion.
 
-    Motion specified as pointVectorFields. E.g.
+    Motion specified as pointVectorFields.
 
+    \heading Patch usage
+
+    Example:
+    \verbatim
     walls
     {
         type                uniformInterpolatedDisplacement;
@@ -36,9 +40,10 @@ Description
         fieldName           wantedDisplacement;
         interpolationScheme linear;
     }
+    \endverbatim
 
-    This will scan the case for 'wantedDisplacement' pointVectorFields
-    and interpolate those in time (using 'linear' interpolation) to
+    This will scan the case for \a wantedDisplacement pointVectorFields
+    and interpolate those in time (using \c linear interpolation) to
     obtain the current displacement.
     The advantage of specifying displacement in this way is that it
     automatically works through decomposePar.
diff --git a/src/fvOptions/cellSetOption/cellSetOption.H b/src/fvOptions/cellSetOption/cellSetOption.H
index 6dcbe17886..dd07b2e87f 100644
--- a/src/fvOptions/cellSetOption/cellSetOption.H
+++ b/src/fvOptions/cellSetOption/cellSetOption.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,8 +26,8 @@ Class
 
 Description
     Cell-set options abtract base class.  Provides a base set of controls,
-    e.g.
-
+    e.g.:
+    \verbatim
         type            scalarExplicitSource    // Source type
         active          on;                     // on/off switch
 
@@ -40,8 +40,9 @@ Description
             .
             .
         }
+    \endverbatim
 
-Note:
+Note
     Source/sink options are to be added to the equation R.H.S.
 
 SourceFiles
diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
index eafb1b384e..93f50a3930 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,27 +25,29 @@ Class
     Foam::fv::interRegionExplicitPorositySource
 
 Description
-    Inter-region explicit porosity source
+    Inter-region explicit porosity source.
 
     Sources described by, for example using the DarcyForchheimer model:
 
-        interRegionExplicitPorositySourceCoeffs
+    \verbatim
+    interRegionExplicitPorositySourceCoeffs
+    {
+        type            DarcyForchheimer;
+        DarcyForchheimerCoeffs
         {
-            type            DarcyForchheimer;
-            DarcyForchheimerCoeffs
-            {
-                d   d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
-                f   f [0 -1 0 0 0 0 0] (0 0 0);
+            d   d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
+            f   f [0 -1 0 0 0 0 0] (0 0 0);
 
-                coordinateSystem
-                {
-                    e1  (0.70710678 0.70710678 0);
-                    e2  (0 0 1);
-                }
+            coordinateSystem
+            {
+                e1  (0.70710678 0.70710678 0);
+                e2  (0 0 1);
             }
         }
+    }
+    \endverbatim
 
-Note:
+Note
     The porous region must be selected as a cellZone.
 
 SourceFiles
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
index a315b10508..85c55a516a 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
@@ -25,16 +25,17 @@ Class
     Foam::ParticleTrap
 
 Description
-    Traps particles within a given phase fraction for multi-phase cases
+    Traps particles within a given phase fraction for multi-phase cases.
 
     Model is activated using:
-
-        particleTrap1
-        {
-            type        particleTrap;
-            alphaName   alpha;      // name volume fraction field
-            threshold   0.95;       // alpha value below which model is active
-        }
+    \verbatim
+    particleTrap1
+    {
+        type        particleTrap;
+        alphaName   alpha;      // name volume fraction field
+        threshold   0.95;       // alpha value below which model is active
+    }
+    \endverbatim
 
 
 SourceFiles
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
index aa466137c4..3431298370 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
@@ -25,14 +25,17 @@ Class
     Foam::CellZoneInjection
 
 Description
-    Injection positions specified by a particle number density within a cell set
+    Injection positions specified by a particle number density within a cell
+    set.
 
-    - User specifies
-      - Number density of particles in cell set (effective)
-      - Total mass to inject
-      - Initial parcel velocity
-    - Parcel diameters obtained by PDF model
-    - All parcels introduced at SOI
+    \li User specifies:
+        - Number density of particles in cell set (effective)
+        - Total mass to inject
+        - Initial parcel velocity
+
+    \li Parcel diameters obtained by PDF model
+
+    \li All parcels introduced at SOI
 
 SourceFiles
     CellZoneInjection.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 5891f27d82..56fb18d413 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -25,14 +25,16 @@ Class
     Foam::ConeInjection
 
 Description
-    Multi-point cone injection model
-    - User specifies
-      - time of start of injection
-      - list of injector positions and directions (along injection axes)
-      - number of parcels to inject per injector
-      - parcel velocities
-      - inner and outer half-cone angles
-    - Parcel diameters obtained by distribution model
+    Multi-point cone injection model.
+
+    \li User specifies:
+        - time of start of injection
+        - list of injector positions and directions (along injection axes)
+        - number of parcels to inject per injector
+        - parcel velocities
+        - inner and outer half-cone angles
+
+    \li Parcel diameters obtained by distribution model
 
 SourceFiles
     ConeInjection.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
index 07fc39274e..5b1e74a8eb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
@@ -25,25 +25,32 @@ Class
     Foam::ConeNozzleInjection
 
 Description
-    Cone injection
+    Cone injection.
 
-    - User specifies
-      - time of start of injection
-      - injector position
-      - direction (along injection axis)
-      - parcel flow rate
-      - inner and outer half-cone angles
+    \li User specifies:
+        - time of start of injection
+        - injector position
+        - direction (along injection axis)
+        - parcel flow rate
+        - inner and outer half-cone angles
 
-    - Parcel diameters obtained by size distribution model
+    \li Parcel diameters obtained by size distribution model
 
-    - Parcel velocity is calculated as:
+    \li Parcel velocity is calculated as:
+        - Constant velocity:
+        \verbatim
+        U = \<specified by user\>
+        \endverbatim
 
-        - Constant velocity
-            U = \<specified by user\>
-        - Pressure driven velocity
-            U = sqrt(2*(Pinj - Pamb)/rho)
-        - Flow rate and discharge
-            U = V_dot/(A*Cd)
+        - Pressure driven velocity:
+        \verbatim
+        U = sqrt(2*(Pinj - Pamb)/rho)
+        \endverbatim
+
+        - Flow rate and discharge:
+        \verbatim
+        U = V_dot/(A*Cd)
+        \endverbatim
 
 SourceFiles
     ConeNozzleInjection.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index e2bb8db399..c5dd277d3f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -27,16 +27,16 @@ Class
 Description
     Injection at specified positions, with the conditions:
 
-    - for injection to be allowed
-
+    \li for injection to be allowed
+        \verbatim
         factor*referenceField[cellI] >= thresholdField[cellI]
-
+        \endverbatim
         where:
-          - referenceField is the field used to supply the look-up values
-          - thresholdField supplies the values beyond which the injection is
-            permitted
+        - \c referenceField is the field used to supply the look-up values
+        - \c thresholdField supplies the values beyond which the injection is
+            permitted.
 
-    - limited to a user-supllied number of injections per injector location
+    \li limited to a user-supllied number of injections per injector location
 
 SourceFiles
     FieldActivatedInjection.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
index af958d45fa..b03a8b6617 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -28,19 +28,23 @@ Description
     Particle injection sources read from look-up table. Each row corresponds to
     an injection site.
 
+    \verbatim
     (
         (x y z) (u v w) d rho mDot   // injector 1
         (x y z) (u v w) d rho mDot   // injector 2
         ...
         (x y z) (u v w) d rho mDot   // injector N
     );
+    \endverbatim
 
     where:
-        x, y, z = global cartesian co-ordinates [m]
-        u, v, w = global cartesian velocity components [m/s]
-        d       = diameter [m]
-        rho     = density [kg/m3]
-        mDot    = mass flow rate [kg/m3]
+    \plaintable
+        x, y, z | global cartesian co-ordinates [m]
+        u, v, w | global cartesian velocity components [m/s]
+        d       | diameter [m]
+        rho     | density [kg/m3]
+        mDot    | mass flow rate [kg/m3]
+    \endplaintable
 
 SourceFiles
     KinematicLookupTableInjection.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index 2104a2b79c..715e362140 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -25,13 +25,16 @@ Class
     Foam::ManualInjection
 
 Description
-    Manual injection
-    - User specifies
-      - Total mass to inject
-      - Parcel positions in file \c positionsFile
-      - Initial parcel velocity
-    - Parcel diameters obtained by distribution model
-    - All parcels introduced at SOI
+    Manual injection.
+
+    \li User specifies:
+        - Total mass to inject
+        - Parcel positions in file \c positionsFile
+        - Initial parcel velocity
+
+    \li Parcel diameters obtained by distribution model
+
+    \li All parcels introduced at SOI
 
 SourceFiles
     ManualInjection.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
index 8f966b38af..6525f092e6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
@@ -25,17 +25,17 @@ Class
     Foam::PatchFlowRateInjection
 
 Description
-    Patch injection
-    - uses patch flow rate to determine concentration and velociy
+    Patch injection, by using patch flow rate to determine concentration and
+    velocity.
 
-    - User specifies
-      - Total mass to inject
-      - Name of patch
-      - Injection duration
-      - Injection target concentration/carrier volume flow rate
-    - Initial parcel velocity given by local flow velocity
-    - Parcel diameters obtained by distribution model
-    - Parcels injected randomly across the patch
+    \li User specifies
+        - Total mass to inject
+        - Name of patch
+        - Injection duration
+        - Injection target concentration/carrier volume flow rate
+    \li Initial parcel velocity given by local flow velocity
+    \li Parcel diameters obtained by distribution model
+    \li Parcels injected randomly across the patch
 
 SourceFiles
     PatchFlowRateInjection.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index 57fc5f371c..93f4c012d8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -25,15 +25,16 @@ Class
     Foam::PatchInjection
 
 Description
-    Patch injection
-    - User specifies
-      - Total mass to inject
-      - Name of patch
-      - Injection duration
-      - Initial parcel velocity
-      - Injection volume flow rate
-    - Parcel diameters obtained by distribution model
-    - Parcels injected randomly across the patch
+    Patch injection.
+
+    \li User specifies:
+        - Total mass to inject
+        - Name of patch
+        - Injection duration
+        - Initial parcel velocity
+        - Injection volume flow rate
+    \li Parcel diameters obtained by distribution model
+    \li Parcels injected randomly across the patch
 
 SourceFiles
     PatchInjection.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
index 007ed3132f..a5abf354a6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
@@ -26,18 +26,20 @@ Class
 
 Description
     Wall interaction model. Three choices:
-    - rebound - optionally specify elasticity and resitution coefficients
-    - stick   - particles assigined zero velocity
-    - escape  - remove particle from the domain
+
+    \li \c rebound - optionally specify elasticity and restitution coefficients
+    \li \c stick   - particles assigned zero velocity
+    \li \c escape  - remove particle from the domain
 
     Example usage:
-
-        StandardWallInteractionCoeffs
-        {
-            type        rebound; // stick, escape
-            e           1;       // optional - elasticity coeff
-            mu          0;       // optional - restitution coeff
-        }
+    \verbatim
+    StandardWallInteractionCoeffs
+    {
+        type        rebound; // stick, escape
+        e           1;       // optional - elasticity coeff
+        mu          0;       // optional - restitution coeff
+    }
+    \endverbatim
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H
index c0a0a5fcfe..a55351c162 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H
@@ -140,12 +140,13 @@ public:
             //- Highest distance of all features
             scalar maxDistance() const;
 
-            //- Find nearest point on nearest feature edge. Sets
-            //  - nearFeature: index of feature mesh
-            //  - nearInfo   : location on feature edge and edge index
-            //                 (note: not feature edge index but index into
-            //                  edges() directly)
-            //  - nearNormal : local feature edge normal
+            //- Find nearest point on nearest feature edge. Sets:
+            //
+            //    - nearFeature: index of feature mesh
+            //    - nearInfo   : location on feature edge and edge index
+            //        (note: not feature edge index but index into edges()
+            //        directly)
+            //    - nearNormal : local feature edge normal
             void findNearestEdge
             (
                 const pointField& samples,
@@ -155,12 +156,13 @@ public:
                 vectorField& nearNormal
             ) const;
 
-            //- Find nearest point on nearest region edge. Sets
-            //  - nearFeature: index of feature mesh
-            //  - nearInfo   : location on feature edge and edge index
-            //                 (note: not feature edge index but index into
-            //                  edges() directly)
-            //  - nearNormal : local feature edge normal
+            //- Find nearest point on nearest region edge. Sets:
+            //
+            //    - nearFeature: index of feature mesh
+            //    - nearInfo   : location on feature edge and edge index
+            //        (note: not feature edge index but index into edges()
+            //        directly)
+            //    - nearNormal : local feature edge normal
             void findNearestRegionEdge
             (
                 const pointField& samples,
@@ -170,11 +172,12 @@ public:
                 vectorField& nearNormal
             ) const;
 
-            //- Find nearest feature point. Sets
-            //  - nearFeature: index of feature mesh
-            //  - nearInfo   : location on feature point and point index.
-            //                 (note: not index into shapes().pointLabels() but
-            //                  index into points() directly)
+            //- Find nearest feature point. Sets:
+            //
+            //    - nearFeature: index of feature mesh
+            //    - nearInfo   : location on feature point and point index.
+            //        (note: not index into shapes().pointLabels() but index
+            //        into points() directly)
             void findNearestPoint
             (
                 const pointField& samples,
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H
index a9bd6a64a1..f6f646baa1 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H
@@ -60,11 +60,12 @@ public:
     // Public data types
 
         //- Enumeration defining the layer specification:
-        //  - first and total thickness specified
-        //  - first and expansion ratio specified
-        //  - final and total thickness specified
-        //  - final and expansion ratio specified
-        //  - total thickness and expansion ratio specified
+        //
+        //    - first and total thickness specified
+        //    - first and expansion ratio specified
+        //    - final and total thickness specified
+        //    - final and expansion ratio specified
+        //    - total thickness and expansion ratio specified
         enum layerSpecification
         {
             ILLEGAL,
@@ -166,11 +167,12 @@ public:
 
         // Per patch information
 
-            //- How many layers to add.
-            //  -1 : no specification. Assume 0 layers but allow sliding
-            //       to make layers
-            //   0 : specified to have 0 layers. No sliding allowed.
-            //  >0 : number of layers
+            //- How many layers to add:
+            //
+            //    - -1 : no specification. Assume 0 layers but allow sliding
+            //        to make layers
+            //    - 0 : specified to have 0 layers. No sliding allowed.
+            //    - >0 : number of layers
             const labelList& numLayers() const
             {
                 return numLayers_;
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
index 0b24b4abc9..2d460a1095 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
@@ -37,14 +37,17 @@ Description
     - the rotation angles are in degrees, unless otherwise explictly specified:
 
     \verbatim
-        coordinateRotation
-        {
-            type        EulerRotation
-            degrees     false;
-            rotation    (0 0 3.141592654);
-        }
+    coordinateRotation
+    {
+        type        EulerRotation;
+        degrees     false;
+        rotation    (0 0 3.141592654);
+    }
     \endverbatim
 
+SourceFiles
+    EulerCoordinateRotation.C
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef EulerCoordinateRotation_H
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
index e50de63228..69817341f3 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
@@ -34,14 +34,17 @@ Description
     - the rotation angles are in degrees, unless otherwise explictly specified:
 
     \verbatim
-        coordinateRotation
-        {
-            type        STARCDRotation;
-            degrees     false;
-            rotation    (0 0 3.141592654);
-        }
+    coordinateRotation
+    {
+        type        STARCDRotation;
+        degrees     false;
+        rotation    (0 0 3.141592654);
+    }
     \endverbatim
 
+SourceFiles
+    STARCDCoordinateRotation.C
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef STARCDCoordinateRotation_H
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H
index 1254a474d3..945a728cc0 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H
@@ -28,17 +28,21 @@ Description
     A coordinate rotation specified using global axis
 
     The rotation is defined by a combination of vectors (e1/e2), (e2/e3)
-    or (e3/e1). Any nonorthogonality will be absorbed into the second vector.
+    or (e3/e1). Any nonorthogonality will be absorbed into the second
+    vector.
 
     \verbatim
-        axesRotation
-        {
-            type        axesRotation;
-            e1          (1 0 0);
-            e2          (0 1 0);
-        }
+    axesRotation
+    {
+        type        axesRotation;
+        e1          (1 0 0);
+        e2          (0 1 0);
+    }
     \endverbatim
 
+SourceFiles
+    axesRotation.C
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef axesRotation_H
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
index ae37a3764f..cfee8caf4a 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,21 +28,24 @@ Description
     Abstract base class for coordinate rotation
 
     \verbatim
-        coordinateRotation
-        {
-            type        axesRotation
-            e1          (1 0 0);
-            e2          (0 1 0);
-        }
+    coordinateRotation
+    {
+        type        axesRotation
+        e1          (1 0 0);
+        e2          (0 1 0);
+    }
     \endverbatim
 
     Types of coordinateRotation:
-    1) axesRotation
-    2) STARCDRotation
-    3) cylindrical
-    4) EulerCoordinateRotation
 
+    \li 1. axesRotation
+    \li 2. STARCDRotation
+    \li 3. cylindrical
+    \li 4. EulerCoordinateRotation
 
+SourceFiles
+    coordinateRotation.C
+    coordinateRotationNew.C
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
index 8c571ff4ae..0a846ad001 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
@@ -28,20 +28,22 @@ Description
     A local coordinate rotation.
     The cell based rotational field can be created in two ways:
 
-    1)  Each rotational tensor is defined with two vectors (dir and e3)
-        where dir =  cellC - origin and e3 is the rotation axis.
+    \li 1. Each rotational tensor is defined with two vectors (\c dir and \c e3)
+        where <tt>dir =  cellC - origin</tt> and \c e3 is the rotation axis.
         Per each cell an axesRotation type of rotation is created
-        (cylindrical coordinates)
-
+        (cylindrical coordinates). For example:
         \verbatim
-            cylindrical
-            {
-                type        localAxes;
-                e3          (0 0 1);
-            }
+        cylindrical
+        {
+            type        localAxes;
+            e3          (0 0 1);
+        }
         \endverbatim
 
-    2) The rotational tensor field is provided at construction
+    \li 2. The rotational tensor field is provided at construction.
+
+SourceFiles
+    cylindrical.C
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.H b/src/meshTools/coordinateSystems/coordinateSystem.H
index 34579acf27..ab040f77dc 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.H
+++ b/src/meshTools/coordinateSystems/coordinateSystem.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,30 +30,29 @@ Description
     All systems are defined by an origin point and a co-ordinate rotation.
 
     \verbatim
-        coordinateSystem
+    coordinateSystem
+    {
+        type    cartesian;
+        origin  (0 0 0);
+        coordinateRotation
         {
-            type    cartesian;
-            origin  (0 0 0);
-            coordinateRotation
-            {
-                type        cylindrical;
-                e3          (0 0 1);
-            }
+            type        cylindrical;
+            e3          (0 0 1);
         }
+    }
     \endverbatim
 
     Types of coordinateRotation:
-    1) axesRotation
-    2) STARCDRotation
-    3) cylindrical
-    4) EulerCoordinateRotation
+
+    \li 1. axesRotation
+    \li 2. STARCDRotation
+    \li 3. cylindrical
+    \li 4. EulerCoordinateRotation
 
     Type of co-ordinates:
-    1) cartesian
 
+    \li 1. cartesian
 
-See Also
-    coordinateSystem and coordinateSystem::New
 
 SourceFiles
     coordinateSystem.C
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
index 173de6e80a..a9419bb8f5 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
@@ -29,6 +29,7 @@ Description
     centres and processors they're on.
 
     If constructed from dictionary:
+    \verbatim
         // Region to sample (default is region0)
         sampleRegion region0;
 
@@ -63,8 +64,9 @@ Description
         // According to offsetMode (see above) supply one of
         // offset, offsets or distance
         offset  (1 0 0);
+    \endverbatim
 
-    Note: if offsetMode is 'normal' it uses outwards pointing normals. So
+    Note: if offsetMode is \c normal it uses outwards pointing normals. So
     supply a negative distance if sampling inside the domain.
 
 
@@ -218,9 +220,10 @@ protected:
         // Derived information
 
             //- Communication schedule:
-            //  - Cells/faces to sample per processor
-            //  - Patch faces to receive per processor
-            //  - schedule
+            //
+            //    - Cells/faces to sample per processor
+            //    - Patch faces to receive per processor
+            //    - schedule
             mutable autoPtr<mapDistribute> mapPtr_;
 
 
diff --git a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H
index df1721a694..d9591b4d55 100644
--- a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H
+++ b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,16 +26,21 @@ Class
 
 Description
     Contains information about location on a triSurface:
-    - pointIndexHit:
+
+    \li pointIndexHit:
         - location
         - bool: hit/miss
         - index (of triangle/point/edge)
-    - elementType():
+
+    \li elementType():
         - what index above relates to. In triangle::proxType
-    - triangle():
+
+    \li triangle():
         - last known triangle
 
+
 SourceFiles
+    surfaceLocation.C
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
index 8785424569..a4fd4dec63 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
@@ -31,12 +31,13 @@ Description
     This function object allows specification of different writing frequency
     of objects registered to the database. It has similar functionality
     as the main time database through the outputControl setting:
-        timeStep
-        outputTime
-        adjustableTime
-        runTime
-        clockTime
-        cpuTime
+
+    \li \c timeStep
+    \li \c outputTime
+    \li \c adjustableTime
+    \li \c runTime
+    \li \c clockTime
+    \li \c cpuTime
 
     Example of function object specification:
     \verbatim
@@ -58,7 +59,7 @@ Description
         exclusiveWriting    | Takes over object writing | no | yes
     \endtable
 
-    exclusiveWriting disables automatic writing (i.e through database) of the
+    \c exclusiveWriting disables automatic writing (i.e through database) of the
     objects to avoid duplicate writing.
 
 SeeAlso
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
index 386d1ba330..af37dc1cbc 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
@@ -32,9 +32,11 @@ Description
     further manipulation.
 
     Fields are stored as copies of the original, with the prefix
-    "tubulenceModel:", e.g.
+    "tubulenceModel:", e.g.:
 
-        turbulenceModel:R
+    \verbatim
+    turbulenceModel:R
+    \endverbatim
 
     Example of function object specification:
     \verbatim
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
index 3bbdeb8491..16f7e9ff6b 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,52 +22,57 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::compressible::
-        filmPyrolysisRadiativeCoupledMixedFvPatchScalarField
+    Foam::filmPyrolysisRadiativeCoupledMixedFvPatchScalarField
 
 Description
     Mixed boundary condition for temperature, to be used in the flow and
     pyrolysis regions when a film region model is used.
 
-
     Example usage:
-        myInterfacePatchName
-        {
-            type            filmPyrolysisRadiativeCoupledMixed;
-            Tnbr            T;
-            kappa           fluidThermo;
-            Qr              Qr;
-            kappaName       none;
-            filmDeltaDry    0.0;
-            filmDeltaWet    3e-4;
-            value           $internalField;
-        }
+    \verbatim
+    myInterfacePatchName
+    {
+        type            filmPyrolysisRadiativeCoupledMixed;
+        Tnbr            T;
+        kappa           fluidThermo;
+        Qr              Qr;
+        kappaName       none;
+        filmDeltaDry    0.0;
+        filmDeltaWet    3e-4;
+        value           $internalField;
+    }
+    \endverbatim
 
     Needs to be on underlying mapped(Wall)FvPatch.
-    It calculates local field as
-         ratio = (filmDelta - filmDeltaDry)/(filmDeltaWet - filmDeltaDry),
+    It calculates local field as:
 
-    when ratio = 1 is considered wet and the film temperarture is fixed at
+    \verbatim
+        ratio = (filmDelta - filmDeltaDry)/(filmDeltaWet - filmDeltaDry)
+    \endverbatim
+
+    when ratio = 1 is considered wet and the film temperature is fixed at
     the wall. If ratio = 0 (dry) it emulates the normal radiative solid BC.
 
     In between ratio 0 and 1 the gradient and value contributions are
-    weighted using the ratio field in the followig way:
+    weighted using the ratio field in the following way:
 
-    qConv = ratio*htcwfilm*(Tfilm - *this);
-    qRad = (1.0 - ratio)*Qr;
+    \verbatim
+        qConv = ratio*htcwfilm*(Tfilm - *this);
+        qRad = (1.0 - ratio)*Qr;
+    \endverbatim
 
     Then the solid can gain or loose energy through radiation or conduction
     towards the film.
 
-    Note: kappa : heat conduction at patch.
-        Gets supplied how to lookup/calculate kappa:
-    - 'lookup' : lookup volScalarField (or volSymmTensorField) with name
-    - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate K
-    - 'solidThermo' : use basicSolidThermo K()
+    Notes:
 
-    Qr is the radiative flux defined in the radiation model.
+    \li \c kappa and \c kappaName are inherited from temperatureCoupledBase.
+    \li \c Qr is the radiative flux defined in the radiation model.
 
 
+SeeAlso
+    Foam::temperatureCoupledBase
+
 SourceFiles
     filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
 
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.H b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.H
index bbcad6707c..84c7932d72 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.H
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,14 +35,14 @@ Description
 
     Example of the boundary condition specification:
     \verbatim
-        myPatch
-        {
-            type            filmPyrolysisTemperatureCoupled;
-            phi             phi;      // name of flux field (default = phi)
-            rho             rho;      // name of density field (default = rho)
-            deltaWet        1e-4;     // threshold height for 'wet' film
-            value           uniform   300; // initial temperature / [K]
-        }
+    myPatch
+    {
+        type            filmPyrolysisTemperatureCoupled;
+        phi             phi;      // name of flux field (default = phi)
+        rho             rho;      // name of density field (default = rho)
+        deltaWet        1e-4;     // threshold height for 'wet' film
+        value           uniform   300; // initial temperature / [K]
+    }
     \endverbatim
 
 SourceFiles
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.H b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.H
index 916cf8a270..f4566b2325 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.H
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,14 +35,14 @@ Description
 
     Example of the boundary condition specification:
     \verbatim
-        myPatch
-        {
-            type            filmPyrolysisVelocityCoupled;
-            phi             phi;      // name of flux field (default = phi)
-            rho             rho;      // name of density field (default = rho)
-            deltaWet        1e-4;     // threshold height for 'wet' film
-            value           uniform   (0 0 0); // initial velocity / [m/s]
-        }
+    myPatch
+    {
+        type            filmPyrolysisVelocityCoupled;
+        phi             phi;      // name of flux field (default = phi)
+        rho             rho;      // name of density field (default = rho)
+        deltaWet        1e-4;     // threshold height for 'wet' film
+        value           uniform   (0 0 0); // initial velocity / [m/s]
+    }
     \endverbatim
 
 SourceFiles
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H
index 0e49627d13..1e1bc813f8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::patchInjection
+    Foam::regionModels::surfaceFilmModels::patchInjection
 
 Description
     Remove and inject the mass in the film as it passes over the selected
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
index 1cfeeb7488..389672e74f 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermalBaffleFvPatchScalarField
+    Foam::compressible::thermalBaffleFvPatchScalarField
 
 Group
     grpThermoBoundaryConditions
@@ -30,16 +30,18 @@ Group
 Description
     This boundary condition provides a coupled temperature condition between
     multiple mesh regions.  The regions are generally referred to as the:
-    - primary region, and
-    - baffle region
+
+    \li primary region,
+    \li and baffle region.
 
     The primary region creates the baffle region and evolves its energy
     equation either:
+
     - 1-D, normal to each patch face
     - 2-D, normal and tangential components
 
     The thermodynamic properties of the baffle material are specified via
-    dictionary entries on the master patch
+    dictionary entries on the master patch.
 
     \heading Patch usage
     Example of the boundary condition specification:
@@ -116,7 +118,7 @@ Description
     }
     \endverbatim
 
-    /- Slave patch on primary region
+    \li Slave patch on primary region
     \verbatim
     myPatch_slave
     {
@@ -127,7 +129,7 @@ Description
     \endverbatim
 
 
-    /- Patches on baffle region
+    \li Patches on baffle region
     \verbatim
     bottom
     {
@@ -148,7 +150,7 @@ Description
 
 
 SeeAlso
-    Foam::turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+    Foam::compressible::turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
     Foam::regionModels::thermalBaffleModels::thermalBaffleModel
 
 SourceFiles
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
index 95f51483fc..550868bf45 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,30 +35,25 @@ Description
 
     The essential entry "limit" controls the gradient of alpha1 on the wall:
 
-    limit none;         // Calculate the gradient from the contact-angle without
-                        // limiter
-
-    limit gradient;     // Limit the wall-gradient such that alpha1 remains
-                        // bounded on the wall
-
-    limit alpha;        // Bound the calculated alpha1 on the wall
-
-    limit zeroGradient; // Set the gradient of alpha1 to 0 on the wall
-                        // i.e. reproduce previous behaviour
+    \li \c none - Calculate the gradient from the contact-angle without limiter
+    \li \c gradient - Limit the wall-gradient such that alpha1 remains bounded
+        on the wall
+    \li \c alpha - Bound the calculated alpha1 on the wall
+    \li \c zeroGradient - Set the gradient of alpha1 to 0 on the wall, i.e.
+        reproduce previous behaviour, the pressure BCs can be left as before.
 
     Note that if any of the first three options are used the boundary condition
-    on p_rgh must set to guarantee that the flux is corrected to be zero at the
-    wall e.g.
+    on \c p_rgh must set to guarantee that the flux is corrected to be zero at
+    the wall e.g.:
 
     \verbatim
     myPatch
     {
         type            alphaContactAngle;
+        limit           none;
     }
     \endverbatim
 
-    If "limit zeroGradient;" is used the pressure BCs can be left as before.
-
 SourceFiles
     alphaContactAngleFvPatchScalarField.C
 

From 4f262eb3a253732bc5ba2ff7921bbdf24c5e7607 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 14 Mar 2016 15:36:42 +0000
Subject: [PATCH 275/447] VectorSpace: Changes loop logic to avoid warning from
 gcc-4.5

---
 src/OpenFOAM/primitives/VectorSpace/VectorSpace.C | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
index 4129c50262..baba05c6ec 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
@@ -60,14 +60,14 @@ Foam::word Foam::name
 {
     std::ostringstream buf;
 
-    buf << '(';
+    buf << '(' << vs.v_[0];
 
-    for (direction i=0; i<Ncmpts-1; i++)
+    for (direction i=1; i<Ncmpts; i++)
     {
-        buf << vs.v_[i] << ',';
+        buf << ',' << vs.v_[i];
     }
 
-    buf << vs.v_[Ncmpts-1] << ')';
+    buf << ')';
 
     return buf.str();
 }

From fa5867137d24c10fe7b9d368f729799563d6d6e5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 14 Mar 2016 16:40:35 +0000
Subject: [PATCH 276/447] transformPoints, surfaceTransformPoints: Updated
 quaternion construction from Euler-angles Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2024

---
 .../mesh/manipulation/transformPoints/transformPoints.C       | 4 ++--
 .../surface/surfaceTransformPoints/surfaceTransformPoints.C   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index aa946b1e56..2fa9ff457e 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -256,7 +256,7 @@ int main(int argc, char *argv[])
         // Convert to radians
         v *= pi/180.0;
 
-        quaternion R(v.x(), v.y(), v.z());
+        quaternion R(quaternion::rotationSequence::XYZ, v);
 
         Info<< "Rotating points by quaternion " << R << endl;
         points = transform(R, points);
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index e4653d1d61..3dcc86b9a9 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
         // Convert to radians
         v *= pi/180.0;
 
-        quaternion R(v.x(), v.y(), v.z());
+        quaternion R(quaternion::rotationSequence::XYZ, v);
 
         Info<< "Rotating points by quaternion " << R << endl;
         points = transform(R, points);

From ffa9d235ea718ad3d43ee0ab40aab9247fe83686 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 15 Mar 2016 15:13:41 +0000
Subject: [PATCH 277/447] RowVector: New 3D row-vector class derived from
 MatrixSpace

The transpose '.T()' of a RowVector returns a Vector and vice versa.
---
 src/OpenFOAM/primitives/RowVector/RowVector.H | 135 ++++++++++++++++++
 .../primitives/RowVector/RowVectorI.H         | 121 ++++++++++++++++
 2 files changed, 256 insertions(+)
 create mode 100644 src/OpenFOAM/primitives/RowVector/RowVector.H
 create mode 100644 src/OpenFOAM/primitives/RowVector/RowVectorI.H

diff --git a/src/OpenFOAM/primitives/RowVector/RowVector.H b/src/OpenFOAM/primitives/RowVector/RowVector.H
new file mode 100644
index 0000000000..1c2005cb35
--- /dev/null
+++ b/src/OpenFOAM/primitives/RowVector/RowVector.H
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RowVector
+
+Description
+    Templated 3D row-vector derived from MatrixSpace adding construction from
+    3 components and element access using x(), y() and z().
+
+SourceFiles
+    RowVectorI.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RowVector_H
+#define RowVector_H
+
+#include "MatrixSpace.H"
+#include "Vector.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class RowVector Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Cmpt>
+class RowVector
+:
+    public MatrixSpace<RowVector<Cmpt>, Cmpt, 1, 3>
+{
+
+public:
+
+    //- Equivalent type of labels used for valid component indexing
+    typedef RowVector<label> labelType;
+
+
+    //- Component labeling enumeration
+    enum components { X, Y, Z };
+
+
+    // Constructors
+
+        //- Construct null
+        inline RowVector();
+
+        //- Construct initialized to zero
+        inline explicit RowVector(const Foam::zero);
+
+        //- Construct given VectorSpace of the same rank
+        template<class Cmpt2>
+        inline RowVector(const MatrixSpace<RowVector<Cmpt2>, Cmpt2, 1, 3>&);
+
+        //- Construct given three components
+        inline RowVector(const Cmpt& rvx, const Cmpt& rvy, const Cmpt& rvz);
+
+        //- Construct from Istream
+        inline RowVector(Istream&);
+
+
+    // Member Functions
+
+        // Access
+
+            inline const Cmpt& x() const;
+            inline const Cmpt& y() const;
+            inline const Cmpt& z() const;
+
+            inline Cmpt& x();
+            inline Cmpt& y();
+            inline Cmpt& z();
+
+
+    // Member Operators
+
+        inline void operator=(const Foam::zero);
+};
+
+
+template<class Cmpt>
+class typeOfTranspose<Cmpt, Vector<Cmpt>>
+{
+public:
+
+    typedef RowVector<Cmpt> type;
+};
+
+
+template<class Cmpt>
+class typeOfTranspose<Cmpt, RowVector<Cmpt>>
+{
+public:
+
+    typedef Vector<Cmpt> type;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "RowVectorI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/RowVector/RowVectorI.H b/src/OpenFOAM/primitives/RowVector/RowVectorI.H
new file mode 100644
index 0000000000..dec007166f
--- /dev/null
+++ b/src/OpenFOAM/primitives/RowVector/RowVectorI.H
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline Foam::RowVector<Cmpt>::RowVector()
+{}
+
+
+template<class Cmpt>
+inline Foam::RowVector<Cmpt>::RowVector(const Foam::zero z)
+:
+    RowVector::msType(z)
+{}
+
+
+template<class Cmpt>
+template<class Cmpt2>
+inline Foam::RowVector<Cmpt>::RowVector
+(
+    const MatrixSpace<RowVector<Cmpt2>, Cmpt2, 1, 3>& ms
+)
+:
+    MatrixSpace<RowVector<Cmpt>, Cmpt, 1, 3>(ms)
+{}
+
+
+template<class Cmpt>
+inline Foam::RowVector<Cmpt>::RowVector
+(
+    const Cmpt& rvx,
+    const Cmpt& rvy,
+    const Cmpt& rvz
+)
+{
+    this->v_[X] = rvx;
+    this->v_[Y] = rvy;
+    this->v_[Z] = rvz;
+}
+
+
+template<class Cmpt>
+inline Foam::RowVector<Cmpt>::RowVector(Istream& is)
+:
+    MatrixSpace<RowVector<Cmpt>, Cmpt, 1, 3>(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline const Cmpt& Foam::RowVector<Cmpt>::x() const
+{
+    return this->v_[X];
+}
+
+template<class Cmpt>
+inline const Cmpt& Foam::RowVector<Cmpt>::y() const
+{
+    return this->v_[Y];
+}
+
+template<class Cmpt>
+inline const Cmpt& Foam::RowVector<Cmpt>::z() const
+{
+    return this->v_[Z];
+}
+
+
+template<class Cmpt>
+inline Cmpt& Foam::RowVector<Cmpt>::x()
+{
+    return this->v_[X];
+}
+
+template<class Cmpt>
+inline Cmpt& Foam::RowVector<Cmpt>::y()
+{
+    return this->v_[Y];
+}
+
+template<class Cmpt>
+inline Cmpt& Foam::RowVector<Cmpt>::z()
+{
+    return this->v_[Z];
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline void Foam::RowVector<Cmpt>::operator=(const Foam::zero z)
+{
+    RowVector::msType::operator=(z);
+}
+
+
+// ************************************************************************* //

From 662f123ad8ac1b642f068b904c23e8823febb679 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 15 Mar 2016 18:14:03 +0000
Subject: [PATCH 278/447] src/OpenFOAM/primitives/spatialVectorAlgebra: New
 classes to support spatial vector algebra

Based on definitions in chapter 2 of the book:
    Featherstone, R. (2008).
    Rigid body dynamics algorithms.
    Springer.

This work is sponsored by Carnegie Wave Energy Ltd
---
 src/OpenFOAM/Make/files                       |   5 +
 .../CompactSpatialTensor.H                    | 144 ++++++++++++++
 .../CompactSpatialTensorI.H                   | 106 +++++++++++
 .../compactSpatialTensor.C                    |  84 +++++++++
 .../compactSpatialTensor.H                    |  62 ++++++
 .../CompactSpatialTensorT.H                   | 176 ++++++++++++++++++
 .../CompactSpatialTensorTI.H                  | 106 +++++++++++
 .../SpatialTensor/SpatialTensor.H             | 176 ++++++++++++++++++
 .../SpatialTensor/SpatialTensorI.H            | 132 +++++++++++++
 .../spatialTensor/spatialTensor.C             |  88 +++++++++
 .../spatialTensor/spatialTensor.H             |  62 ++++++
 .../SpatialVector/SpatialVector.H             | 131 +++++++++++++
 .../SpatialVector/SpatialVectorI.H            | 117 ++++++++++++
 .../spatialVector/spatialVector.C             |  79 ++++++++
 .../spatialVector/spatialVector.H             |  62 ++++++
 15 files changed, 1530 insertions(+)
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/compactSpatialTensor/compactSpatialTensor.C
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/compactSpatialTensor/compactSpatialTensor.H
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.H
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.C
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.H

diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index ebe063819e..056517f409 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -107,6 +107,11 @@ $(ranges)/labelRange/labelRanges.C
 $(ranges)/scalarRange/scalarRange.C
 $(ranges)/scalarRange/scalarRanges.C
 
+spatialVectorAlgebra = primitives/spatialVectorAlgebra
+$(spatialVectorAlgebra)/SpatialVector/spatialVector/spatialVector.C
+$(spatialVectorAlgebra)/SpatialTensor/spatialTensor/spatialTensor.C
+$(spatialVectorAlgebra)/CompactSpatialTensor/compactSpatialTensor/compactSpatialTensor.C
+
 containers/HashTables/HashTable/HashTableCore.C
 containers/HashTables/StaticHashTable/StaticHashTableCore.C
 containers/Lists/SortableList/ParSortableListName.C
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H
new file mode 100644
index 0000000000..fa2b14f6c9
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::CompactSpatialTensor
+
+Description
+    Templated 3D compact spatial tensor derived from MatrixSpace used to
+    represent transformations of spatial vectors and the angular and linear
+    inertia of rigid bodies.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+    \endverbatim
+
+SourceFiles
+    CompactSpatialTensorI.H
+
+SeeAlso
+    Foam::MatrixSpace
+    Foam::SpatialTensor
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CompactSpatialTensor_H
+#define CompactSpatialTensor_H
+
+#include "SpatialTensor.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class CompactSpatialTensor Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Cmpt>
+class CompactSpatialTensor
+:
+    public MatrixSpace<CompactSpatialTensor<Cmpt>, Cmpt, 6, 3>
+{
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline CompactSpatialTensor();
+
+        inline explicit CompactSpatialTensor(const Foam::zero);
+
+        //- Construct given MatrixSpace of the same rank
+        inline CompactSpatialTensor
+        (
+            const typename CompactSpatialTensor::msType&
+        );
+
+        //- Construct given 18 components
+        inline CompactSpatialTensor
+        (
+            const Cmpt& t00, const Cmpt& t01, const Cmpt& t02,
+            const Cmpt& t10, const Cmpt& t11, const Cmpt& t12,
+            const Cmpt& t20, const Cmpt& t21, const Cmpt& t22,
+            const Cmpt& t30, const Cmpt& t31, const Cmpt& t32,
+            const Cmpt& t40, const Cmpt& t41, const Cmpt& t42,
+            const Cmpt& t50, const Cmpt& t51, const Cmpt& t52
+        );
+
+        //- Construct from Istream
+        inline CompactSpatialTensor(Istream&);
+
+
+    // Member Operators
+
+        inline void operator=(const Foam::zero);
+};
+
+
+template<class Cmpt>
+class typeOfInnerProduct<Cmpt, CompactSpatialTensor<Cmpt>, Tensor<Cmpt>>
+{
+public:
+
+    typedef CompactSpatialTensor<Cmpt> type;
+};
+
+
+template<class Cmpt>
+class typeOfInnerProduct<Cmpt, CompactSpatialTensor<Cmpt>, Vector<Cmpt>>
+{
+public:
+
+    typedef SpatialVector<Cmpt> type;
+};
+
+
+template<class Cmpt>
+class typeOfInnerProduct<Cmpt, SpatialTensor<Cmpt>, CompactSpatialTensor<Cmpt>>
+{
+public:
+
+    typedef CompactSpatialTensor<Cmpt> type;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Include inline implementations
+#include "CompactSpatialTensorI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H
new file mode 100644
index 0000000000..c01ed49c7f
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline Foam::CompactSpatialTensor<Cmpt>::CompactSpatialTensor()
+{}
+
+
+template<class Cmpt>
+inline Foam::CompactSpatialTensor<Cmpt>::CompactSpatialTensor
+(
+    const Foam::zero z
+)
+:
+    CompactSpatialTensor::msType(z)
+{}
+
+
+template<class Cmpt>
+inline Foam::CompactSpatialTensor<Cmpt>::CompactSpatialTensor
+(
+    const typename CompactSpatialTensor::msType& ms
+)
+:
+    CompactSpatialTensor::msType(ms)
+{}
+
+
+template<class Cmpt>
+inline Foam::CompactSpatialTensor<Cmpt>::CompactSpatialTensor
+(
+    const Cmpt& t00, const Cmpt& t01, const Cmpt& t02,
+    const Cmpt& t10, const Cmpt& t11, const Cmpt& t12,
+    const Cmpt& t20, const Cmpt& t21, const Cmpt& t22,
+    const Cmpt& t30, const Cmpt& t31, const Cmpt& t32,
+    const Cmpt& t40, const Cmpt& t41, const Cmpt& t42,
+    const Cmpt& t50, const Cmpt& t51, const Cmpt& t52
+)
+{
+    this->v_[0] = t00;
+    this->v_[1] = t01;
+    this->v_[2] = t02;
+
+    this->v_[6 + 0] = t10;
+    this->v_[6 + 1] = t11;
+    this->v_[6 + 2] = t12;
+
+    this->v_[12 + 0] = t20;
+    this->v_[12 + 1] = t21;
+    this->v_[12 + 2] = t22;
+
+    this->v_[18 + 0] = t30;
+    this->v_[18 + 1] = t31;
+    this->v_[18 + 2] = t32;
+
+    this->v_[24 + 0] = t40;
+    this->v_[24 + 1] = t41;
+    this->v_[24 + 2] = t42;
+
+    this->v_[30 + 0] = t50;
+    this->v_[30 + 1] = t51;
+    this->v_[30 + 2] = t52;
+}
+
+
+template<class Cmpt>
+inline Foam::CompactSpatialTensor<Cmpt>::CompactSpatialTensor(Istream& is)
+:
+    CompactSpatialTensor::msType(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline void Foam::CompactSpatialTensor<Cmpt>::operator=(const Foam::zero z)
+{
+    CompactSpatialTensor::msType::operator=(z);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/compactSpatialTensor/compactSpatialTensor.C b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/compactSpatialTensor/compactSpatialTensor.C
new file mode 100644
index 0000000000..8004cd0347
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/compactSpatialTensor/compactSpatialTensor.C
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "compactSpatialTensor.H"
+#include "CompactSpatialTensorT.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<>
+const char* const Foam::compactSpatialTensor::vsType::typeName =
+    "compactSpatialTensor";
+
+template<>
+const char* const Foam::compactSpatialTensor::vsType::componentNames[] =
+{
+    "Exx",  "Exy",  "Exz",
+    "Eyx",  "Eyy",  "Eyz",
+    "Ezx",  "Ezy",  "Ezz",
+
+    "Erxx", "Erxy", "Erxz",
+    "Eryx", "Eryy", "Eryz",
+    "Erzx", "Erzy", "Erzz",
+};
+
+template<>
+const Foam::compactSpatialTensor Foam::compactSpatialTensor::vsType::zero
+(
+    Foam::compactSpatialTensor::uniform(0)
+);
+
+template<>
+const Foam::compactSpatialTensor Foam::compactSpatialTensor::vsType::one
+(
+    compactSpatialTensor::uniform(1)
+);
+
+template<>
+const Foam::compactSpatialTensor Foam::compactSpatialTensor::vsType::max
+(
+    compactSpatialTensor::uniform(VGREAT)
+);
+
+template<>
+const Foam::compactSpatialTensor Foam::compactSpatialTensor::vsType::min
+(
+    compactSpatialTensor::uniform(-VGREAT)
+);
+
+template<>
+const Foam::compactSpatialTensor Foam::compactSpatialTensor::vsType::rootMax
+(
+    compactSpatialTensor::uniform(ROOTVGREAT)
+);
+
+template<>
+const Foam::compactSpatialTensor Foam::compactSpatialTensor::vsType::rootMin
+(
+    compactSpatialTensor::uniform(-ROOTVGREAT)
+);
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/compactSpatialTensor/compactSpatialTensor.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/compactSpatialTensor/compactSpatialTensor.H
new file mode 100644
index 0000000000..fac906e11a
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/compactSpatialTensor/compactSpatialTensor.H
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::compactSpatialTensor
+
+Description
+    CompactSpatialTensor of scalars.
+
+SourceFiles
+    CompactSpatialTensor.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compactSpatialTensor_H
+#define compactSpatialTensor_H
+
+#include "CompactSpatialTensor.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef CompactSpatialTensor<scalar> compactSpatialTensor;
+
+//- Data associated with compactSpatialTensor type are contiguous
+template<>
+inline bool contiguous<compactSpatialTensor>() {return true;}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H
new file mode 100644
index 0000000000..eedc364357
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H
@@ -0,0 +1,176 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::CompactSpatialTensorT
+
+Description
+    Templated 3D transposed compact spatial tensor derived from MatrixSpace
+    used to represent transformations of spatial vectors of rigid bodies.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+    \endverbatim
+
+SourceFiles
+    CompactSpatialTensorTI.H
+
+SeeAlso
+    Foam::MatrixSpace
+    Foam::CompactSpatialTensor
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CompactSpatialTensorT_H
+#define CompactSpatialTensorT_H
+
+#include "CompactSpatialTensor.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class CompactSpatialTensor Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Cmpt>
+class CompactSpatialTensorT
+:
+    public MatrixSpace<CompactSpatialTensorT<Cmpt>, Cmpt, 3, 6>
+{
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline CompactSpatialTensorT();
+
+        inline explicit CompactSpatialTensorT(const Foam::zero);
+
+        //- Construct given MatrixSpace of the same rank
+        inline CompactSpatialTensorT
+        (
+            const typename CompactSpatialTensorT::msType&
+        );
+
+        //- Construct given 18 components
+        inline CompactSpatialTensorT
+        (
+            const Cmpt& t00, const Cmpt& t01, const Cmpt& t02,
+            const Cmpt& t10, const Cmpt& t11, const Cmpt& t12,
+            const Cmpt& t20, const Cmpt& t21, const Cmpt& t22,
+            const Cmpt& t30, const Cmpt& t31, const Cmpt& t32,
+            const Cmpt& t40, const Cmpt& t41, const Cmpt& t42,
+            const Cmpt& t50, const Cmpt& t51, const Cmpt& t52
+        );
+
+        //- Construct from Istream
+        inline CompactSpatialTensorT(Istream&);
+
+
+    // Member Operators
+
+        inline void operator=(const Foam::zero);
+};
+
+
+template<class Cmpt>
+class typeOfTranspose<Cmpt, CompactSpatialTensor<Cmpt>>
+{
+public:
+
+    typedef CompactSpatialTensorT<Cmpt> type;
+};
+
+
+template<class Cmpt>
+class typeOfTranspose<Cmpt, CompactSpatialTensorT<Cmpt>>
+{
+public:
+
+    typedef CompactSpatialTensor<Cmpt> type;
+};
+
+
+template<class Cmpt>
+class typeOfInnerProduct
+<
+    Cmpt,
+    CompactSpatialTensor<Cmpt>,
+    CompactSpatialTensorT<Cmpt>
+>
+{
+public:
+
+    typedef SpatialTensor<Cmpt> type;
+};
+
+
+template<class Cmpt>
+class typeOfInnerProduct
+<
+    Cmpt,
+    CompactSpatialTensorT<Cmpt>,
+    CompactSpatialTensor<Cmpt>
+>
+{
+public:
+
+    typedef Tensor<Cmpt> type;
+};
+
+
+template<class Cmpt>
+class typeOfInnerProduct
+<
+    Cmpt,
+    CompactSpatialTensorT<Cmpt>,
+    SpatialVector<Cmpt>
+>
+{
+public:
+
+    typedef Vector<Cmpt> type;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Include inline implementations
+#include "CompactSpatialTensorTI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H
new file mode 100644
index 0000000000..d76f077fde
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline Foam::CompactSpatialTensorT<Cmpt>::CompactSpatialTensorT()
+{}
+
+
+template<class Cmpt>
+inline Foam::CompactSpatialTensorT<Cmpt>::CompactSpatialTensorT
+(
+    const Foam::zero z
+)
+:
+    CompactSpatialTensorT::msType(z)
+{}
+
+
+template<class Cmpt>
+inline Foam::CompactSpatialTensorT<Cmpt>::CompactSpatialTensorT
+(
+    const typename CompactSpatialTensorT::msType& ms
+)
+:
+    CompactSpatialTensorT::msType(ms)
+{}
+
+
+template<class Cmpt>
+inline Foam::CompactSpatialTensorT<Cmpt>::CompactSpatialTensorT
+(
+    const Cmpt& t00, const Cmpt& t01, const Cmpt& t02,
+    const Cmpt& t10, const Cmpt& t11, const Cmpt& t12,
+    const Cmpt& t20, const Cmpt& t21, const Cmpt& t22,
+    const Cmpt& t30, const Cmpt& t31, const Cmpt& t32,
+    const Cmpt& t40, const Cmpt& t41, const Cmpt& t42,
+    const Cmpt& t50, const Cmpt& t51, const Cmpt& t52
+)
+{
+    this->v_[0] = t00;
+    this->v_[1] = t01;
+    this->v_[2] = t02;
+
+    this->v_[6 + 0] = t10;
+    this->v_[6 + 1] = t11;
+    this->v_[6 + 2] = t12;
+
+    this->v_[12 + 0] = t20;
+    this->v_[12 + 1] = t21;
+    this->v_[12 + 2] = t22;
+
+    this->v_[18 + 0] = t30;
+    this->v_[18 + 1] = t31;
+    this->v_[18 + 2] = t32;
+
+    this->v_[24 + 0] = t40;
+    this->v_[24 + 1] = t41;
+    this->v_[24 + 2] = t42;
+
+    this->v_[30 + 0] = t50;
+    this->v_[30 + 1] = t51;
+    this->v_[30 + 2] = t52;
+}
+
+
+template<class Cmpt>
+inline Foam::CompactSpatialTensorT<Cmpt>::CompactSpatialTensorT(Istream& is)
+:
+    CompactSpatialTensorT::msType(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline void Foam::CompactSpatialTensorT<Cmpt>::operator=(const Foam::zero z)
+{
+    CompactSpatialTensorT::msType::operator=(z);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
new file mode 100644
index 0000000000..e19d74094f
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
@@ -0,0 +1,176 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::SpatialTensor
+
+Description
+    Templated 3D spatial tensor derived from MatrixSpace used to represent
+    transformations of spatial vectors and the angular and linear inertia of
+    rigid bodies.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+    \endverbatim
+
+SourceFiles
+    SpatialTensorI.H
+
+SeeAlso
+    Foam::MatrixSpace
+    Foam::Tensor
+    Foam::SpatialVector
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SpatialTensor_H
+#define SpatialTensor_H
+
+#include "Tensor.H"
+#include "SpatialVector.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class SpatialTensor Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Cmpt>
+class SpatialTensor
+:
+    public MatrixSpace<SpatialTensor<Cmpt>, Cmpt, 6, 6>
+{
+
+public:
+
+    // Member constants
+
+        //- Rank of Tensor is 2
+        static const direction rank = 2;
+
+
+    // Static data members
+
+        //- Identity matrix for square matrices
+        static const SpatialTensor I;
+
+
+    // Constructors
+
+        //- Construct null
+        inline SpatialTensor();
+
+        //- Construct initialized to zero
+        inline explicit SpatialTensor(const Foam::zero);
+
+        //- Construct given MatrixSpace of the same rank
+        inline SpatialTensor(const typename SpatialTensor::msType&);
+
+        //- Construct given 36 components
+        inline SpatialTensor
+        (
+            const Cmpt& t00, const Cmpt& t01, const Cmpt& t02,
+            const Cmpt& t03, const Cmpt& t04, const Cmpt& t05,
+
+            const Cmpt& t10, const Cmpt& t11, const Cmpt& t12,
+            const Cmpt& t13, const Cmpt& t14, const Cmpt& t15,
+
+            const Cmpt& t20, const Cmpt& t21, const Cmpt& t22,
+            const Cmpt& t23, const Cmpt& t24, const Cmpt& t25,
+
+            const Cmpt& t30, const Cmpt& t31, const Cmpt& t32,
+            const Cmpt& t33, const Cmpt& t34, const Cmpt& t35,
+
+            const Cmpt& t40, const Cmpt& t41, const Cmpt& t42,
+            const Cmpt& t43, const Cmpt& t44, const Cmpt& t45,
+
+            const Cmpt& t50, const Cmpt& t51, const Cmpt& t52,
+            const Cmpt& t53, const Cmpt& t54, const Cmpt& t55
+        );
+
+        //- Construct from Istream
+        inline SpatialTensor(Istream&);
+
+
+    // Member Operators
+
+        inline void operator=(const Foam::zero);
+};
+
+
+template<class Cmpt>
+class typeOfTranspose<Cmpt, SpatialTensor<Cmpt>>
+{
+public:
+
+    typedef SpatialTensor<Cmpt> type;
+};
+
+
+template<class Cmpt>
+class typeOfOuterProduct<Cmpt, SpatialVector<Cmpt>, SpatialVector<Cmpt>>
+{
+public:
+
+    typedef SpatialTensor<Cmpt> type;
+};
+
+
+template<class Cmpt>
+class typeOfInnerProduct<Cmpt, SpatialTensor<Cmpt>, SpatialVector<Cmpt>>
+{
+public:
+
+    typedef SpatialVector<Cmpt> type;
+};
+
+
+template<class Cmpt>
+class typeOfInnerProduct<Cmpt, SpatialTensor<Cmpt>, SpatialTensor<Cmpt>>
+{
+public:
+
+    typedef SpatialTensor<Cmpt> type;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Include inline implementations
+#include "SpatialTensorI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
new file mode 100644
index 0000000000..2fd570e81b
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline Foam::SpatialTensor<Cmpt>::SpatialTensor()
+{}
+
+
+template<class Cmpt>
+inline Foam::SpatialTensor<Cmpt>::SpatialTensor(const Foam::zero z)
+:
+    SpatialTensor::msType(z)
+{}
+
+
+template<class Cmpt>
+inline Foam::SpatialTensor<Cmpt>::SpatialTensor
+(
+    const typename SpatialTensor::msType& ms
+)
+:
+    SpatialTensor::msType(ms)
+{}
+
+
+template<class Cmpt>
+inline Foam::SpatialTensor<Cmpt>::SpatialTensor
+(
+    const Cmpt& t00, const Cmpt& t01, const Cmpt& t02,
+    const Cmpt& t03, const Cmpt& t04, const Cmpt& t05,
+
+    const Cmpt& t10, const Cmpt& t11, const Cmpt& t12,
+    const Cmpt& t13, const Cmpt& t14, const Cmpt& t15,
+
+    const Cmpt& t20, const Cmpt& t21, const Cmpt& t22,
+    const Cmpt& t23, const Cmpt& t24, const Cmpt& t25,
+
+    const Cmpt& t30, const Cmpt& t31, const Cmpt& t32,
+    const Cmpt& t33, const Cmpt& t34, const Cmpt& t35,
+
+    const Cmpt& t40, const Cmpt& t41, const Cmpt& t42,
+    const Cmpt& t43, const Cmpt& t44, const Cmpt& t45,
+
+    const Cmpt& t50, const Cmpt& t51, const Cmpt& t52,
+    const Cmpt& t53, const Cmpt& t54, const Cmpt& t55
+)
+{
+    this->v_[0] = t00;
+    this->v_[1] = t01;
+    this->v_[2] = t02;
+    this->v_[3] = t03;
+    this->v_[4] = t04;
+    this->v_[5] = t05;
+
+    this->v_[6] = t10;
+    this->v_[7] = t11;
+    this->v_[8] = t12;
+    this->v_[9] = t13;
+    this->v_[10] = t14;
+    this->v_[11] = t15;
+
+    this->v_[12] = t20;
+    this->v_[13] = t21;
+    this->v_[14] = t22;
+    this->v_[15] = t23;
+    this->v_[16] = t24;
+    this->v_[17] = t25;
+
+    this->v_[18] = t30;
+    this->v_[19] = t31;
+    this->v_[20] = t32;
+    this->v_[21] = t33;
+    this->v_[22] = t34;
+    this->v_[23] = t35;
+
+    this->v_[24] = t40;
+    this->v_[25] = t41;
+    this->v_[26] = t42;
+    this->v_[27] = t43;
+    this->v_[28] = t44;
+    this->v_[29] = t45;
+
+    this->v_[30] = t50;
+    this->v_[31] = t51;
+    this->v_[32] = t52;
+    this->v_[33] = t53;
+    this->v_[34] = t54;
+    this->v_[35] = t55;
+}
+
+
+template<class Cmpt>
+inline Foam::SpatialTensor<Cmpt>::SpatialTensor(Istream& is)
+:
+    SpatialTensor::msType(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline void Foam::SpatialTensor<Cmpt>::operator=(const Foam::zero z)
+{
+    SpatialTensor::msType::operator=(z);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C
new file mode 100644
index 0000000000..191d6c34f3
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "spatialTensor.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<>
+const char* const Foam::spatialTensor::vsType::typeName = "spatialTensor";
+
+template<>
+const char* const Foam::spatialTensor::vsType::componentNames[] =
+{
+    "Exx",  "Exy",  "Exz",    "Erxx", "Erxy", "Erxz",
+    "Eyx",  "Eyy",  "Eyz",    "Eryx", "Eryy", "Eryz",
+    "Ezx",  "Ezy",  "Ezz",    "Erzx", "Erzy", "Erzz"
+
+    "Erxx", "Erxy", "Erxz",   "Exx",  "Exy",  "Exz",
+    "Eryx", "Eryy", "Eryz",   "Eyx",  "Eyy",  "Eyz",
+    "Erzx", "Erzy", "Erzz",   "Ezx",  "Ezy",  "Ezz"
+};
+
+template<>
+const Foam::spatialTensor Foam::spatialTensor::vsType::zero
+(
+    Foam::spatialTensor::uniform(0)
+);
+
+template<>
+const Foam::spatialTensor Foam::spatialTensor::vsType::one
+(
+    spatialTensor::uniform(1)
+);
+
+template<>
+const Foam::spatialTensor Foam::spatialTensor::vsType::max
+(
+    spatialTensor::uniform(VGREAT)
+);
+
+template<>
+const Foam::spatialTensor Foam::spatialTensor::vsType::min
+(
+    spatialTensor::uniform(-VGREAT)
+);
+
+template<>
+const Foam::spatialTensor Foam::spatialTensor::vsType::rootMax
+(
+    spatialTensor::uniform(ROOTVGREAT)
+);
+
+template<>
+const Foam::spatialTensor Foam::spatialTensor::vsType::rootMin
+(
+    spatialTensor::uniform(-ROOTVGREAT)
+);
+
+template<>
+const Foam::spatialTensor Foam::spatialTensor::I
+(
+    Foam::spatialTensor::identity()
+);
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.H
new file mode 100644
index 0000000000..bd44cb3862
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.H
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::spatialTensor
+
+Description
+    SpatialTensor of scalars.
+
+SourceFiles
+    spatialTensor.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef spatialTensor_H
+#define spatialTensor_H
+
+#include "SpatialTensor.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef SpatialTensor<scalar> spatialTensor;
+
+//- Data associated with spatialTensor type are contiguous
+template<>
+inline bool contiguous<spatialTensor>() {return true;}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
new file mode 100644
index 0000000000..19eb9ad1db
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::SpatialVector
+
+Description
+    Templated 3D spatial vector derived from VectorSpace used to represent the
+    anglular and linear components of position, velocity and acceleration of
+    rigid bodies.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+    \endverbatim
+
+SourceFiles
+    SpatialVectorI.H
+
+SeeAlso
+    Foam::VectorSpace
+    Foam::Vector
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SpatialVector_H
+#define SpatialVector_H
+
+#include "Vector.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class SpatialVector Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Cmpt>
+class SpatialVector
+:
+    public VectorSpace<SpatialVector<Cmpt>, Cmpt, 6>
+{
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline SpatialVector();
+
+        //- Construct initialized to zero
+        inline explicit SpatialVector(const Foam::zero);
+
+        //- Construct given VectorSpace of the same rank
+        inline SpatialVector(const typename SpatialVector::vsType&);
+
+        //- Construct from the angular and linear vector components
+        inline SpatialVector
+        (
+            const Vector<Cmpt>& angular,
+            const Vector<Cmpt>& linear
+        );
+
+        //- Construct given 6 components
+        inline SpatialVector
+        (
+            const Cmpt& v0,
+            const Cmpt& v1,
+            const Cmpt& v2,
+            const Cmpt& v3,
+            const Cmpt& v4,
+            const Cmpt& v5
+        );
+
+        //- Construct from Istream
+        inline SpatialVector(Istream&);
+
+
+    // Member Functions
+
+        //- Return the angular part of the spatial vector as a vector
+        inline Vector<Cmpt> angular() const;
+
+        //- Return the linear part of the spatial vector as a vector
+        inline Vector<Cmpt> linear() const;
+
+
+    // Member Operators
+
+        inline void operator=(const Foam::zero);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Include inline implementations
+#include "SpatialVectorI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
new file mode 100644
index 0000000000..af14d75301
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline Foam::SpatialVector<Cmpt>::SpatialVector()
+{}
+
+
+template<class Cmpt>
+inline Foam::SpatialVector<Cmpt>::SpatialVector(const Foam::zero z)
+:
+    SpatialVector::vsType(z)
+{}
+
+
+template<class Cmpt>
+inline Foam::SpatialVector<Cmpt>::SpatialVector
+(
+    const typename SpatialVector::vsType& vs
+)
+:
+    SpatialVector::vsType(vs)
+{}
+
+
+template<class Cmpt>
+inline Foam::SpatialVector<Cmpt>::SpatialVector
+(
+    const Vector<Cmpt>& angular,
+    const Vector<Cmpt>& linear
+)
+{
+    this->v_[0] = angular.x();
+    this->v_[1] = angular.y();
+    this->v_[2] = angular.z();
+    this->v_[3] = linear.x();
+    this->v_[4] = linear.y();
+    this->v_[5] = linear.z();
+}
+
+
+template<class Cmpt>
+inline Foam::SpatialVector<Cmpt>::SpatialVector
+(
+    const Cmpt& v0,
+    const Cmpt& v1,
+    const Cmpt& v2,
+    const Cmpt& v3,
+    const Cmpt& v4,
+    const Cmpt& v5
+)
+{
+    this->v_[0] = v0;
+    this->v_[1] = v1;
+    this->v_[2] = v2;
+    this->v_[3] = v3;
+    this->v_[4] = v4;
+    this->v_[5] = v5;
+}
+
+
+template<class Cmpt>
+inline Foam::SpatialVector<Cmpt>::SpatialVector(Istream& is)
+:
+    SpatialVector::vsType(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline Foam::Vector<Cmpt> Foam::SpatialVector<Cmpt>::angular() const
+{
+    return Vector<Cmpt>(this->v_[0], this->v_[1], this->v_[2]);
+}
+
+template<class Cmpt>
+inline Foam::Vector<Cmpt> Foam::SpatialVector<Cmpt>::linear() const
+{
+    return Vector<Cmpt>(this->v_[3], this->v_[4], this->v_[5]);
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline void Foam::SpatialVector<Cmpt>::operator=(const Foam::zero z)
+{
+    SpatialVector::vsType::operator=(z);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.C b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.C
new file mode 100644
index 0000000000..08d1d28b98
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.C
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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
+    SpatialVector of scalars.
+
+\*---------------------------------------------------------------------------*/
+
+#include "spatialVector.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<>
+const char* const Foam::spatialVector::vsType::typeName = "spatialVector";
+
+template<>
+const char* const Foam::spatialVector::vsType::componentNames[] =
+{
+    "x", "y", "z"
+};
+
+template<>
+const Foam::spatialVector Foam::spatialVector::vsType::zero
+(
+    Foam::spatialVector::uniform(0)
+);
+
+template<>
+const Foam::spatialVector Foam::spatialVector::vsType::one
+(
+    spatialVector::uniform(1)
+);
+
+template<>
+const Foam::spatialVector Foam::spatialVector::vsType::max
+(
+    spatialVector::uniform(VGREAT)
+);
+
+template<>
+const Foam::spatialVector Foam::spatialVector::vsType::min
+(
+    spatialVector::uniform(-VGREAT)
+);
+
+template<>
+const Foam::spatialVector Foam::spatialVector::vsType::rootMax
+(
+    spatialVector::uniform(ROOTVGREAT)
+);
+
+template<>
+const Foam::spatialVector Foam::spatialVector::vsType::rootMin
+(
+    spatialVector::uniform(-ROOTVGREAT)
+);
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.H
new file mode 100644
index 0000000000..8e6ae15380
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.H
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::spatialVector
+
+Description
+    SpatialVector of scalars.
+
+SourceFiles
+    spatialVector.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef spatialVector_H
+#define spatialVector_H
+
+#include "SpatialVector.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef SpatialVector<scalar> spatialVector;
+
+//- Data associated with spatialVector type are contiguous
+template<>
+inline bool contiguous<spatialVector>() {return true;}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 01cdde52b96ca65944b9e1d31bb2189cf00f8ebb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 15 Mar 2016 20:33:06 +0000
Subject: [PATCH 279/447] 
 driftFluxFoam/relativeVelocityModels/general/general:: Corrected construction
 of residualAlpha

---
 .../driftFluxFoam/relativeVelocityModels/general/general.C    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C
index f8a133b63e..6a7d86eed9 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ Foam::relativeVelocityModels::general::general
     a_("a", dimless, dict),
     a1_("a1", dimless, dict),
     V0_("V0", dimVelocity, dict),
-    residualAlpha_(dict.lookup("residualAlpha"))
+    residualAlpha_("residualAlpha", dimless, dict)
 {}
 
 

From d7d331f4716fef1a782b12e3fabe5935729931fb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 15 Mar 2016 22:36:56 +0000
Subject: [PATCH 280/447] MatrixSpace::Block: Added "dereference" operator for
 conversion to sub-tensor

---
 .../primitives/MatrixSpace/MatrixSpace.H      |  6 +++++
 .../primitives/MatrixSpace/MatrixSpaceI.H     | 22 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
index 1d7bcec20d..7d1b1186f4 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
@@ -117,6 +117,9 @@ public:
             //- Construct for the given matrix
             inline ConstBlock(const msType& matrix);
 
+            //- Construct and return the sub-ensor corresponding to this block
+            inline SubTensor operator()() const;
+
             //- (i, j) const element access operator
             inline const Cmpt& operator()
             (
@@ -178,6 +181,9 @@ public:
                 const VectorSpace<VSForm, Cmpt, SubTensor::nRows>& v
             );
 
+            //- Construct and return the sub-ensor corresponding to this block
+            inline SubTensor operator()() const;
+
             //- (i, j) const element access operator
             inline const Cmpt& operator()
             (
diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
index e8df098a94..a7afa55fdf 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
@@ -359,6 +359,17 @@ inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
 }
 
 
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
+inline SubTensor
+Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+ConstBlock<SubTensor, BRowStart, BColStart>::
+operator()() const
+{
+    return *this;
+}
+
+
 template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
 template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
 inline const Cmpt&
@@ -370,6 +381,17 @@ operator()(const direction i, const direction j) const
 }
 
 
+template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
+inline SubTensor
+Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Block<SubTensor, BRowStart, BColStart>::
+operator()() const
+{
+    return *this;
+}
+
+
 template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
 template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
 inline const Cmpt&

From 15300fc43182d1075248f1911a34451452d3a8ec Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 15 Mar 2016 22:37:48 +0000
Subject: [PATCH 281/447] lagrangian::StandardWallInteraction: accumulate
 escaping mass Do not set accumulated properties to 0 on output

Updates provided by Karl Meredith
---
 .../StandardWallInteraction/StandardWallInteraction.C  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
index 3b19a02acc..74c7aa3efd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,6 +124,7 @@ bool Foam::StandardWallInteraction<CloudType>::correct
                 active = false;
                 U = vector::zero;
                 nEscape_++;
+                massEscape_ += p.mass()*p.nParticle();
                 break;
             }
             case PatchInteractionModel<CloudType>::itStick:
@@ -201,16 +202,9 @@ void Foam::StandardWallInteraction<CloudType>::info(Ostream& os)
     if (this->outputTime())
     {
         this->setModelProperty("nEscape", npe);
-        nEscape_ = 0;
-
         this->setModelProperty("massEscape", mpe);
-        massEscape_ = 0.0;
-
         this->setModelProperty("nStick", nps);
-        nStick_ = 0;
-
         this->setModelProperty("massStick", mps);
-        massStick_ = 0.0;
     }
 }
 

From 2284dab8874b7ca73e0a93a65aa6d37cdc75bfd6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 16 Mar 2016 09:24:25 +0000
Subject: [PATCH 282/447] paraFoam: Updated instructions to build the reader
 modules Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=2027

---
 bin/paraFoam | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bin/paraFoam b/bin/paraFoam
index 0a6c152e64..84b82ecdbf 100755
--- a/bin/paraFoam
+++ b/bin/paraFoam
@@ -121,9 +121,6 @@ do
     esac
 done
 
-# Get the ParaView major version to select the appropriate readers
-version=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\).*$/\1/'`
-
 # Check that reader module has been built
 if [ $requirePV -eq 1 -a ! -f $PV_PLUGIN_PATH/libPVFoamReader_SM.so ]
 then
@@ -132,7 +129,7 @@ then
 FATAL ERROR: ParaView reader module libraries do not exist
 
 Please build the reader module before continuing:
-cd \$FOAM_UTILITIES/postProcessing/graphics/PV${version}Readers
+cd \$FOAM_UTILITIES/postProcessing/graphics/PVReaders
 ./Allwclean
 ./Allwmake
 

From 818d5450f8d24b69d827a1a3be1ca43ec9af7978 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 16 Mar 2016 15:34:57 +0000
Subject: [PATCH 283/447] thermoSingleLayer: Output the mean film temperature
 in addition to max and min

---
 .../surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index c4fc973d23..4ffc27c8d9 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -284,7 +284,7 @@ void thermoSingleLayer::solveEnergy()
       - hsSp_
       + q(hs_)
       + radiation_->Shs()
-//      - fvm::SuSp(rhoSp_, hs_)
+   // - fvm::SuSp(rhoSp_, hs_)
       - rhoSp_*hs_
     );
 
@@ -724,7 +724,9 @@ void thermoSingleLayer::info()
 
     const scalarField& Tinternal = T_.internalField();
 
-    Info<< indent << "min/max(T)         = " << gMin(Tinternal) << ", "
+    Info<< indent << "min/mean/max(T)    = "
+        << gMin(Tinternal) << ", "
+        << gAverage(Tinternal) << ", "
         << gMax(Tinternal) << nl;
 
     phaseChange_->info(Info);

From 665f5243b1dd85f3dd2d9be55724e42a29235ff4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Mar 2016 08:05:08 +0000
Subject: [PATCH 284/447] reactingEulerFoam: Moved fluid.correctThermo() into
 energy corrector loop to update the interfacial temperature. Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=2029

---
 .../reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H     | 3 ++-
 .../reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H       | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
index c1d98bcb43..0130a872c9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
@@ -33,9 +33,10 @@ for (int Ecorr=0; Ecorr<nEnergyCorrectors; Ecorr++)
             EEqn->solve();
         }
     }
+
+    fluid.correctThermo();
 }
 
-fluid.correctThermo();
 
 forAll(phases, phasei)
 {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
index 0ac8e84129..0cdbfba8b9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
@@ -47,9 +47,9 @@ for (int Ecorr=0; Ecorr<nEnergyCorrectors; Ecorr++)
             E2eqn->solve();
         }
     }
-}
 
-fluid.correctThermo();
+    fluid.correctThermo();
+}
 
 Info<< phase1.name() << " min/max T "
     << min(phase1.thermo().T()).value()

From 02f8a02955bf76198945c4f254e204e47b5fa6fd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Mar 2016 09:14:25 +0000
Subject: [PATCH 285/447] SpatialTensor: Added constructor from 4 Tensor blocks

---
 .../SpatialTensor/SpatialTensor.H             |  7 ++
 .../SpatialTensor/SpatialTensorI.H            | 83 +++++++++++--------
 2 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
index e19d74094f..52c81866c6 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
@@ -92,6 +92,13 @@ public:
         //- Construct given MatrixSpace of the same rank
         inline SpatialTensor(const typename SpatialTensor::msType&);
 
+        //- Construct given 4 tensor blocks
+        inline SpatialTensor
+        (
+            const Tensor<Cmpt>& t00, const Tensor<Cmpt>& t01,
+            const Tensor<Cmpt>& t10, const Tensor<Cmpt>& t11
+        );
+
         //- Construct given 36 components
         inline SpatialTensor
         (
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
index 2fd570e81b..4f76522bfe 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
@@ -47,6 +47,35 @@ inline Foam::SpatialTensor<Cmpt>::SpatialTensor
 {}
 
 
+template<class Cmpt>
+inline Foam::SpatialTensor<Cmpt>::SpatialTensor
+(
+    const Tensor<Cmpt>& t00, const Tensor<Cmpt>& t01,
+    const Tensor<Cmpt>& t10, const Tensor<Cmpt>& t11
+)
+{
+    // Block (0, 0)
+    this->v_[0] = t00.xx();   this->v_[1] = t00.xy();   this->v_[2] = t00.xz();
+    this->v_[6] = t00.yx();   this->v_[7] = t00.yy();   this->v_[8] = t00.yz();
+    this->v_[12] = t00.zx();  this->v_[13] = t00.zy();  this->v_[14] = t00.zz();
+
+    // Block (0, 1)
+    this->v_[3] = t01.xx();   this->v_[4] = t01.xy();   this->v_[5] = t01.xz();
+    this->v_[9] = t01.yx();   this->v_[10] = t01.yy();  this->v_[11] = t01.yz();
+    this->v_[15] = t01.zx();  this->v_[16] = t01.zy();  this->v_[17] = t01.zz();
+
+    // Block (1, 0)
+    this->v_[18] = t10.xx();  this->v_[19] = t10.xy();  this->v_[20] = t10.xz();
+    this->v_[24] = t10.yx();  this->v_[25] = t10.yy();  this->v_[26] = t10.yz();
+    this->v_[30] = t10.zx();  this->v_[31] = t10.zy();  this->v_[32] = t10.zz();
+
+    // Block (1, 1)
+    this->v_[21] = t11.xx();  this->v_[22] = t11.xy();  this->v_[23] = t11.xz();
+    this->v_[27] = t11.yx();  this->v_[28] = t11.yy();  this->v_[29] = t11.yz();
+    this->v_[33] = t11.zx();  this->v_[34] = t11.zy();  this->v_[35] = t11.zz();
+}
+
+
 template<class Cmpt>
 inline Foam::SpatialTensor<Cmpt>::SpatialTensor
 (
@@ -69,47 +98,29 @@ inline Foam::SpatialTensor<Cmpt>::SpatialTensor
     const Cmpt& t53, const Cmpt& t54, const Cmpt& t55
 )
 {
-    this->v_[0] = t00;
-    this->v_[1] = t01;
-    this->v_[2] = t02;
-    this->v_[3] = t03;
-    this->v_[4] = t04;
-    this->v_[5] = t05;
+    // Row 0
+    this->v_[0] = t00;    this->v_[1] = t01;    this->v_[2] = t02;
+    this->v_[3] = t03;    this->v_[4] = t04;    this->v_[5] = t05;
 
-    this->v_[6] = t10;
-    this->v_[7] = t11;
-    this->v_[8] = t12;
-    this->v_[9] = t13;
-    this->v_[10] = t14;
-    this->v_[11] = t15;
+    // Row 1
+    this->v_[6] = t10;    this->v_[7] = t11;    this->v_[8] = t12;
+    this->v_[9] = t13;    this->v_[10] = t14;   this->v_[11] = t15;
 
-    this->v_[12] = t20;
-    this->v_[13] = t21;
-    this->v_[14] = t22;
-    this->v_[15] = t23;
-    this->v_[16] = t24;
-    this->v_[17] = t25;
+    // Row 2
+    this->v_[12] = t20;   this->v_[13] = t21;   this->v_[14] = t22;
+    this->v_[15] = t23;   this->v_[16] = t24;   this->v_[17] = t25;
 
-    this->v_[18] = t30;
-    this->v_[19] = t31;
-    this->v_[20] = t32;
-    this->v_[21] = t33;
-    this->v_[22] = t34;
-    this->v_[23] = t35;
+    // Row 3
+    this->v_[18] = t30;   this->v_[19] = t31;   this->v_[20] = t32;
+    this->v_[21] = t33;   this->v_[22] = t34;   this->v_[23] = t35;
 
-    this->v_[24] = t40;
-    this->v_[25] = t41;
-    this->v_[26] = t42;
-    this->v_[27] = t43;
-    this->v_[28] = t44;
-    this->v_[29] = t45;
+    // Row 4
+    this->v_[24] = t40;   this->v_[25] = t41;   this->v_[26] = t42;
+    this->v_[27] = t43;   this->v_[28] = t44;   this->v_[29] = t45;
 
-    this->v_[30] = t50;
-    this->v_[31] = t51;
-    this->v_[32] = t52;
-    this->v_[33] = t53;
-    this->v_[34] = t54;
-    this->v_[35] = t55;
+    // Row 5
+    this->v_[30] = t50;   this->v_[31] = t51;   this->v_[32] = t52;
+    this->v_[33] = t53;   this->v_[34] = t54;   this->v_[35] = t55;
 }
 
 

From fa83f2a97d68f86b907a27390f0a16889e35f8e3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Mar 2016 18:05:11 +0000
Subject: [PATCH 286/447] primitives/transform: Added functions to generate
 rotation tensors about the individual axes

---
 src/OpenFOAM/primitives/transform/transform.H | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/transform/transform.H b/src/OpenFOAM/primitives/transform/transform.H
index 3f50d677db..646ba7734f 100644
--- a/src/OpenFOAM/primitives/transform/transform.H
+++ b/src/OpenFOAM/primitives/transform/transform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+//- Rotational transformation tensor from vector n1 to n2
 inline tensor rotationTensor
 (
     const vector& n1,
@@ -76,6 +77,48 @@ inline tensor rotationTensor
 }
 
 
+//- Rotational transformation tensor about the x-axis by omega radians
+inline tensor Rx(const scalar& omega)
+{
+    const scalar s = sin(omega);
+    const scalar c = cos(omega);
+    return tensor
+    (
+        1,  0,  0,
+        0,  c,  s,
+        0, -s,  c
+    );
+}
+
+
+//- Rotational transformation tensor about the y-axis by omega radians
+inline tensor Ry(const scalar& omega)
+{
+    const scalar s = sin(omega);
+    const scalar c = cos(omega);
+    return tensor
+    (
+        c,  0, -s,
+        0,  1,  0,
+        s,  0,  c
+    );
+}
+
+
+//- Rotational transformation tensor about the z-axis by omega radians
+inline tensor Rz(const scalar& omega)
+{
+    const scalar s = sin(omega);
+    const scalar c = cos(omega);
+    return tensor
+    (
+        c,  s,  0,
+       -s,  c,  0,
+        0,  0,  1
+    );
+}
+
+
 inline label transform(const tensor&, const bool i)
 {
     return i;

From 07041365cca1a3d5c8be667e5bfc07503c384e4b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Mar 2016 18:09:04 +0000
Subject: [PATCH 287/447] primitives/transform: Added functios to generate
 rotation tensor about the given axis

---
 src/OpenFOAM/primitives/transform/transform.H | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/OpenFOAM/primitives/transform/transform.H b/src/OpenFOAM/primitives/transform/transform.H
index 646ba7734f..9fd1318acc 100644
--- a/src/OpenFOAM/primitives/transform/transform.H
+++ b/src/OpenFOAM/primitives/transform/transform.H
@@ -119,6 +119,29 @@ inline tensor Rz(const scalar& omega)
 }
 
 
+//- Rotational transformation tensor about axis a by omega radians
+inline tensor Ra(const vector& a, const scalar omega)
+{
+    const scalar s = sin(omega);
+    const scalar c = cos(omega);
+
+    return tensor
+    (
+        sqr(a.x())*(1 - c)  + c,
+        a.y()*a.x()*(1 - c) + a.z()*s,
+        a.x()*a.z()*(1 - c) - a.y()*s,
+
+        a.x()*a.y()*(1 - c) - a.z()*s,
+        sqr(a.y())*(1 - c)  + c,
+        a.y()*a.z()*(1 - c) + a.x()*s,
+
+        a.x()*a.z()*(1 - c) + a.y()*s,
+        a.y()*a.z()*(1 - c) - a.x()*s,
+        sqr(a.z())*(1 - c)  + c
+    );
+}
+
+
 inline label transform(const tensor&, const bool i)
 {
     return i;

From 9a04ebae982d2b49dad4861fad2d8f7dcb818f6f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Mar 2016 20:31:36 +0000
Subject: [PATCH 288/447] =?UTF-8?q?spatialTransform:=20Compact=20represent?=
 =?UTF-8?q?ation=20of=20the=20Pl=C3=BCcker=20spatial=20transformation=20te?=
 =?UTF-8?q?nsor=20in=20terms=20of=20the=20rotation=20tensor=20\c=20E=20and?=
 =?UTF-8?q?=20translation=20vector=20\c=20r=20.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  See Chapter 2 and Appendix A in reference:
     Featherstone, R. (2008).
     Rigid body dynamics algorithms.
     Springer.

    This work is sponsored by Carnegie Wave Energy Ltd

Henry G. Weller
CFD Direct
---
 .../spatialTransform/spatialTransform.H       | 200 +++++++++++++
 .../spatialTransform/spatialTransformI.H      | 267 ++++++++++++++++++
 2 files changed, 467 insertions(+)
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
 create mode 100644 src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H

diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
new file mode 100644
index 0000000000..2d68e321ae
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
@@ -0,0 +1,200 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::spatialTransform
+
+Description
+    Compact representation of the Plücker spatial transformation tensor
+    in terms of the rotation tensor \c E and translation vector \c r .
+
+    See Chapter 2 and Appendix A in reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+    \endverbatim
+
+SourceFiles
+    spatialTransformI.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef spatialTransform_H
+#define spatialTransform_H
+
+#include "tensor.H"
+#include "spatialVector.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class Istream;
+class Ostream;
+
+// Forward declaration of friend functions and operators
+class spatialTransform;
+Istream& operator>>(Istream&, spatialTransform&);
+Ostream& operator<<(Ostream&, const spatialTransform&);
+
+
+/*---------------------------------------------------------------------------*\
+                         Class spatialTransform Declaration
+\*---------------------------------------------------------------------------*/
+
+class spatialTransform
+{
+    // Private data
+
+        //- Rotation tensor
+        tensor E_;
+
+        //- Translation vector
+        vector r_;
+
+
+    // Private member functions
+
+        //- Return E . *r
+        inline tensor Erx() const;
+
+
+public:
+
+        //- Wrapper-class to provide transpose functions and operators
+        class transpose
+        {
+            const spatialTransform& X_;
+
+        public:
+
+            //- Construct from a spatialTransform
+            inline transpose(const spatialTransform& X);
+
+            //- Return the transpose transformation tensor ^A{X^*}_B
+            //  X^T
+            inline operator spatialTensor() const;
+
+            //- Transpose transform dual f: ^A{X^*}_B & f
+            //  X^T . f = (E^T . fl + r ^ E^T . fw, E^T . fl)
+            inline spatialVector operator&(const spatialVector& f) const;
+        };
+
+
+        //- Wrapper-class to provide dual functions and operators
+        class dual
+        {
+            const spatialTransform& X_;
+
+        public:
+
+            //- Construct from a spatialTransform
+            inline dual(const spatialTransform& X);
+
+            //- Return dual transformation tensor ^B{X^*}_A
+            inline operator spatialTensor() const;
+
+            //- Transform dual f: ^B{X^*}_A & f
+            //  X^* . f = (E . fw - r ^ fl, E . fl)
+            inline spatialVector operator&(const spatialVector& f) const;
+        };
+
+
+    // Constructors
+
+        //- Construct null
+        inline spatialTransform();
+
+        //- Construct from components
+        inline spatialTransform(const tensor& E, const vector& r);
+
+        //- Construct from Istream
+        inline spatialTransform(Istream&);
+
+
+    // Member Functions
+
+        //- Return the rotation tensor
+        inline const tensor& E() const;
+
+        //- Return non-const access to the rotation tensor
+        inline tensor& E();
+
+        //- Return the translation vector
+        inline const vector& r() const;
+
+        //- Return non-const access to the translation vector
+        inline vector& r();
+
+        //- Return the transpose transformation tensor ^A{X^*}_B
+        //  X^T
+        inline transpose T() const;
+
+        //- Return the inverse transformation tensor: X^-1
+        //  X^-1 = (E^T, −E.r)
+        inline spatialTransform inv() const;
+
+
+    // Member Operators
+
+        //- Return the dual transformation tensor ^B{X^*}_A
+        inline dual operator*() const;
+
+        //- Return transformation tensor ^BX_A
+        //  X
+        inline operator spatialTensor() const;
+
+        //- Inner-product multiply with a transformation tensor
+        inline void operator&=(const spatialTransform& X);
+
+        //- Return the inner-product of two transformation tensors
+        inline spatialTransform operator&(const spatialTransform& X) const;
+
+        //- Transform v: ^BX_A . v
+        //  X.v = (E . vw, E . (vl - r^vw))
+        inline spatialVector operator&(const spatialVector& v) const;
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>(Istream&, spatialTransform&);
+        friend Ostream& operator<<(Ostream&, const spatialTransform&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "spatialTransformI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
new file mode 100644
index 0000000000..c2a4c943a4
--- /dev/null
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
@@ -0,0 +1,267 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "transform.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::tensor Foam::spatialTransform::Erx() const
+{
+    return E_ & *r_;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::spatialTransform::spatialTransform()
+:
+    E_(tensor::I),
+    r_(vector::zero)
+{}
+
+
+inline Foam::spatialTransform::spatialTransform
+(
+    const tensor& E,
+    const vector& r
+)
+:
+    E_(E),
+    r_(r)
+{}
+
+
+inline Foam::spatialTransform::spatialTransform(Istream& is)
+:
+    E_(is),
+    r_(is)
+{}
+
+
+inline Foam::spatialTransform::transpose::transpose(const spatialTransform& X)
+:
+    X_(X)
+{}
+
+
+inline Foam::spatialTransform::dual::dual(const spatialTransform& X)
+:
+    X_(X)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::tensor& Foam::spatialTransform::E() const
+{
+    return E_;
+}
+
+inline Foam::tensor& Foam::spatialTransform::E()
+{
+    return E_;
+}
+
+inline const Foam::vector& Foam::spatialTransform::r() const
+{
+    return r_;
+}
+
+inline Foam::vector& Foam::spatialTransform::r()
+{
+    return r_;
+}
+
+
+inline Foam::spatialTransform::transpose Foam::spatialTransform::T() const
+{
+    return transpose(*this);
+}
+
+
+inline Foam::spatialTransform Foam::spatialTransform::inv() const
+{
+    return spatialTransform(E_.T(), -(E_ & r_));
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+inline Foam::spatialTransform::dual Foam::spatialTransform::operator*() const
+{
+    return dual(*this);
+}
+
+
+inline Foam::spatialTransform::operator spatialTensor() const
+{
+    return spatialTensor
+    (
+        E_,             tensor::zero,
+       -Erx(),          E_
+    );
+}
+
+
+inline void Foam::spatialTransform::operator&=(const spatialTransform& X)
+{
+    E_ &= X.E_;
+    r_ = X.r_ + (r_ & X.E_.T());
+}
+
+
+inline Foam::spatialTransform Foam::spatialTransform::operator&
+(
+    const spatialTransform& X
+) const
+{
+    return spatialTransform(E_ & X.E_, X.r_ + (r_ & X.E_));
+}
+
+
+inline Foam::spatialVector Foam::spatialTransform::operator&
+(
+    const spatialVector& v
+) const
+{
+    return spatialVector
+    (
+        E_ & v.angular(),
+        E_ & (v.linear() - (r_ ^ v.angular()))
+    );
+}
+
+
+inline Foam::spatialTransform::transpose::operator spatialTensor() const
+{
+    return spatialTensor
+    (
+        X_.E().T(),    -X_.Erx().T(),
+        tensor::zero,   X_.E().T()
+    );
+}
+
+
+inline Foam::spatialVector Foam::spatialTransform::transpose::operator&
+(
+    const spatialVector& f
+) const
+{
+    vector ETfl(X_.E().T() & f.linear());
+
+    return spatialVector
+    (
+        (X_.E().T() & f.angular()) + (X_.r() ^ ETfl),
+        ETfl
+    );
+}
+
+
+inline Foam::spatialTransform::dual::operator spatialTensor() const
+{
+    return spatialTensor
+    (
+        X_.E(),        -X_.Erx(),
+        tensor::zero,   X_.E()
+    );
+}
+
+
+inline Foam::spatialVector Foam::spatialTransform::dual::operator&
+(
+    const spatialVector& f
+) const
+{
+    return spatialVector
+    (
+        X_.E() & (f.angular() - (X_.r() ^ f.linear())),
+        X_.E() & f.linear()
+    );
+}
+
+
+// * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * * //
+
+inline Foam::Istream& Foam::operator>>(Foam::Istream& is, spatialTransform& X)
+{
+    is >> X.E() >> X.r();
+    return is;
+}
+
+
+inline Foam::Ostream& Foam::operator<<
+(
+    Foam::Ostream& os,
+    const spatialTransform& X
+)
+{
+    os << X.E() << token::SPACE << X.r() << endl;
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Rotational spatial transformation tensor about the x-axis by omega radians
+inline spatialTransform Xrx(const scalar& omega)
+{
+    return spatialTransform(Rx(omega), vector::zero);
+}
+
+//- Rotational spatial transformation tensor about the x-axis by omega radians
+inline spatialTransform Xry(const scalar& omega)
+{
+    return spatialTransform(Ry(omega), vector::zero);
+}
+
+//- Rotational spatial transformation tensor about the z-axis by omega radians
+inline spatialTransform Xrz(const scalar& omega)
+{
+    return spatialTransform(Rz(omega), vector::zero);
+}
+
+//- Rotational spatial transformation tensor about axis a by omega radians
+inline spatialTransform Xr(const vector& a, const scalar omega)
+{
+    return spatialTransform(Ra(a, omega), vector::zero);
+}
+
+//- Translational spatial transformation tensor about axis a by omega radians
+inline spatialTransform Xt(const vector& r)
+{
+    return spatialTransform(tensor::I, r);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //

From 9c0c6c5f009a5bb5a80f4dbc29689db195b270fb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Mar 2016 22:12:48 +0000
Subject: [PATCH 289/447] SpatialVector: Added component access member
 functions

wx(), wy(), wz(), lx(), ly() and lz()
---
 .../SpatialVector/SpatialVector.H             |  49 +++++++--
 .../SpatialVector/SpatialVectorI.H            | 104 ++++++++++++++++--
 .../spatialVector/spatialVector.C             |   2 +-
 .../spatialTransform/spatialTransformI.H      |  12 +-
 4 files changed, 138 insertions(+), 29 deletions(-)

diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
index 19eb9ad1db..d60710d305 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
@@ -67,6 +67,10 @@ class SpatialVector
 
 public:
 
+    //- Component labeling enumeration
+    enum components { WX, WY, WZ, LX, LY, LZ };
+
+
     // Constructors
 
         //- Construct null
@@ -81,19 +85,19 @@ public:
         //- Construct from the angular and linear vector components
         inline SpatialVector
         (
-            const Vector<Cmpt>& angular,
-            const Vector<Cmpt>& linear
+            const Vector<Cmpt>& w,
+            const Vector<Cmpt>& l
         );
 
         //- Construct given 6 components
         inline SpatialVector
         (
-            const Cmpt& v0,
-            const Cmpt& v1,
-            const Cmpt& v2,
-            const Cmpt& v3,
-            const Cmpt& v4,
-            const Cmpt& v5
+            const Cmpt& wx,
+            const Cmpt& wy,
+            const Cmpt& wz,
+            const Cmpt& lx,
+            const Cmpt& ly,
+            const Cmpt& lz
         );
 
         //- Construct from Istream
@@ -102,11 +106,32 @@ public:
 
     // Member Functions
 
-        //- Return the angular part of the spatial vector as a vector
-        inline Vector<Cmpt> angular() const;
+        // Component access
 
-        //- Return the linear part of the spatial vector as a vector
-        inline Vector<Cmpt> linear() const;
+            inline const Cmpt& wx() const;
+            inline const Cmpt& wy() const;
+            inline const Cmpt& wz() const;
+
+            inline const Cmpt& lx() const;
+            inline const Cmpt& ly() const;
+            inline const Cmpt& lz() const;
+
+            inline Cmpt& wx();
+            inline Cmpt& wy();
+            inline Cmpt& wz();
+
+            inline Cmpt& lx();
+            inline Cmpt& ly();
+            inline Cmpt& lz();
+
+
+        // Sub-vector access.
+
+            //- Return the angular part of the spatial vector as a vector
+            inline Vector<Cmpt> w() const;
+
+            //- Return the linear part of the spatial vector as a vector
+            inline Vector<Cmpt> l() const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
index af14d75301..6dd73d36fc 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
@@ -50,16 +50,16 @@ inline Foam::SpatialVector<Cmpt>::SpatialVector
 template<class Cmpt>
 inline Foam::SpatialVector<Cmpt>::SpatialVector
 (
-    const Vector<Cmpt>& angular,
-    const Vector<Cmpt>& linear
+    const Vector<Cmpt>& w,
+    const Vector<Cmpt>& l
 )
 {
-    this->v_[0] = angular.x();
-    this->v_[1] = angular.y();
-    this->v_[2] = angular.z();
-    this->v_[3] = linear.x();
-    this->v_[4] = linear.y();
-    this->v_[5] = linear.z();
+    this->v_[0] = w.x();
+    this->v_[1] = w.y();
+    this->v_[2] = w.z();
+    this->v_[3] = l.x();
+    this->v_[4] = l.y();
+    this->v_[5] = l.z();
 }
 
 
@@ -93,13 +93,97 @@ inline Foam::SpatialVector<Cmpt>::SpatialVector(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline Foam::Vector<Cmpt> Foam::SpatialVector<Cmpt>::angular() const
+inline const Cmpt& Foam::SpatialVector<Cmpt>::wx() const
+{
+    return this->v_[WX];
+}
+
+
+template<class Cmpt>
+inline const Cmpt& Foam::SpatialVector<Cmpt>::wy() const
+{
+    return this->v_[WY];
+}
+
+
+template<class Cmpt>
+inline const Cmpt& Foam::SpatialVector<Cmpt>::wz() const
+{
+    return this->v_[WZ];
+}
+
+
+template<class Cmpt>
+inline const Cmpt& Foam::SpatialVector<Cmpt>::lx() const
+{
+    return this->v_[LX];
+}
+
+
+template<class Cmpt>
+inline const Cmpt& Foam::SpatialVector<Cmpt>::ly() const
+{
+    return this->v_[LY];
+}
+
+
+template<class Cmpt>
+inline const Cmpt& Foam::SpatialVector<Cmpt>::lz() const
+{
+    return this->v_[LZ];
+}
+
+
+template<class Cmpt>
+inline Cmpt& Foam::SpatialVector<Cmpt>::wx()
+{
+    return this->v_[WX];
+}
+
+
+template<class Cmpt>
+inline Cmpt& Foam::SpatialVector<Cmpt>::wy()
+{
+    return this->v_[WY];
+}
+
+
+template<class Cmpt>
+inline Cmpt& Foam::SpatialVector<Cmpt>::wz()
+{
+    return this->v_[WZ];
+}
+
+
+template<class Cmpt>
+inline Cmpt& Foam::SpatialVector<Cmpt>::lx()
+{
+    return this->v_[LX];
+}
+
+
+template<class Cmpt>
+inline Cmpt& Foam::SpatialVector<Cmpt>::ly()
+{
+    return this->v_[LY];
+}
+
+
+template<class Cmpt>
+inline Cmpt& Foam::SpatialVector<Cmpt>::lz()
+{
+    return this->v_[LZ];
+}
+
+
+template<class Cmpt>
+inline Foam::Vector<Cmpt> Foam::SpatialVector<Cmpt>::w() const
 {
     return Vector<Cmpt>(this->v_[0], this->v_[1], this->v_[2]);
 }
 
 template<class Cmpt>
-inline Foam::Vector<Cmpt> Foam::SpatialVector<Cmpt>::linear() const
+inline Foam::Vector<Cmpt> Foam::SpatialVector<Cmpt>::l() const
 {
     return Vector<Cmpt>(this->v_[3], this->v_[4], this->v_[5]);
 }
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.C b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.C
index 08d1d28b98..422f31238d 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.C
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/spatialVector/spatialVector.C
@@ -36,7 +36,7 @@ const char* const Foam::spatialVector::vsType::typeName = "spatialVector";
 template<>
 const char* const Foam::spatialVector::vsType::componentNames[] =
 {
-    "x", "y", "z"
+    "wx", "wy", "wz", "lx", "ly", "lz"
 };
 
 template<>
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
index c2a4c943a4..d3d2cfb991 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
@@ -148,8 +148,8 @@ inline Foam::spatialVector Foam::spatialTransform::operator&
 {
     return spatialVector
     (
-        E_ & v.angular(),
-        E_ & (v.linear() - (r_ ^ v.angular()))
+        E_ & v.w(),
+        E_ & (v.l() - (r_ ^ v.w()))
     );
 }
 
@@ -169,11 +169,11 @@ inline Foam::spatialVector Foam::spatialTransform::transpose::operator&
     const spatialVector& f
 ) const
 {
-    vector ETfl(X_.E().T() & f.linear());
+    vector ETfl(X_.E().T() & f.l());
 
     return spatialVector
     (
-        (X_.E().T() & f.angular()) + (X_.r() ^ ETfl),
+        (X_.E().T() & f.w()) + (X_.r() ^ ETfl),
         ETfl
     );
 }
@@ -196,8 +196,8 @@ inline Foam::spatialVector Foam::spatialTransform::dual::operator&
 {
     return spatialVector
     (
-        X_.E() & (f.angular() - (X_.r() ^ f.linear())),
-        X_.E() & f.linear()
+        X_.E() & (f.w() - (X_.r() ^ f.l())),
+        X_.E() & f.l()
     );
 }
 

From 6ab92370fbcfb049fe84338656d8076f00f2ef92 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 18 Mar 2016 11:45:45 +0000
Subject: [PATCH 290/447] Identity: special type derived from SphericalTensor
 to provide the concept of identity (I)

Allows efficient operators to be defined for the interaction between
types and the equivalent identity.
---
 .../primitives/SphericalTensor/Identity.H     | 72 +++++++++++++++++++
 .../sphericalTensor/sphericalTensor.H         |  3 +-
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 src/OpenFOAM/primitives/SphericalTensor/Identity.H

diff --git a/src/OpenFOAM/primitives/SphericalTensor/Identity.H b/src/OpenFOAM/primitives/SphericalTensor/Identity.H
new file mode 100644
index 0000000000..e175edfe32
--- /dev/null
+++ b/src/OpenFOAM/primitives/SphericalTensor/Identity.H
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::Identity
+
+Description
+    Templated Identity tensor derived from SphericalTensor.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Identity_H
+#define Identity_H
+
+#include "SphericalTensor.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class Identity Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Cmpt>
+class Identity
+:
+    public SphericalTensor<Cmpt>
+{
+
+public:
+
+    // Constructors
+
+        //- Construct initializing the SphericalTensor to 1
+        Identity()
+        :
+            SphericalTensor<Cmpt>(1)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
index 462db416bc..31417fa424 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
@@ -36,6 +36,7 @@ SourceFiles
 #define sphericalTensor_H
 
 #include "SphericalTensor.H"
+#include "Identity.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -48,7 +49,7 @@ namespace Foam
 typedef SphericalTensor<scalar> sphericalTensor;
 
 // Identity tensor
-static const sphericalTensor I(1);
+static const Identity<scalar> I;
 
 static const sphericalTensor oneThirdI(1.0/3.0);
 static const sphericalTensor twoThirdsI(2.0/3.0);

From f8b486ae35a8c9941405f43a097d7f8d88b32614 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 18 Mar 2016 11:47:59 +0000
Subject: [PATCH 291/447] Update header

---
 .../SphericalTensor/sphericalTensor/sphericalTensor.H           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
index 31417fa424..e4c4db09f9 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 1346cc9c9d815e9b993f0e00caa00e8d48ebaa19 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 18 Mar 2016 21:52:00 +0000
Subject: [PATCH 292/447] SphericalTensor/Identity: Added dual form

---
 .../primitives/SphericalTensor/Identity.H     | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/primitives/SphericalTensor/Identity.H b/src/OpenFOAM/primitives/SphericalTensor/Identity.H
index e175edfe32..014adae6a2 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/Identity.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/Identity.H
@@ -25,7 +25,8 @@ Class
     Foam::Identity
 
 Description
-    Templated Identity tensor derived from SphericalTensor.
+    Templated identity and dual space identity tensors
+    derived from SphericalTensor.
 
 \*---------------------------------------------------------------------------*/
 
@@ -51,13 +52,29 @@ class Identity
 
 public:
 
-    // Constructors
+    //- Construct initializing the SphericalTensor to 1
+    Identity()
+    :
+        SphericalTensor<Cmpt>(1)
+    {}
 
+    //- The identity type in the dual space
+    class dual
+    :
+        public SphericalTensor<Cmpt>
+    {
         //- Construct initializing the SphericalTensor to 1
-        Identity()
+        dual()
         :
             SphericalTensor<Cmpt>(1)
         {}
+    };
+
+    //- Return the identity in the dual space
+    inline dual operator*()
+    {
+        return dual();
+    }
 };
 
 

From 62b569ee3903b13990b4fc0b115705ec79ee1f94 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 18 Mar 2016 21:52:27 +0000
Subject: [PATCH 293/447] SpatialVector: Added cross-product and dual
 cross-product operators SpatialTensor: Added SpatialVector cross-product and
 dual cross-product -> SpatialTensor operators

---
 .../SpatialTensor/SpatialTensorI.H            | 55 +++++++++++++-
 .../SpatialVector/SpatialVector.H             | 18 +++++
 .../SpatialVector/SpatialVectorI.H            | 75 +++++++++++++++++++
 3 files changed, 147 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
index 4f76522bfe..f3d431bce9 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "Identity.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Cmpt>
@@ -131,7 +133,7 @@ inline Foam::SpatialTensor<Cmpt>::SpatialTensor(Istream& is)
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
 inline void Foam::SpatialTensor<Cmpt>::operator=(const Foam::zero z)
@@ -140,4 +142,55 @@ inline void Foam::SpatialTensor<Cmpt>::operator=(const Foam::zero z)
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+
+//- Return the cross-product tensor
+template<class Cmpt>
+inline Foam::SpatialTensor<Cmpt> operator^
+(
+    const SpatialVector<Cmpt>& v,
+    const Identity<Cmpt>&
+)
+{
+    return SpatialTensor<Cmpt>
+    (
+        0,       -v.wz(),   v.wy(),   0,        0,        0,
+        v.wz(),   0,       -v.wx(),   0,        0,        0,
+       -v.wy(),   v.wx(),   0,        0,        0,        0,
+        0,       -v.lz(),   v.ly(),   0,       -v.wz(),   v.wy(),
+        v.lz(),   0,       -v.lx(),   v.wz(),   0,       -v.wx(),
+       -v.ly(),   v.lx(),   0,       -v.wy(),   v.wx(),   0
+    );
+}
+
+
+//- Return the dual cross-product tensor
+template<class Cmpt>
+inline Foam::SpatialTensor<Cmpt> operator^
+(
+    const SpatialVector<Cmpt>& f,
+    const typename Identity<Cmpt>::dual&
+)
+{
+    return SpatialTensor<Cmpt>
+    (
+        0,       -f.wz(),   f.wy(),   0,       -f.lz(),   f.ly(),
+        f.wz(),   0,       -f.wx(),   f.lz(),   0,       -f.lx(),
+       -f.wy(),   f.wx(),   0,       -f.ly(),   f.lx(),   0,
+        0,        0,        0,        0,       -f.wz(),   f.wy(),
+        0,        0,        0,        f.wz(),   0,       -f.wx(),
+        0,        0,        0,       -f.wy(),   f.wx(),   0
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
index d60710d305..33741f3143 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
@@ -71,6 +71,21 @@ public:
     enum components { WX, WY, WZ, LX, LY, LZ };
 
 
+    //- Class to represent the dual spatial vector
+    class dual
+    {
+        const SpatialVector& v_;
+
+    public:
+
+        //- Construct the dual of the given SpatialVector
+        inline dual(const SpatialVector& v);
+
+        //- Return the parent SpatialVector
+        inline const SpatialVector& v() const;
+    };
+
+
     // Constructors
 
         //- Construct null
@@ -137,6 +152,9 @@ public:
     // Member Operators
 
         inline void operator=(const Foam::zero);
+
+        //- Return the dual spatial vector
+        inline dual operator*() const;
 };
 
 
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
index 6dd73d36fc..9c8c862c5d 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
@@ -90,6 +90,13 @@ inline Foam::SpatialVector<Cmpt>::SpatialVector(Istream& is)
 {}
 
 
+template<class Cmpt>
+inline Foam::SpatialVector<Cmpt>::dual::dual(const SpatialVector& v)
+:
+    v_(v)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
@@ -189,6 +196,13 @@ inline Foam::Vector<Cmpt> Foam::SpatialVector<Cmpt>::l() const
 }
 
 
+template<class Cmpt>
+const Foam::SpatialVector<Cmpt>& Foam::SpatialVector<Cmpt>::dual::v() const
+{
+    return v_;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
@@ -198,4 +212,65 @@ inline void Foam::SpatialVector<Cmpt>::operator=(const Foam::zero z)
 }
 
 
+template<class Cmpt>
+inline typename Foam::SpatialVector<Cmpt>::dual
+Foam::SpatialVector<Cmpt>::operator*() const
+{
+    return dual(*this);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+
+//- Return the cross-product between two spatial vectors
+template<class Cmpt>
+inline SpatialVector<Cmpt> operator^
+(
+    const SpatialVector<Cmpt>& u,
+    const SpatialVector<Cmpt>& v
+)
+{
+    return SpatialVector<Cmpt>
+    (
+       -u.wz()*v.wy() + u.wy()*v.wz(),
+        u.wz()*v.wx() - u.wx()*v.wz(),
+       -u.wy()*v.wx() + u.wx()*v.wy(),
+       -u.lz()*v.wy() + u.ly()*v.wz() - u.wz()*v.ly() + u.wy()*v.lz(),
+        u.lz()*v.wx() - u.lx()*v.wz() + u.wz()*v.lx() - u.wx()*v.lz(),
+       -u.ly()*v.wx() + u.lx()*v.wy() - u.wy()*v.lx() + u.wx()*v.ly()
+    );
+}
+
+
+//- Return the dual cross-product between two spatial vectors
+template<class Cmpt>
+inline SpatialVector<Cmpt> operator^
+(
+    const SpatialVector<Cmpt>& v,
+    const typename SpatialVector<Cmpt>::dual& df
+)
+{
+    const SpatialVector<Cmpt>& f = df.v();
+
+    return SpatialVector<Cmpt>
+    (
+       -v.wz()*f.wy() + v.wy()*f.wz() - v.lz()*f.ly() + v.ly()*f.lz(),
+        v.wz()*f.wx() - v.wx()*f.wz() + v.lz()*f.lx() - v.lx()*f.lz(),
+       -v.wy()*f.wx() + v.wx()*f.wy() - v.ly()*f.lx() + v.lx()*f.ly(),
+       -v.wz()*f.ly() + v.wy()*f.lz(),
+        v.wz()*f.lx() - v.wx()*f.lz(),
+       -v.wy()*f.lx() + v.wx()*f.ly()
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
 // ************************************************************************* //

From 1f89e6562438dd43ee30fe6d09db167aa8a42ec8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 19 Mar 2016 21:19:14 +0000
Subject: [PATCH 294/447] SubList, SubField: Added assignment to UList

---
 .../containers/Lists/SubList/SubList.H        |  3 +++
 .../containers/Lists/SubList/SubListI.H       |  7 ++++++
 src/OpenFOAM/fields/Fields/Field/SubField.H   |  8 +++++++
 src/OpenFOAM/fields/Fields/Field/SubFieldI.H  | 24 ++++++++++++++++++-
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/containers/Lists/SubList/SubList.H b/src/OpenFOAM/containers/Lists/SubList/SubList.H
index b75745382a..efaff633e7 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubList.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubList.H
@@ -87,6 +87,9 @@ public:
         //- Allow cast to a const List<T>&
         inline operator const Foam::List<T>&() const;
 
+        //- Assignment of all entries to the given list
+        inline void operator=(const UList<T>&);
+
         //- Assignment of all entries to the given value
         inline void operator=(const T&);
 };
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
index 90b6ce6d28..2a7f5c19ef 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
@@ -87,6 +87,13 @@ inline Foam::SubList<T>::operator const Foam::List<T>&() const
 }
 
 
+template<class T>
+inline void Foam::SubList<T>::operator=(const UList<T>& l)
+{
+    UList<T>::assign(l);
+}
+
+
 template<class T>
 inline void Foam::SubList<T>::operator=(const T& t)
 {
diff --git a/src/OpenFOAM/fields/Fields/Field/SubField.H b/src/OpenFOAM/fields/Fields/Field/SubField.H
index ec3d150295..07ecd1443f 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubField.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubField.H
@@ -41,6 +41,7 @@ SourceFiles
 
 #include "SubList.H"
 #include "Field.H"
+#include "VectorSpace.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -112,6 +113,13 @@ public:
         //- Assignment via UList operator. Takes linear time.
         inline void operator=(const SubField<Type>&);
 
+        //- Assignment via UList operator. Takes linear time.
+        inline void operator=(const Field<Type>&);
+
+        //- Assignment via UList operator. Takes linear time.
+        template<class Form, direction Ncmpts>
+        inline void operator=(const VectorSpace<Form, Type, Ncmpts>&);
+
         //- Allow cast to a const Field\<Type\>&
         inline operator const Field<Type>&() const;
 };
diff --git a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
index 796b2995c2..8ba1ee8929 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
@@ -111,7 +111,29 @@ inline Foam::tmp<Foam::Field<Type>> Foam::SubField<Type>::T() const
 template<class Type>
 inline void Foam::SubField<Type>::operator=(const SubField<Type>& rhs)
 {
-    UList<Type>::operator=(rhs);
+    SubList<Type>::operator=(rhs);
+}
+
+
+template<class Type>
+inline void Foam::SubField<Type>::operator=(const Field<Type>& rhs)
+{
+    SubList<Type>::operator=(rhs);
+    InfoInFunction << *this << endl;
+}
+
+
+template<class Type>
+template<class Form, Foam::direction Ncmpts>
+inline void Foam::SubField<Type>::operator=
+(
+    const VectorSpace<Form, Type, Ncmpts>& rhs
+)
+{
+    forAll(rhs, i)
+    {
+        this->operator[](i) = rhs[i];
+    }
 }
 
 

From 5afe3027d1dddac32b5b3076be3e890eec5f5c4b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 19 Mar 2016 21:20:18 +0000
Subject: [PATCH 295/447] Updated header

---
 src/OpenFOAM/containers/Lists/SubList/SubList.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/containers/Lists/SubList/SubList.H b/src/OpenFOAM/containers/Lists/SubList/SubList.H
index efaff633e7..ff7661852a 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubList.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 1b93e52c7926a693270e58252b16c398737c51c0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 19 Mar 2016 21:20:33 +0000
Subject: [PATCH 296/447] Field: Added zero() constructor

---
 src/OpenFOAM/fields/Fields/Field/Field.C | 7 +++++++
 src/OpenFOAM/fields/Fields/Field/Field.H | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 0ca41e54a0..62cbccb601 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -57,6 +57,13 @@ Foam::Field<Type>::Field(const label size, const Type& t)
 {}
 
 
+template<class Type>
+Foam::Field<Type>::Field(const label size, const zero)
+:
+    List<Type>(size, pTraits<Type>::zero)
+{}
+
+
 template<class Type>
 Foam::Field<Type>::Field
 (
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 6f08f05926..8e66a98837 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -117,6 +117,9 @@ public:
         //- Construct given size and initial value
         Field(const label, const Type&);
 
+        //- Construct given size and initialed to zero
+        Field(const label, const zero);
+
         //- Construct as copy of a UList\<Type\>
         explicit Field(const UList<Type>&);
 

From 649128313b9b47d2ed5c4446336f1ed1ea27009a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 19 Mar 2016 21:21:23 +0000
Subject: [PATCH 297/447] sampledSet/face: Improved robustness of face
 selection

---
 src/sampling/sampledSet/face/faceOnlySet.C | 72 ++++++++++------------
 src/sampling/sampledSet/face/faceOnlySet.H |  1 +
 2 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/src/sampling/sampledSet/face/faceOnlySet.C b/src/sampling/sampledSet/face/faceOnlySet.C
index 0225658feb..9c794cc6b8 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.C
+++ b/src/sampling/sampledSet/face/faceOnlySet.C
@@ -47,17 +47,13 @@ bool Foam::faceOnlySet::trackToBoundary
 (
     passiveParticleCloud& particleCloud,
     passiveParticle& singleParticle,
+    const scalar smallDist,
     DynamicList<point>& samplingPts,
     DynamicList<label>& samplingCells,
     DynamicList<label>& samplingFaces,
     DynamicList<scalar>& samplingCurveDist
 ) const
 {
-    // distance vector between sampling points
-    const vector offset = end_ - start_;
-    const vector smallVec = tol*offset;
-    const scalar smallDist = mag(smallVec);
-
     particle::TrackingData<passiveParticleCloud> trackData(particleCloud);
 
     // Alias
@@ -101,7 +97,7 @@ void Foam::faceOnlySet::calcSamples
     DynamicList<scalar>& samplingCurveDist
 ) const
 {
-    // distance vector between sampling points
+    // Distance vector between sampling points
     if (mag(end_ - start_) < SMALL)
     {
         FatalErrorInFunction
@@ -138,13 +134,12 @@ void Foam::faceOnlySet::calcSamples
     }
 
     // Get first tracking point. Use bPoint, bFaceI if provided.
-
     point trackPt;
     label trackCellI = -1;
     label trackFaceI = -1;
 
-    //Info<< "before getTrackingPoint : bPoint:" << bPoint
-    //    << " bFaceI:" << bFaceI << endl;
+    // Pout<< "before getTrackingPoint : bPoint:" << bPoint
+    //     << " bFaceI:" << bFaceI << endl;
 
     getTrackingPoint
     (
@@ -152,25 +147,25 @@ void Foam::faceOnlySet::calcSamples
         bPoint,
         bFaceI,
         smallDist,
-
         trackPt,
         trackCellI,
         trackFaceI
     );
 
-    //Info<< "after getTrackingPoint : "
-    //    << " trackPt:" << trackPt
-    //    << " trackCellI:" << trackCellI
-    //    << " trackFaceI:" << trackFaceI
-    //    << endl;
+    // Pout<< "after getTrackingPoint : "
+    //     << " trackPt:" << trackPt
+    //     << " trackCellI:" << trackCellI
+    //     << " trackFaceI:" << trackFaceI
+    //     << endl;
 
     if (trackCellI == -1)
     {
         // Line start_ - end_ does not intersect domain at all.
         // (or is along edge)
         // Set points and cell/face labels to empty lists
-        //Info<< "calcSamples : Both start_ and end_ outside domain"
-        //    << endl;
+
+        // Pout<< "calcSamples : Both start_ and end_ outside domain"
+        //     << endl;
 
         return;
     }
@@ -181,11 +176,11 @@ void Foam::faceOnlySet::calcSamples
         trackFaceI = findNearFace(trackCellI, trackPt, smallDist);
     }
 
-    //Info<< "calcSamples : got first point to track from :"
-    //    << "  trackPt:" << trackPt
-    //    << "  trackCell:" << trackCellI
-    //    << "  trackFace:" << trackFaceI
-    //    << endl;
+    // Pout<< "calcSamples : got first point to track from :"
+    //     << "  trackPt:" << trackPt
+    //     << "  trackCell:" << trackCellI
+    //     << "  trackFace:" << trackFaceI
+    //     << endl;
 
     //
     // Track until hit end of all boundary intersections
@@ -200,11 +195,11 @@ void Foam::faceOnlySet::calcSamples
     // index in bHits; current boundary intersection
     label bHitI = 1;
 
-    while(true)
+    while (true)
     {
         if (trackFaceI != -1)
         {
-            //Info<< "trackPt:" << trackPt << " on face so use." << endl;
+            // Pout<< "trackPt:" << trackPt << " on face so use." << endl;
             samplingPts.append(trackPt);
             samplingCells.append(trackCellI);
             samplingFaces.append(trackFaceI);
@@ -223,32 +218,27 @@ void Foam::faceOnlySet::calcSamples
         (
             particleCloud,
             singleParticle,
+            smallDist,
             samplingPts,
             samplingCells,
             samplingFaces,
             samplingCurveDist
         );
 
-        // fill sampleSegments
+        // Fill sampleSegments
         for (label i = samplingPts.size() - 1; i >= startSegmentI; --i)
         {
             samplingSegments.append(segmentI);
         }
 
-
         if (!reachedBoundary)
         {
-            //Info<< "calcSamples : Reached end of samples: "
-            //    << "  samplePt now:" << singleParticle.position()
-            //    << endl;
+            // Pout<< "calcSamples : Reached end of samples: "
+            //     << "  samplePt now:" << singleParticle.position()
+            //     << endl;
             break;
         }
 
-
-        // Go past boundary intersection where tracking stopped
-        // Use coordinate comparison instead of face comparison for
-        // accuracy reasons
-
         bool foundValidB = false;
 
         while (bHitI < bHits.size())
@@ -257,15 +247,15 @@ void Foam::faceOnlySet::calcSamples
                 (bHits[bHitI].hitPoint() - singleParticle.position())
               & normOffset;
 
-            //Info<< "Finding next boundary : "
-            //    << "bPoint:" << bHits[bHitI].hitPoint()
-            //    << "  tracking:" << singleParticle.position()
-            //    << "  dist:" << dist
-            //    << endl;
+            // Pout<< "Finding next boundary : "
+            //     << "bPoint:" << bHits[bHitI].hitPoint()
+            //     << "  tracking:" << singleParticle.position()
+            //     << "  dist:" << dist
+            //     << endl;
 
             if (dist > smallDist)
             {
-                // hitpoint is past tracking position
+                // Hit-point is past tracking position
                 foundValidB = true;
                 break;
             }
@@ -275,7 +265,7 @@ void Foam::faceOnlySet::calcSamples
             }
         }
 
-        if (!foundValidB)
+        if (!foundValidB || bHitI == bHits.size() - 1)
         {
             // No valid boundary intersection found beyond tracking position
             break;
diff --git a/src/sampling/sampledSet/face/faceOnlySet.H b/src/sampling/sampledSet/face/faceOnlySet.H
index 61f20c7ce7..009c3b66e7 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.H
+++ b/src/sampling/sampledSet/face/faceOnlySet.H
@@ -70,6 +70,7 @@ class faceOnlySet
         (
             passiveParticleCloud& particleCloud,
             passiveParticle& singleParticle,
+            const scalar smallDist,
             DynamicList<point>& samplingPts,
             DynamicList<label>& samplingCells,
             DynamicList<label>& samplingFaces,

From a7e410396a2df64a8abf4316ee36c92d85bb8f26 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 19 Mar 2016 21:22:09 +0000
Subject: [PATCH 298/447] sampledSet/midPoint, midPointAndFace: Improved
 robustness of the mid-point cell seaching and selecting

---
 .../sampledSet/midPoint/midPointSet.C         |  61 ++++-----
 .../midPointAndFace/midPointAndFaceSet.C      | 118 ++++++++----------
 .../sampledSet/sampledSet/sampledSet.C        |  86 ++++++-------
 .../sampledSet/sampledSet/sampledSet.H        |   9 +-
 4 files changed, 119 insertions(+), 155 deletions(-)

diff --git a/src/sampling/sampledSet/midPoint/midPointSet.C b/src/sampling/sampledSet/midPoint/midPointSet.C
index d0ea99108c..38031ee7b0 100644
--- a/src/sampling/sampledSet/midPoint/midPointSet.C
+++ b/src/sampling/sampledSet/midPoint/midPointSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 
 #include "midPointSet.H"
 #include "polyMesh.H"
+#include "meshSearch.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -47,58 +48,46 @@ void Foam::midPointSet::genSamples()
     labelList midSegments(2*size());
     scalarList midCurveDist(2*size());
 
-    label midI = 0;
+    label mSamplei = 0;
+    label samplei = 0;
 
-    label sampleI = 0;
-
-    while(true && size()>0)
+    while (size() > 0)
     {
-        // calculate midpoint between sampleI and sampleI+1 (if in same segment)
+        // Calculate midpoint between samplei and samplei+1 (if in same segment)
         while
         (
-            (sampleI < size() - 1)
-         && (segments_[sampleI] == segments_[sampleI+1])
+            (samplei < size() - 1)
+         && (segments_[samplei] == segments_[samplei+1])
         )
         {
-            midPoints[midI] =
-                0.5*(operator[](sampleI) + operator[](sampleI+1));
+            point midPoint(0.5*(operator[](samplei) + operator[](samplei+1)));
+            label cellm = pointInCell(midPoint, samplei);
 
-            label cell1 = getCell(faces_[sampleI], midPoints[midI]);
-            label cell2 = getCell(faces_[sampleI+1], midPoints[midI]);
-
-            if (cell1 != cell2)
+            if (cellm != -1)
             {
-                FatalErrorInFunction
-                    << "  midI:" << midI
-                    << "  sampleI:" << sampleI
-                    << "  pts[sampleI]:" << operator[](sampleI)
-                    << "  face[sampleI]:" << faces_[sampleI]
-                    << "  pts[sampleI+1]:" << operator[](sampleI+1)
-                    << "  face[sampleI+1]:" << faces_[sampleI+1]
-                    << "  cell1:" << cell1
-                    << "  cell2:" << cell2
-                    << abort(FatalError);
+                midPoints[mSamplei] = midPoint;
+                midCells[mSamplei] = cellm;
+                midSegments[mSamplei] = segments_[samplei];
+                midCurveDist[mSamplei] = mag(midPoints[mSamplei] - start());
+                mSamplei++;
             }
 
-            midCells[midI] = cell1;
-            midSegments[midI] = segments_[sampleI];
-            midCurveDist[midI] = mag(midPoints[midI] - start());
-
-            midI++;
-            sampleI++;
+            samplei++;
         }
 
-        if (sampleI == size() - 1)
+        if (samplei == size() - 1)
         {
             break;
         }
-        sampleI++;
+
+        samplei++;
     }
 
-    midPoints.setSize(midI);
-    midCells.setSize(midI);
-    midSegments.setSize(midI);
-    midCurveDist.setSize(midI);
+    midPoints.setSize(mSamplei);
+    midCells.setSize(mSamplei);
+    midSegments.setSize(mSamplei);
+    midCurveDist.setSize(mSamplei);
+
     setSamples
     (
         midPoints,
diff --git a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C
index 7a57549855..1628ca50ef 100644
--- a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C
+++ b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,101 +39,83 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Rework faceOnlySet samples.
-// Take two consecutive samples
 void Foam::midPointAndFaceSet::genSamples()
 {
     // Generate midpoints and add to face points
 
-    List<point> newSamplePoints(3*size());
-    labelList newSampleCells(3*size());
-    labelList newSampleFaces(3*size());
-    labelList newSampleSegments(3*size());
-    scalarList newSampleCurveDist(3*size());
+    List<point> mpfSamplePoints(3*size());
+    labelList mpfSampleCells(3*size());
+    labelList mpfSampleFaces(3*size());
+    labelList mpfSampleSegments(3*size());
+    scalarList mpfSampleCurveDist(3*size());
 
-    label newSampleI = 0;
+    label mpfSamplei = 0;
+    label samplei = 0;
 
-    label sampleI = 0;
-
-    while(true && size()>0)
+    while (size() > 0)
     {
-        // sampleI is start of segment
-
-        // Add sampleI
-        newSamplePoints[newSampleI] = operator[](sampleI);
-        newSampleCells[newSampleI] = cells_[sampleI];
-        newSampleFaces[newSampleI] = faces_[sampleI];
-        newSampleSegments[newSampleI] = segments_[sampleI];
-        newSampleCurveDist[newSampleI] = curveDist_[sampleI];
-        newSampleI++;
+        // Add first face
+        mpfSamplePoints[mpfSamplei] = operator[](samplei);
+        mpfSampleCells[mpfSamplei] = cells_[samplei];
+        mpfSampleFaces[mpfSamplei] = faces_[samplei];
+        mpfSampleSegments[mpfSamplei] = segments_[samplei];
+        mpfSampleCurveDist[mpfSamplei] = curveDist_[samplei];
+        mpfSamplei++;
 
         while
         (
-            (sampleI < size() - 1)
-         && (segments_[sampleI] == segments_[sampleI+1])
+            (samplei < size() - 1)
+         && (segments_[samplei] == segments_[samplei+1])
         )
         {
-            // Add mid point
-            const point mid = 0.5*(operator[](sampleI) + operator[](sampleI+1));
+            point midPoint(0.5*(operator[](samplei) + operator[](samplei+1)));
+            label cellm = pointInCell(midPoint, samplei);
 
-            label cell1 = getCell(faces_[sampleI], mid);
-            label cell2 = getCell(faces_[sampleI+1], mid);
-
-            if (cell1 != cell2)
+            if (cellm != -1)
             {
-                FatalErrorInFunction
-                    << "  newSampleI:" << newSampleI
-                    << "  pts[sampleI]:" << operator[](sampleI)
-                    << "  face[sampleI]:" << faces_[sampleI]
-                    << "  pts[sampleI+1]:" << operator[](sampleI+1)
-                    << "  face[sampleI+1]:" << faces_[sampleI+1]
-                    << "  cell1:" << cell1
-                    << "  cell2:" << cell2
-                    << abort(FatalError);
+                mpfSamplePoints[mpfSamplei] = midPoint;
+                mpfSampleCells[mpfSamplei] = cellm;
+                mpfSampleFaces[mpfSamplei] = -1;
+                mpfSampleSegments[mpfSamplei] = segments_[samplei];
+                mpfSampleCurveDist[mpfSamplei] =
+                    mag(mpfSamplePoints[mpfSamplei] - start());
+
+                mpfSamplei++;
             }
 
-            newSamplePoints[newSampleI] = mid;
-            newSampleCells[newSampleI] = cell1;
-            newSampleFaces[newSampleI] = -1;
-            newSampleSegments[newSampleI] = segments_[sampleI];
-            newSampleCurveDist[newSampleI] =
-                mag(newSamplePoints[newSampleI] - start());
+            // Add second face
+            mpfSamplePoints[mpfSamplei] = operator[](samplei+1);
+            mpfSampleCells[mpfSamplei] = cells_[samplei+1];
+            mpfSampleFaces[mpfSamplei] = faces_[samplei+1];
+            mpfSampleSegments[mpfSamplei] = segments_[samplei+1];
+            mpfSampleCurveDist[mpfSamplei] =
+                mag(mpfSamplePoints[mpfSamplei] - start());
 
-            newSampleI++;
+            mpfSamplei++;
 
-            // Add sampleI+1
-            newSamplePoints[newSampleI] = operator[](sampleI+1);
-            newSampleCells[newSampleI] = cells_[sampleI+1];
-            newSampleFaces[newSampleI] = faces_[sampleI+1];
-            newSampleSegments[newSampleI] = segments_[sampleI+1];
-            newSampleCurveDist[newSampleI] =
-                mag(newSamplePoints[newSampleI] - start());
-
-            newSampleI++;
-
-            sampleI++;
+            samplei++;
         }
 
-        if (sampleI == size() - 1)
+        if (samplei == size() - 1)
         {
             break;
         }
-        sampleI++;
+        samplei++;
     }
 
-    newSamplePoints.setSize(newSampleI);
-    newSampleCells.setSize(newSampleI);
-    newSampleFaces.setSize(newSampleI);
-    newSampleSegments.setSize(newSampleI);
-    newSampleCurveDist.setSize(newSampleI);
+    mpfSamplePoints.setSize(mpfSamplei);
+    mpfSampleCells.setSize(mpfSamplei);
+    mpfSampleFaces.setSize(mpfSamplei);
+    mpfSampleSegments.setSize(mpfSamplei);
+    mpfSampleCurveDist.setSize(mpfSamplei);
 
     setSamples
     (
-        newSamplePoints,
-        newSampleCells,
-        newSampleFaces,
-        newSampleSegments,
-        newSampleCurveDist
+        mpfSamplePoints,
+        mpfSampleCells,
+        mpfSampleFaces,
+        mpfSampleSegments,
+        mpfSampleCurveDist
     );
 }
 
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C
index ff58cef6bf..f53e6e44fd 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -47,61 +47,57 @@ Foam::label Foam::sampledSet::getBoundaryCell(const label faceI) const
 }
 
 
-Foam::label Foam::sampledSet::getCell
+Foam::label Foam::sampledSet::pointInCell
 (
-    const label faceI,
-    const point& sample
+    const point& p,
+    const label samplei
 ) const
 {
-    if (faceI == -1)
+    const label cellio = mesh().faceOwner()[faces_[samplei]];
+    const label cellin = mesh().faceNeighbour()[faces_[samplei]];
+    const label celljo = mesh().faceOwner()[faces_[samplei+1]];
+    const label celljn = mesh().faceNeighbour()[faces_[samplei+1]];
+
+    // If mid-point is in the cell including the sampled faces
+    // include in list otherwise ignore
+
+    label cellm =
+        (cellio == celljo || cellio == celljn) ? cellio
+      : (cellin == celljo || cellin == celljn) ? cellin
+      : -1;
+
+    if (cellm != -1)
     {
-        FatalErrorInFunction
-            << "Illegal face label " << faceI
-            << abort(FatalError);
-    }
-
-    if (faceI >= mesh().nInternalFaces())
-    {
-        label cellI = getBoundaryCell(faceI);
-
-        if (!mesh().pointInCell(sample, cellI, searchEngine_.decompMode()))
+        // Check the mid-point is in the cell otherwise ignore
+        if (!mesh().pointInCell(p, cellm, searchEngine_.decompMode()))
         {
-            FatalErrorInFunction
-                << "Found cell " << cellI << " using face " << faceI
-                << ". But cell does not contain point " << sample
-                << abort(FatalError);
-        }
-        return cellI;
-    }
-    else
-    {
-        // Try owner and neighbour to see which one contains sample
+            cellm = -1;
 
-        label cellI = mesh().faceOwner()[faceI];
-
-        if (mesh().pointInCell(sample, cellI, searchEngine_.decompMode()))
-        {
-            return cellI;
-        }
-        else
-        {
-            cellI = mesh().faceNeighbour()[faceI];
-
-            if (mesh().pointInCell(sample, cellI, searchEngine_.decompMode()))
+            if (debug)
             {
-                return cellI;
-            }
-            else
-            {
-                FatalErrorInFunction
-                    << "None of the neighbours of face "
-                    << faceI << " contains point " << sample
-                    << abort(FatalError);
-
-                return -1;
+                WarningInFunction
+                    << "Could not find mid-point " << p
+                    << " cell " << cellm << endl;
             }
         }
     }
+    else if (debug)
+    {
+        WarningInFunction
+            << "Could not find cell for mid-point" << nl
+            << "  samplei: " << samplei
+            << "  pts[samplei]: " << operator[](samplei)
+            << "  face[samplei]: " << faces_[samplei]
+            << "  pts[samplei+1]: " << operator[](samplei+1)
+            << "  face[samplei+1]: " << faces_[samplei+1]
+            << "  cellio: " << cellio
+            << "  cellin: " << cellin
+            << "  celljo: " << celljo
+            << "  celljn: " << celljn
+            << endl;
+    }
+
+    return cellm;
 }
 
 
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.H b/src/sampling/sampledSet/sampledSet/sampledSet.H
index 005ef61c1c..1531480ee8 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.H
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.H
@@ -92,12 +92,9 @@ protected:
         //- Returns cell next to boundary face
         label getBoundaryCell(const label) const;
 
-        //- Returns cell using face and containing sample
-        label getCell
-        (
-            const label faceI,
-            const point& sample
-        ) const;
+        //- Return the cell in which the point on the sample line
+        //  resides if found otherwise return -1
+        label pointInCell(const point& p, const label samplei) const;
 
         //- Calculates inproduct of face normal and vector sample-face centre
         //  <0 if sample inside.

From 8f9f866c73fae0c6cac1a0a00bbe3e47e9a0a453 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 20 Mar 2016 10:31:48 +0000
Subject: [PATCH 299/447] objectRegistry: Set the path of the Time
 objectRegistry Patch contributed by Bruno Santos Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2030

---
 src/OpenFOAM/db/objectRegistry/objectRegistry.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index 12961c1daa..1ce602ff0b 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -55,7 +55,7 @@ Foam::objectRegistry::objectRegistry
         IOobject
         (
             string::validate<word>(t.caseName()),
-            "",
+            t.path(),
             t,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE,

From 1d456a669832c401969cb8a627d4fb822464378e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 20 Mar 2016 10:35:35 +0000
Subject: [PATCH 300/447] Updated header

---
 src/OpenFOAM/db/objectRegistry/objectRegistry.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index 1ce602ff0b..94e76b6fd7 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 0ea0848047b6576ac6ae885a91991740416202d1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 20 Mar 2016 15:00:36 +0000
Subject: [PATCH 301/447] Matrix: Replace the row-start pointer array with
 computed offsets

The row-start pointer array provided performance benefits on old
computers but now that computation is often cache-miss limited the
benefit of avoiding a integer multiply is more than offset by the
addition memory access into a separately allocated array.

With the new addressing scheme LUsolve is 15% faster.
---
 src/OpenFOAM/matrices/Matrix/Matrix.C         | 91 ++++++++-----------
 src/OpenFOAM/matrices/Matrix/Matrix.H         | 30 ++++--
 src/OpenFOAM/matrices/Matrix/MatrixI.H        | 55 +++++++++--
 src/OpenFOAM/matrices/Matrix/MatrixIO.C       |  8 +-
 .../scalarMatrices/scalarMatricesTemplates.C  |  2 -
 .../primitives/MatrixSpace/MatrixSpace.H      |  6 +-
 .../primitives/MatrixSpace/MatrixSpaceI.H     | 16 ++--
 7 files changed, 120 insertions(+), 88 deletions(-)

diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index ec9ae8b1b0..829156693c 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -32,13 +32,7 @@ void Foam::Matrix<Form, Type>::allocate()
 {
     if (nRows_ && nCols_)
     {
-        v_ = new Type*[nRows_];
-        v_[0] = new Type[nRows_*nCols_];
-
-        for (label i=1; i<nRows_; i++)
-        {
-            v_[i] = v_[i-1] + nCols_;
-        }
+        v_ = new Type[size()];
     }
 }
 
@@ -50,7 +44,6 @@ Foam::Matrix<Form, Type>::~Matrix()
 {
     if (v_)
     {
-        delete[] (v_[0]);
         delete[] v_;
     }
 }
@@ -59,16 +52,16 @@ Foam::Matrix<Form, Type>::~Matrix()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Form, class Type>
-Foam::Matrix<Form, Type>::Matrix(const label n, const label m)
+Foam::Matrix<Form, Type>::Matrix(const label m, const label n)
 :
-    nRows_(n),
-    nCols_(m),
+    nRows_(m),
+    nCols_(n),
     v_(NULL)
 {
     if (nRows_ < 0 || nCols_ < 0)
     {
         FatalErrorInFunction
-            << "bad n, m " << nRows_ << ", " << nCols_
+            << "Bad m, n " << nRows_ << ", " << nCols_
             << abort(FatalError);
     }
 
@@ -77,16 +70,16 @@ Foam::Matrix<Form, Type>::Matrix(const label n, const label m)
 
 
 template<class Form, class Type>
-Foam::Matrix<Form, Type>::Matrix(const label n, const label m, const Type& a)
+Foam::Matrix<Form, Type>::Matrix(const label m, const label n, const Type& a)
 :
-    nRows_(n),
-    nCols_(m),
+    nRows_(m),
+    nCols_(n),
     v_(NULL)
 {
     if (nRows_ < 0 || nCols_ < 0)
     {
         FatalErrorInFunction
-            << "bad n, m " << nRows_ << ", " << nCols_
+            << "bad m, n " << nRows_ << ", " << nCols_
             << abort(FatalError);
     }
 
@@ -94,13 +87,10 @@ Foam::Matrix<Form, Type>::Matrix(const label n, const label m, const Type& a)
 
     if (v_)
     {
-        Type* v = v_[0];
-
-        label mn = nRows_*nCols_;
-
+        const label mn = size();
         for (label i=0; i<mn; i++)
         {
-            v[i] = a;
+            v_[i] = a;
         }
     }
 }
@@ -116,13 +106,11 @@ Foam::Matrix<Form, Type>::Matrix(const Matrix<Form, Type>& a)
     if (a.v_)
     {
         allocate();
-        Type* v = v_[0];
-        const Type* av = a.v_[0];
 
-        label mn = nRows_*nCols_;
+        const label mn = size();
         for (label i=0; i<mn; i++)
         {
-            v[i] = av[i];
+            v_[i] = a.v_[i];
         }
     }
 }
@@ -133,12 +121,12 @@ void Foam::Matrix<Form, Type>::clear()
 {
     if (v_)
     {
-        delete[] (v_[0]);
         delete[] v_;
+        v_ = NULL;
     }
+
     nRows_ = 0;
     nCols_ = 0;
-    v_ = NULL;
 }
 
 
@@ -183,12 +171,10 @@ void Foam::Matrix<Form, Type>::operator=(const Type& t)
 {
     if (v_)
     {
-        Type* v = v_[0];
-
-        label mn = nRows_*nCols_;
+        const label mn = size();
         for (label i=0; i<mn; i++)
         {
-            v[i] = t;
+            v_[i] = t;
         }
     }
 }
@@ -214,13 +200,10 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
 
     if (v_)
     {
-        Type* v = v_[0];
-        const Type* av = a.v_[0];
-
-        label mn = nRows_*nCols_;
+        const label mn = size();
         for (label i=0; i<mn; i++)
         {
-            v[i] = av[i];
+            v_[i] = a.v_[i];
         }
     }
 }
@@ -231,12 +214,12 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
 template<class Form, class Type>
 const Type& Foam::max(const Matrix<Form, Type>& a)
 {
-    label mn = a.m()*a.n();
+    const label mn = a.size();
 
     if (mn)
     {
         label curMaxI = 0;
-        const Type* v = a[0];
+        const Type* v = a.v();
 
         for (label i=1; i<mn; i++)
         {
@@ -263,12 +246,12 @@ const Type& Foam::max(const Matrix<Form, Type>& a)
 template<class Form, class Type>
 const Type& Foam::min(const Matrix<Form, Type>& a)
 {
-    label mn = a.m()*a.n();
+    const label mn = a.size();
 
     if (mn)
     {
         label curMinI = 0;
-        const Type* v = a[0];
+        const Type* v = a.v();
 
         for (label i=1; i<mn; i++)
         {
@@ -301,10 +284,10 @@ Form Foam::operator-(const Matrix<Form, Type>& a)
 
     if (a.m() && a.n())
     {
-        Type* nav = na[0];
-        const Type* av = a[0];
+        Type* nav = na.v();
+        const Type* av = a.v();
 
-        label mn = a.m()*a.n();
+        const label mn = a.size();
         for (label i=0; i<mn; i++)
         {
             nav[i] = -av[i];
@@ -336,11 +319,11 @@ Form Foam::operator+(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 
     Form ab(a.m(), a.n());
 
-    Type* abv = ab[0];
-    const Type* av = a[0];
-    const Type* bv = b[0];
+    Type* abv = ab.v();
+    const Type* av = a.v();
+    const Type* bv = b.v();
 
-    label mn = a.m()*a.n();
+    const label mn = a.size();
     for (label i=0; i<mn; i++)
     {
         abv[i] = av[i] + bv[i];
@@ -371,11 +354,11 @@ Form Foam::operator-(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 
     Form ab(a.m(), a.n());
 
-    Type* abv = ab[0];
-    const Type* av = a[0];
-    const Type* bv = b[0];
+    Type* abv = ab.v();
+    const Type* av = a.v();
+    const Type* bv = b.v();
 
-    label mn = a.m()*a.n();
+    const label mn = a.size();
     for (label i=0; i<mn; i++)
     {
         abv[i] = av[i] - bv[i];
@@ -392,10 +375,10 @@ Form Foam::operator*(const scalar s, const Matrix<Form, Type>& a)
 
     if (a.m() && a.n())
     {
-        Type* sav = sa[0];
-        const Type* av = a[0];
+        Type* sav = sa.v();
+        const Type* av = a.v();
 
-        label mn = a.m()*a.n();
+        const label mn = a.size();
         for (label i=0; i<mn; i++)
         {
             sav[i] = s*av[i];
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 49bf41fc6f..043b9561aa 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -79,10 +79,9 @@ class Matrix
         label nRows_, nCols_;
 
         //- Row pointers
-        Type** __restrict__ v_;
+        Type* __restrict__ v_;
 
-        //- Allocate the storage for the row-pointers and the data
-        //  and set the row pointers
+        //- Allocate the storage for the element vector
         void allocate();
 
 
@@ -100,11 +99,11 @@ public:
         inline Matrix();
 
         //- Construct given number of rows and columns.
-        Matrix(const label n, const label m);
+        Matrix(const label m, const label n);
 
         //- Construct with given number of rows and columns
         //  and value for all elements.
-        Matrix(const label n, const label m, const Type&);
+        Matrix(const label m, const label n, const Type&);
 
         //- Copy constructor.
         Matrix(const Matrix<Form, Type>&);
@@ -130,16 +129,16 @@ public:
             //- Return the number of columns
             inline label n() const;
 
-            //- Return the number of elements in matrix (n*m)
+            //- Return the number of elements in matrix (m*n)
             inline label size() const;
 
 
         // Check
 
-            //- Check index i is within valid range (0 ... n-1).
+            //- Check index i is within valid range (0 ... m-1).
             inline void checki(const label i) const;
 
-            //- Check index j is within valid range (0 ... m-1).
+            //- Check index j is within valid range (0 ... n-1).
             inline void checkj(const label j) const;
 
 
@@ -159,12 +158,24 @@ public:
 
     // Member operators
 
+        //- Return element vector of the constant Matrix
+        inline const Type* v() const;
+
+        //- Return element vector of the Matrix
+        inline Type* v();
+
         //- Return subscript-checked row of Matrix.
         inline Type* operator[](const label);
 
         //- Return subscript-checked row of constant Matrix.
         inline const Type* operator[](const label) const;
 
+        //- (i, j) const element access operator
+        inline const Type& operator()(const label i, const label j) const;
+
+        //- (i, j) element access operator
+        inline Type& operator()(const label i, const label j);
+
         //- Assignment operator. Takes linear time.
         void operator=(const Matrix<Form, Type>&);
 
@@ -221,13 +232,14 @@ template<class Form, class Type> Form operator*
     const Matrix<Form, Type>&
 );
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    #include "MatrixI.H"
+#include "MatrixI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index fbfd446281..b9ecb4c744 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H
@@ -51,7 +51,6 @@ inline const Foam::Matrix<Form, Type>& Foam::Matrix<Form, Type>::null()
 }
 
 
-//- Return the number of rows
 template<class Form, class Type>
 inline Foam::label Foam::Matrix<Form, Type>::m() const
 {
@@ -76,6 +75,7 @@ inline Foam::label Foam::Matrix<Form, Type>::size() const
 template<class Form, class Type>
 inline void Foam::Matrix<Form, Type>::checki(const label i) const
 {
+    #ifdef FULLDEBUG
     if (!nRows_)
     {
         FatalErrorInFunction
@@ -88,12 +88,14 @@ inline void Foam::Matrix<Form, Type>::checki(const label i) const
             << "index " << i << " out of range 0 ... " << nRows_-1
             << abort(FatalError);
     }
+    #endif
 }
 
 
 template<class Form, class Type>
 inline void Foam::Matrix<Form, Type>::checkj(const label j) const
 {
+    #ifdef FULLDEBUG
     if (!nCols_)
     {
         FatalErrorInFunction
@@ -106,28 +108,65 @@ inline void Foam::Matrix<Form, Type>::checkj(const label j) const
             << "index " << j << " out of range 0 ... " << nCols_-1
             << abort(FatalError);
     }
+    #endif
 }
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Form, class Type>
-inline Type* Foam::Matrix<Form, Type>::operator[](const label i)
+inline const Type* Foam::Matrix<Form, Type>::v() const
+{
+    return v_;
+}
+
+
+template<class Form, class Type>
+inline Type* Foam::Matrix<Form, Type>::v()
+{
+    return v_;
+}
+
+
+template<class Form, class Type>
+inline const Type& Foam::Matrix<Form, Type>::operator()
+(
+    const label i,
+    const label j
+) const
 {
-    #ifdef FULLDEBUG
     checki(i);
-    #endif
-    return v_[i];
+    checki(j);
+    return v_[i*nCols_ + j];
+}
+
+
+template<class Form, class Type>
+inline Type& Foam::Matrix<Form, Type>::operator()
+(
+    const label i,
+    const label j
+)
+{
+    checki(i);
+    checki(j);
+    return v_[i*nCols_ + j];
 }
 
 
 template<class Form, class Type>
 inline const Type* Foam::Matrix<Form, Type>::operator[](const label i) const
 {
-    #ifdef FULLDEBUG
     checki(i);
-    #endif
-    return v_[i];
+    return v_ + i*nCols_;
+}
+
+
+template<class Form, class Type>
+inline Type* Foam::Matrix<Form, Type>::operator[](const label i)
+{
+    checki(i);
+    return v_ + i*nCols_;
 }
 
 
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixIO.C b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
index edf2c54b22..9be178c12f 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixIO.C
+++ b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
@@ -73,7 +73,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
             if (mn)
             {
                 M.allocate();
-                Type* v = M.v_[0];
+                Type* v = M.v_;
 
                 if (listDelimiter == token::BEGIN_LIST)
                 {
@@ -124,7 +124,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
             if (mn)
             {
                 M.allocate();
-                Type* v = M.v_[0];
+                Type* v = M.v_;
 
                 is.read(reinterpret_cast<char*>(v), mn*sizeof(Type));
 
@@ -162,7 +162,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
         {
             bool uniform = false;
 
-            const Type* v = M.v_[0];
+            const Type* v = M.v_;
 
             if (mn > 1 && contiguous<Type>())
             {
@@ -248,7 +248,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
     {
         if (mn)
         {
-            os.write(reinterpret_cast<const char*>(M.v_[0]), mn*sizeof(Type));
+            os.write(reinterpret_cast<const char*>(M.v_), mn*sizeof(Type));
         }
     }
 
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
index 59ca2d34e5..077fa60ced 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
@@ -56,8 +56,6 @@ void Foam::solve
 
         if (i != iMax)
         {
-            //Info<< "Pivoted on " << i << " " << iMax << endl;
-
             for (label k=i; k<m; k++)
             {
                 Swap(tmpMatrix[i][k], tmpMatrix[iMax][k]);
diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
index 7d1b1186f4..fd0beaca09 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
@@ -279,12 +279,12 @@ public:
         //- (i, j) const element access operator
         inline const Cmpt& operator()
         (
-            const direction& row,
-            const direction& col
+            const direction& i,
+            const direction& j
         ) const;
 
         //- (i, j) element access operator
-        inline Cmpt& operator()(const direction& row, const direction& col);
+        inline Cmpt& operator()(const direction& i, const direction& j);
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
index a7afa55fdf..3fca897851 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
@@ -322,12 +322,12 @@ Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::block()
 template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
 inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
 (
-    const direction& row,
-    const direction& col
+    const direction& i,
+    const direction& j
 ) const
 {
     #ifdef FULLDEBUG
-    if (row < 0 || row > Nrows-1 || col < 0 || col > Ncols-1)
+    if (i < 0 || i > Nrows-1 || j < 0 || j > Ncols-1)
     {
         FatalErrorInFunction
             << "indices out of range"
@@ -335,19 +335,19 @@ inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
     }
     #endif
 
-    return this->v_[row*Ncols + col];
+    return this->v_[i*Ncols + j];
 }
 
 
 template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
 inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
 (
-    const direction& row,
-    const direction& col
+    const direction& i,
+    const direction& j
 )
 {
     #ifdef FULLDEBUG
-    if (row < 0 || row > Nrows-1 || col < 0 || col > Ncols-1)
+    if (i < 0 || i > Nrows-1 || j < 0 || j > Ncols-1)
     {
         FatalErrorInFunction
             << "indices out of range"
@@ -355,7 +355,7 @@ inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
     }
     #endif
 
-    return this->v_[row*Ncols + col];
+    return this->v_[i*Ncols + j];
 }
 
 

From 67a51b1fdddb8e9eaea58d13173c64d0464a7fac Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 20 Mar 2016 19:44:29 +0000
Subject: [PATCH 302/447] Matrix: Added (i, j) addressing to allow support for
 addressing blocks of the matrix

This change brings OpenFOAM into line with the standard matrix
addressing in other C++ libraries for better interoperability.
---
 applications/test/Matrix/Test-Matrix.C        | 54 ++++++++++------
 applications/test/ODE/Test-ODE.C              | 34 +++++-----
 .../test/simpleMatrix/Test-simpleMatrix.C     | 20 +++---
 .../surfaceFeatureExtract.C                   | 10 +--
 src/ODE/ODESolvers/EulerSI/EulerSI.C          |  6 +-
 .../ODESolvers/Rosenbrock12/Rosenbrock12.C    |  6 +-
 .../ODESolvers/Rosenbrock23/Rosenbrock23.C    |  6 +-
 .../ODESolvers/Rosenbrock34/Rosenbrock34.C    |  6 +-
 src/ODE/ODESolvers/SIBS/SIMPR.C               |  6 +-
 src/ODE/ODESolvers/SIBS/polyExtrapolate.C     |  4 +-
 src/ODE/ODESolvers/rodas23/rodas23.C          |  6 +-
 src/ODE/ODESolvers/rodas34/rodas34.C          |  6 +-
 src/ODE/ODESolvers/seulex/seulex.C            | 14 ++---
 .../matrices/DiagonalMatrix/DiagonalMatrix.C  |  2 +-
 src/OpenFOAM/matrices/Matrix/Matrix.C         |  8 +--
 src/OpenFOAM/matrices/Matrix/MatrixI.H        |  4 +-
 .../matrices/SquareMatrix/SquareMatrix.C      |  2 +-
 .../SymmetricSquareMatrix.C                   |  8 +--
 .../SymmetricSquareMatrix.H                   |  7 ---
 .../SymmetricSquareMatrixI.H                  | 36 -----------
 .../matrices/scalarMatrices/SVD/SVD.C         | 62 +++++++++----------
 .../matrices/scalarMatrices/scalarMatrices.C  | 26 ++++----
 .../scalarMatrices/scalarMatricesTemplates.C  | 18 +++---
 .../CentredFitSnGrad/CentredFitSnGradData.C   | 26 ++++----
 .../schemes/FitData/FitData.C                 | 14 ++---
 .../chemistryModel/chemistryModel.C           |  2 +-
 .../EulerImplicit/EulerImplicit.C             |  6 +-
 .../radiationModels/viewFactor/viewFactor.C   | 20 +++---
 .../pyrolysisChemistryModel.C                 |  2 +-
 29 files changed, 197 insertions(+), 224 deletions(-)

diff --git a/applications/test/Matrix/Test-Matrix.C b/applications/test/Matrix/Test-Matrix.C
index 380576d695..3e14e57085 100644
--- a/applications/test/Matrix/Test-Matrix.C
+++ b/applications/test/Matrix/Test-Matrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,15 +36,15 @@ int main(int argc, char *argv[])
 {
     SquareMatrix<scalar> hmm(3);
 
-    hmm[0][0] = -3.0;
-    hmm[0][1] = 10.0;
-    hmm[0][2] = -4.0;
-    hmm[1][0] = 2.0;
-    hmm[1][1] = 3.0;
-    hmm[1][2] = 10.0;
-    hmm[2][0] = 2.0;
-    hmm[2][1] = 6.0;
-    hmm[2][2] = 1.0;
+    hmm(0, 0) = -3.0;
+    hmm(0, 1) = 10.0;
+    hmm(0, 2) = -4.0;
+    hmm(1, 0) = 2.0;
+    hmm(1, 1) = 3.0;
+    hmm(1, 2) = 10.0;
+    hmm(2, 0) = 2.0;
+    hmm(2, 1) = 6.0;
+    hmm(2, 2) = 1.0;
 
     //Info<< hmm << endl << hmm - 2.0*(-hmm) << endl;
     Info<< max(hmm) << endl;
@@ -106,15 +106,15 @@ int main(int argc, char *argv[])
     {
         scalarSquareMatrix squareMatrix(3, 3, 0);
 
-        squareMatrix[0][0] = 4;
-        squareMatrix[0][1] = 12;
-        squareMatrix[0][2] = -16;
-        squareMatrix[1][0] = 12;
-        squareMatrix[1][1] = 37;
-        squareMatrix[1][2] = -43;
-        squareMatrix[2][0] = -16;
-        squareMatrix[2][1] = -43;
-        squareMatrix[2][2] = 98;
+        squareMatrix(0, 0) = 4;
+        squareMatrix(0, 1) = 12;
+        squareMatrix(0, 2) = -16;
+        squareMatrix(1, 0) = 12;
+        squareMatrix(1, 1) = 37;
+        squareMatrix(1, 2) = -43;
+        squareMatrix(2, 0) = -16;
+        squareMatrix(2, 1) = -43;
+        squareMatrix(2, 2) = 98;
 
         const scalarSquareMatrix squareMatrixCopy = squareMatrix;
         Info<< nl << "Square Matrix = " << squareMatrix << endl;
@@ -131,6 +131,22 @@ int main(int argc, char *argv[])
         Info<< "det = " << detDecomposed(squareMatrix, sign) << endl;
     }
 
+    {
+        scalarSquareMatrix squareMatrix(3000, 3000, 1);
+
+        for(label i=0; i<squareMatrix.n(); i++)
+        {
+            squareMatrix(i, i) = 10;
+        }
+
+        scalarField rhs(squareMatrix.n(), 0);
+        rhs[0] = 1;
+        rhs[1] = 2;
+        rhs[2] = 3;
+
+        LUsolve(squareMatrix, rhs);
+    }
+
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/applications/test/ODE/Test-ODE.C b/applications/test/ODE/Test-ODE.C
index ae20374259..689c634fdb 100644
--- a/applications/test/ODE/Test-ODE.C
+++ b/applications/test/ODE/Test-ODE.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,25 +75,25 @@ public:
         dfdx[2] = (2.0/sqr(x))*y[2];
         dfdx[3] = (3.0/sqr(x))*y[3];
 
-        dfdy[0][0] = 0.0;
-        dfdy[0][1] = -1.0;
-        dfdy[0][2] = 0.0;
-        dfdy[0][3] = 0.0;
+        dfdy(0, 0) = 0.0;
+        dfdy(0, 1) = -1.0;
+        dfdy(0, 2) = 0.0;
+        dfdy(0, 3) = 0.0;
 
-        dfdy[1][0] = 1.0;
-        dfdy[1][1] = -1.0/x;
-        dfdy[1][2] = 0.0;
-        dfdy[1][3] = 0.0;
+        dfdy(1, 0) = 1.0;
+        dfdy(1, 1) = -1.0/x;
+        dfdy(1, 2) = 0.0;
+        dfdy(1, 3) = 0.0;
 
-        dfdy[2][0] = 0.0;
-        dfdy[2][1] = 1.0;
-        dfdy[2][2] = -2.0/x;
-        dfdy[2][3] = 0.0;
+        dfdy(2, 0) = 0.0;
+        dfdy(2, 1) = 1.0;
+        dfdy(2, 2) = -2.0/x;
+        dfdy(2, 3) = 0.0;
 
-        dfdy[3][0] = 0.0;
-        dfdy[3][1] = 0.0;
-        dfdy[3][2] = 1.0;
-        dfdy[3][3] = -3.0/x;
+        dfdy(3, 0) = 0.0;
+        dfdy(3, 1) = 0.0;
+        dfdy(3, 2) = 1.0;
+        dfdy(3, 3) = -3.0/x;
     }
 };
 
diff --git a/applications/test/simpleMatrix/Test-simpleMatrix.C b/applications/test/simpleMatrix/Test-simpleMatrix.C
index e5010212e7..d67b9d3bde 100644
--- a/applications/test/simpleMatrix/Test-simpleMatrix.C
+++ b/applications/test/simpleMatrix/Test-simpleMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,15 +35,15 @@ int main(int argc, char *argv[])
 {
     simpleMatrix<vector> hmm(3);
 
-    hmm[0][0] = -3.0;
-    hmm[0][1] = 10.0;
-    hmm[0][2] = -4.0;
-    hmm[1][0] = 2.0;
-    hmm[1][1] = 3.0;
-    hmm[1][2] = 10.0;
-    hmm[2][0] = 2.0;
-    hmm[2][1] = 6.0;
-    hmm[2][2] = 1.0;
+    hmm(0, 0) = -3.0;
+    hmm(0, 1) = 10.0;
+    hmm(0, 2) = -4.0;
+    hmm(1, 0) = 2.0;
+    hmm(1, 1) = 3.0;
+    hmm(1, 2) = 10.0;
+    hmm(2, 0) = 2.0;
+    hmm(2, 1) = 6.0;
+    hmm(2, 2) = 1.0;
 
     hmm.source()[0] = vector(2.0, 1.0, 3.0);
     hmm.source()[1] = vector(1.0, 4.0, 3.0);
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 542c9ba4af..510305f28c 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -312,11 +312,11 @@ triSurfacePointScalarField calcCurvature
             scalar x = edgeVectors[i] & faceCoordSys[0];
             scalar y = edgeVectors[i] & faceCoordSys[1];
 
-            T[0][0] += sqr(x);
-            T[1][0] += x*y;
-            T[1][1] += sqr(x) + sqr(y);
-            T[2][1] += x*y;
-            T[2][2] += sqr(y);
+            T(0, 0) += sqr(x);
+            T(1, 0) += x*y;
+            T(1, 1) += sqr(x) + sqr(y);
+            T(2, 1) += x*y;
+            T(2, 2) += sqr(y);
 
             scalar dndx = normalDifferences[i] & faceCoordSys[0];
             scalar dndy = normalDifferences[i] & faceCoordSys[1];
diff --git a/src/ODE/ODESolvers/EulerSI/EulerSI.C b/src/ODE/ODESolvers/EulerSI/EulerSI.C
index 91a60461a1..0648b26649 100644
--- a/src/ODE/ODESolvers/EulerSI/EulerSI.C
+++ b/src/ODE/ODESolvers/EulerSI/EulerSI.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,10 +67,10 @@ Foam::scalar Foam::EulerSI::solve
     {
         for (label j=0; j<n_; j++)
         {
-            a_[i][j] = -dfdy_[i][j];
+            a_(i, j) = -dfdy_(i, j);
         }
 
-        a_[i][i] += 1.0/dx;
+        a_(i, i) += 1.0/dx;
     }
 
     LUDecompose(a_, pivotIndices_);
diff --git a/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.C b/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.C
index f5fd2b94bd..fa163aec0e 100644
--- a/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.C
+++ b/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,10 +81,10 @@ Foam::scalar Foam::Rosenbrock12::solve
     {
         for (label j=0; j<n_; j++)
         {
-            a_[i][j] = -dfdy_[i][j];
+            a_(i, j) = -dfdy_(i, j);
         }
 
-        a_[i][i] += 1.0/(gamma*dx);
+        a_(i, i) += 1.0/(gamma*dx);
     }
 
     LUDecompose(a_, pivotIndices_);
diff --git a/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.C b/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.C
index 495f351e8d..3b6c8cf463 100644
--- a/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.C
+++ b/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,10 +94,10 @@ Foam::scalar Foam::Rosenbrock23::solve
     {
         for (label j=0; j<n_; j++)
         {
-            a_[i][j] = -dfdy_[i][j];
+            a_(i, j) = -dfdy_(i, j);
         }
 
-        a_[i][i] += 1.0/(gamma*dx);
+        a_(i, i) += 1.0/(gamma*dx);
     }
 
     LUDecompose(a_, pivotIndices_);
diff --git a/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.C b/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.C
index db16f61959..5b761b267f 100644
--- a/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.C
+++ b/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,10 +139,10 @@ Foam::scalar Foam::Rosenbrock34::solve
     {
         for (label j=0; j<n_; j++)
         {
-            a_[i][j] = -dfdy_[i][j];
+            a_(i, j) = -dfdy_(i, j);
         }
 
-        a_[i][i] += 1.0/(gamma*dx);
+        a_(i, i) += 1.0/(gamma*dx);
     }
 
     LUDecompose(a_, pivotIndices_);
diff --git a/src/ODE/ODESolvers/SIBS/SIMPR.C b/src/ODE/ODESolvers/SIBS/SIMPR.C
index 0017d4c23b..d747b36dc6 100644
--- a/src/ODE/ODESolvers/SIBS/SIMPR.C
+++ b/src/ODE/ODESolvers/SIBS/SIMPR.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,9 +46,9 @@ void Foam::SIBS::SIMPR
     {
         for (label j=0; j<n_; j++)
         {
-            a[i][j] = -h*dfdy[i][j];
+            a(i, j) = -h*dfdy(i, j);
         }
-        ++a[i][i];
+        ++a(i, i);
     }
 
     labelList pivotIndices(n_);
diff --git a/src/ODE/ODESolvers/SIBS/polyExtrapolate.C b/src/ODE/ODESolvers/SIBS/polyExtrapolate.C
index 8b1c72d09d..3f74d20915 100644
--- a/src/ODE/ODESolvers/SIBS/polyExtrapolate.C
+++ b/src/ODE/ODESolvers/SIBS/polyExtrapolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ void Foam::SIBS::polyExtrapolate
     {
         for (label j=0; j<n; j++)
         {
-            d[j][0] = yest[j];
+            d(j, 0) = yest[j];
         }
     }
     else
diff --git a/src/ODE/ODESolvers/rodas23/rodas23.C b/src/ODE/ODESolvers/rodas23/rodas23.C
index af4540b96d..31d5e8acee 100644
--- a/src/ODE/ODESolvers/rodas23/rodas23.C
+++ b/src/ODE/ODESolvers/rodas23/rodas23.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,10 +85,10 @@ Foam::scalar Foam::rodas23::solve
     {
         for (label j=0; j<n_; j++)
         {
-            a_[i][j] = -dfdy_[i][j];
+            a_(i, j) = -dfdy_(i, j);
         }
 
-        a_[i][i] += 1.0/(gamma*dx);
+        a_(i, i) += 1.0/(gamma*dx);
     }
 
     LUDecompose(a_, pivotIndices_);
diff --git a/src/ODE/ODESolvers/rodas34/rodas34.C b/src/ODE/ODESolvers/rodas34/rodas34.C
index 6a15ad1913..5f403238d7 100644
--- a/src/ODE/ODESolvers/rodas34/rodas34.C
+++ b/src/ODE/ODESolvers/rodas34/rodas34.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,10 +108,10 @@ Foam::scalar Foam::rodas34::solve
     {
         for (label j=0; j<n_; j++)
         {
-            a_[i][j] = -dfdy_[i][j];
+            a_(i, j) = -dfdy_(i, j);
         }
 
-        a_[i][i] += 1.0/(gamma*dx);
+        a_(i, i) += 1.0/(gamma*dx);
     }
 
     LUDecompose(a_, pivotIndices_);
diff --git a/src/ODE/ODESolvers/seulex/seulex.C b/src/ODE/ODESolvers/seulex/seulex.C
index 51389d0779..f91a55557e 100644
--- a/src/ODE/ODESolvers/seulex/seulex.C
+++ b/src/ODE/ODESolvers/seulex/seulex.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ Foam::seulex::seulex(const ODESystem& ode, const dictionary& dict)
         for (int l=0; l<k; l++)
         {
             scalar ratio = scalar(nSeq_[k])/nSeq_[l];
-            coeff_[k][l] = 1.0/(ratio - 1.0);
+            coeff_(k, l) = 1.0/(ratio - 1.0);
         }
     }
 }
@@ -117,10 +117,10 @@ bool Foam::seulex::seul
     {
         for (label j=0; j<n_; j++)
         {
-            a_[i][j] = -dfdy_[i][j];
+            a_(i, j) = -dfdy_(i, j);
         }
 
-        a_[i][i] += 1.0/dx;
+        a_(i, i) += 1.0/dx;
     }
 
     LUDecompose(a_, pivotIndices_);
@@ -192,13 +192,13 @@ void Foam::seulex::extrapolate
         for (label i=0; i<n_; i++)
         {
             table[j-1][i] =
-                table[j][i] + coeff_[k][j]*(table[j][i] - table[j-1][i]);
+                table(j, i) + coeff_(k, j)*(table(j, i) - table[j-1][i]);
         }
     }
 
     for (int i=0; i<n_; i++)
     {
-        y[i] = table[0][i] + coeff_[k][0]*(table[0][i] - y[i]);
+        y[i] = table(0, i) + coeff_(k, 0)*(table(0, i) - y[i]);
     }
 }
 
@@ -288,7 +288,7 @@ void Foam::seulex::solve
                 forAll(scale_, i)
                 {
                     scale_[i] = absTol_[i] + relTol_[i]*mag(y0_[i]);
-                    err += sqr((y[i] - table_[0][i])/scale_[i]);
+                    err += sqr((y[i] - table_(0, i))/scale_[i]);
                 }
                 err = sqrt(err/n_);
                 if (err > 1.0/SMALL || (k > 1 && err >= errOld))
diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
index 69844cd403..4345ed2406 100644
--- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
+++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
@@ -42,7 +42,7 @@ Foam::DiagonalMatrix<Type>::DiagonalMatrix(const Matrix<Form, Type>& a)
 {
     forAll(*this, i)
     {
-        this->operator[](i) = a[i][i];
+        this->operator[](i) = a(i, i);
     }
 }
 
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index 829156693c..6ccd1c79e5 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -156,7 +156,7 @@ Form Foam::Matrix<Form, Type>::T() const
     {
         for (label j=0; j<n(); j++)
         {
-            At[j][i] = A[i][j];
+            At(j, i) = A(i, j);
         }
     }
 
@@ -238,7 +238,7 @@ const Type& Foam::max(const Matrix<Form, Type>& a)
             << abort(FatalError);
 
         // Return in error to keep compiler happy
-        return a[0][0];
+        return a(0, 0);
     }
 }
 
@@ -270,7 +270,7 @@ const Type& Foam::min(const Matrix<Form, Type>& a)
             << abort(FatalError);
 
         // Return in error to keep compiler happy
-        return a[0][0];
+        return a(0, 0);
     }
 }
 
@@ -411,7 +411,7 @@ Form Foam::operator*(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
         {
             for (label l = 0; l < b.m(); l++)
             {
-                ab[i][j] += a[i][l]*b[l][j];
+                ab(i, j) += a(i, l)*b(l, j);
             }
         }
     }
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index b9ecb4c744..532e9df3f8 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H
@@ -136,7 +136,7 @@ inline const Type& Foam::Matrix<Form, Type>::operator()
 ) const
 {
     checki(i);
-    checki(j);
+    checkj(j);
     return v_[i*nCols_ + j];
 }
 
@@ -149,7 +149,7 @@ inline Type& Foam::Matrix<Form, Type>::operator()
 )
 {
     checki(i);
-    checki(j);
+    checkj(j);
     return v_[i*nCols_ + j];
 }
 
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
index e8e7dd0e8c..74439c15de 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
@@ -39,7 +39,7 @@ Foam::scalar Foam::detDecomposed
 
     for (label i = 0; i < matrix.m(); ++i)
     {
-        diagProduct *= matrix[i][i];
+        diagProduct *= matrix(i, i);
     }
 
     return sign*diagProduct;
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
index 1ab99b1240..28ad1d2745 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
@@ -37,7 +37,7 @@ Foam::SymmetricSquareMatrix<Type> Foam::invDecomposed
 
     for (label i = 0; i < matrix.m(); ++i)
     {
-        inv[i][i] = 1.0/matrix[i][i];
+        inv(i, i) = 1.0/matrix(i, i);
 
         for (label j = 0; j < i; ++j)
         {
@@ -45,10 +45,10 @@ Foam::SymmetricSquareMatrix<Type> Foam::invDecomposed
 
             for (label k = j; k < i; k++)
             {
-                sum -= matrix[i][k]*inv[k][j];
+                sum -= matrix(i, k)*inv(k, j);
             }
 
-            inv[i][j] = sum/matrix[i][i];
+            inv(i, j) = sum/matrix(i, i);
         }
     }
 
@@ -77,7 +77,7 @@ Foam::scalar Foam::detDecomposed(const SymmetricSquareMatrix<Type>& matrix)
 
     for (label i = 0; i < matrix.m(); ++i)
     {
-        diagProduct *= matrix[i][i];
+        diagProduct *= matrix(i, i);
     }
 
     return sqr(diagProduct);
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
index a5050b24c8..193ee1602f 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
@@ -76,13 +76,6 @@ public:
 
         //- Clone
         inline autoPtr<SymmetricSquareMatrix<Type>> clone() const;
-
-
-        //- Return subscript-checked row of Matrix.
-        inline Type& operator()(const label r, const label c);
-
-        //- Return subscript-checked row of constant Matrix.
-        inline const Type& operator()(const label r, const label c) const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
index 00757eabc6..a363026aac 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
@@ -94,40 +94,4 @@ Foam::SymmetricSquareMatrix<Type>::clone() const
 }
 
 
-template<class Type>
-inline Type& Foam::SymmetricSquareMatrix<Type>::operator()
-(
-    const label r,
-    const label c
-)
-{
-    if (r > c)
-    {
-        return this->operator[](r)[c];
-    }
-    else
-    {
-        return this->operator[](c)[r];
-    }
-}
-
-
-template<class Type>
-inline const Type& Foam::SymmetricSquareMatrix<Type>::operator()
-(
-    const label r,
-    const label c
-) const
-{
-    if (r > c)
-    {
-        return this->operator[](r)[c];
-    }
-    else
-    {
-        return this->operator[](c)[r];
-    }
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
index bbe1e21483..1bb8ab1cad 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
@@ -60,40 +60,40 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         {
             for (label k = i; k < Um; k++)
             {
-                scale += mag(U_[k][i]);
+                scale += mag(U_(k, i));
             }
 
             if (scale != 0)
             {
                 for (label k = i; k < Um; k++)
                 {
-                    U_[k][i] /= scale;
-                    s += U_[k][i]*U_[k][i];
+                    U_(k, i) /= scale;
+                    s += U_(k, i)*U_(k, i);
                 }
 
-                scalar f = U_[i][i];
+                scalar f = U_(i, i);
                 g = -sign(Foam::sqrt(s), f);
                 scalar h = f*g - s;
-                U_[i][i] = f - g;
+                U_(i, i) = f - g;
 
                 for (label j = l-1; j < Un; j++)
                 {
                     s = 0;
                     for (label k = i; k < Um; k++)
                     {
-                        s += U_[k][i]*U_[k][j];
+                        s += U_(k, i)*U_(k, j);
                     }
 
                     f = s/h;
                     for (label k = i; k < A.m(); k++)
                     {
-                        U_[k][j] += f*U_[k][i];
+                        U_(k, j) += f*U_(k, i);
                     }
                 }
 
                 for (label k = i; k < Um; k++)
                 {
-                    U_[k][i] *= scale;
+                    U_(k, i) *= scale;
                 }
             }
         }
@@ -106,15 +106,15 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         {
             for (label k = l-1; k < Un; k++)
             {
-                scale += mag(U_[i][k]);
+                scale += mag(U_(i, k));
             }
 
             if (scale != 0)
             {
                 for (label k=l-1; k < Un; k++)
                 {
-                    U_[i][k] /= scale;
-                    s += U_[i][k]*U_[i][k];
+                    U_(i, k) /= scale;
+                    s += U_(i, k)*U_(i, k);
                 }
 
                 scalar f = U_[i][l-1];
@@ -124,7 +124,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
 
                 for (label k = l-1; k < Un; k++)
                 {
-                    rv1[k] = U_[i][k]/h;
+                    rv1[k] = U_(i, k)/h;
                 }
 
                 for (label j = l-1; j < Um; j++)
@@ -132,17 +132,17 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                     s = 0;
                     for (label k = l-1; k < Un; k++)
                     {
-                        s += U_[j][k]*U_[i][k];
+                        s += U_(j, k)*U_(i, k);
                     }
 
                     for (label k = l-1; k < Un; k++)
                     {
-                        U_[j][k] += s*rv1[k];
+                        U_(j, k) += s*rv1[k];
                     }
                 }
                 for (label k = l-1; k < Un; k++)
                 {
-                    U_[i][k] *= scale;
+                    U_(i, k) *= scale;
                 }
             }
         }
@@ -158,7 +158,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
             {
                 for (label j = l; j < Un; j++)
                 {
-                    V_[j][i] = (U_[i][j]/U_[i][l])/g;
+                    V_(j, i) = (U_(i, j)/U_(i, l))/g;
                 }
 
                 for (label j=l; j < Un; j++)
@@ -166,23 +166,23 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                     s = 0;
                     for (label k = l; k < Un; k++)
                     {
-                        s += U_[i][k]*V_[k][j];
+                        s += U_(i, k)*V_(k, j);
                     }
 
                     for (label k = l; k < Un; k++)
                     {
-                        V_[k][j] += s*V_[k][i];
+                        V_(k, j) += s*V_(k, i);
                     }
                 }
             }
 
             for (label j = l; j < Un;j++)
             {
-                V_[i][j] = V_[j][i] = 0.0;
+                V_(i, j) = V_(j, i) = 0.0;
             }
         }
 
-        V_[i][i] = 1;
+        V_(i, i) = 1;
         g = rv1[i];
         l = i;
     }
@@ -194,7 +194,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
 
         for (label j = l; j < Un; j++)
         {
-            U_[i][j] = 0.0;
+            U_(i, j) = 0.0;
         }
 
         if (g != 0)
@@ -206,31 +206,31 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                 s = 0;
                 for (label k = l; k < Um; k++)
                 {
-                    s += U_[k][i]*U_[k][j];
+                    s += U_(k, i)*U_(k, j);
                 }
 
-                scalar f = (s/U_[i][i])*g;
+                scalar f = (s/U_(i, i))*g;
 
                 for (label k = i; k < Um; k++)
                 {
-                    U_[k][j] += f*U_[k][i];
+                    U_(k, j) += f*U_(k, i);
                 }
             }
 
             for (label j = i; j < Um; j++)
             {
-                U_[j][i] *= g;
+                U_(j, i) *= g;
             }
         }
         else
         {
             for (label j = i; j < Um; j++)
             {
-                U_[j][i] = 0.0;
+                U_(j, i) = 0.0;
             }
         }
 
-        ++U_[i][i];
+        ++U_(i, i);
     }
 
     for (label k = Un-1; k >= 0; k--)
@@ -272,9 +272,9 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                     for (label j = 0; j < Um; j++)
                     {
                         scalar y = U_[j][mn];
-                        scalar z = U_[j][i];
+                        scalar z = U_(j, i);
                         U_[j][mn] = y*c + z*s;
-                        U_[j][i] = z*c - y*s;
+                        U_(j, i) = z*c - y*s;
                     }
                 }
             }
@@ -287,7 +287,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                 {
                     S_[k] = -z;
 
-                    for (label j = 0; j < Un; j++) V_[j][k] = -V_[j][k];
+                    for (label j = 0; j < Un; j++) V_(j, k) = -V_(j, k);
                 }
                 break;
             }
@@ -383,7 +383,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
     {
         for (label j = 0; j < A.n(); j++)
         {
-            diff = mag(A[i][j] - SVDA[i][j]);
+            diff = mag(A(i, j) - SVDA(i, j));
             if (diff > maxDiff) maxDiff = diff;
         }
     }
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
index 46e972f729..0317fc27ae 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
@@ -84,7 +84,7 @@ void Foam::LUDecompose
             scalar sum = matrixi[j];
             for (label k=0; k<i; k++)
             {
-                sum -= matrixi[k]*matrix[k][j];
+                sum -= matrixi[k]*matrix(k, j);
             }
             matrixi[j] = sum;
         }
@@ -99,7 +99,7 @@ void Foam::LUDecompose
 
             for (label k=0; k<j; k++)
             {
-                sum -= matrixi[k]*matrix[k][j];
+                sum -= matrixi[k]*matrix(k, j);
             }
 
             matrixi[j] = sum;
@@ -138,7 +138,7 @@ void Foam::LUDecompose
 
             for (label i=j+1; i<m; i++)
             {
-                matrix[i][j] *= rDiag;
+                matrix(i, j) *= rDiag;
             }
         }
     }
@@ -155,7 +155,7 @@ void Foam::LUDecompose(scalarSymmetricSquareMatrix& matrix)
     {
         for (label k = j + 1; k < size; k++)
         {
-            matrix[j][k] = 0.0;
+            matrix(j, k) = 0.0;
         }
     }
 
@@ -169,18 +169,18 @@ void Foam::LUDecompose(scalarSymmetricSquareMatrix& matrix)
 
             for (label i = 0; i < k; i++)
             {
-                s += matrix[i][k]*matrix[i][j];
+                s += matrix(i, k)*matrix(i, j);
             }
 
-            s = (matrix[j][k] - s)/matrix[k][k];
+            s = (matrix(j, k) - s)/matrix(k, k);
 
-            matrix[k][j] = s;
-            matrix[j][k] = s;
+            matrix(k, j) = s;
+            matrix(j, k) = s;
 
             d += sqr(s);
         }
 
-        d = matrix[j][j] - d;
+        d = matrix(j, j) - d;
 
         if (d < 0.0)
         {
@@ -190,7 +190,7 @@ void Foam::LUDecompose(scalarSymmetricSquareMatrix& matrix)
                 << abort(FatalError);
         }
 
-        matrix[j][j] = sqrt(d);
+        matrix(j, j) = sqrt(d);
     }
 }
 
@@ -232,9 +232,9 @@ void Foam::multiply
                 scalar ab = 0;
                 for (label j = 0; j < A.n(); j++)
                 {
-                    ab += A[i][j]*B[j][l];
+                    ab += A(i, j)*B(j, l);
                 }
-                ans[i][g] += C[l][g] * ab;
+                ans(i, g) += C(l, g) * ab;
             }
         }
     }
@@ -273,7 +273,7 @@ void Foam::multiply
         {
             for (label l = 0; l < C.m(); l++)
             {
-                ans[i][g] += C[l][g] * A[i][l]*B[l];
+                ans(i, g) += C(l, g) * A(i, l)*B[l];
             }
         }
     }
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
index 077fa60ced..c6acc739e2 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
@@ -47,7 +47,7 @@ void Foam::solve
         // Swap entries around to find a good pivot
         for (label j=i+1; j<m; j++)
         {
-            if (mag(tmpMatrix[j][i]) > largestCoeff)
+            if (mag(tmpMatrix(j, i)) > largestCoeff)
             {
                 iMax = j;
                 largestCoeff = mag(tmpMatrix[iMax][i]);
@@ -58,13 +58,13 @@ void Foam::solve
         {
             for (label k=i; k<m; k++)
             {
-                Swap(tmpMatrix[i][k], tmpMatrix[iMax][k]);
+                Swap(tmpMatrix(i, k), tmpMatrix[iMax][k]);
             }
             Swap(sourceSol[i], sourceSol[iMax]);
         }
 
         // Check that the system of equations isn't singular
-        if (mag(tmpMatrix[i][i]) < 1e-20)
+        if (mag(tmpMatrix(i, i)) < 1e-20)
         {
             FatalErrorInFunction
                 << "Singular Matrix"
@@ -74,12 +74,12 @@ void Foam::solve
         // Reduce to upper triangular form
         for (label j=i+1; j<m; j++)
         {
-            sourceSol[j] -= sourceSol[i]*(tmpMatrix[j][i]/tmpMatrix[i][i]);
+            sourceSol[j] -= sourceSol[i]*(tmpMatrix(j, i)/tmpMatrix(i, i));
 
             for (label k=m-1; k>=i; k--)
             {
-                tmpMatrix[j][k] -=
-                    tmpMatrix[i][k]*tmpMatrix[j][i]/tmpMatrix[i][i];
+                tmpMatrix(j, k) -=
+                    tmpMatrix(i, k)*tmpMatrix(j, i)/tmpMatrix(i, i);
             }
         }
     }
@@ -91,10 +91,10 @@ void Foam::solve
 
         for (label k=j+1; k<m; k++)
         {
-            ntempvec += tmpMatrix[j][k]*sourceSol[k];
+            ntempvec += tmpMatrix(j, k)*sourceSol[k];
         }
 
-        sourceSol[j] = (sourceSol[j] - ntempvec)/tmpMatrix[j][j];
+        sourceSol[j] = (sourceSol[j] - ntempvec)/tmpMatrix(j, j);
     }
 }
 
@@ -257,7 +257,7 @@ void Foam::multiply
         {
             for (label l = 0; l < B.m(); l++)
             {
-                ans[i][j] += A[i][l]*B[l][j];
+                ans(i, j) += A(i, l)*B(l, j);
             }
         }
     }
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
index 8820a78e6c..b1bf85aa8e 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
@@ -122,8 +122,8 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit
     // Additional weighting for constant and linear terms
     for (label i = 0; i < B.m(); i++)
     {
-        B[i][0] *= wts[0];
-        B[i][1] *= wts[0];
+        B(i, 0) *= wts[0];
+        B(i, 1) *= wts[0];
     }
 
     // Set the fit
@@ -137,14 +137,14 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit
 
         for (label i=0; i<stencilSize; i++)
         {
-            coeffsi[i] = wts[1]*wts[i]*svd.VSinvUt()[1][i]/scale;
+            coeffsi[i] = wts[1]*wts[i]*svd.VSinvUt()(1, i)/scale;
         }
 
         goodFit =
         (
-            mag(wts[0]*wts[0]*svd.VSinvUt()[0][0] - wLin)
+            mag(wts[0]*wts[0]*svd.VSinvUt()(0, 0) - wLin)
           < this->linearLimitFactor()*wLin)
-         && (mag(wts[0]*wts[1]*svd.VSinvUt()[0][1] - (1 - wLin)
+         && (mag(wts[0]*wts[1]*svd.VSinvUt()(0, 1) - (1 - wLin)
         ) < this->linearLimitFactor()*(1 - wLin))
          && coeffsi[0] < 0 && coeffsi[1] > 0
          && mag(coeffsi[0] + deltaCoeff) < 0.5*deltaCoeff
@@ -163,10 +163,10 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit
                 << "    deltaCoeff " << deltaCoeff << nl
                 << "    sing vals " << svd.S() << nl
                 << "Components of goodFit:\n"
-                << "    wts[0]*wts[0]*svd.VSinvUt()[0][0] = "
-                << wts[0]*wts[0]*svd.VSinvUt()[0][0] << nl
-                << "    wts[0]*wts[1]*svd.VSinvUt()[0][1] = "
-                << wts[0]*wts[1]*svd.VSinvUt()[0][1]
+                << "    wts[0]*wts[0]*svd.VSinvUt()(0, 0) = "
+                << wts[0]*wts[0]*svd.VSinvUt()(0, 0) << nl
+                << "    wts[0]*wts[1]*svd.VSinvUt()(0, 1) = "
+                << wts[0]*wts[1]*svd.VSinvUt()(0, 1)
                 << " dim = " << this->dim() << endl;
 
             wts[0] *= 10;
@@ -174,14 +174,14 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit
 
             for (label j = 0; j < B.n(); j++)
             {
-                B[0][j] *= 10;
-                B[1][j] *= 10;
+                B(0, j) *= 10;
+                B(1, j) *= 10;
             }
 
             for (label i = 0; i < B.m(); i++)
             {
-                B[i][0] *= 10;
-                B[i][1] *= 10;
+                B(i, 0) *= 10;
+                B(i, 1) *= 10;
             }
         }
     }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
index bc86903cbc..eb6da09f19 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
@@ -196,8 +196,8 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
     // Additional weighting for constant and linear terms
     for (label i = 0; i < B.m(); i++)
     {
-        B[i][0] *= wts[0];
-        B[i][1] *= wts[0];
+        B(i, 0) *= wts[0];
+        B(i, 1) *= wts[0];
     }
 
     // Set the fit
@@ -214,7 +214,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
 
         for (label i=0; i<stencilSize; i++)
         {
-            coeffsi[i] = wts[0]*wts[i]*svd.VSinvUt()[0][i];
+            coeffsi[i] = wts[0]*wts[i]*svd.VSinvUt()(0, i);
             if (mag(coeffsi[i]) > maxCoeff)
             {
                 maxCoeff = mag(coeffsi[i]);
@@ -269,14 +269,14 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
 
             for (label j = 0; j < B.n(); j++)
             {
-                B[0][j] *= 10;
-                B[1][j] *= 10;
+                B(0, j) *= 10;
+                B(1, j) *= 10;
             }
 
             for (label i = 0; i < B.m(); i++)
             {
-                B[i][0] *= 10;
-                B[i][1] *= 10;
+                B(i, 0) *= 10;
+                B(i, 1) *= 10;
             }
         }
     }
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index 7c2d9beac2..1b424d1ccf 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -341,7 +341,7 @@ void Foam::chemistryModel<CompType, ThermoType>::jacobian
     {
         for (label j=0; j<nEqns(); j++)
         {
-            dfdc[i][j] = 0.0;
+            dfdc(i, j) = 0.0;
         }
     }
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
index 15a256f66b..2b52c0a7cf 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -151,7 +151,7 @@ void Foam::EulerImplicit<ChemistryModel>::solve
         scalar d = 0;
         for (label j=0; j<nSpecie; j++)
         {
-            d -= RR[i][j]*c[j];
+            d -= RR(i, j)*c[j];
         }
 
         if (d < -SMALL)
@@ -172,7 +172,7 @@ void Foam::EulerImplicit<ChemistryModel>::solve
     // Add the diagonal and source contributions from the time-derivative
     for (label i=0; i<nSpecie; i++)
     {
-        RR[i][i] += 1.0/deltaT;
+        RR(i, i) += 1.0/deltaT;
         RR.source()[i] = c[i]/deltaT;
     }
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index 71e34ab46d..2c8a7e2ba1 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -209,12 +209,12 @@ void Foam::radiation::viewFactor::initialise()
                 scalar sumF = 0.0;
                 for (label j=0; j<totalNCoarseFaces_; j++)
                 {
-                    sumF += Fmatrix_()[i][j];
+                    sumF += Fmatrix_()(i, j);
                 }
                 scalar delta = sumF - 1.0;
                 for (label j=0; j<totalNCoarseFaces_; j++)
                 {
-                    Fmatrix_()[i][j] *= (1.0 - delta/(sumF + 0.001));
+                    Fmatrix_()(i, j) *= (1.0 - delta/(sumF + 0.001));
                 }
             }
         }
@@ -541,13 +541,13 @@ void Foam::radiation::viewFactor::calculate()
 
                     if (i==j)
                     {
-                        C[i][j] = invEj - (invEj - 1.0)*Fmatrix_()[i][j];
-                        q[i] += (Fmatrix_()[i][j] - 1.0)*sigmaT4 - QrExt[j];
+                        C(i, j) = invEj - (invEj - 1.0)*Fmatrix_()(i, j);
+                        q[i] += (Fmatrix_()(i, j) - 1.0)*sigmaT4 - QrExt[j];
                     }
                     else
                     {
-                        C[i][j] = (1.0 - invEj)*Fmatrix_()[i][j];
-                        q[i] += Fmatrix_()[i][j]*sigmaT4;
+                        C(i, j) = (1.0 - invEj)*Fmatrix_()(i, j);
+                        q[i] += Fmatrix_()(i, j)*sigmaT4;
                     }
 
                 }
@@ -570,11 +570,11 @@ void Foam::radiation::viewFactor::calculate()
                         scalar invEj = 1.0/E[j];
                         if (i==j)
                         {
-                            CLU_()[i][j] = invEj-(invEj-1.0)*Fmatrix_()[i][j];
+                            CLU_()(i, j) = invEj-(invEj-1.0)*Fmatrix_()(i, j);
                         }
                         else
                         {
-                            CLU_()[i][j] = (1.0 - invEj)*Fmatrix_()[i][j];
+                            CLU_()(i, j) = (1.0 - invEj)*Fmatrix_()(i, j);
                         }
                     }
                 }
@@ -598,11 +598,11 @@ void Foam::radiation::viewFactor::calculate()
 
                     if (i==j)
                     {
-                        q[i] += (Fmatrix_()[i][j] - 1.0)*sigmaT4  - QrExt[j];
+                        q[i] += (Fmatrix_()(i, j) - 1.0)*sigmaT4  - QrExt[j];
                     }
                     else
                     {
-                        q[i] += Fmatrix_()[i][j]*sigmaT4;
+                        q[i] += Fmatrix_()(i, j)*sigmaT4;
                     }
                 }
             }
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index dee571fe18..54992d7efb 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -363,7 +363,7 @@ jacobian
     {
         for (label j=0; j<nEqns(); j++)
         {
-            dfdc[i][j] = 0.0;
+            dfdc(i, j) = 0.0;
         }
     }
 

From 445ce0f2ced48a1a09f643ee28af806f927b7820 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 20 Mar 2016 19:50:23 +0000
Subject: [PATCH 303/447] Test-Matrix: Removed timing test

---
 applications/test/Matrix/Test-Matrix.C | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/applications/test/Matrix/Test-Matrix.C b/applications/test/Matrix/Test-Matrix.C
index 3e14e57085..ad48481fa1 100644
--- a/applications/test/Matrix/Test-Matrix.C
+++ b/applications/test/Matrix/Test-Matrix.C
@@ -131,22 +131,6 @@ int main(int argc, char *argv[])
         Info<< "det = " << detDecomposed(squareMatrix, sign) << endl;
     }
 
-    {
-        scalarSquareMatrix squareMatrix(3000, 3000, 1);
-
-        for(label i=0; i<squareMatrix.n(); i++)
-        {
-            squareMatrix(i, i) = 10;
-        }
-
-        scalarField rhs(squareMatrix.n(), 0);
-        rhs[0] = 1;
-        rhs[1] = 2;
-        rhs[2] = 3;
-
-        LUsolve(squareMatrix, rhs);
-    }
-
     Info<< "\nEnd\n" << endl;
 
     return 0;

From ea6eac35a678d8f2ad06371c475f91bf6aef5137 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 07:58:38 +0000
Subject: [PATCH 304/447] etc/config.sh/CGAL: updated

Patch contributed by Bruno Santos:
 - "etc/config.sh/CGAL":
   - Indented the contents of the recently added if block.
   - Added comment about using system versions.
   - Library paths are now only added if the respective version is not "boost-system" and "cgal-system".

 - "src/renumber/Allwmake":
   It now relies on the previous file to get the version for
   Boost (the same way as in "makeCGAL"). This is so that it will also
   build "SloanRenumber" if "boost_version" is set to "boost-system".

 - "applications/utilities/mesh/generation/Allwmake":
   It now also relies on the script "config.sh/CGAL" to get the
   version for CGAL. If "cgal_version" is set to "cgal-system", it
   will now also build "foamy*Mesh" utilities and respective
   libraries.

Resolves report http://www.openfoam.org/mantisbt/view.php?id=1232
---
 .../utilities/mesh/generation/Allwmake        |  8 +++-
 etc/config.sh/CGAL                            | 42 +++++++++++--------
 src/renumber/Allwmake                         |  9 +++-
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake
index 20a658ec8f..f6f56de5d6 100755
--- a/applications/utilities/mesh/generation/Allwmake
+++ b/applications/utilities/mesh/generation/Allwmake
@@ -1,5 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Get CGAL and boost versions
+. $WM_PROJECT_DIR/etc/config.sh/functions
+_foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \
+          $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
+
 set -x
 
 wmake -all blockMesh
@@ -7,7 +13,7 @@ wmake -all extrude
 wmake -all extrude2DMesh
 wmake -all snappyHexMesh
 
-if [ -n "$CGAL_ARCH_PATH" ]
+if [ -n "$CGAL_ARCH_PATH" -o "$cgal_version" = "cgal-system" ]
 then
     foamyMesh/Allwmake
 fi
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index c76aabe75e..4d0ca25ff6 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -27,6 +27,12 @@
 # Description
 #     Setup file for CGAL (& boost) include/libraries.
 #     Sourced from OpenFOAM-<VERSION>/etc/bashrc
+#
+#     If using system-wide installations for either one, use the following
+#     version settings:
+#
+#         boost_version=boost-system
+#         cgal_version=cgal-system
 #------------------------------------------------------------------------------
 
 boost_version=boost-system
@@ -35,29 +41,29 @@ cgal_version=CGAL-4.7
 if [ -z "$SOURCE_CGAL_VERSIONS_ONLY" ]
 then
 
-common_path=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
+    common_path=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
 
-export BOOST_ARCH_PATH=$common_path/$boost_version
-export CGAL_ARCH_PATH=$common_path/$cgal_version
+    export BOOST_ARCH_PATH=$common_path/$boost_version
+    export CGAL_ARCH_PATH=$common_path/$cgal_version
 
-if [ "$FOAM_VERBOSE" -a "$PS1" ]
-then
-    echo "Using CGAL and boost" 1>&2
-    echo "    $cgal_version at $CGAL_ARCH_PATH" 1>&2
-    echo "    $boost_version at $BOOST_ARCH_PATH" 1>&2
-fi
+    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    then
+        echo "Using CGAL and boost" 1>&2
+        echo "    $cgal_version at $CGAL_ARCH_PATH" 1>&2
+        echo "    $boost_version at $BOOST_ARCH_PATH" 1>&2
+    fi
 
-if [ -d "$CGAL_ARCH_PATH" ]
-then
-    _foamAddLib $CGAL_ARCH_PATH/lib
-fi
+    if [ -d "$CGAL_ARCH_PATH" -a "$cgal_version" != "cgal-system" ]
+    then
+        _foamAddLib $CGAL_ARCH_PATH/lib
+    fi
 
-if [ -d "$BOOST_ARCH_PATH" ]
-then
-    _foamAddLib $BOOST_ARCH_PATH/lib
-fi
+    if [ -d "$BOOST_ARCH_PATH" -a "$boost_version" != "boost-system" ]
+    then
+        _foamAddLib $BOOST_ARCH_PATH/lib
+    fi
 
-unset boost_version cgal_version common_path
+    unset boost_version cgal_version common_path
 
 fi
 
diff --git a/src/renumber/Allwmake b/src/renumber/Allwmake
index 6cf33cff70..a44d239870 100755
--- a/src/renumber/Allwmake
+++ b/src/renumber/Allwmake
@@ -5,7 +5,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
-## get ZOLTAN_ARCH_PATH
+# Get CGAL and scotch versions
+. $WM_PROJECT_DIR/etc/config.sh/functions
+_foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \
+          $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
+
+## Get ZOLTAN_ARCH_PATH
 #if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan`
 #then
 #    . $settings
@@ -21,7 +26,7 @@ set -x
 
 wmake $targetType renumberMethods
 
-if [ -n "$BOOST_ARCH_PATH" ]
+if [ -n "$BOOST_ARCH_PATH" -o "$boost_version" = "boost-system" ]
 then
     wmake $targetType SloanRenumber
 else

From e69aaae5486df72e136cc4c9dd9e99937e4e2fdf Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 08:22:21 +0000
Subject: [PATCH 305/447] Identity: Added cast to scalar

---
 src/OpenFOAM/primitives/SphericalTensor/Identity.H | 14 ++++++++++++--
 .../sphericalTensor/sphericalTensor.H              |  4 ----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/OpenFOAM/primitives/SphericalTensor/Identity.H b/src/OpenFOAM/primitives/SphericalTensor/Identity.H
index 014adae6a2..492b03dddf 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/Identity.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/Identity.H
@@ -25,8 +25,8 @@ Class
     Foam::Identity
 
 Description
-    Templated identity and dual space identity tensors
-    derived from SphericalTensor.
+    Templated identity and dual space identity tensors derived from
+    SphericalTensor.
 
 \*---------------------------------------------------------------------------*/
 
@@ -75,9 +75,19 @@ public:
     {
         return dual();
     }
+
+    //- Return 1 for scalar
+    inline operator scalar() const
+    {
+        return 1;
+    }
 };
 
 
+// Global Identity tensor
+static const Identity<scalar> I;
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
index e4c4db09f9..3bfa84f0bc 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
@@ -48,13 +48,9 @@ namespace Foam
 
 typedef SphericalTensor<scalar> sphericalTensor;
 
-// Identity tensor
-static const Identity<scalar> I;
-
 static const sphericalTensor oneThirdI(1.0/3.0);
 static const sphericalTensor twoThirdsI(2.0/3.0);
 
-
 //- Specify data associated with sphericalTensor type are contiguous
 template<>
 inline bool contiguous<sphericalTensor>() {return true;}

From 0f0e4a0c3839972811838689f2c5875cc247d3d6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 08:23:09 +0000
Subject: [PATCH 306/447] zero: Added cast to float and double for consistent
 scalar and floatScalar initialization and assignment to 0 Zero: New global
 instance of zero for simple and efficient initialization and assigment of
 primitives to 0

---
 src/OpenFOAM/primitives/zero/zero.H | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/zero/zero.H b/src/OpenFOAM/primitives/zero/zero.H
index ca997cae22..8c2f6fb37a 100644
--- a/src/OpenFOAM/primitives/zero/zero.H
+++ b/src/OpenFOAM/primitives/zero/zero.H
@@ -36,6 +36,8 @@ SourceFiles
 #ifndef zero_H
 #define zero_H
 
+#include "label.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -51,15 +53,38 @@ public:
 
     zero()
     {}
+
+    //- Return 0 for label
+    inline operator label() const
+    {
+        return 0;
+    }
+
+    //- Return 0 for float
+    inline operator float() const
+    {
+        return 0;
+    }
+
+    //- Return 0 for double
+    inline operator double() const
+    {
+        return 0;
+    }
 };
 
+
+// Global zero
+static const zero Zero;
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    #include "zeroI.H"
+#include "zeroI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From e6e687b67da6ae0e11458feff889768a66570c5c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 08:25:50 +0000
Subject: [PATCH 307/447] VectorSpaces and MatrixSpaces: Added construction
 from and assignment to zero

---
 .../primitives/MatrixSpace/MatrixSpaceI.H     | 24 +++++++------------
 .../primitives/RowVector/RowVectorI.H         | 12 +++++-----
 .../SphericalTensor/SphericalTensor.H         |  9 +++++++
 .../SphericalTensor/SphericalTensorI.H        | 20 ++++++++++++++--
 .../SphericalTensor2D/SphericalTensor2D.H     |  9 +++++++
 .../SphericalTensor2D/SphericalTensor2DI.H    | 20 ++++++++++++++--
 .../primitives/SymmTensor/SymmTensor.H        |  6 +++++
 .../primitives/SymmTensor/SymmTensorI.H       | 20 +++++++++++++---
 .../primitives/SymmTensor2D/SymmTensor2D.H    |  6 +++++
 .../primitives/SymmTensor2D/SymmTensor2DI.H   | 20 +++++++++++++---
 src/OpenFOAM/primitives/Tensor/Tensor.H       |  3 +++
 src/OpenFOAM/primitives/Tensor/TensorI.H      | 13 +++++++---
 src/OpenFOAM/primitives/Tensor2D/Tensor2D.H   |  6 +++++
 src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H  | 20 ++++++++++++++--
 src/OpenFOAM/primitives/Vector/VectorI.H      | 12 +++++-----
 src/OpenFOAM/primitives/Vector2D/Vector2D.H   |  9 +++++++
 src/OpenFOAM/primitives/Vector2D/Vector2DI.H  | 20 ++++++++++++++--
 .../primitives/VectorSpace/VectorSpaceI.H     |  4 ++--
 .../CompactSpatialTensorI.H                   |  8 +++----
 .../CompactSpatialTensorTI.H                  |  8 +++----
 .../SpatialTensor/SpatialTensorI.H            |  8 +++----
 .../SpatialVector/SpatialVectorI.H            |  8 +++----
 22 files changed, 203 insertions(+), 62 deletions(-)

diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
index 3fca897851..e7ae70ec6b 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
@@ -35,10 +35,10 @@ inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace()
 template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
 inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace
 (
-    const Foam::zero z
+    const Foam::zero
 )
 :
-    MatrixSpace::vsType(z)
+    MatrixSpace::vsType(Zero)
 {}
 
 
@@ -257,7 +257,7 @@ inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>
 Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::identity()
 {
     StaticAssert(Nrows == Ncols);
-    msType result((Foam::zero()));
+    msType result(Zero);
 
     for (direction i=0; i<Ncols; ++i)
     {
@@ -327,7 +327,7 @@ inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
 ) const
 {
     #ifdef FULLDEBUG
-    if (i < 0 || i > Nrows-1 || j < 0 || j > Ncols-1)
+    if (i > Nrows-1 || j > Ncols-1)
     {
         FatalErrorInFunction
             << "indices out of range"
@@ -347,7 +347,7 @@ inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
 )
 {
     #ifdef FULLDEBUG
-    if (i < 0 || i > Nrows-1 || j < 0 || j > Ncols-1)
+    if (i > Nrows-1 || j > Ncols-1)
     {
         FatalErrorInFunction
             << "indices out of range"
@@ -417,10 +417,10 @@ operator()(const direction i, const direction j)
 template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
 inline void Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator=
 (
-    const Foam::zero z
+    const Foam::zero
 )
 {
-    MatrixSpace::vsType::operator=(z);
+    MatrixSpace::vsType::operator=(Zero);
 }
 
 
@@ -552,10 +552,7 @@ inline typename typeOfInnerProduct<Cmpt, Form1, Form2>::type operator&
 {
     StaticAssert(Ncols1 == Nrows2);
 
-    typename typeOfInnerProduct<Cmpt, Form1, Form2>::type result
-    (
-        (Foam::zero())
-    );
+    typename typeOfInnerProduct<Cmpt, Form1, Form2>::type result(Zero);
 
     for (direction i=0; i<Nrows1; ++i)
     {
@@ -579,10 +576,7 @@ inline typename typeOfInnerProduct<Cmpt, Form, VSForm>::type operator&
     const VectorSpace<VSForm, Cmpt, Ncols>& v
 )
 {
-    typename typeOfInnerProduct<Cmpt, Form, VSForm>::type result
-    (
-        (Foam::zero())
-    );
+    typename typeOfInnerProduct<Cmpt, Form, VSForm>::type result(Zero);
 
     for (direction i=0; i<Nrows; ++i)
     {
diff --git a/src/OpenFOAM/primitives/RowVector/RowVectorI.H b/src/OpenFOAM/primitives/RowVector/RowVectorI.H
index dec007166f..2419ff2225 100644
--- a/src/OpenFOAM/primitives/RowVector/RowVectorI.H
+++ b/src/OpenFOAM/primitives/RowVector/RowVectorI.H
@@ -31,9 +31,9 @@ inline Foam::RowVector<Cmpt>::RowVector()
 
 
 template<class Cmpt>
-inline Foam::RowVector<Cmpt>::RowVector(const Foam::zero z)
+inline Foam::RowVector<Cmpt>::RowVector(const Foam::zero)
 :
-    RowVector::msType(z)
+    RowVector::msType(Zero)
 {}
 
 
@@ -44,7 +44,7 @@ inline Foam::RowVector<Cmpt>::RowVector
     const MatrixSpace<RowVector<Cmpt2>, Cmpt2, 1, 3>& ms
 )
 :
-    MatrixSpace<RowVector<Cmpt>, Cmpt, 1, 3>(ms)
+    RowVector::msType(ms)
 {}
 
 
@@ -65,7 +65,7 @@ inline Foam::RowVector<Cmpt>::RowVector
 template<class Cmpt>
 inline Foam::RowVector<Cmpt>::RowVector(Istream& is)
 :
-    MatrixSpace<RowVector<Cmpt>, Cmpt, 1, 3>(is)
+    RowVector::msType(is)
 {}
 
 
@@ -112,9 +112,9 @@ inline Cmpt& Foam::RowVector<Cmpt>::z()
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline void Foam::RowVector<Cmpt>::operator=(const Foam::zero z)
+inline void Foam::RowVector<Cmpt>::operator=(const Foam::zero)
 {
-    RowVector::msType::operator=(z);
+    RowVector::msType::operator=(Zero);
 }
 
 
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
index 2fa7b9b4ed..656731ccf0 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
@@ -82,6 +82,9 @@ public:
         //- Construct null
         inline SphericalTensor();
 
+        //- Construct initialized to zero
+        inline explicit SphericalTensor(const Foam::zero);
+
         //- Construct given VectorSpace
         template<class Cmpt2>
         inline SphericalTensor
@@ -106,6 +109,12 @@ public:
 
         //- Transpose
         inline const SphericalTensor<Cmpt>& T() const;
+
+
+    // Member Operators
+
+        //- Assignment to zero
+        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
index 409b3961b2..cb4d7fda30 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
@@ -32,6 +32,13 @@ inline Foam::SphericalTensor<Cmpt>::SphericalTensor()
 {}
 
 
+template<class Cmpt>
+inline Foam::SphericalTensor<Cmpt>::SphericalTensor(const Foam::zero)
+:
+    SphericalTensor::vsType(Zero)
+{}
+
+
 template<class Cmpt>
 template<class Cmpt2>
 inline Foam::SphericalTensor<Cmpt>::SphericalTensor
@@ -39,7 +46,7 @@ inline Foam::SphericalTensor<Cmpt>::SphericalTensor
     const VectorSpace<SphericalTensor<Cmpt2>, Cmpt2, 1>& vs
 )
 :
-    VectorSpace<SphericalTensor<Cmpt>, Cmpt, 1>(vs)
+    SphericalTensor::vsType(vs)
 {}
 
 
@@ -53,7 +60,7 @@ inline Foam::SphericalTensor<Cmpt>::SphericalTensor(const Cmpt& stii)
 template<class Cmpt>
 inline Foam::SphericalTensor<Cmpt>::SphericalTensor(Istream& is)
 :
-    VectorSpace<SphericalTensor<Cmpt>, Cmpt, 1>(is)
+    SphericalTensor::vsType(is)
 {}
 
 
@@ -81,6 +88,15 @@ Foam::SphericalTensor<Cmpt>::T() const
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline void Foam::SphericalTensor<Cmpt>::operator=(const Foam::zero)
+{
+    SphericalTensor::vsType::operator=(Zero);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
index ecebdf2625..9791a66829 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
@@ -78,6 +78,9 @@ public:
         //- Construct null
         inline SphericalTensor2D();
 
+        //- Construct initialized to zero
+        inline explicit SphericalTensor2D(const Foam::zero);
+
         //- Construct given VectorSpace
         inline SphericalTensor2D
         (
@@ -97,6 +100,12 @@ public:
 
             inline const Cmpt& ii() const;
             inline Cmpt& ii();
+
+
+    // Member Operators
+
+        //- Assignment to zero
+        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
index 9a8b6daff7..2147a736d2 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
@@ -32,13 +32,20 @@ inline Foam::SphericalTensor2D<Cmpt>::SphericalTensor2D()
 {}
 
 
+template<class Cmpt>
+inline Foam::SphericalTensor2D<Cmpt>::SphericalTensor2D(const Foam::zero)
+:
+    SphericalTensor2D::vsType(Zero)
+{}
+
+
 template<class Cmpt>
 inline Foam::SphericalTensor2D<Cmpt>::SphericalTensor2D
 (
     const VectorSpace<SphericalTensor2D<Cmpt>, Cmpt, 1>& vs
 )
 :
-    VectorSpace<SphericalTensor2D<Cmpt>, Cmpt, 1>(vs)
+    SphericalTensor2D::vsType(vs)
 {}
 
 
@@ -52,7 +59,7 @@ inline Foam::SphericalTensor2D<Cmpt>::SphericalTensor2D(const Cmpt& stii)
 template<class Cmpt>
 inline Foam::SphericalTensor2D<Cmpt>::SphericalTensor2D(Istream& is)
 :
-    VectorSpace<SphericalTensor2D<Cmpt>, Cmpt, 1>(is)
+    SphericalTensor2D::vsType(is)
 {}
 
 
@@ -72,6 +79,15 @@ inline Cmpt& Foam::SphericalTensor2D<Cmpt>::ii()
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline void Foam::SphericalTensor2D<Cmpt>::operator=(const Foam::zero)
+{
+    SphericalTensor2D::vsType::operator=(Zero);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index 58eca1da22..aa5758f2d2 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -82,6 +82,9 @@ public:
         //- Construct null
         inline SymmTensor();
 
+        //- Construct initialized to zero
+        inline explicit SymmTensor(const Foam::zero);
+
         //- Construct given VectorSpace of the same rank
         template<class Cmpt2>
         inline SymmTensor(const VectorSpace<SymmTensor<Cmpt2>, Cmpt2, 6>&);
@@ -125,6 +128,9 @@ public:
 
     // Member Operators
 
+        //- Assignment to zero
+        inline void operator=(const Foam::zero);
+
         //- Construct given SphericalTensor
         inline void operator=(const SphericalTensor<Cmpt>&);
 };
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index 6caa6aec26..9b97a9dedc 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -33,6 +33,13 @@ inline Foam::SymmTensor<Cmpt>::SymmTensor()
 {}
 
 
+template<class Cmpt>
+inline Foam::SymmTensor<Cmpt>::SymmTensor(const Foam::zero)
+:
+    SymmTensor::vsType(Zero)
+{}
+
+
 template<class Cmpt>
 template<class Cmpt2>
 inline Foam::SymmTensor<Cmpt>::SymmTensor
@@ -40,7 +47,7 @@ inline Foam::SymmTensor<Cmpt>::SymmTensor
     const VectorSpace<SymmTensor<Cmpt2>, Cmpt2, 6>& vs
 )
 :
-    VectorSpace<SymmTensor<Cmpt>, Cmpt, 6>(vs)
+    SymmTensor::vsType(vs)
 {}
 
 
@@ -70,7 +77,7 @@ inline Foam::SymmTensor<Cmpt>::SymmTensor
 template<class Cmpt>
 inline Foam::SymmTensor<Cmpt>::SymmTensor(Istream& is)
 :
-    VectorSpace<SymmTensor<Cmpt>, Cmpt, 6>(is)
+    SymmTensor::vsType(is)
 {}
 
 
@@ -157,7 +164,7 @@ inline const Foam::SymmTensor<Cmpt>& Foam::SymmTensor<Cmpt>::T() const
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
 inline void Foam::SymmTensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
@@ -168,6 +175,13 @@ inline void Foam::SymmTensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 }
 
 
+template<class Cmpt>
+inline void Foam::SymmTensor<Cmpt>::operator=(const Foam::zero)
+{
+    SymmTensor::vsType::operator=(Zero);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
index 55a455ddc3..ac5811fc75 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
@@ -82,6 +82,9 @@ public:
         //- Construct null
         inline SymmTensor2D();
 
+        //- Construct initialized to zero
+        inline explicit SymmTensor2D(const Foam::zero);
+
         //- Construct given VectorSpace
         inline SymmTensor2D(const VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>&);
 
@@ -117,6 +120,9 @@ public:
 
     // Member Operators
 
+        //- Assignment to zero
+        inline void operator=(const Foam::zero);
+
         //- Construct given SphericalTensor2D
         inline void operator=(const SphericalTensor2D<Cmpt>&);
 };
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
index 674a6a6975..d69b566a46 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
@@ -33,13 +33,20 @@ inline Foam::SymmTensor2D<Cmpt>::SymmTensor2D()
 {}
 
 
+template<class Cmpt>
+inline Foam::SymmTensor2D<Cmpt>::SymmTensor2D(const Foam::zero)
+:
+    SymmTensor2D::vsType(Zero)
+{}
+
+
 template<class Cmpt>
 inline Foam::SymmTensor2D<Cmpt>::SymmTensor2D
 (
     const VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>& vs
 )
 :
-    VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>(vs)
+    SymmTensor2D::vsType(vs)
 {}
 
 
@@ -66,7 +73,7 @@ inline Foam::SymmTensor2D<Cmpt>::SymmTensor2D
 template<class Cmpt>
 inline Foam::SymmTensor2D<Cmpt>::SymmTensor2D(Istream& is)
 :
-    VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>(is)
+    SymmTensor2D::vsType(is)
 {}
 
 
@@ -117,7 +124,7 @@ inline const Foam::SymmTensor2D<Cmpt>& Foam::SymmTensor2D<Cmpt>::T() const
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
 inline void Foam::SymmTensor2D<Cmpt>::operator=
@@ -130,6 +137,13 @@ inline void Foam::SymmTensor2D<Cmpt>::operator=
 }
 
 
+template<class Cmpt>
+inline void Foam::SymmTensor2D<Cmpt>::operator=(const Foam::zero)
+{
+    SymmTensor2D::vsType::operator=(Zero);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index ce5d305be7..044e62537b 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -197,6 +197,9 @@ public:
 
         //- Assign to a triad
         inline void operator=(const Vector<Vector<Cmpt>>&);
+
+        //- Assignment to zero
+        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 5673703285..116dc7d352 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -33,9 +33,9 @@ inline Foam::Tensor<Cmpt>::Tensor()
 
 
 template<class Cmpt>
-inline Foam::Tensor<Cmpt>::Tensor(const Foam::zero z)
+inline Foam::Tensor<Cmpt>::Tensor(const Foam::zero)
 :
-    Tensor::msType(z)
+    Tensor::msType(Zero)
 {}
 
 
@@ -329,7 +329,7 @@ inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::T() const
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
 inline void Foam::Tensor<Cmpt>::operator&=(const Tensor<Cmpt>& t)
@@ -400,6 +400,13 @@ inline void Foam::Tensor<Cmpt>::operator=(const Vector<Vector<Cmpt>>& tr)
 }
 
 
+template<class Cmpt>
+inline void Foam::Tensor<Cmpt>::operator=(const Foam::zero)
+{
+    Tensor::msType::operator=(Zero);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
index 098f52ef9d..d2e82ca134 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
@@ -85,6 +85,9 @@ public:
         //- Construct null
         inline Tensor2D();
 
+        //- Construct initialized to zero
+        inline explicit Tensor2D(const Foam::zero);
+
         //- Construct given VectorSpace
         inline Tensor2D(const VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>&);
 
@@ -142,6 +145,9 @@ public:
 
         //- Copy SphericalTensor2D
         inline void operator=(const SphericalTensor2D<Cmpt>&);
+
+        //- Assignment to zero
+        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
index bc68f00ad3..f965993811 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
@@ -30,13 +30,20 @@ inline Foam::Tensor2D<Cmpt>::Tensor2D()
 {}
 
 
+template<class Cmpt>
+inline Foam::Tensor2D<Cmpt>::Tensor2D(const Foam::zero)
+:
+    Tensor2D::msType(Zero)
+{}
+
+
 template<class Cmpt>
 inline Foam::Tensor2D<Cmpt>::Tensor2D
 (
     const VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>& vs
 )
 :
-    VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>(vs)
+    Tensor2D::msType(vs)
 {}
 
 
@@ -83,7 +90,7 @@ inline Foam::Tensor2D<Cmpt>::Tensor2D
 template<class Cmpt>
 inline Foam::Tensor2D<Cmpt>::Tensor2D(Istream& is)
 :
-    VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>(is)
+    Tensor2D::msType(is)
 {}
 
 
@@ -181,6 +188,15 @@ inline void Foam::Tensor2D<Cmpt>::operator=(const SphericalTensor2D<Cmpt>& st)
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline void Foam::Tensor2D<Cmpt>::operator=(const Foam::zero)
+{
+    Tensor2D::msType::operator=(Zero);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/Vector/VectorI.H b/src/OpenFOAM/primitives/Vector/VectorI.H
index e6d72fa6b2..591155fa42 100644
--- a/src/OpenFOAM/primitives/Vector/VectorI.H
+++ b/src/OpenFOAM/primitives/Vector/VectorI.H
@@ -31,9 +31,9 @@ inline Foam::Vector<Cmpt>::Vector()
 
 
 template<class Cmpt>
-inline Foam::Vector<Cmpt>::Vector(const Foam::zero z)
+inline Foam::Vector<Cmpt>::Vector(const Foam::zero)
 :
-    Vector::vsType(z)
+    Vector::vsType(Zero)
 {}
 
 
@@ -44,7 +44,7 @@ inline Foam::Vector<Cmpt>::Vector
     const VectorSpace<Vector<Cmpt2>, Cmpt2, 3>& vs
 )
 :
-    VectorSpace<Vector<Cmpt>, Cmpt, 3>(vs)
+    Vector::vsType(vs)
 {}
 
 
@@ -65,7 +65,7 @@ inline Foam::Vector<Cmpt>::Vector
 template<class Cmpt>
 inline Foam::Vector<Cmpt>::Vector(Istream& is)
 :
-    VectorSpace<Vector<Cmpt>, Cmpt, 3>(is)
+    Vector::vsType(is)
 {}
 
 
@@ -124,9 +124,9 @@ inline const Foam::Vector<Cmpt>& Foam::Vector<Cmpt>::centre
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline void Foam::Vector<Cmpt>::operator=(const Foam::zero z)
+inline void Foam::Vector<Cmpt>::operator=(const Foam::zero)
 {
-    VectorSpace<Vector<Cmpt>, Cmpt, 3>::operator=(z);
+    Vector::vsType::operator=(Zero);
 }
 
 
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2D.H b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
index d1c7852b8f..c64afadab6 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2D.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
@@ -75,6 +75,9 @@ public:
         //- Construct null
         inline Vector2D();
 
+        //- Construct initialized to zero
+        inline explicit Vector2D(const Foam::zero);
+
         //- Construct given VectorSpace
         inline Vector2D(const VectorSpace<Vector2D<Cmpt>, Cmpt, 2>&);
 
@@ -100,6 +103,12 @@ public:
 
             //- Perp dot product (dot product with perpendicular vector)
             inline scalar perp(const Vector2D<Cmpt>& b) const;
+
+
+    // Member Operators
+
+        //- Assignment to zero
+        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
index 8ccf067c26..36b70942b4 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
@@ -30,13 +30,20 @@ inline Foam::Vector2D<Cmpt>::Vector2D()
 {}
 
 
+template<class Cmpt>
+inline Foam::Vector2D<Cmpt>::Vector2D(const Foam::zero)
+:
+    Vector2D::vsType(Zero)
+{}
+
+
 template<class Cmpt>
 inline Foam::Vector2D<Cmpt>::Vector2D
 (
     const VectorSpace<Vector2D<Cmpt>, Cmpt, 2>& vs
 )
 :
-    VectorSpace<Vector2D<Cmpt>, Cmpt, 2>(vs)
+    Vector2D::vsType(vs)
 {}
 
 
@@ -51,7 +58,7 @@ inline Foam::Vector2D<Cmpt>::Vector2D(const Cmpt& vx, const Cmpt& vy)
 template<class Cmpt>
 inline Foam::Vector2D<Cmpt>::Vector2D(Istream& is)
 :
-    VectorSpace<Vector2D<Cmpt>, Cmpt, 2>(is)
+    Vector2D::vsType(is)
 {}
 
 
@@ -83,6 +90,15 @@ inline Cmpt& Foam::Vector2D<Cmpt>::y()
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline void Foam::Vector2D<Cmpt>::operator=(const Foam::zero)
+{
+    Vector2D::vsType::operator=(Zero);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index 10f6964e7b..3b545a43e6 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -42,9 +42,9 @@ inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace()
 
 
 template<class Form, class Cmpt, direction Ncmpts>
-inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace(const Foam::zero z)
+inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace(const Foam::zero)
 {
-    VectorSpaceOps<Ncmpts,0>::eqOpS(*this, 0, eqOp<Cmpt>());
+    VectorSpaceOps<Ncmpts,0>::eqOpS(*this, Zero, eqOp<Cmpt>());
 }
 
 
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H
index c01ed49c7f..5b45979de9 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H
@@ -33,10 +33,10 @@ inline Foam::CompactSpatialTensor<Cmpt>::CompactSpatialTensor()
 template<class Cmpt>
 inline Foam::CompactSpatialTensor<Cmpt>::CompactSpatialTensor
 (
-    const Foam::zero z
+    const Foam::zero
 )
 :
-    CompactSpatialTensor::msType(z)
+    CompactSpatialTensor::msType(Zero)
 {}
 
 
@@ -97,9 +97,9 @@ inline Foam::CompactSpatialTensor<Cmpt>::CompactSpatialTensor(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline void Foam::CompactSpatialTensor<Cmpt>::operator=(const Foam::zero z)
+inline void Foam::CompactSpatialTensor<Cmpt>::operator=(const Foam::zero)
 {
-    CompactSpatialTensor::msType::operator=(z);
+    CompactSpatialTensor::msType::operator=(Zero);
 }
 
 
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H
index d76f077fde..51a1a8bae8 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H
@@ -33,10 +33,10 @@ inline Foam::CompactSpatialTensorT<Cmpt>::CompactSpatialTensorT()
 template<class Cmpt>
 inline Foam::CompactSpatialTensorT<Cmpt>::CompactSpatialTensorT
 (
-    const Foam::zero z
+    const Foam::zero
 )
 :
-    CompactSpatialTensorT::msType(z)
+    CompactSpatialTensorT::msType(Zero)
 {}
 
 
@@ -97,9 +97,9 @@ inline Foam::CompactSpatialTensorT<Cmpt>::CompactSpatialTensorT(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline void Foam::CompactSpatialTensorT<Cmpt>::operator=(const Foam::zero z)
+inline void Foam::CompactSpatialTensorT<Cmpt>::operator=(const Foam::zero)
 {
-    CompactSpatialTensorT::msType::operator=(z);
+    CompactSpatialTensorT::msType::operator=(Zero);
 }
 
 
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
index f3d431bce9..d6712e8caa 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
@@ -33,9 +33,9 @@ inline Foam::SpatialTensor<Cmpt>::SpatialTensor()
 
 
 template<class Cmpt>
-inline Foam::SpatialTensor<Cmpt>::SpatialTensor(const Foam::zero z)
+inline Foam::SpatialTensor<Cmpt>::SpatialTensor(const Foam::zero)
 :
-    SpatialTensor::msType(z)
+    SpatialTensor::msType(Zero)
 {}
 
 
@@ -136,9 +136,9 @@ inline Foam::SpatialTensor<Cmpt>::SpatialTensor(Istream& is)
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline void Foam::SpatialTensor<Cmpt>::operator=(const Foam::zero z)
+inline void Foam::SpatialTensor<Cmpt>::operator=(const Foam::zero)
 {
-    SpatialTensor::msType::operator=(z);
+    SpatialTensor::msType::operator=(Zero);
 }
 
 
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
index 9c8c862c5d..c4adce263f 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
@@ -31,9 +31,9 @@ inline Foam::SpatialVector<Cmpt>::SpatialVector()
 
 
 template<class Cmpt>
-inline Foam::SpatialVector<Cmpt>::SpatialVector(const Foam::zero z)
+inline Foam::SpatialVector<Cmpt>::SpatialVector(const Foam::zero)
 :
-    SpatialVector::vsType(z)
+    SpatialVector::vsType(Zero)
 {}
 
 
@@ -206,9 +206,9 @@ const Foam::SpatialVector<Cmpt>& Foam::SpatialVector<Cmpt>::dual::v() const
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline void Foam::SpatialVector<Cmpt>::operator=(const Foam::zero z)
+inline void Foam::SpatialVector<Cmpt>::operator=(const Foam::zero)
 {
-    SpatialVector::vsType::operator=(z);
+    SpatialVector::vsType::operator=(Zero);
 }
 
 

From 5ca4acadd6450e8ec1bb4000dfe6efaf75d6e08d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 08:26:50 +0000
Subject: [PATCH 308/447] List: Added construction from and assignment to zero

---
 src/OpenFOAM/containers/Lists/List/List.C   | 24 +++++++++++++++++++++
 src/OpenFOAM/containers/Lists/List/List.H   |  6 ++++++
 src/OpenFOAM/containers/Lists/List/ListI.H  |  7 ++++++
 src/OpenFOAM/containers/Lists/UList/UList.C | 10 +++++++++
 src/OpenFOAM/containers/Lists/UList/UList.H |  4 ++++
 5 files changed, 51 insertions(+)

diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index 134bd4f04a..34cc05ee8d 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -79,6 +79,30 @@ Foam::List<T>::List(const label s, const T& a)
 }
 
 
+template<class T>
+Foam::List<T>::List(const label s, const zero)
+:
+    UList<T>(NULL, s)
+{
+    if (this->size_ < 0)
+    {
+        FatalErrorInFunction
+            << "bad size " << this->size_
+            << abort(FatalError);
+    }
+
+    if (this->size_)
+    {
+        this->v_ = new T[this->size_];
+
+        List_ACCESS(T, (*this), vp);
+        List_FOR_ALL((*this), i)
+            List_ELEM((*this), vp, i) = Zero;
+        List_END_FOR_ALL
+    }
+}
+
+
 template<class T>
 Foam::List<T>::List(const List<T>& a)
 :
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index d86ea02251..9b28f5461f 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -105,6 +105,9 @@ public:
         //- Construct with given size and value for all elements.
         List(const label, const T&);
 
+        //- Construct with given size initializing all elements to zero.
+        List(const label, const zero);
+
         //- Copy constructor.
         List(const List<T>&);
 
@@ -225,6 +228,9 @@ public:
         //- Assignment of all entries to the given value
         inline void operator=(const T&);
 
+        //- Assignment of all entries to zero
+        inline void operator=(const zero);
+
 
     // Istream operator
 
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index 1d1e991244..7d4b325140 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -141,4 +141,11 @@ inline void Foam::List<T>::operator=(const T& t)
 }
 
 
+template<class T>
+inline void Foam::List<T>::operator=(const zero)
+{
+    UList<T>::operator=(Zero);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.C b/src/OpenFOAM/containers/Lists/UList/UList.C
index 2bbe09038a..7014e396a9 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.C
+++ b/src/OpenFOAM/containers/Lists/UList/UList.C
@@ -76,6 +76,16 @@ void Foam::UList<T>::operator=(const T& t)
 }
 
 
+template<class T>
+void Foam::UList<T>::operator=(const zero)
+{
+    List_ACCESS(T, (*this), vp);
+    List_FOR_ALL((*this), i)
+        List_ELEM((*this), vp, i) = Zero;
+    List_END_FOR_ALL
+}
+
+
 // * * * * * * * * * * * * * * STL Member Functions  * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index aff5ff8e12..a2fd872fa6 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -46,6 +46,7 @@ SourceFiles
 #include "label.H"
 #include "uLabel.H"
 #include "nullObject.H"
+#include "zero.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -223,6 +224,9 @@ public:
         //- Assignment of all entries to the given value
         void operator=(const T&);
 
+        //- Assignment of all entries to zero
+        void operator=(const zero);
+
 
     // STL type definitions
 

From 5c93cb5c8ec1b3a2ce8f6336739fe066397b0c87 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 08:27:11 +0000
Subject: [PATCH 309/447] Updated header

---
 src/OpenFOAM/containers/Lists/UList/UList.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/containers/Lists/UList/UList.C b/src/OpenFOAM/containers/Lists/UList/UList.C
index 7014e396a9..e64b808ed5 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.C
+++ b/src/OpenFOAM/containers/Lists/UList/UList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 4edb771e8ac5c625809934d497e195db9a6619da Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 08:27:31 +0000
Subject: [PATCH 310/447] Field: Added construction from and assignment to zero

---
 src/OpenFOAM/fields/Fields/Field/Field.C | 9 ++++++++-
 src/OpenFOAM/fields/Fields/Field/Field.H | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 62cbccb601..31983797d1 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -60,7 +60,7 @@ Foam::Field<Type>::Field(const label size, const Type& t)
 template<class Type>
 Foam::Field<Type>::Field(const label size, const zero)
 :
-    List<Type>(size, pTraits<Type>::zero)
+    List<Type>(size, Zero)
 {}
 
 
@@ -707,6 +707,13 @@ void Foam::Field<Type>::operator=(const Type& t)
 }
 
 
+template<class Type>
+void Foam::Field<Type>::operator=(const zero)
+{
+    List<Type>::operator=(Zero);
+}
+
+
 template<class Type>
 template<class Form, class Cmpt, Foam::direction nCmpt>
 void Foam::Field<Type>::operator=(const VectorSpace<Form,Cmpt,nCmpt>& vs)
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 8e66a98837..3c5510be50 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -347,6 +347,7 @@ public:
         void operator=(const SubField<Type>&);
         void operator=(const tmp<Field<Type>>&);
         void operator=(const Type&);
+        void operator=(const zero);
 
         template<class Form, class Cmpt, direction nCmpt>
         void operator=(const VectorSpace<Form,Cmpt,nCmpt>&);

From 402915798d72dac5544837a8ac632fa7a35bac34 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 08:27:59 +0000
Subject: [PATCH 311/447] fvPatchFields: Use 'Zero' rather than
 'pTraits<Type>::zero' to initialize to 0

This new approach to 0 initialization is simpler, cleaner, more readable
and more efficient.  The rest of the OpenFOAM code will be updated in
due course.
---
 .../basic/fixedGradient/fixedGradientFvPatchField.C  |  4 ++--
 .../basic/fixedValue/fixedValueFvPatchField.C        |  2 +-
 .../basic/zeroGradient/zeroGradientFvPatchField.C    |  6 +++---
 .../basic/zeroGradient/zeroGradientFvPatchField.H    |  2 +-
 .../derived/advective/advectiveFvPatchField.C        | 10 +++++-----
 .../cylindricalInletVelocityFvPatchVectorField.C     |  4 ++--
 .../externalCoupledMixedFvPatchField.C               |  6 +++---
 .../derived/fixedJump/fixedJumpFvPatchField.C        |  4 ++--
 .../derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C  |  6 +++---
 .../fixedNormalSlip/fixedNormalSlipFvPatchField.C    |  2 +-
 .../derived/inletOutlet/inletOutletFvPatchField.C    |  6 +++---
 .../inletOutletTotalTemperatureFvPatchScalarField.C  |  8 ++++----
 .../derived/mappedField/mappedPatchFieldBase.C       |  4 ++--
 .../mappedFixedInternalValueFvPatchField.C           |  2 +-
 .../derived/outletInlet/outletInletFvPatchField.C    |  4 ++--
 .../timeVaryingMappedFixedValue/AverageIOField.C     |  2 +-
 .../timeVaryingMappedFixedValueFvPatchField.C        | 12 ++++++------
 .../turbulentInlet/turbulentInletFvPatchField.C      |  2 +-
 .../uniformInletOutletFvPatchField.C                 |  8 ++++----
 .../fields/fvPatchFields/fvPatchField/fvPatchField.C |  4 ++--
 20 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
index f66d376e38..bb789ed827 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
@@ -36,7 +36,7 @@ Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
 )
 :
     fvPatchField<Type>(p, iF),
-    gradient_(p.size(), pTraits<Type>::zero)
+    gradient_(p.size(), Zero)
 {}
 
 
@@ -176,7 +176,7 @@ Foam::fixedGradientFvPatchField<Type>::gradientInternalCoeffs() const
 {
     return tmp<Field<Type>>
     (
-        new Field<Type>(this->size(), pTraits<Type>::zero)
+        new Field<Type>(this->size(), Zero)
     );
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
index 445bed4f7e..b6841f3353 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
@@ -117,7 +117,7 @@ Foam::fixedValueFvPatchField<Type>::valueInternalCoeffs
 {
     return tmp<Field<Type>>
     (
-        new Field<Type>(this->size(), pTraits<Type>::zero)
+        new Field<Type>(this->size(), Zero)
     );
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
index 4601904a39..4395534fe2 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
@@ -125,7 +125,7 @@ Foam::zeroGradientFvPatchField<Type>::valueBoundaryCoeffs
 {
     return tmp<Field<Type>>
     (
-        new Field<Type>(this->size(), pTraits<Type>::zero)
+        new Field<Type>(this->size(), Zero)
     );
 }
 
@@ -136,7 +136,7 @@ Foam::zeroGradientFvPatchField<Type>::gradientInternalCoeffs() const
 {
     return tmp<Field<Type>>
     (
-        new Field<Type>(this->size(), pTraits<Type>::zero)
+        new Field<Type>(this->size(), Zero)
     );
 }
 
@@ -147,7 +147,7 @@ Foam::zeroGradientFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return tmp<Field<Type>>
     (
-        new Field<Type>(this->size(), pTraits<Type>::zero)
+        new Field<Type>(this->size(), Zero)
     );
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
index 188dbdb6bd..2b0f7a31f7 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
@@ -143,7 +143,7 @@ public:
             {
                 return tmp<Field<Type>>
                 (
-                    new Field<Type>(this->size(), pTraits<Type>::zero)
+                    new Field<Type>(this->size(), Zero)
                 );
             }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 5fc626e44c..6d17c75187 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -45,11 +45,11 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
     mixedFvPatchField<Type>(p, iF),
     phiName_("phi"),
     rhoName_("rho"),
-    fieldInf_(pTraits<Type>::zero),
+    fieldInf_(Zero),
     lInf_(-GREAT)
 {
-    this->refValue() = pTraits<Type>::zero;
-    this->refGrad() = pTraits<Type>::zero;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -82,7 +82,7 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
     mixedFvPatchField<Type>(p, iF),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    fieldInf_(pTraits<Type>::zero),
+    fieldInf_(Zero),
     lInf_(-GREAT)
 {
     if (dict.found("value"))
@@ -98,7 +98,7 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
     }
 
     this->refValue() = *this;
-    this->refGrad() = pTraits<Type>::zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 
     if (dict.readIfPresent("lInf", lInf_))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
index 575eae01f7..d6223500e0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
@@ -40,8 +40,8 @@ cylindricalInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    centre_(pTraits<vector>::zero),
-    axis_(pTraits<vector>::zero),
+    centre_(Zero),
+    axis_(Zero),
     axialVelocity_(),
     radialVelocity_(),
     rpm_()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
index e0a3e4e4b1..b3629e877f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
@@ -455,8 +455,8 @@ externalCoupledMixedFvPatchField
     initialised_(false),
     coupledPatchIDs_()
 {
-    this->refValue() = pTraits<Type>::zero;
-    this->refGrad() = pTraits<Type>::zero;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -534,7 +534,7 @@ externalCoupledMixedFvPatchField
 
     // initialise as a fixed value
     this->refValue() = *this;
-    this->refGrad() = pTraits<Type>::zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 1.0;
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
index 88e9b93b40..13eba7efa0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
@@ -35,7 +35,7 @@ Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
 )
 :
     jumpCyclicFvPatchField<Type>(p, iF),
-    jump_(this->size(), pTraits<Type>::zero)
+    jump_(this->size(), Zero)
 {}
 
 
@@ -62,7 +62,7 @@ Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
 )
 :
     jumpCyclicFvPatchField<Type>(p, iF),
-    jump_(p.size(), pTraits<Type>::zero)
+    jump_(p.size(), Zero)
 {
     if (this->cyclicPatch().owner())
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
index 59b606b5f7..354a84bb2d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
@@ -35,7 +35,7 @@ Foam::fixedJumpAMIFvPatchField<Type>::fixedJumpAMIFvPatchField
 )
 :
     jumpCyclicAMIFvPatchField<Type>(p, iF),
-    jump_(this->size(), pTraits<Type>::zero)
+    jump_(this->size(), Zero)
 {}
 
 
@@ -62,7 +62,7 @@ Foam::fixedJumpAMIFvPatchField<Type>::fixedJumpAMIFvPatchField
 )
 :
     jumpCyclicAMIFvPatchField<Type>(p, iF),
-    jump_(p.size(), pTraits<Type>::zero)
+    jump_(p.size(), Zero)
 {
     if (this->cyclicAMIPatch().owner())
     {
@@ -128,7 +128,7 @@ Foam::tmp<Foam::Field<Type>> Foam::fixedJumpAMIFvPatchField<Type>::jump() const
             return this->cyclicAMIPatch().interpolate
             (
                 nbrPatch.jump(),
-                Field<Type>(this->size(), pTraits<Type>::zero)
+                Field<Type>(this->size(), Zero)
             );
         }
         else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
index df658614fb..d2a8a6b425 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
@@ -37,7 +37,7 @@ Foam::fixedNormalSlipFvPatchField<Type>::fixedNormalSlipFvPatchField
 )
 :
     transformFvPatchField<Type>(p, iF),
-    fixedValue_(p.size(), pTraits<Type>::zero)
+    fixedValue_(p.size(), Zero)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index 19d887e257..198c81d10d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -37,8 +37,8 @@ Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
     mixedFvPatchField<Type>(p, iF),
     phiName_("phi")
 {
-    this->refValue() = pTraits<Type>::zero;
-    this->refGrad() = pTraits<Type>::zero;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -82,7 +82,7 @@ Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
         fvPatchField<Type>::operator=(this->refValue());
     }
 
-    this->refGrad() = pTraits<Type>::zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index 607f88934f..54aa5346e9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -44,8 +44,8 @@ inletOutletTotalTemperatureFvPatchScalarField
     gamma_(0.0),
     T0_(p.size(), 0.0)
 {
-    this->refValue() = pTraits<scalar>::zero;
-    this->refGrad() = pTraits<scalar>::zero;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -83,7 +83,7 @@ inletOutletTotalTemperatureFvPatchScalarField
 {
     this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
 
-    this->refValue() = pTraits<scalar>::zero;
+    this->refValue() = Zero;
     if (dict.found("value"))
     {
         fvPatchField<scalar>::operator=
@@ -96,7 +96,7 @@ inletOutletTotalTemperatureFvPatchScalarField
         fvPatchField<scalar>::operator=(T0_);
     }
 
-    this->refGrad() = pTraits<scalar>::zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
index 1c52eadef5..589afaf309 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
@@ -94,7 +94,7 @@ mappedPatchFieldBase<Type>::mappedPatchFieldBase
     patchField_(patchField),
     fieldName_(patchField_.dimensionedInternalField().name()),
     setAverage_(false),
-    average_(pTraits<Type>::zero),
+    average_(Zero),
     interpolationScheme_(interpolationCell<Type>::typeName)
 {}
 
@@ -259,7 +259,7 @@ tmp<Field<Type>> mappedPatchFieldBase<Type>::mappedField() const
         }
         case mappedPatchBase::NEARESTFACE:
         {
-            Field<Type> allValues(nbrMesh.nFaces(), pTraits<Type>::zero);
+            Field<Type> allValues(nbrMesh.nFaces(), Zero);
 
             const fieldType& nbrField = sampleField();
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
index ba3a0e0209..082d9944ed 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
@@ -145,7 +145,7 @@ void Foam::mappedFixedInternalValueFvPatchField<Type>::updateCoeffs()
         }
         case mappedPatchBase::NEARESTFACE:
         {
-            Field<Type> allValues(nbrMesh.nFaces(), pTraits<Type>::zero);
+            Field<Type> allValues(nbrMesh.nFaces(), Zero);
 
             const FieldType& nbrField = this->sampleField();
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index d6f69f823a..b79fd2b83b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -38,7 +38,7 @@ Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
     phiName_("phi")
 {
     this->refValue() = *this;
-    this->refGrad() = pTraits<Type>::zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -82,7 +82,7 @@ Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
         fvPatchField<Type>::operator=(this->refValue());
     }
 
-    this->refGrad() = pTraits<Type>::zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C
index 68caf7d14c..af098508e4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C
@@ -50,7 +50,7 @@ Foam::AverageIOField<Type>::AverageIOField
 :
     regIOobject(io),
     Field<Type>(size),
-    average_(pTraits<Type>::zero)
+    average_(Zero)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index e7edad23a5..94c090296a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -45,10 +45,10 @@ timeVaryingMappedFixedValueFvPatchField
     sampleTimes_(0),
     startSampleTime_(-1),
     startSampledValues_(0),
-    startAverage_(pTraits<Type>::zero),
+    startAverage_(Zero),
     endSampleTime_(-1),
     endSampledValues_(0),
-    endAverage_(pTraits<Type>::zero),
+    endAverage_(Zero),
     offset_()
 {}
 
@@ -78,10 +78,10 @@ timeVaryingMappedFixedValueFvPatchField
     sampleTimes_(0),
     startSampleTime_(-1),
     startSampledValues_(0),
-    startAverage_(pTraits<Type>::zero),
+    startAverage_(Zero),
     endSampleTime_(-1),
     endSampledValues_(0),
-    endAverage_(pTraits<Type>::zero),
+    endAverage_(Zero),
     offset_(Function1<Type>::New("offset", dict))
 {
     if
@@ -134,10 +134,10 @@ timeVaryingMappedFixedValueFvPatchField
     sampleTimes_(0),
     startSampleTime_(-1),
     startSampledValues_(0),
-    startAverage_(pTraits<Type>::zero),
+    startAverage_(Zero),
     endSampleTime_(-1),
     endSampledValues_(0),
-    endAverage_(pTraits<Type>::zero),
+    endAverage_(Zero),
     offset_(ptf.offset_, false)
 {}
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index 771586d6a8..4527eca009 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -36,7 +36,7 @@ Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
 :
     fixedValueFvPatchField<Type>(p, iF),
     ranGen_(label(0)),
-    fluctuationScale_(pTraits<Type>::zero),
+    fluctuationScale_(Zero),
     referenceField_(p.size()),
     alpha_(0.1),
     curTimeIndex_(-1)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index c68304a93b..2ae611dc17 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -37,8 +37,8 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
     mixedFvPatchField<Type>(p, iF),
     phiName_("phi")
 {
-    this->refValue() = pTraits<Type>::zero;
-    this->refGrad() = pTraits<Type>::zero;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -70,7 +70,7 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
         fvPatchField<Type>::operator=(this->refValue());
     }
 
-    this->refGrad() = pTraits<Type>::zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -94,7 +94,7 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
     this->refValue() =
         uniformInletValue_->value(this->db().time().timeOutputValue());
 
-    this->refGrad() = pTraits<Type>::zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 
     // Initialize the patch value to the refValue
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 856c1a174f..88cd19d712 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -116,14 +116,14 @@ Foam::fvPatchField<Type>::fvPatchField
 {
     if (dict.found("value"))
     {
-        fvPatchField<Type>::operator=
+        Field<Type>::operator=
         (
             Field<Type>("value", dict, p.size())
         );
     }
     else if (!valueRequired)
     {
-        fvPatchField<Type>::operator=(pTraits<Type>::zero);
+        Field<Type>::operator=(Zero);
     }
     else
     {

From 628eca41f6db8ee752e35fa04500b8f8d34e7aaa Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 08:31:34 +0000
Subject: [PATCH 312/447] Updated headers

---
 .../fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C | 2 +-
 .../inletOutletTotalTemperatureFvPatchScalarField.C             | 2 +-
 .../mappedFixedInternalValueFvPatchField.C                      | 2 +-
 .../fvPatchFields/derived/outletInlet/outletInletFvPatchField.C | 2 +-
 .../derived/timeVaryingMappedFixedValue/AverageIOField.C        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index 198c81d10d..e5036e4058 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index 54aa5346e9..8a113e177a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
index 082d9944ed..6f5a49c7b6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index b79fd2b83b..7584e4aa1a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C
index af098508e4..c8099fe94b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 7e5d9982a74ed3fc50c1e37c1b1f500abed6ecfa Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 08:33:16 +0000
Subject: [PATCH 313/447] etc/codeTemplates/BC: Use Use 'Zero' rather than
 'pTraits<Type>::zero' to initialize to 0

---
 etc/codeTemplates/BC/BC.C | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index 7163b87aa3..ced40005b3 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -50,15 +50,15 @@ CONSTRUCT
 :
     PARENT(p, iF),
     scalarData_(0.0),
-    data_(pTraits<TYPE>::zero),
-    fieldData_(p.size(), pTraits<TYPE>::zero),
+    data_(Zero),
+    fieldData_(p.size(), Zero),
     timeVsData_(),
     wordData_("wordDefault"),
     labelData_(-1),
     boolData_(false)
 {
-    this->refValue() = pTraits<TYPE>::zero;
-    this->refGrad() = pTraits<TYPE>::zero;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -81,7 +81,7 @@ CONSTRUCT
     labelData_(-1),
     boolData_(false)
 {
-    this->refGrad() = pTraits<TYPE>::zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 
     this->refValue() = FIELD("fieldData", dict, p.size());

From 03865517961b6013023bcc41d97b420df5e84489 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 10:35:13 +0000
Subject: [PATCH 314/447] zero: Added support for initializing bool

---
 src/OpenFOAM/primitives/zero/zero.H | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/OpenFOAM/primitives/zero/zero.H b/src/OpenFOAM/primitives/zero/zero.H
index 8c2f6fb37a..1bd5f43807 100644
--- a/src/OpenFOAM/primitives/zero/zero.H
+++ b/src/OpenFOAM/primitives/zero/zero.H
@@ -54,6 +54,12 @@ public:
     zero()
     {}
 
+    //- Return 0 for bool
+    inline operator bool() const
+    {
+        return 0;
+    }
+
     //- Return 0 for label
     inline operator label() const
     {

From ce81b44dc66e7161d2aa66f9b4b5d0771f26dc77 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 10:35:57 +0000
Subject: [PATCH 315/447] VectorSpaces, MatrixSpaces: Allow automatic
 conversion from zero

---
 src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H             | 2 +-
 src/OpenFOAM/primitives/RowVector/RowVector.H                 | 2 +-
 src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H     | 2 +-
 src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H | 2 +-
 src/OpenFOAM/primitives/SymmTensor/SymmTensor.H               | 2 +-
 src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H           | 2 +-
 src/OpenFOAM/primitives/Tensor/Tensor.H                       | 2 +-
 src/OpenFOAM/primitives/Tensor2D/Tensor2D.H                   | 2 +-
 src/OpenFOAM/primitives/Vector/Vector.H                       | 2 +-
 src/OpenFOAM/primitives/Vector2D/Vector2D.H                   | 2 +-
 src/OpenFOAM/primitives/VectorSpace/VectorSpace.H             | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
index fd0beaca09..d93310ed26 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
@@ -202,7 +202,7 @@ public:
         inline MatrixSpace();
 
         //- Construct initialized to zero
-        inline explicit MatrixSpace(const Foam::zero);
+        inline MatrixSpace(const Foam::zero);
 
         //- Construct as copy of a VectorSpace with the same size
         template<class Form2, class Cmpt2>
diff --git a/src/OpenFOAM/primitives/RowVector/RowVector.H b/src/OpenFOAM/primitives/RowVector/RowVector.H
index 1c2005cb35..f670241f66 100644
--- a/src/OpenFOAM/primitives/RowVector/RowVector.H
+++ b/src/OpenFOAM/primitives/RowVector/RowVector.H
@@ -70,7 +70,7 @@ public:
         inline RowVector();
 
         //- Construct initialized to zero
-        inline explicit RowVector(const Foam::zero);
+        inline RowVector(const Foam::zero);
 
         //- Construct given VectorSpace of the same rank
         template<class Cmpt2>
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
index 656731ccf0..9c8b8a12a9 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
@@ -83,7 +83,7 @@ public:
         inline SphericalTensor();
 
         //- Construct initialized to zero
-        inline explicit SphericalTensor(const Foam::zero);
+        inline SphericalTensor(const Foam::zero);
 
         //- Construct given VectorSpace
         template<class Cmpt2>
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
index 9791a66829..8db556c9cd 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
@@ -79,7 +79,7 @@ public:
         inline SphericalTensor2D();
 
         //- Construct initialized to zero
-        inline explicit SphericalTensor2D(const Foam::zero);
+        inline SphericalTensor2D(const Foam::zero);
 
         //- Construct given VectorSpace
         inline SphericalTensor2D
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index aa5758f2d2..2ee9b74e9f 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -83,7 +83,7 @@ public:
         inline SymmTensor();
 
         //- Construct initialized to zero
-        inline explicit SymmTensor(const Foam::zero);
+        inline SymmTensor(const Foam::zero);
 
         //- Construct given VectorSpace of the same rank
         template<class Cmpt2>
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
index ac5811fc75..ad733376ec 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
@@ -83,7 +83,7 @@ public:
         inline SymmTensor2D();
 
         //- Construct initialized to zero
-        inline explicit SymmTensor2D(const Foam::zero);
+        inline SymmTensor2D(const Foam::zero);
 
         //- Construct given VectorSpace
         inline SymmTensor2D(const VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>&);
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index 044e62537b..42570c866e 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -91,7 +91,7 @@ public:
         inline Tensor();
 
         //- Construct initialized to zero
-        inline explicit Tensor(const Foam::zero);
+        inline Tensor(const Foam::zero);
 
         //- Construct given MatrixSpace of the same rank
         template<class Cmpt2>
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
index d2e82ca134..7ff02d3f9f 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
@@ -86,7 +86,7 @@ public:
         inline Tensor2D();
 
         //- Construct initialized to zero
-        inline explicit Tensor2D(const Foam::zero);
+        inline Tensor2D(const Foam::zero);
 
         //- Construct given VectorSpace
         inline Tensor2D(const VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>&);
diff --git a/src/OpenFOAM/primitives/Vector/Vector.H b/src/OpenFOAM/primitives/Vector/Vector.H
index 6a6495c249..b442d8fff1 100644
--- a/src/OpenFOAM/primitives/Vector/Vector.H
+++ b/src/OpenFOAM/primitives/Vector/Vector.H
@@ -82,7 +82,7 @@ public:
         inline Vector();
 
         //- Construct initialized to zero
-        inline explicit Vector(const Foam::zero);
+        inline Vector(const Foam::zero);
 
         //- Construct given VectorSpace of the same rank
         template<class Cmpt2>
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2D.H b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
index c64afadab6..c30e8a47eb 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2D.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
@@ -76,7 +76,7 @@ public:
         inline Vector2D();
 
         //- Construct initialized to zero
-        inline explicit Vector2D(const Foam::zero);
+        inline Vector2D(const Foam::zero);
 
         //- Construct given VectorSpace
         inline Vector2D(const VectorSpace<Vector2D<Cmpt>, Cmpt, 2>&);
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index 1d47ae3a07..2aa3a1d74d 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -154,7 +154,7 @@ public:
         inline VectorSpace();
 
         //- Construct initialized to zero
-        inline explicit VectorSpace(const Foam::zero);
+        inline VectorSpace(const Foam::zero);
 
         //- Construct from Istream
         VectorSpace(Istream&);

From 34361493f9eb7502164800f2f72313006e373fd3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 10:38:30 +0000
Subject: [PATCH 316/447] src/OpenFOAM: Use Zero rather than pTraits<Type>

---
 src/OpenFOAM/containers/Lists/BinSum/BinSum.C | 14 ++++-----
 .../Lists/Distribution/Distribution.C         |  4 +--
 .../dimensionedType/dimensionedType.C         |  6 ++--
 .../FieldField/FieldFieldFunctions.C          | 10 +++----
 src/OpenFOAM/fields/Fields/Field/Field.C      |  4 +--
 .../fields/Fields/Field/FieldFunctions.C      | 30 +++++++++----------
 .../UniformDimensionedField.C                 |  4 +--
 .../basic/value/valuePointPatchField.C        |  2 +-
 .../interpolatePointToCell.C                  |  4 +--
 .../interpolation2DTable.C                    |  2 +-
 .../interpolationWeightsTemplates.C           |  4 +--
 .../PatchToPatchInterpolate.C                 | 12 ++------
 .../PrimitivePatchInterpolation.C             |  6 ++--
 .../matrices/LUscalarMatrix/LUscalarMatrix.C  |  4 +--
 .../matrices/LduMatrix/LduMatrix/LduMatrix.C  |  8 ++---
 .../LduMatrix/LduMatrix/LduMatrixOperations.C |  2 +-
 .../LduMatrix/LduMatrix/LduMatrixSolver.C     |  4 +--
 .../LduMatrix/LduMatrix/SolverPerformance.H   |  4 +--
 .../Solvers/DiagonalSolver/DiagonalSolver.C   |  6 ++--
 .../LduMatrix/Solvers/PBiCCCG/PBiCCCG.C       |  4 +--
 .../LduMatrix/Solvers/PBiCICG/PBiCICG.C       |  4 +--
 .../Solvers/SmoothSolver/SmoothSolver.C       |  4 +--
 .../meshes/meshShapes/face/faceTemplates.C    |  6 ++--
 .../demandDrivenEntry/demandDrivenEntry.C     |  4 +--
 .../functions/Function1/Constant/Constant.C   |  2 +-
 .../functions/Function1/Function1/Function1.C |  4 +--
 .../PolynomialEntry/PolynomialEntry.C         |  4 +--
 .../functions/Function1/Table/TableBase.C     |  2 +-
 28 files changed, 78 insertions(+), 86 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/BinSum/BinSum.C b/src/OpenFOAM/containers/Lists/BinSum/BinSum.C
index 1e09961326..3850f4b653 100644
--- a/src/OpenFOAM/containers/Lists/BinSum/BinSum.C
+++ b/src/OpenFOAM/containers/Lists/BinSum/BinSum.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,12 +35,12 @@ Foam::BinSum<IndexType, List, CombineOp>::BinSum
     const IndexType delta
 )
 :
-    List(ceil((max-min)/delta), pTraits<typename List::value_type>::zero),
+    List(ceil((max-min)/delta), Zero),
     min_(min),
     max_(max),
     delta_(delta),
-    lowSum_(pTraits<typename List::value_type>::zero),
-    highSum_(pTraits<typename List::value_type>::zero)
+    lowSum_(Zero),
+    highSum_(Zero)
 {}
 
 
@@ -55,12 +55,12 @@ Foam::BinSum<IndexType, List, CombineOp>::BinSum
     const CombineOp& cop
 )
 :
-    List(ceil((max-min)/delta), pTraits<typename List::value_type>::zero),
+    List(ceil((max-min)/delta), Zero),
     min_(min),
     max_(max),
     delta_(delta),
-    lowSum_(pTraits<typename List::value_type>::zero),
-    highSum_(pTraits<typename List::value_type>::zero)
+    lowSum_(Zero),
+    highSum_(Zero)
 {
     forAll(indexVals, i)
     {
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
index c5ee3a283c..e6d4524995 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
@@ -196,7 +196,7 @@ Foam::Pair<Foam::label> Foam::Distribution<Type>::validLimits
 template<class Type>
 Type Foam::Distribution<Type>::mean() const
 {
-    Type meanValue(pTraits<Type>::zero);
+    Type meanValue(Zero);
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {
@@ -225,7 +225,7 @@ Type Foam::Distribution<Type>::mean() const
 template<class Type>
 Type Foam::Distribution<Type>::median() const
 {
-    Type medianValue(pTraits<Type>::zero);
+    Type medianValue(Zero);
 
     List<List<Pair<scalar>>> normDistribution = normalised();
 
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index f110dd803d..f5381ef91e 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -137,7 +137,7 @@ Foam::dimensioned<Type>::dimensioned
 :
     name_(name),
     dimensions_(dimSet),
-    value_(pTraits<Type>::zero)
+    value_(Zero)
 {
     initialize(is);
 }
@@ -153,7 +153,7 @@ Foam::dimensioned<Type>::dimensioned
 :
     name_(name),
     dimensions_(dimSet),
-    value_(pTraits<Type>::zero)
+    value_(Zero)
 {
     initialize(dict.lookup(name));
 }
@@ -165,7 +165,7 @@ Foam::dimensioned<Type>::dimensioned
 :
     name_("undefined"),
     dimensions_(dimless),
-    value_(pTraits<Type>::zero)
+    value_(Zero)
 {}
 
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index 330336b2af..f30797a793 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -468,7 +468,7 @@ Type sum(const FieldField<Field, Type>& f)
 {
     if (f.size())
     {
-        Type Sum = pTraits<Type>::zero;
+        Type Sum = Zero;
 
         forAll(f, i)
         {
@@ -479,7 +479,7 @@ Type sum(const FieldField<Field, Type>& f)
     }
     else
     {
-        return pTraits<Type>::zero;
+        return Zero;
     }
 }
 
@@ -524,7 +524,7 @@ Type average(const FieldField<Field, Type>& f)
             WarningInFunction
                 << "empty fieldField, returning zero" << endl;
 
-            return pTraits<Type>::zero;
+            return Zero;
         }
 
         Type avrg = sum(f)/n;
@@ -536,7 +536,7 @@ Type average(const FieldField<Field, Type>& f)
         WarningInFunction
             << "empty fieldField, returning zero" << endl;
 
-        return pTraits<Type>::zero;
+        return Zero;
     }
 }
 
@@ -585,7 +585,7 @@ Type gAverage(const FieldField<Field, Type>& f)
         WarningInFunction
             << "empty fieldField, returning zero" << endl;
 
-        return pTraits<Type>::zero;
+        return Zero;
     }
 }
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 31983797d1..4b628788e8 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -406,7 +406,7 @@ void Foam::Field<Type>::map
         const labelList&  localAddrs   = mapAddressing[i];
         const scalarList& localWeights = mapWeights[i];
 
-        f[i] = pTraits<Type>::zero;
+        f[i] = Zero;
 
         forAll(localAddrs, j)
         {
@@ -533,7 +533,7 @@ void Foam::Field<Type>::rmap
 {
     Field<Type>& f = *this;
 
-    f = pTraits<Type>::zero;
+    f = Zero;
 
     forAll(mapF, i)
     {
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index c75a045f5d..65d2406470 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -346,13 +346,13 @@ Type sum(const UList<Type>& f)
 {
     if (f.size())
     {
-        Type Sum = pTraits<Type>::zero;
+        Type Sum = Zero;
         TFOR_ALL_S_OP_F(Type, Sum, +=, Type, f)
         return Sum;
     }
     else
     {
-        return pTraits<Type>::zero;
+        return Zero;
     }
 }
 
@@ -379,7 +379,7 @@ Type maxMagSqr(const UList<Type>& f)
     }
     else
     {
-        return pTraits<Type>::zero;
+        return Zero;
     }
 }
 
@@ -417,13 +417,13 @@ scalar sumProd(const UList<Type>& f1, const UList<Type>& f2)
 {
     if (f1.size() && (f1.size() == f2.size()))
     {
-        scalar SumProd = 0.0;
+        scalar SumProd = 0;
         TFOR_ALL_S_OP_F_OP_F(scalar, SumProd, +=, Type, f1, &&, Type, f2)
         return SumProd;
     }
     else
     {
-        return 0.0;
+        return 0;
     }
 }
 
@@ -433,7 +433,7 @@ Type sumCmptProd(const UList<Type>& f1, const UList<Type>& f2)
 {
     if (f1.size() && (f1.size() == f2.size()))
     {
-        Type SumProd = pTraits<Type>::zero;
+        Type SumProd = Zero;
         TFOR_ALL_S_OP_FUNC_F_F
         (
             Type,
@@ -449,7 +449,7 @@ Type sumCmptProd(const UList<Type>& f1, const UList<Type>& f2)
     }
     else
     {
-        return pTraits<Type>::zero;
+        return Zero;
     }
 }
 
@@ -459,13 +459,13 @@ scalar sumSqr(const UList<Type>& f)
 {
     if (f.size())
     {
-        scalar SumSqr = 0.0;
+        scalar SumSqr = 0;
         TFOR_ALL_S_OP_FUNC_F(scalar, SumSqr, +=, sqr, Type, f)
         return SumSqr;
     }
     else
     {
-        return 0.0;
+        return 0;
     }
 }
 
@@ -476,13 +476,13 @@ scalar sumMag(const UList<Type>& f)
 {
     if (f.size())
     {
-        scalar SumMag = 0.0;
+        scalar SumMag = 0;
         TFOR_ALL_S_OP_FUNC_F(scalar, SumMag, +=, mag, Type, f)
         return SumMag;
     }
     else
     {
-        return 0.0;
+        return 0;
     }
 }
 
@@ -494,13 +494,13 @@ Type sumCmptMag(const UList<Type>& f)
 {
     if (f.size())
     {
-        Type SumMag = pTraits<Type>::zero;
+        Type SumMag = Zero;
         TFOR_ALL_S_OP_FUNC_F(scalar, SumMag, +=, cmptMag, Type, f)
         return SumMag;
     }
     else
     {
-        return pTraits<Type>::zero;
+        return Zero;
     }
 }
 
@@ -520,7 +520,7 @@ Type average(const UList<Type>& f)
         WarningInFunction
             << "empty field, returning zero" << endl;
 
-        return pTraits<Type>::zero;
+        return Zero;
     }
 }
 
@@ -597,7 +597,7 @@ Type gAverage
         WarningInFunction
             << "empty field, returning zero." << endl;
 
-        return pTraits<Type>::zero;
+        return Zero;
     }
 }
 
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
index 1fd8eac973..cc7c6be0ea 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ Foam::UniformDimensionedField<Type>::UniformDimensionedField
 )
 :
     regIOobject(io),
-    dimensioned<Type>(regIOobject::name(), dimless, pTraits<Type>::zero)
+    dimensioned<Type>(regIOobject::name(), dimless, Zero)
 {
     dictionary dict(readStream(typeName));
     scalar multiplier;
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index c22c91f79d..e7c7dacb85 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -77,7 +77,7 @@ Foam::valuePointPatchField<Type>::valuePointPatchField
     }
     else if (!valueRequired)
     {
-        Field<Type>::operator=(pTraits<Type>::zero);
+        Field<Type>::operator=(Zero);
     }
     else
     {
diff --git a/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.C b/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.C
index c0e7192d15..c5d2cc4257 100644
--- a/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.C
+++ b/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Type Foam::interpolatePointToCell
 
     labelHashSet pointHad(10*cFaces.size());
 
-    Type sum(pTraits<Type>::zero);
+    Type sum = Zero;
 
     forAll(cFaces, i)
     {
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
index d12ce331da..fe2e5bd514 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
@@ -308,7 +308,7 @@ Type Foam::interpolation2DTable<Type>::operator()
         WarningInFunction
             << "cannot interpolate a zero-sized table - returning zero" << endl;
 
-        return pTraits<Type>::zero;
+        return Zero;
     }
     else if (nX == 1)
     {
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C
index 9050921b9e..1f2038cb91 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ Foam::interpolationWeights::weightedSum
     }
     else
     {
-        return pTraits<returnType>::zero;
+        return Zero;
     }
 }
 
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
index b44cd52352..621e9a7574 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
@@ -51,11 +51,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 
     tmp<Field<Type>> tresult
     (
-        new Field<Type>
-        (
-            toPatch_.nPoints(),
-            pTraits<Type>::zero
-        )
+        new Field<Type>(toPatch_.nPoints(), Zero)
     );
 
     Field<Type>& result = tresult();
@@ -119,11 +115,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
 
     tmp<Field<Type>> tresult
     (
-        new Field<Type>
-        (
-            toPatch_.size(),
-            pTraits<Type>::zero
-        )
+        new Field<Type>(toPatch_.size(), Zero)
     );
 
     Field<Type>& result = tresult();
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
index e9253134ef..30c5ec1e70 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
@@ -188,7 +188,7 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
     (
         new Field<Type>
         (
-            patch_.nPoints(), pTraits<Type>::zero
+            patch_.nPoints(), Zero
         )
     );
 
@@ -245,7 +245,7 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
         new Field<Type>
         (
             patch_.size(),
-            pTraits<Type>::zero
+            Zero
         )
     );
 
@@ -300,7 +300,7 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
 
     tmp<Field<Type>> tresult
     (
-        new Field<Type>(patch_.nEdges(), pTraits<Type>::zero)
+        new Field<Type>(patch_.nEdges(), Zero)
     );
 
     Field<Type>& result = tresult.ref();
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
index dc68209202..5c811d20c3 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
@@ -129,7 +129,7 @@ Foam::LUscalarMatrix::LUscalarMatrix
                 nCells += lduMatrices[i].size();
             }
 
-            scalarSquareMatrix m(nCells, nCells, 0.0);
+            scalarSquareMatrix m(nCells, 0.0);
             transfer(m);
             convert(lduMatrices);
         }
@@ -137,7 +137,7 @@ Foam::LUscalarMatrix::LUscalarMatrix
     else
     {
         label nCells = ldum.lduAddr().size();
-        scalarSquareMatrix m(nCells, nCells, 0.0);
+        scalarSquareMatrix m(nCells, 0.0);
         transfer(m);
         convert(ldum, interfaceCoeffs, interfaces);
     }
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
index aa50c4def3..a36b31137b 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
@@ -191,7 +191,7 @@ Foam::Field<DType>& Foam::LduMatrix<Type, DType, LUType>::diag()
 {
     if (!diagPtr_)
     {
-        diagPtr_ = new Field<DType>(lduAddr().size(), pTraits<DType>::zero);
+        diagPtr_ = new Field<DType>(lduAddr().size(), Zero);
     }
 
     return *diagPtr_;
@@ -212,7 +212,7 @@ Foam::Field<LUType>& Foam::LduMatrix<Type, DType, LUType>::upper()
             upperPtr_ = new Field<LUType>
             (
                 lduAddr().lowerAddr().size(),
-                pTraits<LUType>::zero
+                Zero
             );
         }
     }
@@ -235,7 +235,7 @@ Foam::Field<LUType>& Foam::LduMatrix<Type, DType, LUType>::lower()
             lowerPtr_ = new Field<LUType>
             (
                 lduAddr().lowerAddr().size(),
-                pTraits<LUType>::zero
+                Zero
             );
         }
     }
@@ -249,7 +249,7 @@ Foam::Field<Type>& Foam::LduMatrix<Type, DType, LUType>::source()
 {
     if (!sourcePtr_)
     {
-        sourcePtr_ = new Field<Type>(lduAddr().size(), pTraits<Type>::zero);
+        sourcePtr_ = new Field<Type>(lduAddr().size(), Zero);
     }
 
     return *sourcePtr_;
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
index 1c43bebcaf..8715b36752 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
@@ -89,7 +89,7 @@ Foam::LduMatrix<Type, DType, LUType>::H(const Field<Type>& psi) const
 {
     tmp<Field<Type>> tHpsi
     (
-        new Field<Type>(lduAddr().size(), pTraits<Type>::zero)
+        new Field<Type>(lduAddr().size(), Zero)
     );
 
     if (lowerPtr_ || upperPtr_)
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
index 8aed474b36..157db46d7b 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ Foam::LduMatrix<Type, DType, LUType>::solver::solver
     maxIter_(1000),
     minIter_(0),
     tolerance_(1e-6*pTraits<Type>::one),
-    relTol_(pTraits<Type>::zero)
+    relTol_(Zero)
 {
     readControls();
 }
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
index a933e1aeca..1c639c4439 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
@@ -110,8 +110,8 @@ public:
 
         SolverPerformance()
         :
-            initialResidual_(pTraits<Type>::zero),
-            finalResidual_(pTraits<Type>::zero),
+            initialResidual_(Zero),
+            finalResidual_(Zero),
             noIterations_(0),
             converged_(false),
             singular_(false)
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C
index adbe9113a2..4c1cf19a26 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,8 +67,8 @@ Foam::DiagonalSolver<Type, DType, LUType>::solve
     (
         typeName,
         this->fieldName_,
-        pTraits<Type>::zero,
-        pTraits<Type>::zero,
+        Zero,
+        Zero,
         0,
         true,
         false
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
index b770bdf21f..11f7d52aa7 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ Foam::PBiCCCG<Type, DType, LUType>::solve
     Field<Type> pA(nCells);
     Type* __restrict__ pAPtr = pA.begin();
 
-    Field<Type> pT(nCells, pTraits<Type>::zero);
+    Field<Type> pT(nCells, Zero);
     Type* __restrict__ pTPtr = pT.begin();
 
     Field<Type> wA(nCells);
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
index 3043a01673..860765e4c1 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ Foam::PBiCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
     Field<Type> pA(nCells);
     Type* __restrict__ pAPtr = pA.begin();
 
-    Field<Type> pT(nCells, pTraits<Type>::zero);
+    Field<Type> pT(nCells, Zero);
     Type* __restrict__ pTPtr = pT.begin();
 
     Field<Type> wA(nCells);
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
index 5dea9207d6..76d3b4369e 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ Foam::SmoothSolver<Type, DType, LUType>::solve(Field<Type>& psi) const
     }
     else
     {
-        Type normFactor = pTraits<Type>::zero;
+        Type normFactor = Zero;
 
         {
             Field<Type> Apsi(psi.size());
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C b/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
index dcfda1d699..33d1f97b78 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ Type Foam::face::average
     label nPoints = size();
 
     point centrePoint = point::zero;
-    Type cf = pTraits<Type>::zero;
+    Type cf = Zero;
 
     for (label pI=0; pI<nPoints; pI++)
     {
@@ -83,7 +83,7 @@ Type Foam::face::average
     cf /= nPoints;
 
     scalar sumA = 0;
-    Type sumAf = pTraits<Type>::zero;
+    Type sumAf = Zero;
 
     for (label pI=0; pI<nPoints; pI++)
     {
diff --git a/src/OpenFOAM/primitives/demandDrivenEntry/demandDrivenEntry.C b/src/OpenFOAM/primitives/demandDrivenEntry/demandDrivenEntry.C
index bac4117c78..cbb518b241 100644
--- a/src/OpenFOAM/primitives/demandDrivenEntry/demandDrivenEntry.C
+++ b/src/OpenFOAM/primitives/demandDrivenEntry/demandDrivenEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ Foam::demandDrivenEntry<Type>::demandDrivenEntry
 :
     dict_(dict),
     keyword_(keyword),
-    value_(pTraits<Type>::zero),
+    value_(Zero),
     stored_(false)
 {}
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
index 8b757e59bc..d1b5f32885 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
@@ -35,7 +35,7 @@ Foam::Function1Types::Constant<Type>::Constant
 )
 :
     Function1<Type>(entryName),
-    value_(pTraits<Type>::zero)
+    value_(Zero)
 {
     Istream& is(dict.lookup(entryName));
     word entryType(is);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index 3654a7563e..bccc14d7f5 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -69,7 +69,7 @@ Type Foam::Function1<Type>::value(const scalar x) const
 {
     NotImplemented;
 
-    return pTraits<Type>::zero;
+    return Zero;
 }
 
 
@@ -78,7 +78,7 @@ Type Foam::Function1<Type>::integrate(const scalar x1, const scalar x2) const
 {
     NotImplemented;
 
-    return pTraits<Type>::zero;
+    return Zero;
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
index 4859b50949..005e743e61 100644
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
@@ -146,7 +146,7 @@ void Foam::Function1Types::Polynomial<Type>::convertTimeBase(const Time& t)
 template<class Type>
 Type Foam::Function1Types::Polynomial<Type>::value(const scalar x) const
 {
-    Type y(pTraits<Type>::zero);
+    Type y(Zero);
     forAll(coeffs_, i)
     {
         y += cmptMultiply
@@ -167,7 +167,7 @@ Type Foam::Function1Types::Polynomial<Type>::integrate
     const scalar x2
 ) const
 {
-    Type intx(pTraits<Type>::zero);
+    Type intx(Zero);
 
     if (canIntegrate_)
     {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 8217c6ca18..a4f83a039c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -394,7 +394,7 @@ Foam::tmp<Foam::scalarField> Foam::Function1Types::TableBase<Type>::x() const
 template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::Function1Types::TableBase<Type>::y() const
 {
-    tmp<Field<Type>> tfld(new Field<Type>(table_.size(), pTraits<Type>::zero));
+    tmp<Field<Type>> tfld(new Field<Type>(table_.size(), Zero));
     Field<Type>& fld = tfld.ref();
 
     forAll(table_, i)

From 554b965000557038740cb6942e09a9362a2ac7ac Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 10:38:59 +0000
Subject: [PATCH 317/447]  VectorSpaces, MatrixSpaces: Allow automatic
 conversion from zero

---
 .../CompactSpatialTensor/CompactSpatialTensor.H                 | 2 +-
 .../CompactSpatialTensorT/CompactSpatialTensorT.H               | 2 +-
 .../spatialVectorAlgebra/SpatialTensor/SpatialTensor.H          | 2 +-
 .../spatialVectorAlgebra/SpatialVector/SpatialVector.H          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H
index fa2b14f6c9..03e6dcc565 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H
@@ -72,7 +72,7 @@ public:
         //- Construct null
         inline CompactSpatialTensor();
 
-        inline explicit CompactSpatialTensor(const Foam::zero);
+        inline CompactSpatialTensor(const Foam::zero);
 
         //- Construct given MatrixSpace of the same rank
         inline CompactSpatialTensor
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H
index eedc364357..2ec83b589f 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H
@@ -71,7 +71,7 @@ public:
         //- Construct null
         inline CompactSpatialTensorT();
 
-        inline explicit CompactSpatialTensorT(const Foam::zero);
+        inline CompactSpatialTensorT(const Foam::zero);
 
         //- Construct given MatrixSpace of the same rank
         inline CompactSpatialTensorT
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
index 52c81866c6..63e2d7e7b7 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
@@ -87,7 +87,7 @@ public:
         inline SpatialTensor();
 
         //- Construct initialized to zero
-        inline explicit SpatialTensor(const Foam::zero);
+        inline SpatialTensor(const Foam::zero);
 
         //- Construct given MatrixSpace of the same rank
         inline SpatialTensor(const typename SpatialTensor::msType&);
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
index 33741f3143..ef48678f2a 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
@@ -92,7 +92,7 @@ public:
         inline SpatialVector();
 
         //- Construct initialized to zero
-        inline explicit SpatialVector(const Foam::zero);
+        inline SpatialVector(const Foam::zero);
 
         //- Construct given VectorSpace of the same rank
         inline SpatialVector(const typename SpatialVector::vsType&);

From f34f9b3819f178f5e93cd9d9ad79a7c77386789b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 14:07:38 +0000
Subject: [PATCH 318/447] zero: Return Zero rather than zero()

---
 src/OpenFOAM/primitives/zero/zeroI.H | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/primitives/zero/zeroI.H b/src/OpenFOAM/primitives/zero/zeroI.H
index a197b57338..9b79c8faa2 100644
--- a/src/OpenFOAM/primitives/zero/zeroI.H
+++ b/src/OpenFOAM/primitives/zero/zeroI.H
@@ -59,19 +59,19 @@ inline Type operator-(const zero&, const Type& t)
 template<class Type>
 inline zero operator*(const Type& t, const zero&)
 {
-    return zero();
+    return Zero;
 }
 
 template<class Type>
 inline zero operator*(const zero&, const Type& t)
 {
-    return zero();
+    return Zero;
 }
 
 template<class Type>
 inline zero operator/(const zero&, const Type& t)
 {
-    return zero();
+    return Zero;
 }
 
 

From 14e4045702b468989ba5d8b80b943288000e5f4e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 14:08:01 +0000
Subject: [PATCH 319/447] Updated header

---
 src/OpenFOAM/primitives/zero/zeroI.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/zero/zeroI.H b/src/OpenFOAM/primitives/zero/zeroI.H
index 9b79c8faa2..0b7b75f237 100644
--- a/src/OpenFOAM/primitives/zero/zeroI.H
+++ b/src/OpenFOAM/primitives/zero/zeroI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 5eaa70cebcc21946fd55b8f67d6fc058358a4899 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 14:08:35 +0000
Subject: [PATCH 320/447] GAMGAgglomerationTemplates:  Assign to Zero rather
 than pTraits<Type>::zero

---
 .../GAMGAgglomeration/GAMGAgglomerationTemplates.C            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
index 645fee617d..c4fda6e960 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
@@ -81,7 +81,7 @@ void Foam::GAMGAgglomeration::restrictField
     const labelList& fineToCoarse
 ) const
 {
-    cf = pTraits<Type>::zero;
+    cf = Zero;
 
     forAll(ff, i)
     {
@@ -153,7 +153,7 @@ void Foam::GAMGAgglomeration::restrictFaceField
             << abort(FatalError);
     }
 
-    cf = pTraits<Type>::zero;
+    cf = Zero;
 
     forAll(fineToCoarse, ffacei)
     {

From 27ec0178dc13b014816811a13d593313792a669a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 14:09:04 +0000
Subject: [PATCH 321/447] Updated header

---
 .../GAMGAgglomeration/GAMGAgglomerationTemplates.C              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
index c4fda6e960..ba9f55614f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 961dc048da4b778be3fc9ede0b3405c7cbe84275 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 14:09:24 +0000
Subject: [PATCH 322/447] Matrix: Added support for extracting and assigning
 blocks

The blocks may be specified directly in terms of the size and location in the
parent matrix or with the size obtained from a template specified
VectorSpace or MatrixSpace type.
---
 src/OpenFOAM/matrices/Matrix/Matrix.C  | 481 +++++++++++++++++++++++--
 src/OpenFOAM/matrices/Matrix/Matrix.H  | 301 ++++++++++++++--
 src/OpenFOAM/matrices/Matrix/MatrixI.H | 332 ++++++++++++++++-
 3 files changed, 1051 insertions(+), 63 deletions(-)

diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index 6ccd1c79e5..808e00b86c 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -37,19 +37,7 @@ void Foam::Matrix<Form, Type>::allocate()
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class Form, class Type>
-Foam::Matrix<Form, Type>::~Matrix()
-{
-    if (v_)
-    {
-        delete[] v_;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Form, class Type>
 Foam::Matrix<Form, Type>::Matrix(const label m, const label n)
@@ -69,6 +57,33 @@ Foam::Matrix<Form, Type>::Matrix(const label m, const label n)
 }
 
 
+template<class Form, class Type>
+Foam::Matrix<Form, Type>::Matrix(const label m, const label n, const zero)
+:
+    nRows_(m),
+    nCols_(n),
+    v_(NULL)
+{
+    if (nRows_ < 0 || nCols_ < 0)
+    {
+        FatalErrorInFunction
+            << "Bad m, n " << nRows_ << ", " << nCols_
+            << abort(FatalError);
+    }
+
+    allocate();
+
+    if (v_)
+    {
+        const label mn = size();
+        for (label i=0; i<mn; i++)
+        {
+            v_[i] = Zero;
+        }
+    }
+}
+
+
 template<class Form, class Type>
 Foam::Matrix<Form, Type>::Matrix(const label m, const label n, const Type& a)
 :
@@ -79,7 +94,7 @@ Foam::Matrix<Form, Type>::Matrix(const label m, const label n, const Type& a)
     if (nRows_ < 0 || nCols_ < 0)
     {
         FatalErrorInFunction
-            << "bad m, n " << nRows_ << ", " << nCols_
+            << "Bad m, n " << nRows_ << ", " << nCols_
             << abort(FatalError);
     }
 
@@ -96,6 +111,24 @@ Foam::Matrix<Form, Type>::Matrix(const label m, const label n, const Type& a)
 }
 
 
+template<class Form, class Type>
+inline Foam::Matrix<Form, Type>::Matrix(const mType::Block& block)
+:
+    nRows_(block.m()),
+    nCols_(block.n())
+{
+    allocate();
+
+    for (label i=0; i<nRows_; i++)
+    {
+        for (label j=0; j<nCols_; j++)
+        {
+            (*this)(i,j) = block(i,j);
+        }
+    }
+}
+
+
 template<class Form, class Type>
 Foam::Matrix<Form, Type>::Matrix(const Matrix<Form, Type>& a)
 :
@@ -116,6 +149,20 @@ Foam::Matrix<Form, Type>::Matrix(const Matrix<Form, Type>& a)
 }
 
 
+// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
+
+template<class Form, class Type>
+Foam::Matrix<Form, Type>::~Matrix()
+{
+    if (v_)
+    {
+        delete[] v_;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
 template<class Form, class Type>
 void Foam::Matrix<Form, Type>::clear()
 {
@@ -146,6 +193,26 @@ void Foam::Matrix<Form, Type>::transfer(Matrix<Form, Type>& a)
 }
 
 
+template<class Form, class Type>
+void Foam::Matrix<Form, Type>::setSize(const label m, const label n)
+{
+    mType newMatrix(m, n, Zero);
+
+    label minM = min(m, nRows_);
+    label minN = min(n, nCols_);
+
+    for (label i=0; i<minM; i++)
+    {
+        for (label j=0; j<minN; j++)
+        {
+            newMatrix(i, j) = (*this)(i, j);
+        }
+    }
+
+    transfer(newMatrix);
+}
+
+
 template<class Form, class Type>
 Form Foam::Matrix<Form, Type>::T() const
 {
@@ -164,29 +231,57 @@ Form Foam::Matrix<Form, Type>::T() const
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
 template<class Form, class Type>
-void Foam::Matrix<Form, Type>::operator=(const Type& t)
+Foam::Matrix<Form, Type>::ConstBlock::operator Field<cmptType>() const
 {
-    if (v_)
+    if (nCols_ != 1)
     {
-        const label mn = size();
-        for (label i=0; i<mn; i++)
-        {
-            v_[i] = t;
-        }
+        FatalErrorInFunction
+            << "Number of columns " << nCols_ << " != 1"
+            << abort(FatalError);
     }
+
+    Field<cmptType> f(nRows_);
+
+    forAll(f, i)
+    {
+        f[i] = operator()(i, 0);
+    }
+
+    return f;
 }
 
 
+template<class Form, class Type>
+Foam::Matrix<Form, Type>::Block::operator Field<cmptType>() const
+{
+    if (nCols_ != 1)
+    {
+        FatalErrorInFunction
+            << "Number of columns " << nCols_ << " != 1"
+            << abort(FatalError);
+    }
+
+    Field<cmptType> f(nRows_);
+
+    forAll(f, i)
+    {
+        f[i] = operator()(i, 0);
+    }
+
+    return f;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
 template<class Form, class Type>
 void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
 {
     if (this == &a)
     {
         FatalErrorInFunction
-            << "attempted assignment to self"
+            << "Attempted assignment to self"
             << abort(FatalError);
     }
 
@@ -209,6 +304,247 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
 }
 
 
+template<class Form, class Type>
+void Foam::Matrix<Form, Type>::operator=(const mType::Block& block)
+{
+    for (label i=0; i<nRows_; i++)
+    {
+        for (label j=0; j<nCols_; j++)
+        {
+            (*this)(i,j) = block(i,j);
+        }
+    }
+}
+
+
+template<class Form, class Type>
+void Foam::Matrix<Form, Type>::Block::operator=(const Block& block)
+{
+    if (this != &block)
+    {
+        if (nRows_ != block.m() || nCols_ != block.n())
+        {
+            FatalErrorInFunction
+                << "Attempt to assign blocks of different sizes: "
+                << nRows_ << "x" << nCols_ << " != "
+                << block.m() << "x" << block.n()
+                << abort(FatalError);
+        }
+
+        for (label i=0; i<nRows_; i++)
+        {
+            for (label j=0; j<nCols_; j++)
+            {
+                (*this)(i, j) = block(i, j);
+            }
+        }
+    }
+}
+
+
+template<class Form, class Type>
+void Foam::Matrix<Form, Type>::Block::operator=(const ConstBlock& block)
+{
+    if (this != &block)
+    {
+        if (nRows_ != block.m() || nCols_ != block.n())
+        {
+            FatalErrorInFunction
+                << "Attempt to assign blocks of different sizes: "
+                << nRows_ << "x" << nCols_ << " != "
+                << block.m() << "x" << block.n()
+                << abort(FatalError);
+        }
+
+        for (label i=0; i<nRows_; i++)
+        {
+            for (label j=0; j<nCols_; j++)
+            {
+                (*this)(i, j) = block(i, j);
+            }
+        }
+    }
+}
+
+
+template<class Form, class Type>
+void Foam::Matrix<Form, Type>::Block::operator=(const mType& block)
+{
+    if (nRows_ != block.m() || nCols_ != block.n())
+    {
+        FatalErrorInFunction
+            << "Attempt to assign blocks of different sizes: "
+            << nRows_ << "x" << nCols_ << " != "
+            << block.m() << "x" << block.n()
+            << abort(FatalError);
+    }
+
+    for (label i=0; i<nRows_; i++)
+    {
+        for (label j=0; j<nCols_; j++)
+        {
+            (*this)(i, j) = block(i, j);
+        }
+    }
+}
+
+
+template<class Form, class Type>
+void Foam::Matrix<Form, Type>::operator=(const Type& t)
+{
+    if (v_)
+    {
+        const label mn = size();
+        for (label i=0; i<mn; i++)
+        {
+            v_[i] = t;
+        }
+    }
+}
+
+
+template<class Form, class Type>
+void Foam::Matrix<Form, Type>::operator=(const zero)
+{
+    if (v_)
+    {
+        const label mn = size();
+        for (label i=0; i<mn; i++)
+        {
+            v_[i] = Zero;
+        }
+    }
+}
+
+
+template<class Form, class Type>
+template
+<
+    template<class, Foam::direction, Foam::direction> class MSBlock,
+    class SubTensor,
+    Foam::direction BRowStart,
+    Foam::direction BColStart
+>
+void Foam::Matrix<Form, Type>::Block::operator=
+(
+    const MSBlock<SubTensor, BRowStart, BColStart>& block
+)
+{
+    if (nRows_ != block.nRows || nCols_ != block.nCols)
+    {
+        FatalErrorInFunction
+            << "Attempt to assign blocks of different sizes: "
+            << nRows_ << "x" << nCols_ << " != "
+            << block.nRows << "x" << block.nCols
+            << abort(FatalError);
+    }
+
+    for (direction i=0; i<nRows_; ++i)
+    {
+        for (direction j=0; j<nCols_; ++j)
+        {
+            operator()(i, j) = block(i, j);
+        }
+    }
+}
+
+
+template<class Form, class Type>
+template
+<
+    template<class, Foam::direction> class VSBlock,
+    class SubVector,
+    Foam::direction BStart
+>
+void Foam::Matrix<Form, Type>::Block::operator=
+(
+    const VSBlock<SubVector, BStart>& block
+)
+{
+    if (nRows_ != block.nComponents || nCols_ != 1)
+    {
+        FatalErrorInFunction
+            << "Attempt to assign blocks of different sizes: "
+            << nRows_ << "x" << nCols_ << " != "
+            << block.nComponents << "x" << 1
+            << abort(FatalError);
+    }
+
+    for (direction i=0; i<nRows_; ++i)
+    {
+        operator()(i, 0) = block[i];
+    }
+}
+
+
+template<class Form, class Type>
+template<class MSForm, Foam::direction Nrows, Foam::direction Ncols>
+void Foam::Matrix<Form, Type>::Block::operator=
+(
+    const MatrixSpace<MSForm, cmptType, Nrows, Ncols>& ms
+)
+{
+    if (nRows_ != Nrows || nCols_ != Ncols)
+    {
+        FatalErrorInFunction
+            << "Attempt to assign blocks of different sizes: "
+            << nRows_ << "x" << nCols_ << " != "
+            << Nrows << "x" << Ncols
+            << abort(FatalError);
+    }
+
+    for (label i=0; i<nRows_; i++)
+    {
+        for (label j=0; j<nCols_; j++)
+        {
+            (*this)(i, j) = ms(i, j);
+        }
+    }
+}
+
+
+template<class Form, class Type>
+template<class VSForm, Foam::direction Ncmpts>
+void Foam::Matrix<Form, Type>::Block::operator=
+(
+    const VectorSpace<VSForm, cmptType, Ncmpts>& ms
+)
+{
+    if (nRows_ != Ncmpts || nCols_ != 1)
+    {
+        FatalErrorInFunction
+            << "Attempt to assign blocks of different sizes: "
+            << nRows_ << "x" << nCols_ << " != "
+            << Ncmpts << "x" << 1
+            << abort(FatalError);
+    }
+
+    for (direction i=0; i<Ncmpts; ++i)
+    {
+        operator()(i, 0) = ms[i];
+    }
+}
+
+
+template<class Form, class Type>
+void Foam::Matrix<Form, Type>::Block::operator=(const Field<cmptType>& f)
+{
+    if (nRows_ != f.size() || nCols_ != 1)
+    {
+        FatalErrorInFunction
+            << "Error: cannot assign blocks of different size (left is "
+            << nRows_ << "x" << nCols_ << " != "
+            << f.size() << "x" << 1
+            << abort(FatalError);
+    }
+
+    forAll(f, i)
+    {
+        operator()(i, 0) = f[i];
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Form, class Type>
@@ -234,7 +570,7 @@ const Type& Foam::max(const Matrix<Form, Type>& a)
     else
     {
         FatalErrorInFunction
-            << "matrix is empty"
+            << "Matrix is empty"
             << abort(FatalError);
 
         // Return in error to keep compiler happy
@@ -266,7 +602,7 @@ const Type& Foam::min(const Matrix<Form, Type>& a)
     else
     {
         FatalErrorInFunction
-            << "matrix is empty"
+            << "Matrix is empty"
             << abort(FatalError);
 
         // Return in error to keep compiler happy
@@ -304,7 +640,7 @@ Form Foam::operator+(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
     if (a.m() != b.m())
     {
         FatalErrorInFunction
-            << "attempted add matrices with different number of rows: "
+            << "Attempt to add matrices with different number of rows: "
             << a.m() << ", " << b.m()
             << abort(FatalError);
     }
@@ -312,7 +648,7 @@ Form Foam::operator+(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
     if (a.n() != b.n())
     {
         FatalErrorInFunction
-            << "attempted add matrices with different number of columns: "
+            << "Attempt to add matrices with different number of columns: "
             << a.n() << ", " << b.n()
             << abort(FatalError);
     }
@@ -339,7 +675,7 @@ Form Foam::operator-(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
     if (a.m() != b.m())
     {
         FatalErrorInFunction
-            << "attempted add matrices with different number of rows: "
+            << "Attempt to add matrices with different number of rows: "
             << a.m() << ", " << b.m()
             << abort(FatalError);
     }
@@ -347,7 +683,7 @@ Form Foam::operator-(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
     if (a.n() != b.n())
     {
         FatalErrorInFunction
-            << "attempted add matrices with different number of columns: "
+            << "Attempt to add matrices with different number of columns: "
             << a.n() << ", " << b.n()
             << abort(FatalError);
     }
@@ -389,13 +725,55 @@ Form Foam::operator*(const scalar s, const Matrix<Form, Type>& a)
 }
 
 
+template<class Form, class Type>
+Form Foam::operator*(const Matrix<Form, Type>& a, const scalar s)
+{
+    Form sa(a.m(), a.n());
+
+    if (a.m() && a.n())
+    {
+        Type* sav = sa.v();
+        const Type* av = a.v();
+
+        const label mn = a.size();
+        for (label i=0; i<mn; i++)
+        {
+            sav[i] = av[i]*s;
+        }
+    }
+
+    return sa;
+}
+
+
+template<class Form, class Type>
+Form Foam::operator/(const Matrix<Form, Type>& a, const scalar s)
+{
+    Form sa(a.m(), a.n());
+
+    if (a.m() && a.n())
+    {
+        Type* sav = sa.v();
+        const Type* av = a.v();
+
+        const label mn = a.size();
+        for (label i=0; i<mn; i++)
+        {
+            sav[i] = av[i]/s;
+        }
+    }
+
+    return sa;
+}
+
+
 template<class Form, class Type>
 Form Foam::operator*(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 {
     if (a.n() != b.m())
     {
         FatalErrorInFunction
-            << "attempted to multiply incompatible matrices:" << nl
+            << "Attempt to multiply incompatible matrices:" << nl
             << "Matrix A : " << a.m() << " rows, " << a.n() << " columns" << nl
             << "Matrix B : " << b.m() << " rows, " << b.n() << " columns" << nl
             << "In order to multiply matrices, columns of A must equal "
@@ -405,13 +783,13 @@ Form Foam::operator*(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 
     Form ab(a.m(), b.n(), scalar(0));
 
-    for (label i = 0; i < ab.m(); i++)
+    for (label i=0; i<ab.m(); i++)
     {
-        for (label j = 0; j < ab.n(); j++)
+        for (label j=0; j<ab.n(); j++)
         {
-            for (label l = 0; l < b.m(); l++)
+            for (label k=0; k<b.m(); k++)
             {
-                ab(i, j) += a(i, l)*b(l, j);
+                ab(i, j) += a(i, k)*b(k, j);
             }
         }
     }
@@ -420,6 +798,39 @@ Form Foam::operator*(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 }
 
 
+template<class Form, class Type>
+inline Foam::tmp<Foam::Field<Type>> Foam::operator*
+(
+    const Matrix<Form, Type>& M,
+    const Field<Type>& f
+)
+{
+    if (M.n() != f.size())
+    {
+        FatalErrorInFunction
+            << "Attempt to multiply incompatible matrix and field:" << nl
+            << "Matrix : " << M.m() << " rows, " << M.n() << " columns" << nl
+            << "Field : " << f.size() << " rows" << nl
+            << "In order to multiply a matrix M and field f, "
+               "columns of M must equal rows of f"
+            << abort(FatalError);
+    }
+
+    tmp<Field<Type>> tMf(new Field<Type>(f.size(), Zero));
+    Field<Type>& Mf = tMf.ref();
+
+    for (label i=0; i<M.m(); ++i)
+    {
+        for (label j=0; j<M.n(); ++j)
+        {
+            Mf[i] += M(i, j)*f[j];
+        }
+    }
+
+    return tMf;
+}
+
+
 // * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
 
 #include "MatrixIO.C"
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 043b9561aa..5f905b465b 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -41,7 +41,9 @@ SourceFiles
 #include "bool.H"
 #include "label.H"
 #include "uLabel.H"
-#include "List.H"
+#include "Field.H"
+#include "MatrixSpace.H"
+#include "zero.H"
 #include "autoPtr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -87,10 +89,168 @@ class Matrix
 
 public:
 
+    //- Matrix type
+    typedef Matrix<Form, Type> mType;
+
+    //- Component type
+    typedef Type cmptType;
+
+
     // Static Member Functions
 
         //- Return a null Matrix
-        inline static const Matrix<Form, Type>& null();
+        inline static const mType& null();
+
+
+    // Sub-Block Classes
+
+        class ConstBlock
+        {
+            // Private data
+
+                //- Const reference to the parent matrix
+                const mType& matrix_;
+
+                // Block size
+                const label nRows_;
+                const label nCols_;
+
+                // Block location in parent matrix
+                const label rowStart_;
+                const label colStart_;
+
+        public:
+
+            typedef typename mType::cmptType cmptType;
+
+            // Constructors
+
+                //- Construct block for matrix, size and location
+                inline ConstBlock
+                (
+                    const mType& matrix,
+                    const label m,
+                    const label n,
+                    const label mStart,
+                    const label nStart
+                );
+
+
+            // Member Functions
+
+                //- Return the number of rows in the block
+                inline label m() const;
+
+                //- Return the number of columns in the block
+                inline label n() const;
+
+                //- (i, j) const element access operator
+                inline const Type& operator()
+                (
+                    const label i,
+                    const label j
+                ) const;
+
+                //- Convert a column of a matrix to a Field
+                operator Field<Type>() const;
+        };
+
+
+        class Block
+        {
+            // Private data
+
+                //- Reference to the parent matrix
+                mType& matrix_;
+
+                // Block size
+                const label nRows_;
+                const label nCols_;
+
+                // Block location in parent matrix
+                const label rowStart_;
+                const label colStart_;
+
+        public:
+
+            typedef typename mType::cmptType cmptType;
+
+            // Constructors
+
+                //- Construct block for matrix, size and location
+                inline Block
+                (
+                    mType& matrix,
+                    const label m,
+                    const label n,
+                    const label mStart,
+                    const label nStart
+                );
+
+
+            // Member Functions
+
+                //- Return the number of rows in the block
+                inline label m() const;
+
+                //- Return the number of columns in the block
+                inline label n() const;
+
+                //- (i, j) const element access operator
+                inline const Type& operator()
+                (
+                    const label i,
+                    const label j
+                ) const;
+
+                //- (i, j) element access operator
+                inline Type& operator()(const label i, const label j);
+
+                //- Convert a column of a matrix to a Field
+                operator Field<Type>() const;
+
+
+            // Member operators
+
+                //- Assignment to a compatible matrix
+                void operator=(const mType&);
+
+                //- Assignment to a compatible block
+                void operator=(const Block&);
+
+                //- Assignment to a compatible const block
+                void operator=(const ConstBlock&);
+
+                //- Assignment to a compatible MatrixSpace
+                template<class MSForm, direction Nrows, direction Ncols>
+                void operator=(const MatrixSpace<MSForm, Type, Nrows, Ncols>&);
+
+                //- Assignment to a compatible MatrixSpace block
+                template
+                <
+                    template<class, direction, direction> class Block,
+                    class SubTensor,
+                    direction BRowStart,
+                    direction BColStart
+                >
+                void operator=(const Block<SubTensor, BRowStart, BColStart>&);
+
+                //- Assignment to a compatible VectorSpace (column-vector)
+                template<class VSForm, direction Ncmpts>
+                void operator=(const VectorSpace<VSForm, Type, Ncmpts>&);
+
+                //- Assignment to a compatible VectorSpace (column-vector) block
+                template
+                <
+                    template<class, direction> class Block,
+                    class SubVector,
+                    direction BStart
+                >
+                void operator=(const Block<SubVector, BStart>&);
+
+                //- Assignment to a Field (column-vector)
+                void operator=(const Field<Type>&);
+        };
 
 
     // Constructors
@@ -102,17 +262,24 @@ public:
         Matrix(const label m, const label n);
 
         //- Construct with given number of rows and columns
-        //  and value for all elements.
+        //  initializing all elements to zero
+        Matrix(const label m, const label n, const zero);
+
+        //- Construct with given number of rows and columns
+        //  initializing all elements to the given value
         Matrix(const label m, const label n, const Type&);
 
         //- Copy constructor.
-        Matrix(const Matrix<Form, Type>&);
+        Matrix(const mType&);
+
+        //- Construct from a block of another matrix
+        Matrix(const mType::Block&);
 
         //- Construct from Istream.
         Matrix(Istream&);
 
         //- Clone
-        inline autoPtr<Matrix<Form, Type>> clone() const;
+        inline autoPtr<mType> clone() const;
 
 
     //- Destructor
@@ -132,6 +299,64 @@ public:
             //- Return the number of elements in matrix (m*n)
             inline label size() const;
 
+            //- Return element vector of the constant Matrix
+            inline const Type* v() const;
+
+            //- Return element vector of the Matrix
+            inline Type* v();
+
+
+        // Block access
+
+            inline ConstBlock block
+            (
+                const label m,
+                const label n,
+                const label mStart,
+                const label nStart
+            ) const;
+
+            template<class VectorSpace>
+            inline ConstBlock block
+            (
+                const label mStart,
+                const label nStart
+            ) const;
+
+            inline ConstBlock col
+            (
+                const label m,
+                const label rowStart
+            ) const;
+
+            inline ConstBlock col
+            (
+                const label m,
+                const label mStart,
+                const label nStart
+            ) const;
+
+
+            inline Block block
+            (
+                const label m,
+                const label n,
+                const label mStart,
+                const label nStart
+            );
+
+            template<class VectorSpace>
+            inline Block block(const label mStart, const label nStart);
+
+            inline Block col(const label m, const label rowStart);
+
+            inline Block col
+            (
+                const label m,
+                const label mStart,
+                const label nStart
+            );
+
 
         // Check
 
@@ -149,7 +374,10 @@ public:
 
             //- Transfer the contents of the argument Matrix into this Matrix
             //  and annul the argument Matrix.
-            void transfer(Matrix<Form, Type>&);
+            void transfer(mType&);
+
+            //- Resize the matrix preserving the elements
+            void setSize(const label m, const label nCols);
 
 
         //- Return the transpose of the matrix
@@ -158,12 +386,6 @@ public:
 
     // Member operators
 
-        //- Return element vector of the constant Matrix
-        inline const Type* v() const;
-
-        //- Return element vector of the Matrix
-        inline Type* v();
-
         //- Return subscript-checked row of Matrix.
         inline Type* operator[](const label);
 
@@ -177,7 +399,13 @@ public:
         inline Type& operator()(const label i, const label j);
 
         //- Assignment operator. Takes linear time.
-        void operator=(const Matrix<Form, Type>&);
+        void operator=(const mType&);
+
+        //- Assignment to a block of another matrix
+        void operator=(const mType::Block&);
+
+        //- Assignment of all entries to zero
+        void operator=(const zero);
 
         //- Assignment of all entries to the given value
         void operator=(const Type&);
@@ -189,49 +417,78 @@ public:
         friend Istream& operator>> <Form, Type>
         (
             Istream&,
-            Matrix<Form, Type>&
+            mType&
         );
 
         // Write Matrix to Ostream.
         friend Ostream& operator<< <Form, Type>
         (
             Ostream&,
-            const Matrix<Form, Type>&
+            const mType&
         );
 };
 
 
 // Global functions and operators
 
-template<class Form, class Type> const Type& max(const Matrix<Form, Type>&);
-template<class Form, class Type> const Type& min(const Matrix<Form, Type>&);
+template<class Form, class Type>
+const Type& max(const Matrix<Form, Type>&);
 
-template<class Form, class Type> Form operator-(const Matrix<Form, Type>&);
+template<class Form, class Type>
+const Type& min(const Matrix<Form, Type>&);
 
-template<class Form, class Type> Form operator+
+template<class Form, class Type>
+Form operator-(const Matrix<Form, Type>&);
+
+template<class Form, class Type>
+Form operator+
 (
     const Matrix<Form, Type>&,
     const Matrix<Form, Type>&
 );
 
-template<class Form, class Type> Form operator-
+template<class Form, class Type>
+Form operator-
 (
     const Matrix<Form, Type>&,
     const Matrix<Form, Type>&
 );
 
-template<class Form, class Type> Form operator*
+template<class Form, class Type>
+Form operator*
 (
     const scalar,
     const Matrix<Form, Type>&
 );
 
-template<class Form, class Type> Form operator*
+template<class Form, class Type>
+Form operator*
+(
+    const Matrix<Form, Type>&,
+    const scalar
+);
+
+template<class Form, class Type>
+Form operator/
+(
+    const Matrix<Form, Type>&,
+    const scalar
+);
+
+template<class Form, class Type>
+Form operator*
 (
     const Matrix<Form, Type>&,
     const Matrix<Form, Type>&
 );
 
+template<class Form, class Type>
+tmp<Field<Type>> operator*
+(
+    const Matrix<Form, Type>&,
+    const Field<Type>&
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index 532e9df3f8..73992f3285 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H
@@ -42,6 +42,68 @@ clone() const
 }
 
 
+template<class Form, class Type>
+Foam::Matrix<Form, Type>::ConstBlock::ConstBlock
+(
+    const mType& matrix,
+    const label m,
+    const label n,
+    const label mStart,
+    const label nStart
+)
+:
+    matrix_(matrix),
+    nRows_(m),
+    nCols_(n),
+    rowStart_(mStart),
+    colStart_(nStart)
+{
+    #ifdef FULLDEBUG
+    if
+    (
+        rowStart_ + nRows_ > matrix.m()
+     || colStart_ + nCols_ > matrix.n()
+    )
+    {
+        FatalErrorInFunction
+            << "Block addresses outside matrix"
+            << abort(FatalError);
+    }
+    #endif
+}
+
+
+template<class Form, class Type>
+Foam::Matrix<Form, Type>::Block::Block
+(
+    mType& matrix,
+    const label m,
+    const label n,
+    const label mStart,
+    const label nStart
+)
+:
+    matrix_(matrix),
+    nRows_(m),
+    nCols_(n),
+    rowStart_(mStart),
+    colStart_(nStart)
+{
+    #ifdef FULLDEBUG
+    if
+    (
+        rowStart_ + nRows_ > matrix.m()
+     || colStart_ + nCols_ > matrix.n()
+    )
+    {
+        FatalErrorInFunction
+            << "Block addresses outside matrix"
+            << abort(FatalError);
+    }
+    #endif
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Form, class Type>
@@ -76,16 +138,16 @@ template<class Form, class Type>
 inline void Foam::Matrix<Form, Type>::checki(const label i) const
 {
     #ifdef FULLDEBUG
-    if (!nRows_)
+    if (!nRows_ || !nCols_)
     {
         FatalErrorInFunction
-            << "attempt to access element from zero sized row"
+            << "Attempt to access element from empty matrix"
             << abort(FatalError);
     }
     else if (i<0 || i>=nRows_)
     {
         FatalErrorInFunction
-            << "index " << i << " out of range 0 ... " << nRows_-1
+            << "Index " << i << " out of range 0 ... " << nRows_-1
             << abort(FatalError);
     }
     #endif
@@ -96,10 +158,10 @@ template<class Form, class Type>
 inline void Foam::Matrix<Form, Type>::checkj(const label j) const
 {
     #ifdef FULLDEBUG
-    if (!nCols_)
+    if (!nRows_ || !nCols_)
     {
         FatalErrorInFunction
-            << "attempt to access element from zero sized column"
+            << "Attempt to access element from empty matrix"
             << abort(FatalError);
     }
     else if (j<0 || j>=nCols_)
@@ -112,7 +174,33 @@ inline void Foam::Matrix<Form, Type>::checkj(const label j) const
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+template<class Form, class Type>
+inline Foam::label Foam::Matrix<Form, Type>::ConstBlock::m() const
+{
+    return nRows_;
+}
+
+
+template<class Form, class Type>
+inline Foam::label Foam::Matrix<Form, Type>::ConstBlock::n() const
+{
+    return nCols_;
+}
+
+
+template<class Form, class Type>
+inline Foam::label Foam::Matrix<Form, Type>::Block::m() const
+{
+    return nRows_;
+}
+
+
+template<class Form, class Type>
+inline Foam::label Foam::Matrix<Form, Type>::Block::n() const
+{
+    return nCols_;
+}
+
 
 template<class Form, class Type>
 inline const Type* Foam::Matrix<Form, Type>::v() const
@@ -128,6 +216,238 @@ inline Type* Foam::Matrix<Form, Type>::v()
 }
 
 
+template<class Form, class Type>
+inline typename Foam::Matrix<Form, Type>::ConstBlock
+Foam::Matrix<Form, Type>::block
+(
+    const label m,
+    const label n,
+    const label mStart,
+    const label nStart
+) const
+{
+    return ConstBlock
+    (
+        *this,
+        m,
+        n,
+        mStart,
+        nStart
+    );
+}
+
+
+template<class Form, class Type>
+template<class VectorSpace>
+inline typename Foam::Matrix<Form, Type>::ConstBlock
+Foam::Matrix<Form, Type>::block
+(
+    const label mStart,
+    const label nStart
+) const
+{
+    return ConstBlock
+    (
+        *this,
+        VectorSpace::nRows,
+        VectorSpace::nCols,
+        mStart,
+        nStart
+    );
+}
+
+
+template<class Form, class Type>
+inline typename Foam::Matrix<Form, Type>::ConstBlock
+Foam::Matrix<Form, Type>::col
+(
+    const label m,
+    const label mStart
+) const
+{
+    return ConstBlock
+    (
+        *this,
+        m,
+        1,
+        mStart,
+        0
+    );
+}
+
+
+template<class Form, class Type>
+inline typename Foam::Matrix<Form, Type>::ConstBlock
+Foam::Matrix<Form, Type>::col
+(
+    const label m,
+    const label mStart,
+    const label nStart
+) const
+{
+    return ConstBlock
+    (
+        *this,
+        m,
+        1,
+        mStart,
+        nStart
+    );
+}
+
+
+template<class Form, class Type>
+inline typename Foam::Matrix<Form, Type>::Block
+Foam::Matrix<Form, Type>::block
+(
+    const label m,
+    const label n,
+    const label mStart,
+    const label nStart
+)
+{
+    return Block
+    (
+        *this,
+        m,
+        n,
+        mStart,
+        nStart
+    );
+}
+
+
+template<class Form, class Type>
+template<class VectorSpace>
+inline typename Foam::Matrix<Form, Type>::Block
+Foam::Matrix<Form, Type>::block(const label mStart, const label nStart)
+{
+    return Block
+    (
+        *this,
+        VectorSpace::nRows,
+        VectorSpace::nCols,
+        mStart,
+        nStart
+    );
+}
+
+
+template<class Form, class Type>
+inline typename Foam::Matrix<Form, Type>::Block
+Foam::Matrix<Form, Type>::col(const label m, const label mStart)
+{
+    return Block
+    (
+        *this,
+        m,
+        1,
+        mStart,
+        0
+    );
+}
+
+
+template<class Form, class Type>
+inline typename Foam::Matrix<Form, Type>::Block
+Foam::Matrix<Form, Type>::col
+(
+    const label m,
+    const label mStart,
+    const label nStart
+)
+{
+    return Block
+    (
+        *this,
+        m,
+        1,
+        mStart,
+        nStart
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Form, class Type>
+inline const Type& Foam::Matrix<Form, Type>::ConstBlock::operator()
+(
+    const label i,
+    const label j
+) const
+{
+    #ifdef FULLDEBUG
+    if (i<0 || i>=nRows_)
+    {
+        FatalErrorInFunction
+            << "Index " << i << " out of range 0 ... " << nRows_-1
+            << abort(FatalError);
+    }
+    if (j<0 || j>=nCols_)
+    {
+        FatalErrorInFunction
+            << "Index " << j << " out of range 0 ... " << nCols_-1
+            << abort(FatalError);
+    }
+    #endif
+
+    return matrix_(i + rowStart_, j + colStart_);
+}
+
+
+template<class Form, class Type>
+inline const Type& Foam::Matrix<Form, Type>::Block::operator()
+(
+    const label i,
+    const label j
+) const
+{
+    #ifdef FULLDEBUG
+    if (i<0 || i>=nRows_)
+    {
+        FatalErrorInFunction
+            << "Index " << i << " out of range 0 ... " << nRows_-1
+            << abort(FatalError);
+    }
+    if (j<0 || j>=nCols_)
+    {
+        FatalErrorInFunction
+            << "Index " << j << " out of range 0 ... " << nCols_-1
+            << abort(FatalError);
+    }
+    #endif
+
+    return matrix_(i + rowStart_, j + colStart_);
+}
+
+
+template<class Form, class Type>
+inline Type& Foam::Matrix<Form, Type>::Block::operator()
+(
+    const label i,
+    const label j
+)
+{
+    #ifdef FULLDEBUG
+    if (i<0 || i>=nRows_)
+    {
+        FatalErrorInFunction
+            << "Index " << i << " out of range 0 ... " << nRows_-1
+            << abort(FatalError);
+    }
+    if (j<0 || j>=nCols_)
+    {
+        FatalErrorInFunction
+            << "Index " << j << " out of range 0 ... " << nCols_-1
+            << abort(FatalError);
+    }
+    #endif
+
+    return matrix_(i + rowStart_, j + colStart_);
+}
+
+
 template<class Form, class Type>
 inline const Type& Foam::Matrix<Form, Type>::operator()
 (

From c7e17fa6c2f66cca48ed9d048b6a6005360bd079 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 14:11:41 +0000
Subject: [PATCH 323/447] RectangularMatrix: Added construction from and
 assignment to zero Also added the Field outer-product operator returning a
 RectangularMatrix

---
 .../RectangularMatrix/RectangularMatrix.H     | 24 ++++++
 .../RectangularMatrix/RectangularMatrixI.H    | 83 +++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
index fa255b03b4..a947d8105f 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
@@ -39,6 +39,7 @@ SourceFiles
 #define RectangularMatrix_H
 
 #include "Matrix.H"
+#include "Identity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,6 +66,17 @@ public:
         //- Construct given number of rows and columns,
         inline RectangularMatrix(const label m, const label n);
 
+        //- Construct from a block of another matrix
+        inline RectangularMatrix(const typename RectangularMatrix::Block&);
+
+        //- Construct with given number of rows and columns
+        //  initializing all elements to zero
+        inline RectangularMatrix(const label m, const label n, const zero);
+
+        //- Construct given number of rows/columns
+        //  Initializing to the identity matrix
+        inline RectangularMatrix(const label n, const Identity<Type>);
+
         //- Construct with given number of rows and columns
         //  and value for all elements.
         inline RectangularMatrix(const label m, const label n, const Type&);
@@ -74,9 +86,21 @@ public:
 
         //- Clone
         inline autoPtr<RectangularMatrix<Type>> clone() const;
+
+
+    // Member operators
+
+        //- Assignment of all entries to zero
+        void operator=(const zero);
 };
 
 
+// Global functions and operators
+
+template<class Type>
+RectangularMatrix<Type> outer(const Field<Type>& f1, const Field<Type>& f2);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
index 55c3f69699..631cc8b93c 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
@@ -31,6 +31,7 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix()
     Matrix<RectangularMatrix<Type>, Type>()
 {}
 
+
 template<class Type>
 inline Foam::RectangularMatrix<Type>::RectangularMatrix
 (
@@ -41,6 +42,45 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix
     Matrix<RectangularMatrix<Type>, Type>(m, n)
 {}
 
+
+template<class Type>
+inline Foam::RectangularMatrix<Type>::RectangularMatrix
+(
+    const typename RectangularMatrix::Block& block
+)
+:
+    Matrix<RectangularMatrix<Type>, Type>(block)
+{}
+
+
+template<class Type>
+inline Foam::RectangularMatrix<Type>::RectangularMatrix
+(
+    const label m,
+    const label n,
+    const zero
+)
+:
+    Matrix<RectangularMatrix<Type>, Type>(m, n, Zero)
+{}
+
+
+template<class Type>
+inline Foam::RectangularMatrix<Type>::RectangularMatrix
+(
+    const label n,
+    const Identity<Type>
+)
+:
+    Matrix<RectangularMatrix<Type>, Type>(n, n, Zero)
+{
+    for (label i = 0; i < n; ++i)
+    {
+        this->operator()(i, i) = I;
+    }
+}
+
+
 template<class Type>
 inline Foam::RectangularMatrix<Type>::RectangularMatrix
 (
@@ -52,12 +92,14 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix
     Matrix<RectangularMatrix<Type>, Type>(m, n, t)
 {}
 
+
 template<class Type>
 inline Foam::RectangularMatrix<Type>::RectangularMatrix(Istream& is)
 :
     Matrix<RectangularMatrix<Type>, Type>(is)
 {}
 
+
 template<class Type>
 inline Foam::autoPtr<Foam::RectangularMatrix<Type>>
 Foam::RectangularMatrix<Type>::clone() const
@@ -69,4 +111,45 @@ Foam::RectangularMatrix<Type>::clone() const
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::RectangularMatrix<Type>::operator=(const zero)
+{
+    Matrix<RectangularMatrix<Type>, Type>::operator=(Zero);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+inline Foam::RectangularMatrix<Type> outer
+(
+    const Field<Type>& f1,
+    const Field<Type>& f2
+)
+{
+    RectangularMatrix<Type> f1f2T(f1.size(), f2.size());
+
+    for (label i=0; i<f1f2T.m(); ++i)
+    {
+        for (label j=0; j<f1f2T.n(); ++j)
+        {
+            f1f2T(i, j) = f1[i]*f2[j];
+        }
+    }
+
+    return f1f2T;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
 // ************************************************************************* //

From 082261439c403cd3c10654afcb28efe7c44d9ed7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 14:12:53 +0000
Subject: [PATCH 324/447] Identity: Added conversion to label

---
 src/OpenFOAM/primitives/SphericalTensor/Identity.H | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/OpenFOAM/primitives/SphericalTensor/Identity.H b/src/OpenFOAM/primitives/SphericalTensor/Identity.H
index 492b03dddf..0d645d8b91 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/Identity.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/Identity.H
@@ -76,6 +76,12 @@ public:
         return dual();
     }
 
+    //- Return 1 for label
+    inline operator label() const
+    {
+        return 1;
+    }
+
     //- Return 1 for scalar
     inline operator scalar() const
     {

From caf8776f9b6795c84c6e07121868a59af3a29044 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 14:13:48 +0000
Subject: [PATCH 325/447] SquareMatrix, SymmetricSquareMatrix: Changed the
 constructor from size to require only n This avoids the need to check that
 the m and n dimensions are the same.

---
 applications/test/Matrix/Test-Matrix.C        | 14 +++--
 .../viewFactorsGen/viewFactorsGen.C           |  3 +-
 .../surfaceFeatureExtract.C                   |  2 +-
 src/ODE/ODESolvers/SIBS/SIBS.C                |  6 +--
 .../matrices/SquareMatrix/SquareMatrix.C      |  2 +-
 .../matrices/SquareMatrix/SquareMatrix.H      | 16 +++---
 .../matrices/SquareMatrix/SquareMatrixI.H     | 52 ++++++++++++-------
 .../SymmetricSquareMatrix.C                   | 33 ++++++++----
 .../SymmetricSquareMatrix.H                   | 16 +++---
 .../SymmetricSquareMatrixI.H                  | 35 +++++++------
 .../lduMatrix/lduMatrix/lduMatrixTemplates.C  |  2 +-
 .../scalarMatrices/scalarMatricesTemplates.C  |  2 +-
 .../matrices/simpleMatrix/simpleMatrix.C      |  2 +-
 .../radiationModels/viewFactor/viewFactor.C   | 11 ++--
 14 files changed, 116 insertions(+), 80 deletions(-)

diff --git a/applications/test/Matrix/Test-Matrix.C b/applications/test/Matrix/Test-Matrix.C
index ad48481fa1..95cfa4c1af 100644
--- a/applications/test/Matrix/Test-Matrix.C
+++ b/applications/test/Matrix/Test-Matrix.C
@@ -25,6 +25,7 @@ License
 
 #include "scalarMatrices.H"
 #include "vector.H"
+#include "tensor.H"
 #include "IFstream.H"
 
 using namespace Foam;
@@ -50,7 +51,7 @@ int main(int argc, char *argv[])
     Info<< max(hmm) << endl;
     Info<< min(hmm) << endl;
 
-    SquareMatrix<scalar> hmm2(3, 3, 1.0);
+    SquareMatrix<scalar> hmm2(3, I);
 
     hmm = hmm2;
 
@@ -72,7 +73,14 @@ int main(int argc, char *argv[])
     Info<< hmm5 << endl;
 
     {
-        scalarSymmetricSquareMatrix symmMatrix(3, 3, 0);
+        RectangularMatrix<scalar> rm1(5, 6, 3.1);
+        rm1(0, 1) = 4.5;
+        RectangularMatrix<scalar> rm1b(rm1.block(2, 2, 0, 0));
+        Info<< "rm1b = " << rm1b << endl;
+    }
+
+    {
+        scalarSymmetricSquareMatrix symmMatrix(3, Zero);
 
         symmMatrix(0, 0) = 4;
         symmMatrix(1, 0) = 12;
@@ -104,7 +112,7 @@ int main(int argc, char *argv[])
     }
 
     {
-        scalarSquareMatrix squareMatrix(3, 3, 0);
+        scalarSquareMatrix squareMatrix(3, Zero);
 
         squareMatrix(0, 0) = 4;
         squareMatrix(0, 1) = 12;
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index ed00d1a6cf..d5f295a62b 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -675,7 +675,6 @@ int main(int argc, char *argv[])
     // Matrix sum in j(Fij) for each i (if enclosure sum = 1)
     scalarSquareMatrix sumViewFactorPatch
     (
-        totalPatches,
         totalPatches,
         0.0
     );
@@ -888,7 +887,7 @@ int main(int argc, char *argv[])
 
     if (Pstream::master())
     {
-        scalarSquareMatrix Fmatrix(totalNCoarseFaces, totalNCoarseFaces, 0.0);
+        scalarSquareMatrix Fmatrix(totalNCoarseFaces, 0.0);
 
         labelListList globalFaceFaces(visibleFaceFaces.size());
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 510305f28c..2882e6af2a 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -303,7 +303,7 @@ triSurfacePointScalarField calcCurvature
         faceCoordSys.normalize();
 
         // Construct the matrix to solve
-        scalarSymmetricSquareMatrix T(3, 3, 0);
+        scalarSymmetricSquareMatrix T(3, 0);
         scalarDiagonalMatrix Z(3, 0);
 
         // Least Squares
diff --git a/src/ODE/ODESolvers/SIBS/SIBS.C b/src/ODE/ODESolvers/SIBS/SIBS.C
index 36acb8a6b1..a095a7c507 100644
--- a/src/ODE/ODESolvers/SIBS/SIBS.C
+++ b/src/ODE/ODESolvers/SIBS/SIBS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ Foam::SIBS::SIBS(const ODESystem& ode, const dictionary& dict)
 :
     ODESolver(ode, dict),
     a_(iMaxX_, 0.0),
-    alpha_(kMaxX_, kMaxX_, 0.0),
+    alpha_(kMaxX_, 0.0),
     d_p_(n_, kMaxX_, 0.0),
     x_p_(kMaxX_, 0.0),
     err_(kMaxX_, 0.0),
@@ -60,7 +60,7 @@ Foam::SIBS::SIBS(const ODESystem& ode, const dictionary& dict)
     yErr_(n_, 0.0),
     dydx0_(n_),
     dfdx_(n_, 0.0),
-    dfdy_(n_, n_, 0.0),
+    dfdy_(n_, 0.0),
     first_(1),
     epsOld_(-1.0)
 {}
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
index 74439c15de..cf34d78a21 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
@@ -35,7 +35,7 @@ Foam::scalar Foam::detDecomposed
     const label sign
 )
 {
-    scalar diagProduct = 1.0;
+    Type diagProduct = pTraits<Type>::one;
 
     for (label i = 0; i < matrix.m(); ++i)
     {
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
index 270891a955..39403194d5 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
@@ -38,6 +38,7 @@ SourceFiles
 #define SquareMatrix_H
 
 #include "Matrix.H"
+#include "Identity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -64,14 +65,17 @@ public:
         //- Construct given number of rows/columns.
         inline SquareMatrix(const label n);
 
-        //- Construct given number of rows and columns,
-        //  It checks that m == n.
-        inline SquareMatrix(const label m, const label n);
+        //- Construct given number of rows/columns
+        //  initializing all elements to zero
+        inline SquareMatrix(const label n, const zero);
+
+        //- Construct given number of rows/columns
+        //  Initializing to the identity matrix
+        inline SquareMatrix(const label n, const Identity<Type>);
 
         //- Construct with given number of rows and rows
-        //  and value for all elements.
-        //  It checks that m == n.
-        inline SquareMatrix(const label m, const label n, const Type&);
+        //  initializing all elements to the given value
+        inline SquareMatrix(const label n, const Type&);
 
         //- Construct from Istream.
         inline SquareMatrix(Istream&);
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
index 74d7bdb95c..ffa595d51d 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
@@ -31,40 +31,51 @@ inline Foam::SquareMatrix<Type>::SquareMatrix()
     Matrix<SquareMatrix<Type>, Type>()
 {}
 
+
 template<class Type>
 inline Foam::SquareMatrix<Type>::SquareMatrix(const label n)
 :
     Matrix<SquareMatrix<Type>, Type>(n, n)
 {}
 
-template<class Type>
-inline Foam::SquareMatrix<Type>::SquareMatrix(const label m, const label n)
-:
-    Matrix<SquareMatrix<Type>, Type>(m, n)
-{
-    if (m != n)
-    {
-        FatalErrorInFunction
-          << "m != n for constructing a square matrix" << exit(FatalError);
-    }
-}
 
 template<class Type>
 inline Foam::SquareMatrix<Type>::SquareMatrix
 (
-    const label m,
+    const label n,
+    const zero
+)
+:
+    Matrix<SquareMatrix<Type>, Type>(n, n, Zero)
+{}
+
+
+template<class Type>
+inline Foam::SquareMatrix<Type>::SquareMatrix
+(
+    const label n,
+    const Identity<Type>
+)
+:
+    Matrix<SquareMatrix<Type>, Type>(n, n, Zero)
+{
+    for (label i = 0; i < n; ++i)
+    {
+        this->operator()(i, i) = I;
+    }
+}
+
+
+template<class Type>
+inline Foam::SquareMatrix<Type>::SquareMatrix
+(
     const label n,
     const Type& t
 )
 :
-    Matrix<SquareMatrix<Type>, Type>(m, n, t)
-{
-    if (m != n)
-    {
-        FatalErrorInFunction
-          << "m != n for constructing a square matrix" << exit(FatalError);
-    }
-}
+    Matrix<SquareMatrix<Type>, Type>(n, n, t)
+{}
+
 
 template<class Type>
 inline Foam::SquareMatrix<Type>::SquareMatrix(Istream& is)
@@ -72,6 +83,7 @@ inline Foam::SquareMatrix<Type>::SquareMatrix(Istream& is)
     Matrix<SquareMatrix<Type>, Type>(is)
 {}
 
+
 template<class Type>
 inline Foam::autoPtr<Foam::SquareMatrix<Type>>
 Foam::SquareMatrix<Type>::clone() const
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
index 28ad1d2745..dcb31ef241 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
@@ -33,15 +33,17 @@ Foam::SymmetricSquareMatrix<Type> Foam::invDecomposed
     const SymmetricSquareMatrix<Type>& matrix
 )
 {
-    SymmetricSquareMatrix<Type> inv(matrix.m(), matrix.m(), 0.0);
+    const label n = matrix.n();
 
-    for (label i = 0; i < matrix.m(); ++i)
+    SymmetricSquareMatrix<Type> inv(n, Zero);
+
+    for (label i = 0; i < n; ++i)
     {
         inv(i, i) = 1.0/matrix(i, i);
 
         for (label j = 0; j < i; ++j)
         {
-            scalar sum = 0.0;
+            Type sum = Zero;
 
             for (label k = j; k < i; k++)
             {
@@ -52,7 +54,20 @@ Foam::SymmetricSquareMatrix<Type> Foam::invDecomposed
         }
     }
 
-    return inv.T()*inv;
+    SymmetricSquareMatrix<Type> result(n, Zero);
+
+    for (label k = 0; k < n; k++)
+    {
+        for (label i = 0; i <= k; i++)
+        {
+            for (label j = 0; j <= k; j++)
+            {
+                result(i, j) += inv(k, i)*inv(k, j);
+            }
+        }
+    }
+
+    return result;
 }
 
 
@@ -63,7 +78,6 @@ Foam::SymmetricSquareMatrix<Type> Foam::inv
 )
 {
     SymmetricSquareMatrix<Type> matrixTmp(matrix);
-
     LUDecompose(matrixTmp);
 
     return invDecomposed(matrixTmp);
@@ -71,9 +85,9 @@ Foam::SymmetricSquareMatrix<Type> Foam::inv
 
 
 template<class Type>
-Foam::scalar Foam::detDecomposed(const SymmetricSquareMatrix<Type>& matrix)
+Type Foam::detDecomposed(const SymmetricSquareMatrix<Type>& matrix)
 {
-    scalar diagProduct = 1.0;
+    Type diagProduct = pTraits<Type>::one;
 
     for (label i = 0; i < matrix.m(); ++i)
     {
@@ -85,10 +99,9 @@ Foam::scalar Foam::detDecomposed(const SymmetricSquareMatrix<Type>& matrix)
 
 
 template<class Type>
-Foam::scalar Foam::det(const SymmetricSquareMatrix<Type>& matrix)
+Type Foam::det(const SymmetricSquareMatrix<Type>& matrix)
 {
-    SymmetricSquareMatrix<Type> matrixTmp = matrix;
-
+    SymmetricSquareMatrix<Type> matrixTmp(matrix);
     LUDecompose(matrixTmp);
 
     return detDecomposed(matrixTmp);
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
index 193ee1602f..543d16b848 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
@@ -38,6 +38,7 @@ SourceFiles
 #define SymmetricSquareMatrix_H
 
 #include "SquareMatrix.H"
+#include "Identity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -64,12 +65,15 @@ public:
         //- Construct given number of rows/columns.
         inline SymmetricSquareMatrix(const label n);
 
-        //- Construct with given number of rows/columns
-        inline SymmetricSquareMatrix(const label m, const label n);
+        //- Construct given number of rows/columns, initializing to zero
+        inline SymmetricSquareMatrix(const label n, const zero);
+
+        //- Construct given number of rows/columns,
+        inline SymmetricSquareMatrix(const label n, const Identity<Type>);
 
         //- Construct with given number of rows/columns
-        //  and value for all elements.
-        inline SymmetricSquareMatrix(const label m, const label n, const Type&);
+        //  initializing all elements to the given value
+        inline SymmetricSquareMatrix(const label n, const Type&);
 
         //- Construct from Istream.
         inline SymmetricSquareMatrix(Istream&);
@@ -91,11 +95,11 @@ SymmetricSquareMatrix<Type> inv(const SymmetricSquareMatrix<Type>&);
 
 //- Return the LU decomposed SymmetricSquareMatrix det
 template<class Type>
-scalar detDecomposed(const SymmetricSquareMatrix<Type>&);
+Type detDecomposed(const SymmetricSquareMatrix<Type>&);
 
 //- Return the SymmetricSquareMatrix det
 template<class Type>
-scalar det(const SymmetricSquareMatrix<Type>&);
+Type det(const SymmetricSquareMatrix<Type>&);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
index a363026aac..821daf199b 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
@@ -42,17 +42,26 @@ inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix(const label n)
 template<class Type>
 inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix
 (
-    const label m,
-    const label n
+    const label n,
+    const zero
 )
 :
-    Matrix<SymmetricSquareMatrix<Type>, Type>(m, n)
+    Matrix<SymmetricSquareMatrix<Type>, Type>(n, n, Zero)
+{}
+
+
+template<class Type>
+inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix
+(
+    const label n,
+    const Identity<Type>
+)
+:
+    Matrix<SymmetricSquareMatrix<Type>, Type>(n, n, Zero)
 {
-    if (m != n)
+    for (label i = 0; i < n; i++)
     {
-        FatalErrorInFunction
-            << "m != n for constructing a symmetric square matrix"
-            << exit(FatalError);
+        this->operator()(i, i) = pTraits<Type>::one;
     }
 }
 
@@ -60,20 +69,12 @@ inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix
 template<class Type>
 inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix
 (
-    const label m,
     const label n,
     const Type& t
 )
 :
-    Matrix<SymmetricSquareMatrix<Type>, Type>(m, n, t)
-{
-    if (m != n)
-    {
-        FatalErrorInFunction
-            << "m != n for constructing a symmetric square matrix"
-            << exit(FatalError);
-    }
-}
+    Matrix<SymmetricSquareMatrix<Type>, Type>(n, n, t)
+{}
 
 
 template<class Type>
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
index 739251c358..7ac02d189f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
@@ -35,7 +35,7 @@ Foam::tmp<Foam::Field<Type>> Foam::lduMatrix::H(const Field<Type>& psi) const
 {
     tmp<Field<Type>> tHpsi
     (
-        new Field<Type>(lduAddr().size(), pTraits<Type>::zero)
+        new Field<Type>(lduAddr().size(), Zero)
     );
 
     if (lowerPtr_ || upperPtr_)
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
index c6acc739e2..52413a38dd 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
@@ -87,7 +87,7 @@ void Foam::solve
     // Back-substitution
     for (label j=m-1; j>=0; j--)
     {
-        Type ntempvec = pTraits<Type>::zero;
+        Type ntempvec = Zero;
 
         for (label k=j+1; k<m; k++)
         {
diff --git a/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C b/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
index 960ba0d563..0f1c6995b9 100644
--- a/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
+++ b/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
@@ -43,7 +43,7 @@ Foam::simpleMatrix<Type>::simpleMatrix
     const Type& sourceVal
 )
 :
-    scalarSquareMatrix(mSize, mSize, coeffVal),
+    scalarSquareMatrix(mSize, coeffVal),
     source_(mSize, sourceVal)
 {}
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index 2c8a7e2ba1..d70eccfa9c 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -173,7 +173,7 @@ void Foam::radiation::viewFactor::initialise()
     {
         Fmatrix_.reset
         (
-            new scalarSquareMatrix(totalNCoarseFaces_, totalNCoarseFaces_, 0.0)
+            new scalarSquareMatrix(totalNCoarseFaces_, 0.0)
         );
 
         if (debug)
@@ -224,12 +224,7 @@ void Foam::radiation::viewFactor::initialise()
         {
             CLU_.reset
             (
-                new scalarSquareMatrix
-                (
-                    totalNCoarseFaces_,
-                    totalNCoarseFaces_,
-                    0.0
-                )
+                new scalarSquareMatrix(totalNCoarseFaces_, 0.0)
             );
 
             pivotIndices_.setSize(CLU_().m());
@@ -529,7 +524,7 @@ void Foam::radiation::viewFactor::calculate()
         // Variable emissivity
         if (!constEmissivity_)
         {
-            scalarSquareMatrix C(totalNCoarseFaces_, totalNCoarseFaces_, 0.0);
+            scalarSquareMatrix C(totalNCoarseFaces_, 0.0);
 
             for (label i=0; i<totalNCoarseFaces_; i++)
             {

From cb65ba71d7b17f6588bea161fee5fe1bd6d6bfc9 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 15:02:55 +0000
Subject: [PATCH 326/447] Made all template declarations consistent using
 'class' rather than 'typename'

---
 .../InterfaceCompositionModel.H               |  4 ++--
 .../HeatAndMassTransferPhaseSystem.H          |  2 +-
 .../HeatTransferPhaseSystem.H                 |  2 +-
 .../MomentumTransferPhaseSystem.H             |  2 +-
 .../phaseSystems/phaseSystem/phaseSystem.H    |  6 ++---
 .../phaseSystem/phaseSystemTemplates.C        |  4 ++--
 .../twoPhaseSystem/twoPhaseSystem.H           |  2 +-
 .../DelaunayMeshTools/DelaunayMeshTools.H     | 18 +++++++--------
 .../DelaunayMeshToolsTemplates.C              | 16 +++++++-------
 .../backgroundMeshDecomposition.H             |  4 ++--
 .../backgroundMeshDecompositionTemplates.C    |  6 ++---
 .../indexedCell/indexedCell.H                 |  2 +-
 .../indexedCell/indexedCellChecks.C           |  8 +++----
 .../indexedCell/indexedCellChecks.H           |  8 +++----
 .../indexedCell/indexedCellOps.H              |  6 ++---
 .../indexedCell/indexedCellOpsTemplates.C     |  6 ++---
 .../indexedVertex/indexedVertex.H             |  2 +-
 .../indexedVertex/indexedVertexOps.H          |  6 ++---
 .../indexedVertex/indexedVertexOpsTemplates.C |  6 ++---
 .../conformalVoronoiMesh/pointConversion.H    |  4 ++--
 .../vectorTools/vectorTools.H                 | 16 +++++++-------
 .../foamyMesh/foamyQuadMesh/indexedFace.H     |  2 +-
 .../foamyMesh/foamyQuadMesh/indexedVertex.H   |  2 +-
 .../decomposePar/domainDecomposition.H        |  2 +-
 .../domainDecompositionTemplates.C            |  2 +-
 .../surface/surfaceCoarsen/bunnylod/list.h    | 22 +++++++++----------
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H  |  2 +-
 .../IOstreams/Pstreams/combineGatherScatter.C |  8 +++----
 .../db/IOstreams/Pstreams/gatherScatter.C     |  6 ++---
 .../db/IOstreams/Pstreams/gatherScatterList.C |  6 ++---
 src/OpenFOAM/memory/tmp/tmpI.H                |  4 ++--
 src/OpenFOAM/memory/tmpNrc/tmpNrcI.H          |  4 ++--
 .../primitives/nullObject/nullObject.H        | 12 +++++-----
 .../primitives/nullObject/nullObjectI.H       | 14 ++++++------
 .../polyMeshFilter/polyMeshFilter.H           |  4 ++--
 .../polyMeshFilter/polyMeshFilterTemplates.C  |  6 ++---
 .../PackingModels/PackingModel/PackingModel.H |  2 +-
 37 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
index 198783c4e6..6aeea6e097 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
@@ -45,8 +45,8 @@ namespace Foam
 
 class phaseModel;
 class phasePair;
-template <class ThermoType> class pureMixture;
-template <class ThermoType> class multiComponentMixture;
+template<class ThermoType> class pureMixture;
+template<class ThermoType> class multiComponentMixture;
 
 /*---------------------------------------------------------------------------*\
                          Class InterfaceCompositionModel Declaration
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
index 296201ddba..550c0d1043 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
@@ -43,7 +43,7 @@ SourceFiles
 namespace Foam
 {
 
-template <class modelType>
+template<class modelType>
 class BlendedInterfacialModel;
 
 class blendingMethod;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
index 480433d189..d313aa7e65 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
@@ -43,7 +43,7 @@ namespace Foam
 {
 
 class blendingMethod;
-template <class modelType> class BlendedInterfacialModel;
+template<class modelType> class BlendedInterfacialModel;
 class heatTransferModel;
 
 /*---------------------------------------------------------------------------*\
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
index 49a0bfb642..e6a3209f1c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
@@ -47,7 +47,7 @@ SourceFiles
 namespace Foam
 {
 
-template <class modelType>
+template<class modelType>
 class BlendedInterfacialModel;
 
 class blendingMethod;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index 85470192a1..9bfaebd9f7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
@@ -57,7 +57,7 @@ namespace Foam
 {
 
 class blendingMethod;
-template <class modelType> class BlendedInterfacialModel;
+template<class modelType> class BlendedInterfacialModel;
 class surfaceTensionModel;
 class aspectRatioModel;
 
@@ -320,11 +320,11 @@ public:
         inline fv::options& fvOptions() const;
 
         //- Access a sub model between a phase pair
-        template <class modelType>
+        template<class modelType>
         const modelType& lookupSubModel(const phasePair& key) const;
 
         //- Access a sub model between two phases
-        template <class modelType>
+        template<class modelType>
         const modelType& lookupSubModel
         (
             const phaseModel& dispersed,
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
index 3ac0019fab..3ab4a91ec5 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
@@ -182,7 +182,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
     }
 }
 
-template <class modelType>
+template<class modelType>
 const modelType& Foam::phaseSystem::lookupSubModel(const phasePair& key) const
 {
     return
@@ -193,7 +193,7 @@ const modelType& Foam::phaseSystem::lookupSubModel(const phasePair& key) const
 }
 
 
-template <class modelType>
+template<class modelType>
 const modelType& Foam::phaseSystem::lookupSubModel
 (
     const phaseModel& dispersed,
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
index 2355c0bf74..225bf34f62 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
@@ -54,7 +54,7 @@ class wallLubricationModel;
 class turbulentDispersionModel;
 
 class blendingMethod;
-template <class modelType> class BlendedInterfacialModel;
+template<class modelType> class BlendedInterfacialModel;
 
 /*---------------------------------------------------------------------------*\
                       Class twoPhaseSystem Declaration
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshTools.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshTools.H
index 17a50f6999..dc4cadfaf1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshTools.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ namespace DelaunayMeshTools
 
     //- Write Delaunay points in the range between (and including)
     //  type startPointType and endPointType to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeOBJ
     (
         const fileName& fName,
@@ -85,7 +85,7 @@ namespace DelaunayMeshTools
     );
 
     //- Write Delaunay points of type pointType to .obj file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeOBJ
     (
         const fileName& fName,
@@ -94,15 +94,15 @@ namespace DelaunayMeshTools
     );
 
     //- Write the fixed Delaunay points to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeFixedPoints(const fileName& fName, const Triangulation& t);
 
     //- Write the boundary Delaunay points to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeBoundaryPoints(const fileName& fName, const Triangulation& t);
 
     //- Write the processor interface to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeProcessorInterface
     (
         const fileName& fName,
@@ -112,7 +112,7 @@ namespace DelaunayMeshTools
 
     //- Write the internal Delaunay vertices of the tessellation as a
     //  pointField that may be used to restart the meshing process
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeInternalDelaunayVertices
     (
         const fileName& instance,
@@ -121,14 +121,14 @@ namespace DelaunayMeshTools
 
     //- Draws a tet cell to an output stream. The offset is supplied as the tet
     //  number to be drawn.
-    template<typename CellHandle>
+    template<class CellHandle>
     void drawDelaunayCell(Ostream& os, const CellHandle& c, label offset = 0);
 
 
 // Field extraction
 
     //- Extract all points in vertex-index order
-    template<typename Triangulation>
+    template<class Triangulation>
     tmp<pointField> allPoints(const Triangulation& t);
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C
index 143241f858..ed6818dd39 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C
@@ -32,7 +32,7 @@ License
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeOBJ
 (
     const fileName& fName,
@@ -77,7 +77,7 @@ void Foam::DelaunayMeshTools::writeOBJ
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeOBJ
 (
     const fileName& fName,
@@ -89,7 +89,7 @@ void Foam::DelaunayMeshTools::writeOBJ
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeFixedPoints
 (
     const fileName& fName,
@@ -117,7 +117,7 @@ void Foam::DelaunayMeshTools::writeFixedPoints
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeBoundaryPoints
 (
     const fileName& fName,
@@ -145,7 +145,7 @@ void Foam::DelaunayMeshTools::writeBoundaryPoints
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeProcessorInterface
 (
     const fileName& fName,
@@ -175,7 +175,7 @@ void Foam::DelaunayMeshTools::writeProcessorInterface
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeInternalDelaunayVertices
 (
     const fileName& instance,
@@ -224,7 +224,7 @@ void Foam::DelaunayMeshTools::writeInternalDelaunayVertices
 }
 
 
-template<typename CellHandle>
+template<class CellHandle>
 void Foam::DelaunayMeshTools::drawDelaunayCell
 (
     Ostream& os,
@@ -273,7 +273,7 @@ void Foam::DelaunayMeshTools::drawDelaunayCell
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 Foam::tmp<Foam::pointField> Foam::DelaunayMeshTools::allPoints
 (
     const Triangulation& t
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index 60701acbb8..a539ddcff2 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -225,7 +225,7 @@ public:
         );
 
         //- Distribute supplied the points to the appropriate processor
-        template<typename PointType>
+        template<class PointType>
         autoPtr<mapDistribute> distributePoints(List<PointType>& points) const;
 
         //- Is the given position inside the domain of this decomposition
@@ -263,7 +263,7 @@ public:
         ) const;
 
         //- What processor is the given position on?
-        template<typename PointType>
+        template<class PointType>
         labelList processorPosition(const List<PointType>& pts) const;
 
         //- What is the nearest processor to the given position?
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
index b633210762..5851c7e807 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<typename PointType>
+template<class PointType>
 Foam::autoPtr<Foam::mapDistribute>
 Foam::backgroundMeshDecomposition::distributePoints
 (
@@ -45,7 +45,7 @@ Foam::backgroundMeshDecomposition::distributePoints
 }
 
 
-template<typename PointType>
+template<class PointType>
 Foam::labelList Foam::backgroundMeshDecomposition::processorPosition
 (
     const List<PointType>& pts
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
index f3b964b3f3..7fc602c139 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
@@ -119,7 +119,7 @@ public:
     typedef typename Cb::Vertex_handle                   Vertex_handle;
     typedef typename Cb::Cell_handle                     Cell_handle;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Cb::template Rebind_TDS<TDS2>::Other Cb2;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
index 86512ac92e..49f6796781 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 #include "CGALTriangulation3DKernel.H"
 
 
-template<typename Cell>
+template<class Cell>
 Foam::scalar Foam::foamyHexMeshChecks::coplanarTet
 (
     Cell& c,
@@ -74,7 +74,7 @@ Foam::scalar Foam::foamyHexMeshChecks::coplanarTet
 }
 
 
-template<typename Cell>
+template<class Cell>
 bool Foam::foamyHexMeshChecks::closePoints
 (
     Cell& c,
@@ -104,7 +104,7 @@ bool Foam::foamyHexMeshChecks::closePoints
 }
 
 
-template<typename Cell>
+template<class Cell>
 bool Foam::foamyHexMeshChecks::smallVolume
 (
     Cell& c,
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
index 1aa31c3dbe..39385f4561 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,21 +34,21 @@ namespace Foam
 namespace foamyHexMeshChecks
 {
 
-    template<typename Cell>
+    template<class Cell>
     scalar coplanarTet
     (
         Cell& c,
         const scalar tol = 1e-12
     );
 
-    template<typename Cell>
+    template<class Cell>
     bool closePoints
     (
         Cell& c,
         const scalar tol = 1e-12
     );
 
-    template<typename Cell>
+    template<class Cell>
     bool smallVolume
     (
         Cell& c,
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H
index 6620b8de57..8efb99a44d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,10 @@ namespace indexedCellOps
 {
 
 //- Does the Dual vertex form part of a processor patch
-template<typename CellType>
+template<class CellType>
 Foam::label dualVertexMasterProc(const CellType& c);
 
-template<typename CellType>
+template<class CellType>
 Foam::FixedList<Foam::label, 4> processorsAttached(const CellType& c);
 
 } // End namespace indexedCellOps
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOpsTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOpsTemplates.C
index 9222339396..e5841b65b8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOpsTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOpsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-template<typename CellType>
+template<class CellType>
 Foam::label CGAL::indexedCellOps::dualVertexMasterProc(const CellType& c)
 {
     if (!c->parallelDualVertex())
@@ -56,7 +56,7 @@ Foam::label CGAL::indexedCellOps::dualVertexMasterProc(const CellType& c)
 }
 
 
-template<typename CellType>
+template<class CellType>
 Foam::FixedList<Foam::label, 4>
 CGAL::indexedCellOps::processorsAttached(const CellType& c)
 {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
index 3cbc6acbc8..d6d8dd9601 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
@@ -134,7 +134,7 @@ public:
     typedef typename Tds::Vertex_handle                 Vertex_handle;
     typedef typename Tds::Cell_handle                   Cell_handle;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Vb::template Rebind_TDS<TDS2>::Other   Vb2;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H
index 657275c618..99fdea0e9c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,11 +50,11 @@ namespace indexedVertexOps
 
 //- Return the target cell size from that stored on a pair of Delaunay vertices,
 //  using a mean function.
-template<typename VertexType>
+template<class VertexType>
 Foam::scalar averageCellSize(const VertexType& vA, const VertexType& vB);
 
 
-template<typename VertexType>
+template<class VertexType>
 inline bool uninitialised(const VertexType& v);
 
 } // End namespace indexedVertexOps
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOpsTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOpsTemplates.C
index 1b28a88c5e..5cb2fd96ca 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOpsTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOpsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-template<typename VertexType>
+template<class VertexType>
 Foam::scalar CGAL::indexedVertexOps::averageCellSize
 (
     const VertexType& vA,
@@ -47,7 +47,7 @@ Foam::scalar CGAL::indexedVertexOps::averageCellSize
 }
 
 
-template<typename VertexType>
+template<class VertexType>
 inline bool CGAL::indexedVertexOps::uninitialised(const VertexType& v)
 {
     return v->type() == Foam::indexedVertexEnum::vtUnassigned;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
index 509a8f7a7f..570f32aee0 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
@@ -54,7 +54,7 @@ namespace Foam
 
 #ifdef CGAL_INEXACT
 
-    template<typename Point>
+    template<class Point>
     inline pointFromPoint topoint(const Point& P)
     {
         return reinterpret_cast<pointFromPoint>(P);
@@ -67,7 +67,7 @@ namespace Foam
 
 #else
 
-    template<typename Point>
+    template<class Point>
     inline pointFromPoint topoint(const Point& P)
     {
         return Foam::point
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H
index 7144977040..a4593e2eb6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ namespace vectorTools
     //- Test if a and b are parallel: a^b = 0
     //  Uses the cross product, so the tolerance is proportional to
     //  the sine of the angle between a and b in radians
-    template<typename T>
+    template<class T>
     bool areParallel
     (
         const Vector<T>& a,
@@ -67,7 +67,7 @@ namespace vectorTools
     //- Test if a and b are orthogonal: a.b = 0
     //  Uses the dot product, so the tolerance is proportional to
     //  the cosine of the angle between a and b in radians
-    template<typename T>
+    template<class T>
     bool areOrthogonal
     (
         const Vector<T>& a,
@@ -79,7 +79,7 @@ namespace vectorTools
     }
 
     //- Test if angle between a and b is acute: a.b > 0
-    template<typename T>
+    template<class T>
     bool areAcute
     (
         const Vector<T>& a,
@@ -90,7 +90,7 @@ namespace vectorTools
     }
 
     //- Test if angle between a and b is obtuse: a.b < 0
-    template<typename T>
+    template<class T>
     bool areObtuse
     (
         const Vector<T>& a,
@@ -101,7 +101,7 @@ namespace vectorTools
     }
 
     //- Calculate angle between a and b in radians
-    template<typename T>
+    template<class T>
     T cosPhi
     (
         const Vector<T>& a,
@@ -116,7 +116,7 @@ namespace vectorTools
     }
 
     //- Calculate angle between a and b in radians
-    template<typename T>
+    template<class T>
     T radAngleBetween
     (
         const Vector<T>& a,
@@ -131,7 +131,7 @@ namespace vectorTools
     }
 
     //- Calculate angle between a and b in degrees
-    template<typename T>
+    template<class T>
     T degAngleBetween
     (
         const Vector<T>& a,
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
index 07dc30ea42..df02689057 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
@@ -70,7 +70,7 @@ public:
     typedef typename Fb::Vertex_handle                   Vertex_handle;
     typedef typename Fb::Face_handle                     Face_handle;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Fb::template Rebind_TDS<TDS2>::Other Fb2;
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
index 3c100372df..c6f7512b55 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
@@ -105,7 +105,7 @@ public:
     typedef typename Vb::Face_handle        Face_handle;
     typedef typename Vb::Point              Point;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Vb::template Rebind_TDS<TDS2>::Other    Vb2;
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
index 1935c6fa67..2951b10d23 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
@@ -142,7 +142,7 @@ class domainDecomposition
         ) const;
 
         //- Generate sub patch info for processor cyclics
-        template <class BinaryOp>
+        template<class BinaryOp>
         void processInterCyclics
         (
             const polyBoundaryMesh& patches,
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
index 5122d628d7..b12668ff1e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
@@ -27,7 +27,7 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template <class BinaryOp>
+template<class BinaryOp>
 void Foam::domainDecomposition::processInterCyclics
 (
     const polyBoundaryMesh& patches,
diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/list.h b/applications/utilities/surface/surfaceCoarsen/bunnylod/list.h
index 1c19f0d99c..225496ef2f 100644
--- a/applications/utilities/surface/surfaceCoarsen/bunnylod/list.h
+++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/list.h
@@ -9,7 +9,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-template <class Type> class List {
+template<class Type> class List {
         public:
                 List(int s=0);
                 ~List();
@@ -30,7 +30,7 @@ template <class Type> class List {
 };
 
 
-template <class Type>
+template<class Type>
 List<Type>::List(int s){
         num=0;
         array_size = 0;
@@ -40,12 +40,12 @@ List<Type>::List(int s){
         }
 }
 
-template <class Type>
+template<class Type>
 List<Type>::~List(){
         delete element;
 }
 
-template <class Type>
+template<class Type>
 void List<Type>::allocate(int s){
         assert(s>0);
         assert(s>=num);
@@ -58,18 +58,18 @@ void List<Type>::allocate(int s){
         }
         if(old) delete old;
 }
-template <class Type>
+template<class Type>
 void List<Type>::SetSize(int s){
         if(s==0) { if(element) delete element;}
         else {  allocate(s); }
         num=s;
 }
-template <class Type>
+template<class Type>
 void List<Type>::Pack(){
         allocate(num);
 }
 
-template <class Type>
+template<class Type>
 void List<Type>::Add(Type t){
         assert(num<=array_size);
         if(num==array_size) {
@@ -83,7 +83,7 @@ void List<Type>::Add(Type t){
         element[num++] = t;
 }
 
-template <class Type>
+template<class Type>
 int List<Type>::Contains(Type t){
         int i;
         int count=0;
@@ -93,13 +93,13 @@ int List<Type>::Contains(Type t){
         return count;
 }
 
-template <class Type>
+template<class Type>
 void List<Type>::AddUnique(Type t){
         if(!Contains(t)) Add(t);
 }
 
 
-template <class Type>
+template<class Type>
 void List<Type>::DelIndex(int i){
         assert(i<num);
         num--;
@@ -109,7 +109,7 @@ void List<Type>::DelIndex(int i){
         }
 }
 
-template <class Type>
+template<class Type>
 void List<Type>::Remove(Type t){
         int i;
         for(i=0;i<num;i++) {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index abae46e9de..d501f3d443 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -123,7 +123,7 @@ public:
             );
 
             //- Like above but switches between linear/tree communication
-            template <class T>
+            template<class T>
             static void scatter
             (
                 T& Value,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
index 323dc8d3c3..345e766aea 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
@@ -134,7 +134,7 @@ void Foam::Pstream::combineGather
 }
 
 
-template <class T, class CombineOp>
+template<class T, class CombineOp>
 void Foam::Pstream::combineGather
 (
     T& Value,
@@ -249,7 +249,7 @@ void Foam::Pstream::combineScatter
 }
 
 
-template <class T>
+template<class T>
 void Foam::Pstream::combineScatter
 (
     T& Value,
@@ -484,7 +484,7 @@ void Foam::Pstream::listCombineScatter
 }
 
 
-template <class T>
+template<class T>
 void Foam::Pstream::listCombineScatter
 (
     List<T>& Values,
@@ -667,7 +667,7 @@ void Foam::Pstream::mapCombineScatter
 }
 
 
-template <class Container>
+template<class Container>
 void Foam::Pstream::mapCombineScatter
 (
     Container& Values,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
index 477dbe35f5..50a3b7660e 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ void Pstream::gather
 }
 
 
-template <class T, class BinaryOp>
+template<class T, class BinaryOp>
 void Pstream::gather
 (
     T& Value,
@@ -217,7 +217,7 @@ void Pstream::scatter
 }
 
 
-template <class T>
+template<class T>
 void Pstream::scatter(T& Value, const int tag, const label comm)
 {
     if (UPstream::nProcs(comm) < UPstream::nProcsSimpleSum)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
index a016eee530..930a51bc85 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,7 +186,7 @@ void Pstream::gatherList
 }
 
 
-template <class T>
+template<class T>
 void Pstream::gatherList(List<T>& Values, const int tag, const label comm)
 {
     if (UPstream::nProcs(comm) < UPstream::nProcsSimpleSum)
@@ -321,7 +321,7 @@ void Pstream::scatterList
 }
 
 
-template <class T>
+template<class T>
 void Pstream::scatterList(List<T>& Values, const int tag, const label comm)
 {
     if (UPstream::nProcs(comm) < UPstream::nProcsSimpleSum)
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index a0dfdc6d23..b1add8e8c3 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -372,7 +372,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
 
 
 //- Return the const reference of the non-const reference argument
-template<typename T>
+template<class T>
 inline const T& Const(T& t)
 {
     return t;
@@ -380,7 +380,7 @@ inline const T& Const(T& t)
 
 
 //- Return the const reference of the non-const rvalue reference argument
-template<typename T>
+template<class T>
 inline const T& Const(T&& t)
 {
     return t;
diff --git a/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H b/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H
index b56a4c4407..75f66f44e8 100644
--- a/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H
+++ b/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H
@@ -302,7 +302,7 @@ inline void Foam::tmpNrc<T>::operator=(const tmpNrc<T>& t)
 
 
 //- Return the const reference of the non-const reference argument
-template<typename T>
+template<class T>
 inline const T& Const(T& t)
 {
     return t;
@@ -310,7 +310,7 @@ inline const T& Const(T& t)
 
 
 //- Return the const reference of the non-const rvalue reference argument
-template<typename T>
+template<class T>
 inline const T& Const(T&& t)
 {
     return t;
diff --git a/src/OpenFOAM/primitives/nullObject/nullObject.H b/src/OpenFOAM/primitives/nullObject/nullObject.H
index 1ec31d5341..71217836c1 100644
--- a/src/OpenFOAM/primitives/nullObject/nullObject.H
+++ b/src/OpenFOAM/primitives/nullObject/nullObject.H
@@ -69,29 +69,29 @@ extern const NullObject* nullObjectPtr;
 
 
 //- Return reference to the nullObject of type T
-template <class T>
+template<class T>
 inline const T& NullObjectRef();
 
 //- Return pointer to the nullObject of type T
-template <class T>
+template<class T>
 inline const T* NullObjectPtr();
 
 
 //- Return true if t is a reference to the nullObject of type T
-template <class T>
+template<class T>
 inline bool isNull(const T& t);
 
 //- Return true if t is not a reference to the nullObject of type T
-template <class T>
+template<class T>
 inline bool notNull(const T& t);
 
 
 //- Return true if t is a pointer to the nullObject of type T
-template <class T>
+template<class T>
 inline bool isNull(const T* t);
 
 //- Return true if t is not a pointer to the nullObject of type T
-template <class T>
+template<class T>
 inline bool notNull(const T* t);
 
 
diff --git a/src/OpenFOAM/primitives/nullObject/nullObjectI.H b/src/OpenFOAM/primitives/nullObject/nullObjectI.H
index 4f8fbc1f73..727de5838b 100644
--- a/src/OpenFOAM/primitives/nullObject/nullObjectI.H
+++ b/src/OpenFOAM/primitives/nullObject/nullObjectI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,39 +23,39 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-template <class T>
+template<class T>
 inline const T& Foam::NullObjectRef()
 {
     return *reinterpret_cast<const T*>(nullObjectPtr);
 }
 
-template <class T>
+template<class T>
 inline const T* Foam::NullObjectPtr()
 {
     return reinterpret_cast<const T*>(nullObjectPtr);
 }
 
 
-template <class T>
+template<class T>
 inline bool Foam::isNull(const T& t)
 {
     return &t == NullObjectPtr<T>();
 }
 
-template <class T>
+template<class T>
 inline bool Foam::notNull(const T& t)
 {
     return &t != NullObjectPtr<T>();
 }
 
 
-template <class T>
+template<class T>
 inline bool Foam::isNull(const T* t)
 {
     return t == NullObjectPtr<T>();
 }
 
-template <class T>
+template<class T>
 inline bool Foam::notNull(const T* t)
 {
     return t != NullObjectPtr<T>();
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
index a49d6f63f9..ffe92dc899 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
@@ -89,10 +89,10 @@ class polyMeshFilter
 
     // Private Member Functions
 
-        template<typename T>
+        template<class T>
         static void updateSets(const mapPolyMesh& map);
 
-        template<typename T>
+        template<class T>
         static void copySets(const polyMesh& oldMesh, const polyMesh& newMesh);
 
         label filterFacesLoop(const label nOriginalBadFaces);
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
index 08fa9d6efe..98078299e0 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 
 // * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * * //
 
-template<typename SetType>
+template<class SetType>
 void Foam::polyMeshFilter::updateSets(const mapPolyMesh& map)
 {
     HashTable<const SetType*> sets =
@@ -66,7 +66,7 @@ void Foam::polyMeshFilter::updateSets(const mapPolyMesh& map)
 }
 
 
-template<typename SetType>
+template<class SetType>
 void Foam::polyMeshFilter::copySets
 (
     const polyMesh& oldMesh,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
index 23115c2588..40e30198e6 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
@@ -52,7 +52,7 @@ class ParticleStressModel;
 
 class CorrectionLimitingMethod;
 
-template <class Type>
+template<class Type>
 class AveragingMethod;
 
 /*---------------------------------------------------------------------------*\

From aa89254c797108054c68d246e0993f0c2c3ba971 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Tue, 22 Mar 2016 17:40:03 +0000
Subject: [PATCH 327/447] foamNewFunctionObject: script to create template code
 for a new function object Run foamNewFunctionObject -h for details

---
 bin/foamNewFunctionObject                     |  83 +++++++++
 .../functionObject/FUNCTIONOBJECT.C           |  96 ++++++++++
 .../functionObject/FUNCTIONOBJECT.H           | 176 ++++++++++++++++++
 .../FUNCTIONOBJECTFunctionObject.C            |  46 +++++
 .../FUNCTIONOBJECTFunctionObject.H            |  54 ++++++
 .../functionObject/IOFUNCTIONOBJECT.H         |  49 +++++
 etc/codeTemplates/functionObject/Make/files   |   4 +
 etc/codeTemplates/functionObject/Make/options |   7 +
 8 files changed, 515 insertions(+)
 create mode 100755 bin/foamNewFunctionObject
 create mode 100644 etc/codeTemplates/functionObject/FUNCTIONOBJECT.C
 create mode 100644 etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
 create mode 100644 etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.C
 create mode 100644 etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.H
 create mode 100644 etc/codeTemplates/functionObject/IOFUNCTIONOBJECT.H
 create mode 100644 etc/codeTemplates/functionObject/Make/files
 create mode 100644 etc/codeTemplates/functionObject/Make/options

diff --git a/bin/foamNewFunctionObject b/bin/foamNewFunctionObject
new file mode 100755
index 0000000000..a6de93f70d
--- /dev/null
+++ b/bin/foamNewFunctionObject
@@ -0,0 +1,83 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2016 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/>.
+#
+# Script
+#     foamNewFunctionObject
+#
+# Description
+#     Create directory with source and compilation files for a new function
+#     object
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+DIR="$FOAM_ETC/codeTemplates/functionObject"
+
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+Usage: $Script [-h | -help] <functionObjectName>
+
+* Create directory with source and compilation files for a new function object
+  <functionObjectName> (dir)
+  - <functionObjectName>.H
+  - <functionObjectName>.C
+  - <functionObjectName>FunctionObject.H
+  - <functionObjectName>FunctionObject.C
+  - IO<functionObjectName>.H
+  - Make (dir)
+    - files
+    - options
+  Compiles a library named lib<functionObjectName>FunctionObject.so in
+  \$FOAM_USER_LIBBIN:
+  $FOAM_USER_LIBBIN
+USAGE
+    exit 1
+}
+
+case "$1" in
+(-h | -help)
+    usage
+    ;;
+-*)
+    usage "$1 is not a valid option/filename"
+    ;;
+esac
+
+[ "$#" -eq 1 ] || usage "Wrong number of arguments"
+[ -d "$1" ] && usage "$1 directory already exists, aborting..."
+
+NAME=$1
+
+echo "Creating function object code directory $NAME" && mkdir $NAME
+for F in $(ls ${DIR}/*.*)
+do
+    FILE=$(basename $F | sed "s#FUNCTIONOBJECT#${NAME}#g")
+    sed "s#FUNCTIONOBJECT#${NAME}#g" ${F} > ${NAME}/${FILE}
+done
+
+echo "Creating Make subdirectory" && mkdir $NAME/Make
+sed "s#FUNCTIONOBJECT#${NAME}#g" ${DIR}/Make/files > $NAME/Make/files
+cp ${DIR}/Make/options $NAME/Make
+
+#------------------------------------------------------------------------------
diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C
new file mode 100644
index 0000000000..68189c6d43
--- /dev/null
+++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "FUNCTIONOBJECT.H"
+#include "dictionary.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+defineTypeNameAndDebug(FUNCTIONOBJECT, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::FUNCTIONOBJECT::FUNCTIONOBJECT
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    name_(name),
+    obr_(obr),
+    wordData_(dict.lookupOrDefault<word>("wordData", "defaultWord")),
+    scalarData_(readScalar(dict.lookup("scalarData"))),
+    labelData_(readLabel(dict.lookup("labelData")))
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::FUNCTIONOBJECT::~FUNCTIONOBJECT()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::FUNCTIONOBJECT::read(const dictionary& dict)
+{
+    dict.readIfPresent("wordData", wordData_);
+    dict.lookup("scalarData") >> scalarData_;
+    dict.lookup("labelData") >> labelData_;
+}
+
+
+void Foam::FUNCTIONOBJECT::execute()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::FUNCTIONOBJECT::end()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::FUNCTIONOBJECT::timeSet()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::FUNCTIONOBJECT::write()
+{
+}
+
+
+// ************************************************************************* //
diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
new file mode 100644
index 0000000000..62fdf144e2
--- /dev/null
+++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
@@ -0,0 +1,176 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::FUNCTIONOBJECT
+
+Group
+
+Description
+    This function object...
+
+    Example of function object specification:
+    \verbatim
+    FUNCTIONOBJECT1
+    {
+        type           FUNCTIONOBJECT;
+        functionObjectLibs ("libFUNCTIONOBJECTFunctionObject.so");
+        ...
+        wordData       someWord;
+        scalarData     1.0;
+        labelData      1;
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description               | Required | Default value
+        type         | type name: FUNCTIONOBJECT | yes      |
+        wordData     | some word option...       | no       | defaultWord
+        scalarData   | some scalar value...      | yes      |
+        labelData    | some label value...       | yes      |
+    \endtable
+
+SourceFiles
+    FUNCTIONOBJECT.C
+    IOFUNCTIONOBJECT.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef FUNCTIONOBJECT_H
+#define FUNCTIONOBJECT_H
+
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class polyMesh;
+class mapPolyMesh;
+
+/*---------------------------------------------------------------------------*\
+                   Class FUNCTIONOBJECT Declaration
+\*---------------------------------------------------------------------------*/
+
+class FUNCTIONOBJECT
+{
+    // Private data
+
+        //- Name of this set of FUNCTIONOBJECT
+        word name_;
+
+        //- Refererence to Db
+        const objectRegistry& obr_;
+
+        // Read from dictionary
+
+            //- word
+            word wordData_;
+
+            //- scalar
+            scalar scalarData_;
+
+            //- label
+            label labelData_;
+
+
+    // Private Member Functions
+
+
+        //- Disallow default bitwise copy construct
+        FUNCTIONOBJECT(const FUNCTIONOBJECT&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const FUNCTIONOBJECT&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("FUNCTIONOBJECT");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        FUNCTIONOBJECT
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~FUNCTIONOBJECT();
+
+
+    // Member Functions
+
+        //- Return name of the FUNCTIONOBJECT
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the FUNCTIONOBJECT data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Called when time was set at the end of the Time::operator++
+        virtual void timeSet();
+
+        //- Write the FUNCTIONOBJECT
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const polyMesh&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.C b/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.C
new file mode 100644
index 0000000000..b10ecc5098
--- /dev/null
+++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.C
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "FUNCTIONOBJECTFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug
+    (
+        FUNCTIONOBJECTFunctionObject,
+        0
+    );
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        FUNCTIONOBJECTFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //
diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.H b/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.H
new file mode 100644
index 0000000000..78e6a7f0b9
--- /dev/null
+++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.H
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::FUNCTIONOBJECTFunctionObject
+
+Description
+    FunctionObject wrapper around FUNCTIONOBJECT to allow them to be
+    created via the functions entry within controlDict.
+
+SourceFiles
+    FUNCTIONOBJECTFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef FUNCTIONOBJECTFunctionObject_H
+#define FUNCTIONOBJECTFunctionObject_H
+
+#include "FUNCTIONOBJECT.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<FUNCTIONOBJECT>
+        FUNCTIONOBJECTFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/etc/codeTemplates/functionObject/IOFUNCTIONOBJECT.H b/etc/codeTemplates/functionObject/IOFUNCTIONOBJECT.H
new file mode 100644
index 0000000000..0075f798a1
--- /dev/null
+++ b/etc/codeTemplates/functionObject/IOFUNCTIONOBJECT.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::IOFUNCTIONOBJECT
+
+Description
+    Instance of the generic IOOutputFilter for FUNCTIONOBJECT.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOFUNCTIONOBJECT_H
+#define IOFUNCTIONOBJECT_H
+
+#include "FUNCTIONOBJECT.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<FUNCTIONOBJECT> IOFUNCTIONOBJECT;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/etc/codeTemplates/functionObject/Make/files b/etc/codeTemplates/functionObject/Make/files
new file mode 100644
index 0000000000..73b9956031
--- /dev/null
+++ b/etc/codeTemplates/functionObject/Make/files
@@ -0,0 +1,4 @@
+FUNCTIONOBJECT.C
+FUNCTIONOBJECTFunctionObject.C
+
+LIB = $(FOAM_USER_LIBBIN)/libFUNCTIONOBJECTFunctionObject
diff --git a/etc/codeTemplates/functionObject/Make/options b/etc/codeTemplates/functionObject/Make/options
new file mode 100644
index 0000000000..a3ae8da833
--- /dev/null
+++ b/etc/codeTemplates/functionObject/Make/options
@@ -0,0 +1,7 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools

From 730f89dc9d4131c71d1673b4189e6669a6b15bc5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 22 Mar 2016 17:46:52 +0000
Subject: [PATCH 328/447] Use Zero rather than pTraits<Type>::zero unless a
 static typed '0' is required

---
 .../basicXiSubXiEq/basicXiSubXiEq.C           |  2 +-
 .../PDRModels/dragModels/basic/basic.C        |  2 +-
 .../XiModels/XiEqModels/XiEqModel/XiEqModel.C |  2 +-
 .../adjointShapeOptimizationFoam.C            |  2 +-
 .../BlendedInterfacialModel.C                 |  4 +-
 .../BlendedInterfacialModel.C                 |  4 +-
 .../extendedStencil/Test-ExtendedStencil2.C   |  2 +-
 .../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 20 ++++-----
 .../splitMeshRegions/splitMeshRegions.C       |  4 +-
 .../helpBoundary/helpBoundaryTemplates.C      |  2 +-
 .../foamToEnsight/ensightCloudField.C         |  4 +-
 .../ensightOutputFunctions.C                  |  2 +-
 .../foamToTetDualMesh/foamToTetDualMesh.C     | 14 +++----
 .../postChannel/channelIndexTemplates.C       |  4 +-
 .../patch/patchAverage/patchAverage.C         |  4 +-
 .../viewFactorsGen/viewFactorsGen.C           |  4 +-
 .../atmBoundaryLayer/atmBoundaryLayer.C       |  6 +--
 .../nutURoughWallFunctionFvPatchScalarField.C |  6 +--
 .../fvMeshDistribute/fvMeshDistribute.C       | 20 ++++-----
 src/dynamicMesh/fvMeshTools/fvMeshTools.C     | 42 +++++++++----------
 .../motionSmootherAlgoTemplates.C             |  4 +-
 .../fixedProfile/fixedProfileFvPatchField.C   |  4 +-
 .../fixedValue/fixedValueFvsPatchField.C      |  2 +-
 .../steadyStateD2dt2Scheme.C                  |  4 +-
 .../CoEulerDdtScheme/CoEulerDdtScheme.C       |  4 +-
 .../CrankNicolsonDdtScheme.C                  |  4 +-
 .../EulerDdtScheme/EulerDdtScheme.C           |  4 +-
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C  |  4 +-
 .../backwardDdtScheme/backwardDdtScheme.C     |  4 +-
 .../localEulerDdtScheme/localEulerDdtScheme.C |  4 +-
 .../steadyStateDdtScheme.C                    | 18 ++++----
 .../finiteVolume/fvc/fvcCellReduce.C          |  2 +-
 .../finiteVolume/fvc/fvcSimpleReconstruct.C   |  2 +-
 .../finiteVolume/fvc/fvcSurfaceIntegrate.C    |  4 +-
 .../LeastSquaresGrad/LeastSquaresGrad.C       |  4 +-
 .../gradSchemes/gaussGrad/gaussGrad.C         |  2 +-
 .../leastSquaresGrad/leastSquaresGrad.C       |  2 +-
 .../faceCorrectedSnGrad/faceCorrectedSnGrad.C |  2 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            | 16 +++----
 .../extendedCellToCellStencilTemplates.C      |  2 +-
 .../extendedCellToFaceStencilTemplates.C      |  4 +-
 ...extendedUpwindCellToFaceStencilTemplates.C |  2 +-
 .../extendedFaceToCellStencilTemplates.C      |  4 +-
 .../interpolationCellPointFace.C              |  4 +-
 .../interpolationPointMVC/pointMVCWeightI.H   |  4 +-
 .../schemes/cubic/cubic.H                     |  2 +-
 .../schemes/linearUpwind/linearUpwind.C       |  2 +-
 .../schemes/linearUpwind/linearUpwindV.C      |  2 +-
 .../outletStabilised/outletStabilised.H       |  2 +-
 .../schemes/pointLinear/pointLinear.C         |  2 +-
 .../schemes/skewCorrected/skewCorrected.H     |  2 +-
 .../volPointInterpolate.C                     |  6 +--
 .../pairPatchAgglomerationTemplates.C         |  4 +-
 ...meVaryingMappedFixedValuePointPatchField.C | 12 +++---
 .../rotorDiskSourceTemplates.C                |  2 +-
 .../semiImplicitSource/SemiImplicitSource.C   |  4 +-
 .../IntegrationScheme/IntegrationScheme.H     |  4 +-
 .../PairCollisionRecord/PairCollisionRecord.C |  4 +-
 .../WallCollisionRecord/WallCollisionRecord.C |  4 +-
 .../AveragingMethod/AveragingMethod.C         | 10 ++---
 .../MPPIC/AveragingMethods/Basic/Basic.C      |  2 +-
 .../bufferedAccumulator/bufferedAccumulator.C |  8 ++--
 .../correlationFunction/correlationFunction.C |  2 +-
 .../zeroFixedValuePointPatchField.C           |  6 +--
 .../meshRefinement/meshRefinementTemplates.C  |  6 +--
 .../snappyLayerDriverTemplates.C              |  4 +-
 .../AMIInterpolation/AMIInterpolation.C       |  4 +-
 .../mappedPatchBaseTemplates.C                |  6 +--
 .../cellSource/cellSourceTemplates.C          |  2 +-
 .../faceSource/faceSourceTemplates.C          |  8 ++--
 .../fieldValueDeltaTemplates.C                |  8 ++--
 .../calcFvcGrad/calcFvcGradTemplates.C        |  4 +-
 .../regionModel/regionModelTemplates.C        |  4 +-
 .../thermalBaffle/thermalBaffle.C             |  8 ++--
 src/sampling/meshToMesh/meshToMeshTemplates.C | 16 +++----
 .../meshToMesh0/meshToMesh0Templates.C        |  2 +-
 .../isoSurface/isoSurfaceTemplates.C          | 16 +++----
 .../sampledSurface/sampledSurfaceTemplates.C  |  8 ++--
 .../sampledTriSurfaceMeshTemplates.C          |  2 +-
 .../nastran/nastranSurfaceWriterTemplates.C   |  2 +-
 .../surfaceFormats/ac3d/AC3DsurfaceFormat.C   |  4 +-
 .../rawTopoChangerFvMeshTemplates.C           |  4 +-
 82 files changed, 224 insertions(+), 224 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
index 06c3c5537c..e85e41b432 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
@@ -122,7 +122,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::basicSubGrid::XiEq() const
         (
             "zero",
             nsv.dimensions(),
-            pTraits<symmTensor>::zero
+            Zero
         )
     );
     ns.internalField() = nsv.internalField()*Cw;
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
index 0de82a82e4..7e3d2bb7aa 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
@@ -108,7 +108,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::PDRDragModels::basic::Dcu() const
             (
                 "zero",
                 dimMass/dimTime/pow(dimLength, 3),
-                pTraits<symmTensor>::zero
+                Zero
             )
         )
     );
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
index a84aca3210..966dae7175 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
@@ -131,7 +131,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
         (
             "zero",
             nsv.dimensions(),
-            pTraits<symmTensor>::zero
+            Zero
         )
     );
     ns.internalField() = nsv.internalField()*pow(mesh.V(), 2.0/3.0);
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index cdc1616e2b..a303ae4fe4 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -60,7 +60,7 @@ void zeroCells
 {
     forAll(cells, i)
     {
-        vf[cells[i]] = pTraits<Type>::zero;
+        vf[cells[i]] = Zero;
     }
 }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
index 78eb01cf1c..abff13475e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -47,7 +47,7 @@ void Foam::BlendedInterfacialModel<ModelType>::correctFixedFluxBCs
         )
         {
             field.boundaryField()[patchI]
-              = pTraits<typename GeometricField::value_type>::zero;
+              = Zero;
         }
     }
 }
@@ -382,7 +382,7 @@ Foam::BlendedInterfacialModel<ModelType>::F() const
                 false
             ),
             phase1_.mesh(),
-            dimensioned<Type>("zero", ModelType::dimF, pTraits<Type>::zero)
+            dimensioned<Type>("zero", ModelType::dimF, Zero)
         )
     );
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
index 1b2a492782..0d78e02ac8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -47,7 +47,7 @@ void Foam::BlendedInterfacialModel<modelType>::correctFixedFluxBCs
         )
         {
             field.boundaryField()[patchI]
-              = pTraits<typename GeometricField::value_type>::zero;
+              = Zero;
         }
     }
 }
@@ -280,7 +280,7 @@ Foam::BlendedInterfacialModel<modelType>::F() const
                 false
             ),
             pair_.phase1().mesh(),
-            dimensioned<Type>("zero", modelType::dimF, pTraits<Type>::zero)
+            dimensioned<Type>("zero", modelType::dimF, Zero)
         )
     );
 
diff --git a/applications/test/extendedStencil/Test-ExtendedStencil2.C b/applications/test/extendedStencil/Test-ExtendedStencil2.C
index 3c0228df85..03d5283233 100644
--- a/applications/test/extendedStencil/Test-ExtendedStencil2.C
+++ b/applications/test/extendedStencil/Test-ExtendedStencil2.C
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
             const volVectorField& fld = mesh.C();
 
             // 1. Construct cell data in compact addressing
-            List<point> compactFld(map.constructSize(), pTraits<point>::zero);
+            List<point> compactFld(map.constructSize(), Zero);
 
             // Insert my internal values
             forAll(fld, cellI)
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index ca1f9a4752..8be739c5ff 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -781,7 +781,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<scalar>::zero,
+        scalar(Zero),
         volScalarField::typeName,
         scalarFlds
     );
@@ -793,7 +793,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<vector>::zero,
+        vector(Zero),
         volVectorField::typeName,
         vectorFlds
     );
@@ -811,7 +811,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<sphericalTensor>::zero,
+        sphericalTensor(Zero),
         volSphericalTensorField::typeName,
         sphericalTensorFlds
     );
@@ -823,7 +823,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<symmTensor>::zero,
+        symmTensor(Zero),
         volSymmTensorField::typeName,
         symmTensorFlds
     );
@@ -835,7 +835,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<tensor>::zero,
+        tensor(Zero),
         volTensorField::typeName,
         tensorFlds
     );
@@ -849,7 +849,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<scalar>::zero,
+        scalar(Zero),
         surfaceScalarField::typeName,
         surfScalarFlds
     );
@@ -861,7 +861,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<vector>::zero,
+        vector(Zero),
         surfaceVectorField::typeName,
         surfVectorFlds
     );
@@ -879,7 +879,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<sphericalTensor>::zero,
+        sphericalTensor(Zero),
         surfaceSphericalTensorField::typeName,
         surfSphericalTensorFlds
     );
@@ -899,7 +899,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<symmTensor>::zero,
+        symmTensor(Zero),
         surfaceSymmTensorField::typeName,
         surfSymmTensorFlds
     );
@@ -911,7 +911,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<tensor>::zero,
+        tensor(Zero),
         surfaceTensorField::typeName,
         surfTensorFlds
     );
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 6697fbecfb..2a7e0727cc 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -182,7 +182,7 @@ void subsetVolFields
             if (addedPatches.found(patchI))
             {
                 tSubFld.ref().boundaryField()[patchI] ==
-                    pTraits<typename GeoField::value_type>::zero;
+                    typename GeoField::value_type(Zero);
             }
         }
 
@@ -234,7 +234,7 @@ void subsetSurfaceFields
             if (addedPatches.found(patchI))
             {
                 tSubFld.ref().boundaryField()[patchI] ==
-                    pTraits<typename GeoField::value_type>::zero;
+                    typename GeoField::value_type(Zero);
             }
         }
 
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
index c27ee167f5..ec53cb414d 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
@@ -94,7 +94,7 @@ void Foam::helpTypes::helpBoundary::fixedValueFieldConditions
             false
         ),
         mesh,   
-        dimensioned<Type>("zero", dimless, pTraits<Type>::zero)
+        dimensioned<Type>("zero", dimless, Zero)
     );
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
index 18f3deabf0..aeb18be678 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ void ensightCloudField
 
             if (mag(v) < 1.0e-90)
             {
-                v = pTraits<Type>::zero;
+                v = Zero;
             }
 
             for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
index a21efa64da..309b49a82d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
@@ -182,7 +182,7 @@ void Foam::ensightLagrangianField
 
         if (mag(val) < 1.0e-90)
         {
-            val = pTraits<Type>::zero;
+            val = Zero;
         }
 
         for (direction cmpt=0; cmpt < pTraits<Type>::nComponents; cmpt++)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
index 888d274dea..6e50d70471 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ void ReadAndMapFields
                 (
                     "zero",
                     readField.dimensions(),
-                    pTraits<Type>::zero
+                    Zero
                 )
             )
         );
@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
         objects,
         tetDualMesh,
         pointDualAddressing,
-        pTraits<scalar>::zero,  // nullValue
+        Zero,  // nullValue
         psFlds
     );
 
@@ -263,7 +263,7 @@ int main(int argc, char *argv[])
         objects,
         tetDualMesh,
         pointDualAddressing,
-        pTraits<vector>::zero,  // nullValue
+        Zero,  // nullValue
         pvFlds
     );
 
@@ -274,7 +274,7 @@ int main(int argc, char *argv[])
         objects,
         tetDualMesh,
         pointDualAddressing,
-        pTraits<sphericalTensor>::zero,  // nullValue
+        Zero,  // nullValue
         pstFlds
     );
 
@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
         objects,
         tetDualMesh,
         pointDualAddressing,
-        pTraits<symmTensor>::zero,  // nullValue
+        Zero,  // nullValue
         psymmtFlds
     );
 
@@ -296,7 +296,7 @@ int main(int argc, char *argv[])
         objects,
         tetDualMesh,
         pointDualAddressing,
-        pTraits<tensor>::zero,  // nullValue
+        Zero,  // nullValue
         ptFlds
     );
 
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C
index b4ce9a7bfb..2f50554802 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 template<class T>
 Foam::Field<T> Foam::channelIndex::regionSum(const Field<T>& cellField) const
 {
-    Field<T> regionField(cellRegion_().nRegions(), pTraits<T>::zero);
+    Field<T> regionField(cellRegion_().nRegions(), Zero);
 
     forAll(cellRegion_(), cellI)
     {
diff --git a/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C b/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C
index acdc968fa7..ace3dc3b9d 100644
--- a/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C
+++ b/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ void printAverage
         FieldType field(fieldHeader, mesh);
 
         typename FieldType::value_type sumField =
-            pTraits<typename FieldType::value_type>::zero;
+            Zero;
 
         if (area > 0)
         {
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index d5f295a62b..defc6fb870 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -584,8 +584,8 @@ int main(int argc, char *argv[])
     // I need coarse Sf (Ai), fine Sf (dAi) and fine Cf(r) to calculate Fij
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    pointField compactCoarseCf(map.constructSize(), pTraits<vector>::zero);
-    pointField compactCoarseSf(map.constructSize(), pTraits<vector>::zero);
+    pointField compactCoarseCf(map.constructSize(), Zero);
+    pointField compactCoarseSf(map.constructSize(), Zero);
     List<List<point>> compactFineSf(map.constructSize());
     List<List<point>> compactFineCf(map.constructSize());
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
index 2679132d78..1f95e729cd 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,8 +34,8 @@ namespace Foam
 
 atmBoundaryLayer::atmBoundaryLayer()
 :
-    flowDir_(pTraits<vector>::zero),
-    zDir_(pTraits<vector>::zero),
+    flowDir_(Zero),
+    zDir_(Zero),
     kappa_(0.41),
     Cmu_(0.09),
     Uref_(0),
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
index 7605716a4a..0f4bff28a6 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
@@ -209,9 +209,9 @@ nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
 )
 :
     nutWallFunctionFvPatchScalarField(p, iF),
-    roughnessHeight_(pTraits<scalar>::zero),
-    roughnessConstant_(pTraits<scalar>::zero),
-    roughnessFactor_(pTraits<scalar>::zero)
+    roughnessHeight_(Zero),
+    roughnessConstant_(Zero),
+    roughnessFactor_(Zero)
 {}
 
 
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index e38f3c6d47..bbf056d0d8 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -2215,11 +2215,11 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     // from nothing so explicitly reset.
     initPatchFields<volScalarField, processorFvPatchField<scalar>>
     (
-        pTraits<scalar>::zero
+        Zero
     );
     initPatchFields<volVectorField, processorFvPatchField<vector>>
     (
-        pTraits<vector>::zero
+        Zero
     );
     initPatchFields
     <
@@ -2227,24 +2227,24 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
         processorFvPatchField<sphericalTensor>
     >
     (
-        pTraits<sphericalTensor>::zero
+        Zero
     );
     initPatchFields<volSymmTensorField, processorFvPatchField<symmTensor>>
     (
-        pTraits<symmTensor>::zero
+        Zero
     );
     initPatchFields<volTensorField, processorFvPatchField<tensor>>
     (
-        pTraits<tensor>::zero
+        Zero
     );
 
     initPatchFields<surfaceScalarField, processorFvsPatchField<scalar>>
     (
-        pTraits<scalar>::zero
+        Zero
     );
     initPatchFields<surfaceVectorField, processorFvsPatchField<vector>>
     (
-        pTraits<vector>::zero
+        Zero
     );
     initPatchFields
     <
@@ -2252,7 +2252,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
         processorFvsPatchField<sphericalTensor>
     >
     (
-        pTraits<sphericalTensor>::zero
+        Zero
     );
     initPatchFields
     <
@@ -2260,11 +2260,11 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
         processorFvsPatchField<symmTensor>
     >
     (
-        pTraits<symmTensor>::zero
+        Zero
     );
     initPatchFields<surfaceTensorField, processorFvsPatchField<tensor>>
     (
-        pTraits<tensor>::zero
+        Zero
     );
 
 
diff --git a/src/dynamicMesh/fvMeshTools/fvMeshTools.C b/src/dynamicMesh/fvMeshTools/fvMeshTools.C
index 19e41d1558..cab0199354 100644
--- a/src/dynamicMesh/fvMeshTools/fvMeshTools.C
+++ b/src/dynamicMesh/fvMeshTools/fvMeshTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,35 +107,35 @@ Foam::label Foam::fvMeshTools::addPatch
         mesh,
         patchFieldDict,
         defaultPatchFieldType,
-        pTraits<scalar>::zero
+        Zero
     );
     addPatchFields<volVectorField>
     (
         mesh,
         patchFieldDict,
         defaultPatchFieldType,
-        pTraits<vector>::zero
+        Zero
     );
     addPatchFields<volSphericalTensorField>
     (
         mesh,
         patchFieldDict,
         defaultPatchFieldType,
-        pTraits<sphericalTensor>::zero
+        Zero
     );
     addPatchFields<volSymmTensorField>
     (
         mesh,
         patchFieldDict,
         defaultPatchFieldType,
-        pTraits<symmTensor>::zero
+        Zero
     );
     addPatchFields<volTensorField>
     (
         mesh,
         patchFieldDict,
         defaultPatchFieldType,
-        pTraits<tensor>::zero
+        Zero
     );
 
     // Surface fields
@@ -145,35 +145,35 @@ Foam::label Foam::fvMeshTools::addPatch
         mesh,
         patchFieldDict,
         defaultPatchFieldType,
-        pTraits<scalar>::zero
+        Zero
     );
     addPatchFields<surfaceVectorField>
     (
         mesh,
         patchFieldDict,
         defaultPatchFieldType,
-        pTraits<vector>::zero
+        Zero
     );
     addPatchFields<surfaceSphericalTensorField>
     (
         mesh,
         patchFieldDict,
         defaultPatchFieldType,
-        pTraits<sphericalTensor>::zero
+        Zero
     );
     addPatchFields<surfaceSymmTensorField>
     (
         mesh,
         patchFieldDict,
         defaultPatchFieldType,
-        pTraits<symmTensor>::zero
+        Zero
     );
     addPatchFields<surfaceTensorField>
     (
         mesh,
         patchFieldDict,
         defaultPatchFieldType,
-        pTraits<tensor>::zero
+        Zero
     );
 
     // Create reordering list
@@ -237,36 +237,36 @@ void Foam::fvMeshTools::setPatchFields
 
 void Foam::fvMeshTools::zeroPatchFields(fvMesh& mesh, const label patchI)
 {
-    setPatchFields<volScalarField>(mesh, patchI, pTraits<scalar>::zero);
-    setPatchFields<volVectorField>(mesh, patchI, pTraits<vector>::zero);
+    setPatchFields<volScalarField>(mesh, patchI, Zero);
+    setPatchFields<volVectorField>(mesh, patchI, Zero);
     setPatchFields<volSphericalTensorField>
     (
         mesh,
         patchI,
-        pTraits<sphericalTensor>::zero
+        Zero
     );
     setPatchFields<volSymmTensorField>
     (
         mesh,
         patchI,
-        pTraits<symmTensor>::zero
+        Zero
     );
-    setPatchFields<volTensorField>(mesh, patchI, pTraits<tensor>::zero);
-    setPatchFields<surfaceScalarField>(mesh, patchI, pTraits<scalar>::zero);
-    setPatchFields<surfaceVectorField>(mesh, patchI, pTraits<vector>::zero);
+    setPatchFields<volTensorField>(mesh, patchI, Zero);
+    setPatchFields<surfaceScalarField>(mesh, patchI, Zero);
+    setPatchFields<surfaceVectorField>(mesh, patchI, Zero);
     setPatchFields<surfaceSphericalTensorField>
     (
         mesh,
         patchI,
-        pTraits<sphericalTensor>::zero
+        Zero
     );
     setPatchFields<surfaceSymmTensorField>
     (
         mesh,
         patchI,
-        pTraits<symmTensor>::zero
+        Zero
     );
-    setPatchFields<surfaceTensorField>(mesh, patchI, pTraits<tensor>::zero);
+    setPatchFields<surfaceTensorField>(mesh, patchI, Zero);
 }
 
 
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
index 46250fb6b0..683d42f75f 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
@@ -155,7 +155,7 @@ Foam::motionSmootherAlgo::avg
                 false
             ),
             fld.mesh(),
-            dimensioned<Type>("zero", fld.dimensions(), pTraits<Type>::zero)
+            dimensioned<Type>("zero", fld.dimensions(), Zero)
         )
     );
     GeometricField<Type, pointPatchField, pointMesh>& res = tres.ref();
@@ -197,7 +197,7 @@ Foam::motionSmootherAlgo::avg
         mesh,
         res,
         plusEqOp<Type>(),
-        pTraits<Type>::zero     // null value
+        Type(Zero)     // null value
     );
     syncTools::syncPointList
     (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index 681d04ab31..1ea26724c6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -36,7 +36,7 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
 :
     fixedValueFvPatchField<Type>(p, iF),
     profile_(),
-    dir_(pTraits<vector>::zero),
+    dir_(Zero),
     origin_(0)
 {}
 
@@ -51,7 +51,7 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
 :
     fixedValueFvPatchField<Type>(p, iF, fld),
     profile_(),
-    dir_(pTraits<vector>::zero),
+    dir_(Zero),
     origin_(0)
 {}
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
index 107313dd4c..2d4fdaceea 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
@@ -95,7 +95,7 @@ Foam::fixedValueFvsPatchField<Type>::valueInternalCoeffs
 {
     return tmp<Field<Type>>
     (
-        new Field<Type>(this->size(), pTraits<Type>::zero)
+        new Field<Type>(this->size(), Zero)
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
index 7f21db69bb..2290d1735f 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
@@ -63,7 +63,7 @@ steadyStateD2dt2Scheme<Type>::fvcD2dt2
             (
                 "0",
                 vf.dimensions()/dimTime/dimTime,
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
@@ -95,7 +95,7 @@ steadyStateD2dt2Scheme<Type>::fvcD2dt2
             (
                 "0",
                 rho.dimensions()*vf.dimensions()/dimTime/dimTime,
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index 2374f31fff..aabc1320f3 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -178,7 +178,7 @@ CoEulerDdtScheme<Type>::fvcDdt
                 (
                     "0",
                     dt.dimensions()/dimTime,
-                    pTraits<Type>::zero
+                    Zero
                 )
             )
         );
@@ -201,7 +201,7 @@ CoEulerDdtScheme<Type>::fvcDdt
                 (
                     "0",
                     dt.dimensions()/dimTime,
-                    pTraits<Type>::zero
+                    Zero
                 ),
                 calculatedFvPatchField<Type>::typeName
             )
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index d33969f50a..9d4be317ff 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -162,7 +162,7 @@ CrankNicolsonDdtScheme<Type>::ddt0_
                     (
                         "0",
                         dims/dimTime,
-                        pTraits<typename GeoField::value_type>::zero
+                        Zero
                     )
                 )
             );
@@ -310,7 +310,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             (
                 "0",
                 dt.dimensions()/dimTime,
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index 79c3069f0d..e6c7239f61 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -68,7 +68,7 @@ EulerDdtScheme<Type>::fvcDdt
                 (
                     "0",
                     dt.dimensions()/dimTime,
-                    pTraits<Type>::zero
+                    Zero
                 )
             )
         );
@@ -90,7 +90,7 @@ EulerDdtScheme<Type>::fvcDdt
                 (
                     "0",
                     dt.dimensions()/dimTime,
-                    pTraits<Type>::zero
+                    Zero
                 ),
                 calculatedFvPatchField<Type>::typeName
             )
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index 204f88e69c..a3b9b841e1 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -178,7 +178,7 @@ SLTSDdtScheme<Type>::fvcDdt
                 (
                     "0",
                     dt.dimensions()/dimTime,
-                    pTraits<Type>::zero
+                    Zero
                 )
             )
         );
@@ -200,7 +200,7 @@ SLTSDdtScheme<Type>::fvcDdt
                 (
                     "0",
                     dt.dimensions()/dimTime,
-                    pTraits<Type>::zero
+                    Zero
                 ),
                 calculatedFvPatchField<Type>::typeName
             )
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index 9297d106d8..e3127a453b 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -106,7 +106,7 @@ backwardDdtScheme<Type>::fvcDdt
                 (
                     "0",
                     dt.dimensions()/dimTime,
-                    pTraits<Type>::zero
+                    Zero
                 )
             )
         );
@@ -130,7 +130,7 @@ backwardDdtScheme<Type>::fvcDdt
                 (
                     "0",
                     dt.dimensions()/dimTime,
-                    pTraits<Type>::zero
+                    Zero
                 ),
                 calculatedFvPatchField<Type>::typeName
             )
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
index 4338399573..69d707974a 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@@ -74,7 +74,7 @@ localEulerDdtScheme<Type>::fvcDdt
                 (
                     "0",
                     dt.dimensions()/dimTime,
-                    pTraits<Type>::zero
+                    Zero
                 )
             )
         );
@@ -97,7 +97,7 @@ localEulerDdtScheme<Type>::fvcDdt
                 (
                     "0",
                     dt.dimensions()/dimTime,
-                    pTraits<Type>::zero
+                    Zero
                 ),
                 calculatedFvPatchField<Type>::typeName
             )
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
index b26de564ae..790d189bc3 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
@@ -61,7 +61,7 @@ steadyStateDdtScheme<Type>::fvcDdt
             (
                 "0",
                 dt.dimensions()/dimTime,
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
@@ -90,7 +90,7 @@ steadyStateDdtScheme<Type>::fvcDdt
             (
                 "0",
                 vf.dimensions()/dimTime,
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
@@ -120,7 +120,7 @@ steadyStateDdtScheme<Type>::fvcDdt
             (
                 "0",
                 rho.dimensions()*vf.dimensions()/dimTime,
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
@@ -150,7 +150,7 @@ steadyStateDdtScheme<Type>::fvcDdt
             (
                 "0",
                 rho.dimensions()*vf.dimensions()/dimTime,
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
@@ -181,7 +181,7 @@ steadyStateDdtScheme<Type>::fvcDdt
             (
                 "0",
                 rho.dimensions()*vf.dimensions()/dimTime,
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
@@ -295,7 +295,7 @@ steadyStateDdtScheme<Type>::fvcDdtUfCorr
             (
                 "0",
                 Uf.dimensions()*dimArea/dimTime,
-                pTraits<typename flux<Type>::type>::zero
+                Zero
             )
         )
     );
@@ -325,7 +325,7 @@ steadyStateDdtScheme<Type>::fvcDdtPhiCorr
             (
                 "0",
                 phi.dimensions()/dimTime,
-                pTraits<typename flux<Type>::type>::zero
+                Zero
             )
         )
     );
@@ -358,7 +358,7 @@ steadyStateDdtScheme<Type>::fvcDdtUfCorr
             (
                 "0",
                 Uf.dimensions()*dimArea/dimTime,
-                pTraits<typename flux<Type>::type>::zero
+                Zero
             )
         )
     );
@@ -391,7 +391,7 @@ steadyStateDdtScheme<Type>::fvcDdtPhiCorr
             (
                 "0",
                 phi.dimensions()/dimTime,
-                pTraits<typename flux<Type>::type>::zero
+                Zero
             )
         )
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
index c078bd365d..bbc5cfc275 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
@@ -65,7 +65,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensioned<Type>("0", ssf.dimensions(), pTraits<Type>::zero),
+            dimensioned<Type>("0", ssf.dimensions(), Zero),
             extrapolatedCalculatedFvPatchField<Type>::typeName
         )
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
index 6c97f1afd2..f4e5bae45d 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
@@ -79,7 +79,7 @@ reconstruct
             (
                 "0",
                 ssf.dimensions()/dimArea,
-                pTraits<GradType>::zero
+                Zero
             ),
             extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
index dd08e083aa..3ce8ab38ec 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
@@ -102,7 +102,7 @@ surfaceIntegrate
             (
                 "0",
                 ssf.dimensions()/dimVol,
-                pTraits<Type>::zero
+                Zero
             ),
             extrapolatedCalculatedFvPatchField<Type>::typeName
         )
@@ -154,7 +154,7 @@ surfaceSum
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensioned<Type>("0", ssf.dimensions(), pTraits<Type>::zero),
+            dimensioned<Type>("0", ssf.dimensions(), Zero),
             extrapolatedCalculatedFvPatchField<Type>::typeName
         )
     );
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
index a462ff85f7..b8f0336226 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
@@ -75,7 +75,7 @@ Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
             (
                 "zero",
                 vtf.dimensions()/dimLength,
-                pTraits<GradType>::zero
+                Zero
             ),
             extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
@@ -89,7 +89,7 @@ Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
 
     // Construct flat version of vtf
     // including all values referred to by the stencil
-    List<Type> flatVtf(stencil.map().constructSize(), pTraits<Type>::zero);
+    List<Type> flatVtf(stencil.map().constructSize(), Zero);
 
     // Insert internal values
     forAll(vtf, celli)
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
index 7e0c76cf55..34b9170c62 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
@@ -65,7 +65,7 @@ Foam::fv::gaussGrad<Type>::gradf
             (
                 "0",
                 ssf.dimensions()/dimLength,
-                pTraits<GradType>::zero
+                Zero
             ),
             extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
index 4a15dbc4d1..2a3839b5b2 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
@@ -71,7 +71,7 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
             (
                 "zero",
                 vsf.dimensions()/dimLength,
-                pTraits<GradType>::zero
+                Zero
             ),
             extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
index 467dc0af52..e67bc081e3 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
@@ -116,7 +116,7 @@ Foam::fv::faceCorrectedSnGrad<Type>::fullGradCorrection
         sfCorr[facei] = dCorr&fgrad;
     }
 
-    tsfCorr.ref().boundaryField() = pTraits<Type>::zero;
+    tsfCorr.ref().boundaryField() = Zero;
 
     return tsfCorr;
 }
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 41b7fae8a7..1d1e9ee529 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -249,10 +249,10 @@ void Foam::fvMatrix<Type>::setValuesFromList
                             mesh.boundaryMesh()[patchi].whichFace(facei);
 
                         internalCoeffs_[patchi][patchFacei] =
-                            pTraits<Type>::zero;
+                            Zero;
 
                         boundaryCoeffs_[patchi][patchFacei] =
-                            pTraits<Type>::zero;
+                            Zero;
                     }
                 }
             }
@@ -273,7 +273,7 @@ Foam::fvMatrix<Type>::fvMatrix
     lduMatrix(psi.mesh()),
     psi_(psi),
     dimensions_(ds),
-    source_(psi.size(), pTraits<Type>::zero),
+    source_(psi.size(), Zero),
     internalCoeffs_(psi.mesh().boundary().size()),
     boundaryCoeffs_(psi.mesh().boundary().size()),
     faceFluxCorrectionPtr_(NULL)
@@ -293,7 +293,7 @@ Foam::fvMatrix<Type>::fvMatrix
             new Field<Type>
             (
                 psi.mesh().boundary()[patchI].size(),
-                pTraits<Type>::zero
+                Zero
             )
         );
 
@@ -303,7 +303,7 @@ Foam::fvMatrix<Type>::fvMatrix
             new Field<Type>
             (
                 psi.mesh().boundary()[patchI].size(),
-                pTraits<Type>::zero
+                Zero
             )
         );
     }
@@ -433,7 +433,7 @@ Foam::fvMatrix<Type>::fvMatrix
             new Field<Type>
             (
                 psi.mesh().boundary()[patchI].size(),
-                pTraits<Type>::zero
+                Zero
             )
         );
 
@@ -443,7 +443,7 @@ Foam::fvMatrix<Type>::fvMatrix
             new Field<Type>
             (
                 psi.mesh().boundary()[patchI].size(),
-                pTraits<Type>::zero
+                Zero
             )
         );
     }
@@ -2292,7 +2292,7 @@ Foam::operator&
     }
     else
     {
-        Mphi.internalField() = pTraits<Type>::zero;
+        Mphi.internalField() = Zero;
     }
 
     Mphi.internalField() += M.lduMatrix::H(psi.field()) + M.source();
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
index 20b328bb81..77eead6d48 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
@@ -70,7 +70,7 @@ Foam::tmp
             (
                 fld.name(),
                 fld.dimensions(),
-                pTraits<WeightedType>::zero
+                Zero
             )
         )
     );
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
index 7fe2202afe..d6aac47191 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
@@ -37,7 +37,7 @@ void Foam::extendedCellToFaceStencil::collectData
 )
 {
     // 1. Construct cell data in compact addressing
-    List<Type> flatFld(map.constructSize(), pTraits<Type>::zero);
+    List<Type> flatFld(map.constructSize(), Zero);
 
     // Insert my internal values
     forAll(fld, cellI)
@@ -114,7 +114,7 @@ Foam::extendedCellToFaceStencil::weightedSum
             (
                 fld.name(),
                 fld.dimensions(),
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
index fe06177ec4..e47683cb48 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
@@ -63,7 +63,7 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum
             (
                 fld.name(),
                 fld.dimensions(),
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
index e1530b0b36..0535e0548d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
@@ -37,7 +37,7 @@ void Foam::extendedFaceToCellStencil::collectData
 )
 {
     // 1. Construct face data in compact addressing
-    List<Type> flatFld(map.constructSize(), pTraits<Type>::zero);
+    List<Type> flatFld(map.constructSize(), Zero);
 
     // Insert my internal values
     forAll(fld, cellI)
@@ -108,7 +108,7 @@ Foam::extendedFaceToCellStencil::weightedSum
             (
                 fld.name(),
                 fld.dimensions(),
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C
index 537c686bdb..deecb80321 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ Type Foam::interpolationCellPointFace<Type>::interpolate
     scalar phi[4], phiCandidate[4];
     label tetLabelCandidate[2], tetPointLabels[2];
 
-    Type t = pTraits<Type>::zero;
+    Type t = Zero;
 
     // only use face information when the position is on a face
     if (faceI < 0)
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeightI.H b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeightI.H
index 47ea12bab9..61f7cedb25 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeightI.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeightI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ inline Type Foam::pointMVCWeight::interpolate
 {
     const labelList& vertices = psip.mesh()().cellPoints()[cellIndex_];
 
-    Type t = pTraits<Type>::zero;
+    Type t = Zero;
     forAll(vertices, i)
     {
         t += psip[vertices[i]]*weights_[i];
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
index 2531574315..18b767b002 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
@@ -175,7 +175,7 @@ public:
             {
                 if (!sfCorr.boundaryField()[pi].coupled())
                 {
-                    sfCorr.boundaryField()[pi] = pTraits<Type>::zero;
+                    sfCorr.boundaryField()[pi] = Zero;
                 }
             }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
index aa7d4482b8..6dad60e254 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
@@ -51,7 +51,7 @@ Foam::linearUpwind<Type>::correction
                 false
             ),
             mesh,
-            dimensioned<Type>(vf.name(), vf.dimensions(), pTraits<Type>::zero)
+            dimensioned<Type>(vf.name(), vf.dimensions(), Zero)
         )
     );
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
index fce527802c..608c573ad2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
@@ -57,7 +57,7 @@ Foam::linearUpwindV<Type>::correction
             (
                 vf.name(),
                 vf.dimensions(),
-                pTraits<Type>::zero
+                Zero
             )
         )
     );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
index 819347a972..dbdebfa7d2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
@@ -222,7 +222,7 @@ public:
                                 if (mesh_.isInternalFace(facei))
                                 {
                                     // Remove correction
-                                    corr[facei] = pTraits<Type>::zero;
+                                    corr[facei] = Zero;
                                 }
                             }
                         }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
index 98a7cdbf41..303421fcf6 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
@@ -166,7 +166,7 @@ correction
         }
         else
         {
-            pSfCorr = pTraits<Type>::zero;
+            pSfCorr = Zero;
         }
     }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
index 1f568e6315..28649caa75 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
@@ -152,7 +152,7 @@ public:
                     (
                         vf.name(),
                         vf.dimensions(),
-                        pTraits<Type>::zero
+                        Zero
                     )
                 )
             );
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 79bdc2a29a..2759d0fb4b 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -143,7 +143,7 @@ void Foam::volPointInterpolation::interpolateInternalField
             const scalarList& pw = pointWeights_[pointi];
             const labelList& ppc = pointCells[pointi];
 
-            pf[pointi] = pTraits<Type>::zero;
+            pf[pointi] = Zero;
 
             forAll(ppc, pointCelli)
             {
@@ -192,7 +192,7 @@ Foam::tmp<Foam::Field<Type>> Foam::volPointInterpolation::flatBoundaryField
 
             forAll(pp, i)
             {
-                boundaryVals[bFaceI++] = pTraits<Type>::zero;
+                boundaryVals[bFaceI++] = Zero;
             }
         }
     }
@@ -231,7 +231,7 @@ void Foam::volPointInterpolation::interpolateBoundaryField
 
             Type& val = pfi[pointI];
 
-            val = pTraits<Type>::zero;
+            val = Zero;
             forAll(pFaces, j)
             {
                 if (boundaryIsPatchFace_[pFaces[j]])
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C
index 9ddc691bb7..5943814b4c 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ void Foam::pairPatchAgglomeration::restrictField
             << abort(FatalError);
     }
 
-    cf = pTraits<Type>::zero;
+    cf = Zero;
 
     forAll(ff, i)
     {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index 7d3b5a8d7c..6223cdb13c 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -46,10 +46,10 @@ timeVaryingMappedFixedValuePointPatchField
     sampleTimes_(0),
     startSampleTime_(-1),
     startSampledValues_(0),
-    startAverage_(pTraits<Type>::zero),
+    startAverage_(Zero),
     endSampleTime_(-1),
     endSampledValues_(0),
-    endAverage_(pTraits<Type>::zero),
+    endAverage_(Zero),
     offset_()
 {}
 
@@ -74,10 +74,10 @@ timeVaryingMappedFixedValuePointPatchField
     sampleTimes_(0),
     startSampleTime_(-1),
     startSampledValues_(0),
-    startAverage_(pTraits<Type>::zero),
+    startAverage_(Zero),
     endSampleTime_(-1),
     endSampledValues_(0),
-    endAverage_(pTraits<Type>::zero),
+    endAverage_(Zero),
     offset_
     (
         ptf.offset_.valid()
@@ -113,10 +113,10 @@ timeVaryingMappedFixedValuePointPatchField
     sampleTimes_(0),
     startSampleTime_(-1),
     startSampledValues_(0),
-    startAverage_(pTraits<Type>::zero),
+    startAverage_(Zero),
     endSampleTime_(-1),
     endSampledValues_(0),
-    endAverage_(pTraits<Type>::zero),
+    endAverage_(Zero),
     offset_()
 {
     if (dict.found("offset"))
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
index 3ca231a5c1..0d757a57c8 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
@@ -182,7 +182,7 @@ void Foam::fv::rotorDiskSource::writeField
                     IOobject::NO_WRITE
                 ),
                 mesh_,
-                dimensioned<Type>("zero", dimless, pTraits<Type>::zero)
+                dimensioned<Type>("zero", dimless, Zero)
             )
         );
 
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
index c7643dd71a..459ded8cd9 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -157,7 +157,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
         (
             "zero",
             eqn.dimensions()/dimVolume,
-            pTraits<Type>::zero
+            Zero
         ),
         false
     );
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
index ab077d5b7f..88326f8c2b 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
@@ -69,8 +69,8 @@ public:
         //- Constructor
         integrationResult()
         :
-            value_(pTraits<Type>::zero),
-            average_(pTraits<Type>::zero)
+            value_(Zero),
+            average_(Zero)
         {}
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
index 572e5a41d0..7f27ff8438 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Foam::PairCollisionRecord<Type>::PairCollisionRecord()
 :
     origProcOfOther_(0),
     origIdOfOther_(-1),
-    data_(pTraits<Type>::zero)
+    data_(Zero)
 {}
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
index 3e4470eaf3..ed533633f0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ Foam::WallCollisionRecord<Type>::WallCollisionRecord()
 :
     accessed_(false),
     pRel_(),
-    data_(pTraits<Type>::zero)
+    data_(Zero)
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
index 136140ad5f..2fa9f5b72a 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
@@ -47,7 +47,7 @@ Foam::AveragingMethod<Type>::AveragingMethod
     {
         FieldField<Field, Type>::append
         (
-            new Field<Type>(size[i], pTraits<Type>::zero)
+            new Field<Type>(size[i], Zero)
         );
     }
 }
@@ -161,7 +161,7 @@ bool Foam::AveragingMethod<Type>::write() const
             mesh_
         ),
         mesh_,
-        dimensioned<Type>("zero", dimless, pTraits<Type>::zero)
+        dimensioned<Type>("zero", dimless, Zero)
     );
     GeometricField<TypeGrad, fvPatchField, volMesh> cellGrad
     (
@@ -172,7 +172,7 @@ bool Foam::AveragingMethod<Type>::write() const
             mesh_
         ),
         mesh_,
-        dimensioned<TypeGrad>("zero", dimless, pTraits<TypeGrad>::zero)
+        dimensioned<TypeGrad>("zero", dimless, Zero)
     );
     GeometricField<Type, pointPatchField, pointMesh> pointValue
     (
@@ -183,7 +183,7 @@ bool Foam::AveragingMethod<Type>::write() const
             mesh_
         ),
         pointMesh_,
-        dimensioned<Type>("zero", dimless, pTraits<Type>::zero)
+        dimensioned<Type>("zero", dimless, Zero)
     );
     GeometricField<TypeGrad, pointPatchField, pointMesh> pointGrad
     (
@@ -194,7 +194,7 @@ bool Foam::AveragingMethod<Type>::write() const
             mesh_
         ),
         pointMesh_,
-        dimensioned<TypeGrad>("zero", dimless, pTraits<TypeGrad>::zero)
+        dimensioned<TypeGrad>("zero", dimless, Zero)
     );
 
     // tet-volume weighted sums
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
index 97bbb7b9b5..b921b0042d 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
@@ -77,7 +77,7 @@ void Foam::AveragingMethods::Basic<Type>::updateGrad()
             false
         ),
         this->mesh_,
-        dimensioned<Type>("zero", dimless, pTraits<Type>::zero),
+        dimensioned<Type>("zero", dimless, Zero),
         zeroGradientFvPatchField<Type>::typeName
     );
     tempData.internalField() = data_;
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
index d693708a9b..895ae8bfd0 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
@@ -41,7 +41,7 @@ void Foam::bufferedAccumulator<Type>::accumulateAndResetBuffer(const label b)
 
     averagesTaken_++;
 
-    (*this)[b] = Field<Type>(bufferLength(), pTraits<Type>::zero);
+    (*this)[b] = Field<Type>(bufferLength(), Zero);
 
     bufferOffsets_[b] = 0;
 }
@@ -112,7 +112,7 @@ void Foam::bufferedAccumulator<Type>::setSizes
 
     forAll((*this), b)
     {
-        (*this)[b] = Field<Type>(bufferLength, pTraits<Type>::zero);
+        (*this)[b] = Field<Type>(bufferLength, Zero);
     }
 
     averagesTaken_ = 0;
@@ -187,7 +187,7 @@ Foam::Field<Type> Foam::bufferedAccumulator<Type>::averaged() const
             << ". Returning empty field."
             << endl;
 
-        return Field<Type>(bufferLength(), pTraits<Type>::zero);
+        return Field<Type>(bufferLength(), Zero);
     }
 }
 
@@ -195,7 +195,7 @@ Foam::Field<Type> Foam::bufferedAccumulator<Type>::averaged() const
 template<class Type>
 void Foam::bufferedAccumulator<Type>::resetAveraging()
 {
-    accumulationBuffer() = Field<Type>(bufferLength(), pTraits<Type>::zero);
+    accumulationBuffer() = Field<Type>(bufferLength(), Zero);
 
     averagesTaken_ = 0;
 }
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
index c90588a71f..a89c35333d 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
@@ -68,7 +68,7 @@ void Foam::correlationFunction<Type>::setTimesAndSizes
             Field<Type>
             (
                 tZeroBufferSize,
-                pTraits<Type>::zero
+                Zero
             )
         );
 }
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
index 0caa4f166c..f5630ead7e 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
@@ -50,7 +50,7 @@ zeroFixedValuePointPatchField
 :
     fixedValuePointPatchField<Type>(p, iF, dict, false)
 {
-    fixedValuePointPatchField<Type>::operator=(pTraits<Type>::zero);
+    fixedValuePointPatchField<Type>::operator=(Zero);
 }
 
 
@@ -67,7 +67,7 @@ zeroFixedValuePointPatchField
     fixedValuePointPatchField<Type>(ptf, p, iF, mapper)
 {
     // For safety re-evaluate
-    fixedValuePointPatchField<Type>::operator=(pTraits<Type>::zero);
+    fixedValuePointPatchField<Type>::operator=(Zero);
 }
 
 
@@ -93,7 +93,7 @@ zeroFixedValuePointPatchField
     fixedValuePointPatchField<Type>(ptf, iF)
 {
     // For safety re-evaluate
-    fixedValuePointPatchField<Type>::operator=(pTraits<Type>::zero);
+    fixedValuePointPatchField<Type>::operator=(Zero);
 }
 
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
index 7e42869451..12a1011e87 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -70,7 +70,7 @@ T Foam::meshRefinement::gAverage
             << exit(FatalError);
     }
 
-    T sum = pTraits<T>::zero;
+    T sum = Zero;
     label n = 0;
 
     forAll(values, i)
@@ -305,7 +305,7 @@ void Foam::meshRefinement::weightedSum
     }
 
     sum.setSize(meshPoints.size());
-    sum = pTraits<Type>::zero;
+    sum = Zero;
 
     forAll(edges, edgeI)
     {
@@ -329,7 +329,7 @@ void Foam::meshRefinement::weightedSum
         meshPoints,
         sum,
         plusEqOp<Type>(),
-        pTraits<Type>::zero     // null value
+        Type(Zero)     // null value
     );
 }
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C
index a8eb5fff8c..d4f9cd36e5 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C
@@ -43,7 +43,7 @@ void Foam::snappyLayerDriver::averageNeighbours
 {
     const pointField& pts = mesh.points();
 
-    average = pTraits<Type>::zero;
+    average = Zero;
 
     forAll(edges, edgeI)
     {
@@ -77,7 +77,7 @@ void Foam::snappyLayerDriver::averageNeighbours
         meshPoints,
         average,
         plusEqOp<Type>(),
-        pTraits<Type>::zero     // null value
+        Zero     // null value
     );
 
     average *= invSumWeight;
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index 6b2f0ae692..1c55843ee2 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -1284,7 +1284,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
         new Field<Type>
         (
             srcAddress_.size(),
-            pTraits<Type>::zero
+            Zero
         )
     );
 
@@ -1329,7 +1329,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
         new Field<Type>
         (
             tgtAddress_.size(),
-            pTraits<Type>::zero
+            Zero
         )
     );
 
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
index 8b5a50e394..bfd9152ceb 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ void Foam::mappedPatchBase::distribute
                 map().constructMap(),
                 lst,
                 cop,
-                pTraits<Type>::zero
+                Type(Zero)
             );
         }
     }
@@ -126,7 +126,7 @@ void Foam::mappedPatchBase::reverseDistribute
                 map().subMap(),
                 lst,
                 cop,
-                pTraits<Type>::zero
+                Type(Zero)
             );
             break;
         }
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
index 217f1f58f3..d678ee53a8 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
@@ -75,7 +75,7 @@ Type Foam::fieldValues::cellSource::processValues
     const scalarField& weightField
 ) const
 {
-    Type result = pTraits<Type>::zero;
+    Type result = Zero;
     switch (operation_)
     {
         case opSum:
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
index ca7c997662..0cfd1f40c6 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
@@ -81,7 +81,7 @@ Foam::tmp<Foam::Field<Type>> Foam::fieldValues::faceSource::getFieldValues
                 const faceList& faces = surfacePtr_().faces();
                 tmp<Field<Type>> tavg
                 (
-                    new Field<Type>(faces.size(), pTraits<Type>::zero)
+                    new Field<Type>(faces.size(), Zero)
                 );
                 Field<Type>& avg = tavg.ref();
 
@@ -127,7 +127,7 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
     const scalarField& weightField
 ) const
 {
-    Type result = pTraits<Type>::zero;
+    Type result = Zero;
     switch (operation_)
     {
         case opSum:
@@ -148,7 +148,7 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
                 << pTraits<Type>::typeName
                 << exit(FatalError);
 
-            result = pTraits<Type>::zero;
+            result = Zero;
             break;
         }
         case opSumDirectionBalance:
@@ -159,7 +159,7 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
                 << pTraits<Type>::typeName
                 << exit(FatalError);
 
-            result = pTraits<Type>::zero;
+            result = Zero;
             break;
         }
         case opAverage:
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C
index d5067cfce6..4cc4c9aea5 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Type Foam::fieldValues::fieldValueDelta::applyOperation
     const Type& value2
 ) const
 {
-    Type result = pTraits<Type>::zero;
+    Type result = Zero;
 
     switch (operation_)
     {
@@ -89,8 +89,8 @@ void Foam::fieldValues::fieldValueDelta::processFields(bool& found)
     const dictionary& results1 = source1Ptr_->resultDict();
     const dictionary& results2 = source2Ptr_->resultDict();
 
-    Type r1(pTraits<Type>::zero);
-    Type r2(pTraits<Type>::zero);
+    Type r1(Zero);
+    Type r2(Zero);
 
     forAll(fields1, i)
     {
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C
index 89589a0c45..0a570b9872 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ Foam::calcFvcGrad::gradField(const word& gradName, const dimensionSet& dims)
                 (
                     "zero",
                     dims/dimLength,
-                    pTraits<gradType>::zero
+                    Zero
                 )
             )
         );
diff --git a/src/regionModels/regionModel/regionModel/regionModelTemplates.C b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
index 8722957966..03ef4f601e 100644
--- a/src/regionModels/regionModel/regionModel/regionModelTemplates.C
+++ b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
@@ -93,7 +93,7 @@ Foam::regionModels::regionModel::mapRegionPatchField
                 new Field<Type>
                 (
                     p.size(),
-                    pTraits<Type>::zero
+                    Zero
                 )
             );
     }
@@ -149,7 +149,7 @@ Foam::regionModels::regionModel::mapRegionPatchInternalField
                 new Field<Type>
                 (
                     p.size(),
-                    pTraits<Type>::zero
+                    Zero
                 )
             );
     }
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
index 1490e558b1..5454563cb8 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
@@ -182,7 +182,7 @@ thermalBaffle::thermalBaffle
         (
             "zero",
             dimEnergy/dimArea/dimTime,
-            pTraits<scalar>::zero
+            Zero
         )
     ),
     Q_
@@ -200,7 +200,7 @@ thermalBaffle::thermalBaffle
         (
             "zero",
             dimEnergy/dimVolume/dimTime,
-            pTraits<scalar>::zero
+            Zero
         )
     ),
     radiation_
@@ -242,7 +242,7 @@ thermalBaffle::thermalBaffle
         (
             "zero",
             dimEnergy/dimArea/dimTime,
-            pTraits<scalar>::zero
+            Zero
         )
     ),
     Q_
@@ -260,7 +260,7 @@ thermalBaffle::thermalBaffle
         (
             "zero",
             dimEnergy/dimVolume/dimTime,
-            pTraits<scalar>::zero
+            Zero
         )
     ),
     radiation_
diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C
index 958b932be5..59b1590a9d 100644
--- a/src/sampling/meshToMesh/meshToMeshTemplates.C
+++ b/src/sampling/meshToMesh/meshToMeshTemplates.C
@@ -111,7 +111,7 @@ void Foam::meshToMesh::mapSrcToTgt
 
             if (srcAddress.size())
             {
-//                result[cellI] = pTraits<Type>::zero;
+//                result[cellI] = Zero;
                 result[cellI] *= (1.0 - sum(srcWeight));
                 forAll(srcAddress, i)
                 {
@@ -131,7 +131,7 @@ void Foam::meshToMesh::mapSrcToTgt
 
             if (srcAddress.size())
             {
-//                result[cellI] = pTraits<Type>::zero;
+//                result[cellI] = Zero;
                 result[cellI] *= (1.0 - sum(srcWeight));
                 forAll(srcAddress, i)
                 {
@@ -157,7 +157,7 @@ Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapSrcToTgt
         new Field<Type>
         (
             tgtToSrcCellAddr_.size(),
-            pTraits<Type>::zero
+            Zero
         )
     );
 
@@ -276,7 +276,7 @@ Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapTgtToSrc
         new Field<Type>
         (
             srcToTgtCellAddr_.size(),
-            pTraits<Type>::zero
+            Zero
         )
     );
 
@@ -362,7 +362,7 @@ void Foam::meshToMesh::mapSrcToTgt
             tgtField.rmap(tnewTgt(), identity(tgtField.size()));
         }
 
-        tgtField == pTraits<Type>::zero;
+        tgtField == Type(Zero);
 
         AMIList[i].interpolateToTarget
         (
@@ -461,7 +461,7 @@ Foam::meshToMesh::mapSrcToTgt
             ),
             tgtMesh,
             field.dimensions(),
-            Field<Type>(tgtMesh.nCells(), pTraits<Type>::zero),
+            Field<Type>(tgtMesh.nCells(), Zero),
             tgtPatchFields
         )
     );
@@ -551,7 +551,7 @@ void Foam::meshToMesh::mapTgtToSrc
             srcField.rmap(tnewSrc(), identity(srcField.size()));
         }
 
-        srcField == pTraits<Type>::zero;
+        srcField == Type(Zero);
 
         AMIList[i].interpolateToSource
         (
@@ -650,7 +650,7 @@ Foam::meshToMesh::mapTgtToSrc
             ),
             srcMesh,
             field.dimensions(),
-            Field<Type>(srcMesh.nCells(), pTraits<Type>::zero),
+            Field<Type>(srcMesh.nCells(), Zero),
             srcPatchFields
         )
     );
diff --git a/src/sampling/meshToMesh0/meshToMesh0Templates.C b/src/sampling/meshToMesh0/meshToMesh0Templates.C
index b4805a5c98..b36d2c55d4 100644
--- a/src/sampling/meshToMesh0/meshToMesh0Templates.C
+++ b/src/sampling/meshToMesh0/meshToMesh0Templates.C
@@ -70,7 +70,7 @@ void Foam::meshToMesh0::interpolateField
         const labelList& overlapCells = adr[celli];
         const scalarList& w = weights[celli];
 
-        Type f = pTraits<Type>::zero;
+        Type f = Zero;
         forAll(overlapCells, i)
         {
             label fromCelli = overlapCells[i];
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
index c0444401db..b610d44d03 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
@@ -468,7 +468,7 @@ Foam::label Foam::isoSurface::generateFaceTriPoints
             (
                 snappedPoint[pointI] != -1
               ? snappedPoints[snappedPoint[pointI]]
-              : pTraits<Type>::zero
+              : Type(Zero)
             ),
 
             pVals[nextPointI],
@@ -477,7 +477,7 @@ Foam::label Foam::isoSurface::generateFaceTriPoints
             (
                 snappedPoint[nextPointI] != -1
               ? snappedPoints[snappedPoint[nextPointI]]
-              : pTraits<Type>::zero
+              : Type(Zero)
             ),
 
             cVals[own],
@@ -486,7 +486,7 @@ Foam::label Foam::isoSurface::generateFaceTriPoints
             (
                 snappedCc[own] != -1
               ? snappedPoints[snappedCc[own]]
-              : pTraits<Type>::zero
+              : Type(Zero)
             ),
 
             neiVal,
@@ -582,7 +582,7 @@ void Foam::isoSurface::generateTriPoints
                 (
                     snappedCc[nei[faceI]] != -1
                   ? snappedPoints[snappedCc[nei[faceI]]]
-                  : pTraits<Type>::zero
+                  : Type(Zero)
                 ),
 
                 triPoints,
@@ -594,7 +594,7 @@ void Foam::isoSurface::generateTriPoints
 
     // Determine neighbouring snap status
     boolList neiSnapped(mesh_.nFaces()-mesh_.nInternalFaces(), false);
-    List<Type> neiSnappedPoint(neiSnapped.size(), pTraits<Type>::zero);
+    List<Type> neiSnappedPoint(neiSnapped.size(), Type(Zero));
     forAll(patches, patchI)
     {
         const polyPatch& pp = patches[patchI];
@@ -680,7 +680,7 @@ void Foam::isoSurface::generateTriPoints
                             cVals.boundaryField()[patchI][i],
                             cCoords.boundaryField()[patchI][i],
                             false,
-                            pTraits<Type>::zero,
+                            Type(Zero),
 
                             triPoints,
                             triMeshCells
@@ -713,7 +713,7 @@ void Foam::isoSurface::generateTriPoints
                         cVals.boundaryField()[patchI][i],
                         cCoords.boundaryField()[patchI][i],
                         false,  // fc not snapped
-                        pTraits<Type>::zero,
+                        Type(Zero),
 
                         triPoints,
                         triMeshCells
@@ -739,7 +739,7 @@ Foam::isoSurface::interpolate
 )
 {
     // One value per point
-    tmp<Field<Type> > tvalues(new Field<Type>(nPoints, pTraits<Type>::zero));
+    tmp<Field<Type> > tvalues(new Field<Type>(nPoints, Type(Zero)));
     Field<Type>& values = tvalues.ref();
     labelList nValues(values.size(), 0);
 
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
index dcf176b56a..758c3395ed 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
@@ -49,7 +49,7 @@ bool Foam::sampledSurface::checkFieldSize(const Field<Type>& field) const
 template<class Type>
 Type Foam::sampledSurface::integrate(const Field<Type>& field) const
 {
-    Type value = pTraits<Type>::zero;
+    Type value = Zero;
 
     if (checkFieldSize(field))
     {
@@ -73,7 +73,7 @@ Type Foam::sampledSurface::integrate(const tmp<Field<Type>>& field) const
 template<class Type>
 Type Foam::sampledSurface::average(const Field<Type>& field) const
 {
-    Type value = pTraits<Type>::zero;
+    Type value = Zero;
 
     if (checkFieldSize(field))
     {
@@ -89,7 +89,7 @@ Type Foam::sampledSurface::average(const Field<Type>& field) const
     }
     else
     {
-        return pTraits<Type>::zero;
+        return Zero;
     }
 }
 
@@ -174,7 +174,7 @@ Foam::sampledSurface::pointAverage
                 false
             ),
             mesh,
-            dimensioned<Type>("zero", dimless, pTraits<Type>::zero)
+            dimensioned<Type>("zero", dimless, Zero)
         )
     );
     GeometricField<Type, fvPatchField, volMesh>& cellAvg = tcellAvg.ref();
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
index c286dde965..737ccba99b 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
@@ -56,7 +56,7 @@ Foam::sampledTriSurfaceMesh::sampleField
 
         // Create flat boundary field
 
-        Field<Type> bVals(nBnd, pTraits<Type>::zero);
+        Field<Type> bVals(nBnd, Zero);
 
         forAll(vField.boundaryField(), patchI)
         {
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
index 994f7bf467..12a730b424 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
@@ -181,7 +181,7 @@ void Foam::nastranSurfaceWriter::writeTemplate
             const DynamicList<face>& dFaces = decomposedFaces[i];
             forAll(dFaces, faceI)
             {
-                Type v = pTraits<Type>::zero;
+                Type v = Zero;
                 const face& f = dFaces[faceI];
 
                 forAll(f, fptI)
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
index f226acc91d..60301d6776 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
 
         // number of vertices for this zone
         label  nZonePoints = 0;
-        vector location(pTraits<vector>::zero);
+        vector location(Zero);
         // tensor rotation(I);
 
         // Read all info for current zone
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
index f47a642e3b..0dee7077b7 100644
--- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ void Foam::rawTopoChangerFvMesh::zeroUnmappedValues
                     false
                 ),
                 *this,
-                dimensioned<Type>("0", fld.dimensions(), pTraits<Type>::zero)
+                dimensioned<Type>("0", fld.dimensions(), Zero)
             )
         );
     }

From cfd939d4f27a6741388115aaeca3aee2159b4c48 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 23 Mar 2016 12:49:03 +0000
Subject: [PATCH 329/447] Matrices: Rename private member 'nRows_' -> 'mRows_'
 for consistency with access member function 'm()'

---
 .../Lists/CompactListList/CompactListList.C   |  28 +--
 .../Lists/CompactListList/CompactListList.H   |  16 +-
 .../Lists/CompactListList/CompactListListI.H  |  24 +-
 .../containers/Lists/ListOps/ListOps.H        |   8 +-
 .../Lists/ListOps/ListOpsTemplates.C          |  12 +-
 .../matrices/LUscalarMatrix/LUscalarMatrix.C  |   6 +-
 .../primitives/MatrixSpace/MatrixSpace.H      |  24 +-
 .../primitives/MatrixSpace/MatrixSpaceI.H     | 232 +++++++++---------
 .../primitives/VectorSpace/VectorSpace.H      |   2 +-
 9 files changed, 176 insertions(+), 176 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 4cdf0ac325..f2ad0802b0 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
@@ -125,23 +125,23 @@ Foam::CompactListList<T, Container>::CompactListList
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T, class Container>
-void Foam::CompactListList<T, Container>::setSize(const label nRows)
+void Foam::CompactListList<T, Container>::setSize(const label mRows)
 {
-    if (nRows == 0)
+    if (mRows == 0)
     {
         clear();
     }
-    if (nRows < size())
+    if (mRows < size())
     {
-        size_ = nRows;
-        offsets_.setSize(nRows+1);
-        m_.setSize(offsets_[nRows]);
+        size_ = mRows;
+        offsets_.setSize(mRows+1);
+        m_.setSize(offsets_[mRows]);
     }
-    else if (nRows > size())
+    else if (mRows > size())
     {
         FatalErrorInFunction
             << "Cannot be used to extend the list from " << offsets_.size()
-            << " to " << nRows << nl
+            << " to " << mRows << nl
             << "    Please use one of the other setSize member functions"
             << abort(FatalError);
     }
@@ -151,12 +151,12 @@ void Foam::CompactListList<T, Container>::setSize(const label nRows)
 template<class T, class Container>
 void Foam::CompactListList<T, Container>::setSize
 (
-    const label nRows,
+    const label mRows,
     const label nData
 )
 {
-    size_ = nRows;
-    offsets_.setSize(nRows+1);
+    size_ = mRows;
+    offsets_.setSize(mRows+1);
     m_.setSize(nData);
 }
 
@@ -164,13 +164,13 @@ void Foam::CompactListList<T, Container>::setSize
 template<class T, class Container>
 void Foam::CompactListList<T, Container>::setSize
 (
-    const label nRows,
+    const label mRows,
     const label nData,
     const T& t
 )
 {
-    size_ = nRows;
-    offsets_.setSize(nRows+1);
+    size_ = mRows;
+    offsets_.setSize(mRows+1);
     m_.setSize(nData, t);
 }
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index d5764ba08d..fcb7ea2ba5 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -107,11 +107,11 @@ public:
 
         //- Construct given size of offset table (number of rows)
         //  and number of data.
-        inline CompactListList(const label nRows, const label nData);
+        inline CompactListList(const label mRows, const label nData);
 
         //- Construct given size of offset table (number of rows),
         //  the number of data and a value for all elements.
-        inline CompactListList(const label nRows, const label nData, const T&);
+        inline CompactListList(const label mRows, const label nData, const T&);
 
         //- Construct given list of row-sizes.
         explicit CompactListList(const labelUList& rowSizes);
@@ -159,26 +159,26 @@ public:
 
             //- Reset size of CompactListList.
             //  This form only allows contraction of the CompactListList.
-            void setSize(const label nRows);
+            void setSize(const label mRows);
 
             //- Reset size of CompactListList.
-            void setSize(const label nRows, const label nData);
+            void setSize(const label mRows, const label nData);
 
             //- Reset sizes of CompactListList and value for new elements.
-            void setSize(const label nRows, const label nData, const T&);
+            void setSize(const label mRows, const label nData, const T&);
 
             //- Reset size of CompactListList.
             void setSize(const labelUList& rowSizes);
 
             //- Reset size of CompactListList.
             //  This form only allows contraction of the CompactListList.
-            inline void resize(const label nRows);
+            inline void resize(const label mRows);
 
             //- Reset size of CompactListList.
-            inline void resize(const label nRows, const label nData);
+            inline void resize(const label mRows, const label nData);
 
             //- Reset sizes of CompactListList and value for new elements.
-            inline void resize(const label nRows, const label nData, const T&);
+            inline void resize(const label mRows, const label nData, const T&);
 
             //- Reset size of CompactListList.
             inline void resize(const labelUList& rowSizes);
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
index 4abf848915..2072887cc5 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
@@ -38,12 +38,12 @@ inline Foam::CompactListList<T, Container>::CompactListList()
 template<class T, class Container>
 inline Foam::CompactListList<T, Container>::CompactListList
 (
-    const label nRows,
+    const label mRows,
     const label nData
 )
 :
-    size_(nRows),
-    offsets_(nRows+1, 0),
+    size_(mRows),
+    offsets_(mRows+1, 0),
     m_(nData)
 {}
 
@@ -51,13 +51,13 @@ inline Foam::CompactListList<T, Container>::CompactListList
 template<class T, class Container>
 inline Foam::CompactListList<T, Container>::CompactListList
 (
-    const label nRows,
+    const label mRows,
     const label nData,
     const T& t
 )
 :
-    size_(nRows),
-    offsets_(nRows+1, 0),
+    size_(mRows),
+    offsets_(mRows+1, 0),
     m_(nData, t)
 {}
 
@@ -173,32 +173,32 @@ Foam::CompactListList<T, Container>::xfer()
 
 
 template<class T, class Container>
-inline void Foam::CompactListList<T, Container>::resize(const label nRows)
+inline void Foam::CompactListList<T, Container>::resize(const label mRows)
 {
-    this->setSize(nRows);
+    this->setSize(mRows);
 }
 
 
 template<class T, class Container>
 inline void Foam::CompactListList<T, Container>::resize
 (
-    const label nRows,
+    const label mRows,
     const label nData
 )
 {
-    this->setSize(nRows, nData);
+    this->setSize(mRows, nData);
 }
 
 
 template<class T, class Container>
 inline void Foam::CompactListList<T, Container>::resize
 (
-    const label nRows,
+    const label mRows,
     const label nData,
     const T& t
 )
 {
-    this->setSize(nRows, nData, t);
+    this->setSize(mRows, nData, t);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index 82be15ee5a..ee93041791 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -244,14 +244,14 @@ label findLower
 
 //- To construct a List from a C array. Has extra Container type
 //  to initialise e.g. wordList from arrays of char*.
-template<class Container, class T, int nRows>
-List<Container> initList(const T[nRows]);
+template<class Container, class T, int mRows>
+List<Container> initList(const T[mRows]);
 
 
 //- To construct a (square) ListList from a C array. Has extra Container type
 //  to initialise e.g. faceList from arrays of labels.
-template<class Container, class T, int nRows, int nColumns>
-List<Container> initListList(const T[nRows][nColumns]);
+template<class Container, class T, int mRows, int nColumns>
+List<Container> initListList(const T[mRows][nColumns]);
 
 
 //- Helper class for list to append y onto the end of x
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 7194a89eb7..bb20707a77 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -687,10 +687,10 @@ Foam::label Foam::findLower
 }
 
 
-template<class Container, class T, int nRows>
-Foam::List<Container> Foam::initList(const T elems[nRows])
+template<class Container, class T, int mRows>
+Foam::List<Container> Foam::initList(const T elems[mRows])
 {
-    List<Container> lst(nRows);
+    List<Container> lst(mRows);
 
     forAll(lst, rowI)
     {
@@ -700,10 +700,10 @@ Foam::List<Container> Foam::initList(const T elems[nRows])
 }
 
 
-template<class Container, class T, int nRows, int nColumns>
-Foam::List<Container> Foam::initListList(const T elems[nRows][nColumns])
+template<class Container, class T, int mRows, int nColumns>
+Foam::List<Container> Foam::initListList(const T elems[mRows][nColumns])
 {
-    List<Container> lst(nRows);
+    List<Container> lst(mRows);
 
     Container cols(nColumns);
     forAll(lst, rowI)
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
index 5c811d20c3..5a4076633d 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
@@ -144,13 +144,13 @@ Foam::LUscalarMatrix::LUscalarMatrix
 
     if (Pstream::master(comm_))
     {
-        label nRows = m();
+        label mRows = m();
         label nColumns = n();
 
         if (debug)
         {
-            Pout<< "LUscalarMatrix : size:" << nRows << endl;
-            for (label rowI = 0; rowI < nRows; rowI++)
+            Pout<< "LUscalarMatrix : size:" << mRows << endl;
+            for (label rowI = 0; rowI < mRows; rowI++)
             {
                 const scalar* row = operator[](rowI);
 
diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
index d93310ed26..8fa5397c2d 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
@@ -52,21 +52,21 @@ namespace Foam
                          Class MatrixSpace Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Form, class Cmpt, direction Nrows, direction Ncols>
+template<class Form, class Cmpt, direction Mrows, direction Ncols>
 class MatrixSpace
 :
-    public VectorSpace<Form, Cmpt, Nrows*Ncols>
+    public VectorSpace<Form, Cmpt, Mrows*Ncols>
 {
 
 public:
 
     //- MatrixSpace type
-    typedef MatrixSpace<Form, Cmpt, Nrows, Ncols> msType;
+    typedef MatrixSpace<Form, Cmpt, Mrows, Ncols> msType;
 
 
     // Member constants
 
-        static const direction nRows = Nrows;
+        static const direction mRows = Mrows;
         static const direction nCols = Ncols;
 
 
@@ -75,7 +75,7 @@ public:
         //- Return the number of rows
         static direction m()
         {
-            return Nrows;
+            return Mrows;
         }
 
         //- Return the number of columns
@@ -99,13 +99,13 @@ public:
 
         public:
 
-            static const direction nRows = SubTensor::nRows;
+            static const direction mRows = SubTensor::mRows;
             static const direction nCols = SubTensor::nCols;
 
             //- Return the number of rows in the block
             static direction m()
             {
-                return nRows;
+                return mRows;
             }
 
             //- Return the number of columns in the block
@@ -143,13 +143,13 @@ public:
 
         public:
 
-            static const direction nRows = SubTensor::nRows;
+            static const direction mRows = SubTensor::mRows;
             static const direction nCols = SubTensor::nCols;
 
             //- Return the number of rows in the block
             static direction m()
             {
-                return nRows;
+                return mRows;
             }
 
             //- Return the number of columns in the block
@@ -169,7 +169,7 @@ public:
                 <
                     Form2,
                     Cmpt,
-                    SubTensor::nRows,
+                    SubTensor::mRows,
                     SubTensor::nCols
                 >& matrix
             );
@@ -178,7 +178,7 @@ public:
             template<class VSForm>
             inline void operator=
             (
-                const VectorSpace<VSForm, Cmpt, SubTensor::nRows>& v
+                const VectorSpace<VSForm, Cmpt, SubTensor::mRows>& v
             );
 
             //- Construct and return the sub-ensor corresponding to this block
@@ -208,7 +208,7 @@ public:
         template<class Form2, class Cmpt2>
         inline explicit MatrixSpace
         (
-            const VectorSpace<Form2, Cmpt2, Nrows*Ncols>&
+            const VectorSpace<Form2, Cmpt2, Mrows*Ncols>&
         );
 
         //- Construct from a block of another matrix space
diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
index e7ae70ec6b..2aa3a4d52b 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
@@ -27,13 +27,13 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::MatrixSpace()
 {}
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::MatrixSpace
 (
     const Foam::zero
 )
@@ -42,30 +42,30 @@ inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace
 {}
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<class Form2, class Cmpt2>
-inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace
+inline Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::MatrixSpace
 (
-    const VectorSpace<Form2, Cmpt2, Nrows*Ncols>& vs
+    const VectorSpace<Form2, Cmpt2, Mrows*Ncols>& vs
 )
 :
     MatrixSpace::vsType(vs)
 {}
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template
 <
     template<class, Foam::direction, Foam::direction> class Block2,
     Foam::direction BRowStart,
     Foam::direction BColStart
 >
-inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace
+inline Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::MatrixSpace
 (
     const Block2<Form, BRowStart, BColStart>& block
 )
 {
-    for (direction i=0; i<Nrows; ++i)
+    for (direction i=0; i<Mrows; ++i)
     {
         for (direction j=0; j<Ncols; ++j)
         {
@@ -75,188 +75,188 @@ inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::MatrixSpace(Istream& is)
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::MatrixSpace(Istream& is)
 :
     MatrixSpace::vsType(is)
 {}
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
-inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+inline Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::
 ConstBlock<SubTensor, BRowStart, BColStart>::
 ConstBlock(const msType& matrix)
 :
     matrix_(matrix)
 {
-    StaticAssert(msType::nRows >= BRowStart + nRows);
+    StaticAssert(msType::mRows >= BRowStart + mRows);
     StaticAssert(msType::nCols >= BColStart + nCols);
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
-inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+inline Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::
 Block<SubTensor, BRowStart, BColStart>::
 Block(msType& matrix)
 :
     matrix_(matrix)
 {
-    StaticAssert(msType::nRows >= BRowStart + nRows);
+    StaticAssert(msType::mRows >= BRowStart + mRows);
     StaticAssert(msType::nCols >= BColStart + nCols);
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<Foam::direction Row, Foam::direction Col>
-inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::elmt() const
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::elmt() const
 {
-    StaticAssert(Row < Nrows && Col < Ncols);
+    StaticAssert(Row < Mrows && Col < Ncols);
     return this->v_[Row*Ncols + Col];
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<Foam::direction Row, Foam::direction Col>
-inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::elmt()
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::elmt()
 {
-    StaticAssert(Row < Nrows && Col < Ncols);
+    StaticAssert(Row < Mrows && Col < Ncols);
     return this->v_[Row*Ncols + Col];
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xx() const
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::xx() const
 {
     return elmt<0, 0>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xx()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::xx()
 {
     return elmt<0, 0>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xy() const
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::xy() const
 {
     return elmt<0,1>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xy()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::xy()
 {
     return elmt<0,1>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xz() const
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::xz() const
 {
     return elmt<0,2>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::xz()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::xz()
 {
     return elmt<0,2>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yx() const
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::yx() const
 {
     return elmt<1,0>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yx()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::yx()
 {
     return elmt<1,0>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yy() const
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::yy() const
 {
     return elmt<1,1>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yy()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::yy()
 {
     return elmt<1,1>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yz() const
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::yz() const
 {
     return elmt<1,2>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::yz()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::yz()
 {
     return elmt<1,2>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zx() const
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::zx() const
 {
     return elmt<2,0>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zx()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::zx()
 {
     return elmt<2,0>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zy() const
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::zy() const
 {
     return elmt<2,1>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zy()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::zy()
 {
     return elmt<2,1>();
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zz() const
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::zz() const
 {
     return elmt<2,2>();
 }
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::zz()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::zz()
 {
     return elmt<2,2>();
 }
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>
-Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::identity()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::identity()
 {
-    StaticAssert(Nrows == Ncols);
+    StaticAssert(Mrows == Ncols);
     msType result(Zero);
 
     for (direction i=0; i<Ncols; ++i)
@@ -268,13 +268,13 @@ Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::identity()
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 inline typename Foam::typeOfTranspose<Cmpt, Form>::type
-Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::T() const
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::T() const
 {
     typename typeOfTranspose<Cmpt, Form>::type result;
 
-    for (direction i=0; i<Nrows; ++i)
+    for (direction i=0; i<Mrows; ++i)
     {
         for (direction j=0; j<Ncols; ++j)
         {
@@ -286,22 +286,22 @@ Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::T() const
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template
 <
     class SubTensor,
     Foam::direction BRowStart,
     Foam::direction BColStart
 >
-inline typename Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::template
+inline typename Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::template
     ConstBlock<SubTensor, BRowStart, BColStart>
-Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::block() const
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::block() const
 {
     return *this;
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template
 <
     class SubTensor,
@@ -309,9 +309,9 @@ template
     Foam::direction BColStart
 >
 inline
-typename Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::template
+typename Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::template
     Block<SubTensor, BRowStart, BColStart>
-Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::block()
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::block()
 {
     return *this;
 }
@@ -319,15 +319,15 @@ Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::block()
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::operator()
 (
     const direction& i,
     const direction& j
 ) const
 {
     #ifdef FULLDEBUG
-    if (i > Nrows-1 || j > Ncols-1)
+    if (i > Mrows-1 || j > Ncols-1)
     {
         FatalErrorInFunction
             << "indices out of range"
@@ -339,15 +339,15 @@ inline const Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::operator()
 (
     const direction& i,
     const direction& j
 )
 {
     #ifdef FULLDEBUG
-    if (i > Nrows-1 || j > Ncols-1)
+    if (i > Mrows-1 || j > Ncols-1)
     {
         FatalErrorInFunction
             << "indices out of range"
@@ -359,10 +359,10 @@ inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator()
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
 inline SubTensor
-Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::
 ConstBlock<SubTensor, BRowStart, BColStart>::
 operator()() const
 {
@@ -370,10 +370,10 @@ operator()() const
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
 inline const Cmpt&
-Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::
 ConstBlock<SubTensor, BRowStart, BColStart>::
 operator()(const direction i, const direction j) const
 {
@@ -381,10 +381,10 @@ operator()(const direction i, const direction j) const
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
 inline SubTensor
-Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::
 Block<SubTensor, BRowStart, BColStart>::
 operator()() const
 {
@@ -392,10 +392,10 @@ operator()() const
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
 inline const Cmpt&
-Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::
 Block<SubTensor, BRowStart, BColStart>::
 operator()(const direction i, const direction j) const
 {
@@ -403,10 +403,10 @@ operator()(const direction i, const direction j) const
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
 inline Cmpt&
-Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::
 Block<SubTensor, BRowStart, BColStart>::
 operator()(const direction i, const direction j)
 {
@@ -414,8 +414,8 @@ operator()(const direction i, const direction j)
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
-inline void Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator=
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
+inline void Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::operator=
 (
     const Foam::zero
 )
@@ -424,9 +424,9 @@ inline void Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator=
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<class Form2>
-inline void Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator&=
+inline void Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::operator&=
 (
     const MatrixSpace<Form, Cmpt, Ncols, Ncols>& matrix
 )
@@ -435,19 +435,19 @@ inline void Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator&=
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template
 <
     template<class, Foam::direction, Foam::direction> class Block2,
     Foam::direction BRowStart,
     Foam::direction BColStart
 >
-inline void Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator=
+inline void Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::operator=
 (
     const Block2<Form, BRowStart, BColStart>& block
 )
 {
-    for (direction i = 0; i < Nrows; ++i)
+    for (direction i = 0; i < Mrows; ++i)
     {
         for (direction j = 0; j < Ncols; ++j)
         {
@@ -457,18 +457,18 @@ inline void Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::operator=
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
 template<class Form2>
 inline void
-Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::
 Block<SubTensor, BRowStart, BColStart>::
 operator=
 (
-    const MatrixSpace<Form2, Cmpt, SubTensor::nRows, SubTensor::nCols>& matrix
+    const MatrixSpace<Form2, Cmpt, SubTensor::mRows, SubTensor::nCols>& matrix
 )
 {
-    for (direction i=0; i<nRows; ++i)
+    for (direction i=0; i<mRows; ++i)
     {
         for (direction j=0; j<nCols; ++j)
         {
@@ -478,20 +478,20 @@ operator=
 }
 
 
-template<class Form, class Cmpt, Foam::direction Nrows, Foam::direction Ncols>
+template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 template<class SubTensor, Foam::direction BRowStart, Foam::direction BColStart>
 template<class VSForm>
 inline void
-Foam::MatrixSpace<Form, Cmpt, Nrows, Ncols>::
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::
 Block<SubTensor, BRowStart, BColStart>::
 operator=
 (
-    const VectorSpace<VSForm, Cmpt, SubTensor::nRows>& v
+    const VectorSpace<VSForm, Cmpt, SubTensor::mRows>& v
 )
 {
     StaticAssert(nCols == 1);
 
-    for (direction i=0; i<SubTensor::nRows; ++i)
+    for (direction i=0; i<SubTensor::mRows; ++i)
     {
         operator()(i,0) = v[i];
     }
@@ -505,10 +505,10 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
 
-template<class Form, class Cmpt, direction Nrows, direction Ncols>
+template<class Form, class Cmpt, direction Mrows, direction Ncols>
 inline typename typeOfTranspose<Cmpt, Form>::type T
 (
-    const MatrixSpace<Form, Cmpt, Ncols, Nrows>& matrix
+    const MatrixSpace<Form, Cmpt, Ncols, Mrows>& matrix
 )
 {
     return matrix.T();
@@ -539,26 +539,26 @@ template
     class Form1,
     class Form2,
     class Cmpt,
-    direction Nrows1,
+    direction Mrows1,
     direction Ncols1,
-    direction Nrows2,
+    direction Mrows2,
     direction Ncols2
 >
 inline typename typeOfInnerProduct<Cmpt, Form1, Form2>::type operator&
 (
-    const MatrixSpace<Form1, Cmpt, Nrows1, Ncols1>& matrix1,
-    const MatrixSpace<Form2, Cmpt, Nrows2, Ncols2>& matrix2
+    const MatrixSpace<Form1, Cmpt, Mrows1, Ncols1>& matrix1,
+    const MatrixSpace<Form2, Cmpt, Mrows2, Ncols2>& matrix2
 )
 {
-    StaticAssert(Ncols1 == Nrows2);
+    StaticAssert(Ncols1 == Mrows2);
 
     typename typeOfInnerProduct<Cmpt, Form1, Form2>::type result(Zero);
 
-    for (direction i=0; i<Nrows1; ++i)
+    for (direction i=0; i<Mrows1; ++i)
     {
         for (direction j=0; j<Ncols2; ++j)
         {
-            for (direction k=0; k<Nrows2; k++)
+            for (direction k=0; k<Mrows2; k++)
             {
                 result(i, j) += matrix1(i, k)*matrix2(k, j);
             }
@@ -569,16 +569,16 @@ inline typename typeOfInnerProduct<Cmpt, Form1, Form2>::type operator&
 }
 
 
-template<class Form, class VSForm, class Cmpt, direction Nrows, direction Ncols>
+template<class Form, class VSForm, class Cmpt, direction Mrows, direction Ncols>
 inline typename typeOfInnerProduct<Cmpt, Form, VSForm>::type operator&
 (
-    const MatrixSpace<Form, Cmpt, Nrows, Ncols>& matrix,
+    const MatrixSpace<Form, Cmpt, Mrows, Ncols>& matrix,
     const VectorSpace<VSForm, Cmpt, Ncols>& v
 )
 {
     typename typeOfInnerProduct<Cmpt, Form, VSForm>::type result(Zero);
 
-    for (direction i=0; i<Nrows; ++i)
+    for (direction i=0; i<Mrows; ++i)
     {
         for (direction j=0; j<Ncols; ++j)
         {
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index 2aa3a1d74d..940294b8e7 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -100,7 +100,7 @@ public:
         // VectorSpace currently defaults to a column-vector
         // This will be removed when column-vector is introduced
         // as a specialization
-        static const direction nRows = Ncmpts;
+        static const direction mRows = Ncmpts;
         static const direction nCols = 1;
 
 

From 878866b16e432faa3febb0bfd0f3f82534b51d39 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 23 Mar 2016 12:50:34 +0000
Subject: [PATCH 330/447] MatrixBlock: Separate Matrix::Block into the separate
 class MatrixBlock

This avoids serious problems with template parameter deduction when
manipulating blocks of different matrix types e.g. Square and
Rectangular.
---
 src/OpenFOAM/matrices/Matrix/Matrix.C         | 582 +++++++-----------
 src/OpenFOAM/matrices/Matrix/Matrix.H         | 214 ++-----
 src/OpenFOAM/matrices/Matrix/MatrixI.H        | 220 +------
 src/OpenFOAM/matrices/Matrix/MatrixIO.C       |   8 +-
 .../matrices/MatrixBlock/MatrixBlock.C        | 342 ++++++++++
 .../matrices/MatrixBlock/MatrixBlock.H        | 240 ++++++++
 .../matrices/MatrixBlock/MatrixBlockI.H       | 203 ++++++
 7 files changed, 1070 insertions(+), 739 deletions(-)
 create mode 100644 src/OpenFOAM/matrices/MatrixBlock/MatrixBlock.C
 create mode 100644 src/OpenFOAM/matrices/MatrixBlock/MatrixBlock.H
 create mode 100644 src/OpenFOAM/matrices/MatrixBlock/MatrixBlockI.H

diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index 808e00b86c..46508d8e3f 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -30,7 +30,7 @@ License
 template<class Form, class Type>
 void Foam::Matrix<Form, Type>::allocate()
 {
-    if (nRows_ && nCols_)
+    if (mRows_ && nCols_)
     {
         v_ = new Type[size()];
     }
@@ -42,14 +42,14 @@ void Foam::Matrix<Form, Type>::allocate()
 template<class Form, class Type>
 Foam::Matrix<Form, Type>::Matrix(const label m, const label n)
 :
-    nRows_(m),
+    mRows_(m),
     nCols_(n),
     v_(NULL)
 {
-    if (nRows_ < 0 || nCols_ < 0)
+    if (mRows_ < 0 || nCols_ < 0)
     {
         FatalErrorInFunction
-            << "Bad m, n " << nRows_ << ", " << nCols_
+            << "Incorrect m, n " << mRows_ << ", " << nCols_
             << abort(FatalError);
     }
 
@@ -60,14 +60,14 @@ Foam::Matrix<Form, Type>::Matrix(const label m, const label n)
 template<class Form, class Type>
 Foam::Matrix<Form, Type>::Matrix(const label m, const label n, const zero)
 :
-    nRows_(m),
+    mRows_(m),
     nCols_(n),
     v_(NULL)
 {
-    if (nRows_ < 0 || nCols_ < 0)
+    if (mRows_ < 0 || nCols_ < 0)
     {
         FatalErrorInFunction
-            << "Bad m, n " << nRows_ << ", " << nCols_
+            << "Incorrect m, n " << mRows_ << ", " << nCols_
             << abort(FatalError);
     }
 
@@ -85,16 +85,16 @@ Foam::Matrix<Form, Type>::Matrix(const label m, const label n, const zero)
 
 
 template<class Form, class Type>
-Foam::Matrix<Form, Type>::Matrix(const label m, const label n, const Type& a)
+Foam::Matrix<Form, Type>::Matrix(const label m, const label n, const Type& s)
 :
-    nRows_(m),
+    mRows_(m),
     nCols_(n),
     v_(NULL)
 {
-    if (nRows_ < 0 || nCols_ < 0)
+    if (mRows_ < 0 || nCols_ < 0)
     {
         FatalErrorInFunction
-            << "Bad m, n " << nRows_ << ", " << nCols_
+            << "Incorrect m, n " << mRows_ << ", " << nCols_
             << abort(FatalError);
     }
 
@@ -105,45 +105,92 @@ Foam::Matrix<Form, Type>::Matrix(const label m, const label n, const Type& a)
         const label mn = size();
         for (label i=0; i<mn; i++)
         {
-            v_[i] = a;
+            v_[i] = s;
         }
     }
 }
 
 
 template<class Form, class Type>
-inline Foam::Matrix<Form, Type>::Matrix(const mType::Block& block)
+Foam::Matrix<Form, Type>::Matrix(const Matrix<Form, Type>& M)
 :
-    nRows_(block.m()),
-    nCols_(block.n())
-{
-    allocate();
-
-    for (label i=0; i<nRows_; i++)
-    {
-        for (label j=0; j<nCols_; j++)
-        {
-            (*this)(i,j) = block(i,j);
-        }
-    }
-}
-
-
-template<class Form, class Type>
-Foam::Matrix<Form, Type>::Matrix(const Matrix<Form, Type>& a)
-:
-    nRows_(a.nRows_),
-    nCols_(a.nCols_),
+    mRows_(M.mRows_),
+    nCols_(M.nCols_),
     v_(NULL)
 {
-    if (a.v_)
+    if (M.v_)
     {
         allocate();
 
         const label mn = size();
         for (label i=0; i<mn; i++)
         {
-            v_[i] = a.v_[i];
+            v_[i] = M.v_[i];
+        }
+    }
+}
+
+
+template<class Form, class Type>
+template<class Form2>
+Foam::Matrix<Form, Type>::Matrix(const Matrix<Form2, Type>& M)
+:
+    mRows_(M.m()),
+    nCols_(M.n()),
+    v_(NULL)
+{
+    if (M.v())
+    {
+        allocate();
+
+        const label mn = size();
+        for (label i=0; i<mn; i++)
+        {
+            v_[i] = M.v()[i];
+        }
+    }
+}
+
+
+template<class Form, class Type>
+template<class MatrixType>
+inline Foam::Matrix<Form, Type>::Matrix
+(
+    const ConstMatrixBlock<MatrixType>& Mb
+)
+:
+    mRows_(Mb.m()),
+    nCols_(Mb.n())
+{
+    allocate();
+
+    for (label i=0; i<mRows_; i++)
+    {
+        for (label j=0; j<nCols_; j++)
+        {
+            (*this)(i,j) = Mb(i,j);
+        }
+    }
+}
+
+
+template<class Form, class Type>
+template<class MatrixType>
+inline Foam::Matrix<Form, Type>::Matrix
+(
+    const MatrixBlock<MatrixType>& Mb
+)
+:
+    mRows_(Mb.m()),
+    nCols_(Mb.n())
+{
+    allocate();
+
+    for (label i=0; i<mRows_; i++)
+    {
+        for (label j=0; j<nCols_; j++)
+        {
+            (*this)(i,j) = Mb(i,j);
         }
     }
 }
@@ -172,24 +219,24 @@ void Foam::Matrix<Form, Type>::clear()
         v_ = NULL;
     }
 
-    nRows_ = 0;
+    mRows_ = 0;
     nCols_ = 0;
 }
 
 
 template<class Form, class Type>
-void Foam::Matrix<Form, Type>::transfer(Matrix<Form, Type>& a)
+void Foam::Matrix<Form, Type>::transfer(Matrix<Form, Type>& M)
 {
     clear();
 
-    nRows_ = a.nRows_;
-    a.nRows_ = 0;
+    mRows_ = M.mRows_;
+    M.mRows_ = 0;
 
-    nCols_ = a.nCols_;
-    a.nCols_ = 0;
+    nCols_ = M.nCols_;
+    M.nCols_ = 0;
 
-    v_ = a.v_;
-    a.v_ = NULL;
+    v_ = M.v_;
+    M.v_ = NULL;
 }
 
 
@@ -198,7 +245,7 @@ void Foam::Matrix<Form, Type>::setSize(const label m, const label n)
 {
     mType newMatrix(m, n, Zero);
 
-    label minM = min(m, nRows_);
+    label minM = min(m, mRows_);
     label minN = min(n, nCols_);
 
     for (label i=0; i<minM; i++)
@@ -231,65 +278,23 @@ Form Foam::Matrix<Form, Type>::T() const
 }
 
 
-template<class Form, class Type>
-Foam::Matrix<Form, Type>::ConstBlock::operator Field<cmptType>() const
-{
-    if (nCols_ != 1)
-    {
-        FatalErrorInFunction
-            << "Number of columns " << nCols_ << " != 1"
-            << abort(FatalError);
-    }
-
-    Field<cmptType> f(nRows_);
-
-    forAll(f, i)
-    {
-        f[i] = operator()(i, 0);
-    }
-
-    return f;
-}
-
-
-template<class Form, class Type>
-Foam::Matrix<Form, Type>::Block::operator Field<cmptType>() const
-{
-    if (nCols_ != 1)
-    {
-        FatalErrorInFunction
-            << "Number of columns " << nCols_ << " != 1"
-            << abort(FatalError);
-    }
-
-    Field<cmptType> f(nRows_);
-
-    forAll(f, i)
-    {
-        f[i] = operator()(i, 0);
-    }
-
-    return f;
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Form, class Type>
-void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
+void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& M)
 {
-    if (this == &a)
+    if (this == &M)
     {
         FatalErrorInFunction
             << "Attempted assignment to self"
             << abort(FatalError);
     }
 
-    if (nRows_ != a.nRows_ || nCols_ != a.nCols_)
+    if (mRows_ != M.mRows_ || nCols_ != M.nCols_)
     {
         clear();
-        nRows_ = a.nRows_;
-        nCols_ = a.nCols_;
+        mRows_ = M.mRows_;
+        nCols_ = M.nCols_;
         allocate();
     }
 
@@ -298,106 +303,55 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
         const label mn = size();
         for (label i=0; i<mn; i++)
         {
-            v_[i] = a.v_[i];
+            v_[i] = M.v_[i];
         }
     }
 }
 
 
 template<class Form, class Type>
-void Foam::Matrix<Form, Type>::operator=(const mType::Block& block)
+template<class MatrixType>
+void Foam::Matrix<Form, Type>::operator=
+(
+    const ConstMatrixBlock<MatrixType>& Mb
+)
 {
-    for (label i=0; i<nRows_; i++)
+    for (label i=0; i<mRows_; i++)
     {
         for (label j=0; j<nCols_; j++)
         {
-            (*this)(i,j) = block(i,j);
+            (*this)(i,j) = Mb(i,j);
         }
     }
 }
 
 
 template<class Form, class Type>
-void Foam::Matrix<Form, Type>::Block::operator=(const Block& block)
+template<class MatrixType>
+void Foam::Matrix<Form, Type>::operator=
+(
+    const MatrixBlock<MatrixType>& Mb
+)
 {
-    if (this != &block)
-    {
-        if (nRows_ != block.m() || nCols_ != block.n())
-        {
-            FatalErrorInFunction
-                << "Attempt to assign blocks of different sizes: "
-                << nRows_ << "x" << nCols_ << " != "
-                << block.m() << "x" << block.n()
-                << abort(FatalError);
-        }
-
-        for (label i=0; i<nRows_; i++)
-        {
-            for (label j=0; j<nCols_; j++)
-            {
-                (*this)(i, j) = block(i, j);
-            }
-        }
-    }
-}
-
-
-template<class Form, class Type>
-void Foam::Matrix<Form, Type>::Block::operator=(const ConstBlock& block)
-{
-    if (this != &block)
-    {
-        if (nRows_ != block.m() || nCols_ != block.n())
-        {
-            FatalErrorInFunction
-                << "Attempt to assign blocks of different sizes: "
-                << nRows_ << "x" << nCols_ << " != "
-                << block.m() << "x" << block.n()
-                << abort(FatalError);
-        }
-
-        for (label i=0; i<nRows_; i++)
-        {
-            for (label j=0; j<nCols_; j++)
-            {
-                (*this)(i, j) = block(i, j);
-            }
-        }
-    }
-}
-
-
-template<class Form, class Type>
-void Foam::Matrix<Form, Type>::Block::operator=(const mType& block)
-{
-    if (nRows_ != block.m() || nCols_ != block.n())
-    {
-        FatalErrorInFunction
-            << "Attempt to assign blocks of different sizes: "
-            << nRows_ << "x" << nCols_ << " != "
-            << block.m() << "x" << block.n()
-            << abort(FatalError);
-    }
-
-    for (label i=0; i<nRows_; i++)
+    for (label i=0; i<mRows_; i++)
     {
         for (label j=0; j<nCols_; j++)
         {
-            (*this)(i, j) = block(i, j);
+            (*this)(i,j) = Mb(i,j);
         }
     }
 }
 
 
 template<class Form, class Type>
-void Foam::Matrix<Form, Type>::operator=(const Type& t)
+void Foam::Matrix<Form, Type>::operator=(const Type& s)
 {
     if (v_)
     {
         const label mn = size();
         for (label i=0; i<mn; i++)
         {
-            v_[i] = t;
+            v_[i] = s;
         }
     }
 }
@@ -417,155 +371,27 @@ void Foam::Matrix<Form, Type>::operator=(const zero)
 }
 
 
-template<class Form, class Type>
-template
-<
-    template<class, Foam::direction, Foam::direction> class MSBlock,
-    class SubTensor,
-    Foam::direction BRowStart,
-    Foam::direction BColStart
->
-void Foam::Matrix<Form, Type>::Block::operator=
-(
-    const MSBlock<SubTensor, BRowStart, BColStart>& block
-)
-{
-    if (nRows_ != block.nRows || nCols_ != block.nCols)
-    {
-        FatalErrorInFunction
-            << "Attempt to assign blocks of different sizes: "
-            << nRows_ << "x" << nCols_ << " != "
-            << block.nRows << "x" << block.nCols
-            << abort(FatalError);
-    }
-
-    for (direction i=0; i<nRows_; ++i)
-    {
-        for (direction j=0; j<nCols_; ++j)
-        {
-            operator()(i, j) = block(i, j);
-        }
-    }
-}
-
-
-template<class Form, class Type>
-template
-<
-    template<class, Foam::direction> class VSBlock,
-    class SubVector,
-    Foam::direction BStart
->
-void Foam::Matrix<Form, Type>::Block::operator=
-(
-    const VSBlock<SubVector, BStart>& block
-)
-{
-    if (nRows_ != block.nComponents || nCols_ != 1)
-    {
-        FatalErrorInFunction
-            << "Attempt to assign blocks of different sizes: "
-            << nRows_ << "x" << nCols_ << " != "
-            << block.nComponents << "x" << 1
-            << abort(FatalError);
-    }
-
-    for (direction i=0; i<nRows_; ++i)
-    {
-        operator()(i, 0) = block[i];
-    }
-}
-
-
-template<class Form, class Type>
-template<class MSForm, Foam::direction Nrows, Foam::direction Ncols>
-void Foam::Matrix<Form, Type>::Block::operator=
-(
-    const MatrixSpace<MSForm, cmptType, Nrows, Ncols>& ms
-)
-{
-    if (nRows_ != Nrows || nCols_ != Ncols)
-    {
-        FatalErrorInFunction
-            << "Attempt to assign blocks of different sizes: "
-            << nRows_ << "x" << nCols_ << " != "
-            << Nrows << "x" << Ncols
-            << abort(FatalError);
-    }
-
-    for (label i=0; i<nRows_; i++)
-    {
-        for (label j=0; j<nCols_; j++)
-        {
-            (*this)(i, j) = ms(i, j);
-        }
-    }
-}
-
-
-template<class Form, class Type>
-template<class VSForm, Foam::direction Ncmpts>
-void Foam::Matrix<Form, Type>::Block::operator=
-(
-    const VectorSpace<VSForm, cmptType, Ncmpts>& ms
-)
-{
-    if (nRows_ != Ncmpts || nCols_ != 1)
-    {
-        FatalErrorInFunction
-            << "Attempt to assign blocks of different sizes: "
-            << nRows_ << "x" << nCols_ << " != "
-            << Ncmpts << "x" << 1
-            << abort(FatalError);
-    }
-
-    for (direction i=0; i<Ncmpts; ++i)
-    {
-        operator()(i, 0) = ms[i];
-    }
-}
-
-
-template<class Form, class Type>
-void Foam::Matrix<Form, Type>::Block::operator=(const Field<cmptType>& f)
-{
-    if (nRows_ != f.size() || nCols_ != 1)
-    {
-        FatalErrorInFunction
-            << "Error: cannot assign blocks of different size (left is "
-            << nRows_ << "x" << nCols_ << " != "
-            << f.size() << "x" << 1
-            << abort(FatalError);
-    }
-
-    forAll(f, i)
-    {
-        operator()(i, 0) = f[i];
-    }
-}
-
-
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Form, class Type>
-const Type& Foam::max(const Matrix<Form, Type>& a)
+const Type& Foam::max(const Matrix<Form, Type>& M)
 {
-    const label mn = a.size();
+    const label mn = M.size();
 
     if (mn)
     {
         label curMaxI = 0;
-        const Type* v = a.v();
+        const Type* Mv = M.v();
 
         for (label i=1; i<mn; i++)
         {
-            if (v[i] > v[curMaxI])
+            if (Mv[i] > Mv[curMaxI])
             {
                 curMaxI = i;
             }
         }
 
-        return v[curMaxI];
+        return Mv[curMaxI];
     }
     else
     {
@@ -574,30 +400,30 @@ const Type& Foam::max(const Matrix<Form, Type>& a)
             << abort(FatalError);
 
         // Return in error to keep compiler happy
-        return a(0, 0);
+        return M(0, 0);
     }
 }
 
 
 template<class Form, class Type>
-const Type& Foam::min(const Matrix<Form, Type>& a)
+const Type& Foam::min(const Matrix<Form, Type>& M)
 {
-    const label mn = a.size();
+    const label mn = M.size();
 
     if (mn)
     {
         label curMinI = 0;
-        const Type* v = a.v();
+        const Type* Mv = M.v();
 
         for (label i=1; i<mn; i++)
         {
-            if (v[i] < v[curMinI])
+            if (Mv[i] < Mv[curMinI])
             {
                 curMinI = i;
             }
         }
 
-        return v[curMinI];
+        return Mv[curMinI];
     }
     else
     {
@@ -606,7 +432,7 @@ const Type& Foam::min(const Matrix<Form, Type>& a)
             << abort(FatalError);
 
         // Return in error to keep compiler happy
-        return a(0, 0);
+        return M(0, 0);
     }
 }
 
@@ -614,187 +440,197 @@ const Type& Foam::min(const Matrix<Form, Type>& a)
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 template<class Form, class Type>
-Form Foam::operator-(const Matrix<Form, Type>& a)
+Form Foam::operator-(const Matrix<Form, Type>& M)
 {
-    Form na(a.m(), a.n());
+    Form nM(M.m(), M.n());
 
-    if (a.m() && a.n())
+    if (M.m() && M.n())
     {
-        Type* nav = na.v();
-        const Type* av = a.v();
+        Type* nMv = nM.v();
+        const Type* Mv = M.v();
 
-        const label mn = a.size();
+        const label mn = M.size();
         for (label i=0; i<mn; i++)
         {
-            nav[i] = -av[i];
+            nMv[i] = -Mv[i];
         }
     }
 
-    return na;
+    return nM;
 }
 
 
 template<class Form, class Type>
-Form Foam::operator+(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
+Form Foam::operator+(const Matrix<Form, Type>& A, const Matrix<Form, Type>& B)
 {
-    if (a.m() != b.m())
+    if (A.m() != B.m())
     {
         FatalErrorInFunction
-            << "Attempt to add matrices with different number of rows: "
-            << a.m() << ", " << b.m()
+            << "Attempt to add matrices with different numbers of rows: "
+            << A.m() << ", " << B.m()
             << abort(FatalError);
     }
 
-    if (a.n() != b.n())
+    if (A.n() != B.n())
     {
         FatalErrorInFunction
-            << "Attempt to add matrices with different number of columns: "
-            << a.n() << ", " << b.n()
+            << "Attempt to add matrices with different numbers of columns: "
+            << A.n() << ", " << B.n()
             << abort(FatalError);
     }
 
-    Form ab(a.m(), a.n());
+    Form AB(A.m(), A.n());
 
-    Type* abv = ab.v();
-    const Type* av = a.v();
-    const Type* bv = b.v();
+    Type* ABv = AB.v();
+    const Type* Av = A.v();
+    const Type* Bv = B.v();
 
-    const label mn = a.size();
+    const label mn = A.size();
     for (label i=0; i<mn; i++)
     {
-        abv[i] = av[i] + bv[i];
+        ABv[i] = Av[i] + Bv[i];
     }
 
-    return ab;
+    return AB;
 }
 
 
 template<class Form, class Type>
-Form Foam::operator-(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
+Form Foam::operator-(const Matrix<Form, Type>& A, const Matrix<Form, Type>& B)
 {
-    if (a.m() != b.m())
+    if (A.m() != B.m())
     {
         FatalErrorInFunction
-            << "Attempt to add matrices with different number of rows: "
-            << a.m() << ", " << b.m()
+            << "Attempt to add matrices with different numbers of rows: "
+            << A.m() << ", " << B.m()
             << abort(FatalError);
     }
 
-    if (a.n() != b.n())
+    if (A.n() != B.n())
     {
         FatalErrorInFunction
-            << "Attempt to add matrices with different number of columns: "
-            << a.n() << ", " << b.n()
+            << "Attempt to add matrices with different numbers of columns: "
+            << A.n() << ", " << B.n()
             << abort(FatalError);
     }
 
-    Form ab(a.m(), a.n());
+    Form AB(A.m(), A.n());
 
-    Type* abv = ab.v();
-    const Type* av = a.v();
-    const Type* bv = b.v();
+    Type* ABv = AB.v();
+    const Type* Av = A.v();
+    const Type* Bv = B.v();
 
-    const label mn = a.size();
+    const label mn = A.size();
     for (label i=0; i<mn; i++)
     {
-        abv[i] = av[i] - bv[i];
+        ABv[i] = Av[i] - Bv[i];
     }
 
-    return ab;
+    return AB;
 }
 
 
 template<class Form, class Type>
-Form Foam::operator*(const scalar s, const Matrix<Form, Type>& a)
+Form Foam::operator*(const scalar s, const Matrix<Form, Type>& M)
 {
-    Form sa(a.m(), a.n());
+    Form sM(M.m(), M.n());
 
-    if (a.m() && a.n())
+    if (M.m() && M.n())
     {
-        Type* sav = sa.v();
-        const Type* av = a.v();
+        Type* sMv = sM.v();
+        const Type* Mv = M.v();
 
-        const label mn = a.size();
+        const label mn = M.size();
         for (label i=0; i<mn; i++)
         {
-            sav[i] = s*av[i];
+            sMv[i] = s*Mv[i];
         }
     }
 
-    return sa;
+    return sM;
 }
 
 
 template<class Form, class Type>
-Form Foam::operator*(const Matrix<Form, Type>& a, const scalar s)
+Form Foam::operator*(const Matrix<Form, Type>& M, const scalar s)
 {
-    Form sa(a.m(), a.n());
+    Form sM(M.m(), M.n());
 
-    if (a.m() && a.n())
+    if (M.m() && M.n())
     {
-        Type* sav = sa.v();
-        const Type* av = a.v();
+        Type* sMv = sM.v();
+        const Type* Mv = M.v();
 
-        const label mn = a.size();
+        const label mn = M.size();
         for (label i=0; i<mn; i++)
         {
-            sav[i] = av[i]*s;
+            sMv[i] = Mv[i]*s;
         }
     }
 
-    return sa;
+    return sM;
 }
 
 
 template<class Form, class Type>
-Form Foam::operator/(const Matrix<Form, Type>& a, const scalar s)
+Form Foam::operator/(const Matrix<Form, Type>& M, const scalar s)
 {
-    Form sa(a.m(), a.n());
+    Form sM(M.m(), M.n());
 
-    if (a.m() && a.n())
+    if (M.m() && M.n())
     {
-        Type* sav = sa.v();
-        const Type* av = a.v();
+        Type* sMv = sM.v();
+        const Type* Mv = M.v();
 
-        const label mn = a.size();
+        const label mn = M.size();
         for (label i=0; i<mn; i++)
         {
-            sav[i] = av[i]/s;
+            sMv[i] = Mv[i]/s;
         }
     }
 
-    return sa;
+    return sM;
 }
 
 
-template<class Form, class Type>
-Form Foam::operator*(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
+template<class Form1, class Form2, class Type>
+typename Foam::typeOfInnerProduct<Type, Form1, Form2>::type
+Foam::operator*
+(
+    const Matrix<Form1, Type>& A,
+    const Matrix<Form2, Type>& B
+)
 {
-    if (a.n() != b.m())
+    if (A.n() != B.m())
     {
         FatalErrorInFunction
             << "Attempt to multiply incompatible matrices:" << nl
-            << "Matrix A : " << a.m() << " rows, " << a.n() << " columns" << nl
-            << "Matrix B : " << b.m() << " rows, " << b.n() << " columns" << nl
+            << "Matrix A : " << A.m() << " x " << A.n() << nl
+            << "Matrix B : " << B.m() << " x " << B.n() << nl
             << "In order to multiply matrices, columns of A must equal "
             << "rows of B"
             << abort(FatalError);
     }
 
-    Form ab(a.m(), b.n(), scalar(0));
+    typename typeOfInnerProduct<Type, Form1, Form2>::type AB
+    (
+        A.m(),
+        B.n(),
+        Zero
+    );
 
-    for (label i=0; i<ab.m(); i++)
+    for (label i=0; i<AB.m(); i++)
     {
-        for (label j=0; j<ab.n(); j++)
+        for (label j=0; j<AB.n(); j++)
         {
-            for (label k=0; k<b.m(); k++)
+            for (label k=0; k<B.m(); k++)
             {
-                ab(i, j) += a(i, k)*b(k, j);
+                AB(i, j) += A(i, k)*B(k, j);
             }
         }
     }
 
-    return ab;
+    return AB;
 }
 
 
@@ -809,7 +645,7 @@ inline Foam::tmp<Foam::Field<Type>> Foam::operator*
     {
         FatalErrorInFunction
             << "Attempt to multiply incompatible matrix and field:" << nl
-            << "Matrix : " << M.m() << " rows, " << M.n() << " columns" << nl
+            << "Matrix : " << M.m() << " x " << M.n() << nl
             << "Field : " << f.size() << " rows" << nl
             << "In order to multiply a matrix M and field f, "
                "columns of M must equal rows of f"
@@ -819,9 +655,9 @@ inline Foam::tmp<Foam::Field<Type>> Foam::operator*
     tmp<Field<Type>> tMf(new Field<Type>(f.size(), Zero));
     Field<Type>& Mf = tMf.ref();
 
-    for (label i=0; i<M.m(); ++i)
+    for (label i=0; i<M.m(); i++)
     {
-        for (label j=0; j<M.n(); ++j)
+        for (label j=0; j<M.n(); j++)
         {
             Mf[i] += M(i, j)*f[j];
         }
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 5f905b465b..9385d42d87 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -25,8 +25,7 @@ Class
     Foam::Matrix
 
 Description
-    A templated 2D matrix of objects of \<T\>, where the n x m matrix
-    dimensions are known and used for subscript bounds checking, etc.
+    A templated (m x n) matrix of objects of \<T\>.
 
 SourceFiles
     Matrix.C
@@ -42,7 +41,6 @@ SourceFiles
 #include "label.H"
 #include "uLabel.H"
 #include "Field.H"
-#include "MatrixSpace.H"
 #include "zero.H"
 #include "autoPtr.H"
 
@@ -67,6 +65,12 @@ template<class Form, class Type> Ostream& operator<<
     const Matrix<Form, Type>&
 );
 
+template<class MatrixType>
+class ConstMatrixBlock;
+
+template<class MatrixType>
+class MatrixBlock;
+
 
 /*---------------------------------------------------------------------------*\
                            Class Matrix Declaration
@@ -78,7 +82,7 @@ class Matrix
     // Private data
 
         //- Number of rows and columns in Matrix.
-        label nRows_, nCols_;
+        label mRows_, nCols_;
 
         //- Row pointers
         Type* __restrict__ v_;
@@ -102,157 +106,6 @@ public:
         inline static const mType& null();
 
 
-    // Sub-Block Classes
-
-        class ConstBlock
-        {
-            // Private data
-
-                //- Const reference to the parent matrix
-                const mType& matrix_;
-
-                // Block size
-                const label nRows_;
-                const label nCols_;
-
-                // Block location in parent matrix
-                const label rowStart_;
-                const label colStart_;
-
-        public:
-
-            typedef typename mType::cmptType cmptType;
-
-            // Constructors
-
-                //- Construct block for matrix, size and location
-                inline ConstBlock
-                (
-                    const mType& matrix,
-                    const label m,
-                    const label n,
-                    const label mStart,
-                    const label nStart
-                );
-
-
-            // Member Functions
-
-                //- Return the number of rows in the block
-                inline label m() const;
-
-                //- Return the number of columns in the block
-                inline label n() const;
-
-                //- (i, j) const element access operator
-                inline const Type& operator()
-                (
-                    const label i,
-                    const label j
-                ) const;
-
-                //- Convert a column of a matrix to a Field
-                operator Field<Type>() const;
-        };
-
-
-        class Block
-        {
-            // Private data
-
-                //- Reference to the parent matrix
-                mType& matrix_;
-
-                // Block size
-                const label nRows_;
-                const label nCols_;
-
-                // Block location in parent matrix
-                const label rowStart_;
-                const label colStart_;
-
-        public:
-
-            typedef typename mType::cmptType cmptType;
-
-            // Constructors
-
-                //- Construct block for matrix, size and location
-                inline Block
-                (
-                    mType& matrix,
-                    const label m,
-                    const label n,
-                    const label mStart,
-                    const label nStart
-                );
-
-
-            // Member Functions
-
-                //- Return the number of rows in the block
-                inline label m() const;
-
-                //- Return the number of columns in the block
-                inline label n() const;
-
-                //- (i, j) const element access operator
-                inline const Type& operator()
-                (
-                    const label i,
-                    const label j
-                ) const;
-
-                //- (i, j) element access operator
-                inline Type& operator()(const label i, const label j);
-
-                //- Convert a column of a matrix to a Field
-                operator Field<Type>() const;
-
-
-            // Member operators
-
-                //- Assignment to a compatible matrix
-                void operator=(const mType&);
-
-                //- Assignment to a compatible block
-                void operator=(const Block&);
-
-                //- Assignment to a compatible const block
-                void operator=(const ConstBlock&);
-
-                //- Assignment to a compatible MatrixSpace
-                template<class MSForm, direction Nrows, direction Ncols>
-                void operator=(const MatrixSpace<MSForm, Type, Nrows, Ncols>&);
-
-                //- Assignment to a compatible MatrixSpace block
-                template
-                <
-                    template<class, direction, direction> class Block,
-                    class SubTensor,
-                    direction BRowStart,
-                    direction BColStart
-                >
-                void operator=(const Block<SubTensor, BRowStart, BColStart>&);
-
-                //- Assignment to a compatible VectorSpace (column-vector)
-                template<class VSForm, direction Ncmpts>
-                void operator=(const VectorSpace<VSForm, Type, Ncmpts>&);
-
-                //- Assignment to a compatible VectorSpace (column-vector) block
-                template
-                <
-                    template<class, direction> class Block,
-                    class SubVector,
-                    direction BStart
-                >
-                void operator=(const Block<SubVector, BStart>&);
-
-                //- Assignment to a Field (column-vector)
-                void operator=(const Field<Type>&);
-        };
-
-
     // Constructors
 
         //- Null constructor.
@@ -272,8 +125,17 @@ public:
         //- Copy constructor.
         Matrix(const mType&);
 
+        //- Copy constructor from matrix of a different form
+        template<class Form2>
+        explicit Matrix(const Matrix<Form2, Type>&);
+
         //- Construct from a block of another matrix
-        Matrix(const mType::Block&);
+        template<class MatrixType>
+        Matrix(const ConstMatrixBlock<MatrixType>&);
+
+        //- Construct from a block of another matrix
+        template<class MatrixType>
+        Matrix(const MatrixBlock<MatrixType>&);
 
         //- Construct from Istream.
         Matrix(Istream&);
@@ -308,7 +170,7 @@ public:
 
         // Block access
 
-            inline ConstBlock block
+            inline ConstMatrixBlock<mType> block
             (
                 const label m,
                 const label n,
@@ -317,19 +179,19 @@ public:
             ) const;
 
             template<class VectorSpace>
-            inline ConstBlock block
+            inline ConstMatrixBlock<mType> block
             (
                 const label mStart,
                 const label nStart
             ) const;
 
-            inline ConstBlock col
+            inline ConstMatrixBlock<mType> col
             (
                 const label m,
                 const label rowStart
             ) const;
 
-            inline ConstBlock col
+            inline ConstMatrixBlock<mType> col
             (
                 const label m,
                 const label mStart,
@@ -337,7 +199,7 @@ public:
             ) const;
 
 
-            inline Block block
+            inline MatrixBlock<mType> block
             (
                 const label m,
                 const label n,
@@ -346,11 +208,19 @@ public:
             );
 
             template<class VectorSpace>
-            inline Block block(const label mStart, const label nStart);
+            inline MatrixBlock<mType> block
+            (
+                const label mStart,
+                const label nStart
+            );
 
-            inline Block col(const label m, const label rowStart);
+            inline MatrixBlock<mType> col
+            (
+                const label m,
+                const label rowStart
+            );
 
-            inline Block col
+            inline MatrixBlock<mType> col
             (
                 const label m,
                 const label mStart,
@@ -402,7 +272,12 @@ public:
         void operator=(const mType&);
 
         //- Assignment to a block of another matrix
-        void operator=(const mType::Block&);
+        template<class MatrixType>
+        void operator=(const ConstMatrixBlock<MatrixType>&);
+
+        //- Assignment to a block of another matrix
+        template<class MatrixType>
+        void operator=(const MatrixBlock<MatrixType>&);
 
         //- Assignment of all entries to zero
         void operator=(const zero);
@@ -475,11 +350,12 @@ Form operator/
     const scalar
 );
 
-template<class Form, class Type>
-Form operator*
+template<class Form1, class Form2, class Type>
+typename typeOfInnerProduct<Type, Form1, Form2>::type
+operator*
 (
-    const Matrix<Form, Type>&,
-    const Matrix<Form, Type>&
+    const Matrix<Form1, Type>& a,
+    const Matrix<Form2, Type>& b
 );
 
 template<class Form, class Type>
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index 73992f3285..73992aac77 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H
@@ -23,12 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "MatrixBlock.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Form, class Type>
 inline Foam::Matrix<Form, Type>::Matrix()
 :
-    nRows_(0),
+    mRows_(0),
     nCols_(0),
     v_(NULL)
 {}
@@ -42,68 +44,6 @@ clone() const
 }
 
 
-template<class Form, class Type>
-Foam::Matrix<Form, Type>::ConstBlock::ConstBlock
-(
-    const mType& matrix,
-    const label m,
-    const label n,
-    const label mStart,
-    const label nStart
-)
-:
-    matrix_(matrix),
-    nRows_(m),
-    nCols_(n),
-    rowStart_(mStart),
-    colStart_(nStart)
-{
-    #ifdef FULLDEBUG
-    if
-    (
-        rowStart_ + nRows_ > matrix.m()
-     || colStart_ + nCols_ > matrix.n()
-    )
-    {
-        FatalErrorInFunction
-            << "Block addresses outside matrix"
-            << abort(FatalError);
-    }
-    #endif
-}
-
-
-template<class Form, class Type>
-Foam::Matrix<Form, Type>::Block::Block
-(
-    mType& matrix,
-    const label m,
-    const label n,
-    const label mStart,
-    const label nStart
-)
-:
-    matrix_(matrix),
-    nRows_(m),
-    nCols_(n),
-    rowStart_(mStart),
-    colStart_(nStart)
-{
-    #ifdef FULLDEBUG
-    if
-    (
-        rowStart_ + nRows_ > matrix.m()
-     || colStart_ + nCols_ > matrix.n()
-    )
-    {
-        FatalErrorInFunction
-            << "Block addresses outside matrix"
-            << abort(FatalError);
-    }
-    #endif
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Form, class Type>
@@ -116,7 +56,7 @@ inline const Foam::Matrix<Form, Type>& Foam::Matrix<Form, Type>::null()
 template<class Form, class Type>
 inline Foam::label Foam::Matrix<Form, Type>::m() const
 {
-    return nRows_;
+    return mRows_;
 }
 
 
@@ -130,7 +70,7 @@ inline Foam::label Foam::Matrix<Form, Type>::n() const
 template<class Form, class Type>
 inline Foam::label Foam::Matrix<Form, Type>::size() const
 {
-    return nRows_*nCols_;
+    return mRows_*nCols_;
 }
 
 
@@ -138,16 +78,16 @@ template<class Form, class Type>
 inline void Foam::Matrix<Form, Type>::checki(const label i) const
 {
     #ifdef FULLDEBUG
-    if (!nRows_ || !nCols_)
+    if (!mRows_ || !nCols_)
     {
         FatalErrorInFunction
             << "Attempt to access element from empty matrix"
             << abort(FatalError);
     }
-    else if (i<0 || i>=nRows_)
+    else if (i<0 || i>=mRows_)
     {
         FatalErrorInFunction
-            << "Index " << i << " out of range 0 ... " << nRows_-1
+            << "Index " << i << " out of range 0 ... " << mRows_-1
             << abort(FatalError);
     }
     #endif
@@ -158,7 +98,7 @@ template<class Form, class Type>
 inline void Foam::Matrix<Form, Type>::checkj(const label j) const
 {
     #ifdef FULLDEBUG
-    if (!nRows_ || !nCols_)
+    if (!mRows_ || !nCols_)
     {
         FatalErrorInFunction
             << "Attempt to access element from empty matrix"
@@ -174,34 +114,6 @@ inline void Foam::Matrix<Form, Type>::checkj(const label j) const
 }
 
 
-template<class Form, class Type>
-inline Foam::label Foam::Matrix<Form, Type>::ConstBlock::m() const
-{
-    return nRows_;
-}
-
-
-template<class Form, class Type>
-inline Foam::label Foam::Matrix<Form, Type>::ConstBlock::n() const
-{
-    return nCols_;
-}
-
-
-template<class Form, class Type>
-inline Foam::label Foam::Matrix<Form, Type>::Block::m() const
-{
-    return nRows_;
-}
-
-
-template<class Form, class Type>
-inline Foam::label Foam::Matrix<Form, Type>::Block::n() const
-{
-    return nCols_;
-}
-
-
 template<class Form, class Type>
 inline const Type* Foam::Matrix<Form, Type>::v() const
 {
@@ -217,7 +129,7 @@ inline Type* Foam::Matrix<Form, Type>::v()
 
 
 template<class Form, class Type>
-inline typename Foam::Matrix<Form, Type>::ConstBlock
+inline Foam::ConstMatrixBlock<Foam::Matrix<Form, Type>>
 Foam::Matrix<Form, Type>::block
 (
     const label m,
@@ -226,7 +138,7 @@ Foam::Matrix<Form, Type>::block
     const label nStart
 ) const
 {
-    return ConstBlock
+    return ConstMatrixBlock<mType>
     (
         *this,
         m,
@@ -239,17 +151,17 @@ Foam::Matrix<Form, Type>::block
 
 template<class Form, class Type>
 template<class VectorSpace>
-inline typename Foam::Matrix<Form, Type>::ConstBlock
+inline Foam::ConstMatrixBlock<Foam::Matrix<Form, Type>>
 Foam::Matrix<Form, Type>::block
 (
     const label mStart,
     const label nStart
 ) const
 {
-    return ConstBlock
+    return ConstMatrixBlock<mType>
     (
         *this,
-        VectorSpace::nRows,
+        VectorSpace::mRows,
         VectorSpace::nCols,
         mStart,
         nStart
@@ -258,14 +170,14 @@ Foam::Matrix<Form, Type>::block
 
 
 template<class Form, class Type>
-inline typename Foam::Matrix<Form, Type>::ConstBlock
+inline Foam::ConstMatrixBlock<Foam::Matrix<Form, Type>>
 Foam::Matrix<Form, Type>::col
 (
     const label m,
     const label mStart
 ) const
 {
-    return ConstBlock
+    return ConstMatrixBlock<mType>
     (
         *this,
         m,
@@ -277,7 +189,7 @@ Foam::Matrix<Form, Type>::col
 
 
 template<class Form, class Type>
-inline typename Foam::Matrix<Form, Type>::ConstBlock
+inline Foam::ConstMatrixBlock<Foam::Matrix<Form, Type>>
 Foam::Matrix<Form, Type>::col
 (
     const label m,
@@ -285,7 +197,7 @@ Foam::Matrix<Form, Type>::col
     const label nStart
 ) const
 {
-    return ConstBlock
+    return ConstMatrixBlock<mType>
     (
         *this,
         m,
@@ -297,7 +209,7 @@ Foam::Matrix<Form, Type>::col
 
 
 template<class Form, class Type>
-inline typename Foam::Matrix<Form, Type>::Block
+inline Foam::MatrixBlock<Foam::Matrix<Form, Type>>
 Foam::Matrix<Form, Type>::block
 (
     const label m,
@@ -306,7 +218,7 @@ Foam::Matrix<Form, Type>::block
     const label nStart
 )
 {
-    return Block
+    return MatrixBlock<mType>
     (
         *this,
         m,
@@ -319,13 +231,13 @@ Foam::Matrix<Form, Type>::block
 
 template<class Form, class Type>
 template<class VectorSpace>
-inline typename Foam::Matrix<Form, Type>::Block
+inline Foam::MatrixBlock<Foam::Matrix<Form, Type>>
 Foam::Matrix<Form, Type>::block(const label mStart, const label nStart)
 {
-    return Block
+    return MatrixBlock<mType>
     (
         *this,
-        VectorSpace::nRows,
+        VectorSpace::mRows,
         VectorSpace::nCols,
         mStart,
         nStart
@@ -334,10 +246,10 @@ Foam::Matrix<Form, Type>::block(const label mStart, const label nStart)
 
 
 template<class Form, class Type>
-inline typename Foam::Matrix<Form, Type>::Block
+inline Foam::MatrixBlock<Foam::Matrix<Form, Type>>
 Foam::Matrix<Form, Type>::col(const label m, const label mStart)
 {
-    return Block
+    return MatrixBlock<mType>
     (
         *this,
         m,
@@ -349,7 +261,7 @@ Foam::Matrix<Form, Type>::col(const label m, const label mStart)
 
 
 template<class Form, class Type>
-inline typename Foam::Matrix<Form, Type>::Block
+inline Foam::MatrixBlock<Foam::Matrix<Form, Type>>
 Foam::Matrix<Form, Type>::col
 (
     const label m,
@@ -357,7 +269,7 @@ Foam::Matrix<Form, Type>::col
     const label nStart
 )
 {
-    return Block
+    return MatrixBlock<mType>
     (
         *this,
         m,
@@ -370,84 +282,6 @@ Foam::Matrix<Form, Type>::col
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<class Form, class Type>
-inline const Type& Foam::Matrix<Form, Type>::ConstBlock::operator()
-(
-    const label i,
-    const label j
-) const
-{
-    #ifdef FULLDEBUG
-    if (i<0 || i>=nRows_)
-    {
-        FatalErrorInFunction
-            << "Index " << i << " out of range 0 ... " << nRows_-1
-            << abort(FatalError);
-    }
-    if (j<0 || j>=nCols_)
-    {
-        FatalErrorInFunction
-            << "Index " << j << " out of range 0 ... " << nCols_-1
-            << abort(FatalError);
-    }
-    #endif
-
-    return matrix_(i + rowStart_, j + colStart_);
-}
-
-
-template<class Form, class Type>
-inline const Type& Foam::Matrix<Form, Type>::Block::operator()
-(
-    const label i,
-    const label j
-) const
-{
-    #ifdef FULLDEBUG
-    if (i<0 || i>=nRows_)
-    {
-        FatalErrorInFunction
-            << "Index " << i << " out of range 0 ... " << nRows_-1
-            << abort(FatalError);
-    }
-    if (j<0 || j>=nCols_)
-    {
-        FatalErrorInFunction
-            << "Index " << j << " out of range 0 ... " << nCols_-1
-            << abort(FatalError);
-    }
-    #endif
-
-    return matrix_(i + rowStart_, j + colStart_);
-}
-
-
-template<class Form, class Type>
-inline Type& Foam::Matrix<Form, Type>::Block::operator()
-(
-    const label i,
-    const label j
-)
-{
-    #ifdef FULLDEBUG
-    if (i<0 || i>=nRows_)
-    {
-        FatalErrorInFunction
-            << "Index " << i << " out of range 0 ... " << nRows_-1
-            << abort(FatalError);
-    }
-    if (j<0 || j>=nCols_)
-    {
-        FatalErrorInFunction
-            << "Index " << j << " out of range 0 ... " << nCols_-1
-            << abort(FatalError);
-    }
-    #endif
-
-    return matrix_(i + rowStart_, j + colStart_);
-}
-
-
 template<class Form, class Type>
 inline const Type& Foam::Matrix<Form, Type>::operator()
 (
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixIO.C b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
index 9be178c12f..51943ada59 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixIO.C
+++ b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
@@ -34,7 +34,7 @@ License
 template<class Form, class Type>
 Foam::Matrix<Form, Type>::Matrix(Istream& is)
 :
-    nRows_(0),
+    mRows_(0),
     nCols_(0),
     v_(NULL)
 {
@@ -59,10 +59,10 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
 
     if (firstToken.isLabel())
     {
-        M.nRows_ = firstToken.labelToken();
+        M.mRows_ = firstToken.labelToken();
         M.nCols_ = readLabel(is);
 
-        label mn = M.nRows_*M.nCols_;
+        label mn = M.mRows_*M.nCols_;
 
         // Read list contents depending on data format
         if (is.format() == IOstream::ASCII || !contiguous<Type>())
@@ -151,7 +151,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
 template<class Form, class Type>
 Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
 {
-    label mn = M.nRows_*M.nCols_;
+    label mn = M.mRows_*M.nCols_;
 
     os  << M.m() << token::SPACE << M.n();
 
diff --git a/src/OpenFOAM/matrices/MatrixBlock/MatrixBlock.C b/src/OpenFOAM/matrices/MatrixBlock/MatrixBlock.C
new file mode 100644
index 0000000000..3aecbe8377
--- /dev/null
+++ b/src/OpenFOAM/matrices/MatrixBlock/MatrixBlock.C
@@ -0,0 +1,342 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "MatrixBlock.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class MatrixType>
+Foam::ConstMatrixBlock<MatrixType>::operator Field<cmptType>() const
+{
+    if (nCols_ != 1)
+    {
+        FatalErrorInFunction
+            << "Number of columns " << nCols_ << " != 1"
+            << abort(FatalError);
+    }
+
+    Field<cmptType> f(mRows_);
+
+    forAll(f, i)
+    {
+        f[i] = operator()(i, 0);
+    }
+
+    return f;
+}
+
+
+template<class MatrixType>
+Foam::MatrixBlock<MatrixType>::operator Field<cmptType>() const
+{
+    if (nCols_ != 1)
+    {
+        FatalErrorInFunction
+            << "Number of columns " << nCols_ << " != 1"
+            << abort(FatalError);
+    }
+
+    Field<cmptType> f(mRows_);
+
+    forAll(f, i)
+    {
+        f[i] = operator()(i, 0);
+    }
+
+    return f;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class MatrixType>
+template<class Form>
+void Foam::MatrixBlock<MatrixType>::operator=
+(
+    const Matrix<Form, cmptType>& Mb
+)
+{
+    if (mRows_ != Mb.m() || nCols_ != Mb.n())
+    {
+        FatalErrorInFunction
+            << "Attempt to assign blocks of different sizes: "
+            << mRows_ << "x" << nCols_ << " != "
+            << Mb.m() << "x" << Mb.n()
+            << abort(FatalError);
+    }
+
+    for (label i=0; i<mRows_; i++)
+    {
+        for (label j=0; j<nCols_; j++)
+        {
+            (*this)(i, j) = Mb(i, j);
+        }
+    }
+}
+
+
+template<class MatrixType>
+void Foam::MatrixBlock<MatrixType>::operator=
+(
+    const ConstMatrixBlock<MatrixType>& Mb
+)
+{
+    if (this != &Mb)
+    {
+        if (mRows_ != Mb.m() || nCols_ != Mb.n())
+        {
+            FatalErrorInFunction
+                << "Attempt to assign blocks of different sizes: "
+                << mRows_ << "x" << nCols_ << " != "
+                << Mb.m() << "x" << Mb.n()
+                << abort(FatalError);
+        }
+
+        for (label i=0; i<mRows_; i++)
+        {
+            for (label j=0; j<nCols_; j++)
+            {
+                (*this)(i, j) = Mb(i, j);
+            }
+        }
+    }
+}
+
+
+template<class MatrixType>
+void Foam::MatrixBlock<MatrixType>::operator=
+(
+    const MatrixBlock<MatrixType>& Mb
+)
+{
+    if (this != &Mb)
+    {
+        if (mRows_ != Mb.m() || nCols_ != Mb.n())
+        {
+            FatalErrorInFunction
+                << "Attempt to assign blocks of different sizes: "
+                << mRows_ << "x" << nCols_ << " != "
+                << Mb.m() << "x" << Mb.n()
+                << abort(FatalError);
+        }
+
+        for (label i=0; i<mRows_; i++)
+        {
+            for (label j=0; j<nCols_; j++)
+            {
+                (*this)(i, j) = Mb(i, j);
+            }
+        }
+    }
+}
+
+
+template<class MatrixType>
+template<class MatrixType2>
+void Foam::MatrixBlock<MatrixType>::operator=
+(
+    const ConstMatrixBlock<MatrixType2>& Mb
+)
+{
+    if (this != &Mb)
+    {
+        if (mRows_ != Mb.m() || nCols_ != Mb.n())
+        {
+            FatalErrorInFunction
+                << "Attempt to assign blocks of different sizes: "
+                << mRows_ << "x" << nCols_ << " != "
+                << Mb.m() << "x" << Mb.n()
+                << abort(FatalError);
+        }
+
+        for (label i=0; i<mRows_; i++)
+        {
+            for (label j=0; j<nCols_; j++)
+            {
+                (*this)(i, j) = Mb(i, j);
+            }
+        }
+    }
+}
+
+
+template<class MatrixType>
+template<class MatrixType2>
+void Foam::MatrixBlock<MatrixType>::operator=
+(
+    const MatrixBlock<MatrixType2>& Mb
+)
+{
+    if (this != &Mb)
+    {
+        if (mRows_ != Mb.m() || nCols_ != Mb.n())
+        {
+            FatalErrorInFunction
+                << "Attempt to assign blocks of different sizes: "
+                << mRows_ << "x" << nCols_ << " != "
+                << Mb.m() << "x" << Mb.n()
+                << abort(FatalError);
+        }
+
+        for (label i=0; i<mRows_; i++)
+        {
+            for (label j=0; j<nCols_; j++)
+            {
+                (*this)(i, j) = Mb(i, j);
+            }
+        }
+    }
+}
+
+
+template<class MatrixType>
+template
+<
+    template<class, Foam::direction, Foam::direction> class MSBlock,
+    class SubTensor,
+    Foam::direction BRowStart,
+    Foam::direction BColStart
+>
+void Foam::MatrixBlock<MatrixType>::operator=
+(
+    const MSBlock<SubTensor, BRowStart, BColStart>& Mb
+)
+{
+    if (mRows_ != Mb.mRows || nCols_ != Mb.nCols)
+    {
+        FatalErrorInFunction
+            << "Attempt to assign blocks of different sizes: "
+            << mRows_ << "x" << nCols_ << " != "
+            << Mb.mRows << "x" << Mb.nCols
+            << abort(FatalError);
+    }
+
+    for (direction i=0; i<mRows_; ++i)
+    {
+        for (direction j=0; j<nCols_; ++j)
+        {
+            operator()(i, j) = Mb(i, j);
+        }
+    }
+}
+
+
+template<class MatrixType>
+template
+<
+    template<class, Foam::direction> class VSBlock,
+    class SubVector,
+    Foam::direction BStart
+>
+void Foam::MatrixBlock<MatrixType>::operator=
+(
+    const VSBlock<SubVector, BStart>& Mb
+)
+{
+    if (mRows_ != Mb.nComponents || nCols_ != 1)
+    {
+        FatalErrorInFunction
+            << "Attempt to assign blocks of different sizes: "
+            << mRows_ << "x" << nCols_ << " != "
+            << Mb.nComponents << "x" << 1
+            << abort(FatalError);
+    }
+
+    for (direction i=0; i<mRows_; ++i)
+    {
+        operator()(i, 0) = Mb[i];
+    }
+}
+
+
+template<class MatrixType>
+template<class MSForm, Foam::direction Nrows, Foam::direction Ncols>
+void Foam::MatrixBlock<MatrixType>::operator=
+(
+    const MatrixSpace<MSForm, cmptType, Nrows, Ncols>& ms
+)
+{
+    if (mRows_ != Nrows || nCols_ != Ncols)
+    {
+        FatalErrorInFunction
+            << "Attempt to assign blocks of different sizes: "
+            << mRows_ << "x" << nCols_ << " != "
+            << Nrows << "x" << Ncols
+            << abort(FatalError);
+    }
+
+    for (label i=0; i<mRows_; i++)
+    {
+        for (label j=0; j<nCols_; j++)
+        {
+            (*this)(i, j) = ms(i, j);
+        }
+    }
+}
+
+
+template<class MatrixType>
+template<class VSForm, Foam::direction Ncmpts>
+void Foam::MatrixBlock<MatrixType>::operator=
+(
+    const VectorSpace<VSForm, cmptType, Ncmpts>& ms
+)
+{
+    if (mRows_ != Ncmpts || nCols_ != 1)
+    {
+        FatalErrorInFunction
+            << "Attempt to assign blocks of different sizes: "
+            << mRows_ << "x" << nCols_ << " != "
+            << Ncmpts << "x" << 1
+            << abort(FatalError);
+    }
+
+    for (direction i=0; i<Ncmpts; ++i)
+    {
+        operator()(i, 0) = ms[i];
+    }
+}
+
+
+template<class MatrixType>
+void Foam::MatrixBlock<MatrixType>::operator=(const Field<cmptType>& f)
+{
+    if (mRows_ != f.size() || nCols_ != 1)
+    {
+        FatalErrorInFunction
+            << "Error: cannot assign blocks of different size (left is "
+            << mRows_ << "x" << nCols_ << " != "
+            << f.size() << "x" << 1
+            << abort(FatalError);
+    }
+
+    forAll(f, i)
+    {
+        operator()(i, 0) = f[i];
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/MatrixBlock/MatrixBlock.H b/src/OpenFOAM/matrices/MatrixBlock/MatrixBlock.H
new file mode 100644
index 0000000000..67ece198ee
--- /dev/null
+++ b/src/OpenFOAM/matrices/MatrixBlock/MatrixBlock.H
@@ -0,0 +1,240 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::MatrixBlock
+
+Description
+    A templated block of an (m x n) matrix of type \<MatrixType\>.
+
+        Foam::ConstMatrixBlock: block of a const matrix
+        Foam::MatrixBlock: block of a non-const matrix
+
+    The block may be assigned to a block of another matrix or to a VectorSpace
+    or MatrixSpace e.g. \c tensor.  Conversion of a column block to a \c
+    Field<T> is also provide.
+
+SourceFiles
+    MatrixBlock.C
+    MatrixBlockI.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef MatrixBlock_H
+#define MatrixBlock_H
+
+#include "Matrix.H"
+#include "MatrixSpace.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class ConstMatrixBlock Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class MatrixType>
+class ConstMatrixBlock
+{
+    // Private data
+
+        //- Const reference to the parent matrix
+        const MatrixType& matrix_;
+
+        // Block size
+        const label mRows_;
+        const label nCols_;
+
+        // Block location in parent matrix
+        const label rowStart_;
+        const label colStart_;
+
+public:
+
+    typedef typename MatrixType::cmptType cmptType;
+
+    // Constructors
+
+        //- Construct block for matrix, size and location
+        inline ConstMatrixBlock
+        (
+            const MatrixType& matrix,
+            const label m,
+            const label n,
+            const label mStart,
+            const label nStart
+        );
+
+
+    // Member Functions
+
+        //- Return the number of rows in the block
+        inline label m() const;
+
+        //- Return the number of columns in the block
+        inline label n() const;
+
+        //- (i, j) const element access operator
+        inline const cmptType& operator()
+        (
+            const label i,
+            const label j
+        ) const;
+
+        //- Convert a column of a matrix to a Field
+        operator Field<cmptType>() const;
+};
+
+
+/*---------------------------------------------------------------------------*\
+                          Class MatrixBlock Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class MatrixType>
+class MatrixBlock
+{
+    // Private data
+
+        //- Reference to the parent matrix
+        MatrixType& matrix_;
+
+        // Block size
+        const label mRows_;
+        const label nCols_;
+
+        // Block location in parent matrix
+        const label rowStart_;
+        const label colStart_;
+
+public:
+
+    typedef typename MatrixType::cmptType cmptType;
+
+    // Constructors
+
+        //- Construct block for matrix, size and location
+        inline MatrixBlock
+        (
+            MatrixType& matrix,
+            const label m,
+            const label n,
+            const label mStart,
+            const label nStart
+        );
+
+
+    // Member Functions
+
+        //- Return the number of rows in the block
+        inline label m() const;
+
+        //- Return the number of columns in the block
+        inline label n() const;
+
+        //- (i, j) const element access operator
+        inline const cmptType& operator()
+        (
+            const label i,
+            const label j
+        ) const;
+
+        //- (i, j) element access operator
+        inline cmptType& operator()(const label i, const label j);
+
+        //- Convert a column of a matrix to a Field
+        operator Field<cmptType>() const;
+
+
+    // Member operators
+
+        //- Assignment to a compatible matrix
+        template<class Form>
+        void operator=(const Matrix<Form, cmptType>&);
+
+        //- Assignment to a compatible const block
+        void operator=(const ConstMatrixBlock<MatrixType>&);
+
+        //- Assignment to a compatible block
+        void operator=(const MatrixBlock<MatrixType>&);
+
+        //- Assignment to a compatible const block
+        template<class MatrixType2>
+        void operator=(const ConstMatrixBlock<MatrixType2>&);
+
+        //- Assignment to a compatible block
+        template<class MatrixType2>
+        void operator=(const MatrixBlock<MatrixType2>&);
+
+        //- Assignment to a compatible MatrixSpace
+        template<class MSForm, direction Nrows, direction Ncols>
+        void operator=(const MatrixSpace<MSForm, cmptType, Nrows, Ncols>&);
+
+        //- Assignment to a compatible MatrixSpace block
+        template
+        <
+            template<class, direction, direction> class Block,
+            class SubTensor,
+            direction BRowStart,
+            direction BColStart
+        >
+        void operator=(const Block<SubTensor, BRowStart, BColStart>&);
+
+        //- Assignment to a compatible VectorSpace (column-vector)
+        template<class VSForm, direction Ncmpts>
+        void operator=(const VectorSpace<VSForm, cmptType, Ncmpts>&);
+
+        //- Assignment to a compatible VectorSpace (column-vector) block
+        template
+        <
+            template<class, direction> class Block,
+            class SubVector,
+            direction BStart
+        >
+        void operator=(const Block<SubVector, BStart>&);
+
+        //- Assignment to a Field (column-vector)
+        void operator=(const Field<cmptType>&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "MatrixBlockI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "MatrixBlock.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/MatrixBlock/MatrixBlockI.H b/src/OpenFOAM/matrices/MatrixBlock/MatrixBlockI.H
new file mode 100644
index 0000000000..e764dea032
--- /dev/null
+++ b/src/OpenFOAM/matrices/MatrixBlock/MatrixBlockI.H
@@ -0,0 +1,203 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MatrixType>
+Foam::ConstMatrixBlock<MatrixType>::ConstMatrixBlock
+(
+    const MatrixType& matrix,
+    const label m,
+    const label n,
+    const label mStart,
+    const label nStart
+)
+:
+    matrix_(matrix),
+    mRows_(m),
+    nCols_(n),
+    rowStart_(mStart),
+    colStart_(nStart)
+{
+    #ifdef FULLDEBUG
+    if
+    (
+        rowStart_ + mRows_ > matrix.m()
+     || colStart_ + nCols_ > matrix.n()
+    )
+    {
+        FatalErrorInFunction
+            << "Block addresses outside matrix"
+            << abort(FatalError);
+    }
+    #endif
+}
+
+
+template<class MatrixType>
+Foam::MatrixBlock<MatrixType>::MatrixBlock
+(
+    MatrixType& matrix,
+    const label m,
+    const label n,
+    const label mStart,
+    const label nStart
+)
+:
+    matrix_(matrix),
+    mRows_(m),
+    nCols_(n),
+    rowStart_(mStart),
+    colStart_(nStart)
+{
+    #ifdef FULLDEBUG
+    if
+    (
+        rowStart_ + mRows_ > matrix.m()
+     || colStart_ + nCols_ > matrix.n()
+    )
+    {
+        FatalErrorInFunction
+            << "Block addresses outside matrix"
+            << abort(FatalError);
+    }
+    #endif
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class MatrixType>
+inline Foam::label Foam::ConstMatrixBlock<MatrixType>::m() const
+{
+    return mRows_;
+}
+
+
+template<class MatrixType>
+inline Foam::label Foam::ConstMatrixBlock<MatrixType>::n() const
+{
+    return nCols_;
+}
+
+
+template<class MatrixType>
+inline Foam::label Foam::MatrixBlock<MatrixType>::m() const
+{
+    return mRows_;
+}
+
+
+template<class MatrixType>
+inline Foam::label Foam::MatrixBlock<MatrixType>::n() const
+{
+    return nCols_;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class MatrixType>
+inline const typename MatrixType::cmptType&
+Foam::ConstMatrixBlock<MatrixType>::operator()
+(
+    const label i,
+    const label j
+) const
+{
+    #ifdef FULLDEBUG
+    if (i<0 || i>=mRows_)
+    {
+        FatalErrorInFunction
+            << "Index " << i << " out of range 0 ... " << mRows_-1
+            << abort(FatalError);
+    }
+    if (j<0 || j>=nCols_)
+    {
+        FatalErrorInFunction
+            << "Index " << j << " out of range 0 ... " << nCols_-1
+            << abort(FatalError);
+    }
+    #endif
+
+    return matrix_(i + rowStart_, j + colStart_);
+}
+
+
+template<class MatrixType>
+inline const typename MatrixType::cmptType&
+Foam::MatrixBlock<MatrixType>::operator()
+(
+    const label i,
+    const label j
+) const
+{
+    #ifdef FULLDEBUG
+    if (i<0 || i>=mRows_)
+    {
+        FatalErrorInFunction
+            << "Index " << i << " out of range 0 ... " << mRows_-1
+            << abort(FatalError);
+    }
+    if (j<0 || j>=nCols_)
+    {
+        FatalErrorInFunction
+            << "Index " << j << " out of range 0 ... " << nCols_-1
+            << abort(FatalError);
+    }
+    #endif
+
+    return matrix_(i + rowStart_, j + colStart_);
+}
+
+
+template<class MatrixType>
+inline typename MatrixType::cmptType&
+Foam::MatrixBlock<MatrixType>::operator()
+(
+    const label i,
+    const label j
+)
+{
+    #ifdef FULLDEBUG
+    if (i<0 || i>=mRows_)
+    {
+        FatalErrorInFunction
+            << "Index " << i << " out of range 0 ... " << mRows_-1
+            << abort(FatalError);
+    }
+    if (j<0 || j>=nCols_)
+    {
+        FatalErrorInFunction
+            << "Index " << j << " out of range 0 ... " << nCols_-1
+            << abort(FatalError);
+    }
+    #endif
+
+    return matrix_(i + rowStart_, j + colStart_);
+}
+
+
+// ************************************************************************* //

From ecc608d1c5b7286ba58a2a931b1c12fcdda3a7fd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 23 Mar 2016 12:52:35 +0000
Subject: [PATCH 331/447] SquareMatrix, RectangularMatrix: Updated block
 handling

Added 'typeOfInnerProduct' support to ensure the correct type is
returned from the matrix product operator.
---
 .../RectangularMatrix/RectangularMatrix.H     |  36 +++++-
 .../RectangularMatrix/RectangularMatrixI.H    |  30 ++++-
 .../matrices/SquareMatrix/SquareMatrix.C      |   2 +-
 .../matrices/SquareMatrix/SquareMatrix.H      |  40 ++++++-
 .../matrices/SquareMatrix/SquareMatrixI.H     | 103 +++++++++++++++++-
 .../SymmetricSquareMatrix.C                   |   6 +-
 6 files changed, 205 insertions(+), 12 deletions(-)

diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
index a947d8105f..7167a23f0c 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
@@ -39,6 +39,7 @@ SourceFiles
 #define RectangularMatrix_H
 
 #include "Matrix.H"
+#include "SquareMatrix.H"
 #include "Identity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -67,7 +68,12 @@ public:
         inline RectangularMatrix(const label m, const label n);
 
         //- Construct from a block of another matrix
-        inline RectangularMatrix(const typename RectangularMatrix::Block&);
+        template<class MatrixType>
+        inline RectangularMatrix(const ConstMatrixBlock<MatrixType>&);
+
+        //- Construct from a block of another matrix
+        template<class MatrixType>
+        inline RectangularMatrix(const MatrixBlock<MatrixType>&);
 
         //- Construct with given number of rows and columns
         //  initializing all elements to zero
@@ -81,6 +87,9 @@ public:
         //  and value for all elements.
         inline RectangularMatrix(const label m, const label n, const Type&);
 
+        //- Construct as copy of a square matrix
+        inline RectangularMatrix(const SquareMatrix<Type>&);
+
         //- Construct from Istream.
         inline RectangularMatrix(Istream&);
 
@@ -97,6 +106,31 @@ public:
 
 // Global functions and operators
 
+template<class Type>
+class typeOfInnerProduct<Type, RectangularMatrix<Type>, RectangularMatrix<Type>>
+{
+public:
+
+    typedef RectangularMatrix<Type> type;
+};
+
+template<class Type>
+class typeOfInnerProduct<Type, RectangularMatrix<Type>, SquareMatrix<Type>>
+{
+public:
+
+    typedef RectangularMatrix<Type> type;
+};
+
+template<class Type>
+class typeOfInnerProduct<Type, SquareMatrix<Type>, RectangularMatrix<Type>>
+{
+public:
+
+    typedef RectangularMatrix<Type> type;
+};
+
+
 template<class Type>
 RectangularMatrix<Type> outer(const Field<Type>& f1, const Field<Type>& f2);
 
diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
index 631cc8b93c..f7a26784dc 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
@@ -44,9 +44,21 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix
 
 
 template<class Type>
+template<class MatrixType>
 inline Foam::RectangularMatrix<Type>::RectangularMatrix
 (
-    const typename RectangularMatrix::Block& block
+    const ConstMatrixBlock<MatrixType>& block
+)
+:
+    Matrix<RectangularMatrix<Type>, Type>(block)
+{}
+
+
+template<class Type>
+template<class MatrixType>
+inline Foam::RectangularMatrix<Type>::RectangularMatrix
+(
+    const MatrixBlock<MatrixType>& block
 )
 :
     Matrix<RectangularMatrix<Type>, Type>(block)
@@ -74,7 +86,7 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix
 :
     Matrix<RectangularMatrix<Type>, Type>(n, n, Zero)
 {
-    for (label i = 0; i < n; ++i)
+    for (label i = 0; i < n; i++)
     {
         this->operator()(i, i) = I;
     }
@@ -93,6 +105,16 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix
 {}
 
 
+template<class Type>
+inline Foam::RectangularMatrix<Type>::RectangularMatrix
+(
+    const SquareMatrix<Type>& SM
+)
+:
+    Matrix<RectangularMatrix<Type>, Type>(SM)
+{}
+
+
 template<class Type>
 inline Foam::RectangularMatrix<Type>::RectangularMatrix(Istream& is)
 :
@@ -136,9 +158,9 @@ inline Foam::RectangularMatrix<Type> outer
 {
     RectangularMatrix<Type> f1f2T(f1.size(), f2.size());
 
-    for (label i=0; i<f1f2T.m(); ++i)
+    for (label i=0; i<f1f2T.m(); i++)
     {
-        for (label j=0; j<f1f2T.n(); ++j)
+        for (label j=0; j<f1f2T.n(); j++)
         {
             f1f2T(i, j) = f1[i]*f2[j];
         }
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
index cf34d78a21..2d3ad7e79d 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
@@ -37,7 +37,7 @@ Foam::scalar Foam::detDecomposed
 {
     Type diagProduct = pTraits<Type>::one;
 
-    for (label i = 0; i < matrix.m(); ++i)
+    for (label i = 0; i < matrix.m(); i++)
     {
         diagProduct *= matrix(i, i);
     }
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
index 39403194d5..2af8a5d542 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
@@ -45,6 +45,12 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of friend functions and operators
+
+template<class Type>
+class RectangularMatrix;
+
+
 /*---------------------------------------------------------------------------*\
                            Class Matrix Declaration
 \*---------------------------------------------------------------------------*/
@@ -65,10 +71,22 @@ public:
         //- Construct given number of rows/columns.
         inline SquareMatrix(const label n);
 
+        //- Construct from a block of another matrix
+        template<class MatrixType>
+        inline SquareMatrix(const ConstMatrixBlock<MatrixType>&);
+
+        //- Construct from a block of another matrix
+        template<class MatrixType>
+        inline SquareMatrix(const MatrixBlock<MatrixType>&);
+
         //- Construct given number of rows/columns
         //  initializing all elements to zero
         inline SquareMatrix(const label n, const zero);
 
+        //- Construct given number of rows and columns (checked to be equal)
+        //  initializing all elements to zero
+        inline SquareMatrix(const label m, const label n, const zero);
+
         //- Construct given number of rows/columns
         //  Initializing to the identity matrix
         inline SquareMatrix(const label n, const Identity<Type>);
@@ -77,15 +95,25 @@ public:
         //  initializing all elements to the given value
         inline SquareMatrix(const label n, const Type&);
 
+        //- Construct as copy of a RectangularMatrix
+        //  which is checked to be square
+        inline explicit SquareMatrix(const RectangularMatrix<Type>&);
+
         //- Construct from Istream.
         inline SquareMatrix(Istream&);
 
         //- Clone
         inline autoPtr<SquareMatrix<Type>> clone() const;
+
+
+    // Member operators
+
+        //- Assignment of all entries to zero
+        void operator=(const zero);
 };
 
 
-// Global functions
+// Global functions and operators
 
 //- Return the LU decomposed SquareMatrix det
 template<class Type>
@@ -99,6 +127,14 @@ scalar det(const SquareMatrix<Type>&);
 template<class Type>
 scalar det(SquareMatrix<Type>&);
 
+template<class Type>
+class typeOfInnerProduct<Type, SquareMatrix<Type>, SquareMatrix<Type>>
+{
+public:
+
+    typedef SquareMatrix<Type> type;
+};
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -106,7 +142,7 @@ scalar det(SquareMatrix<Type>&);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    #include "SquareMatrixI.H"
+#include "SquareMatrixI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
index ffa595d51d..873259380e 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
@@ -39,6 +39,28 @@ inline Foam::SquareMatrix<Type>::SquareMatrix(const label n)
 {}
 
 
+template<class Type>
+template<class MatrixType>
+inline Foam::SquareMatrix<Type>::SquareMatrix
+(
+    const ConstMatrixBlock<MatrixType>& block
+)
+:
+    Matrix<SquareMatrix<Type>, Type>(block)
+{}
+
+
+template<class Type>
+template<class MatrixType>
+inline Foam::SquareMatrix<Type>::SquareMatrix
+(
+    const MatrixBlock<MatrixType>& block
+)
+:
+    Matrix<SquareMatrix<Type>, Type>(block)
+{}
+
+
 template<class Type>
 inline Foam::SquareMatrix<Type>::SquareMatrix
 (
@@ -50,6 +72,26 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
 {}
 
 
+template<class Type>
+inline Foam::SquareMatrix<Type>::SquareMatrix
+(
+    const label m,
+    const label n,
+    const zero
+)
+:
+    Matrix<SquareMatrix<Type>, Type>(m, n, Zero)
+{
+    if (m != n)
+    {
+        FatalErrorInFunction
+            << "Attempt to construct a square matrix "
+            << m << " x " << n << nl
+            << abort(FatalError);
+    }
+}
+
+
 template<class Type>
 inline Foam::SquareMatrix<Type>::SquareMatrix
 (
@@ -59,7 +101,7 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
 :
     Matrix<SquareMatrix<Type>, Type>(n, n, Zero)
 {
-    for (label i = 0; i < n; ++i)
+    for (label i = 0; i < n; i++)
     {
         this->operator()(i, i) = I;
     }
@@ -77,6 +119,24 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
 {}
 
 
+template<class Type>
+inline Foam::SquareMatrix<Type>::SquareMatrix
+(
+    const RectangularMatrix<Type>& RM
+)
+:
+    Matrix<SquareMatrix<Type>, Type>(RM)
+{
+    if (this->m() != this->n())
+    {
+        FatalErrorInFunction
+            << "Attempt to construct a square matrix from a rectangular matrix "
+            << this->m() << " x " << this->n() << nl
+            << abort(FatalError);
+    }
+}
+
+
 template<class Type>
 inline Foam::SquareMatrix<Type>::SquareMatrix(Istream& is)
 :
@@ -92,4 +152,45 @@ Foam::SquareMatrix<Type>::clone() const
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::SquareMatrix<Type>::operator=(const zero)
+{
+    Matrix<SquareMatrix<Type>, Type>::operator=(Zero);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+inline Foam::SquareMatrix<Type> symmOuter
+(
+    const Field<Type>& f1,
+    const Field<Type>& f2
+)
+{
+    SquareMatrix<Type> f1f2T(f1.size());
+
+    for (label i=0; i<f1f2T.m(); i++)
+    {
+        for (label j=0; j<f1f2T.n(); j++)
+        {
+            f1f2T(i, j) = f1[i]*f2[j];
+        }
+    }
+
+    return f1f2T;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
index dcb31ef241..167b6f7da9 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
@@ -37,11 +37,11 @@ Foam::SymmetricSquareMatrix<Type> Foam::invDecomposed
 
     SymmetricSquareMatrix<Type> inv(n, Zero);
 
-    for (label i = 0; i < n; ++i)
+    for (label i = 0; i < n; i++)
     {
         inv(i, i) = 1.0/matrix(i, i);
 
-        for (label j = 0; j < i; ++j)
+        for (label j = 0; j < i; j++)
         {
             Type sum = Zero;
 
@@ -89,7 +89,7 @@ Type Foam::detDecomposed(const SymmetricSquareMatrix<Type>& matrix)
 {
     Type diagProduct = pTraits<Type>::one;
 
-    for (label i = 0; i < matrix.m(); ++i)
+    for (label i = 0; i < matrix.m(); i++)
     {
         diagProduct *= matrix(i, i);
     }

From 0945cfd35f622d826ae86787c9f921d322e62bcd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 23 Mar 2016 15:33:03 +0000
Subject: [PATCH 332/447] LLTMatrix: New matrix form to support Cholesky
 decomposition of symmetric positive-definite matrices and the solution of
 associated linear systems.

---
 applications/test/Matrix/Test-Matrix.C      |  22 ++++
 src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C | 138 ++++++++++++++++++++
 src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H |  98 ++++++++++++++
 3 files changed, 258 insertions(+)
 create mode 100644 src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
 create mode 100644 src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H

diff --git a/applications/test/Matrix/Test-Matrix.C b/applications/test/Matrix/Test-Matrix.C
index 95cfa4c1af..c8691e81b5 100644
--- a/applications/test/Matrix/Test-Matrix.C
+++ b/applications/test/Matrix/Test-Matrix.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "scalarMatrices.H"
+#include "LLTMatrix.H"
 #include "vector.H"
 #include "tensor.H"
 #include "IFstream.H"
@@ -139,6 +140,27 @@ int main(int argc, char *argv[])
         Info<< "det = " << detDecomposed(squareMatrix, sign) << endl;
     }
 
+    {
+        scalarSquareMatrix squareMatrix(3, Zero);
+
+        squareMatrix(0, 0) = 4;
+        squareMatrix(0, 1) = 12;
+        squareMatrix(0, 2) = -16;
+        squareMatrix(1, 0) = 12;
+        squareMatrix(1, 1) = 37;
+        squareMatrix(1, 2) = -43;
+        squareMatrix(2, 0) = -16;
+        squareMatrix(2, 1) = -43;
+        squareMatrix(2, 2) = 98;
+
+        scalarField source(3, 1);
+
+        LLTMatrix<scalar> LLT(squareMatrix);
+        scalarField x(LLT.solve(source));
+
+        Info<< "LLT solve residual " << (squareMatrix*x - source) << endl;
+    }
+
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
new file mode 100644
index 0000000000..3424695007
--- /dev/null
+++ b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "LLTMatrix.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+void Foam::LLTMatrix<Type>::decompose()
+{
+    SquareMatrix<Type>& LLT = *this;
+    const label m = LLT.m();
+
+    for (label i = 0; i < m; i++)
+    {
+        for (label j = 0; j < m; j++)
+        {
+            if (j > i)
+            {
+                LLT(i, j) = Zero;
+                continue;
+            }
+
+            Type sum = LLT(i, j);
+
+            for (label k = 0; k < j; k++)
+            {
+                sum -= LLT(i, k)*LLT(j, k);
+            }
+
+            if (i > j)
+            {
+                LLT(i, j) = sum/LLT(j, j);
+            }
+            else if (sum > 0)
+            {
+                LLT(i, i) = sqrt(sum);
+            }
+            else
+            {
+                FatalErrorInFunction
+                    << "Cholesky decomposition failed, "
+                       "matrix is not symmetric positive definite"
+                    << abort(FatalError);
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::LLTMatrix<Type>::LLTMatrix(const SquareMatrix<Type>& M)
+:
+    SquareMatrix<Type>(M)
+{
+    decompose();
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::LLTMatrix<Type>::solve
+(
+    Field<Type>& x,
+    const Field<Type>& source
+) const
+{
+    const SquareMatrix<Type>& LLT = *this;
+    const label m = LLT.m();
+
+    for (label i = 0; i < m; i++)
+    {
+        Type sum = source[i];
+
+        for (label j = 0; j < i; j++)
+        {
+            sum = sum - LLT(i, j)*x[j];
+        }
+
+        x[i] = sum/LLT(i, i);
+    }
+
+    for (int i = m - 1; i >= 0; i--)
+    {
+        Type sum = x[i];
+
+        for (label j = i + 1; j < m; j++)
+        {
+            sum = sum - LLT(j, i)*x[j];
+        }
+
+        x[i] = sum/LLT(i, i);
+    }
+
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>> Foam::LLTMatrix<Type>::solve
+(
+    const Field<Type>& source
+) const
+{
+    tmp<Field<Type>> tx(new Field<Type>(this->m()));
+    Field<Type>& x = tx.ref();
+
+    solve(x, source);
+
+    return tx;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H
new file mode 100644
index 0000000000..119ea726f6
--- /dev/null
+++ b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::LLTMatrix
+
+Description
+    Templated class to perform the Cholesky decomposition on a
+    symmetric positive-definite matrix.
+
+    Member functions are provided to solve linear systems using the LLT
+    decomposition.
+
+SourceFiles
+    LLTMatrix.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef LLTMatrix_H
+#define LLTMatrix_H
+
+#include "SquareMatrix.H"
+#include "Field.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class LLTMatrix Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class LLTMatrix
+:
+    public SquareMatrix<Type>
+{
+    // Private Member Functions
+
+        //- Perform the Cholesky decomposition of the matrix
+        void decompose();
+
+public:
+
+    // Constructors
+
+        //- Construct from a square matrix and perform the decomposition
+        LLTMatrix(const SquareMatrix<Type>& M);
+
+
+    // Member Functions
+
+        //- Solve the linear system with the given source
+        //  and returning the solution in the Field argument x
+        void solve(Field<Type>& x, const Field<Type>& source) const;
+
+        //- Solve the linear system with the given source
+        //  returning the solution
+        tmp<Field<Type>> solve(const Field<Type>& source) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "LLTMatrix.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From a08adf25de7881ddec814ecbb7bba848c54c6a8f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 23 Mar 2016 15:34:19 +0000
Subject: [PATCH 333/447] LUscalarMatrix: Updated code layout

---
 src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
index 226cd63a80..fc289fb3a5 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
@@ -67,6 +67,9 @@ class LUscalarMatrix
         //- The pivot indices used in the LU decomposition
         labelList pivotIndices_;
 
+
+    // Private member functions
+
         //- Convert the given lduMatrix into this LUscalarMatrix
         void convert
         (

From 1ec47384bb98eb9923cf1cd790a5d452e3d8de27 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 23 Mar 2016 18:27:04 +0000
Subject: [PATCH 334/447] src/OpenFOAM/matrices: Reformatted for-loops
 consistently

---
 src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C   | 14 ++--
 src/OpenFOAM/matrices/Matrix/MatrixIO.C       |  6 +-
 .../RectangularMatrix/RectangularMatrixI.H    |  2 +-
 .../matrices/SquareMatrix/SquareMatrix.C      |  2 +-
 .../matrices/SquareMatrix/SquareMatrixI.H     |  2 +-
 .../SymmetricSquareMatrix.C                   | 14 ++--
 .../SymmetricSquareMatrixI.H                  |  2 +-
 .../lduMatrix/lduAddressing/lduAddressing.C   |  2 +-
 .../lduMatrixUpdateMatrixInterfaces.C         |  4 +-
 .../GAMGAgglomerateLduAddressing.C            |  4 +-
 .../GAMGAgglomeration/GAMGAgglomeration.C     |  4 +-
 .../GAMGAgglomerationTemplates.C              |  2 +-
 .../matrices/scalarMatrices/SVD/SVD.C         | 72 +++++++++----------
 .../matrices/scalarMatrices/SVD/SVDI.H        |  4 +-
 .../matrices/scalarMatrices/scalarMatrices.C  | 20 +++---
 .../scalarMatrices/scalarMatricesTemplates.C  |  6 +-
 16 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
index 3424695007..021d733a0d 100644
--- a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
+++ b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
@@ -33,9 +33,9 @@ void Foam::LLTMatrix<Type>::decompose()
     SquareMatrix<Type>& LLT = *this;
     const label m = LLT.m();
 
-    for (label i = 0; i < m; i++)
+    for (label i=0; i<m; i++)
     {
-        for (label j = 0; j < m; j++)
+        for (label j=0; j<m; j++)
         {
             if (j > i)
             {
@@ -45,7 +45,7 @@ void Foam::LLTMatrix<Type>::decompose()
 
             Type sum = LLT(i, j);
 
-            for (label k = 0; k < j; k++)
+            for (label k=0; k<j; k++)
             {
                 sum -= LLT(i, k)*LLT(j, k);
             }
@@ -93,11 +93,11 @@ void Foam::LLTMatrix<Type>::solve
     const SquareMatrix<Type>& LLT = *this;
     const label m = LLT.m();
 
-    for (label i = 0; i < m; i++)
+    for (label i=0; i<m; i++)
     {
         Type sum = source[i];
 
-        for (label j = 0; j < i; j++)
+        for (label j=0; j<i; j++)
         {
             sum = sum - LLT(i, j)*x[j];
         }
@@ -105,11 +105,11 @@ void Foam::LLTMatrix<Type>::solve
         x[i] = sum/LLT(i, i);
     }
 
-    for (int i = m - 1; i >= 0; i--)
+    for (int i=m - 1; i >= 0; i--)
     {
         Type sum = x[i];
 
-        for (label j = i + 1; j < m; j++)
+        for (label j=i + 1; j<m; j++)
         {
             sum = sum - LLT(j, i)*x[j];
         }
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixIO.C b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
index 51943ada59..13f613d74e 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixIO.C
+++ b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
@@ -168,7 +168,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
             {
                 uniform = true;
 
-                for (label i=0; i< mn; i++)
+                for (label i=0; i<mn; i++)
                 {
                     if (v[i] != v[0])
                     {
@@ -197,7 +197,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
                 label k = 0;
 
                 // loop over rows
-                for (label i=0; i< M.m(); i++)
+                for (label i=0; i<M.m(); i++)
                 {
                     os  << token::BEGIN_LIST;
 
@@ -222,7 +222,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix<Form, Type>& M)
                 label k = 0;
 
                 // loop over rows
-                for (label i=0; i< M.m(); i++)
+                for (label i=0; i<M.m(); i++)
                 {
                     os  << nl << token::BEGIN_LIST;
 
diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
index f7a26784dc..1cb6e0c0c9 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
@@ -86,7 +86,7 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix
 :
     Matrix<RectangularMatrix<Type>, Type>(n, n, Zero)
 {
-    for (label i = 0; i < n; i++)
+    for (label i=0; i<n; i++)
     {
         this->operator()(i, i) = I;
     }
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
index 2d3ad7e79d..69683ce96d 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.C
@@ -37,7 +37,7 @@ Foam::scalar Foam::detDecomposed
 {
     Type diagProduct = pTraits<Type>::one;
 
-    for (label i = 0; i < matrix.m(); i++)
+    for (label i=0; i<matrix.m(); i++)
     {
         diagProduct *= matrix(i, i);
     }
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
index 873259380e..38dcb15926 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
@@ -101,7 +101,7 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
 :
     Matrix<SquareMatrix<Type>, Type>(n, n, Zero)
 {
-    for (label i = 0; i < n; i++)
+    for (label i=0; i<n; i++)
     {
         this->operator()(i, i) = I;
     }
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
index 167b6f7da9..879f8ac7e1 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
@@ -37,15 +37,15 @@ Foam::SymmetricSquareMatrix<Type> Foam::invDecomposed
 
     SymmetricSquareMatrix<Type> inv(n, Zero);
 
-    for (label i = 0; i < n; i++)
+    for (label i=0; i<n; i++)
     {
         inv(i, i) = 1.0/matrix(i, i);
 
-        for (label j = 0; j < i; j++)
+        for (label j=0; j<i; j++)
         {
             Type sum = Zero;
 
-            for (label k = j; k < i; k++)
+            for (label k=j; k<i; k++)
             {
                 sum -= matrix(i, k)*inv(k, j);
             }
@@ -56,11 +56,11 @@ Foam::SymmetricSquareMatrix<Type> Foam::invDecomposed
 
     SymmetricSquareMatrix<Type> result(n, Zero);
 
-    for (label k = 0; k < n; k++)
+    for (label k=0; k<n; k++)
     {
-        for (label i = 0; i <= k; i++)
+        for (label i=0; i <= k; i++)
         {
-            for (label j = 0; j <= k; j++)
+            for (label j=0; j <= k; j++)
             {
                 result(i, j) += inv(k, i)*inv(k, j);
             }
@@ -89,7 +89,7 @@ Type Foam::detDecomposed(const SymmetricSquareMatrix<Type>& matrix)
 {
     Type diagProduct = pTraits<Type>::one;
 
-    for (label i = 0; i < matrix.m(); i++)
+    for (label i=0; i<matrix.m(); i++)
     {
         diagProduct *= matrix(i, i);
     }
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
index 821daf199b..333da73f5d 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
@@ -59,7 +59,7 @@ inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix
 :
     Matrix<SymmetricSquareMatrix<Type>, Type>(n, n, Zero)
 {
-    for (label i = 0; i < n; i++)
+    for (label i=0; i<n; i++)
     {
         this->operator()(i, i) = pTraits<Type>::one;
     }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
index 091b6b2695..269fc2150b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
@@ -227,7 +227,7 @@ Foam::label Foam::lduAddressing::triIndex(const label a, const label b) const
 
     const labelUList& neighbour = upperAddr();
 
-    for (label i = startLabel; i < endLabel; i++)
+    for (label i=startLabel; i<endLabel; i++)
     {
         if (neighbour[i] == nbr)
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index 36db4b5f0f..481e504734 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
         // Try and consume interfaces as they become available
         bool allUpdated = false;
 
-        for (label i = 0; i < UPstream::nPollProcInterfaces; i++)
+        for (label i=0; i<UPstream::nPollProcInterfaces; i++)
         {
             allUpdated = true;
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index eb640e2010..9d41b183b9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -640,7 +640,7 @@ void Foam::GAMGAgglomeration::combineLevels(const label curLevel)
 //    {
 //        vals[0] = myVal;
 //
-//        for (label i = 1; i < procIDs.size(); i++)
+//        for (label i=1; i<procIDs.size(); i++)
 //        {
 //            label& slaveVal = vals[i];
 //            IPstream::read
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index 6092a56a67..63bdd3a021 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -656,7 +656,7 @@ bool Foam::GAMGAgglomeration::checkRestriction
             labelList& newCoarse = coarseToNewCoarse[coarseI];
             newCoarse.setSize(masters.size());
             newCoarse[0] = coarseI;
-            for (label i = 1; i < newCoarse.size(); i++)
+            for (label i=1; i<newCoarse.size(); i++)
             {
                 newCoarse[i] = nNewCoarse++;
             }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
index ba9f55614f..372accc31b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
@@ -44,7 +44,7 @@ void Foam::GAMGAgglomeration::gatherList
         allVals.setSize(procIDs.size());
 
         allVals[0] = myVal;
-        for (label i = 1; i < procIDs.size(); i++)
+        for (label i=1; i<procIDs.size(); i++)
         {
             IPstream fromSlave
             (
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
index 1bb8ab1cad..4c833cd40a 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
@@ -48,9 +48,9 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
     scalar scale = 0;
     scalar s = 0;
     scalar anorm = 0;
-    label l = 0;
+    label l=0;
 
-    for (label i = 0; i < Un; i++)
+    for (label i=0; i<Un; i++)
     {
         l = i+2;
         rv1[i] = scale*g;
@@ -58,14 +58,14 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
 
         if (i < Um)
         {
-            for (label k = i; k < Um; k++)
+            for (label k=i; k<Um; k++)
             {
                 scale += mag(U_(k, i));
             }
 
             if (scale != 0)
             {
-                for (label k = i; k < Um; k++)
+                for (label k=i; k<Um; k++)
                 {
                     U_(k, i) /= scale;
                     s += U_(k, i)*U_(k, i);
@@ -76,22 +76,22 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                 scalar h = f*g - s;
                 U_(i, i) = f - g;
 
-                for (label j = l-1; j < Un; j++)
+                for (label j=l-1; j<Un; j++)
                 {
                     s = 0;
-                    for (label k = i; k < Um; k++)
+                    for (label k=i; k<Um; k++)
                     {
                         s += U_(k, i)*U_(k, j);
                     }
 
                     f = s/h;
-                    for (label k = i; k < A.m(); k++)
+                    for (label k=i; k<A.m(); k++)
                     {
                         U_(k, j) += f*U_(k, i);
                     }
                 }
 
-                for (label k = i; k < Um; k++)
+                for (label k=i; k<Um; k++)
                 {
                     U_(k, i) *= scale;
                 }
@@ -104,14 +104,14 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
 
         if (i+1 <= Um && i != Un)
         {
-            for (label k = l-1; k < Un; k++)
+            for (label k=l-1; k<Un; k++)
             {
                 scale += mag(U_(i, k));
             }
 
             if (scale != 0)
             {
-                for (label k=l-1; k < Un; k++)
+                for (label k=l-1; k<Un; k++)
                 {
                     U_(i, k) /= scale;
                     s += U_(i, k)*U_(i, k);
@@ -122,25 +122,25 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                 scalar h = f*g - s;
                 U_[i][l-1] = f - g;
 
-                for (label k = l-1; k < Un; k++)
+                for (label k=l-1; k<Un; k++)
                 {
                     rv1[k] = U_(i, k)/h;
                 }
 
-                for (label j = l-1; j < Um; j++)
+                for (label j=l-1; j<Um; j++)
                 {
                     s = 0;
-                    for (label k = l-1; k < Un; k++)
+                    for (label k=l-1; k<Un; k++)
                     {
                         s += U_(j, k)*U_(i, k);
                     }
 
-                    for (label k = l-1; k < Un; k++)
+                    for (label k=l-1; k<Un; k++)
                     {
                         U_(j, k) += s*rv1[k];
                     }
                 }
-                for (label k = l-1; k < Un; k++)
+                for (label k=l-1; k<Un; k++)
                 {
                     U_(i, k) *= scale;
                 }
@@ -150,33 +150,33 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         anorm = max(anorm, mag(S_[i]) + mag(rv1[i]));
     }
 
-    for (label i = Un-1; i >= 0; i--)
+    for (label i=Un-1; i >= 0; i--)
     {
         if (i < Un-1)
         {
             if (g != 0)
             {
-                for (label j = l; j < Un; j++)
+                for (label j=l; j<Un; j++)
                 {
                     V_(j, i) = (U_(i, j)/U_(i, l))/g;
                 }
 
-                for (label j=l; j < Un; j++)
+                for (label j=l; j<Un; j++)
                 {
                     s = 0;
-                    for (label k = l; k < Un; k++)
+                    for (label k=l; k<Un; k++)
                     {
                         s += U_(i, k)*V_(k, j);
                     }
 
-                    for (label k = l; k < Un; k++)
+                    for (label k=l; k<Un; k++)
                     {
                         V_(k, j) += s*V_(k, i);
                     }
                 }
             }
 
-            for (label j = l; j < Un;j++)
+            for (label j=l; j<Un;j++)
             {
                 V_(i, j) = V_(j, i) = 0.0;
             }
@@ -187,12 +187,12 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         l = i;
     }
 
-    for (label i = min(Un, Um) - 1; i >= 0; i--)
+    for (label i=min(Un, Um) - 1; i>=0; i--)
     {
         l = i+1;
         g = S_[i];
 
-        for (label j = l; j < Un; j++)
+        for (label j=l; j<Un; j++)
         {
             U_(i, j) = 0.0;
         }
@@ -201,30 +201,30 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         {
             g = 1.0/g;
 
-            for (label j = l; j < Un; j++)
+            for (label j=l; j<Un; j++)
             {
                 s = 0;
-                for (label k = l; k < Um; k++)
+                for (label k=l; k<Um; k++)
                 {
                     s += U_(k, i)*U_(k, j);
                 }
 
                 scalar f = (s/U_(i, i))*g;
 
-                for (label k = i; k < Um; k++)
+                for (label k=i; k<Um; k++)
                 {
                     U_(k, j) += f*U_(k, i);
                 }
             }
 
-            for (label j = i; j < Um; j++)
+            for (label j=i; j<Um; j++)
             {
                 U_(j, i) *= g;
             }
         }
         else
         {
-            for (label j = i; j < Um; j++)
+            for (label j=i; j<Um; j++)
             {
                 U_(j, i) = 0.0;
             }
@@ -233,7 +233,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
         ++U_(i, i);
     }
 
-    for (label k = Un-1; k >= 0; k--)
+    for (label k=Un-1; k >= 0; k--)
     {
         for (label its = 0; its < 35; its++)
         {
@@ -255,7 +255,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
             {
                 scalar c = 0.0;
                 s = 1.0;
-                for (label i = l; i < k+1; i++)
+                for (label i=l; i<k+1; i++)
                 {
                     scalar f = s*rv1[i];
                     rv1[i] = c*rv1[i];
@@ -269,7 +269,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                     c = g*h;
                     s = -f*h;
 
-                    for (label j = 0; j < Um; j++)
+                    for (label j=0; j<Um; j++)
                     {
                         scalar y = U_[j][mn];
                         scalar z = U_(j, i);
@@ -287,7 +287,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
                 {
                     S_[k] = -z;
 
-                    for (label j = 0; j < Un; j++) V_(j, k) = -V_(j, k);
+                    for (label j=0; j<Un; j++) V_(j, k) = -V_(j, k);
                 }
                 break;
             }
@@ -309,9 +309,9 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
             scalar c = 1.0;
             s = 1.0;
 
-            for (label j = l; j <= mn; j++)
+            for (label j=l; j <= mn; j++)
             {
-                label i = j + 1;
+                label i=j + 1;
                 g = rv1[i];
                 y = S_[i];
                 h = s*g;
@@ -379,9 +379,9 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
     multiply(SVDA, U_, S_, transpose(V_));
     scalar maxDiff = 0;
     scalar diff = 0;
-    for (label i = 0; i < A.m(); i++)
+    for (label i=0; i<A.m(); i++)
     {
-        for (label j = 0; j < A.n(); j++)
+        for (label j=0; j<A.n(); j++)
         {
             diff = mag(A(i, j) - SVDA(i, j));
             if (diff > maxDiff) maxDiff = diff;
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVDI.H b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVDI.H
index d35cb53c9d..c3fdb9bb1a 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVDI.H
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVDI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ inline Foam::label Foam::SVD::nZeros() const
 inline Foam::scalar Foam::SVD::minNonZeroS() const
 {
     scalar minS = S_[0];
-    for (label i = 1; i < S_.size(); i++)
+    for (label i=1; i<S_.size(); i++)
     {
         scalar s = S_[i];
         if (s > VSMALL && s < minS) minS = s;
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
index 0317fc27ae..d96ffb903e 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
@@ -151,23 +151,23 @@ void Foam::LUDecompose(scalarSymmetricSquareMatrix& matrix)
     label size = matrix.m();
 
     // Set upper triangular parts to zero.
-    for (label j = 0; j < size; j++)
+    for (label j=0; j<size; j++)
     {
-        for (label k = j + 1; k < size; k++)
+        for (label k=j + 1; k<size; k++)
         {
             matrix(j, k) = 0.0;
         }
     }
 
-    for (label j = 0; j < size; j++)
+    for (label j=0; j<size; j++)
     {
         scalar d = 0.0;
 
-        for (label k = 0; k < j; k++)
+        for (label k=0; k<j; k++)
         {
             scalar s = 0.0;
 
-            for (label i = 0; i < k; i++)
+            for (label i=0; i<k; i++)
             {
                 s += matrix(i, k)*matrix(i, j);
             }
@@ -223,14 +223,14 @@ void Foam::multiply
 
     ans = scalarRectangularMatrix(A.m(), C.n(), scalar(0));
 
-    for (label i = 0; i < A.m(); i++)
+    for (label i=0; i<A.m(); i++)
     {
         for (label g = 0; g < C.n(); g++)
         {
-            for (label l = 0; l < C.m(); l++)
+            for (label l=0; l<C.m(); l++)
             {
                 scalar ab = 0;
-                for (label j = 0; j < A.n(); j++)
+                for (label j=0; j<A.n(); j++)
                 {
                     ab += A(i, j)*B(j, l);
                 }
@@ -267,11 +267,11 @@ void Foam::multiply
 
     ans = scalarRectangularMatrix(A.m(), C.n(), scalar(0));
 
-    for (label i = 0; i < A.m(); i++)
+    for (label i=0; i<A.m(); i++)
     {
         for (label g = 0; g < C.n(); g++)
         {
-            for (label l = 0; l < C.m(); l++)
+            for (label l=0; l<C.m(); l++)
             {
                 ans(i, g) += C(l, g) * A(i, l)*B[l];
             }
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
index 52413a38dd..915b00d95a 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
@@ -251,11 +251,11 @@ void Foam::multiply
 
     ans = Matrix<Form, Type>(A.m(), B.n(), scalar(0));
 
-    for (label i = 0; i < A.m(); i++)
+    for (label i=0; i<A.m(); i++)
     {
-        for (label j = 0; j < B.n(); j++)
+        for (label j=0; j<B.n(); j++)
         {
-            for (label l = 0; l < B.m(); l++)
+            for (label l=0; l<B.m(); l++)
             {
                 ans(i, j) += A(i, l)*B(l, j);
             }

From 1fdcefb46467e4c47eff3a0176faea0d495e9fbe Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 24 Mar 2016 14:47:41 +0000
Subject: [PATCH 335/447] LLTMatrix: Add support for updating the decomposition
 from a new matrix

---
 src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C | 30 ++++++++++-----------
 src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H |  7 +++--
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
index 021d733a0d..e160180240 100644
--- a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
+++ b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
@@ -25,12 +25,25 @@ License
 
 #include "LLTMatrix.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::LLTMatrix<Type>::decompose()
+Foam::LLTMatrix<Type>::LLTMatrix(const SquareMatrix<Type>& M)
+{
+    decompose(M);
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::LLTMatrix<Type>::decompose(const SquareMatrix<Type>& M)
 {
     SquareMatrix<Type>& LLT = *this;
+
+    // Initialize the LLT decomposition matrix to M
+    LLT = M;
+
     const label m = LLT.m();
 
     for (label i=0; i<m; i++)
@@ -70,19 +83,6 @@ void Foam::LLTMatrix<Type>::decompose()
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::LLTMatrix<Type>::LLTMatrix(const SquareMatrix<Type>& M)
-:
-    SquareMatrix<Type>(M)
-{
-    decompose();
-}
-
-
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
-
 template<class Type>
 void Foam::LLTMatrix<Type>::solve
 (
diff --git a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H
index 119ea726f6..9a48c38cd7 100644
--- a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H
+++ b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H
@@ -56,10 +56,6 @@ class LLTMatrix
 :
     public SquareMatrix<Type>
 {
-    // Private Member Functions
-
-        //- Perform the Cholesky decomposition of the matrix
-        void decompose();
 
 public:
 
@@ -71,6 +67,9 @@ public:
 
     // Member Functions
 
+        //- Perform the Cholesky decomposition of the matrix
+        void decompose(const SquareMatrix<Type>& M);
+
         //- Solve the linear system with the given source
         //  and returning the solution in the Field argument x
         void solve(Field<Type>& x, const Field<Type>& source) const;

From 0ce3586094b31b6dc79e49d811364039fce09564 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 24 Mar 2016 14:48:28 +0000
Subject: [PATCH 336/447] Matrix: correct docs

---
 src/OpenFOAM/matrices/Matrix/Matrix.H | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 9385d42d87..22e289a689 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -247,7 +247,7 @@ public:
             void transfer(mType&);
 
             //- Resize the matrix preserving the elements
-            void setSize(const label m, const label nCols);
+            void setSize(const label m, const label n);
 
 
         //- Return the transpose of the matrix
@@ -279,10 +279,10 @@ public:
         template<class MatrixType>
         void operator=(const MatrixBlock<MatrixType>&);
 
-        //- Assignment of all entries to zero
+        //- Assignment of all elements to zero
         void operator=(const zero);
 
-        //- Assignment of all entries to the given value
+        //- Assignment of all elements to the given value
         void operator=(const Type&);
 
 

From 9bbf09573b0b5a4abbe160e237b664d8ebb77597 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 24 Mar 2016 14:48:59 +0000
Subject: [PATCH 337/447] SquareMatrix: Add setSize and assignment to identity

---
 .../RectangularMatrix/RectangularMatrix.H     |  2 +-
 .../matrices/SquareMatrix/SquareMatrix.H      | 13 +++++++++++-
 .../matrices/SquareMatrix/SquareMatrixI.H     | 20 +++++++++++++++++++
 .../scalarMatrices/scalarMatricesTemplates.C  |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
index 7167a23f0c..84a8315113 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
@@ -99,7 +99,7 @@ public:
 
     // Member operators
 
-        //- Assignment of all entries to zero
+        //- Assignment of all elements to zero
         void operator=(const zero);
 };
 
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
index 2af8a5d542..443ac00bd2 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
@@ -106,10 +106,21 @@ public:
         inline autoPtr<SquareMatrix<Type>> clone() const;
 
 
+    // Member Functions
+
+        // Edit
+
+            //- Resize the matrix preserving the elements
+            inline void setSize(const label m);
+
+
     // Member operators
 
-        //- Assignment of all entries to zero
+        //- Assignment of all elements to zero
         void operator=(const zero);
+
+        //- Assignment elements to the
+        void operator=(const Identity<Type>);
 };
 
 
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
index 38dcb15926..7dbc3bde28 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
@@ -152,6 +152,15 @@ Foam::SquareMatrix<Type>::clone() const
 }
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+inline void Foam::SquareMatrix<Type>::setSize(const label m)
+{
+    Matrix<SquareMatrix<Type>, Type>::setSize(m, m);
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -161,6 +170,17 @@ void Foam::SquareMatrix<Type>::operator=(const zero)
 }
 
 
+template<class Type>
+void Foam::SquareMatrix<Type>::operator=(const Identity<Type>)
+{
+    Matrix<SquareMatrix<Type>, Type>::operator=(Zero);
+    for (label i=0; i<this->n(); i++)
+    {
+        this->operator()(i, i) = I;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
index 915b00d95a..5e9ed25702 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
@@ -44,7 +44,7 @@ void Foam::solve
         label iMax = i;
         scalar largestCoeff = mag(tmpMatrix[iMax][i]);
 
-        // Swap entries around to find a good pivot
+        // Swap elements around to find a good pivot
         for (label j=i+1; j<m; j++)
         {
             if (mag(tmpMatrix(j, i)) > largestCoeff)

From e9199c6e14ddef7b19d0d791b3986701ecba86f9 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 24 Mar 2016 14:49:25 +0000
Subject: [PATCH 338/447] QRMatrix: New class to provide QR-decomposition by
 Householder reflection

This development is sponsored by Carnegie Wave Energy Ltd.
---
 applications/test/Matrix/Test-Matrix.C     |  27 +++
 src/OpenFOAM/matrices/QRMatrix/QRMatrix.C  | 249 +++++++++++++++++++++
 src/OpenFOAM/matrices/QRMatrix/QRMatrix.H  | 133 +++++++++++
 src/OpenFOAM/matrices/QRMatrix/QRMatrixI.H |  51 +++++
 4 files changed, 460 insertions(+)
 create mode 100644 src/OpenFOAM/matrices/QRMatrix/QRMatrix.C
 create mode 100644 src/OpenFOAM/matrices/QRMatrix/QRMatrix.H
 create mode 100644 src/OpenFOAM/matrices/QRMatrix/QRMatrixI.H

diff --git a/applications/test/Matrix/Test-Matrix.C b/applications/test/Matrix/Test-Matrix.C
index c8691e81b5..87a39386fc 100644
--- a/applications/test/Matrix/Test-Matrix.C
+++ b/applications/test/Matrix/Test-Matrix.C
@@ -25,6 +25,7 @@ License
 
 #include "scalarMatrices.H"
 #include "LLTMatrix.H"
+#include "QRMatrix.H"
 #include "vector.H"
 #include "tensor.H"
 #include "IFstream.H"
@@ -161,6 +162,32 @@ int main(int argc, char *argv[])
         Info<< "LLT solve residual " << (squareMatrix*x - source) << endl;
     }
 
+    {
+        scalarSquareMatrix squareMatrix(3, Zero);
+
+        squareMatrix(0, 0) = 4;
+        squareMatrix(0, 1) = 12;
+        squareMatrix(0, 2) = -16;
+        squareMatrix(1, 0) = 12;
+        squareMatrix(1, 1) = 37;
+        squareMatrix(1, 2) = -43;
+        squareMatrix(2, 0) = -16;
+        squareMatrix(2, 1) = -43;
+        squareMatrix(2, 2) = 98;
+
+        scalarField source(3, 1);
+
+        QRMatrix<scalarSquareMatrix> QR(squareMatrix);
+        scalarField x(QR.solve(source));
+
+        Info<< "QR solve residual "
+            << (squareMatrix*x - source) << endl;
+
+        Info<< "QR inverse solve residual "
+            << (x - QR.inverse()*source) << endl;
+
+    }
+
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/src/OpenFOAM/matrices/QRMatrix/QRMatrix.C b/src/OpenFOAM/matrices/QRMatrix/QRMatrix.C
new file mode 100644
index 0000000000..80e33b0fb2
--- /dev/null
+++ b/src/OpenFOAM/matrices/QRMatrix/QRMatrix.C
@@ -0,0 +1,249 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "QRMatrix.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MatrixType>
+Foam::QRMatrix<MatrixType>::QRMatrix(const MatrixType& M)
+{
+    decompose(M);
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template<class MatrixType>
+void Foam::QRMatrix<MatrixType>::decompose(const MatrixType& M)
+{
+    const label m = M.m();
+    const label n = M.n();
+
+    // Initialize the R-matrix to M
+    R_ = M;
+
+    // Initialize the Q-matrix to I
+    Q_.setSize(m);
+    Q_ = I;
+
+    // Pre-allocate temporary storage for the Householder steps
+    QMatrixType Qk(m);
+    QMatrixType Rk(m);
+    Field<cmptType> uk(m);
+
+    for (label k=0; k<n; k++)
+    {
+        // alpha = -|column k of Rk|
+        cmptType alpha = Zero;
+        for (label bi=k; bi<m; bi++)
+        {
+            alpha += sqr(R_(bi, k));
+        }
+        alpha = sqrt(alpha);
+
+        if (R_(k, k) > 0)
+        {
+            alpha = -alpha;
+        }
+
+        // uk = column k of Rk - alpha*ek
+        // rSumSqrUk = 2/sum(sqr(uk))
+        uk[k] = R_(k, k) - alpha;
+        cmptType rSumSqrUk = sqr(uk[k]);
+        for (label bi=k+1; bi<m; bi++)
+        {
+            uk[bi] = R_(bi, k);
+            rSumSqrUk += sqr(uk[bi]);
+        }
+        rSumSqrUk = 2/rSumSqrUk;
+
+        // Qk = I - 2*u*uT/sum(sqr(uk))
+        for (label bi=k; bi<m; bi++)
+        {
+            for (label bj=k; bj<m; bj++)
+            {
+                Qk(bi, bj) = -rSumSqrUk*uk[bi]*uk[bj];
+            }
+            Qk(bi, bi) += 1;
+        }
+
+        // Rk = Qk*R
+        for (label bi=k; bi<m; bi++)
+        {
+            for (label bk=k; bk<n; bk++)
+            {
+                Rk(bi, bk) = Zero;
+                for (label bj=k; bj<n; bj++)
+                {
+                    Rk(bi, bk) += Qk(bi, bj)*R_(bj, bk);
+                }
+            }
+        }
+
+        // Ensure diagonal is positive
+        if (R_(k, k) < 0)
+        {
+            // R = -Rk
+            // Q = -Q
+            for (label bi=k; bi<m; bi++)
+            {
+                for (label bj=k; bj<n; bj++)
+                {
+                    R_(bi, bj) = -Rk(bi, bj);
+                }
+                for (label bj=k; bj<m; bj++)
+                {
+                    Q_(bi, bj) = -Q_(bi, bj);
+                }
+            }
+        }
+        else
+        {
+            // R = Rk
+            for (label bi=k; bi<m; bi++)
+            {
+                for (label bj=k; bj<n; bj++)
+                {
+                    R_(bi, bj) = Rk(bi, bj);
+                }
+            }
+        }
+
+        // Q = Q*Qk (using Rk as temporary storage)
+        for (label bi=0; bi<m; bi++)
+        {
+            for (label bk=k; bk<m; bk++)
+            {
+                Rk(bi, bk) = Zero;
+                for (label bj=k; bj<m; bj++)
+                {
+                    Rk(bi, bk) += Q_(bi, bj)*Qk(bj, bk);
+                }
+            }
+        }
+        for (label bi=0; bi<m; bi++)
+        {
+            for (label bj=k; bj<n; bj++)
+            {
+                Q_(bi, bj) = Rk(bi, bj);
+            }
+        }
+    }
+}
+
+
+template<class MatrixType>
+void Foam::QRMatrix<MatrixType>::solvex
+(
+    Field<cmptType>& x
+) const
+{
+    const label n = R_.n();
+
+    for (int i=n-1; i>=0; i--)
+    {
+        cmptType sum = x[i];
+
+        for (label j=i+1; j<n; j++)
+        {
+            sum -= x[j]*R_(i, j);
+        }
+
+        if (mag(R_(i, i)) < SMALL)
+        {
+            FatalErrorInFunction
+                << "Back-substitution failed due to small diagonal"
+                << abort(FatalError);
+        }
+
+        x[i] = sum/R_(i, i);
+    }
+}
+
+
+template<class MatrixType>
+void Foam::QRMatrix<MatrixType>::solve
+(
+    Field<cmptType>& x,
+    const Field<cmptType>& source
+) const
+{
+    const label m = Q_.m();
+
+    // x = Q_.T()*source;
+    for (label i=0; i<m; i++)
+    {
+        x[i] = 0;
+        for (label j=0; j<m; j++)
+        {
+            x[i] += Q_(j, i)*source[j];
+        }
+    }
+
+    solvex(x);
+}
+
+
+template<class MatrixType>
+Foam::tmp<Foam::Field<typename MatrixType::cmptType>>
+Foam::QRMatrix<MatrixType>::solve
+(
+    const Field<cmptType>& source
+) const
+{
+    tmp<Field<cmptType>> tx(new Field<cmptType>(Q_.m()));
+    Field<cmptType>& x = tx.ref();
+
+    solve(x, source);
+
+    return tx;
+}
+
+
+template<class MatrixType>
+typename Foam::QRMatrix<MatrixType>::QMatrixType
+Foam::QRMatrix<MatrixType>::inverse() const
+{
+    const label m = Q_.m();
+
+    Field<cmptType> x(m);
+    QMatrixType inv(m);
+
+    for (label i=0; i<m; i++)
+    {
+        for (label j=0; j<m; j++)
+        {
+            x[j] = Q_(i, j);
+        }
+        solvex(x);
+        inv.block(m, 1, 0, i) = x;
+    }
+
+    return inv;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/QRMatrix/QRMatrix.H b/src/OpenFOAM/matrices/QRMatrix/QRMatrix.H
new file mode 100644
index 0000000000..bbad659be2
--- /dev/null
+++ b/src/OpenFOAM/matrices/QRMatrix/QRMatrix.H
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::QRMatrix
+
+Description
+    Class templated on matrix type to perform the QR decomposition using
+    Householder reflections on a square or rectangular matrix.
+
+SourceFiles
+    QRMatrixI.H
+    QRMatrix.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef QRMatrix_H
+#define QRMatrix_H
+
+#include "SquareMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class QRMatrix Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class MatrixType>
+class QRMatrix
+{
+
+public:
+
+    typedef typename MatrixType::cmptType cmptType;
+    typedef SquareMatrix<cmptType> QMatrixType;
+    typedef MatrixType RMatrixType;
+
+private:
+
+    // Private data
+
+        //- The Q-matrix
+        QMatrixType Q_;
+
+        //- The R-matrix
+        RMatrixType R_;
+
+
+    // Private member functions
+
+        //- Solve the linear system with the Field argument x initialized to
+        //  the appropriate transformed source (e.g. Q.T()*source)
+        //  and return the solution in x
+        void solvex(Field<cmptType>& x) const;
+
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline QRMatrix();
+
+        //- Construct decomposing given matrix
+        QRMatrix(const MatrixType& M);
+
+
+    // Member Functions
+
+        //- Return Q-matrix
+        inline const QMatrixType& Q() const;
+
+        //- Return R-matrix
+        inline const RMatrixType& R() const;
+
+        //- Decompose given matrix
+        void decompose(const MatrixType& M);
+
+        //- Solve the linear system with the given source
+        //  and returning the solution in the Field argument x
+        void solve(Field<cmptType>& x, const Field<cmptType>& source) const;
+
+        //- Solve the linear system with the given source
+        //  returning the solution
+        tmp<Field<cmptType>> solve(const Field<cmptType>& source) const;
+
+        //- Return the inverse of a square matrix
+        QMatrixType inverse() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "QRMatrixI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "QRMatrix.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/QRMatrix/QRMatrixI.H b/src/OpenFOAM/matrices/QRMatrix/QRMatrixI.H
new file mode 100644
index 0000000000..1d9ca4b620
--- /dev/null
+++ b/src/OpenFOAM/matrices/QRMatrix/QRMatrixI.H
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MatrixType>
+inline Foam::QRMatrix<MatrixType>::QRMatrix()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class MatrixType>
+inline const typename Foam::QRMatrix<MatrixType>::QMatrixType&
+Foam::QRMatrix<MatrixType>::Q() const
+{
+    return Q_;
+}
+
+
+template<class MatrixType>
+inline const typename Foam::QRMatrix<MatrixType>::RMatrixType&
+Foam::QRMatrix<MatrixType>::R() const
+{
+    return R_;
+}
+
+
+// ************************************************************************* //

From f019d1e73895464442358edd960418b86e1f1e04 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 24 Mar 2016 18:05:18 +0000
Subject: [PATCH 339/447] LLTMatrix, LUscalarMatrix, QRMatrix: Provided
 consistent construction, decomposition and solution interface

---
 src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C    |  5 +++++
 src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H    |  3 +++
 .../matrices/LUscalarMatrix/LUscalarMatrix.C   | 18 ++++++++++++++----
 .../matrices/LUscalarMatrix/LUscalarMatrix.H   | 13 ++++++++++---
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
index e160180240..2e8f7421d9 100644
--- a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
+++ b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
@@ -27,6 +27,11 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class Type>
+Foam::LLTMatrix<Type>::LLTMatrix()
+{}
+
+
 template<class Type>
 Foam::LLTMatrix<Type>::LLTMatrix(const SquareMatrix<Type>& M)
 {
diff --git a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H
index 9a48c38cd7..622efc5a62 100644
--- a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H
+++ b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H
@@ -61,6 +61,9 @@ public:
 
     // Constructors
 
+        //- Construct null
+        LLTMatrix();
+
         //- Construct from a square matrix and perform the decomposition
         LLTMatrix(const SquareMatrix<Type>& M);
 
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
index 5a4076633d..ecff7ea54c 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
@@ -39,6 +39,12 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+Foam::LUscalarMatrix::LUscalarMatrix()
+:
+    comm_(Pstream::worldComm)
+{}
+
+
 Foam::LUscalarMatrix::LUscalarMatrix(const scalarSquareMatrix& matrix)
 :
     scalarSquareMatrix(matrix),
@@ -249,8 +255,6 @@ void Foam::LUscalarMatrix::convert
             }
         }
     }
-
-    //printDiagonalDominance();
 }
 
 
@@ -380,8 +384,6 @@ void Foam::LUscalarMatrix::convert
             }
         }
     }
-
-    //printDiagonalDominance();
 }
 
 
@@ -402,4 +404,12 @@ void Foam::LUscalarMatrix::printDiagonalDominance() const
 }
 
 
+void Foam::LUscalarMatrix::decompose(const scalarSquareMatrix& M)
+{
+    scalarSquareMatrix::operator=(M);
+    pivotIndices_.setSize(m());
+    LUDecompose(*this, pivotIndices_);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
index fc289fb3a5..c8a83e5e5a 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
@@ -25,7 +25,7 @@ Class
     Foam::LUscalarMatrix
 
 Description
-    Foam::LUscalarMatrix
+    Class to perform the LU decomposition on a symmetric matrix.
 
 SourceFiles
     LUscalarMatrix.C
@@ -93,10 +93,14 @@ public:
     // Declare name of the class and its debug switch
     ClassName("LUscalarMatrix");
 
+
     // Constructors
 
-        //- Construct from scalarSquareMatrix and perform LU decomposition
-        LUscalarMatrix(const scalarSquareMatrix&);
+        //- Construct null
+        LUscalarMatrix();
+
+        //- Construct from and perform LU decomposition of the matrix M
+        LUscalarMatrix(const scalarSquareMatrix& M);
 
         //- Construct from lduMatrix and perform LU decomposition
         LUscalarMatrix
@@ -109,6 +113,9 @@ public:
 
     // Member Functions
 
+        //- Perform the LU decomposition of the matrix M
+        void decompose(const scalarSquareMatrix& M);
+
         //- Solve the matrix using the LU decomposition with pivoting
         //  returning the solution in the source
         template<class T>

From d4046bb85e82e74f297cd5ca40a5aa9f4f39a86d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 24 Mar 2016 19:13:04 +0000
Subject: [PATCH 340/447] LLTMatrix, LUscalarMatrix, QRMatrix: Provided
 consistent 'solve' interface

---
 applications/test/Matrix/Test-Matrix.C        | 81 ++++++++-----------
 src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C   |  6 ++
 .../matrices/LUscalarMatrix/LUscalarMatrix.H  | 14 +++-
 .../LUscalarMatrix/LUscalarMatrixTemplates.C  | 58 +++++++++----
 src/OpenFOAM/matrices/QRMatrix/QRMatrix.C     |  2 +-
 src/OpenFOAM/matrices/QRMatrix/QRMatrix.H     |  2 +-
 .../lduMatrix/solvers/GAMG/GAMGSolverSolve.C  |  3 +-
 7 files changed, 93 insertions(+), 73 deletions(-)

diff --git a/applications/test/Matrix/Test-Matrix.C b/applications/test/Matrix/Test-Matrix.C
index 87a39386fc..908c364d9c 100644
--- a/applications/test/Matrix/Test-Matrix.C
+++ b/applications/test/Matrix/Test-Matrix.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "scalarMatrices.H"
+#include "LUscalarMatrix.H"
 #include "LLTMatrix.H"
 #include "QRMatrix.H"
 #include "vector.H"
@@ -113,70 +114,53 @@ int main(int argc, char *argv[])
         Info<< "Solution = " << rhs << endl;
     }
 
+
+    scalarSquareMatrix squareMatrix(3, Zero);
+
+    squareMatrix(0, 0) = 4;
+    squareMatrix(0, 1) = 12;
+    squareMatrix(0, 2) = -16;
+    squareMatrix(1, 0) = 12;
+    squareMatrix(1, 1) = 37;
+    squareMatrix(1, 2) = -43;
+    squareMatrix(2, 0) = -16;
+    squareMatrix(2, 1) = -43;
+    squareMatrix(2, 2) = 98;
+
+    Info<< nl << "Square Matrix = " << squareMatrix << endl;
+
+    const scalarField source(3, 1);
+
     {
-        scalarSquareMatrix squareMatrix(3, Zero);
-
-        squareMatrix(0, 0) = 4;
-        squareMatrix(0, 1) = 12;
-        squareMatrix(0, 2) = -16;
-        squareMatrix(1, 0) = 12;
-        squareMatrix(1, 1) = 37;
-        squareMatrix(1, 2) = -43;
-        squareMatrix(2, 0) = -16;
-        squareMatrix(2, 1) = -43;
-        squareMatrix(2, 2) = 98;
-
-        const scalarSquareMatrix squareMatrixCopy = squareMatrix;
-        Info<< nl << "Square Matrix = " << squareMatrix << endl;
-
-        Info<< "det = " << det(squareMatrixCopy) << endl;
+        {
+            scalarSquareMatrix sm(squareMatrix);
+            Info<< "det = " << det(sm) << endl;
+        }
 
+        scalarSquareMatrix sm(squareMatrix);
         labelList rhs(3, 0);
         label sign;
-        LUDecompose(squareMatrix, rhs, sign);
+        LUDecompose(sm, rhs, sign);
 
-        Info<< "Decomposition = " << squareMatrix << endl;
+        Info<< "Decomposition = " << sm << endl;
         Info<< "Pivots = " << rhs << endl;
         Info<< "Sign = " << sign << endl;
-        Info<< "det = " << detDecomposed(squareMatrix, sign) << endl;
+        Info<< "det = " << detDecomposed(sm, sign) << endl;
     }
 
     {
-        scalarSquareMatrix squareMatrix(3, Zero);
-
-        squareMatrix(0, 0) = 4;
-        squareMatrix(0, 1) = 12;
-        squareMatrix(0, 2) = -16;
-        squareMatrix(1, 0) = 12;
-        squareMatrix(1, 1) = 37;
-        squareMatrix(1, 2) = -43;
-        squareMatrix(2, 0) = -16;
-        squareMatrix(2, 1) = -43;
-        squareMatrix(2, 2) = 98;
-
-        scalarField source(3, 1);
+        LUscalarMatrix LU(squareMatrix);
+        scalarField x((LU.solve(source));
+        Info<< "LU solve residual " << (squareMatrix*x - source) << endl;
+    }
 
+    {
         LLTMatrix<scalar> LLT(squareMatrix);
         scalarField x(LLT.solve(source));
-
         Info<< "LLT solve residual " << (squareMatrix*x - source) << endl;
     }
 
     {
-        scalarSquareMatrix squareMatrix(3, Zero);
-
-        squareMatrix(0, 0) = 4;
-        squareMatrix(0, 1) = 12;
-        squareMatrix(0, 2) = -16;
-        squareMatrix(1, 0) = 12;
-        squareMatrix(1, 1) = 37;
-        squareMatrix(1, 2) = -43;
-        squareMatrix(2, 0) = -16;
-        squareMatrix(2, 1) = -43;
-        squareMatrix(2, 2) = 98;
-
-        scalarField source(3, 1);
-
         QRMatrix<scalarSquareMatrix> QR(squareMatrix);
         scalarField x(QR.solve(source));
 
@@ -184,8 +168,7 @@ int main(int argc, char *argv[])
             << (squareMatrix*x - source) << endl;
 
         Info<< "QR inverse solve residual "
-            << (x - QR.inverse()*source) << endl;
-
+            << (x - QR.inv()*source) << endl;
     }
 
     Info<< "\nEnd\n" << endl;
diff --git a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
index 2e8f7421d9..d0f828d4f3 100644
--- a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
+++ b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.C
@@ -95,6 +95,12 @@ void Foam::LLTMatrix<Type>::solve
     const Field<Type>& source
 ) const
 {
+    // If x and source are different initialize x = source
+    if (&x != &source)
+    {
+        x = source;
+    }
+
     const SquareMatrix<Type>& LLT = *this;
     const label m = LLT.m();
 
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
index c8a83e5e5a..0e0bc01013 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H
@@ -116,10 +116,16 @@ public:
         //- Perform the LU decomposition of the matrix M
         void decompose(const scalarSquareMatrix& M);
 
-        //- Solve the matrix using the LU decomposition with pivoting
-        //  returning the solution in the source
-        template<class T>
-        void solve(Field<T>& source) const;
+        //- Solve the linear system with the given source
+        //  and returning the solution in the Field argument x.
+        //  This function may be called with the same field for x and source.
+        template<class Type>
+        void solve(Field<Type>& x, const Field<Type>& source) const;
+
+        //- Solve the linear system with the given source
+        //  returning the solution
+        template<class Type>
+        tmp<Field<Type>> solve(const Field<Type>& source) const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C
index 4d327faeee..605babb852 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C
@@ -24,23 +24,34 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LUscalarMatrix.H"
+#include "SubField.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::LUscalarMatrix::solve(Field<Type>& sourceSol) const
+void Foam::LUscalarMatrix::solve
+(
+    Field<Type>& x,
+    const Field<Type>& source
+) const
 {
+    // If x and source are different initialize x = source
+    if (&x != &source)
+    {
+        x = source;
+    }
+
     if (Pstream::parRun())
     {
-        Field<Type> completeSourceSol(m());
+        Field<Type> X(m());
 
         if (Pstream::master(comm_))
         {
             typename Field<Type>::subField
             (
-                completeSourceSol,
-                sourceSol.size()
-            ).assign(sourceSol);
+                X,
+                x.size()
+            ).assign(x);
 
             for
             (
@@ -55,7 +66,7 @@ void Foam::LUscalarMatrix::solve(Field<Type>& sourceSol) const
                     slave,
                     reinterpret_cast<char*>
                     (
-                        &(completeSourceSol[procOffsets_[slave]])
+                        &(X[procOffsets_[slave]])
                     ),
                     (procOffsets_[slave+1]-procOffsets_[slave])*sizeof(Type),
                     Pstream::msgType(),
@@ -69,8 +80,8 @@ void Foam::LUscalarMatrix::solve(Field<Type>& sourceSol) const
             (
                 Pstream::scheduled,
                 Pstream::masterNo(),
-                reinterpret_cast<const char*>(sourceSol.begin()),
-                sourceSol.byteSize(),
+                reinterpret_cast<const char*>(x.begin()),
+                x.byteSize(),
                 Pstream::msgType(),
                 comm_
             );
@@ -78,12 +89,12 @@ void Foam::LUscalarMatrix::solve(Field<Type>& sourceSol) const
 
         if (Pstream::master(comm_))
         {
-            LUBacksubstitute(*this, pivotIndices_, completeSourceSol);
+            LUBacksubstitute(*this, pivotIndices_, X);
 
-            sourceSol = typename Field<Type>::subField
+            x = typename Field<Type>::subField
             (
-                completeSourceSol,
-                sourceSol.size()
+                X,
+                x.size()
             );
 
             for
@@ -99,7 +110,7 @@ void Foam::LUscalarMatrix::solve(Field<Type>& sourceSol) const
                     slave,
                     reinterpret_cast<const char*>
                     (
-                        &(completeSourceSol[procOffsets_[slave]])
+                        &(X[procOffsets_[slave]])
                     ),
                     (procOffsets_[slave + 1]-procOffsets_[slave])*sizeof(Type),
                     Pstream::msgType(),
@@ -113,8 +124,8 @@ void Foam::LUscalarMatrix::solve(Field<Type>& sourceSol) const
             (
                 Pstream::scheduled,
                 Pstream::masterNo(),
-                reinterpret_cast<char*>(sourceSol.begin()),
-                sourceSol.byteSize(),
+                reinterpret_cast<char*>(x.begin()),
+                x.byteSize(),
                 Pstream::msgType(),
                 comm_
             );
@@ -122,9 +133,24 @@ void Foam::LUscalarMatrix::solve(Field<Type>& sourceSol) const
     }
     else
     {
-        LUBacksubstitute(*this, pivotIndices_, sourceSol);
+        LUBacksubstitute(*this, pivotIndices_, x);
     }
 }
 
 
+template<class Type>
+Foam::tmp<Foam::Field<Type>> Foam::LUscalarMatrix::solve
+(
+    const Field<Type>& source
+) const
+{
+    tmp<Field<Type>> tx(new Field<Type>(m()));
+    Field<Type>& x = tx.ref();
+
+    solve(x, source);
+
+    return tx;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/QRMatrix/QRMatrix.C b/src/OpenFOAM/matrices/QRMatrix/QRMatrix.C
index 80e33b0fb2..165056d68e 100644
--- a/src/OpenFOAM/matrices/QRMatrix/QRMatrix.C
+++ b/src/OpenFOAM/matrices/QRMatrix/QRMatrix.C
@@ -225,7 +225,7 @@ Foam::QRMatrix<MatrixType>::solve
 
 template<class MatrixType>
 typename Foam::QRMatrix<MatrixType>::QMatrixType
-Foam::QRMatrix<MatrixType>::inverse() const
+Foam::QRMatrix<MatrixType>::inv() const
 {
     const label m = Q_.m();
 
diff --git a/src/OpenFOAM/matrices/QRMatrix/QRMatrix.H b/src/OpenFOAM/matrices/QRMatrix/QRMatrix.H
index bbad659be2..e3dab46b4f 100644
--- a/src/OpenFOAM/matrices/QRMatrix/QRMatrix.H
+++ b/src/OpenFOAM/matrices/QRMatrix/QRMatrix.H
@@ -108,7 +108,7 @@ public:
         tmp<Field<cmptType>> solve(const Field<cmptType>& source) const;
 
         //- Return the inverse of a square matrix
-        QMatrixType inverse() const;
+        QMatrixType inv() const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index 1a547204a7..3e357cdbe7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -533,8 +533,7 @@ void Foam::GAMGSolver::solveCoarsestLevel
 
     if (directSolveCoarsest_)
     {
-        coarsestCorrField = coarsestSource;
-        coarsestLUMatrixPtr_->solve(coarsestCorrField);
+        coarsestLUMatrixPtr_->solve(coarsestCorrField, coarsestSource);
     }
     //else if
     //(

From b5f6e5d42ade8f06e3d93a594a4c0194af8ca51e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 24 Mar 2016 19:13:36 +0000
Subject: [PATCH 341/447] Update header

---
 src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index 3e357cdbe7..d9f4760375 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 9f7ecd5453387cd6ebbcc869bb7e51b4cdcc06af Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 24 Mar 2016 23:04:40 +0000
Subject: [PATCH 342/447] LLTMatrix: Updated docs

---
 src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H
index 622efc5a62..fa60845fa7 100644
--- a/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H
+++ b/src/OpenFOAM/matrices/LLTMatrix/LLTMatrix.H
@@ -74,7 +74,8 @@ public:
         void decompose(const SquareMatrix<Type>& M);
 
         //- Solve the linear system with the given source
-        //  and returning the solution in the Field argument x
+        //  and returning the solution in the Field argument x.
+        //  This function may be called with the same field for x and source.
         void solve(Field<Type>& x, const Field<Type>& source) const;
 
         //- Solve the linear system with the given source

From c05686d9bc0d21d587980b4a64d12b07405a5301 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 24 Mar 2016 23:04:53 +0000
Subject: [PATCH 343/447] Identity: Make cast-to-primitive operators explicit
 to avoid operator resolution ambiguities when compiling single-precision

---
 src/OpenFOAM/primitives/SphericalTensor/Identity.H | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/primitives/SphericalTensor/Identity.H b/src/OpenFOAM/primitives/SphericalTensor/Identity.H
index 0d645d8b91..aac5313532 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/Identity.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/Identity.H
@@ -77,13 +77,13 @@ public:
     }
 
     //- Return 1 for label
-    inline operator label() const
+    inline explicit operator label() const
     {
         return 1;
     }
 
     //- Return 1 for scalar
-    inline operator scalar() const
+    inline explicit operator scalar() const
     {
         return 1;
     }

From e3f3c03ca88849abcfa5b0a95b2b4c1d9925a25e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 24 Mar 2016 23:06:10 +0000
Subject: [PATCH 344/447] sampledSet: Further improvements in robustness for
 midPoint and midPointAndFace

---
 src/sampling/sampledSet/face/faceOnlySet.C    |  5 +-
 .../sampledSet/sampledSet/sampledSet.C        | 79 +++++++++++++------
 .../sampledSet/sampledSet/sampledSet.H        |  3 +
 3 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/src/sampling/sampledSet/face/faceOnlySet.C b/src/sampling/sampledSet/face/faceOnlySet.C
index 9c794cc6b8..fea0cb109c 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.C
+++ b/src/sampling/sampledSet/face/faceOnlySet.C
@@ -56,7 +56,6 @@ bool Foam::faceOnlySet::trackToBoundary
 {
     particle::TrackingData<passiveParticleCloud> trackData(particleCloud);
 
-    // Alias
     const point& trackPt = singleParticle.position();
 
     while(true)
@@ -76,12 +75,12 @@ bool Foam::faceOnlySet::trackToBoundary
 
         if (mag(trackPt - end_) < smallDist)
         {
-            // end reached
+            // End reached
             return false;
         }
         else if (singleParticle.onBoundary())
         {
-            // Boundary reached.
+            // Boundary reached
             return true;
         }
     }
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C
index f53e6e44fd..6930bdcb80 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -47,31 +47,49 @@ Foam::label Foam::sampledSet::getBoundaryCell(const label faceI) const
 }
 
 
+Foam::label Foam::sampledSet::getNeighbourCell(const label faceI) const
+{
+    if (faceI >= mesh().nInternalFaces())
+    {
+        return mesh().faceOwner()[faceI];
+    }
+    else
+    {
+        return mesh().faceNeighbour()[faceI];
+    }
+}
+
+
 Foam::label Foam::sampledSet::pointInCell
 (
     const point& p,
     const label samplei
 ) const
 {
-    const label cellio = mesh().faceOwner()[faces_[samplei]];
-    const label cellin = mesh().faceNeighbour()[faces_[samplei]];
-    const label celljo = mesh().faceOwner()[faces_[samplei+1]];
-    const label celljn = mesh().faceNeighbour()[faces_[samplei+1]];
-
-    // If mid-point is in the cell including the sampled faces
-    // include in list otherwise ignore
+    // Collect the face owner and neighbour cells of the sample into an array
+    // for convenience
+    label cells[4] =
+    {
+        mesh().faceOwner()[faces_[samplei]],
+        getNeighbourCell(faces_[samplei]),
+        mesh().faceOwner()[faces_[samplei+1]],
+        getNeighbourCell(faces_[samplei+1])
+    };
 
+    // Find the sampled cell by checking the owners and neighbours of the
+    // sampled faces
     label cellm =
-        (cellio == celljo || cellio == celljn) ? cellio
-      : (cellin == celljo || cellin == celljn) ? cellin
+        (cells[0] == cells[2] || cells[0] == cells[3]) ? cells[0]
+      : (cells[1] == cells[2] || cells[1] == cells[3]) ? cells[1]
       : -1;
 
     if (cellm != -1)
     {
-        // Check the mid-point is in the cell otherwise ignore
+        // If found the sampled cell check the point is in the cell
+        // otherwise ignore
         if (!mesh().pointInCell(p, cellm, searchEngine_.decompMode()))
         {
-            cellm = -1;
+           cellm = -1;
 
             if (debug)
             {
@@ -81,20 +99,33 @@ Foam::label Foam::sampledSet::pointInCell
             }
         }
     }
-    else if (debug)
+    else
     {
-        WarningInFunction
-            << "Could not find cell for mid-point" << nl
-            << "  samplei: " << samplei
-            << "  pts[samplei]: " << operator[](samplei)
-            << "  face[samplei]: " << faces_[samplei]
-            << "  pts[samplei+1]: " << operator[](samplei+1)
-            << "  face[samplei+1]: " << faces_[samplei+1]
-            << "  cellio: " << cellio
-            << "  cellin: " << cellin
-            << "  celljo: " << celljo
-            << "  celljn: " << celljn
-            << endl;
+        // If the sample does not pass through a single cell check if the point
+        // is in any of the owners or neighbours otherwise ignore
+        for (label i=0; i<4; i++)
+        {
+            if (mesh().pointInCell(p, cells[i], searchEngine_.decompMode()))
+            {
+                return cells[i];
+            }
+        }
+
+        if (debug)
+        {
+            WarningInFunction
+                << "Could not find cell for mid-point" << nl
+                << "  samplei: " << samplei
+                << "  pts[samplei]: " << operator[](samplei)
+                << "  face[samplei]: " << faces_[samplei]
+                << "  pts[samplei+1]: " << operator[](samplei+1)
+                << "  face[samplei+1]: " << faces_[samplei+1]
+                << "  cellio: " << cells[0]
+                << "  cellin: " << cells[1]
+                << "  celljo: " << cells[2]
+                << "  celljn: " << cells[3]
+                << endl;
+        }
     }
 
     return cellm;
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.H b/src/sampling/sampledSet/sampledSet/sampledSet.H
index 1531480ee8..9b3eee9072 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.H
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.H
@@ -92,6 +92,9 @@ protected:
         //- Returns cell next to boundary face
         label getBoundaryCell(const label) const;
 
+        //- Returns the neigbour cell or the owner if face in on the boundary
+        label getNeighbourCell(const label) const;
+
         //- Return the cell in which the point on the sample line
         //  resides if found otherwise return -1
         label pointInCell(const point& p, const label samplei) const;

From 04dcee7680a191df6baa99056b28789df8b655a7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 25 Mar 2016 22:35:03 +0000
Subject: [PATCH 345/447] RectangularMatrix: Removed the identity function (now
 in SquareMatrix)

---
 .../RectangularMatrix/RectangularMatrix.H        |  5 -----
 .../RectangularMatrix/RectangularMatrixI.H       | 16 ----------------
 .../matrices/SquareMatrix/SquareMatrixI.H        |  4 ++--
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
index 84a8315113..dd7b5bb8ca 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
@@ -40,7 +40,6 @@ SourceFiles
 
 #include "Matrix.H"
 #include "SquareMatrix.H"
-#include "Identity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -79,10 +78,6 @@ public:
         //  initializing all elements to zero
         inline RectangularMatrix(const label m, const label n, const zero);
 
-        //- Construct given number of rows/columns
-        //  Initializing to the identity matrix
-        inline RectangularMatrix(const label n, const Identity<Type>);
-
         //- Construct with given number of rows and columns
         //  and value for all elements.
         inline RectangularMatrix(const label m, const label n, const Type&);
diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
index 1cb6e0c0c9..e07888e25b 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
@@ -77,22 +77,6 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix
 {}
 
 
-template<class Type>
-inline Foam::RectangularMatrix<Type>::RectangularMatrix
-(
-    const label n,
-    const Identity<Type>
-)
-:
-    Matrix<RectangularMatrix<Type>, Type>(n, n, Zero)
-{
-    for (label i=0; i<n; i++)
-    {
-        this->operator()(i, i) = I;
-    }
-}
-
-
 template<class Type>
 inline Foam::RectangularMatrix<Type>::RectangularMatrix
 (
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
index 7dbc3bde28..12ecd2530f 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
@@ -103,7 +103,7 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
 {
     for (label i=0; i<n; i++)
     {
-        this->operator()(i, i) = I;
+        this->operator()(i, i) = Type(I);
     }
 }
 
@@ -176,7 +176,7 @@ void Foam::SquareMatrix<Type>::operator=(const Identity<Type>)
     Matrix<SquareMatrix<Type>, Type>::operator=(Zero);
     for (label i=0; i<this->n(); i++)
     {
-        this->operator()(i, i) = I;
+        this->operator()(i, i) = Type(I);
     }
 }
 

From 1a5ba9c4ff2fc9718f195fe9effe733a80bc4188 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 25 Mar 2016 22:36:13 +0000
Subject: [PATCH 346/447] scotchDecomp, ptscotchDecomp: Updated documentation
 Patch contributed by Bruno Santos Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2032

---
 doc/Doxygen/css/doxyMod.css                   |   4 +
 .../decompose/ptscotchDecomp/ptscotchDecomp.C |  89 ---------
 .../decompose/ptscotchDecomp/ptscotchDecomp.H |  19 +-
 .../decompose/scotchDecomp/scotchDecomp.C     |  96 ----------
 .../decompose/scotchDecomp/scotchDecomp.H     | 179 +++++++++++++++++-
 5 files changed, 199 insertions(+), 188 deletions(-)

diff --git a/doc/Doxygen/css/doxyMod.css b/doc/Doxygen/css/doxyMod.css
index 11407eedd7..1831a683c8 100644
--- a/doc/Doxygen/css/doxyMod.css
+++ b/doc/Doxygen/css/doxyMod.css
@@ -12,6 +12,10 @@
     list-style-type: square;
 }
 
+.contents ol {
+    margin-left: 20px;
+}
+
 /* colour and underline to match OpenFOAM style */
 div.title
 {
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
index 101eb3b7c9..d004c617b8 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
@@ -21,95 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-    From scotch forum:
-
-    By: Francois PELLEGRINI RE: Graph mapping 'strategy' string [ reply ]
-    2008-08-22 10:09 Strategy handling in Scotch is a bit tricky. In order
-    not to be confused, you must have a clear view of how they are built.
-    Here are some rules:
-
-    1- Strategies are made up of "methods" which are combined by means of
-    "operators".
-
-    2- A method is of the form "m{param=value,param=value,...}", where "m"
-    is a single character (this is your first error: "f" is a method name,
-    not a parameter name).
-
-    3- There exist different sort of strategies : bipartitioning strategies,
-    mapping strategies, ordering strategies, which cannot be mixed. For
-    instance, you cannot build a bipartitioning strategy and feed it to a
-    mapping method (this is your second error).
-
-    To use the "mapCompute" routine, you must create a mapping strategy, not
-    a bipartitioning one, and so use stratGraphMap() and not
-    stratGraphBipart(). Your mapping strategy should however be based on the
-    "recursive bipartitioning" method ("b"). For instance, a simple (and
-    hence not very efficient) mapping strategy can be :
-
-    "b{sep=f}"
-
-    which computes mappings with the recursive bipartitioning method "b",
-    this latter using the Fiduccia-Mattheyses method "f" to compute its
-    separators.
-
-    If you want an exact partition (see your previous post), try
-    "b{sep=fx}".
-
-    However, these strategies are not the most efficient, as they do not
-    make use of the multi-level framework.
-
-    To use the multi-level framework, try for instance:
-
-    "b{sep=m{vert=100,low=h,asc=f}x}"
-
-    The current default mapping strategy in Scotch can be seen by using the
-    "-vs" option of program gmap. It is, to date:
-
-    b
-    {
-        job=t,
-        map=t,
-        poli=S,
-        sep=
-        (
-            m
-            {
-                asc=b
-                {
-                    bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},
-                    org=f{move=80,pass=-1,bal=0.005},
-                    width=3
-                },
-                low=h{pass=10}f{move=80,pass=-1,bal=0.0005},
-                type=h,
-                vert=80,
-                rat=0.8
-            }
-          | m
-            {
-                asc=b
-                {
-                    bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},
-                    org=f{move=80,pass=-1,bal=0.005},
-                    width=3
-                },
-                low=h{pass=10}f{move=80,pass=-1,bal=0.0005},
-                type=h,
-                vert=80,
-                rat=0.8
-            }
-        )
-    }
-
-
-
-    Note: writeGraph=true : writes out .dgr files for debugging. Run with e.g.
-
-        mpirun -np 4 dgpart 2 'region0_%r.dgr'
-
-    - %r gets replaced by current processor rank
-    - decompose into 2 domains
-
 \*---------------------------------------------------------------------------*/
 
 #include "ptscotchDecomp.H"
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
index a4ec01d1c9..6aa45a2903 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
@@ -25,7 +25,24 @@ Class
     Foam::ptscotchDecomp
 
 Description
-    PTScotch domain decomposition
+    PTScotch domain decomposition.
+    For the main details about how to define the strategies, see scotchDecomp.
+
+    Nonetheless, when decomposing in parallel, using <tt>writeGraph=true</tt>
+    will write out \c .dgr files for debugging. For example, use these files
+    with \c dgpart as follows:
+
+    \verbatim
+    mpirun -np 4 dgpart 2 'region0_%r.dgr'
+    \endverbatim
+
+    where:
+
+    \li \c %r gets replaced by current processor rank
+    \li it will decompose into 2 domains
+
+SeeAlso
+    Foam::scotchDecomp
 
 SourceFiles
     ptscotchDecomp.C
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
index dd72d4e3b1..52c0f173fb 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.C
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
@@ -21,102 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-    From scotch forum:
-
-    By: Francois PELLEGRINI RE: Graph mapping 'strategy' string [ reply ]
-    2008-08-22 10:09 Strategy handling in Scotch is a bit tricky. In order
-    not to be confused, you must have a clear view of how they are built.
-    Here are some rules:
-
-    1- Strategies are made up of "methods" which are combined by means of
-    "operators".
-
-    2- A method is of the form "m{param=value,param=value,...}", where "m"
-    is a single character (this is your first error: "f" is a method name,
-    not a parameter name).
-
-    3- There exist different sort of strategies : bipartitioning strategies,
-    mapping strategies, ordering strategies, which cannot be mixed. For
-    instance, you cannot build a bipartitioning strategy and feed it to a
-    mapping method (this is your second error).
-
-    To use the "mapCompute" routine, you must create a mapping strategy, not
-    a bipartitioning one, and so use stratGraphMap() and not
-    stratGraphBipart(). Your mapping strategy should however be based on the
-    "recursive bipartitioning" method ("b"). For instance, a simple (and
-    hence not very efficient) mapping strategy can be :
-
-    "b{sep=f}"
-
-    which computes mappings with the recursive bipartitioning method "b",
-    this latter using the Fiduccia-Mattheyses method "f" to compute its
-    separators.
-
-    If you want an exact partition (see your previous post), try
-    "b{sep=fx}".
-
-    However, these strategies are not the most efficient, as they do not
-    make use of the multi-level framework.
-
-    To use the multi-level framework, try for instance:
-
-    "b{sep=m{vert=100,low=h,asc=f}x}"
-
-    The current default mapping strategy in Scotch can be seen by using the
-    "-vs" option of program gmap. It is, to date:
-
-    r
-    {
-        job=t,
-        map=t,
-        poli=S,
-        sep=
-        (
-            m
-            {
-                asc=b
-                {
-                    bnd=
-                    (
-                        d{pass=40,dif=1,rem=1}
-                     |
-                    )
-                    f{move=80,pass=-1,bal=0.002491},
-                    org=f{move=80,pass=-1,bal=0.002491},
-                    width=3
-                },
-                low=h{pass=10}
-                f{move=80,pass=-1,bal=0.002491},
-                type=h,
-                vert=80,
-                rat=0.8
-            }
-          | m
-            {
-                asc=b
-                {
-                    bnd=
-                    (
-                        d{pass=40,dif=1,rem=1}
-                      |
-                    )
-                    f{move=80,pass=-1,bal=0.002491},
-                    org=f{move=80,pass=-1,bal=0.002491},
-                    width=3
-                },
-                low=h{pass=10}
-                f{move=80,pass=-1,bal=0.002491},
-                type=h,
-                vert=80,
-                rat=0.8
-            }
-        )
-    }
-
-
-    Note: instead of gmap run gpart \<nProcs\> -vs \<grfFile\>
-    where \<grfFile\> can be obtained by running with 'writeGraph=true'
-
 \*---------------------------------------------------------------------------*/
 
 #include "scotchDecomp.H"
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.H b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
index 714bdb76fc..a2a2a298ca 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.H
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,9 +27,184 @@ Class
 Description
     Scotch domain decomposition.
     When run in parallel will collect the whole graph on to the master,
-    decompose and send back. Run ptscotchDecomp for proper distributed
+    decompose and send back. Use ptscotchDecomp for proper distributed
     decomposition.
 
+    Quoting from the Scotch forum, on the 2008-08-22 10:09, Francois
+    PELLEGRINI posted the following details:
+    \verbatim
+    RE: Graph mapping 'strategy' string
+
+    Strategy handling in Scotch is a bit tricky. In order
+    not to be confused, you must have a clear view of how they are built.
+    Here are some rules:
+
+    1- Strategies are made up of "methods" which are combined by means of
+    "operators".
+
+    2- A method is of the form "m{param=value,param=value,...}", where "m"
+    is a single character (this is your first error: "f" is a method name,
+    not a parameter name).
+
+    3- There exist different sort of strategies : bipartitioning strategies,
+    mapping strategies, ordering strategies, which cannot be mixed. For
+    instance, you cannot build a bipartitioning strategy and feed it to a
+    mapping method (this is your second error).
+
+    To use the "mapCompute" routine, you must create a mapping strategy, not
+    a bipartitioning one, and so use stratGraphMap() and not
+    stratGraphBipart(). Your mapping strategy should however be based on the
+    "recursive bipartitioning" method ("b"). For instance, a simple (and
+    hence not very efficient) mapping strategy can be :
+
+    "b{sep=f}"
+
+    which computes mappings with the recursive bipartitioning method "b",
+    this latter using the Fiduccia-Mattheyses method "f" to compute its
+    separators.
+
+    If you want an exact partition (see your previous post), try
+    "b{sep=fx}".
+
+    However, these strategies are not the most efficient, as they do not
+    make use of the multi-level framework.
+
+    To use the multi-level framework, try for instance:
+
+    "b{sep=m{vert=100,low=h,asc=f}x}"
+
+    The current default mapping strategy in Scotch can be seen by using the
+    "-vs" option of program gmap. It is, to date:
+
+    r
+    {
+        job=t,
+        map=t,
+        poli=S,
+        sep=
+        (
+            m
+            {
+                asc=b
+                {
+                    bnd=
+                    (
+                        d{pass=40,dif=1,rem=1}
+                     |
+                    )
+                    f{move=80,pass=-1,bal=0.002491},
+                    org=f{move=80,pass=-1,bal=0.002491},
+                    width=3
+                },
+                low=h{pass=10}
+                f{move=80,pass=-1,bal=0.002491},
+                type=h,
+                vert=80,
+                rat=0.8
+            }
+          | m
+            {
+                asc=b
+                {
+                    bnd=
+                    (
+                        d{pass=40,dif=1,rem=1}
+                      |
+                    )
+                    f{move=80,pass=-1,bal=0.002491},
+                    org=f{move=80,pass=-1,bal=0.002491},
+                    width=3
+                },
+                low=h{pass=10}
+                f{move=80,pass=-1,bal=0.002491},
+                type=h,
+                vert=80,
+                rat=0.8
+            }
+        )
+    }
+    \endverbatim
+
+    Given that this information was written in 2008, this example strategy will
+    unlikely work as-is with the more recent Scotch versions. Therefore, the
+    steps for getting the current default strategy from within Scotch, is to do
+    the following steps:
+
+    <ol>
+    <li> Edit the file <tt>system/decomposeParDict</tt> and use the following
+    settings:
+
+    \verbatim
+    method          scotch;
+
+    scotchCoeffs
+    {
+        writeGraph true;
+    }
+    \endverbatim
+    </li>
+
+    <li> Run \c decomposePar. For example, it will write a file named
+         <tt>region0.grf</tt>.
+    </li>
+
+    <li> Now, instead of using \c gmap, run \c gpart with the following
+    command structure to get the default strategy:
+
+    \verbatim
+    gpart \<nProcs\> -vs \<grfFile\>
+    \endverbatim
+
+    where:
+
+    <ul>
+        <li> \<grfFile\> is the file that was obtained with the option
+             <tt>writeGraph=true</tt>, namely <tt>region0.grf</tt>.
+        </li>
+        <li> \<nProcs\> is the \c numberOfSubdomains defined in the dictionary
+             file.
+        </li>
+    </ul>
+    </li>
+
+    <li> At the end of the execution will be shown a long string, similar to
+    the following example (complete line was cropped at <tt>[...]</tt>):
+
+    \verbatim
+    S    Strat=m{asc=b{width=3,bnd=d{pass=40,dif=1,rem=0}[...],type=h}
+    \endverbatim
+    </li>
+
+    <li> Edit the file <tt>system/decomposeParDict</tt> once again and add
+    the \c strategy entry as exemplified:
+
+    \verbatim
+    method          scotch;
+
+    scotchCoeffs
+    {
+        //writeGraph true;
+        strategy "m{asc=b{width=3,bnd=d{pass=40,dif=1,rem=0}[...],type=h}";
+    }
+    \endverbatim
+    </li>
+
+    <li> Finally, run \c decomposePar once again, to at least test if it
+         works as intended.
+    </li>
+
+    </ol>
+
+Note
+    \c gpart can be found in the current search path by adding the respective
+    \c bin folder from the Scotch installation, namely by running the following
+    commands:
+
+    \verbatim
+    source $(foamEtcFile config.sh/scotch)
+    export PATH=$PATH:$SCOTCH_ARCH_PATH/bin
+    \endverbatim
+
 SourceFiles
     scotchDecomp.C
 

From b7924a57d549fd3509a3d9eaefa2351ecf09699b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 25 Mar 2016 22:43:40 +0000
Subject: [PATCH 347/447] SubField: Removed temporary Info statement

---
 src/OpenFOAM/fields/Fields/Field/SubFieldI.H | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
index 8ba1ee8929..67aa4c4adb 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
@@ -119,7 +119,6 @@ template<class Type>
 inline void Foam::SubField<Type>::operator=(const Field<Type>& rhs)
 {
     SubList<Type>::operator=(rhs);
-    InfoInFunction << *this << endl;
 }
 
 

From f77e26c5b9fb3bdd0686da6859c829280b362344 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 30 Mar 2016 18:16:20 +0100
Subject: [PATCH 348/447] MatrixSpace: Corrected typo

---
 src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
index 8fa5397c2d..f04f302f57 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
@@ -181,7 +181,7 @@ public:
                 const VectorSpace<VSForm, Cmpt, SubTensor::mRows>& v
             );
 
-            //- Construct and return the sub-ensor corresponding to this block
+            //- Construct and return the sub-tensor corresponding to this block
             inline SubTensor operator()() const;
 
             //- (i, j) const element access operator

From a6901dd007ee4417a071a7f73233dd35d796f273 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 30 Mar 2016 18:16:47 +0100
Subject: [PATCH 349/447] MatrixSpace: Add support for block conversion into
 VectorSpace

---
 src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
index 2aa3a4d52b..ff636aa933 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
@@ -388,7 +388,17 @@ Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::
 Block<SubTensor, BRowStart, BColStart>::
 operator()() const
 {
-    return *this;
+    SubTensor st;
+
+    for (direction i=0; i<SubTensor::mRows; ++i)
+    {
+        for (direction j=0; j<SubTensor::nCols; ++j)
+        {
+            st[i*SubTensor::nCols + j] = operator()(i, j);
+        }
+    }
+
+    return st;
 }
 
 

From 6e5b35bb690be63641cc4f465d899c6489eb3291 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 30 Mar 2016 18:17:27 +0100
Subject: [PATCH 350/447] spatialTransform: Include spatialTensor.H

---
 .../spatialVectorAlgebra/spatialTransform/spatialTransform.H     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
index 2d68e321ae..77f4946c8e 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
@@ -45,6 +45,7 @@ SourceFiles
 
 #include "tensor.H"
 #include "spatialVector.H"
+#include "spatialTensor.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From f1ecdd77e6f5ff6cb7a7ce1b1d409297798cb008 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 30 Mar 2016 18:17:51 +0100
Subject: [PATCH 351/447] Field: Add block member function to return sub-sets
 of the field as VectorSpaces

---
 src/OpenFOAM/fields/Fields/Field/Field.C | 13 +++++++++++++
 src/OpenFOAM/fields/Fields/Field/Field.H |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 4b628788e8..f590912822 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -611,6 +611,19 @@ void Foam::Field<Type>::replace
 }
 
 
+template<class Type>
+template<class VSForm>
+VSForm Foam::Field<Type>::block(const label start) const
+{
+    VSForm vs;
+    for (direction i=0; i<VSForm::nComponents; i++)
+    {
+        vs[i] = this->operator[](start + i);
+    }
+    return vs;
+}
+
+
 template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::Field<Type>::T() const
 {
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 3c5510be50..2e531dfc80 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -333,6 +333,9 @@ public:
         //- Replace a component field of the field
         void replace(const direction, const cmptType&);
 
+        template<class VSForm>
+        VSForm block(const label start) const;
+
         //- Return the field transpose (only defined for second rank tensors)
         tmp<Field<Type>> T() const;
 

From 1c35f1a505325af58827d65766a87d527db1a543 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 30 Mar 2016 19:26:01 +0100
Subject: [PATCH 352/447] Updated handling of the ParaView installation path
 Patch contributed by Bruno Santos Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2034

---
 etc/config.csh/paraview | 3 ---
 etc/config.sh/paraview  | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index 3292f9724c..9e5f7eb0f7 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -98,9 +98,6 @@ if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
     endif
 
     set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}
-    if (! -r $ParaView_LIB_DIR && -r ${ParaView_DIR}/lib/paraview-3.0) then
-        set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-3.0
-    endif
 
     setenv PATH ${ParaView_DIR}/bin:${PATH}
     setenv LD_LIBRARY_PATH "${ParaView_LIB_DIR}:${LD_LIBRARY_PATH}"
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 0d14688677..b6216f0579 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -115,10 +115,6 @@ then
     fi
 
     ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR
-    if [ ! -d $ParaView_LIB_DIR -a -d $ParaView_DIR/lib/paraview-3.0 ]
-    then
-        ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-3.0
-    fi
 
     export PATH=$ParaView_DIR/bin:$PATH
     export LD_LIBRARY_PATH=$ParaView_LIB_DIR:$LD_LIBRARY_PATH

From 8cd7097be1e516c850ff44ae9ca5ab7709d8034e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 1 Apr 2016 14:53:23 +0100
Subject: [PATCH 353/447] spatialTransformI.H: Corrected doc

---
 .../spatialVectorAlgebra/spatialTransform/spatialTransformI.H   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
index d3d2cfb991..8c2724aa33 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
@@ -253,7 +253,7 @@ inline spatialTransform Xr(const vector& a, const scalar omega)
     return spatialTransform(Ra(a, omega), vector::zero);
 }
 
-//- Translational spatial transformation tensor about axis a by omega radians
+//- Translational spatial transformation tensor for translation r
 inline spatialTransform Xt(const vector& r)
 {
     return spatialTransform(tensor::I, r);

From 5312f6c7f0b5511c9ba76ae2be5e893b672d3ed6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 1 Apr 2016 14:53:43 +0100
Subject: [PATCH 354/447] wmake/rules/linux64Icc: avoid uninteresting warning
 messages and change to -O3

---
 wmake/rules/linux64Icc/c++    | 2 +-
 wmake/rules/linux64Icc/c++Opt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wmake/rules/linux64Icc/c++ b/wmake/rules/linux64Icc/c++
index 03bee61dce..1cf106e2b3 100644
--- a/wmake/rules/linux64Icc/c++
+++ b/wmake/rules/linux64Icc/c++
@@ -1,7 +1,7 @@
 SUFFIXES += .C
 
 c++WARN     = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
-              -diag-disable 2304
+              -diag-disable 654,1125,2304
 
 # Suppress some warnings for flex++ and CGAL
 c++LESSWARN = -diag-disable 1224,2026,2305
diff --git a/wmake/rules/linux64Icc/c++Opt b/wmake/rules/linux64Icc/c++Opt
index fa6f76e452..de5b5fa10b 100644
--- a/wmake/rules/linux64Icc/c++Opt
+++ b/wmake/rules/linux64Icc/c++Opt
@@ -1,2 +1,2 @@
 c++DBUG     =
-c++OPT      = -xHost -O2
+c++OPT      = -xHost -O3

From eabb03aa2ac7b2cf74b37edcb1ef1f1f29a526e8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 1 Apr 2016 16:59:51 +0100
Subject: [PATCH 355/447] faceZoneToCell: Corrected cell selection logic Patch
 contributed by Mattijs Janssens Resolved bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2038

---
 .../sets/cellSources/faceZoneToCell/faceZoneToCell.C          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
index 9157348433..3f5d7ece30 100644
--- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
+++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ void Foam::faceZoneToCell::combine(topoSet& set, const bool add) const
             forAll(cellLabels, i)
             {
                 // Only do active cells
-                if (cellLabels[i] < mesh_.nCells())
+                if (cellLabels[i] >= 0 && cellLabels[i] < mesh_.nCells())
                 {
                     addOrDelete(set, cellLabels[i], add);
                 }

From 88bd9123748ad0606688c40e6257c928975786a8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 2 Apr 2016 18:32:11 +0100
Subject: [PATCH 356/447] Pstream: optimisation of data exchange

Contributed by Mattijs Janssens.

1. Any non-blocking data exchange needs to know in advance the sizes to
   receive so it can size the buffer.  For "halo" exchanges this is not
   a problem since the sizes are known in advance but or all other data
   exchanges these sizes need to be exchanged in advance.

   This was previously done by having all processors send the sizes of data to
   send to the master and send it back such that all processors
   - had the same information
   - all could work out who was sending what to where and hence what needed to
     be received.

   This is now changed such that we only send the size to the
   destination processor (instead of to all as previously). This means
   that
   - the list of sizes to send is now of size nProcs v.s. nProcs*nProcs before
   - we cut out the route to the master and back by using a native MPI
     call

   It causes a small change to the API of exchange and PstreamBuffers -
   they now return the sizes of the local buffers only (a labelList) and
   not the sizes of the buffers on all processors (labelListList)

2. Reversing the order of the way in which the sending is done when
   scattering information from the master processor to the other
   processors. This is done in a tree like fashion. Each processor has a
   set of processors to receive from/ send to. When receiving it will
   first receive from the processors with the least amount of
   sub-processors (i.e. the ones which return first). When sending it
   needs to do the opposite: start sending to the processor with the
   most amount of sub-tree since this is the critical path.
---
 applications/test/parallel/Test-parallel.C    | 13 ++--
 .../DelaunayMesh/DistributedDelaunayMesh.C    | 17 ++---
 .../backgroundMeshDecomposition.C             | 15 ++--
 .../IOobjects/IOdictionary/IOdictionaryIO.C   |  6 +-
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H  | 35 +++++++--
 .../db/IOstreams/Pstreams/PstreamBuffers.C    | 26 ++-----
 .../db/IOstreams/Pstreams/PstreamBuffers.H    |  4 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 10 ++-
 .../IOstreams/Pstreams/combineGatherScatter.C |  6 +-
 src/OpenFOAM/db/IOstreams/Pstreams/exchange.C | 71 ++++++++++++++-----
 .../db/IOstreams/Pstreams/gatherScatter.C     |  6 +-
 .../db/IOstreams/Pstreams/gatherScatterList.C |  2 +-
 src/OpenFOAM/db/regIOobject/regIOobjectRead.C |  5 +-
 .../mapPolyMesh/mapDistribute/mapDistribute.C |  4 --
 src/Pstream/dummy/UPstream.C                  | 13 +++-
 src/Pstream/mpi/UPstream.C                    | 48 +++++++++++++
 src/lagrangian/basic/Cloud/Cloud.C            | 14 ++--
 .../basic/InteractionLists/InteractionLists.C | 16 ++---
 src/meshTools/regionSplit/regionSplit.C       | 18 +----
 19 files changed, 206 insertions(+), 123 deletions(-)

diff --git a/applications/test/parallel/Test-parallel.C b/applications/test/parallel/Test-parallel.C
index a2072eadd9..62d6150ce4 100644
--- a/applications/test/parallel/Test-parallel.C
+++ b/applications/test/parallel/Test-parallel.C
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
     // Test mapDistribute
     // ~~~~~~~~~~~~~~~~~~
 
-    if (false)
+    if (true)
     {
         Random rndGen(43544*Pstream::myProcNo());
 
@@ -80,11 +80,6 @@ int main(int argc, char *argv[])
             nSend[procI]++;
         }
 
-        // Sync how many to send
-        labelListList allNTrans(Pstream::nProcs());
-        allNTrans[Pstream::myProcNo()] = nSend;
-        combineReduce(allNTrans, UPstream::listEq());
-
         // Collect items to be sent
         labelListList sendMap(Pstream::nProcs());
         forAll(sendMap, procI)
@@ -98,11 +93,15 @@ int main(int argc, char *argv[])
             sendMap[procI][nSend[procI]++] = i;
         }
 
+        // Sync how many to send
+        labelList nRecv;
+        Pstream::exchangeSizes(sendMap, nRecv);
+
         // Collect items to be received
         labelListList recvMap(Pstream::nProcs());
         forAll(recvMap, procI)
         {
-            recvMap[procI].setSize(allNTrans[procI][Pstream::myProcNo()]);
+            recvMap[procI].setSize(nRecv[procI]);
         }
 
         label constructSize = 0;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index 7a672354ec..a698561822 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,14 +56,6 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
         nSend[procI]++;
     }
 
-    // Send over how many I need to receive
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    labelListList sendSizes(Pstream::nProcs());
-
-    sendSizes[Pstream::myProcNo()] = nSend;
-
-    combineReduce(sendSizes, UPstream::listEq());
 
     // 2. Size sendMap
     labelListList sendMap(Pstream::nProcs());
@@ -83,6 +75,11 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
         sendMap[procI][nSend[procI]++] = i;
     }
 
+    // 4. Send over how many I need to receive
+    labelList recvSizes;
+    Pstream::exchangeSizes(sendMap, recvSizes);
+
+
     // Determine receive map
     // ~~~~~~~~~~~~~~~~~~~~~
 
@@ -100,7 +97,7 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
     {
         if (procI != Pstream::myProcNo())
         {
-            label nRecv = sendSizes[procI][Pstream::myProcNo()];
+            label nRecv = recvSizes[procI];
 
             constructMap[procI].setSize(nRecv);
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index a21e6cecfc..72a0b76e55 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -61,14 +61,6 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
         nSend[procI]++;
     }
 
-    // Send over how many I need to receive
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    labelListList sendSizes(Pstream::nProcs());
-
-    sendSizes[Pstream::myProcNo()] = nSend;
-
-    combineReduce(sendSizes, UPstream::listEq());
 
     // 2. Size sendMap
     labelListList sendMap(Pstream::nProcs());
@@ -88,6 +80,11 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
         sendMap[procI][nSend[procI]++] = i;
     }
 
+    // 4. Send over how many I need to receive
+    labelList recvSizes;
+    Pstream::exchangeSizes(sendMap, recvSizes);
+
+
     // Determine receive map
     // ~~~~~~~~~~~~~~~~~~~~~
 
@@ -105,7 +102,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
     {
         if (procI != Pstream::myProcNo())
         {
-            label nRecv = sendSizes[procI][Pstream::myProcNo()];
+            label nRecv = recvSizes[procI];
 
             constructMap[procI].setSize(nRecv);
 
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C
index 9920451007..5be036fcec 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C
@@ -109,8 +109,10 @@ void Foam::IOdictionary::readFile(const bool masterOnly)
             IOdictionary::readData(fromAbove);
         }
 
-        // Send to my downstairs neighbours
-        forAll(myComm.below(), belowI)
+        // Send to my downstairs neighbours. Note reverse order not
+        // necessary here but just for consistency with other uses
+        // (e.g. gatherScatter.C)
+        forAllReverse(myComm.below(), belowI)
         {
             if (debug)
             {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index d501f3d443..e2ec02e88b 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -303,21 +303,42 @@ public:
 
         // Exchange
 
-            //- Exchange data. Sends sendData, receives into recvData, sets
-            //  sizes (not bytes). sizes[p0][p1] is what processor p0 has
-            //  sent to p1. Continuous data only.
-            //  If block=true will wait for all transfers to finish.
+            //- Helper: exchange contiguous data. Sends sendData, receives into
+            //  recvData. If block=true will wait for all transfers to finish.
             template<class Container, class T>
             static void exchange
             (
-                const List<Container >&,
-                List<Container >&,
-                labelListList& sizes,
+                const UList<Container>& sendData,
+                const labelUList& recvSizes,
+                List<Container>& recvData,
                 const int tag = UPstream::msgType(),
                 const label comm = UPstream::worldComm,
                 const bool block = true
             );
 
+            //- Helper: exchange sizes of sendData. sendData is the data per
+            //  processor (in the communicator). Returns sizes of sendData
+            //  on the sending processor.
+            template<class Container>
+            static void exchangeSizes
+            (
+                const Container& sendData,
+                labelList& sizes,
+                const label comm = UPstream::worldComm
+            );
+
+            //- Exchange contiguous data. Sends sendData, receives into
+            //  recvData. Determines sizes to receive.
+            //  If block=true will wait for all transfers to finish.
+            template<class Container, class T>
+            static void exchange
+            (
+                const UList<Container>& sendData,
+                List<Container>& recvData,
+                const int tag = UPstream::msgType(),
+                const label comm = UPstream::worldComm,
+                const bool block = true
+            );
 };
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index f6ab958e7c..73616e681a 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,12 +85,10 @@ void Foam::PstreamBuffers::finishedSends(const bool block)
 
     if (commsType_ == UPstream::nonBlocking)
     {
-        labelListList sizes;
         Pstream::exchange<DynamicList<char>, char>
         (
             sendBuf_,
             recvBuf_,
-            sizes,
             tag_,
             comm_,
             block
@@ -99,17 +97,19 @@ void Foam::PstreamBuffers::finishedSends(const bool block)
 }
 
 
-void Foam::PstreamBuffers::finishedSends(labelListList& sizes, const bool block)
+void Foam::PstreamBuffers::finishedSends(labelList& recvSizes, const bool block)
 {
     finishedSendsCalled_ = true;
 
     if (commsType_ == UPstream::nonBlocking)
     {
+        Pstream::exchangeSizes(sendBuf_, recvSizes, comm_);
+
         Pstream::exchange<DynamicList<char>, char>
         (
             sendBuf_,
+            recvSizes,
             recvBuf_,
-            sizes,
             tag_,
             comm_,
             block
@@ -123,22 +123,8 @@ void Foam::PstreamBuffers::finishedSends(labelListList& sizes, const bool block)
             << " since transfers already in progress. Use non-blocking instead."
             << exit(FatalError);
 
-        // Note: possible only if using different tag from write started
+        // Note: maybe possible only if using different tag from write started
         // by ~UOPstream. Needs some work.
-        //sizes.setSize(UPstream::nProcs(comm));
-        //labelList& nsTransPs = sizes[UPstream::myProcNo(comm)];
-        //nsTransPs.setSize(UPstream::nProcs(comm));
-        //
-        //forAll(sendBuf_, procI)
-        //{
-        //    nsTransPs[procI] = sendBuf_[procI].size();
-        //}
-        //
-        //// Send sizes across.
-        //int oldTag = UPstream::msgType();
-        //UPstream::msgType() = tag_;
-        //combineReduce(sizes, UPstream::listEq());
-        //UPstream::msgType() = oldTag;
     }
 }
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index 5da9dd218b..16caa9d720 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@@ -149,9 +149,9 @@ public:
         void finishedSends(const bool block = true);
 
         //- Mark all sends as having been done. Same as above but also returns
-        //  sizes (bytes) transferred. Note:currently only valid for
+        //  sizes (bytes) received. Note:currently only valid for
         //  non-blocking.
-        void finishedSends(labelListList& sizes, const bool block = true);
+        void finishedSends(labelList& recvSizes, const bool block = true);
 
         //- Clear storage and reset
         void clear();
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 67450666d2..9c66b0852c 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -489,7 +489,15 @@ public:
         //- Abort program
         static void abort();
 
-
+        //- Exchange label with all processors (in the communicator).
+        //  sendData[procI] is the label to send to procI.
+        //  After return recvData contains the data from the other processors.
+        static void allToAll
+        (
+            const labelUList& sendData,
+            labelUList& recvData,
+            const label communicator = 0
+        );
 };
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
index 345e766aea..d1ac549922 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
@@ -218,7 +218,7 @@ void Foam::Pstream::combineScatter
         }
 
         // Send to my downstairs neighbours
-        forAll(myComm.below(), belowI)
+        forAllReverse(myComm.below(), belowI)
         {
             label belowID = myComm.below()[belowI];
 
@@ -453,7 +453,7 @@ void Foam::Pstream::listCombineScatter
         }
 
         // Send to my downstairs neighbours
-        forAll(myComm.below(), belowI)
+        forAllReverse(myComm.below(), belowI)
         {
             label belowID = myComm.below()[belowI];
 
@@ -651,7 +651,7 @@ void Foam::Pstream::mapCombineScatter
         }
 
         // Send to my downstairs neighbours
-        forAll(myComm.below(), belowI)
+        forAllReverse(myComm.below(), belowI)
         {
             label belowID = myComm.below()[belowI];
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C b/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
index a3aff12981..95ad2537a4 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,9 +36,9 @@ Description
 template<class Container, class T>
 void Foam::Pstream::exchange
 (
-    const List<Container>& sendBufs,
+    const UList<Container>& sendBufs,
+    const labelUList& recvSizes,
     List<Container>& recvBufs,
-    labelListList& sizes,
     const int tag,
     const label comm,
     const bool block
@@ -53,23 +53,13 @@ void Foam::Pstream::exchange
     if (sendBufs.size() != UPstream::nProcs(comm))
     {
         FatalErrorInFunction
-            << "Size of list:" << sendBufs.size()
-            << " does not equal the number of processors:"
+            << "Size of list " << sendBufs.size()
+            << " does not equal the number of processors "
             << UPstream::nProcs(comm)
             << Foam::abort(FatalError);
     }
 
-    sizes.setSize(UPstream::nProcs(comm));
-    labelList& nsTransPs = sizes[UPstream::myProcNo(comm)];
-    nsTransPs.setSize(UPstream::nProcs(comm));
-
-    forAll(sendBufs, procI)
-    {
-        nsTransPs[procI] = sendBufs[procI].size();
-    }
-
-    // Send sizes across. Note: blocks.
-    combineReduce(sizes, UPstream::listEq(), tag, comm);
+    recvBufs.setSize(sendBufs.size());
 
     if (UPstream::nProcs(comm) > 1)
     {
@@ -78,10 +68,9 @@ void Foam::Pstream::exchange
         // Set up receives
         // ~~~~~~~~~~~~~~~
 
-        recvBufs.setSize(sendBufs.size());
-        forAll(sizes, procI)
+        forAll(recvSizes, procI)
         {
-            label nRecv = sizes[procI][UPstream::myProcNo(comm)];
+            label nRecv = recvSizes[procI];
 
             if (procI != Pstream::myProcNo(comm) && nRecv > 0)
             {
@@ -143,4 +132,48 @@ void Foam::Pstream::exchange
 }
 
 
+template<class Container>
+void Foam::Pstream::exchangeSizes
+(
+    const Container& sendBufs,
+    labelList& recvSizes,
+    const label comm
+)
+{
+    if (sendBufs.size() != UPstream::nProcs(comm))
+    {
+        FatalErrorInFunction
+            << "Size of container " << sendBufs.size()
+            << " does not equal the number of processors "
+            << UPstream::nProcs(comm)
+            << Foam::abort(FatalError);
+    }
+
+    labelList sendSizes(sendBufs.size());
+    forAll(sendBufs, procI)
+    {
+        sendSizes[procI] = sendBufs[procI].size();
+    }
+    recvSizes.setSize(sendSizes.size());
+    allToAll(sendSizes, recvSizes, comm);
+}
+
+
+template<class Container, class T>
+void Foam::Pstream::exchange
+(
+    const UList<Container>& sendBufs,
+    List<Container>& recvBufs,
+    const int tag,
+    const label comm,
+    const bool block
+)
+{
+    labelList recvSizes;
+    exchangeSizes(sendBufs, recvSizes, comm);
+
+    exchange<Container, T>(sendBufs, recvSizes, recvBufs, tag, comm, block);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
index 50a3b7660e..a270bea29e 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
@@ -185,8 +185,10 @@ void Pstream::scatter
             }
         }
 
-        // Send to my downstairs neighbours
-        forAll(myComm.below(), belowI)
+        // Send to my downstairs neighbours. Note reverse order (compared to
+        // receiving). This is to make sure to send to the critical path
+        // (only when using a tree schedule!) first.
+        forAllReverse(myComm.below(), belowI)
         {
             if (contiguous<T>())
             {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
index 930a51bc85..abd4dba8f9 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
@@ -274,7 +274,7 @@ void Pstream::scatterList
         }
 
         // Send to my downstairs neighbours
-        forAll(myComm.below(), belowI)
+        forAllReverse(myComm.below(), belowI)
         {
             label belowID = myComm.below()[belowI];
             const labelList& notBelowLeaves = comms[belowID].allNotBelow();
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
index 83f27c0cce..0ea3228226 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
@@ -248,8 +248,9 @@ bool Foam::regIOobject::read()
             ok = readData(fromAbove);
         }
 
-        // Send to my downstairs neighbours
-        forAll(myComm.below(), belowI)
+        // Send to my downstairs neighbours. Note reverse order not
+        // nessecary here - just for consistency reasons.
+        forAllReverse(myComm.below(), belowI)
         {
             OPstream toBelow
             (
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index bbb4c0ceb8..72d7376b85 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -528,12 +528,10 @@ void Foam::mapDistribute::exchangeAddressing
     }
 
     subMap_.setSize(Pstream::nProcs());
-    labelListList sendSizes;
     Pstream::exchange<labelList, label>
     (
         wantedRemoteElements,
         subMap_,
-        sendSizes,
         tag,
         Pstream::worldComm  //TBD
     );
@@ -608,12 +606,10 @@ void Foam::mapDistribute::exchangeAddressing
     }
 
     subMap_.setSize(Pstream::nProcs());
-    labelListList sendSizes;
     Pstream::exchange<labelList, label>
     (
         wantedRemoteElements,
         subMap_,
-        sendSizes,
         tag,
         Pstream::worldComm      //TBD
     );
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index cd3bc60f39..3f82f8a4dd 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,6 +81,17 @@ void Foam::reduce(scalar&, const sumOp<scalar>&, const int, const label, label&)
 {}
 
 
+void Foam::UPstream::allToAll
+(
+    const labelUList& sendData,
+    labelUList& recvData,
+    const label communicator
+)
+{
+    recvData.assign(sendData);
+}
+
+
 void Foam::UPstream::allocatePstreamCommunicator
 (
     const label,
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index c5407cb52d..4f95592ecc 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -295,6 +295,54 @@ void Foam::reduce
 }
 
 
+void Foam::UPstream::allToAll
+(
+    const labelUList& sendData,
+    labelUList& recvData,
+    const label communicator
+)
+{
+    label np = nProcs(communicator);
+
+    if (sendData.size() != np || recvData.size() != np)
+    {
+        FatalErrorInFunction
+            << "Size of sendData " << sendData.size()
+            << " or size of recvData " << recvData.size()
+            << " is not equal to the number of processors in the domain "
+            << np
+            << Foam::abort(FatalError);
+    }
+
+    if (!UPstream::parRun())
+    {
+        recvData.assign(sendData);
+    }
+    else
+    {
+        if
+        (
+            MPI_Alltoall
+            (
+                sendData.begin(),
+                sizeof(label),
+                MPI_BYTE,
+                recvData.begin(),
+                sizeof(label),
+                MPI_BYTE,
+                PstreamGlobals::MPICommunicators_[communicator]
+            )
+        )
+        {
+            FatalErrorInFunction
+                << "MPI_Alltoall failed for " << sendData
+                << " on communicator " << communicator
+                << Foam::abort(FatalError);
+        }
+    }
+}
+
+
 void Foam::UPstream::allocatePstreamCommunicator
 (
     const label parentIndex,
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 4a573a46ee..0ea3551bb1 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -322,7 +322,7 @@ void Foam::Cloud<ParticleType>::move(TrackData& td, const scalar trackTime)
 
 
         // Start sending. Sets number of bytes transferred
-        labelListList allNTrans(Pstream::nProcs());
+        labelList allNTrans(Pstream::nProcs());
         pBufs.finishedSends(allNTrans);
 
 
@@ -330,15 +330,13 @@ void Foam::Cloud<ParticleType>::move(TrackData& td, const scalar trackTime)
 
         forAll(allNTrans, i)
         {
-            forAll(allNTrans[i], j)
+            if (allNTrans[i])
             {
-                if (allNTrans[i][j])
-                {
-                    transfered = true;
-                    break;
-                }
+                transfered = true;
+                break;
             }
         }
+        reduce(transfered, orOp<bool>());
 
         if (!transfered)
         {
@@ -350,7 +348,7 @@ void Foam::Cloud<ParticleType>::move(TrackData& td, const scalar trackTime)
         {
             label neighbProci = neighbourProcs[i];
 
-            label nRec = allNTrans[neighbProci][Pstream::myProcNo()];
+            label nRec = allNTrans[neighbProci];
 
             if (nRec)
             {
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index 4551a403f5..4b250dd7b8 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -844,15 +844,6 @@ void Foam::InteractionLists<ParticleType>::buildMap
         nSend[procI]++;
     }
 
-    // Send over how many I need to receive
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    labelListList sendSizes(Pstream::nProcs());
-
-    sendSizes[Pstream::myProcNo()] = nSend;
-
-    combineReduce(sendSizes, UPstream::listEq());
-
     // 2. Size sendMap
     labelListList sendMap(Pstream::nProcs());
 
@@ -871,6 +862,11 @@ void Foam::InteractionLists<ParticleType>::buildMap
         sendMap[procI][nSend[procI]++] = i;
     }
 
+    // 4. Send over how many I need to receive
+    labelList recvSizes;
+    Pstream::exchangeSizes(sendMap, recvSizes);
+
+
     // Determine receive map
     // ~~~~~~~~~~~~~~~~~~~~~
 
@@ -888,7 +884,7 @@ void Foam::InteractionLists<ParticleType>::buildMap
     {
         if (procI != Pstream::myProcNo())
         {
-            label nRecv = sendSizes[procI][Pstream::myProcNo()];
+            label nRecv = recvSizes[procI];
 
             constructMap[procI].setSize(nRecv);
 
diff --git a/src/meshTools/regionSplit/regionSplit.C b/src/meshTools/regionSplit/regionSplit.C
index 27b438cd67..5c5ef0487c 100644
--- a/src/meshTools/regionSplit/regionSplit.C
+++ b/src/meshTools/regionSplit/regionSplit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -623,13 +623,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
 
     // Get the wanted region labels into recvNonLocal
     labelListList recvNonLocal;
-    labelListList sizes;
-    Pstream::exchange<labelList, label>
-    (
-        sendNonLocal,
-        recvNonLocal,
-        sizes
-    );
+    Pstream::exchange<labelList, label>(sendNonLocal, recvNonLocal);
 
     // Now we have the wanted compact region labels that procI wants in
     // recvNonLocal[procI]. Construct corresponding list of compact
@@ -650,13 +644,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
 
     // Send back (into recvNonLocal)
     recvNonLocal.clear();
-    sizes.clear();
-    Pstream::exchange<labelList, label>
-    (
-        sendWantedLocal,
-        recvNonLocal,
-        sizes
-    );
+    Pstream::exchange<labelList, label>(sendWantedLocal, recvNonLocal);
     sendWantedLocal.clear();
 
     // Now recvNonLocal contains for every element in setNonLocal the

From 4831f8146c3ececddf3d1a7d56a551ee29c6b79e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 2 Apr 2016 23:28:03 +0100
Subject: [PATCH 357/447] applications/test/Matrix/Test-Matrix.C: Corrected
 typo

---
 applications/test/Matrix/Test-Matrix.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/test/Matrix/Test-Matrix.C b/applications/test/Matrix/Test-Matrix.C
index 908c364d9c..523fd79710 100644
--- a/applications/test/Matrix/Test-Matrix.C
+++ b/applications/test/Matrix/Test-Matrix.C
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
 
     {
         LUscalarMatrix LU(squareMatrix);
-        scalarField x((LU.solve(source));
+        scalarField x(LU.solve(source));
         Info<< "LU solve residual " << (squareMatrix*x - source) << endl;
     }
 

From 6e573ad7e83d1e928cc36ccfc23355f546a4ae8d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 3 Apr 2016 10:26:05 +0100
Subject: [PATCH 358/447] UList: Rationalize assignment (shallow-copy vs
 deep-copy)

    //- Disallow default shallow-copy assignment
    //
    //  Assignment of UList<T> may need to be either shallow (copy pointer)
    //  or deep (copy elements) depending on context or the particular type
    //  of list derived from UList and it is confusing and prone to error
    //  for the default assignment to be either.  The solution is to
    //  disallow default assignment and provide separate 'shallowCopy' and
    //  'deepCopy' member functions.
    void operator=(const UList<T>&) = delete;

    //- Copy the pointer held by the given UList.
    inline void shallowCopy(const UList<T>&);

    //- Copy elements of the given UList.
    void deepCopy(const UList<T>&);
---
 .../CompactListList/Test-CompactListList.C    |  4 +--
 .../test/globalMeshData/Test-globalMeshData.C | 14 ++++------
 .../preProcessing/setFields/setFields.C       |  4 +--
 .../viewFactorsGen/viewFactorsGen.C           |  8 +++---
 .../containers/Lists/SubList/SubList.H        |  3 +++
 .../containers/Lists/SubList/SubListI.H       |  9 ++++++-
 src/OpenFOAM/containers/Lists/UList/UList.C   |  2 +-
 src/OpenFOAM/containers/Lists/UList/UList.H   | 26 ++++++++++++++++---
 src/OpenFOAM/containers/Lists/UList/UListI.H  |  8 ++++++
 .../SlicedGeometricField.C                    | 16 ++++++------
 .../LUscalarMatrix/LUscalarMatrixTemplates.C  |  2 +-
 .../GAMG/GAMGSolverAgglomerateMatrix.C        | 12 +++------
 .../lduMatrix/solvers/GAMG/GAMGSolverSolve.C  |  2 +-
 .../globalMeshData/globalIndexTemplates.C     |  6 ++---
 .../PrimitivePatch/PrimitivePatch.C           |  2 +-
 src/Pstream/dummy/UPstream.C                  |  2 +-
 src/Pstream/mpi/UPstream.C                    |  2 +-
 .../fvMeshDistribute/fvMeshDistribute.C       | 14 +++++-----
 .../basic/sliced/slicedFvPatchField.C         |  8 +++---
 .../basic/sliced/slicedFvsPatchField.C        |  8 +++---
 .../volPointInterpolate.C                     |  2 +-
 .../CellZoneInjection/CellZoneInjection.C     | 10 +++----
 .../clouds/Templates/SprayCloud/SprayCloudI.H |  4 +--
 .../AMIInterpolationParallelOps.C             |  4 +--
 .../simpleGeomDecomp/simpleGeomDecomp.C       | 14 +++++-----
 src/renumber/SloanRenumber/SloanRenumber.C    |  4 +--
 .../meshToMesh/meshToMeshParallelOps.C        | 13 ++++------
 .../sampledPatchInternalFieldTemplates.C      |  2 +-
 .../sampledTriSurfaceMeshTemplates.C          |  2 +-
 src/surfMesh/surfMesh/surfMesh.C              |  6 ++---
 .../radiationModels/viewFactor/viewFactor.C   |  9 +++----
 31 files changed, 122 insertions(+), 100 deletions(-)

diff --git a/applications/test/CompactListList/Test-CompactListList.C b/applications/test/CompactListList/Test-CompactListList.C
index 6d0a26676a..9baf498faf 100644
--- a/applications/test/CompactListList/Test-CompactListList.C
+++ b/applications/test/CompactListList/Test-CompactListList.C
@@ -56,8 +56,8 @@ int main(int argc, char *argv[])
         rowSizes[1] = row1.size();
         cll1.resize(rowSizes);
 
-        cll1[0].assign(row0);   //note: operator= will not work since UList
-        cll1[1].assign(row1);
+        cll1[0].deepCopy(row0);
+        cll1[1].deepCopy(row1);
         Info<< "cll1:" << cll1 << endl;
 
         forAll(cll1.m(), i)
diff --git a/applications/test/globalMeshData/Test-globalMeshData.C b/applications/test/globalMeshData/Test-globalMeshData.C
index c6b2d142e7..eab4500ebe 100644
--- a/applications/test/globalMeshData/Test-globalMeshData.C
+++ b/applications/test/globalMeshData/Test-globalMeshData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,10 +64,8 @@ int main(int argc, char *argv[])
 
         // Create field with my local data
         pointField coords(globalPointSlavesMap.constructSize());
-        SubList<point>(coords, coupledPatch.nPoints()).assign
-        (
-            coupledPatch.localPoints()
-        );
+        SubList<point>(coords, coupledPatch.nPoints()) =
+            coupledPatch.localPoints();
 
         // Exchange data. Apply positional transforms.
         globalPointSlavesMap.distribute
@@ -185,8 +183,7 @@ int main(int argc, char *argv[])
         label nBnd = mesh.nFaces()-mesh.nInternalFaces();
 
         pointField fc(globalPointBoundaryFacesMap.constructSize());
-        SubList<point>(fc, nBnd).assign
-        (
+        SubList<point>(fc, nBnd) =
             primitivePatch
             (
                 SubList<face>
@@ -196,8 +193,7 @@ int main(int argc, char *argv[])
                     mesh.nInternalFaces()
                 ),
                 mesh.points()
-            ).faceCentres()
-        );
+            ).faceCentres();
 
         // Exchange data
         globalPointBoundaryFacesMap.distribute
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index eedce844bc..9570756b4f 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -240,7 +240,7 @@ bool setFaceFieldType
                 field.boundaryField()[patchi].size(),
                 field.boundaryField()[patchi].patch().start()
               - mesh.nInternalFaces()
-            ).assign(field.boundaryField()[patchi]);
+            ) = field.boundaryField()[patchi];
         }
 
         // Override
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index defc6fb870..cdafdf3b20 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -424,14 +424,14 @@ int main(int argc, char *argv[])
             (
                 availablePoints,
                 upp.faceCentres().size()
-            ).assign(upp.faceCentres());
+            ) = upp.faceCentres();
 
             SubList<point>
             (
                 availablePoints,
                 upp.localPoints().size(),
                 upp.faceCentres().size()
-            ).assign(upp.localPoints());
+            ) = upp.localPoints();
 
             point cfo = cf;
             scalar dist = GREAT;
@@ -592,8 +592,8 @@ int main(int argc, char *argv[])
     DynamicList<label> compactPatchId(map.constructSize());
 
     // Insert my coarse local values
-    SubList<point>(compactCoarseSf, nCoarseFaces).assign(localCoarseSf);
-    SubList<point>(compactCoarseCf, nCoarseFaces).assign(localCoarseCf);
+    SubList<point>(compactCoarseSf, nCoarseFaces) = localCoarseSf;
+    SubList<point>(compactCoarseCf, nCoarseFaces) = localCoarseCf;
 
     // Insert my fine local values
     label compactI = 0;
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubList.H b/src/OpenFOAM/containers/Lists/SubList/SubList.H
index ff7661852a..b55fced6bb 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubList.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubList.H
@@ -87,6 +87,9 @@ public:
         //- Allow cast to a const List<T>&
         inline operator const Foam::List<T>&() const;
 
+        //- Assignment of all entries to the given sub-list
+        inline void operator=(const SubList<T>&);
+
         //- Assignment of all entries to the given list
         inline void operator=(const UList<T>&);
 
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
index 2a7f5c19ef..dbbed7469b 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
@@ -87,10 +87,17 @@ inline Foam::SubList<T>::operator const Foam::List<T>&() const
 }
 
 
+template<class T>
+inline void Foam::SubList<T>::operator=(const SubList<T>& sl)
+{
+    UList<T>::deepCopy(sl);
+}
+
+
 template<class T>
 inline void Foam::SubList<T>::operator=(const UList<T>& l)
 {
-    UList<T>::assign(l);
+    UList<T>::deepCopy(l);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.C b/src/OpenFOAM/containers/Lists/UList/UList.C
index e64b808ed5..ea871ed3f9 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.C
+++ b/src/OpenFOAM/containers/Lists/UList/UList.C
@@ -34,7 +34,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
-void Foam::UList<T>::assign(const UList<T>& a)
+void Foam::UList<T>::deepCopy(const UList<T>& a)
 {
     if (a.size_ != this->size_)
     {
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index a2fd872fa6..984bd90436 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -80,6 +80,19 @@ class UList
         T* __restrict__ v_;
 
 
+    // Private Member Functions
+
+        //- Disallow default shallow-copy assignment
+        //
+        //  Assignment of UList<T> may need to be either shallow (copy pointer)
+        //  or deep (copy elements) depending on context or the particular type
+        //  of list derived from UList and it is confusing and prone to error
+        //  for the default assignment to be either.  The solution is to
+        //  disallow default assignment and provide separate 'shallowCopy' and
+        //  'deepCopy' member functions.
+        void operator=(const UList<T>&) = delete;
+
+
 public:
 
     // Related types
@@ -90,11 +103,13 @@ public:
         //- Declare friendship with the SubList class
         friend class SubList<T>;
 
+
     // Static Member Functions
 
         //- Return a null UList
         inline static const UList<T>& null();
 
+
     // Public classes
 
         //- Less function class that can be used for sorting
@@ -198,15 +213,18 @@ public:
             inline void checkIndex(const label i) const;
 
 
+        //- Copy the pointer held by the given UList.
+        inline void shallowCopy(const UList<T>&);
+
+        //- Copy elements of the given UList.
+        void deepCopy(const UList<T>&);
+
         //- Write the UList as a dictionary entry.
         void writeEntry(Ostream&) const;
 
         //- Write the UList as a dictionary entry with keyword.
         void writeEntry(const word& keyword, Ostream&) const;
 
-        //- Assign elements to those from UList.
-        void assign(const UList<T>&);
-
 
     // Member operators
 
@@ -327,7 +345,7 @@ public:
     // STL member operators
 
         //- Equality operation on ULists of the same type.
-        //  Returns true when the ULists are elementwise equal
+        //  Returns true when the ULists are element-wise equal
         //  (using UList::value_type::operator==).  Takes linear time.
         bool operator==(const UList<T>&) const;
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UListI.H b/src/OpenFOAM/containers/Lists/UList/UListI.H
index 243e5faaf1..2d58855cbc 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListI.H
+++ b/src/OpenFOAM/containers/Lists/UList/UListI.H
@@ -152,6 +152,14 @@ inline T* Foam::UList<T>::data()
 }
 
 
+template<class T>
+inline void Foam::UList<T>::shallowCopy(const UList<T>& a)
+{
+    size_ = a.size_;
+    v_ = a.v_;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
index e347e2bf4b..d49c8b46f8 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@@ -158,7 +158,7 @@ slicedBoundaryField
                     DimensionedField<Type, GeoMesh>::null()
                 )
             );
-            bf[patchi].UList<Type>::operator=(bField[patchi]);
+            bf[patchi].shallowCopy(bField[patchi]);
         }
     }
 
@@ -193,7 +193,7 @@ DimensionedInternalField::DimensionedInternalField
     )
 {
     // Set the internalField to the slice of the complete field
-    UList<Type>::operator=
+    UList<Type>::shallowCopy
     (
         typename Field<Type>::subField(iField, GeoMesh::size(mesh))
     );
@@ -227,7 +227,7 @@ SlicedGeometricField
     )
 {
     // Set the internalField to the slice of the complete field
-    UList<Type>::operator=
+    UList<Type>::shallowCopy
     (
         typename Field<Type>::subField(completeField, GeoMesh::size(mesh))
     );
@@ -271,7 +271,7 @@ SlicedGeometricField
     )
 {
     // Set the internalField to the slice of the complete field
-    UList<Type>::operator=
+    UList<Type>::shallowCopy
     (
         typename Field<Type>::subField(completeIField, GeoMesh::size(mesh))
     );
@@ -305,7 +305,7 @@ SlicedGeometricField
     )
 {
     // Set the internalField to the supplied internal field
-    UList<Type>::operator=(gf.internalField());
+    UList<Type>::shallowCopy(gf.internalField());
 
     correctBoundaryConditions();
 }
@@ -334,7 +334,7 @@ SlicedGeometricField
     )
 {
     // Set the internalField to the supplied internal field
-    UList<Type>::operator=(gf.internalField());
+    UList<Type>::shallowCopy(gf.internalField());
 }
 
 
@@ -352,7 +352,7 @@ Foam::SlicedGeometricField<Type, PatchField, SlicedPatchField, GeoMesh>::
 {
     // Set the internalField storage pointer to NULL before its destruction
     // to protect the field it a slice of.
-    UList<Type>::operator=(UList<Type>(NULL, 0));
+    UList<Type>::shallowCopy(UList<Type>(NULL, 0));
 }
 
 
@@ -368,7 +368,7 @@ DimensionedInternalField::~DimensionedInternalField()
 {
     // Set the internalField storage pointer to NULL before its destruction
     // to protect the field it a slice of.
-    UList<Type>::operator=(UList<Type>(NULL, 0));
+    UList<Type>::shallowCopy(UList<Type>(NULL, 0));
 }
 
 
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C
index 605babb852..432c39917c 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C
@@ -51,7 +51,7 @@ void Foam::LUscalarMatrix::solve
             (
                 X,
                 x.size()
-            ).assign(x);
+            ) = x;
 
             for
             (
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index d472b98ded..d6df8be629 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -497,14 +497,13 @@ void Foam::GAMGSolver::procAgglomerateMatrix
         if (coarsestMatrix.hasDiag())
         {
             scalarField& allDiag = allMatrix.diag();
+
             SubList<scalar>
             (
                 allDiag,
                 coarsestMatrix.diag().size()
-            ).assign
-            (
-                coarsestMatrix.diag()
-            );
+            ) = coarsestMatrix.diag();
+
             forAll(otherMats, i)
             {
                 SubList<scalar>
@@ -512,10 +511,7 @@ void Foam::GAMGSolver::procAgglomerateMatrix
                     allDiag,
                     otherMats[i].diag().size(),
                     cellOffsets[i+1]
-                ).assign
-                (
-                    otherMats[i].diag()
-                );
+                ) = otherMats[i].diag();
             }
         }
         if (coarsestMatrix.hasLower())
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index d9f4760375..03a6d11107 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -295,7 +295,7 @@ void Foam::GAMGSolver::Vcycle
             // used
             if (nPreSweeps_)
             {
-                preSmoothedCoarseCorrField.assign(coarseCorrFields[leveli]);
+                preSmoothedCoarseCorrField = coarseCorrFields[leveli];
             }
 
             agglomeration_.prolongField
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexTemplates.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexTemplates.C
index 5532969f36..3be3a3a90b 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ void Foam::globalIndex::gather
         allFld.setSize(off.last());
 
         // Assign my local data
-        SubList<Type>(allFld, fld.size(), 0).assign(fld);
+        SubList<Type>(allFld, fld.size(), 0) = fld;
 
         if (commsType == Pstream::scheduled || commsType == Pstream::blocking)
         {
@@ -207,7 +207,7 @@ void Foam::globalIndex::scatter
 {
     if (Pstream::myProcNo(comm) == procIDs[0])
     {
-        fld.assign(SubList<Type>(allFld, off[1]-off[0]));
+        fld.deepCopy(SubList<Type>(allFld, off[1]-off[0]));
 
         if (commsType == Pstream::scheduled || commsType == Pstream::blocking)
         {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
index 6fb9994e4d..7f78dde7b2 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
@@ -582,7 +582,7 @@ operator=
 {
     clearOut();
 
-    FaceList<Face>::operator=(pp);
+    FaceList<Face>::shallowCopy(pp);
 }
 
 
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index 3f82f8a4dd..124e22a0c5 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -88,7 +88,7 @@ void Foam::UPstream::allToAll
     const label communicator
 )
 {
-    recvData.assign(sendData);
+    recvData.deepCopy(sendData);
 }
 
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 4f95592ecc..b7a5cd0c8f 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -316,7 +316,7 @@ void Foam::UPstream::allToAll
 
     if (!UPstream::parRun())
     {
-        recvData.assign(sendData);
+        recvData.deepCopy(sendData);
     }
     else
     {
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index bbf056d0d8..cb16af4907 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -566,10 +566,8 @@ void Foam::fvMeshDistribute::getNeighbourData
             }
 
             // Which processor they will end up on
-            SubList<label>(nbrNewNbrProc, pp.size(), offset).assign
-            (
-                UIndirectList<label>(distribution, pp.faceCells())()
-            );
+            SubList<label>(nbrNewNbrProc, pp.size(), offset) =
+                UIndirectList<label>(distribution, pp.faceCells())();
         }
     }
 
@@ -1074,7 +1072,7 @@ void Foam::fvMeshDistribute::sendMesh
 
             if (myZoneID != -1)
             {
-                zonePoints[nameI].assign(pointZones[myZoneID]);
+                zonePoints[nameI].deepCopy(pointZones[myZoneID]);
             }
         }
     }
@@ -1106,8 +1104,8 @@ void Foam::fvMeshDistribute::sendMesh
 
             if (myZoneID != -1)
             {
-                zoneFaces[nameI].assign(faceZones[myZoneID]);
-                zoneFaceFlip[nameI].assign(faceZones[myZoneID].flipMap());
+                zoneFaces[nameI].deepCopy(faceZones[myZoneID]);
+                zoneFaceFlip[nameI].deepCopy(faceZones[myZoneID].flipMap());
             }
         }
     }
@@ -1137,7 +1135,7 @@ void Foam::fvMeshDistribute::sendMesh
 
             if (myZoneID != -1)
             {
-                zoneCells[nameI].assign(cellZones[myZoneID]);
+                zoneCells[nameI].deepCopy(cellZones[myZoneID]);
             }
         }
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
index 37b209e8c4..5e489ae07f 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
@@ -38,7 +38,7 @@ Foam::slicedFvPatchField<Type>::slicedFvPatchField
     fvPatchField<Type>(p, iF, Field<Type>())
 {
     // Set the fvPatchField to a slice of the given complete field
-    UList<Type>::operator=(p.patchSlice(completeField));
+    UList<Type>::shallowCopy(p.patchSlice(completeField));
 }
 
 
@@ -92,7 +92,7 @@ Foam::slicedFvPatchField<Type>::slicedFvPatchField
     fvPatchField<Type>(ptf.patch(), iF, Field<Type>())
 {
     // Transfer the slice from the argument
-    UList<Type>::operator=(ptf);
+    UList<Type>::shallowCopy(ptf);
 }
 
 
@@ -121,7 +121,7 @@ Foam::slicedFvPatchField<Type>::slicedFvPatchField
     )
 {
     // Transfer the slice from the argument
-    UList<Type>::operator=(ptf);
+    UList<Type>::shallowCopy(ptf);
 }
 
 
@@ -144,7 +144,7 @@ Foam::slicedFvPatchField<Type>::~slicedFvPatchField()
 {
     // Set the fvPatchField storage pointer to NULL before its destruction
     // to protect the field it a slice of.
-    UList<Type>::operator=(UList<Type>(NULL, 0));
+    UList<Type>::shallowCopy(UList<Type>(NULL, 0));
 }
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
index 9cd047b214..34750c979a 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
@@ -38,7 +38,7 @@ Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
     fvsPatchField<Type>(p, iF, Field<Type>())
 {
     // Set the fvsPatchField to a slice of the given complete field
-    UList<Type>::operator=(p.patchSlice(completeField));
+    UList<Type>::shallowCopy(p.patchSlice(completeField));
 }
 
 
@@ -92,7 +92,7 @@ Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
     fvsPatchField<Type>(ptf.patch(), iF, Field<Type>())
 {
     // Transfer the slice from the argument
-    UList<Type>::operator=(ptf);
+    UList<Type>::shallowCopy(ptf);
 }
 
 
@@ -121,7 +121,7 @@ Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
     )
 {
     // Transfer the slice from the argument
-    UList<Type>::operator=(ptf);
+    UList<Type>::shallowCopy(ptf);
 }
 
 
@@ -144,7 +144,7 @@ Foam::slicedFvsPatchField<Type>::~slicedFvsPatchField()
 {
     // Set the fvsPatchField storage pointer to NULL before its destruction
     // to protect the field it a slice of.
-    UList<Type>::operator=(UList<Type>(NULL, 0));
+    UList<Type>::shallowCopy(UList<Type>(NULL, 0));
 }
 
 
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 2759d0fb4b..0f4750b279 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -184,7 +184,7 @@ Foam::tmp<Foam::Field<Type>> Foam::volPointInterpolation::flatBoundaryField
                 boundaryVals,
                 vf.boundaryField()[patchI].size(),
                 bFaceI
-            ).assign(vf.boundaryField()[patchI]);
+            ) = vf.boundaryField()[patchI];
         }
         else
         {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
index 083b0b6cb9..20f3740857 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ void Foam::CellZoneInjection<CloudType>::setPositions
         allPositions,
         globalPositions.localSize(Pstream::myProcNo()),
         globalPositions.offset(Pstream::myProcNo())
-    ).assign(positions);
+    ) = positions;
 
     Pstream::listCombineGather(allPositions, minEqOp<point>());
     Pstream::listCombineScatter(allPositions);
@@ -126,19 +126,19 @@ void Foam::CellZoneInjection<CloudType>::setPositions
         allInjectorCells,
         globalPositions.localSize(Pstream::myProcNo()),
         globalPositions.offset(Pstream::myProcNo())
-    ).assign(injectorCells);
+    ) = injectorCells;
     SubList<label>
     (
         allInjectorTetFaces,
         globalPositions.localSize(Pstream::myProcNo()),
         globalPositions.offset(Pstream::myProcNo())
-    ).assign(injectorTetFaces);
+    ) = injectorTetFaces;
     SubList<label>
     (
         allInjectorTetPts,
         globalPositions.localSize(Pstream::myProcNo()),
         globalPositions.offset(Pstream::myProcNo())
-    ).assign(injectorTetPts);
+    ) = injectorTetPts;
 
     // Transfer data
     positions_.transfer(allPositions);
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
index ba5bc78aa7..bd0ebdc0dc 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
@@ -138,7 +138,7 @@ inline Foam::scalar Foam::SprayCloud<CloudType>::penetration
                 allMass,
                 globalParcels.localSize(procI),
                 globalParcels.offset(procI)
-            ).assign(procMass[procI]);
+            ) = procMass[procI];
 
             // flatten the distance list
             SubList<scalar>
@@ -146,7 +146,7 @@ inline Foam::scalar Foam::SprayCloud<CloudType>::penetration
                 allDist,
                 globalParcels.localSize(procI),
                 globalParcels.offset(procI)
-            ).assign(procDist[procI]);
+            ) = procDist[procI];
         }
 
         // sort allDist distances into ascending order
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
index 77e77b2ce6..df6b45268c 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
@@ -246,7 +246,7 @@ distributeAndMergePatches
     // My own data first
     {
         const labelList& faceIDs = allTgtFaceIDs[Pstream::myProcNo()];
-        SubList<label>(tgtFaceIDs, faceIDs.size()).assign(faceIDs);
+        SubList<label>(tgtFaceIDs, faceIDs.size()) = faceIDs;
 
         const faceList& fcs = allFaces[Pstream::myProcNo()];
         forAll(fcs, i)
@@ -274,7 +274,7 @@ distributeAndMergePatches
         if (procI != Pstream::myProcNo())
         {
             const labelList& faceIDs = allTgtFaceIDs[procI];
-            SubList<label>(tgtFaceIDs, faceIDs.size(), nFaces).assign(faceIDs);
+            SubList<label>(tgtFaceIDs, faceIDs.size(), nFaces) = faceIDs;
 
             const faceList& fcs = allFaces[procI];
             forAll(fcs, i)
diff --git a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
index 0af2348247..e0e27a5166 100644
--- a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -325,7 +325,7 @@ Foam::labelList Foam::simpleGeomDecomp::decompose
 
             label nTotalPoints = 0;
             // Master first
-            SubField<point>(allPoints, points.size()).assign(points);
+            SubField<point>(allPoints, points.size()) = points;
             nTotalPoints += points.size();
 
             // Add slaves
@@ -338,7 +338,7 @@ Foam::labelList Foam::simpleGeomDecomp::decompose
                     allPoints,
                     nbrPoints.size(),
                     nTotalPoints
-                ).assign(nbrPoints);
+                ) = nbrPoints;
                 nTotalPoints += nbrPoints.size();
             }
 
@@ -401,8 +401,8 @@ Foam::labelList Foam::simpleGeomDecomp::decompose
 
             label nTotalPoints = 0;
             // Master first
-            SubField<point>(allPoints, points.size()).assign(points);
-            SubField<scalar>(allWeights, points.size()).assign(weights);
+            SubField<point>(allPoints, points.size()) = points;
+            SubField<scalar>(allWeights, points.size()) = weights;
             nTotalPoints += points.size();
 
             // Add slaves
@@ -416,13 +416,13 @@ Foam::labelList Foam::simpleGeomDecomp::decompose
                     allPoints,
                     nbrPoints.size(),
                     nTotalPoints
-                ).assign(nbrPoints);
+                ) = nbrPoints;
                 SubField<scalar>
                 (
                     allWeights,
                     nbrWeights.size(),
                     nTotalPoints
-                ).assign(nbrWeights);
+                ) = nbrWeights;
                 nTotalPoints += nbrPoints.size();
             }
 
diff --git a/src/renumber/SloanRenumber/SloanRenumber.C b/src/renumber/SloanRenumber/SloanRenumber.C
index 2490478940..43e8006a7a 100644
--- a/src/renumber/SloanRenumber/SloanRenumber.C
+++ b/src/renumber/SloanRenumber/SloanRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ Foam::labelList Foam::SloanRenumber::renumber
                 nbr,
                 pbm[patchI].size(),
                 pbm[patchI].start()-mesh.nInternalFaces()
-            ).assign(pbm[patchI].faceCells());
+            ) = pbm[patchI].faceCells();
         }
     }
     syncTools::swapBoundaryFaceList(mesh, nbr);
diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index ebe9a50b93..e1b72cce2a 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@@ -644,17 +644,14 @@ void Foam::meshToMesh::distributeAndMergeCells
     forAll(allPoints, procI)
     {
         const pointField& pts = allPoints[procI];
-        SubList<point>(tgtPoints, pts.size(), pointOffset[procI]).assign(pts);
+        SubList<point>(tgtPoints, pts.size(), pointOffset[procI]) = pts;
     }
 
     // Insert cellIDs
     forAll(allTgtCellIDs, procI)
     {
         const labelList& cellIDs = allTgtCellIDs[procI];
-        SubList<label>(tgtCellIDs, cellIDs.size(), cellOffset[procI]).assign
-        (
-            cellIDs
-        );
+        SubList<label>(tgtCellIDs, cellIDs.size(), cellOffset[procI]) = cellIDs;
     }
 
 
@@ -671,7 +668,7 @@ void Foam::meshToMesh::distributeAndMergeCells
             allNInternalFaces[procI],
             internalFaceOffset[procI]
         );
-        slice.assign(SubList<face>(fcs, allNInternalFaces[procI]));
+        slice = SubList<face>(fcs, allNInternalFaces[procI]);
         forAll(slice, i)
         {
             add(slice[i], pointOffset[procI]);
@@ -683,7 +680,7 @@ void Foam::meshToMesh::distributeAndMergeCells
             allNInternalFaces[procI],
             internalFaceOffset[procI]
         );
-        ownSlice.assign(SubField<label>(faceOs, allNInternalFaces[procI]));
+        ownSlice = SubField<label>(faceOs, allNInternalFaces[procI]);
         add(ownSlice, cellOffset[procI]);
 
         SubField<label> nbrSlice
@@ -692,7 +689,7 @@ void Foam::meshToMesh::distributeAndMergeCells
             allNInternalFaces[procI],
             internalFaceOffset[procI]
         );
-        nbrSlice.assign(SubField<label>(faceNs, allNInternalFaces[procI]));
+        nbrSlice = SubField<label>(faceNs, allNInternalFaces[procI]);
         add(nbrSlice, cellOffset[procI]);
 
         internalFaceOffset[procI] += allNInternalFaces[procI];
diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
index be2348729f..803fa5c6fa 100644
--- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
@@ -109,7 +109,7 @@ Foam::sampledPatchInternalField::interpolateField
 
         // Now patchVals holds the interpolated data in patch face order.
         // Collect.
-        SubList<Type>(allPatchVals, patchVals.size(), sz).assign(patchVals);
+        SubList<Type>(allPatchVals, patchVals.size(), sz) = patchVals;
         sz += patchVals.size();
     }
 
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
index 737ccba99b..e2242536e5 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
@@ -67,7 +67,7 @@ Foam::sampledTriSurfaceMesh::sampleField
                 bVals,
                 vField.boundaryField()[patchI].size(),
                 bFaceI
-            ).assign(vField.boundaryField()[patchI]);
+            ) = vField.boundaryField()[patchI];
         }
 
         // Sample in flat boundary field
diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C
index af64864ecb..1cc3ddcba4 100644
--- a/src/surfMesh/surfMesh/surfMesh.C
+++ b/src/surfMesh/surfMesh/surfMesh.C
@@ -229,7 +229,7 @@ Foam::surfMesh::~surfMesh()
 
 void Foam::surfMesh::updatePointsRef()
 {
-    // assign the reference to the points (this is truly ugly)
+    // Assign the reference to the points (this is truly ugly)
     reinterpret_cast<SubField<point>&>
     (
         const_cast<Field<point>&>(MeshReference::points())
@@ -239,8 +239,8 @@ void Foam::surfMesh::updatePointsRef()
 
 void Foam::surfMesh::updateFacesRef()
 {
-    // assign the reference to the faces
-    static_cast<UList<face>&>(*this) = this->storedFaces();
+    // Assign the reference to the faces
+    shallowCopy(this->storedFaces());
 }
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index d70eccfa9c..aa2077e2be 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -467,10 +467,9 @@ void Foam::radiation::viewFactor::calculate()
     }
 
     // Fill the local values to distribute
-    SubList<scalar>(compactCoarseT,nLocalCoarseFaces_).assign(localCoarseTave);
-    SubList<scalar>(compactCoarseE,nLocalCoarseFaces_).assign(localCoarseEave);
-    SubList<scalar>
-        (compactCoarseHo,nLocalCoarseFaces_).assign(localCoarseHoave);
+    SubList<scalar>(compactCoarseT,nLocalCoarseFaces_) = localCoarseTave;
+    SubList<scalar>(compactCoarseE,nLocalCoarseFaces_) = localCoarseEave;
+    SubList<scalar>(compactCoarseHo,nLocalCoarseFaces_) = localCoarseHoave;
 
     // Distribute data
     map_->distribute(compactCoarseT);
@@ -491,7 +490,7 @@ void Foam::radiation::viewFactor::calculate()
     (
         compactGlobalIds,
         nLocalCoarseFaces_
-    ).assign(localGlobalIds);
+    ) = localGlobalIds;
 
     map_->distribute(compactGlobalIds);
 

From 9d0ab178b0618a4207c0f97e499efa01723b0656 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 3 Apr 2016 14:46:45 +0100
Subject: [PATCH 359/447] wmake/rules/linux64Clang/c++Opt: Removed temporary
 line

---
 wmake/rules/linux64Clang/c++Opt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wmake/rules/linux64Clang/c++Opt b/wmake/rules/linux64Clang/c++Opt
index 3363be8090..2aedabd628 100644
--- a/wmake/rules/linux64Clang/c++Opt
+++ b/wmake/rules/linux64Clang/c++Opt
@@ -1,3 +1,2 @@
-#c++DBUG     = -O0 -DFULLDEBUG -g
 c++DBUG     =
 c++OPT      = -O3

From 55b457a0ca6ce400f8a90da47bf4ed96dd014e75 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 3 Apr 2016 15:48:59 +0100
Subject: [PATCH 360/447] rigidBodyDynamics: New library providing support for
 the dynamics of n-DoF articulated bodies

Based on the principles, algorithms, data structures and notation
presented in the book:

    Featherstone, R. (2008).
    Rigid body dynamics algorithms.
    Springer.

This development is sponsored by Carnegie Wave Energy Ltd.
---
 src/rigidBodyDynamics/Make/files              |  25 ++
 src/rigidBodyDynamics/Make/options            |   3 +
 .../bodies/masslessBody/masslessBody.C        |  42 +++
 .../bodies/masslessBody/masslessBody.H        | 106 ++++++
 .../bodies/masslessBody/masslessBodyI.H       |  40 +++
 .../bodies/rigidBody/rigidBody.C              |  67 ++++
 .../bodies/rigidBody/rigidBody.H              | 145 ++++++++
 .../bodies/rigidBody/rigidBodyI.H             |  66 ++++
 .../bodies/subBody/subBody.H                  | 125 +++++++
 .../bodies/subBody/subBodyI.H                 |  62 ++++
 src/rigidBodyDynamics/joints/Pa/Pa.C          |  98 ++++++
 src/rigidBodyDynamics/joints/Pa/Pa.H          | 111 +++++++
 src/rigidBodyDynamics/joints/Px/Px.C          |  98 ++++++
 src/rigidBodyDynamics/joints/Px/Px.H          | 111 +++++++
 src/rigidBodyDynamics/joints/Pxyz/Pxyz.C      | 112 +++++++
 src/rigidBodyDynamics/joints/Pxyz/Pxyz.H      | 111 +++++++
 src/rigidBodyDynamics/joints/Py/Py.C          |  98 ++++++
 src/rigidBodyDynamics/joints/Py/Py.H          | 111 +++++++
 src/rigidBodyDynamics/joints/Pz/Pz.C          |  98 ++++++
 src/rigidBodyDynamics/joints/Pz/Pz.H          | 111 +++++++
 src/rigidBodyDynamics/joints/Ra/Ra.C          |  98 ++++++
 src/rigidBodyDynamics/joints/Ra/Ra.H          | 111 +++++++
 src/rigidBodyDynamics/joints/Rs/Rs.C          | 114 +++++++
 src/rigidBodyDynamics/joints/Rs/Rs.H          | 116 +++++++
 src/rigidBodyDynamics/joints/Rx/Rx.C          |  99 ++++++
 src/rigidBodyDynamics/joints/Rx/Rx.H          | 111 +++++++
 src/rigidBodyDynamics/joints/Rxyz/Rxyz.C      | 146 ++++++++
 src/rigidBodyDynamics/joints/Rxyz/Rxyz.H      | 112 +++++++
 src/rigidBodyDynamics/joints/Ry/Ry.C          |  99 ++++++
 src/rigidBodyDynamics/joints/Ry/Ry.H          | 111 +++++++
 src/rigidBodyDynamics/joints/Ryxz/Ryxz.C      | 146 ++++++++
 src/rigidBodyDynamics/joints/Ryxz/Ryxz.H      | 112 +++++++
 src/rigidBodyDynamics/joints/Rz/Rz.C          |  99 ++++++
 src/rigidBodyDynamics/joints/Rz/Rz.H          | 111 +++++++
 src/rigidBodyDynamics/joints/Rzyx/Rzyx.C      | 146 ++++++++
 src/rigidBodyDynamics/joints/Rzyx/Rzyx.H      | 112 +++++++
 src/rigidBodyDynamics/joints/joint/joint.C    |  77 +++++
 src/rigidBodyDynamics/joints/joint/joint.H    | 269 +++++++++++++++
 src/rigidBodyDynamics/joints/joint/jointI.H   | 110 ++++++
 src/rigidBodyDynamics/joints/joints.H         |  19 ++
 .../joints/nullJoint/nullJoint.C              |  97 ++++++
 .../joints/nullJoint/nullJoint.H              | 111 +++++++
 .../rigidBodyInertia/rigidBodyInertia.H       | 175 ++++++++++
 .../rigidBodyInertia/rigidBodyInertiaI.H      | 243 ++++++++++++++
 .../rigidBodyModel/forwardDynamics.C          | 239 +++++++++++++
 .../rigidBodyModel/rigidBodyModel.C           | 224 +++++++++++++
 .../rigidBodyModel/rigidBodyModel.H           | 313 ++++++++++++++++++
 .../rigidBodyModel/rigidBodyModelI.H          | 120 +++++++
 48 files changed, 5580 insertions(+)
 create mode 100644 src/rigidBodyDynamics/Make/files
 create mode 100644 src/rigidBodyDynamics/Make/options
 create mode 100644 src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
 create mode 100644 src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
 create mode 100644 src/rigidBodyDynamics/bodies/masslessBody/masslessBodyI.H
 create mode 100644 src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
 create mode 100644 src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
 create mode 100644 src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
 create mode 100644 src/rigidBodyDynamics/bodies/subBody/subBody.H
 create mode 100644 src/rigidBodyDynamics/bodies/subBody/subBodyI.H
 create mode 100644 src/rigidBodyDynamics/joints/Pa/Pa.C
 create mode 100644 src/rigidBodyDynamics/joints/Pa/Pa.H
 create mode 100644 src/rigidBodyDynamics/joints/Px/Px.C
 create mode 100644 src/rigidBodyDynamics/joints/Px/Px.H
 create mode 100644 src/rigidBodyDynamics/joints/Pxyz/Pxyz.C
 create mode 100644 src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
 create mode 100644 src/rigidBodyDynamics/joints/Py/Py.C
 create mode 100644 src/rigidBodyDynamics/joints/Py/Py.H
 create mode 100644 src/rigidBodyDynamics/joints/Pz/Pz.C
 create mode 100644 src/rigidBodyDynamics/joints/Pz/Pz.H
 create mode 100644 src/rigidBodyDynamics/joints/Ra/Ra.C
 create mode 100644 src/rigidBodyDynamics/joints/Ra/Ra.H
 create mode 100644 src/rigidBodyDynamics/joints/Rs/Rs.C
 create mode 100644 src/rigidBodyDynamics/joints/Rs/Rs.H
 create mode 100644 src/rigidBodyDynamics/joints/Rx/Rx.C
 create mode 100644 src/rigidBodyDynamics/joints/Rx/Rx.H
 create mode 100644 src/rigidBodyDynamics/joints/Rxyz/Rxyz.C
 create mode 100644 src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
 create mode 100644 src/rigidBodyDynamics/joints/Ry/Ry.C
 create mode 100644 src/rigidBodyDynamics/joints/Ry/Ry.H
 create mode 100644 src/rigidBodyDynamics/joints/Ryxz/Ryxz.C
 create mode 100644 src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
 create mode 100644 src/rigidBodyDynamics/joints/Rz/Rz.C
 create mode 100644 src/rigidBodyDynamics/joints/Rz/Rz.H
 create mode 100644 src/rigidBodyDynamics/joints/Rzyx/Rzyx.C
 create mode 100644 src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
 create mode 100644 src/rigidBodyDynamics/joints/joint/joint.C
 create mode 100644 src/rigidBodyDynamics/joints/joint/joint.H
 create mode 100644 src/rigidBodyDynamics/joints/joint/jointI.H
 create mode 100644 src/rigidBodyDynamics/joints/joints.H
 create mode 100644 src/rigidBodyDynamics/joints/nullJoint/nullJoint.C
 create mode 100644 src/rigidBodyDynamics/joints/nullJoint/nullJoint.H
 create mode 100644 src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H
 create mode 100644 src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H
 create mode 100644 src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
 create mode 100644 src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
 create mode 100644 src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
 create mode 100644 src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H

diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
new file mode 100644
index 0000000000..2ae2c197ad
--- /dev/null
+++ b/src/rigidBodyDynamics/Make/files
@@ -0,0 +1,25 @@
+bodies/rigidBody/rigidBody.C
+bodies/masslessBody/masslessBody.C
+
+joints/joint/joint.C
+joints/nullJoint/nullJoint.C
+
+joints/Rx/Rx.C
+joints/Ry/Ry.C
+joints/Rz/Rz.C
+joints/Ra/Ra.C
+joints/Rs/Rs.C
+joints/Rzyx/Rzyx.C
+joints/Rxyz/Rxyz.C
+joints/Ryxz/Ryxz.C
+
+joints/Px/Px.C
+joints/Py/Py.C
+joints/Pz/Pz.C
+joints/Pa/Pa.C
+joints/Pxyz/Pxyz.C
+
+rigidBodyModel/rigidBodyModel.C
+rigidBodyModel/forwardDynamics.C
+
+LIB = $(FOAM_LIBBIN)/librigidBodyDynamics
diff --git a/src/rigidBodyDynamics/Make/options b/src/rigidBodyDynamics/Make/options
new file mode 100644
index 0000000000..79be6f3a7d
--- /dev/null
+++ b/src/rigidBodyDynamics/Make/options
@@ -0,0 +1,3 @@
+EXE_INC =
+
+LIB_LIBS =
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
new file mode 100644
index 0000000000..b5e3cfecd8
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "masslessBody.H"
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::masslessBody::~masslessBody()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+bool Foam::RBD::masslessBody::massless() const
+{
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
new file mode 100644
index 0000000000..46e0104093
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\3
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::masslessBody
+
+Description
+
+SourceFiles
+    masslessBodyI.H
+    masslessBody.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_masslessBody_H
+#define RBD_masslessBody_H
+
+#include "rigidBody.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of Foam classes
+class Istream;
+class Ostream;
+
+namespace RBD
+{
+
+// Forward declaration of friend functions and operators
+class masslessBody;
+Ostream& operator<<(Ostream&, const masslessBody&);
+
+
+/*---------------------------------------------------------------------------*\
+                         Class masslessBody Declaration
+\*---------------------------------------------------------------------------*/
+
+class masslessBody
+:
+    public rigidBody
+{
+
+public:
+
+    // Constructors
+
+        //- Construct a massless body
+        inline masslessBody();
+
+        //- Construct a named massless body
+        inline masslessBody(const word& name);
+
+
+    //- Destructor
+    virtual ~masslessBody();
+
+
+    // Member Functions
+
+        //- Return true if this body is a massless component of a composite body
+        virtual bool massless() const;
+
+
+    // IOstream Operators
+
+        //friend Ostream& operator<<(Ostream&, const masslessBody&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "masslessBodyI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBodyI.H b/src/rigidBodyDynamics/bodies/masslessBody/masslessBodyI.H
new file mode 100644
index 0000000000..06acc415b6
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBodyI.H
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::RBD::masslessBody::masslessBody()
+:
+    rigidBody("massless", rigidBodyInertia())
+{}
+
+
+inline Foam::RBD::masslessBody::masslessBody(const word& name)
+:
+    rigidBody(name, rigidBodyInertia())
+{}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
new file mode 100644
index 0000000000..57848850d6
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBody.H"
+#include "subBody.H"
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::rigidBody::New
+(
+    const word& name,
+    const scalar& m,
+    const vector& c,
+    const symmTensor& Ic
+)
+{
+    return autoPtr<rigidBody>(new rigidBody(name, m, c, Ic));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBody::~rigidBody()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+bool Foam::RBD::rigidBody::massless() const
+{
+    return false;
+}
+
+
+void Foam::RBD::rigidBody::merge(const subBody& subBody)
+{
+    *this = rigidBody
+    (
+        name(),
+        *this + transform(subBody.parentXT(), subBody)
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
new file mode 100644
index 0000000000..8658659e3a
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::rigidBody
+
+Description
+
+SourceFiles
+    rigidBodyI.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_rigidBody_H
+#define RBD_rigidBody_H
+
+#include "rigidBodyInertia.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of Foam classes
+class Istream;
+class Ostream;
+
+namespace RBD
+{
+
+// Forward declaration of classes
+class subBody;
+
+// Forward declaration of friend functions and operators
+class rigidBody;
+Ostream& operator<<(Ostream&, const rigidBody&);
+
+
+/*---------------------------------------------------------------------------*\
+                         Class rigidBody Declaration
+\*---------------------------------------------------------------------------*/
+
+class rigidBody
+:
+    public rigidBodyInertia
+{
+    // Private data
+
+        //- Name of body
+        word name_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from mass, centre of mass and moment of inertia tensor
+        //  about the centre of mass
+        inline rigidBody
+        (
+            const word& name,
+            const scalar& m,
+            const vector& c,
+            const symmTensor& Ic
+        );
+
+        //- Construct from with the given rigidBodyInertia
+        inline rigidBody
+        (
+            const word& name,
+            const rigidBodyInertia& rbi
+        );
+
+        //- Return clone of this rigidBody
+        inline autoPtr<rigidBody> clone() const;
+
+
+    // Selectors
+
+        //- Select constructed from components
+        static autoPtr<rigidBody> New
+        (
+            const word& name,
+            const scalar& m,
+            const vector& c,
+            const symmTensor& Ic
+        );
+
+
+    //- Destructor
+    virtual ~rigidBody();
+
+
+    // Member Functions
+
+        //- Return name
+        inline const word& name() const;
+
+        //- Return false as this body is not massless
+        virtual bool massless() const;
+
+        //- Merge a body into this parent body
+        void merge(const subBody&);
+
+
+    // IOstream Operators
+
+        //friend Ostream& operator<<(Ostream&, const rigidBody&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "rigidBodyI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H b/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
new file mode 100644
index 0000000000..2e68928a45
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::RBD::rigidBody::rigidBody
+(
+    const word& name,
+    const scalar& m,
+    const vector& c,
+    const symmTensor& Ic
+)
+:
+    rigidBodyInertia(m, c, Ic),
+    name_(name)
+{}
+
+
+inline Foam::RBD::rigidBody::rigidBody
+(
+    const word& name,
+    const rigidBodyInertia& rbi
+)
+    :
+    rigidBodyInertia(rbi),
+    name_(name)
+{}
+
+
+inline Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::rigidBody::clone() const
+{
+    return autoPtr<rigidBody>(new rigidBody(*this));
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::word& Foam::RBD::rigidBody::name() const
+{
+    return name_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBody.H b/src/rigidBodyDynamics/bodies/subBody/subBody.H
new file mode 100644
index 0000000000..684cb4b7e3
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/subBody/subBody.H
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::subBody
+
+Description
+    This specialized rigidBody holds the original body after it has been merged
+    into a parent.
+
+SourceFiles
+    subBodyI.H
+    subBody.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_subBody_H
+#define RBD_subBody_H
+
+#include "rigidBody.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of Foam classes
+class Istream;
+class Ostream;
+
+namespace RBD
+{
+
+// Forward declaration of friend functions and operators
+class subBody;
+Ostream& operator<<(Ostream&, const subBody&);
+
+
+/*---------------------------------------------------------------------------*\
+                         Class subBody Declaration
+\*---------------------------------------------------------------------------*/
+
+class subBody
+:
+    public rigidBody
+{
+    // Private data
+
+        //- Original body from which this sub-body was constructed
+        autoPtr<rigidBody> body_;
+
+        //- Parent body ID
+        label parentID_;
+
+        //- Transform with respect to parent body
+        spatialTransform parentXT_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct a merged version of the given rigidBody
+        //  providing the ID of the parent body to which this will be merged
+        //  and the transform relative to the parent
+        inline subBody
+        (
+            autoPtr<rigidBody> bodyPtr,
+            const label parentID,
+            const spatialTransform& parentXT
+        );
+
+
+    // Member Functions
+
+        //- Return the original body from which this sub-body was constructed
+        inline const rigidBody& body() const;
+
+        //- Return the parent body Id
+        inline label parentID() const;
+
+        //- Return the transform with respect to the parent body
+        inline const spatialTransform& parentXT() const;
+
+
+    // IOstream Operators
+
+        //friend Ostream& operator<<(Ostream&, const subBody&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "subBodyI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
new file mode 100644
index 0000000000..2cfd606cc4
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::RBD::subBody::subBody
+(
+    autoPtr<rigidBody> bodyPtr,
+    const label parentID,
+    const spatialTransform& parentXT
+)
+:
+    rigidBody(bodyPtr()),
+    body_(bodyPtr),
+    parentID_(parentID),
+    parentXT_(parentXT)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::RBD::rigidBody& Foam::RBD::subBody::body() const
+{
+    return body_();
+}
+
+
+inline Foam::label Foam::RBD::subBody::parentID() const
+{
+    return parentID_;
+}
+
+
+inline const Foam::spatialTransform& Foam::RBD::subBody::parentXT() const
+{
+    return parentXT_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Pa/Pa.C b/src/rigidBodyDynamics/joints/Pa/Pa.C
new file mode 100644
index 0000000000..8472269504
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Pa/Pa.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Pa.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Pa, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Pa,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Pa::Pa(const rigidBodyModel& model, const vector& axis)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(Zero, axis);
+}
+
+
+Foam::RBD::joints::Pa::Pa(const rigidBodyModel& model, const dictionary& dict)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(Zero, dict.lookup("axis"));
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Pa::clone() const
+{
+    return autoPtr<joint>(new Pa(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Pa::~Pa()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Pa::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    J.X = Xt(S_[0].l()*q[qIndex_]);
+    J.S1 = S_[0];
+    J.v = S_[0]*qDot[qIndex_];
+    J.c = Zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Pa/Pa.H b/src/rigidBodyDynamics/joints/Pa/Pa.H
new file mode 100644
index 0000000000..99208d1e72
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Pa/Pa.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Pa
+
+Description
+    Prismatic joint for translation along the specified arbitrary axis.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Pa.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Pa_H
+#define RBD_joints_Pa_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Pa Declaration
+\*---------------------------------------------------------------------------*/
+
+class Pa
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Pa");
+
+
+    // Constructors
+
+        //- Construct for given model and axis
+        Pa(const rigidBodyModel& model, const vector& axis);
+
+        //- Construct for given model from dictionary
+        Pa(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Pa();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Px/Px.C b/src/rigidBodyDynamics/joints/Px/Px.C
new file mode 100644
index 0000000000..3edbb7a2a3
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Px/Px.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Px.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Px, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Px,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Px::Px(const rigidBodyModel& model)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(0, 0, 0, 1, 0, 0);
+}
+
+
+Foam::RBD::joints::Px::Px(const rigidBodyModel& model, const dictionary& dict)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(0, 0, 0, 1, 0, 0);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Px::clone() const
+{
+    return autoPtr<joint>(new Px(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Px::~Px()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Px::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    J.X = Xt(S_[0].l()*q[qIndex_]);
+    J.S1 = S_[0];
+    J.v = S_[0]*qDot[qIndex_];
+    J.c = Zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Px/Px.H b/src/rigidBodyDynamics/joints/Px/Px.H
new file mode 100644
index 0000000000..0bbd6028b8
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Px/Px.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Px
+
+Description
+    Prismatic joint for translation along the x-axis.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Px.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Px_H
+#define RBD_joints_Px_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Px Declaration
+\*---------------------------------------------------------------------------*/
+
+class Px
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Px");
+
+
+    // Constructors
+
+        //- Construct for given model
+        Px(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        Px(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Px();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.C b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.C
new file mode 100644
index 0000000000..131bcad8c9
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.C
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Pxyz.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Pxyz, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Pxyz,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Pxyz::Pxyz(const rigidBodyModel& model)
+:
+    joint(model, 3)
+{
+    S_[0] = spatialVector(0, 0, 0, 1, 0, 0);
+    S_[1] = spatialVector(0, 0, 0, 0, 1, 0);
+    S_[2] = spatialVector(0, 0, 0, 0, 0, 1);
+}
+
+
+Foam::RBD::joints::Pxyz::Pxyz
+(
+    const rigidBodyModel& model,
+    const dictionary& dict
+)
+:
+    joint(model, 3)
+{
+    S_[0] = spatialVector(0, 0, 0, 1, 0, 0);
+    S_[1] = spatialVector(0, 0, 0, 0, 1, 0);
+    S_[2] = spatialVector(0, 0, 0, 0, 0, 1);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Pxyz::clone() const
+{
+    return autoPtr<joint>(new Pxyz(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Pxyz::~Pxyz()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Pxyz::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    J.X.E() = tensor::I;
+    J.X.r() = q.block<vector>(qIndex_);
+
+    J.S = Zero;
+    J.S(3,0) = 1;
+    J.S(4,1) = 1;
+    J.S(5,2) = 1;
+
+    J.v = spatialVector(Zero, qDot.block<vector>(qIndex_));
+    J.c = Zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
new file mode 100644
index 0000000000..b5e87f6f1f
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Pxyz
+
+Description
+    Prismatic joint for translation in the x/y/z directions.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Pxyz.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Pxyz_H
+#define RBD_joints_Pxyz_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Pxyz Declaration
+\*---------------------------------------------------------------------------*/
+
+class Pxyz
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Pxyz");
+
+
+    // Constructors
+
+        //- Construct for given model
+        Pxyz(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        Pxyz(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Pxyz();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Py/Py.C b/src/rigidBodyDynamics/joints/Py/Py.C
new file mode 100644
index 0000000000..e7e5b147ff
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Py/Py.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Py.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Py, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Py,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Py::Py(const rigidBodyModel& model)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(0, 0, 0, 0, 1, 0);
+}
+
+
+Foam::RBD::joints::Py::Py(const rigidBodyModel& model, const dictionary& dict)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(0, 0, 0, 0, 1, 0);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Py::clone() const
+{
+    return autoPtr<joint>(new Py(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Py::~Py()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Py::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    J.X = Xt(S_[0].l()*q[qIndex_]);
+    J.S1 = S_[0];
+    J.v = S_[0]*qDot[qIndex_];
+    J.c = Zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Py/Py.H b/src/rigidBodyDynamics/joints/Py/Py.H
new file mode 100644
index 0000000000..fb2a87601a
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Py/Py.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Py
+
+Description
+    Prismatic joint for translation along the y-axis.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Py.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Py_H
+#define RBD_joints_Py_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Py Declaration
+\*---------------------------------------------------------------------------*/
+
+class Py
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Py");
+
+
+    // Constructors
+
+        //- Construct for given model
+        Py(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        Py(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Py();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Pz/Pz.C b/src/rigidBodyDynamics/joints/Pz/Pz.C
new file mode 100644
index 0000000000..cbccb6dddd
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Pz/Pz.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Pz.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Pz, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Pz,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Pz::Pz(const rigidBodyModel& model)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(0, 0, 0, 0, 0, 1);
+}
+
+
+Foam::RBD::joints::Pz::Pz(const rigidBodyModel& model, const dictionary& dict)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(0, 0, 0, 0, 0, 1);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Pz::clone() const
+{
+    return autoPtr<joint>(new Pz(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Pz::~Pz()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Pz::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    J.X = Xt(S_[0].l()*q[qIndex_]);
+    J.S1 = S_[0];
+    J.v = S_[0]*qDot[qIndex_];
+    J.c = Zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Pz/Pz.H b/src/rigidBodyDynamics/joints/Pz/Pz.H
new file mode 100644
index 0000000000..d1a7a4e61f
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Pz/Pz.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Pz
+
+Description
+    Prismatic joint for translation along the x-axis.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Pz.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Pz_H
+#define RBD_joints_Pz_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Pz Declaration
+\*---------------------------------------------------------------------------*/
+
+class Pz
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Pz");
+
+
+    // Constructors
+
+        //- Construct for given model
+        Pz(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        Pz(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Pz();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Ra/Ra.C b/src/rigidBodyDynamics/joints/Ra/Ra.C
new file mode 100644
index 0000000000..2230863898
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Ra/Ra.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Ra.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Ra, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Ra,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Ra::Ra(const rigidBodyModel& model, const vector& axis)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(axis, Zero);
+}
+
+
+Foam::RBD::joints::Ra::Ra(const rigidBodyModel& model, const dictionary& dict)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(dict.lookup("axis"), Zero);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Ra::clone() const
+{
+    return autoPtr<joint>(new Ra(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Ra::~Ra()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Ra::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    J.X = Xr(S_[0].w(), q[qIndex_]);
+    J.S1 = S_[0];
+    J.v = S_[0]*qDot[qIndex_];
+    J.c = Zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Ra/Ra.H b/src/rigidBodyDynamics/joints/Ra/Ra.H
new file mode 100644
index 0000000000..b429678318
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Ra/Ra.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Ra
+
+Description
+    Revolute joint for rotation about the specified arbitrary axis.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Ra.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Ra_H
+#define RBD_joints_Ra_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Ra Declaration
+\*---------------------------------------------------------------------------*/
+
+class Ra
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Ra");
+
+
+    // Constructors
+
+        //- Construct for given model and axis
+        Ra(const rigidBodyModel& model, const vector& axis);
+
+        //- Construct for given model from dictionary
+        Ra(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Ra();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Rs/Rs.C b/src/rigidBodyDynamics/joints/Rs/Rs.C
new file mode 100644
index 0000000000..c5da501f0e
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Rs/Rs.C
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Rs.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Rs, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Rs,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Rs::Rs(const rigidBodyModel& model)
+:
+    joint(model, 3)
+{
+    S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
+    S_[1] = spatialVector (0, 1, 0, 0, 0, 0);
+    S_[2] = spatialVector(0, 0, 1, 0, 0, 0);
+}
+
+
+Foam::RBD::joints::Rs::Rs(const rigidBodyModel& model, const dictionary& dict)
+:
+    joint(model, 3)
+{
+    S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
+    S_[1] = spatialVector (0, 1, 0, 0, 0, 0);
+    S_[2] = spatialVector(0, 0, 1, 0, 0, 0);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Rs::clone() const
+{
+    return autoPtr<joint>(new Rs(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Rs::~Rs()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::label Foam::RBD::joints::Rs::nw() const
+{
+    return 1;
+}
+
+
+void Foam::RBD::joints::Rs::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    J.X.E() = operator()(q, w).R().T();
+    J.X.r() = Zero;
+
+    J.S = Zero;
+    J.S.xx() = 1;
+    J.S.yy() = 1;
+    J.S.zz() = 1;
+
+    J.v = spatialVector(qDot.block<vector>(qIndex_), Zero);
+    J.c = Zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Rs/Rs.H b/src/rigidBodyDynamics/joints/Rs/Rs.H
new file mode 100644
index 0000000000..3e1b0655f3
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Rs/Rs.H
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Rs
+
+Description
+    Spherical joint for rotation about the x/y/z-axes using a quaternion
+    (Euler parameters) to avoid gimble-lock.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Rs.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Rs_H
+#define RBD_joints_Rs_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Rs Declaration
+\*---------------------------------------------------------------------------*/
+
+class Rs
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Rs");
+
+
+    // Constructors
+
+        //- Construct for given model
+        Rs(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        Rs(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Rs();
+
+
+    // Member Functions
+
+        //- Return the number of additional state variable for this joint
+        //  For the quaternion this is 1 in addition to the 3 stored in q
+        virtual label nw() const;
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Rx/Rx.C b/src/rigidBodyDynamics/joints/Rx/Rx.C
new file mode 100644
index 0000000000..c90f6fd976
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Rx/Rx.C
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Rx.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Rx, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Rx,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Rx::Rx(const rigidBodyModel& model)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
+}
+
+
+Foam::RBD::joints::Rx::Rx(const rigidBodyModel& model, const dictionary& dict)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Rx::clone() const
+{
+    return autoPtr<joint>(new Rx(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Rx::~Rx()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Rx::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    J.X = Xrx(q[qIndex_]);
+    J.S1 = S_[0];
+    J.v = Zero;
+    J.v.wx() = qDot[qIndex_];
+    J.c = Zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Rx/Rx.H b/src/rigidBodyDynamics/joints/Rx/Rx.H
new file mode 100644
index 0000000000..79ca52d9f2
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Rx/Rx.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Rx
+
+Description
+    Revolute joint for rotation about the x-axis
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Rx.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Rx_H
+#define RBD_joints_Rx_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Rx Declaration
+\*---------------------------------------------------------------------------*/
+
+class Rx
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Rx");
+
+
+    // Constructors
+
+        //- Construct for given model
+        Rx(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        Rx(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Rx();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.C b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.C
new file mode 100644
index 0000000000..8dda6d3e6a
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.C
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Rxyz.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Rxyz, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Rxyz,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Rxyz::Rxyz(const rigidBodyModel& model)
+:
+    joint(model, 3)
+{
+    S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
+    S_[1] = spatialVector(0, 1, 0, 0, 0, 0);
+    S_[2] = spatialVector(0, 0, 1, 0, 0, 0);
+}
+
+
+Foam::RBD::joints::Rxyz::Rxyz
+(
+    const rigidBodyModel& model,
+    const dictionary& dict
+)
+:
+    joint(model, 3)
+{
+    S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
+    S_[1] = spatialVector(0, 1, 0, 0, 0, 0);
+    S_[2] = spatialVector(0, 0, 1, 0, 0, 0);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Rxyz::clone() const
+{
+    return autoPtr<joint>(new Rxyz(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Rxyz::~Rxyz()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Rxyz::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    vector qj(q.block<vector>(qIndex_));
+
+    scalar s0 = sin(qj.x());
+    scalar c0 = cos(qj.x());
+    scalar s1 = sin(qj.y());
+    scalar c1 = cos(qj.y());
+    scalar s2 = sin(qj.z());
+    scalar c2 = cos(qj.z());
+
+    J.X.E() = tensor
+    (
+        c2*c1,            s2*c0 + c2*s1*s0, s2*s0 - c2*s1*c0,
+       -s2*c1,            c2*c0 - s2*s1*s0, c2*s0 + s2*s1*c0,
+        s1,              -c1*s0,            c1*c0
+    );
+    J.X.r() = Zero;
+
+    J.S = Zero;
+    J.S.xx() = c2*c1;
+    J.S.xy() = s2;
+    J.S.yx() = -s2*c1;
+    J.S.yy() = c2;
+    J.S.zx() = s1;
+    J.S.zz() = 1;
+
+    vector qDotj(qDot.block<vector>(qIndex_));
+    J.v = J.S & qDotj;
+
+    J.c = spatialVector
+    (
+       -s2*c1*qDotj.z()*qDotj.x()
+      - c2*s1*qDotj.y()*qDotj.x()
+      + c2*qDotj.z()*qDotj.y(),
+
+       -c2*c1*qDotj.z()*qDotj.x()
+      + s2*s1*qDotj.y()*qDotj.x()
+      - s2*qDotj.z()*qDotj.y(),
+
+        c1*qDotj.y()*qDotj.x(),
+
+        0,
+        0,
+        0
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
new file mode 100644
index 0000000000..7ada2cc4a5
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Rxyz
+
+Description
+    Spherical joint for rotation about the x/y/z-axes using Euler-angles
+    in the order x, y, z.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Rxyz.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Rxyz_H
+#define RBD_joints_Rxyz_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Rxyz Declaration
+\*---------------------------------------------------------------------------*/
+
+class Rxyz
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Rxyz");
+
+
+    // Constructors
+
+        //- Construct for given model
+        Rxyz(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        Rxyz(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Rxyz();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Ry/Ry.C b/src/rigidBodyDynamics/joints/Ry/Ry.C
new file mode 100644
index 0000000000..4814264f1b
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Ry/Ry.C
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Ry.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Ry, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Ry,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Ry::Ry(const rigidBodyModel& model)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(0, 1, 0, 0, 0, 0);
+}
+
+
+Foam::RBD::joints::Ry::Ry(const rigidBodyModel& model, const dictionary& dict)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(0, 1, 0, 0, 0, 0);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Ry::clone() const
+{
+    return autoPtr<joint>(new Ry(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Ry::~Ry()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Ry::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    J.X = Xry(q[qIndex_]);
+    J.S1 = S_[0];
+    J.v = Zero;
+    J.v.wy() = qDot[qIndex_];
+    J.c = Zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Ry/Ry.H b/src/rigidBodyDynamics/joints/Ry/Ry.H
new file mode 100644
index 0000000000..4a88a659a4
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Ry/Ry.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Ry
+
+Description
+    Revolute joint for rotation about the y-axis
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Ry.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Ry_H
+#define RBD_joints_Ry_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Ry Declaration
+\*---------------------------------------------------------------------------*/
+
+class Ry
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Ry");
+
+
+    // Constructors
+
+        //- Construct for given model
+        Ry(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        Ry(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Ry();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.C b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.C
new file mode 100644
index 0000000000..a52896299a
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.C
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Ryxz.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Ryxz, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Ryxz,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Ryxz::Ryxz(const rigidBodyModel& model)
+:
+    joint(model, 3)
+{
+    S_[0] = spatialVector(0, 1, 0, 0, 0, 0);
+    S_[1] = spatialVector(1, 0, 0, 0, 0, 0);
+    S_[2] = spatialVector(0, 0, 1, 0, 0, 0);
+}
+
+
+Foam::RBD::joints::Ryxz::Ryxz
+(
+    const rigidBodyModel& model,
+    const dictionary& dict
+)
+:
+    joint(model, 3)
+{
+    S_[0] = spatialVector(0, 1, 0, 0, 0, 0);
+    S_[1] = spatialVector(1, 0, 0, 0, 0, 0);
+    S_[2] = spatialVector(0, 0, 1, 0, 0, 0);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Ryxz::clone() const
+{
+    return autoPtr<joint>(new Ryxz(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Ryxz::~Ryxz()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Ryxz::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    vector qj(q.block<vector>(qIndex_));
+
+    scalar s0 = sin(qj.x());
+    scalar c0 = cos(qj.x());
+    scalar s1 = sin(qj.y());
+    scalar c1 = cos(qj.y());
+    scalar s2 = sin(qj.z());
+    scalar c2 = cos(qj.z());
+
+    J.X.E() = tensor
+    (
+        c2*c0 + s2*s1*s0, s2*c1,           -c2*s0 + s2*s1*c0,
+       -s2*c0 + c2*s1*s0, c2*c1,            s2*s0 + c2*s1*c0,
+        c1*s0,           -s1,               c1*c0
+    );
+    J.X.r() = Zero;
+
+    J.S = Zero;
+    J.S.xx() = s2*c1;
+    J.S.xy() = c2;
+    J.S.yx() = c2*c1;
+    J.S.yy() = -s2;
+    J.S.zx() = -s1;
+    J.S.zz() = 1;
+
+    vector qDotj(qDot.block<vector>(qIndex_));
+    J.v = J.S & qDotj;
+
+    J.c = spatialVector
+    (
+        c2*c1*qDotj.z()*qDotj.x()
+      - s2*s1*qDotj.y()*qDotj.x()
+      - s2*qDotj.z()*qDotj.y(),
+
+       -s2*c1*qDotj.z()*qDotj.x()
+      - c2*s1*qDotj.y()*qDotj.x()
+      - c2*qDotj.z()*qDotj.y(),
+
+       -c1*qDotj.y()*qDotj.x(),
+
+        0,
+        0,
+        0
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
new file mode 100644
index 0000000000..604e849b3a
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Ryxz
+
+Description
+    Spherical joint for rotation about the x/y/z-axes using Euler-angles
+    in the order y, x, z.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Ryxz.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Ryxz_H
+#define RBD_joints_Ryxz_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Ryxz Declaration
+\*---------------------------------------------------------------------------*/
+
+class Ryxz
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Ryxz");
+
+
+    // Constructors
+
+        //- Construct for given model
+        Ryxz(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        Ryxz(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Ryxz();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Rz/Rz.C b/src/rigidBodyDynamics/joints/Rz/Rz.C
new file mode 100644
index 0000000000..1465dfc460
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Rz/Rz.C
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Rz.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Rz, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Rz,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Rz::Rz(const rigidBodyModel& model)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(0, 0, 1, 0, 0, 0);
+}
+
+
+Foam::RBD::joints::Rz::Rz(const rigidBodyModel& model, const dictionary& dict)
+:
+    joint(model, 1)
+{
+    S_[0] = spatialVector(0, 0, 1, 0, 0, 0);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Rz::clone() const
+{
+    return autoPtr<joint>(new Rz(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Rz::~Rz()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Rz::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    J.X = Xrz(q[qIndex_]);
+    J.S1 = S_[0];
+    J.v = Zero;
+    J.v.wz() = qDot[qIndex_];
+    J.c = Zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Rz/Rz.H b/src/rigidBodyDynamics/joints/Rz/Rz.H
new file mode 100644
index 0000000000..b14b6408fb
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Rz/Rz.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Rz
+
+Description
+    Revolute joint for rotation about the z-axis
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Rz.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Rz_H
+#define RBD_joints_Rz_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Rz Declaration
+\*---------------------------------------------------------------------------*/
+
+class Rz
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Rz");
+
+
+    // Constructors
+
+        //- Construct for given model
+        Rz(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        Rz(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Rz();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.C b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.C
new file mode 100644
index 0000000000..f55775330f
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.C
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Rzyx.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(Rzyx, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        Rzyx,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Rzyx::Rzyx(const rigidBodyModel& model)
+:
+    joint(model, 3)
+{
+    S_[0] = spatialVector(0, 0, 1, 0, 0, 0);
+    S_[1] = spatialVector(0, 1, 0, 0, 0, 0);
+    S_[2] = spatialVector(1, 0, 0, 0, 0, 0);
+}
+
+
+Foam::RBD::joints::Rzyx::Rzyx
+(
+    const rigidBodyModel& model,
+    const dictionary& dict
+)
+:
+    joint(model, 3)
+{
+    S_[0] = spatialVector(0, 0, 1, 0, 0, 0);
+    S_[1] = spatialVector(0, 1, 0, 0, 0, 0);
+    S_[2] = spatialVector(1, 0, 0, 0, 0, 0);
+}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::Rzyx::clone() const
+{
+    return autoPtr<joint>(new Rzyx(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::Rzyx::~Rzyx()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::Rzyx::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    vector qj(q.block<vector>(qIndex_));
+
+    scalar s0 = sin(qj.x());
+    scalar c0 = cos(qj.x());
+    scalar s1 = sin(qj.y());
+    scalar c1 = cos(qj.y());
+    scalar s2 = sin(qj.z());
+    scalar c2 = cos(qj.z());
+
+    J.X.E() = tensor
+    (
+        c0*c1,            s0*c1,           -s1,
+        c0*s1*s2 - s0*c2, s0*s1*s2 + c0*c2, c1*s2,
+        c0*s1*c2 + s0*s2, s0*s1*c2 - c0*s2, c1*c2
+    );
+    J.X.r() = Zero;
+
+    J.S = Zero;
+    J.S.xx() = -s1;
+    J.S.xz() = 1;
+    J.S.yx() = c1*s2;
+    J.S.yy() = c2;
+    J.S.zx() = c1*c2;
+    J.S.zy() = -s2;
+
+    vector qDotj(qDot.block<vector>(qIndex_));
+    J.v = J.S & qDotj;
+
+    J.c = spatialVector
+    (
+       -c1*qDotj.x()*qDotj.y(),
+
+       -s1*s2*qDotj.x()*qDotj.y()
+      + c1*c2*qDotj.x()*qDotj.z()
+      - s2*qDotj.y()*qDotj.z(),
+
+       -s1*c2*qDotj.x()*qDotj.y()
+      - c1*s2*qDotj.x()*qDotj.z()
+      - c2*qDotj.y()*qDotj.z(),
+
+        0,
+        0,
+        0
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
new file mode 100644
index 0000000000..52c53939f1
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::Rzyx
+
+Description
+    Spherical joint for rotation about the x/y/z-axes using Euler-angles
+    in the order z, y, x.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    Rzyx.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_Rzyx_H
+#define RBD_joints_Rzyx_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class Rzyx Declaration
+\*---------------------------------------------------------------------------*/
+
+class Rzyx
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("Rzyx");
+
+
+    // Constructors
+
+        //- Construct for given model
+        Rzyx(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        Rzyx(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~Rzyx();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/joint/joint.C b/src/rigidBodyDynamics/joints/joint/joint.C
new file mode 100644
index 0000000000..04f41d65a4
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/joint/joint.C
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "joint.H"
+#include "rigidBodyModel.H"
+#include "Rs.H"
+#include "Rzyx.H"
+#include "Pxyz.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+    defineTypeNameAndDebug(joint, 0);
+    defineRunTimeSelectionTable(joint, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joint::New(joint* jointPtr)
+{
+    return autoPtr<joint>(jointPtr);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joint::~joint()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::PtrList<Foam::RBD::joint> Foam::RBD::joint::floating
+(
+    const rigidBodyModel& model
+)
+{
+    PtrList<joint> cj(2);
+    cj.set(0, new joints::Pxyz(model));
+    //cj.set(1, new joints::Rs(model));
+    cj.set(1, new joints::Rzyx(model));
+    return cj;
+}
+
+
+void Foam::RBD::joint::write(Ostream& os) const
+{}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/joint/joint.H b/src/rigidBodyDynamics/joints/joint/joint.H
new file mode 100644
index 0000000000..4acfb7da95
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/joint/joint.H
@@ -0,0 +1,269 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joint
+
+Description
+    Abstract base-class for all rigid-body joints.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    jointI.H
+    joint.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joint_H
+#define RBD_joint_H
+
+#include "List.H"
+#include "spatialVector.H"
+#include "compactSpatialTensor.H"
+#include "CompactSpatialTensorT.H"
+#include "spatialTransform.H"
+#include "quaternion.H"
+#include "scalarField.H"
+#include "runTimeSelectionTables.H"
+
+namespace Foam
+{
+namespace RBD
+{
+
+// Forward declaration of classes
+class rigidBodyModel;
+
+/*---------------------------------------------------------------------------*\
+                         Class joint Declaration
+\*---------------------------------------------------------------------------*/
+
+class joint
+{
+
+protected:
+
+    // Protected data
+
+    //- Joint motion sub-space
+    List<spatialVector> S_;
+
+    //- Index of this joint in the rigidBodyModel
+    label index_;
+
+    //- Index of this joints data in the rigidBodyModel state
+    label qIndex_;
+
+    //- Index of this joints quaternion data in the rigidBodyModel state
+    label wIndex_;
+
+
+private:
+
+    // Private member functions to be used by rigidBodyModel
+
+        //- Allow the rigidBodyModel to set the index for this joint
+        label& index()
+        {
+            return index_;
+        }
+
+        //- Allow the rigidBodyModel to set the qIndex for this joint
+        label& qIndex()
+        {
+            return qIndex_;
+        }
+
+        //- Allow the rigidBodyModel to set the wIndex for this joint
+        label& wIndex()
+        {
+            return wIndex_;
+        }
+
+
+public:
+
+    //- Allow the rigidBodyModel class to set the joint indices
+    friend class rigidBodyModel;
+
+    //- Joint state returned by jcalc
+    class XSvc
+    {
+    public:
+
+        //- The joint transformation
+        spatialTransform X;
+
+        //- The joint motion sub-space (3-DoF)
+        compactSpatialTensor S;
+
+        //- The joint motion sub-space (1-DoF)
+        spatialVector S1;
+
+        //- The constrained joint velocity
+        spatialVector v;
+
+        //- The constrained joint acceleration correction
+        //  due to changes in the motion sub-space S
+        spatialVector c;
+
+        //- Null constructor
+        XSvc()
+        :
+            X(),
+            v(Zero),
+            c(Zero)
+        {}
+    };
+
+
+public:
+
+    //- Runtime type information
+    TypeName("joint");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            joint,
+            dictionary,
+            (
+                const rigidBodyModel& model,
+                const dictionary& dict
+            ),
+            (model, dict)
+        );
+
+
+    // Constructors
+
+        //- Construct joint for given rigidBodyModel
+        //  setting the size of the motion sub-space
+        //  to the given degrees of freedom of the joint
+        inline joint(const rigidBodyModel&, const label nDoF);
+
+        //- Clone this joint (needed by PtrList)
+        virtual autoPtr<joint> clone() const = 0;
+
+
+    //- Destructor
+    virtual ~joint();
+
+
+    // Selectors
+
+        //- Simple selector to return an autoPtr<joint> of the given joint*
+        static autoPtr<joint> New(joint* jointPtr);
+
+        //- Select constructed from dictionary
+        static autoPtr<joint> New
+        (
+            const rigidBodyModel& model,
+            const dictionary& dict
+        );
+
+
+    // Member Functions
+
+        //- Return the number of degrees of freedom in this joint
+        inline label nDoF() const;
+
+        //- Return the number of additional state variables need by this joint
+        inline virtual label nw() const;
+
+        //- Return the index of this joint in the model
+        inline label index() const;
+
+        //- Return start index for the state variables for this joint
+        //  in the rigidBodyModel state fields
+        inline label qIndex() const;
+
+        //- Return start index for the additional state variables for this joint
+        //  in the rigidBodyModel w state field
+        inline label wIndex() const;
+
+        //- Return the joint motion sub-space
+        inline const List<spatialVector>& S() const;
+
+        //- Return a list of joints needed to emulate a floating body
+        static PtrList<joint> floating(const rigidBodyModel& model);
+
+        //- Update the rigidBodyModel state for the joint given
+        //  the joint state q, w and velocity qDot
+        virtual void jcalc
+        (
+            XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const = 0;
+
+        //- Write
+        virtual void write(Ostream&) const;
+
+
+    // Member Operators
+
+        //- Return the state quaternion for this joint
+        //  if it uses a quaternion representation for rotation
+        inline quaternion operator()
+        (
+            const scalarField& q,
+            const scalarField& w
+        ) const;
+
+        //- Set the state quaternion for this joint
+        //  if it uses a quaternion representation for rotation
+        inline void operator()
+        (
+            const quaternion& quat,
+            scalarField& q,
+            scalarField& w
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "jointI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/joint/jointI.H b/src/rigidBodyDynamics/joints/joint/jointI.H
new file mode 100644
index 0000000000..f2020c047c
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/joint/jointI.H
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::RBD::joint::joint(const rigidBodyModel&, const label nDoF)
+:
+    S_(nDoF),
+    index_(0),
+    qIndex_(0),
+    wIndex_(0)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::label Foam::RBD::joint::nDoF() const
+{
+    return S_.size();
+}
+
+inline Foam::label Foam::RBD::joint::nw() const
+{
+    return 0;
+}
+
+inline Foam::label Foam::RBD::joint::index() const
+{
+    return index_;
+}
+
+inline Foam::label Foam::RBD::joint::qIndex() const
+{
+    return qIndex_;
+}
+
+inline Foam::label Foam::RBD::joint::wIndex() const
+{
+    return wIndex_;
+}
+
+inline const Foam::List<Foam::spatialVector>& Foam::RBD::joint::S() const
+{
+    return S_;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+inline Foam::quaternion Foam::RBD::joint::operator()
+(
+    const scalarField& q,
+    const scalarField& w
+) const
+{
+    if (nw() != 1)
+    {
+        FatalErrorInFunction
+            << "Attempt to get the quaternion for a non-spherical joint"
+            << abort(FatalError);
+    }
+
+    return quaternion(w[wIndex_], q.block<vector>(qIndex_));
+}
+
+
+inline void Foam::RBD::joint::operator()
+(
+    const quaternion& quat,
+    scalarField& q,
+    scalarField& w
+) const
+{
+    if (nw() != 1)
+    {
+        FatalErrorInFunction
+            << "Attempt to set quaternion for a non-spherical joint"
+            << abort(FatalError);
+    }
+
+    w[wIndex_] = quat.w();
+    q[qIndex_] = quat.v().x();
+    q[qIndex_+1] = quat.v().y();
+    q[qIndex_+2] = quat.v().z();
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/joints.H b/src/rigidBodyDynamics/joints/joints.H
new file mode 100644
index 0000000000..2ddd6c905c
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/joints.H
@@ -0,0 +1,19 @@
+// Null joint for the root-body
+#include "nullJoint.H"
+
+// Revolute joints
+#include "Rx.H"
+#include "Ry.H"
+#include "Rz.H"
+#include "Ra.H"
+#include "Rs.H"
+#include "Rzyx.H"
+#include "Rxyz.H"
+#include "Ryxz.H"
+
+// Prismatic joints
+#include "Px.H"
+#include "Py.H"
+#include "Pz.H"
+#include "Pa.H"
+#include "Pxyz.H"
diff --git a/src/rigidBodyDynamics/joints/nullJoint/nullJoint.C b/src/rigidBodyDynamics/joints/nullJoint/nullJoint.C
new file mode 100644
index 0000000000..04cccfb6c2
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/nullJoint/nullJoint.C
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "nullJoint.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(null, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        null,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::null::null(const rigidBodyModel& model)
+:
+    joint(model, 0)
+{}
+
+
+Foam::RBD::joints::null::null
+(
+    const rigidBodyModel& model,
+    const dictionary& dict
+)
+:
+    joint(model, 0)
+{}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::null::clone() const
+{
+    return autoPtr<joint>(new null(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::null::~null()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::null::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    FatalErrorInFunction
+        << "Cannot calculate the state of a null-joint"
+        << abort(FatalError);
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/nullJoint/nullJoint.H b/src/rigidBodyDynamics/joints/nullJoint/nullJoint.H
new file mode 100644
index 0000000000..d7fc158d1a
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/nullJoint/nullJoint.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::null
+
+Description
+    Null joint for the root-body.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    nullJoint.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_null_H
+#define RBD_joints_null_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class null Declaration
+\*---------------------------------------------------------------------------*/
+
+class null
+:
+    public joint
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("null");
+
+
+    // Constructors
+
+        //- Construct for given model
+        null(const rigidBodyModel& model);
+
+        //- Construct for given model from dictionary
+        null(const rigidBodyModel&, const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~null();
+
+
+    // Member Functions
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H
new file mode 100644
index 0000000000..b5f1233837
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::rigidBodyInertia
+
+Description
+    This class represents the linear and angular inertia of a rigid body
+    by the mass, centre of mass and moment of inertia tensor about the
+    centre of mass.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+    \endverbatim
+
+SourceFiles
+    rigidBodyInertiaI.H
+    rigidBodyInertia.C
+    rigidBodyInertiaIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_rigidBodyInertia_H
+#define RBD_rigidBodyInertia_H
+
+#include "vector.H"
+#include "symmTensor.H"
+#include "spatialVector.H"
+#include "spatialTensor.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class Istream;
+class Ostream;
+
+namespace RBD
+{
+
+// Forward declaration of friend functions and operators
+class rigidBodyInertia;
+Istream& operator>>(Istream&, rigidBodyInertia&);
+Ostream& operator<<(Ostream&, const rigidBodyInertia&);
+
+
+/*---------------------------------------------------------------------------*\
+                         Class rigidBodyInertia Declaration
+\*---------------------------------------------------------------------------*/
+
+class rigidBodyInertia
+{
+    // Private data
+
+        //- Mass of the rigid-body
+        scalar m_;
+
+        //- Centre of mass of the rigid-body
+        vector c_;
+
+        //- Inertia tensor about the centre of mass
+        symmTensor Ic_;
+
+
+public:
+
+    // Static member functions
+
+        //- Return the difference between the inertia tensor of the rigid-body
+        //  about the origin - about the centre of mass
+        //  for the given mass and centre of mass
+        inline static symmTensor Ioc(const scalar m, const vector& c);
+
+
+    // Constructors
+
+        //- Null constructor, initializes to zero
+        inline rigidBodyInertia();
+
+        //- Construct from mass, centre of mass and moment of inertia tensor
+        //  about the centre of mass
+        inline rigidBodyInertia
+        (
+            const scalar m,
+            const vector& c,
+            const symmTensor& Ic
+        );
+
+        //- Construct from the components of a spatial tensor
+        inline explicit rigidBodyInertia(const spatialTensor& st);
+
+        //- Construct from Istream
+        inline explicit rigidBodyInertia(Istream& is);
+
+
+    // Member Functions
+
+        //- Return the mass of the rigid-body
+        inline scalar m() const;
+
+        //- Return the centre of mass of the rigid-body
+        inline const vector& c() const;
+
+        //- Return the inertia tensor of the rigid-body about the centre of mass
+        inline const symmTensor& Ic() const;
+
+        //- Return the difference between the inertia tensor of the rigid-body
+        //  about the origin - about the centre of mass
+        inline symmTensor Ioc() const;
+
+        //- Return the difference between the inertia tensor of the rigid-body
+        //  about the a new centre of mass - about the current centre of mass
+        inline symmTensor Icc(const vector& c) const;
+
+        //- Return the inertia tensor of the rigid-body about the origin
+        inline symmTensor Io() const;
+
+        //- Return the kinetic energy of the body with the given velocity
+        inline scalar kineticEnergy(const spatialVector& v);
+
+
+    // Member Operators
+
+        //- Conversion to spatial tensor
+        inline operator spatialTensor() const;
+
+        inline void operator+=(const rigidBodyInertia&);
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>(Istream&, rigidBodyInertia&);
+        friend Ostream& operator<<(Ostream&, const rigidBodyInertia&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "rigidBodyInertiaI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H
new file mode 100644
index 0000000000..96d0264126
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H
@@ -0,0 +1,243 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "spatialTransform.H"
+#include "transform.H"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+inline Foam::symmTensor Foam::RBD::rigidBodyInertia::Ioc
+(
+    const scalar m,
+    const vector& c
+)
+{
+    return m*(Foam::I*magSqr(c) - sqr(c));
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::RBD::rigidBodyInertia::rigidBodyInertia()
+:
+    m_(0),
+    c_(Zero),
+    Ic_(Zero)
+{}
+
+
+inline Foam::RBD::rigidBodyInertia::rigidBodyInertia
+(
+    const scalar m,
+    const vector& c,
+    const symmTensor& Ic
+)
+:
+    m_(m),
+    c_(c),
+    Ic_(Ic)
+{}
+
+
+inline Foam::RBD::rigidBodyInertia::rigidBodyInertia(const spatialTensor& st)
+:
+    m_(st(3, 3)),
+    c_(vector(-st(1, 5), st(0, 5), -st(0, 4))/m_),
+    Ic_(symm(st.block<tensor, 0, 0>()()) - Ioc())
+{}
+
+
+inline Foam::RBD::rigidBodyInertia::rigidBodyInertia(Istream& is)
+:
+    m_(readScalar(is)),
+    c_(is),
+    Ic_(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::scalar Foam::RBD::rigidBodyInertia::m() const
+{
+    return m_;
+}
+
+inline const Foam::vector& Foam::RBD::rigidBodyInertia::c() const
+{
+    return c_;
+}
+
+inline const Foam::symmTensor& Foam::RBD::rigidBodyInertia::Ic() const
+{
+    return Ic_;
+}
+
+inline Foam::symmTensor Foam::RBD::rigidBodyInertia::Ioc() const
+{
+    return Ioc(m_, c_);
+}
+
+inline Foam::symmTensor Foam::RBD::rigidBodyInertia::Icc(const vector& c) const
+{
+    return Ioc(m_, c - c_);
+}
+
+inline Foam::symmTensor Foam::RBD::rigidBodyInertia::Io() const
+{
+    return Ic_ + Ioc();
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+inline Foam::RBD::rigidBodyInertia::operator spatialTensor() const
+{
+    tensor mcStar(m_*(*c_));
+
+    return spatialTensor
+    (
+        Io(),   mcStar,
+       -mcStar, m_*I
+    );
+}
+
+
+// * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * * //
+
+inline Foam::Istream& Foam::RBD::operator>>
+(
+    Istream& is,
+    rigidBodyInertia& rbi
+)
+{
+    is  >> rbi.m_ >> rbi.c_ >> rbi.Ic_;
+    return is;
+}
+
+
+inline Foam::Ostream& Foam::RBD::operator<<
+(
+    Ostream& os,
+    const rigidBodyInertia& rbi
+)
+{
+    os  << rbi.m_ << nl << rbi.c_ << nl << rbi.Ic_ << endl;
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Return the rigid-body inertia of the combined body
+inline rigidBodyInertia operator+
+(
+    const rigidBodyInertia& rbi1,
+    const rigidBodyInertia& rbi2
+)
+{
+    const scalar m12 = rbi1.m() + rbi2.m();
+    const vector c12 = (rbi1.m()*rbi1.c() + rbi2.m()*rbi2.c())/m12;
+
+    return rigidBodyInertia
+    (
+        m12,
+        c12,
+        rbi1.Ic() + rbi1.Icc(c12) + rbi2.Ic() + rbi2.Icc(c12)
+    );
+}
+
+
+//- Inner-product with a spatialVector (e.g. velocity returning the momentum)
+inline spatialVector operator&
+(
+    const rigidBodyInertia& rbi,
+    const spatialVector& sv
+)
+{
+    const vector av(sv.w());
+    const vector lv(sv.l());
+
+    return spatialVector
+    (
+        (rbi.Io() & av) + rbi.m()*(rbi.c() ^ lv),
+        rbi.m()*lv - rbi.m()*(rbi.c() ^ av)
+    );
+}
+
+
+//- Return (^BX_A)^* I ^AX_B
+inline rigidBodyInertia transform
+(
+    const spatialTransform& X,
+    const rigidBodyInertia& I
+)
+{
+    const vector Xc((X.E().T() & I.c()) + X.r());
+
+    return rigidBodyInertia
+    (
+        I.m(),
+        Xc,
+        transform(X.E().T(), I.Ic())
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::scalar Foam::RBD::rigidBodyInertia::kineticEnergy
+(
+    const spatialVector& v
+)
+{
+    return 0.5*(v && (*this & v));
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+inline void Foam::RBD::rigidBodyInertia::operator+=
+(
+    const rigidBodyInertia& rbi
+)
+{
+    *this = *this + rbi;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
new file mode 100644
index 0000000000..fc7bfd5e0c
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
@@ -0,0 +1,239 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodyModel.H"
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::rigidBodyModel::forwardDynamics
+(
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot,
+    const scalarField& tau,
+    const Field<spatialVector>& fx,
+    scalarField& qDdot
+) const
+{
+    DebugInFunction
+        << "q = " << q << nl
+        << "qDot = " << qDot << nl
+        << "tau = " << tau << endl;
+
+    // Joint state returned by jcalc
+    joint::XSvc J;
+
+    v_[0] = Zero;
+
+    for (label i=1; i<nBodies(); i++)
+    {
+        const joint& jnt = joints()[i];
+        jnt.jcalc(J, q, w, qDot);
+
+        S_[i] = J.S;
+        S1_[i] = J.S1;
+
+        Xlambda_[i] = J.X & XT_[i];
+
+        const label lambdai = lambda_[i];
+
+        if (lambdai != 0)
+        {
+            X0_[i] = Xlambda_[i] & X0_[lambdai];
+        }
+        else
+        {
+            X0_[i] = Xlambda_[i];
+        }
+
+        v_[i] = (Xlambda_[i] & v_[lambdai]) + J.v;
+        c_[i] = J.c + (v_[i] ^ J.v);
+        IA_[i] = I(i);
+        pA_[i] = v_[i] ^* (I(i) & v_[i]);
+
+        if (fx.size())
+        {
+            pA_[i] -= *X0_[i] & fx[i];
+        }
+    }
+
+    for (label i=nBodies()-1; i>0; i--)
+    {
+        const joint& jnt = joints()[i];
+        const label qi = jnt.qIndex();
+
+        if (jnt.nDoF() == 1)
+        {
+            U1_[i] = IA_[i] & S1_[i];
+            Dinv_[i].xx() = 1/(S1_[i] && U1_[i]);
+            u_[i].x() = tau[qi] - (S1_[i] && pA_[i]);
+
+            const label lambdai = lambda_[i];
+
+            if (lambdai != 0)
+            {
+                const spatialTensor Ia
+                (
+                    IA_[i] - (U1_[i]*(Dinv_[i].xx()*U1_[i]))
+                );
+
+                const spatialVector pa
+                (
+                    pA_[i] + (Ia & c_[i]) + U1_[i]*(Dinv_[i].xx()*u_[i].x())
+                );
+
+                IA_[lambdai] +=
+                    spatialTensor(Xlambda_[i].T())
+                  & Ia
+                  & spatialTensor(Xlambda_[i]);
+
+                pA_[lambdai] += Xlambda_[i].T() & pa;
+            }
+        }
+        else
+        {
+            U_[i] = IA_[i] & S_[i];
+            Dinv_[i] = (S_[i].T() & U_[i]).inv();
+
+            u_[i] = tau.block<vector>(qi) - (S_[i].T() & pA_[i]);
+
+            const label lambdai = lambda_[i];
+
+            if (lambdai != 0)
+            {
+                spatialTensor Ia
+                (
+                    IA_[i]
+                  - (U_[i] & Dinv_[i] & U_[i].T())
+                );
+
+                spatialVector pa
+                (
+                    pA_[i]
+                  + (Ia & c_[i])
+                  + (U_[i] & Dinv_[i] & u_[i])
+                );
+
+                IA_[lambdai] +=
+                    spatialTensor(Xlambda_[i].T())
+                  & Ia
+                  & spatialTensor(Xlambda_[i]);
+
+                pA_[lambdai] += Xlambda_[i].T() & pa;
+            }
+        }
+    }
+
+    a_[0] = spatialVector(Zero, -g_);
+
+    for (label i=1; i<nBodies(); i++)
+    {
+        const joint& jnt = joints()[i];
+        const label qi = jnt.qIndex();
+
+        a_[i] = (Xlambda_[i] & a_[lambda_[i]]) + c_[i];
+
+        if (jnt.nDoF() == 1)
+        {
+            qDdot[qi] = Dinv_[i].xx()*(u_[i].x() - (U1_[i] && a_[i]));
+            a_[i] += S1_[i]*qDdot[qi];
+        }
+        else
+        {
+            vector qDdoti(Dinv_[i] & (u_[i] - (U_[i].T() & a_[i])));
+
+            // Need to add mutable "block<vector>" to Field
+            qDdot[qi] = qDdoti.x();
+            qDdot[qi+1] = qDdoti.y();
+            qDdot[qi+2] = qDdoti.z();
+
+            a_[i] += (S_[i] & qDdoti);
+        }
+    }
+
+    DebugInfo
+        << "qDdot = " << qDdot << nl
+        << "a = " << a_ << endl;
+}
+
+
+void Foam::RBD::rigidBodyModel::forwardDynamicsCorrection
+(
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot,
+    const scalarField& qDdot
+) const
+{
+    DebugInFunction << endl;
+
+    // Joint state returned by jcalc
+    joint::XSvc J;
+
+    v_[0] = Zero;
+    a_[0] = spatialVector(Zero, -g_);
+
+    for (label i=1; i<nBodies(); i++)
+    {
+        const joint& jnt = joints()[i];
+        const label qi = jnt.qIndex();
+
+        jnt.jcalc(J, q, w, qDot);
+
+        S_[i] = J.S;
+        S1_[i] = J.S1;
+
+        Xlambda_[i] = J.X & XT_[i];
+
+        const label lambdai = lambda_[i];
+
+        if (lambdai != 0)
+        {
+            X0_[i] = Xlambda_[i] & X0_[lambdai];
+        }
+        else
+        {
+            X0_[i] = Xlambda_[i];
+        }
+
+        v_[i] = (Xlambda_[i] & v_[lambdai]) + J.v;
+        c_[i] = J.c + (v_[i] ^ J.v);
+        a_[i] = (Xlambda_[i] & a_[lambdai]) + c_[i];
+
+        if (jnt.nDoF() == 1)
+        {
+            a_[i] += S1_[i]*qDdot[qi];
+        }
+        else
+        {
+            a_[i] += S_[i] & qDdot.block<vector>(qi);
+        }
+    }
+
+    DebugInfo<< "a = " << a_ << endl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
new file mode 100644
index 0000000000..74a6565efd
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -0,0 +1,224 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodyModel.H"
+#include "masslessBody.H"
+#include "nullJoint.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+    defineTypeNameAndDebug(rigidBodyModel, 0);
+}
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::RBD::rigidBodyModel::initializeRootBody()
+{
+    bodies_.append(new masslessBody);
+    lambda_.append(0);
+    joints_.append(new joints::null(*this));
+    XT_.append(spatialTransform());
+
+    nDoF_ = 0;
+    nw_ = 0;
+
+    resizeState();
+}
+
+
+void Foam::RBD::rigidBodyModel::resizeState()
+{
+    Xlambda_.append(spatialTransform());
+    X0_.append(spatialTransform());
+
+    v_.append(Zero);
+    a_.append(Zero);
+    c_.append(Zero);
+
+    IA_.append(spatialTensor::I);
+    pA_.append(Zero);
+
+    S_.append(Zero);
+    S1_.append(Zero);
+    U_.append(Zero);
+    U1_.append(Zero);
+    Dinv_.append(Zero);
+    u_.append(Zero);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodyModel::rigidBodyModel()
+:
+    g_(Zero)
+{
+    initializeRootBody();
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::label Foam::RBD::rigidBodyModel::join
+(
+    const label parentID,
+    const spatialTransform& XT,
+    const autoPtr<joint>& jointPtr,
+    const autoPtr<rigidBody>& bodyPtr
+)
+{
+    // Append the body
+    bodies_.append(bodyPtr);
+
+    // If the parentID refers to a merged body find the parent into which it has
+    // been merged and set lambda and XT accordingly
+    if (merged(parentID))
+    {
+        const subBody& sBody = mergedBody(parentID);
+        lambda_.append(sBody.parentID());
+        XT_.append(XT & sBody.parentXT());
+    }
+    else
+    {
+        lambda_.append(parentID);
+        XT_.append(XT);
+    }
+
+    // Append the joint
+    const joint& prevJoint = joints_[joints_.size() - 1];
+    joints_.append(jointPtr);
+    joint& curJoint = joints_[joints_.size() - 1];
+    curJoint.index() = joints_.size() - 1;
+    curJoint.qIndex() = prevJoint.qIndex() + prevJoint.nDoF();
+    curJoint.wIndex() = prevJoint.wIndex() + prevJoint.nw();
+
+    // Increment the degrees of freedom
+    nDoF_ += curJoint.nDoF();
+    nw_ += curJoint.nw();
+
+    resizeState();
+
+    return nBodies()-1;
+}
+
+
+Foam::label Foam::RBD::rigidBodyModel::join
+(
+    const label parentID,
+    const spatialTransform& XT,
+    const PtrList<joint>& compositeJoint,
+    const autoPtr<rigidBody>& bodyPtr
+)
+{
+    label parent = parentID;
+
+    // For all but the final joint in the set add a masslessBody with the
+    // joint and transform
+    for (label j=0; j<compositeJoint.size()-1; j++)
+    {
+        parent = join
+        (
+            parent,
+            j == 0 ? XT : spatialTransform(),
+            compositeJoint[j].clone(),
+            autoPtr<rigidBody>(new masslessBody)
+        );
+    }
+
+    // For the final joint in the set add the read body
+    return join
+    (
+        parent,
+        compositeJoint.size() == 1 ? XT : spatialTransform(),
+        compositeJoint[compositeJoint.size()-1].clone(),
+        bodyPtr
+    );
+}
+
+
+Foam::label Foam::RBD::rigidBodyModel::merge
+(
+    const label parentID,
+    const spatialTransform& XT,
+    const autoPtr<rigidBody>& bodyPtr
+)
+{
+    autoPtr<subBody> sBodyPtr;
+
+    // If the parentID refers to a merged body find the parent into which it has
+    // been merged and merge this on into the same parent with the appropriate
+    // transform
+    if (merged(parentID))
+    {
+        const subBody& sBody = mergedBody(parentID);
+        sBodyPtr.set
+        (
+            new subBody
+            (
+                bodyPtr,
+                sBody.parentID(),
+                XT & sBody.parentXT()
+            )
+        );
+    }
+    else
+    {
+        sBodyPtr.set(new subBody(bodyPtr, parentID, XT));
+    }
+
+    const subBody& sBody = sBodyPtr();
+    mergedBodies_.append(sBodyPtr);
+
+    // Merge the sub-body with the parent
+    bodies_[sBody.parentID()].merge(sBody);
+
+    return mergedBodyID(mergedBodies_.size() - 1);
+}
+
+
+Foam::spatialTransform Foam::RBD::rigidBodyModel::X0
+(
+    const label bodyId
+) const
+{
+    if (merged(bodyId))
+    {
+        const subBody& mBody = mergedBody(bodyId);
+        return mBody.parentXT() & X0_[mBody.parentID()];
+    }
+    else
+    {
+        return X0_[bodyId];
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
new file mode 100644
index 0000000000..aa3db57876
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
@@ -0,0 +1,313 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::rigidBodyModel
+
+Description
+    Basic rigid-body model representing a system of rigid-bodies connected by
+    1-6 DoF joints.
+
+    This class holds various body and joint state fields needed by the
+    kinematics and forward-dynamics algorithms presented in
+
+    reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    rigidBodyModel.C
+    kinematics.C
+    forwardDynamics.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_rigidBodyModel_H
+#define RBD_rigidBodyModel_H
+
+#include "rigidBody.H"
+#include "subBody.H"
+#include "joint.H"
+#include "PtrList.H"
+
+namespace Foam
+{
+namespace RBD
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class rigidBodyModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class rigidBodyModel
+{
+    //- Initialize the model with the root-body which is a fixed massless body
+    //  at the origin.
+    void initializeRootBody();
+
+    //- Resize the state fields following the joining of a body
+    void resizeState();
+
+
+protected:
+
+    // Protected data representing the model structure
+
+        //- List of the bodies.
+        //  The 0'th body represents the fixed origin and is constructed
+        //  automatically.  The subsequent (moving) bodies are appended by the
+        //  join member function.
+        PtrList<rigidBody> bodies_;
+
+        //- Bodies may be merged into existing bodies, the inertia of which is
+        //  updated to represent the combined body which is more efficient than
+        //  attaching them with fixed joints.  These 'merged' bodies are held on
+        //  this list.
+        PtrList<subBody> mergedBodies_;
+
+        //- List of indices of the parent of each body
+        DynamicList<label> lambda_;
+
+        //- Each body it attached with a joint which are held on this list.
+        PtrList<joint> joints_;
+
+        //- Transform from the parent body frame to the joint frame.
+        DynamicList<spatialTransform> XT_;
+
+        //- The number of degrees of freedom of the model
+        //  used to set the size of the of joint state fields q, qDot and qDdot.
+        label nDoF_;
+
+        //- The number of additional state variable needed to describe the joint
+        //  states.  Typically this is the number of quaternion joints for which
+        //  the 'w' element is additional to the 3-degrees of freedom of the
+        //  joint.
+        label nw_;
+
+
+    // Other protected member data
+
+        //- Acceleration due to gravity
+        vector g_;
+
+
+    // Mutable transforms maintained by kinematics and forward-dynamics
+
+        //- Transform from the parent body to the current body
+        mutable DynamicList<spatialTransform> Xlambda_;
+
+        //- Transform for external forces to the bodies reference frame
+        mutable DynamicList<spatialTransform> X0_;
+
+
+    // Mutable kinematic body state fields
+
+        //- The spatial velocity of the bodies
+        mutable DynamicList<spatialVector> v_;
+
+        //- The spatial acceleration of the bodies
+        mutable DynamicList<spatialVector> a_;
+
+        //- The velocity dependent spatial acceleration of the joints
+        mutable DynamicList<spatialVector> c_;
+
+
+    // Mutable state fields needed by the forward-dynamics algorithm
+
+        //- Velocity-product acceleration
+
+        //- Articulated body inertia
+        mutable DynamicList<spatialTensor> IA_;
+
+        //- Articulated body bias force
+        mutable DynamicList<spatialVector> pA_;
+
+
+    // Mutable joint state fields
+
+        //- Motion subspace for joints with 3 degrees of freedom
+        mutable DynamicList<compactSpatialTensor> S_;
+
+        //- Motion subspace for joints with 1 degrees of freedom
+        mutable DynamicList<spatialVector> S1_;
+
+        //- Sub-expression IA.S in the forward-dynamics algorithm
+        mutable DynamicList<compactSpatialTensor> U_;
+
+        //- Sub-expression IA.S1 in the forward-dynamics algorithm
+        mutable DynamicList<spatialVector> U1_;
+
+        //- Sub-expression (S^T.U)^-1 in the forward-dynamics algorithm
+        mutable DynamicList<tensor> Dinv_;
+
+        //- Sub-expression tau - S^T.pA in the forward-dynamics algorithm
+        mutable DynamicList<vector> u_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("rigidBodyModel");
+
+
+    // Constructors
+
+        //- Null-constructor which adds the single root-body at the origin
+        rigidBodyModel();
+
+
+    //- Destructor
+    virtual ~rigidBodyModel()
+    {}
+
+
+    // Member Functions
+
+        //- Return the number of bodies in the model (bodies().size())
+        inline label nBodies() const;
+
+        //- Return the list of the bodies in the model
+        inline PtrList<rigidBody> bodies() const;
+
+        //- List of indices of the parent of each body
+        inline const DynamicList<label>& lambda() const;
+
+        //- Return the list of joints in the model
+        inline const PtrList<joint>& joints() const;
+
+        //- Return the number of degrees of freedom of the model
+        //  used to set the size of the of joint state fields q, qDot and qDdot.
+        inline label nDoF() const;
+
+        //- Return the number of additional state variable needed to describe
+        //  the joint states.  Typically this is the number of quaternion
+        //  joints for which the 'w' element is additional to the 3-degrees of
+        //  freedom of the joint.
+        inline label nw() const;
+
+        //- Return the acceleration due to gravity
+        inline const vector& g() const;
+
+        //- Allow the acceleration due to gravity to be set
+        //  after model construction
+        inline vector& g();
+
+        //- Return the inertia of body i
+        inline const rigidBodyInertia& I(const label i) const;
+
+        //- Join the given body to the parent with ID parentID via the given
+        //  joint with transform from the parent frame to the joint frame XT.
+        virtual label join
+        (
+            const label parentID,
+            const spatialTransform& XT,
+            const autoPtr<joint>& jointPtr,
+            const autoPtr<rigidBody>& bodyPtr
+        );
+
+        //- Join the given body to the parent with ID parentID via the given
+        //  composite joint (specified as a list of co-located joints) with
+        //  transform from the parent frame to the joint frame XT.
+        //  Composite joins are useful to represent complex joints with degrees
+        //  of freedom other than 1 or 3 which are directly supported.
+        label join
+        (
+            const label parentID,
+            const spatialTransform& XT,
+            const PtrList<joint>& compositeJoint,
+            const autoPtr<rigidBody>& bodyPtr
+        );
+
+        //- Merge the given body with transform X into the parent with ID
+        //  parentID.  The parent body assumes the properties of the combined
+        //  body (inertia etc.) and the merged body is held on a
+        //  separate list for reference.
+        label merge
+        (
+            const label parentID,
+            const spatialTransform& X,
+            const autoPtr<rigidBody>& bodyPtr
+        );
+
+        //- Return true if the body with given ID has been merged with a parent
+        inline bool merged(label bodyID) const;
+
+        //- Return the index of the merged body in the mergedBody list
+        //  from the given body ID
+        inline label mergedBodyIndex(const label mergedBodyID) const;
+
+        //- Return the merged body ID for the given merged body index
+        //  in the mergedBody list
+        inline label mergedBodyID(const label mergedBodyIndex) const;
+
+        //- Return the merged body for the given body ID
+        inline const subBody& mergedBody(label mergedBodyID) const;
+
+        //- Return the current transform to the global frame for the given body
+        spatialTransform X0(const label bodyId) const;
+
+        //- Calculate the joint acceleration qDdot from the joint state q,
+        //  velocity qDot, internal force tau (in the joint frame) and
+        //  external force fx (in the global frame) using the articulated body
+        //  algorithm (Section 7.3 and Table 7.1)
+        void forwardDynamics
+        (
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot,
+            const scalarField& tau,
+            const Field<spatialVector>& fx,
+            scalarField& qDdot
+        ) const;
+
+        //- Correct the velocity and acceleration of the bodies in the model
+        //  from the given joint state fields following an integration step
+        //  of the forwardDynamics
+        void forwardDynamicsCorrection
+        (
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot,
+            const scalarField& qDdot
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "rigidBodyModelI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
new file mode 100644
index 0000000000..7899bf89ed
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::label Foam::RBD::rigidBodyModel::nBodies() const
+{
+    return bodies_.size();
+}
+
+
+inline Foam::PtrList<Foam::RBD::rigidBody>
+Foam::RBD::rigidBodyModel::bodies() const
+{
+    return bodies_;
+}
+
+
+inline const Foam::PtrList<Foam::RBD::joint>&
+Foam::RBD::rigidBodyModel::joints() const
+{
+    return joints_;
+}
+
+
+inline Foam::label Foam::RBD::rigidBodyModel::nDoF() const
+{
+    return nDoF_;
+}
+
+
+inline Foam::label Foam::RBD::rigidBodyModel::nw() const
+{
+    return nw_;
+}
+
+
+inline const Foam::vector& Foam::RBD::rigidBodyModel::g() const
+{
+    return g_;
+}
+
+
+inline Foam::vector& Foam::RBD::rigidBodyModel::g()
+{
+    return g_;
+}
+
+
+inline const Foam::DynamicList<Foam::label>&
+Foam::RBD::rigidBodyModel::lambda() const
+{
+    return lambda_;
+}
+
+
+inline const Foam::RBD::rigidBodyInertia&
+Foam::RBD::rigidBodyModel::I(const label i) const
+{
+    return bodies_[i];
+}
+
+
+inline bool Foam::RBD::rigidBodyModel::merged(label bodyID) const
+{
+    return bodyID < 0;
+}
+
+
+inline Foam::label
+Foam::RBD::rigidBodyModel::mergedBodyID(const label mergedBodyIndex) const
+{
+    return -1 - mergedBodyIndex;
+}
+
+
+inline Foam::label
+Foam::RBD::rigidBodyModel::mergedBodyIndex(const label mergedBodyID) const
+{
+    return -1 - mergedBodyID;
+}
+
+
+inline const Foam::RBD::subBody&
+Foam::RBD::rigidBodyModel::mergedBody(label mergedBodyID) const
+{
+    if (!merged(mergedBodyID))
+    {
+        FatalErrorInFunction
+            << "Body " << mergedBodyID << " has not been merged"
+            << abort(FatalError);
+    }
+
+    return mergedBodies_[mergedBodyIndex(mergedBodyID)];
+}
+
+
+// ************************************************************************* //

From edfabd06ce9f4132518ae43b5b90a4a0ebbb4cbf Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 3 Apr 2016 15:53:50 +0100
Subject: [PATCH 361/447] src/Allwmake: added rigidBodyDynamics

---
 src/Allwmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Allwmake b/src/Allwmake
index f5e0c5c558..569ef55c28 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -79,6 +79,7 @@ wmake $targetType regionCoupled
 postProcessing/Allwmake $targetType $*
 
 wmake $targetType sixDoFRigidBodyMotion
+wmake $targetType rigidBodyDynamics
 
 
 #------------------------------------------------------------------------------

From 4344a732318d953c08e406d30bf1205a73af7a7c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 3 Apr 2016 22:17:10 +0100
Subject: [PATCH 362/447] applications/test/rigidBodyDynamics/pendulum: Very
 simple test/demonstration of the rigidBodyDynamics library

    Simple swinging pendulum simulation with 1-DoF.  The motion is integrated
    using a symplectic method for just over 2-periods.
---
 .../rigidBodyDynamics/pendulum/Make/files     |  3 +
 .../rigidBodyDynamics/pendulum/Make/options   |  5 +
 .../rigidBodyDynamics/pendulum/pendulum.C     | 98 +++++++++++++++++++
 3 files changed, 106 insertions(+)
 create mode 100644 applications/test/rigidBodyDynamics/pendulum/Make/files
 create mode 100644 applications/test/rigidBodyDynamics/pendulum/Make/options
 create mode 100644 applications/test/rigidBodyDynamics/pendulum/pendulum.C

diff --git a/applications/test/rigidBodyDynamics/pendulum/Make/files b/applications/test/rigidBodyDynamics/pendulum/Make/files
new file mode 100644
index 0000000000..f860e98af4
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/pendulum/Make/files
@@ -0,0 +1,3 @@
+pendulum.C
+
+EXE = $(FOAM_USER_APPBIN)/pendulum
diff --git a/applications/test/rigidBodyDynamics/pendulum/Make/options b/applications/test/rigidBodyDynamics/pendulum/Make/options
new file mode 100644
index 0000000000..4a9d828b67
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/pendulum/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/rigidBodyDynamics/lnInclude
+
+EXE_LIBS = \
+    -lrigidBodyDynamics
diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum.C b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
new file mode 100644
index 0000000000..23c35c4af3
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+Application
+    pendulum
+
+Description
+    Simple swinging pendulum simulation with 1-DoF.  The motion is integrated
+    using a symplectic method for just over 2-periods.
+
+\*---------------------------------------------------------------------------*/
+
+#include "rigidBodyModel.H"
+#include "joints.H"
+
+using namespace Foam;
+using namespace RBD;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    // Create a model for the pendulum
+    rigidBodyModel pendulum;
+
+    // Join a weight to the origin with a centre of mass -1m below the origin
+    // by a hinge which rotates about the z-axis
+    pendulum.join
+    (
+        0,
+        Xt(vector(0, 0, 0)),
+        joint::New(new joints::Rz(pendulum)),
+        rigidBody::New("hinge", 1, vector(0, -1, 0), 0.02*I)
+    );
+
+    // Create the joint-space state fields
+    scalarField q(pendulum.nDoF(), Zero);
+    scalarField w(pendulum.nw(), Zero);
+    scalarField qdot(pendulum.nDoF(), Zero);
+    scalarField qddot(pendulum.nDoF(), Zero);
+    scalarField tau(pendulum.nDoF(), Zero);
+
+    // Set the angle of the pendulum to 0.3rad
+    q[0] = 0.3;
+
+    // Set the gravitational acceleration
+    pendulum.g() = vector(0, -9.81, 0);
+
+    // Integrate the motion of the pendulum for 4.1s (~2-periods) using a
+    // symplectic method
+    scalar deltaT = 0.01;
+    for (scalar t=0; t<4.1; t+=deltaT)
+    {
+        qdot += 0.5*deltaT*qddot;
+        q += deltaT*qdot;
+
+        pendulum.forwardDynamics
+        (
+            q,
+            w,
+            qdot,
+            tau,
+            Field<spatialVector>(),
+            qddot
+        );
+
+        qdot += 0.5*deltaT*qddot;
+
+        Info<< "Time << " << t << "s, angle = " << q[0] << "rad" << endl;
+    }
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //

From bc8dbb2d45408d3ebcaf5b674944175f4f315c7a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 4 Apr 2016 08:59:50 +0100
Subject: [PATCH 363/447] src/conversion/ensight: Specify std::isnan Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=2041

---
 src/conversion/ensight/part/ensightPart.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/conversion/ensight/part/ensightPart.C b/src/conversion/ensight/part/ensightPart.C
index a8a02535d0..d06c64e559 100644
--- a/src/conversion/ensight/part/ensightPart.C
+++ b/src/conversion/ensight/part/ensightPart.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ bool Foam::ensightPart::isFieldDefined(const List<scalar>& field) const
         {
             const label id = idList[i];
 
-            if (id >= field.size() || isnan(field[id]))
+            if (id >= field.size() || std::isnan(field[id]))
             {
                 return false;
             }

From a9b8bb13e07039fb92ec0fb4899c568b588c76ab Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 4 Apr 2016 09:03:40 +0100
Subject: [PATCH 364/447] applications/.*/Allwmake: Updated to support "stop on
 1st error" Patch contributed by Bruno Santos Resolved bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2042

---
 .../solvers/compressible/rhoCentralFoam/Allwmake  |  6 +++++-
 applications/solvers/lagrangian/DPMFoam/Allwmake  |  7 +++++--
 .../multiphase/compressibleInterFoam/Allwmake     |  6 +++++-
 .../compressibleMultiphaseInterFoam/Allwmake      |  6 +++++-
 .../solvers/multiphase/driftFluxFoam/Allwmake     |  8 ++++++--
 .../multiphase/interPhaseChangeFoam/Allwmake      |  6 +++++-
 .../multiphase/multiphaseEulerFoam/Allwmake       |  8 ++++++--
 .../multiphase/multiphaseInterFoam/Allwmake       |  6 +++++-
 .../solvers/multiphase/reactingEulerFoam/Allwmake | 14 +++++++++-----
 .../reactingMultiphaseEulerFoam/Allwmake          |  8 ++++++--
 .../reactingTwoPhaseEulerFoam/Allwmake            |  8 ++++++--
 .../solvers/multiphase/twoPhaseEulerFoam/Allwmake | 10 +++++++---
 .../utilities/mesh/conversion/Optional/Allwmake   |  3 +++
 applications/utilities/mesh/generation/Allwmake   |  5 ++++-
 .../mesh/generation/extrude2DMesh/Allwmake        |  6 +++++-
 .../utilities/mesh/generation/foamyMesh/Allwmake  |  8 ++++++--
 .../foamyHexMeshSurfaceSimplify/Allwmake          |  3 +++
 .../mesh/manipulation/renumberMesh/Allwmake       |  4 ++++
 .../utilities/mesh/manipulation/setSet/Allwmake   |  3 +++
 .../utilities/miscellaneous/foamHelp/Allwmake     |  7 ++++++-
 .../dataConversion/foamToTecplot360/Allwmake      |  3 +++
 .../postProcessing/graphics/PV3Readers/Allwmake   | 10 +++++++---
 .../graphics/PV3Readers/PV3FoamReader/Allwmake    |  6 +++++-
 .../PV3Readers/PV3blockMeshReader/Allwmake        |  6 +++++-
 .../postProcessing/graphics/PVReaders/Allwmake    | 10 +++++++---
 .../graphics/PVReaders/PVFoamReader/Allwmake      |  6 +++++-
 .../graphics/PVReaders/PVblockMeshReader/Allwmake |  6 +++++-
 .../graphics/ensightFoamReader/Allwmake           |  6 +++++-
 .../preProcessing/wallFunctionTable/Allwmake      |  6 +++++-
 wmake/wmake                                       | 15 +++++++++++----
 30 files changed, 162 insertions(+), 44 deletions(-)

diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwmake b/applications/solvers/compressible/rhoCentralFoam/Allwmake
index 6595a83131..c85e459457 100755
--- a/applications/solvers/compressible/rhoCentralFoam/Allwmake
+++ b/applications/solvers/compressible/rhoCentralFoam/Allwmake
@@ -1,7 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-(wmake libso BCs && wmake && wmake rhoCentralDyMFoam)
+(wmake $targetType BCs && wmake && wmake rhoCentralDyMFoam)
 
 #------------------------------------------------------------------------------
diff --git a/applications/solvers/lagrangian/DPMFoam/Allwmake b/applications/solvers/lagrangian/DPMFoam/Allwmake
index 8a47fb1b34..f3f30648d5 100755
--- a/applications/solvers/lagrangian/DPMFoam/Allwmake
+++ b/applications/solvers/lagrangian/DPMFoam/Allwmake
@@ -1,8 +1,11 @@
 #!/bin/sh
-
 cd ${0%/*} || exit 1
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso DPMTurbulenceModels
+wmake $targetType DPMTurbulenceModels
 wmake
 wmake MPPICFoam
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwmake b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
index bb1b0dd691..b658bde457 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
@@ -1,8 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso twoPhaseMixtureThermo
+wmake $targetType twoPhaseMixtureThermo
 wmake
 wmake compressibleInterDyMFoam
 
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake
index a92a8ae36b..025a2399e8 100755
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake
@@ -1,8 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso multiphaseMixtureThermo
+wmake $targetType multiphaseMixtureThermo
 wmake
 
 #------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/driftFluxFoam/Allwmake b/applications/solvers/multiphase/driftFluxFoam/Allwmake
index 4d4db5f280..0c8b6bb8f9 100755
--- a/applications/solvers/multiphase/driftFluxFoam/Allwmake
+++ b/applications/solvers/multiphase/driftFluxFoam/Allwmake
@@ -1,9 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso mixtureViscosityModels
-wmake libso relativeVelocityModels
+wmake $targetType mixtureViscosityModels
+wmake $targetType relativeVelocityModels
 wmake
 
 #------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
index 2f57fe3752..c25175e5e6 100755
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
@@ -1,8 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso phaseChangeTwoPhaseMixtures
+wmake $targetType phaseChangeTwoPhaseMixtures
 wmake
 wmake interPhaseChangeDyMFoam
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
index 885d5ed2a0..6f95f807ac 100755
--- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
@@ -1,10 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmakeLnInclude interfacialModels
-wmake libso multiphaseSystem
-wmake libso interfacialModels
+wmake $targetType multiphaseSystem
+wmake $targetType interfacialModels
 wmake
 
 #------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
index 049217716c..4d2775a8b8 100755
--- a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
@@ -1,8 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso multiphaseMixture
+wmake $targetType multiphaseMixture
 wmake
 wmake multiphaseInterDyMFoam
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
index c67ed9a196..0757f76b3f 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
@@ -1,13 +1,17 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmakeLnInclude interfacialModels
 wmakeLnInclude interfacialCompositionModels
-wmake libso phaseSystems
-wmake libso interfacialModels
-wmake libso interfacialCompositionModels
-reactingTwoPhaseEulerFoam/Allwmake
-reactingMultiphaseEulerFoam/Allwmake
+wmake $targetType phaseSystems
+wmake $targetType interfacialModels
+wmake $targetType interfacialCompositionModels
+reactingTwoPhaseEulerFoam/Allwmake $*
+reactingMultiphaseEulerFoam/Allwmake $*
 
 #------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
index a18671b330..42f430bf17 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
@@ -1,9 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso multiphaseSystem
-wmake libso multiphaseCompressibleTurbulenceModels
+wmake $targetType multiphaseSystem
+wmake $targetType multiphaseCompressibleTurbulenceModels
 wmake
 
 #------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
index 44268bcb63..a0ff46153a 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
@@ -1,9 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso twoPhaseSystem
-wmake libso twoPhaseCompressibleTurbulenceModels
+wmake $targetType twoPhaseSystem
+wmake $targetType twoPhaseCompressibleTurbulenceModels
 wmake
 
 #------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
index dc726c0806..16e2ad39ab 100755
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
@@ -1,11 +1,15 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmakeLnInclude interfacialModels
-wmake libso twoPhaseSystem
-wmake libso interfacialModels
-wmake libso phaseCompressibleTurbulenceModels
+wmake $targetType twoPhaseSystem
+wmake $targetType interfacialModels
+wmake $targetType phaseCompressibleTurbulenceModels
 wmake
 
 #------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake
index 5de68c197b..cb0064789a 100755
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@@ -3,6 +3,9 @@
 # Build optional components (eg, may depend on third-party libraries)
 #------------------------------------------------------------------------------
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 # build libccmio and create lnInclude directory
diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake
index f6f56de5d6..2211a8c0b9 100755
--- a/applications/utilities/mesh/generation/Allwmake
+++ b/applications/utilities/mesh/generation/Allwmake
@@ -1,6 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
 # Get CGAL and boost versions
 . $WM_PROJECT_DIR/etc/config.sh/functions
 _foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \
@@ -15,7 +18,7 @@ wmake -all snappyHexMesh
 
 if [ -n "$CGAL_ARCH_PATH" -o "$cgal_version" = "cgal-system" ]
 then
-    foamyMesh/Allwmake
+    foamyMesh/Allwmake $*
 fi
 
 
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/Allwmake b/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
index e6514878d8..72ed5c7d1e 100755
--- a/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
+++ b/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
@@ -1,8 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso extrude2DMesh
+wmake $targetType extrude2DMesh
 wmake
 
 #------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/generation/foamyMesh/Allwmake b/applications/utilities/mesh/generation/foamyMesh/Allwmake
index e49feb0370..17241fde08 100755
--- a/applications/utilities/mesh/generation/foamyMesh/Allwmake
+++ b/applications/utilities/mesh/generation/foamyMesh/Allwmake
@@ -1,9 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso conformalVoronoiMesh
-wmake libso conformalVoronoi2DMesh
+wmake $targetType conformalVoronoiMesh
+wmake $targetType conformalVoronoi2DMesh
 wmake foamyQuadMesh
 wmake foamyHexMesh
 #wmake foamyHexMeshBackgroundMesh
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
index 0a6b103673..5a714fca98 100755
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
@@ -1,5 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 if [ -d "${FASTDUALOCTREE_SRC_PATH}" ]
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
index 9119e05f12..34b8b78d2f 100755
--- a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
@@ -1,6 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+set -x
+
 export COMPILE_FLAGS=''
 export LINK_FLAGS=''
 
diff --git a/applications/utilities/mesh/manipulation/setSet/Allwmake b/applications/utilities/mesh/manipulation/setSet/Allwmake
index 5dbfd208ce..2822be02b8 100755
--- a/applications/utilities/mesh/manipulation/setSet/Allwmake
+++ b/applications/utilities/mesh/manipulation/setSet/Allwmake
@@ -1,6 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
 unset COMP_FLAGS LINK_FLAGS
 
 #
diff --git a/applications/utilities/miscellaneous/foamHelp/Allwmake b/applications/utilities/miscellaneous/foamHelp/Allwmake
index ba37c5e418..2c97cd692f 100755
--- a/applications/utilities/miscellaneous/foamHelp/Allwmake
+++ b/applications/utilities/miscellaneous/foamHelp/Allwmake
@@ -1,7 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-wmake libso helpTypes
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+set -x
+
+wmake $targetType helpTypes
 wmake
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
index 86a7c89e3a..df9634c112 100755
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
@@ -1,6 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
+# Parse arguments for application compilation (at least for error control)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
 if [ ! -d ${WM_THIRD_PARTY_DIR}/tecio ]
 then
     echo "Did not find tecio in ${WM_THIRD_PARTY_DIR}. Not building foamToTecplot360."
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
index 5172a62ae3..049c1bfca0 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
@@ -1,5 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 #set -x
 
 case "$ParaView_VERSION" in
@@ -14,9 +18,9 @@ case "$ParaView_VERSION" in
         # ensure CMake gets the correct C++ compiler
         [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
 
-        wmake libso vtkPV3Readers
-        PV3blockMeshReader/Allwmake
-        PV3FoamReader/Allwmake
+        wmake $targetType vtkPV3Readers
+        PV3blockMeshReader/Allwmake $*
+        PV3FoamReader/Allwmake $*
     else
         echo "ERROR: ParaView not found in $ParaView_DIR"
     fi
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
index 407f29b642..08602d37ed 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
@@ -1,10 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    wmake libso vtkPV3Foam
+    wmake $targetType vtkPV3Foam
     (
         cd PV3FoamReader
         mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
index ad66b2b71f..48e136d209 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
@@ -1,10 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    wmake libso vtkPV3blockMesh
+    wmake $targetType vtkPV3blockMesh
     (
         cd PV3blockMeshReader
         mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
index ecba083285..edaa31a37b 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
@@ -1,5 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 #set -x
 
 case "$ParaView_VERSION" in
@@ -14,9 +18,9 @@ case "$ParaView_VERSION" in
         # ensure CMake gets the correct C++ compiler
         [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
 
-        wmake libso vtkPVReaders
-        PVblockMeshReader/Allwmake
-        PVFoamReader/Allwmake
+        wmake $targetType vtkPVReaders
+        PVblockMeshReader/Allwmake $*
+        PVFoamReader/Allwmake $*
     else
         echo "ERROR: ParaView not found in $ParaView_DIR"
     fi
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
index 44af3551f1..70b8845d4b 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
@@ -1,10 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    wmake libso vtkPVFoam
+    wmake $targetType vtkPVFoam
     (
         cd PVFoamReader
         mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
index ca9cb6105d..54b75743f9 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
@@ -1,10 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    wmake libso vtkPVblockMesh
+    wmake $targetType vtkPVblockMesh
     (
         cd PVblockMeshReader
         mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake b/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
index 4fe5a6e9e7..7a5f1a0863 100755
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
@@ -1,6 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-wmake libso
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
+wmake $targetType
 
 #------------------------------------------------------------------------------
diff --git a/applications/utilities/preProcessing/wallFunctionTable/Allwmake b/applications/utilities/preProcessing/wallFunctionTable/Allwmake
index 0d1c099d1d..63dbf325be 100755
--- a/applications/utilities/preProcessing/wallFunctionTable/Allwmake
+++ b/applications/utilities/preProcessing/wallFunctionTable/Allwmake
@@ -1,8 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso tabulatedWallFunction
+wmake $targetType tabulatedWallFunction
 wmake
 
 #------------------------------------------------------------------------------
diff --git a/wmake/wmake b/wmake/wmake
index 623a15fcdd..c09088b99f 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -219,6 +219,9 @@ then
         ./Allwmake
         exit $?
     else
+        # Have to keep track of the main exit code for the call to "make"
+        makeExitCode=0
+
         # Find all the sub-directories containing a 'Make' directory
         FOAM_APPS=$(\
                        for d in *; \
@@ -232,13 +235,17 @@ then
             $make ${WM_CONTINUE_ON_ERROR:+-k} \
                   -f $WM_DIR/makefiles/apps \
                   TARGET="$targetType" FOAM_APPS="$FOAM_APPS"
+            makeExitCode=$?
         fi
         # If the current directory contains a 'Make' directory continue
-        # otherwise exit
-        if [ ! -d $MakeDir ]
+        # otherwise exit, or always exit in case of error
+        if [ ! -d $MakeDir -o $makeExitCode -ne 0 ]
         then
-            exit $?
+            exit $makeExitCode
         fi
+
+        # Clean up tracking variable
+        unset makeExitCode
     fi
 fi
 

From e50d8ece5747c6349240004df65c8c0136675034 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 4 Apr 2016 09:26:37 +0100
Subject: [PATCH 365/447] applications/test/rigidBodyDynamics/pendulum: Add a
 test for merging bodies

---
 .../rigidBodyDynamics/pendulum/pendulum.C     | 37 +++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum.C b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
index 23c35c4af3..ac6455b0f7 100644
--- a/applications/test/rigidBodyDynamics/pendulum/pendulum.C
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
@@ -31,6 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "rigidBodyModel.H"
+#include "masslessBody.H"
 #include "joints.H"
 
 using namespace Foam;
@@ -40,18 +41,40 @@ using namespace RBD;
 
 int main(int argc, char *argv[])
 {
+    bool testMerge = false;
+
     // Create a model for the pendulum
     rigidBodyModel pendulum;
 
     // Join a weight to the origin with a centre of mass -1m below the origin
     // by a hinge which rotates about the z-axis
-    pendulum.join
-    (
-        0,
-        Xt(vector(0, 0, 0)),
-        joint::New(new joints::Rz(pendulum)),
-        rigidBody::New("hinge", 1, vector(0, -1, 0), 0.02*I)
-    );
+    if (testMerge)
+    {
+        label hingeID = pendulum.join
+        (
+            0,
+            Xt(Zero),
+            joint::New(new joints::Rz(pendulum)),
+            autoPtr<rigidBody>(new masslessBody("hinge"))
+        );
+
+        pendulum.merge
+        (
+            hingeID,
+            Xt(vector(0, -1, 0)),
+            rigidBody::New("weight", 1, Zero, 0.02*I)
+        );
+    }
+    else
+    {
+        pendulum.join
+        (
+            0,
+            Xt(Zero),
+            joint::New(new joints::Rz(pendulum)),
+            rigidBody::New("pendulum", 1, vector(0, -1, 0), 0.02*I)
+        );
+    }
 
     // Create the joint-space state fields
     scalarField q(pendulum.nDoF(), Zero);

From 486d856b262599406db476408ae909908ca7d666 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 4 Apr 2016 12:51:33 +0100
Subject: [PATCH 366/447] src/conversion/ensight: Specify std::isnan Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=2041

---
 src/conversion/ensight/part/ensightPartIO.C | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/conversion/ensight/part/ensightPartIO.C b/src/conversion/ensight/part/ensightPartIO.C
index 6d827d7ed1..1457ff46c3 100644
--- a/src/conversion/ensight/part/ensightPartIO.C
+++ b/src/conversion/ensight/part/ensightPartIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ void Foam::ensightPart::writeFieldList
     {
         forAll(idList, i)
         {
-            if (idList[i] >= field.size() || isnan(field[idList[i]]))
+            if (idList[i] >= field.size() || std::isnan(field[idList[i]]))
             {
                 os.writeUndef();
             }
@@ -80,7 +80,7 @@ void Foam::ensightPart::writeFieldList
         // no idList => perNode
         forAll(field, i)
         {
-            if (isnan(field[i]))
+            if (std::isnan(field[i]))
             {
                 os.writeUndef();
             }

From 266651f1b92a9f8263e793b73a245f4659d02a01 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 4 Apr 2016 13:53:20 +0100
Subject: [PATCH 367/447] surfaceMeshConvert: Reinstated missing error messages

---
 .../utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 17e22f8c07..45bd203c93 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -197,6 +197,7 @@ int main(int argc, char *argv[])
         if (!csDictIoPtr->headerOk())
         {
             FatalErrorInFunction
+                << "Cannot open coordinateSystems file\n    "
                 << csDictIoPtr->objectPath() << nl
                 << exit(FatalError);
         }
@@ -240,6 +241,7 @@ int main(int argc, char *argv[])
         if (fromCsys.valid() && toCsys.valid())
         {
             FatalErrorInFunction
+                << "Only allowed  '-from' or '-to' option at the moment."
                 << exit(FatalError);
         }
     }

From 6d9c7112c398f038f1ce7fbe4ab7b602f0aaa6fd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 4 Apr 2016 13:53:51 +0100
Subject: [PATCH 368/447] Updated header

---
 .../utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 45bd203c93..b656a484bf 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 071b1fd356e2d3ceae56814dc150ffc720f87055 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 4 Apr 2016 17:06:48 +0100
Subject: [PATCH 369/447] rigidBodyModel: Added support for body lookup by name

---
 src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C | 11 +++++++++--
 src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H |  7 +++++++
 .../rigidBodyModel/rigidBodyModelI.H                  |  6 ++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index 74a6565efd..4d859be759 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -44,6 +44,7 @@ void Foam::RBD::rigidBodyModel::initializeRootBody()
 {
     bodies_.append(new masslessBody);
     lambda_.append(0);
+    bodyIDs_.insert("root", 0);
     joints_.append(new joints::null(*this));
     XT_.append(spatialTransform());
 
@@ -96,7 +97,10 @@ Foam::label Foam::RBD::rigidBodyModel::join
 )
 {
     // Append the body
+    const rigidBody& body = bodyPtr();
     bodies_.append(bodyPtr);
+    const label bodyID = nBodies()-1;
+    bodyIDs_.insert(body.name(), bodyID);
 
     // If the parentID refers to a merged body find the parent into which it has
     // been merged and set lambda and XT accordingly
@@ -126,7 +130,7 @@ Foam::label Foam::RBD::rigidBodyModel::join
 
     resizeState();
 
-    return nBodies()-1;
+    return bodyID;
 }
 
 
@@ -200,7 +204,10 @@ Foam::label Foam::RBD::rigidBodyModel::merge
     // Merge the sub-body with the parent
     bodies_[sBody.parentID()].merge(sBody);
 
-    return mergedBodyID(mergedBodies_.size() - 1);
+    const label sBodyID = mergedBodyID(mergedBodies_.size() - 1);
+    bodyIDs_.insert(sBody.name(), sBodyID);
+
+    return sBodyID;
 }
 
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
index aa3db57876..57c7a17e87 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
@@ -53,6 +53,7 @@ SourceFiles
 #include "subBody.H"
 #include "joint.H"
 #include "PtrList.H"
+#include "HashTable.H"
 
 namespace Foam
 {
@@ -89,6 +90,9 @@ protected:
         //  this list.
         PtrList<subBody> mergedBodies_;
 
+        //- Lookup-table of the IDs of the bodies
+        HashTable<label, word> bodyIDs_;
+
         //- List of indices of the parent of each body
         DynamicList<label> lambda_;
 
@@ -267,6 +271,9 @@ public:
         //- Return the merged body for the given body ID
         inline const subBody& mergedBody(label mergedBodyID) const;
 
+        //- Return the ID of the body with the given name
+        inline label bodyID(const word& name) const;
+
         //- Return the current transform to the global frame for the given body
         spatialTransform X0(const label bodyId) const;
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
index 7899bf89ed..34fa0670ef 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
@@ -117,4 +117,10 @@ Foam::RBD::rigidBodyModel::mergedBody(label mergedBodyID) const
 }
 
 
+inline Foam::label Foam::RBD::rigidBodyModel::bodyID(const word& name) const
+{
+    return bodyIDs_[name];
+}
+
+
 // ************************************************************************* //

From 75af861481fb7bbfbf38df562d6d703b2b219d76 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 4 Apr 2016 17:07:26 +0100
Subject: [PATCH 370/447] rigidBodyDynamics: Added sphere body to simply
 construction of articulated bodies containing spheres

---
 src/rigidBodyDynamics/Make/files              |  1 +
 src/rigidBodyDynamics/bodies/sphere/sphere.C  | 36 +++++++
 src/rigidBodyDynamics/bodies/sphere/sphere.H  | 99 +++++++++++++++++++
 src/rigidBodyDynamics/bodies/sphere/sphereI.H | 39 ++++++++
 4 files changed, 175 insertions(+)
 create mode 100644 src/rigidBodyDynamics/bodies/sphere/sphere.C
 create mode 100644 src/rigidBodyDynamics/bodies/sphere/sphere.H
 create mode 100644 src/rigidBodyDynamics/bodies/sphere/sphereI.H

diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index 2ae2c197ad..4d8c27d482 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -1,5 +1,6 @@
 bodies/rigidBody/rigidBody.C
 bodies/masslessBody/masslessBody.C
+bodies/sphere/sphere.C
 
 joints/joint/joint.C
 joints/nullJoint/nullJoint.C
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.C b/src/rigidBodyDynamics/bodies/sphere/sphere.C
new file mode 100644
index 0000000000..95d7b020b4
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.C
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "sphere.H"
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::sphere::~sphere()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.H b/src/rigidBodyDynamics/bodies/sphere/sphere.H
new file mode 100644
index 0000000000..e1c24e0d30
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\3
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::sphere
+
+Description
+
+SourceFiles
+    sphereI.H
+    sphere.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_sphere_H
+#define RBD_sphere_H
+
+#include "rigidBody.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of Foam classes
+class Istream;
+class Ostream;
+
+namespace RBD
+{
+
+// Forward declaration of friend functions and operators
+class sphere;
+Ostream& operator<<(Ostream&, const sphere&);
+
+
+/*---------------------------------------------------------------------------*\
+                         Class sphere Declaration
+\*---------------------------------------------------------------------------*/
+
+class sphere
+:
+    public rigidBody
+{
+
+public:
+
+    // Constructors
+
+        //- Construct from name, mass and radius
+        inline sphere(const word& name, const scalar m, const scalar r);
+
+
+    //- Destructor
+    virtual ~sphere();
+
+
+    // Member Functions
+
+    // IOstream Operators
+
+        //friend Ostream& operator<<(Ostream&, const sphere&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "sphereI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphereI.H b/src/rigidBodyDynamics/bodies/sphere/sphereI.H
new file mode 100644
index 0000000000..557d35348f
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/sphere/sphereI.H
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::RBD::sphere::sphere
+(
+    const word& name,
+    const scalar m,
+    const scalar r
+)
+:
+    rigidBody(name, m, Zero, (2.0/5.0)*m*sqr(r)*I)
+{}
+
+
+// ************************************************************************* //

From 343136e6cc515b8306f3ecb7bbe69556a01602cd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 4 Apr 2016 17:08:20 +0100
Subject: [PATCH 371/447] applications/test/rigidBodyDynamics/pendulum:
 Simplified using sphere constructor and body lookup by name

---
 .../test/rigidBodyDynamics/pendulum/pendulum.C      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum.C b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
index ac6455b0f7..8a15aec82d 100644
--- a/applications/test/rigidBodyDynamics/pendulum/pendulum.C
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
@@ -32,6 +32,7 @@ Description
 
 #include "rigidBodyModel.H"
 #include "masslessBody.H"
+#include "sphere.H"
 #include "joints.H"
 
 using namespace Foam;
@@ -50,9 +51,9 @@ int main(int argc, char *argv[])
     // by a hinge which rotates about the z-axis
     if (testMerge)
     {
-        label hingeID = pendulum.join
+        pendulum.join
         (
-            0,
+            pendulum.bodyID("root"),
             Xt(Zero),
             joint::New(new joints::Rz(pendulum)),
             autoPtr<rigidBody>(new masslessBody("hinge"))
@@ -60,19 +61,19 @@ int main(int argc, char *argv[])
 
         pendulum.merge
         (
-            hingeID,
+            pendulum.bodyID("hinge"),
             Xt(vector(0, -1, 0)),
-            rigidBody::New("weight", 1, Zero, 0.02*I)
+            autoPtr<rigidBody>(new sphere("weight", 1, 0.05))
         );
     }
     else
     {
         pendulum.join
         (
-            0,
+            pendulum.bodyID("root"),
             Xt(Zero),
             joint::New(new joints::Rz(pendulum)),
-            rigidBody::New("pendulum", 1, vector(0, -1, 0), 0.02*I)
+            rigidBody::New("pendulum", 1, vector(0, -1, 0), 1e-3*I)
         );
     }
 

From 67c2cbfe4b58c7ef49fa2a8272a7ec90084ca96e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 4 Apr 2016 22:10:34 +0100
Subject: [PATCH 372/447] src/rigidBodyDynamics/bodies: Added write

---
 src/rigidBodyDynamics/Make/files              |  1 +
 .../bodies/masslessBody/masslessBody.C        |  4 ++
 .../bodies/masslessBody/masslessBody.H        | 16 +------
 .../bodies/rigidBody/rigidBody.C              | 13 ++++++
 .../bodies/rigidBody/rigidBody.H              | 16 +------
 src/rigidBodyDynamics/bodies/sphere/sphere.C  | 10 ++++
 src/rigidBodyDynamics/bodies/sphere/sphere.H  | 22 ++++-----
 src/rigidBodyDynamics/bodies/sphere/sphereI.H | 11 ++++-
 .../bodies/subBody/subBody.C                  | 46 +++++++++++++++++++
 .../bodies/subBody/subBody.H                  | 27 ++++++-----
 .../bodies/subBody/subBodyI.H                 |  8 ++++
 .../rigidBodyModel/rigidBodyModel.C           | 12 ++++-
 12 files changed, 130 insertions(+), 56 deletions(-)
 create mode 100644 src/rigidBodyDynamics/bodies/subBody/subBody.C

diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index 4d8c27d482..c2c03b7172 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -1,5 +1,6 @@
 bodies/rigidBody/rigidBody.C
 bodies/masslessBody/masslessBody.C
+bodies/subBody/subBody.C
 bodies/sphere/sphere.C
 
 joints/joint/joint.C
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
index b5e3cfecd8..7e97bd8462 100644
--- a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
@@ -39,4 +39,8 @@ bool Foam::RBD::masslessBody::massless() const
 }
 
 
+void Foam::RBD::masslessBody::write(Ostream& os) const
+{}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
index 46e0104093..4c58f97616 100644
--- a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
@@ -41,19 +41,9 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of Foam classes
-class Istream;
-class Ostream;
-
 namespace RBD
 {
 
-// Forward declaration of friend functions and operators
-class masslessBody;
-Ostream& operator<<(Ostream&, const masslessBody&);
-
-
 /*---------------------------------------------------------------------------*\
                          Class masslessBody Declaration
 \*---------------------------------------------------------------------------*/
@@ -83,10 +73,8 @@ public:
         //- Return true if this body is a massless component of a composite body
         virtual bool massless() const;
 
-
-    // IOstream Operators
-
-        //friend Ostream& operator<<(Ostream&, const masslessBody&);
+        //- Write
+        virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
index 57848850d6..d71a082b51 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
@@ -64,4 +64,17 @@ void Foam::RBD::rigidBody::merge(const subBody& subBody)
 }
 
 
+void Foam::RBD::rigidBody::write(Ostream& os) const
+{
+    os.writeKeyword("mass")
+        << m() << token::END_STATEMENT << nl;
+
+    os.writeKeyword("centreOfMass")
+        << c() << token::END_STATEMENT << nl;
+
+    os.writeKeyword("Inertia")
+        << Ic() << token::END_STATEMENT << nl;
+}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
index 8658659e3a..9a7aad09e1 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
@@ -40,22 +40,12 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of Foam classes
-class Istream;
-class Ostream;
-
 namespace RBD
 {
 
 // Forward declaration of classes
 class subBody;
 
-// Forward declaration of friend functions and operators
-class rigidBody;
-Ostream& operator<<(Ostream&, const rigidBody&);
-
-
 /*---------------------------------------------------------------------------*\
                          Class rigidBody Declaration
 \*---------------------------------------------------------------------------*/
@@ -122,10 +112,8 @@ public:
         //- Merge a body into this parent body
         void merge(const subBody&);
 
-
-    // IOstream Operators
-
-        //friend Ostream& operator<<(Ostream&, const rigidBody&);
+        //- Write
+        virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.C b/src/rigidBodyDynamics/bodies/sphere/sphere.C
index 95d7b020b4..275565ea9d 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphere.C
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.C
@@ -33,4 +33,14 @@ Foam::RBD::sphere::~sphere()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+void Foam::RBD::sphere::write(Ostream& os) const
+{
+    os.writeKeyword("mass")
+        << m() << token::END_STATEMENT << nl;
+
+    os.writeKeyword("radius")
+        << r() << token::END_STATEMENT << nl;
+}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.H b/src/rigidBodyDynamics/bodies/sphere/sphere.H
index e1c24e0d30..72eb9c5788 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphere.H
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.H
@@ -25,6 +25,7 @@ Class
     Foam::sphere
 
 Description
+    Specialization of rigidBody to construct a sphere given the mass and radius.
 
 SourceFiles
     sphereI.H
@@ -41,19 +42,9 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of Foam classes
-class Istream;
-class Ostream;
-
 namespace RBD
 {
 
-// Forward declaration of friend functions and operators
-class sphere;
-Ostream& operator<<(Ostream&, const sphere&);
-
-
 /*---------------------------------------------------------------------------*\
                          Class sphere Declaration
 \*---------------------------------------------------------------------------*/
@@ -62,6 +53,11 @@ class sphere
 :
     public rigidBody
 {
+    // Private member data
+
+        //- Radius
+        scalar r_;
+
 
 public:
 
@@ -77,9 +73,11 @@ public:
 
     // Member Functions
 
-    // IOstream Operators
+        //- Return the radius of the sphere
+        inline scalar r() const;
 
-        //friend Ostream& operator<<(Ostream&, const sphere&);
+        //- Write
+        virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphereI.H b/src/rigidBodyDynamics/bodies/sphere/sphereI.H
index 557d35348f..9543e16a9d 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphereI.H
+++ b/src/rigidBodyDynamics/bodies/sphere/sphereI.H
@@ -32,8 +32,17 @@ inline Foam::RBD::sphere::sphere
     const scalar r
 )
 :
-    rigidBody(name, m, Zero, (2.0/5.0)*m*sqr(r)*I)
+    rigidBody(name, m, Zero, (2.0/5.0)*m*sqr(r)*I),
+    r_(r)
 {}
 
 
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+inline Foam::scalar Foam::RBD::sphere::r() const
+{
+    return r_;
+}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBody.C b/src/rigidBodyDynamics/bodies/subBody/subBody.C
new file mode 100644
index 0000000000..e8756177c9
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/subBody/subBody.C
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "subBody.H"
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::subBody::~subBody()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::subBody::write(Ostream& os) const
+{
+    os.writeKeyword("parentBody")
+        << parentName_ << token::END_STATEMENT << nl;
+
+    os.writeKeyword("transform")
+        << parentXT_ << token::END_STATEMENT << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBody.H b/src/rigidBodyDynamics/bodies/subBody/subBody.H
index 684cb4b7e3..f47fa2c299 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBody.H
+++ b/src/rigidBodyDynamics/bodies/subBody/subBody.H
@@ -43,19 +43,9 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of Foam classes
-class Istream;
-class Ostream;
-
 namespace RBD
 {
 
-// Forward declaration of friend functions and operators
-class subBody;
-Ostream& operator<<(Ostream&, const subBody&);
-
-
 /*---------------------------------------------------------------------------*\
                          Class subBody Declaration
 \*---------------------------------------------------------------------------*/
@@ -69,6 +59,9 @@ class subBody
         //- Original body from which this sub-body was constructed
         autoPtr<rigidBody> body_;
 
+        //- Parent body name
+        word parentName_;
+
         //- Parent body ID
         label parentID_;
 
@@ -86,26 +79,32 @@ public:
         inline subBody
         (
             autoPtr<rigidBody> bodyPtr,
+            const word& parentName,
             const label parentID,
             const spatialTransform& parentXT
         );
 
 
+    //- Destructor
+    virtual ~subBody();
+
+
     // Member Functions
 
         //- Return the original body from which this sub-body was constructed
         inline const rigidBody& body() const;
 
+        //- Return the parent body name
+        inline const word& parentName() const;
+
         //- Return the parent body Id
         inline label parentID() const;
 
         //- Return the transform with respect to the parent body
         inline const spatialTransform& parentXT() const;
 
-
-    // IOstream Operators
-
-        //friend Ostream& operator<<(Ostream&, const subBody&);
+        //- Write
+        virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
index 2cfd606cc4..84f705ef4b 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
+++ b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
@@ -28,12 +28,14 @@ License
 inline Foam::RBD::subBody::subBody
 (
     autoPtr<rigidBody> bodyPtr,
+    const word& parentName,
     const label parentID,
     const spatialTransform& parentXT
 )
 :
     rigidBody(bodyPtr()),
     body_(bodyPtr),
+    parentName_(parentName),
     parentID_(parentID),
     parentXT_(parentXT)
 {}
@@ -47,6 +49,12 @@ inline const Foam::RBD::rigidBody& Foam::RBD::subBody::body() const
 }
 
 
+inline const Foam::word& Foam::RBD::subBody::parentName() const
+{
+    return parentName_;
+}
+
+
 inline Foam::label Foam::RBD::subBody::parentID() const
 {
     return parentID_;
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index 4d859be759..7c8679dcf8 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -188,6 +188,7 @@ Foam::label Foam::RBD::rigidBodyModel::merge
             new subBody
             (
                 bodyPtr,
+                bodies_[sBody.parentID()].name(),
                 sBody.parentID(),
                 XT & sBody.parentXT()
             )
@@ -195,7 +196,16 @@ Foam::label Foam::RBD::rigidBodyModel::merge
     }
     else
     {
-        sBodyPtr.set(new subBody(bodyPtr, parentID, XT));
+        sBodyPtr.set
+        (
+            new subBody
+            (
+                bodyPtr,
+                bodies_[parentID].name(),
+                parentID,
+                XT
+            )
+        );
     }
 
     const subBody& sBody = sBodyPtr();

From fea0dc52033e92388f1d99f1e75db3ad28bbdb86 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 6 Apr 2016 12:24:47 +0100
Subject: [PATCH 373/447] src/Pstream/mpi/UPstream.C: Cast-away const-ness for
 backard-compatibility with OpenMPI versions  < 1.7.4 Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2044

---
 src/Pstream/mpi/UPstream.C | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index b7a5cd0c8f..1ba7dfbe33 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -324,7 +324,9 @@ void Foam::UPstream::allToAll
         (
             MPI_Alltoall
             (
-                sendData.begin(),
+                // NOTE: const_cast is a temporary hack for
+                // backward-compatibility with versions of OpenMPI < 1.7.4
+                const_cast<int*>(sendData.begin()),
                 sizeof(label),
                 MPI_BYTE,
                 recvData.begin(),

From 596bd8ba4553406f5a9b09d9f3a78106e9207512 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 6 Apr 2016 14:21:04 +0100
Subject: [PATCH 374/447] geometricOneField: Enhanced to provide better
 correspondence to GeometricField

---
 .../fields/Fields/oneField/oneField.H         |  2 +-
 .../fields/Fields/oneField/oneFieldI.H        |  4 +-
 .../geometricOneField/geometricOneField.H     | 13 ++++-
 .../geometricOneField/geometricOneFieldI.H    | 15 ++++--
 src/OpenFOAM/primitives/one/one.H             | 30 ++++++++++-
 src/OpenFOAM/primitives/one/oneI.H            | 14 +++++
 src/OpenFOAM/primitives/zero/zero.H           | 52 +++++++++++--------
 7 files changed, 98 insertions(+), 32 deletions(-)

diff --git a/src/OpenFOAM/fields/Fields/oneField/oneField.H b/src/OpenFOAM/fields/Fields/oneField/oneField.H
index 1dbf352756..8c6fb16b7a 100644
--- a/src/OpenFOAM/fields/Fields/oneField/oneField.H
+++ b/src/OpenFOAM/fields/Fields/oneField/oneField.H
@@ -64,7 +64,7 @@ public:
 
     // Member Operators
 
-        inline scalar operator[](const label) const;
+        inline one operator[](const label) const;
 
         inline oneField field() const;
 };
diff --git a/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H b/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H
index 3fe8085a2f..35b84a546f 100644
--- a/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H
+++ b/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H
@@ -27,9 +27,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-inline Foam::scalar Foam::oneField::operator[](const label) const
+inline Foam::one Foam::oneField::operator[](const label) const
 {
-    return scalar(1);
+    return one();
 }
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H
index d57bfbea91..23c368b300 100644
--- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H
+++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H
@@ -57,6 +57,13 @@ class geometricOneField
 
 public:
 
+    // Public typedefs
+
+        typedef oneField InternalField;
+        typedef oneField PatchFieldType;
+        typedef oneFieldField GeometricBoundaryField;
+        typedef one cmptType;
+
     // Constructors
 
         //- Construct null
@@ -68,13 +75,15 @@ public:
 
         inline const dimensionSet& dimensions() const;
 
-        inline scalar operator[](const label) const;
+        inline one operator[](const label) const;
 
         inline oneField field() const;
 
         inline oneField oldTime() const;
 
-        inline oneFieldField boundaryField() const;
+        inline InternalField internalField() const;
+
+        inline GeometricBoundaryField boundaryField() const;
 };
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H
index eafebe4b01..8274367d45 100644
--- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H
+++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H
@@ -32,9 +32,9 @@ inline const Foam::dimensionSet& Foam::geometricOneField::dimensions() const
     return dimless;
 }
 
-inline Foam::scalar Foam::geometricOneField::operator[](const label) const
+inline Foam::one Foam::geometricOneField::operator[](const label) const
 {
-    return scalar(1);
+    return one();
 }
 
 inline Foam::oneField Foam::geometricOneField::field() const
@@ -47,9 +47,16 @@ inline Foam::oneField Foam::geometricOneField::oldTime() const
     return oneField();
 }
 
-inline Foam::oneFieldField Foam::geometricOneField::boundaryField() const
+inline Foam::geometricOneField::InternalField
+Foam::geometricOneField::internalField() const
 {
-    return oneFieldField();
+    return InternalField();
+}
+
+inline Foam::geometricOneField::GeometricBoundaryField
+Foam::geometricOneField::boundaryField() const
+{
+    return GeometricBoundaryField();
 }
 
 
diff --git a/src/OpenFOAM/primitives/one/one.H b/src/OpenFOAM/primitives/one/one.H
index 28b7f487ab..a184af000d 100644
--- a/src/OpenFOAM/primitives/one/one.H
+++ b/src/OpenFOAM/primitives/one/one.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,11 +29,16 @@ Description
     unnecessary manipulations for objects which are known to be one at
     compile-time.
 
+SourceFiles
+    oneI.H
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef one_H
 #define one_H
 
+#include "label.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -47,11 +52,34 @@ class one
 {
 public:
 
+    typedef one value_type;
+
     // Constructors
 
         //- Construct null
         one()
         {}
+
+
+    // Member operators
+
+        //- Return 1 for label
+        inline operator label() const
+        {
+            return 1;
+        }
+
+        //- Return 1 for float
+        inline operator float() const
+        {
+            return 1;
+        }
+
+        //- Return 1 for double
+        inline operator double() const
+        {
+            return 1;
+        }
 };
 
 
diff --git a/src/OpenFOAM/primitives/one/oneI.H b/src/OpenFOAM/primitives/one/oneI.H
index 69a8f685f4..a8e0405876 100644
--- a/src/OpenFOAM/primitives/one/oneI.H
+++ b/src/OpenFOAM/primitives/one/oneI.H
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "one.H"
+#include "scalar.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -32,6 +33,14 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+template<class arg2>
+class innerProduct<one, arg2>
+{
+public:
+
+    typedef arg2 type;
+};
+
 inline const one& operator*(const one& o, const one&)
 {
     return o;
@@ -49,6 +58,11 @@ inline const Type& operator*(const one&, const Type& t)
     return t;
 }
 
+template<class Type>
+inline const Type& operator&(const one&, const Type& t)
+{
+    return t;
+}
 
 inline const one& operator/(const one& o, const one&)
 {
diff --git a/src/OpenFOAM/primitives/zero/zero.H b/src/OpenFOAM/primitives/zero/zero.H
index 1bd5f43807..b0156929b6 100644
--- a/src/OpenFOAM/primitives/zero/zero.H
+++ b/src/OpenFOAM/primitives/zero/zero.H
@@ -51,32 +51,40 @@ class zero
 {
 public:
 
-    zero()
-    {}
+    typedef zero value_type;
 
-    //- Return 0 for bool
-    inline operator bool() const
-    {
-        return 0;
-    }
+    // Constructors
 
-    //- Return 0 for label
-    inline operator label() const
-    {
-        return 0;
-    }
+        //- Construct null
+        zero()
+        {}
 
-    //- Return 0 for float
-    inline operator float() const
-    {
-        return 0;
-    }
 
-    //- Return 0 for double
-    inline operator double() const
-    {
-        return 0;
-    }
+    // Member operators
+
+        //- Return 0 for bool
+        inline operator bool() const
+        {
+            return 0;
+        }
+
+        //- Return 0 for label
+        inline operator label() const
+        {
+            return 0;
+        }
+
+        //- Return 0 for float
+        inline operator float() const
+        {
+            return 0;
+        }
+
+        //- Return 0 for double
+        inline operator double() const
+        {
+            return 0;
+        }
 };
 
 

From a8f5b45973583ed4b79eb862b5e4e8e8d5215565 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 6 Apr 2016 14:22:24 +0100
Subject: [PATCH 375/447] Updated headers

---
 src/OpenFOAM/fields/Fields/oneField/oneFieldI.H                 | 2 +-
 .../GeometricFields/geometricOneField/geometricOneFieldI.H      | 2 +-
 src/OpenFOAM/primitives/one/oneI.H                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H b/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H
index 35b84a546f..bcd8edf663 100644
--- a/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H
+++ b/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H
index 8274367d45..7fdbd063ee 100644
--- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H
+++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/primitives/one/oneI.H b/src/OpenFOAM/primitives/one/oneI.H
index a8e0405876..05be7ad120 100644
--- a/src/OpenFOAM/primitives/one/oneI.H
+++ b/src/OpenFOAM/primitives/one/oneI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 52782da917e0ef586411b1b646441dfe7c937d48 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 6 Apr 2016 14:22:33 +0100
Subject: [PATCH 376/447] VectorI: Added dummy innerProduct for scalar

to allow the construction of vtables for virtual member functions
involving the inner-products of fields for which a "NotImplemented"
specialization for scalar is provided.
---
 src/OpenFOAM/primitives/Vector/VectorI.H | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/OpenFOAM/primitives/Vector/VectorI.H b/src/OpenFOAM/primitives/Vector/VectorI.H
index 591155fa42..c6c52f2f43 100644
--- a/src/OpenFOAM/primitives/Vector/VectorI.H
+++ b/src/OpenFOAM/primitives/Vector/VectorI.H
@@ -137,6 +137,18 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+//- Dummy innerProduct for scalar to allow the construction of vtables for
+//  virtual member functions involving the inner-products of fields
+//  for which a "NotImplemented" specialization for scalar is provided.
+template<class Cmpt>
+class innerProduct<Vector<Cmpt>, scalar>
+{
+public:
+
+    typedef scalar type;
+};
+
+
 template<class Cmpt>
 inline typename innerProduct<Vector<Cmpt>, Vector<Cmpt>>::type
 operator&(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)

From 4dedba478e1f639ecc13dd918be178eb99f900e4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 6 Apr 2016 14:23:18 +0100
Subject: [PATCH 377/447] surfaceInterpolationScheme: Added dotInterpolate
 member-function

dotInterpolate interpolates the field and "dots" the resulting
face-values with the vector field provided which removes the need to
create a temporary field for the interpolate.  This reduces the peak
storage of OpenFOAM caused by the divergence of the gradient of vector
fields, improves memory management and under some conditions decreases
run-time.

This development is based on a patch contributed by Paul Edwards, Intel.
---
 .../gaussDivScheme/gaussDivScheme.C           |   2 +-
 .../correctedSnGrad/correctedSnGrad.C         |   4 +-
 .../surfaceInterpolationScheme.C              | 132 ++++++++++++++++--
 .../surfaceInterpolationScheme.H              |  72 +++++++++-
 .../surfaceInterpolationSchemes.C             |  42 +++++-
 5 files changed, 235 insertions(+), 17 deletions(-)

diff --git a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C
index 9721a04eca..308f0daff7 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C
@@ -58,7 +58,7 @@ gaussDivScheme<Type>::fvcDiv
     (
         fvc::surfaceIntegrate
         (
-            this->mesh_.Sf() & this->tinterpScheme_().interpolate(vf)
+            this->tinterpScheme_().dotInterpolate(this->mesh_.Sf(), vf)
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
index ea58ee0249..305743076c 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
@@ -50,9 +50,9 @@ Foam::fv::correctedSnGrad<Type>::fullGradCorrection
 
     // construct GeometricField<Type, fvsPatchField, surfaceMesh>
     tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tssf =
-        mesh.nonOrthCorrectionVectors()
-      & linear<typename outerProduct<vector, Type>::type>(mesh).interpolate
+        linear<typename outerProduct<vector, Type>::type>(mesh).dotInterpolate
         (
+            mesh.nonOrthCorrectionVectors(),
             gradScheme<Type>::New
             (
                 mesh,
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index d871edb6e2..4f6a79c9a2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -26,6 +26,7 @@ License
 #include "surfaceInterpolationScheme.H"
 #include "volFields.H"
 #include "surfaceFields.H"
+#include "geometricOneField.H"
 #include "coupledFvPatchField.H"
 
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
@@ -215,9 +216,19 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
-Foam::surfaceInterpolationScheme<Type>::interpolate
+template<class SFType>
+Foam::tmp
+<
+    Foam::GeometricField
+    <
+        typename Foam::innerProduct<typename SFType::value_type, Type>::type,
+        Foam::fvsPatchField,
+        Foam::surfaceMesh
+    >
+>
+Foam::surfaceInterpolationScheme<Type>::dotInterpolate
 (
+    const SFType& Sf,
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const tmp<surfaceScalarField>& tlambdas
 )
@@ -233,6 +244,9 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
             << endl;
     }
 
+    typedef typename Foam::innerProduct<typename SFType::value_type, Type>::type
+        RetType;
+
     const surfaceScalarField& lambdas = tlambdas();
 
     const Field<Type>& vfi = vf.internalField();
@@ -242,9 +256,9 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
     const labelUList& P = mesh.owner();
     const labelUList& N = mesh.neighbour();
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
+    tmp<GeometricField<RetType, fvsPatchField, surfaceMesh>> tsf
     (
-        new GeometricField<Type, fvsPatchField, surfaceMesh>
+        new GeometricField<RetType, fvsPatchField, surfaceMesh>
         (
             IOobject
             (
@@ -253,16 +267,18 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
                 vf.db()
             ),
             mesh,
-            vf.dimensions()
+            Sf.dimensions()*vf.dimensions()
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsf.ref();
+    GeometricField<RetType, fvsPatchField, surfaceMesh>& sf = tsf.ref();
 
-    Field<Type>& sfi = sf.internalField();
+    Field<RetType>& sfi = sf.internalField();
+
+    const typename SFType::InternalField& Sfi = Sf.internalField();
 
     for (label fi=0; fi<P.size(); fi++)
     {
-        sfi[fi] = lambda[fi]*(vfi[P[fi]] - vfi[N[fi]]) + vfi[N[fi]];
+        sfi[fi] = Sfi[fi] & (lambda[fi]*(vfi[P[fi]] - vfi[N[fi]]) + vfi[N[fi]]);
     }
 
     // Interpolate across coupled patches using given lambdas
@@ -270,16 +286,21 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
     forAll(lambdas.boundaryField(), pi)
     {
         const fvsPatchScalarField& pLambda = lambdas.boundaryField()[pi];
+        const typename SFType::PatchFieldType& pSf = Sf.boundaryField()[pi];
+        fvsPatchField<RetType>& psf = sf.boundaryField()[pi];
 
         if (vf.boundaryField()[pi].coupled())
         {
-            tsf.ref().boundaryField()[pi] =
-                pLambda*vf.boundaryField()[pi].patchInternalField()
-             + (1.0 - pLambda)*vf.boundaryField()[pi].patchNeighbourField();
+            psf =
+                pSf
+              & (
+                    pLambda*vf.boundaryField()[pi].patchInternalField()
+                  + (1.0 - pLambda)*vf.boundaryField()[pi].patchNeighbourField()
+                );
         }
         else
         {
-            sf.boundaryField()[pi] = vf.boundaryField()[pi];
+            psf = pSf & vf.boundaryField()[pi];
         }
     }
 
@@ -289,6 +310,93 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
 }
 
 
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
+Foam::surfaceInterpolationScheme<Type>::interpolate
+(
+    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const tmp<surfaceScalarField>& tlambdas
+)
+{
+    return dotInterpolate(geometricOneField(), vf, tlambdas);
+}
+
+
+template<class Type>
+Foam::tmp
+<
+    Foam::GeometricField
+    <
+        typename Foam::innerProduct<Foam::vector, Type>::type,
+        Foam::fvsPatchField,
+        Foam::surfaceMesh
+    >
+>
+Foam::surfaceInterpolationScheme<Type>::dotInterpolate
+(
+    const surfaceVectorField& Sf,
+    const GeometricField<Type, fvPatchField, volMesh>& vf
+) const
+{
+    if (surfaceInterpolation::debug)
+    {
+        InfoInFunction
+            << "Interpolating "
+            << vf.type() << " "
+            << vf.name()
+            << " from cells to faces"
+            << endl;
+    }
+
+    tmp
+    <
+        GeometricField
+        <
+            typename Foam::innerProduct<Foam::vector, Type>::type,
+            fvsPatchField,
+            surfaceMesh
+        >
+    > tsf = dotInterpolate(Sf, vf, weights(vf));
+
+    if (corrected())
+    {
+        tsf.ref() += Sf & correction(vf);
+    }
+
+    return tsf;
+}
+
+
+template<class Type>
+Foam::tmp
+<
+    Foam::GeometricField
+    <
+        typename Foam::innerProduct<Foam::vector, Type>::type,
+        Foam::fvsPatchField,
+        Foam::surfaceMesh
+    >
+>
+Foam::surfaceInterpolationScheme<Type>::dotInterpolate
+(
+    const surfaceVectorField& Sf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+) const
+{
+    tmp
+    <
+        GeometricField
+        <
+            typename Foam::innerProduct<Foam::vector, Type>::type,
+            fvsPatchField,
+            surfaceMesh
+        >
+    > tSfDotinterpVf = dotInterpolate(Sf, tvf());
+    tvf.clear();
+    return tSfDotinterpVf;
+}
+
+
 template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::surfaceInterpolationScheme<Type>::interpolate
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
index 7780f9d8bb..da6a64fbff 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
@@ -156,6 +156,25 @@ public:
             const tmp<surfaceScalarField>&
         );
 
+        //- Return the face-interpolate of the given cell field
+        //  with the given weighting factors dotted with given field Sf
+        template<class SFType>
+        static tmp
+        <
+            GeometricField
+            <
+                typename innerProduct<typename SFType::value_type, Type>::type,
+                fvsPatchField,
+                surfaceMesh
+            >
+        >
+        dotInterpolate
+        (
+            const SFType& Sf,
+            const GeometricField<Type, fvPatchField, volMesh>& vf,
+            const tmp<surfaceScalarField>& tlambdas
+        );
+
         //- Return the face-interpolate of the given cell field
         //  with the given weighting factors
         static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
@@ -165,7 +184,6 @@ public:
             const tmp<surfaceScalarField>&
         );
 
-
         //- Return the interpolation weighting factors for the given field
         virtual tmp<surfaceScalarField> weights
         (
@@ -186,6 +204,41 @@ public:
             return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>(NULL);
         }
 
+        //- Return the face-interpolate of the given cell field
+        //  with explicit correction dotted with given field Sf
+        virtual
+        tmp
+        <
+            GeometricField
+            <
+                typename innerProduct<vector, Type>::type,
+                fvsPatchField,
+                surfaceMesh
+            >
+        >
+        dotInterpolate
+        (
+            const surfaceVectorField& Sf,
+            const GeometricField<Type, fvPatchField, volMesh>& vf
+        ) const;
+
+        //- Return the face-interpolate of the given tmp cell field
+        //  with explicit correction dotted with given field Sf
+        tmp
+        <
+            GeometricField
+            <
+                typename innerProduct<vector, Type>::type,
+                fvsPatchField,
+                surfaceMesh
+            >
+        >
+        dotInterpolate
+        (
+            const surfaceVectorField& Sf,
+            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        ) const;
+
         //- Return the face-interpolate of the given cell field
         //  with explicit correction
         virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
@@ -201,6 +254,23 @@ public:
 };
 
 
+template<>
+tmp
+<
+    GeometricField
+    <
+        typename innerProduct<vector, scalar>::type,
+        fvsPatchField,
+        surfaceMesh
+    >
+>
+surfaceInterpolationScheme<scalar>::dotInterpolate
+(
+    const surfaceVectorField& Sf,
+    const GeometricField<scalar, fvPatchField, volMesh>&
+) const;
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
index 7332b7cbde..a6da1c8678 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
@@ -54,9 +54,49 @@ makeBaseSurfaceInterpolationScheme(sphericalTensor)
 makeBaseSurfaceInterpolationScheme(symmTensor)
 makeBaseSurfaceInterpolationScheme(tensor)
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<>
+Foam::tmp
+<
+    Foam::GeometricField
+    <
+        typename Foam::innerProduct<Foam::vector, Foam::scalar>::type,
+        Foam::fvsPatchField,
+        Foam::surfaceMesh
+    >
+>
+Foam::surfaceInterpolationScheme<Foam::scalar>::dotInterpolate
+(
+    const surfaceVectorField& Sf,
+    const GeometricField<scalar, fvPatchField, volMesh>&
+) const
+{
+    NotImplemented;
+
+    return
+        tmp
+        <
+            GeometricField
+            <
+                typename innerProduct<vector, scalar>::type,
+                fvsPatchField,
+                surfaceMesh
+            >
+        >
+        (
+            GeometricField
+            <
+                typename innerProduct<vector, scalar>::type,
+                fvsPatchField,
+                surfaceMesh
+            >::null()
+        );
+}
+
+
 // ************************************************************************* //

From 77b03e2e0c38e739e8c14df55637654102c50815 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 6 Apr 2016 20:20:53 +0100
Subject: [PATCH 378/447] Specialized dotInterpolate for the efficient
 calculation of flux fields

e.g. (fvc::interpolate(HbyA) & mesh.Sf()) -> fvc::flux(HbyA)

This removes the need to create an intermediate face-vector field when
computing fluxes which is more efficient, reduces the peak storage and
improved cache coherency in addition to providing a simpler and cleaner
API.
---
 applications/solvers/DNS/dnsFoam/dnsFoam.C    |   2 +-
 .../basic/potentialFoam/createFields.H        |   4 +-
 .../basic/potentialFoam/potentialFoam.C       |   5 +-
 .../solvers/combustion/PDRFoam/pEqn.H         |   4 +-
 applications/solvers/combustion/XiFoam/pEqn.H |   4 +-
 .../solvers/combustion/engineFoam/pEqn.H      |   4 +-
 .../solvers/combustion/fireFoam/pEqn.H        |   2 +-
 .../solvers/combustion/reactingFoam/pEqn.H    |   4 +-
 .../solvers/combustion/reactingFoam/pcEqn.H   |   4 +-
 .../rhoReactingBuoyantFoam/pEqn.H             |   2 +-
 .../reactingFoam/rhoReactingFoam/pEqn.H       |   4 +-
 .../rhoCentralFoam/createFields.H             |   2 +-
 .../rhoCentralDyMFoam/rhoCentralDyMFoam.C     |   2 +-
 .../rhoCentralFoam/rhoCentralFoam.C           |   4 +-
 .../solvers/compressible/rhoPimpleFoam/pEqn.H |   4 +-
 .../compressible/rhoPimpleFoam/pcEqn.H        |   4 +-
 .../rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H     |   4 +-
 .../compressible/rhoPimpleFoam/setRDeltaT.H   |   2 +-
 .../solvers/compressible/rhoSimpleFoam/pEqn.H |   9 +-
 .../compressible/rhoSimpleFoam/pcEqn.H        |   9 +-
 .../rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H  |   7 +-
 .../solvers/compressible/sonicFoam/pEqn.H     |   2 +-
 .../sonicFoam/sonicDyMFoam/pEqn.H             |   2 +-
 .../sonicLiquidFoam/sonicLiquidFoam.C         |   4 +-
 .../electromagnetics/mhdFoam/createPhiB.H     |   2 +-
 .../electromagnetics/mhdFoam/mhdFoam.C        |   5 +-
 .../buoyantBoussinesqPimpleFoam/pEqn.H        |   2 +-
 .../buoyantBoussinesqSimpleFoam/pEqn.H        |   2 +-
 .../heatTransfer/buoyantPimpleFoam/pEqn.H     |   2 +-
 .../heatTransfer/buoyantSimpleFoam/pEqn.H     |   2 +-
 .../chtMultiRegionSimpleFoam/fluid/pEqn.H     |   2 +-
 .../chtMultiRegionFoam/fluid/pEqn.H           |   2 +-
 .../adjointShapeOptimizationFoam.C            |  14 +-
 .../solvers/incompressible/icoFoam/icoFoam.C  |   2 +-
 .../nonNewtonianIcoFoam/nonNewtonianIcoFoam.C |   2 +-
 .../pimpleFoam/SRFPimpleFoam/pEqn.H           |   2 +-
 .../solvers/incompressible/pimpleFoam/pEqn.H  |   2 +-
 .../pimpleFoam/pimpleDyMFoam/pEqn.H           |   2 +-
 .../solvers/incompressible/pisoFoam/pEqn.H    |   2 +-
 .../shallowWaterFoam/shallowWaterFoam.C       |   4 +-
 .../simpleFoam/SRFSimpleFoam/pEqn.H           |   2 +-
 .../solvers/incompressible/simpleFoam/pEqn.H  |   2 +-
 .../simpleFoam/porousSimpleFoam/pEqn.H        |   2 +-
 .../solvers/lagrangian/DPMFoam/UcEqn.H        |   3 +-
 .../solvers/lagrangian/DPMFoam/pEqn.H         |   2 +-
 .../lagrangian/coalChemistryFoam/pEqn.H       |   4 +-
 .../lagrangian/reactingParcelFilmFoam/pEqn.H  |   2 +-
 .../lagrangian/reactingParcelFoam/pEqn.H      |   2 +-
 .../simpleReactingParcelFoam/pEqn.H           |   2 +-
 .../solvers/lagrangian/sprayFoam/pEqn.H       |   4 +-
 .../lagrangian/sprayFoam/sprayDyMFoam/pEqn.H  |   4 +-
 .../cavitatingFoam/cavitatingDyMFoam/pEqn.H   |   2 +-
 .../solvers/multiphase/cavitatingFoam/pEqn.H  |   2 +-
 .../compressibleInterDyMFoam/pEqn.H           |   2 +-
 .../multiphase/compressibleInterFoam/pEqn.H   |   2 +-
 .../compressibleMultiphaseInterFoam/pEqn.H    |   2 +-
 .../driftFluxFoam/alphaEqnSubCycle.H          |   5 +-
 .../solvers/multiphase/driftFluxFoam/pEqn.H   |   2 +-
 .../multiphase/interFoam/interDyMFoam/pEqn.H  |   2 +-
 .../solvers/multiphase/interFoam/pEqn.H       |   2 +-
 .../interPhaseChangeDyMFoam/pEqn.H            |   2 +-
 .../multiphase/interPhaseChangeFoam/pEqn.H    |   2 +-
 .../multiphaseSystem/phaseModel/phaseModel.C  |   5 +-
 .../multiphase/multiphaseEulerFoam/pEqn.H     |   2 +-
 .../potentialFreeSurfaceFoam/pEqn.H           |   2 +-
 .../potentialFreeSurfaceDyMFoam/pEqn.H        |   2 +-
 .../liftModels/liftModel/liftModel.C          |   9 +-
 .../wallLubricationModel.C                    |   7 +-
 .../MovingPhaseModel/MovingPhaseModel.C       |   5 +-
 .../reactingMultiphaseEulerFoam/pU/pEqn.H     |   6 +-
 .../reactingTwoPhaseEulerFoam/pU/pEqn.H       |  20 +-
 .../reactingTwoPhaseEulerFoam/pUf/pEqn.H      |   4 +-
 .../multiphase/twoLiquidMixingFoam/pEqn.H     |   2 +-
 .../liftModels/liftModel/liftModel.C          |   9 +-
 .../wallLubricationModel.C                    |   9 +-
 .../multiphase/twoPhaseEulerFoam/pU/pEqn.H    |  20 +-
 .../multiphase/twoPhaseEulerFoam/pUf/pEqn.H   |   4 +-
 .../twoPhaseSystem/phaseModel/phaseModel.C    |   5 +-
 src/finiteVolume/Make/files                   |   1 +
 .../cfdTools/incompressible/createPhi.H       |   4 +-
 .../cfdTools/incompressible/createPhiv.H      |   4 +-
 .../CoEulerDdtScheme/CoEulerDdtScheme.C       |  28 +--
 .../CrankNicolsonDdtScheme.C                  |  14 +-
 .../EulerDdtScheme/EulerDdtScheme.C           |  28 +--
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C  |  28 +--
 .../backwardDdtScheme/backwardDdtScheme.C     |  17 +-
 .../ddtSchemes/ddtScheme/ddtScheme.C          |   2 +-
 .../ddtSchemes/ddtScheme/ddtScheme.H          |   8 +-
 .../localEulerDdtScheme/localEulerDdtScheme.C |  28 +--
 src/finiteVolume/finiteVolume/fvc/fvcFlux.C   | 157 +--------------
 src/finiteVolume/finiteVolume/fvc/fvcFlux.H   |  15 +-
 .../finiteVolume/fvc/fvcFluxTemplates.C       | 190 ++++++++++++++++++
 .../finiteVolume/fvc/fvcMeshPhi.C             |   1 +
 .../gaussLaplacianScheme.C                    |   2 +-
 .../surfaceInterpolation/surfaceInterpolate.C |  62 ++++++
 .../surfaceInterpolation/surfaceInterpolate.H |  50 ++++-
 .../displacementSBRStressFvMotionSolver.C     |  10 +-
 .../kinematicSingleLayer.C                    |  10 +-
 .../thermoSingleLayer/thermoSingleLayer.C     |   3 +-
 .../hopper/hopperEmptying/system/fvSchemes    |   2 +-
 .../hopperInitialState/system/fvSchemes       |   2 +-
 101 files changed, 523 insertions(+), 451 deletions(-)
 create mode 100644 src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C

diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index 238a05c696..f2f2af745e 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
             surfaceScalarField phiHbyA
             (
                 "phiHbyA",
-                (fvc::interpolate(HbyA) & mesh.Sf())
+                fvc::flux(HbyA)
               + rAUf*fvc::ddtCorr(U, phi)
             );
 
diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H
index ce912510ec..a4e09d481f 100644
--- a/applications/solvers/basic/potentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/createFields.H
@@ -24,13 +24,13 @@ surfaceScalarField phi
         IOobject::NO_READ,
         IOobject::AUTO_WRITE
     ),
-    fvc::interpolate(U) & mesh.Sf()
+    fvc::flux(U)
 );
 
 if (args.optionFound("initialiseUBCs"))
 {
     U.correctBoundaryConditions();
-    phi = fvc::interpolate(U) & mesh.Sf();
+    phi = fvc::flux(U);
 }
 
 
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index 2e4a569ae1..2de65d10a9 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,8 +121,7 @@ int main(int argc, char *argv[])
     U.correctBoundaryConditions();
 
     Info<< "Interpolated velocity error = "
-        << (sqrt(sum(sqr((fvc::interpolate(U) & mesh.Sf()) - phi)))
-          /sum(mesh.magSf())).value()
+        << (sqrt(sum(sqr(fvc::flux(U) - phi)))/sum(mesh.magSf())).value()
         << endl;
 
     // Write U and phi
diff --git a/applications/solvers/combustion/PDRFoam/pEqn.H b/applications/solvers/combustion/PDRFoam/pEqn.H
index b8d21b7e38..c7308f8b12 100644
--- a/applications/solvers/combustion/PDRFoam/pEqn.H
+++ b/applications/solvers/combustion/PDRFoam/pEqn.H
@@ -10,7 +10,7 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(HbyA) & mesh.Sf())
+            fvc::flux(HbyA)
           + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
            /fvc::interpolate(rho)
         )
@@ -41,7 +41,7 @@ else
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
         )
     );
diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H
index 39830d0135..afba129157 100644
--- a/applications/solvers/combustion/XiFoam/pEqn.H
+++ b/applications/solvers/combustion/XiFoam/pEqn.H
@@ -11,7 +11,7 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(HbyA) & mesh.Sf())
+            fvc::flux(HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
         )
     );
@@ -43,7 +43,7 @@ else
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)
         )
     );
diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H
index d84b9bd154..aca8c2c11a 100644
--- a/applications/solvers/combustion/engineFoam/pEqn.H
+++ b/applications/solvers/combustion/engineFoam/pEqn.H
@@ -12,7 +12,7 @@ if (pimple.transonic())
         fvc::interpolate(psi)
        *(
             (
-                (fvc::interpolate(HbyA) & mesh.Sf())
+                fvc::flux(HbyA)
               + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)/fvc::interpolate(rho)
             )
         )
@@ -46,7 +46,7 @@ else
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)
         )
     );
diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H
index 11f140577f..7b5249d57e 100644
--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@@ -10,7 +10,7 @@ surfaceScalarField phiHbyA
 (
     "phiHbyA",
     (
-        (fvc::interpolate(rho*HbyA) & mesh.Sf())
+        fvc::flux(rho*HbyA)
       + rhorAUf*fvc::ddtCorr(rho, U, phi)
     )
   + phig
diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H
index f5b7141224..ac7107acf0 100644
--- a/applications/solvers/combustion/reactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pEqn.H
@@ -19,7 +19,7 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(HbyA) & mesh.Sf())
+            fvc::flux(HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
         )
     );
@@ -51,7 +51,7 @@ else
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)
         )
     );
diff --git a/applications/solvers/combustion/reactingFoam/pcEqn.H b/applications/solvers/combustion/reactingFoam/pcEqn.H
index bf8eb899af..713f443fc5 100644
--- a/applications/solvers/combustion/reactingFoam/pcEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pcEqn.H
@@ -19,7 +19,7 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(HbyA) & mesh.Sf())
+            fvc::flux(HbyA)
           + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
            /fvc::interpolate(rho)
         )
@@ -63,7 +63,7 @@ else
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
         )
     );
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
index ad01cd5f83..926e69f7c1 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
@@ -15,7 +15,7 @@
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)
         )
       + phig
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
index 3d02c63381..eff014cf43 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
@@ -15,7 +15,7 @@
         (
             "phiHbyA",
             (
-                (fvc::interpolate(HbyA) & mesh.Sf())
+                fvc::flux(HbyA)
               + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
             )
         );
@@ -56,7 +56,7 @@
         (
             "phiHbyA",
             (
-                (fvc::interpolate(rho*HbyA) & mesh.Sf())
+                fvc::flux(rho*HbyA)
               + rhorAUf*fvc::ddtCorr(rho, U, phi)
             )
         );
diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H
index 632efaf9d1..538e936e39 100644
--- a/applications/solvers/compressible/rhoCentralFoam/createFields.H
+++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H
@@ -95,7 +95,7 @@ surfaceScalarField neg
     dimensionedScalar("neg", dimless, -1.0)
 );
 
-surfaceScalarField phi("phi", mesh.Sf() & fvc::interpolate(rhoU));
+surfaceScalarField phi("phi", fvc::flux(rhoU));
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
index a9fa5559b8..3b43b5dcec 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
@@ -208,7 +208,7 @@ int main(int argc, char *argv[])
             "sigmaDotU",
             (
                 fvc::interpolate(muEff)*mesh.magSf()*fvc::snGrad(U)
-              + (mesh.Sf() & fvc::interpolate(tauMC))
+              + fvc::dotInterpolate(mesh.Sf(), tauMC)
             )
             & (a_pos*U_pos + a_neg*U_neg)
         );
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index 841c9a5162..3754632d3d 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -201,9 +201,9 @@ int main(int argc, char *argv[])
             "sigmaDotU",
             (
                 fvc::interpolate(muEff)*mesh.magSf()*fvc::snGrad(U)
-              + (mesh.Sf() & fvc::interpolate(tauMC))
+              + fvc::dotInterpolate(mesh.Sf(), tauMC)
             )
-            & (a_pos*U_pos + a_neg*U_neg)
+          & (a_pos*U_pos + a_neg*U_neg)
         );
 
         solve
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index f5b7141224..ac7107acf0 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -19,7 +19,7 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(HbyA) & mesh.Sf())
+            fvc::flux(HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
         )
     );
@@ -51,7 +51,7 @@ else
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)
         )
     );
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
index bf8eb899af..713f443fc5 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
@@ -19,7 +19,7 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(HbyA) & mesh.Sf())
+            fvc::flux(HbyA)
           + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
            /fvc::interpolate(rho)
         )
@@ -63,7 +63,7 @@ else
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
         )
     );
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
index 4abc5cd4aa..7bd540df40 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
@@ -19,7 +19,7 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(HbyA) & mesh.Sf())
+            fvc::flux(HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)/fvc::interpolate(rho)
         )
     );
@@ -51,7 +51,7 @@ else
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(rho*HbyA) & mesh.Sf())
+        fvc::flux(rho*HbyA)
       + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)
     );
 
diff --git a/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H b/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H
index ba2db0d04a..0a38e05ee9 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H
@@ -38,7 +38,7 @@
         surfaceScalarField phid
         (
             "phid",
-            fvc::interpolate(psi)*(fvc::interpolate(U) & mesh.Sf())
+            fvc::interpolate(psi)*fvc::flux(U)
         );
 
         rDeltaT.dimensionedInternalField() = max
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index b085a2b9d1..e46f2a6691 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -12,7 +12,7 @@
         (
             "phid",
             fvc::interpolate(psi)
-           *(fvc::interpolate(HbyA) & mesh.Sf())
+           *fvc::flux(HbyA)
         );
 
         MRF.makeRelative(fvc::interpolate(psi), phid);
@@ -42,12 +42,7 @@
     }
     else
     {
-        surfaceScalarField phiHbyA
-        (
-            "phiHbyA",
-            fvc::interpolate(rho*HbyA) & mesh.Sf()
-        );
-
+        surfaceScalarField phiHbyA("phiHbyA", fvc::flux(rho*HbyA));
         MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
         closedVolume = adjustPhi(phiHbyA, U, p);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
index 51b3865165..67b962f805 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
@@ -11,7 +11,7 @@ if (simple.transonic())
     (
         "phid",
         fvc::interpolate(psi)
-       *(fvc::interpolate(HbyA) & mesh.Sf())
+       *fvc::flux(HbyA)
     );
 
     MRF.makeRelative(fvc::interpolate(psi), phid);
@@ -52,12 +52,7 @@ if (simple.transonic())
 }
 else
 {
-    surfaceScalarField phiHbyA
-    (
-        "phiHbyA",
-        fvc::interpolate(rho*HbyA) & mesh.Sf()
-    );
-
+    surfaceScalarField phiHbyA("phiHbyA", fvc::flux(rho*HbyA));
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
     closedVolume = adjustPhi(phiHbyA, U, p);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
index b586cd15c0..7b55983161 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
@@ -16,12 +16,7 @@
 
     bool closedVolume = false;
 
-    surfaceScalarField phiHbyA
-    (
-        "phiHbyA",
-        fvc::interpolate(rho*HbyA) & mesh.Sf()
-    );
-
+    surfaceScalarField phiHbyA("phiHbyA", fvc::flux(rho*HbyA));
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
     closedVolume = adjustPhi(phiHbyA, U, p);
diff --git a/applications/solvers/compressible/sonicFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/pEqn.H
index f4f6d5ae2a..bd553928b1 100644
--- a/applications/solvers/compressible/sonicFoam/pEqn.H
+++ b/applications/solvers/compressible/sonicFoam/pEqn.H
@@ -8,7 +8,7 @@ surfaceScalarField phid
     "phid",
     fvc::interpolate(psi)
    *(
-        (mesh.Sf() & fvc::interpolate(HbyA))
+        fvc::flux(HbyA)
       + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
     )
 );
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
index 283e450e00..92e0bb3673 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
@@ -8,7 +8,7 @@ surfaceScalarField phid
     "phid",
     fvc::interpolate(psi)
    *(
-       (mesh.Sf() & fvc::interpolate(HbyA))
+       fvc::flux(HbyA)
      + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)/fvc::interpolate(rho)
     )
 );
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
index c60a331b2d..eb147db6c0 100644
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
                     "phid",
                     psi
                    *(
-                       (fvc::interpolate(U) & mesh.Sf())
+                       fvc::flux(U)
                      + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
                     )
                 );
diff --git a/applications/solvers/electromagnetics/mhdFoam/createPhiB.H b/applications/solvers/electromagnetics/mhdFoam/createPhiB.H
index 9b8aea9ae2..de0c573259 100644
--- a/applications/solvers/electromagnetics/mhdFoam/createPhiB.H
+++ b/applications/solvers/electromagnetics/mhdFoam/createPhiB.H
@@ -40,7 +40,7 @@
                 IOobject::NO_READ,
                 IOobject::AUTO_WRITE
             ),
-            (fvc::interpolate(B) & mesh.Sf())
+            fvc::flux(B)
         );
     }
 
diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
index 0d21312a30..43e800b48b 100644
--- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
+++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
                 surfaceScalarField phiHbyA
                 (
                     "phiHbyA",
-                    (fvc::interpolate(HbyA) & mesh.Sf())
+                    fvc::flux(HbyA)
                   + rAUf*fvc::ddtCorr(U, phi)
                 );
 
@@ -147,8 +147,7 @@ int main(int argc, char *argv[])
             volScalarField rAB(1.0/BEqn.A());
             surfaceScalarField rABf("rABf", fvc::interpolate(rAB));
 
-            phiB = (fvc::interpolate(B) & mesh.Sf())
-                + rABf*fvc::ddtCorr(B, phiB);
+            phiB = fvc::flux(B) + rABf*fvc::ddtCorr(B, phiB);
 
             while (bpiso.correctNonOrthogonal())
             {
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
index a9be0e59f7..51d9461c87 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
@@ -8,7 +8,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
       + rAUf*fvc::ddtCorr(U, phi)
       + phig
     );
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
index 7df0ac46d2..f29075b149 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
@@ -10,7 +10,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
     );
 
     MRF.makeRelative(phiHbyA);
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index 66864139fa..bb371bb9f3 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@@ -15,7 +15,7 @@
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)
         )
       + phig
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index a744b9d19f..6c1ae382fa 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -12,7 +12,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(rho*HbyA) & mesh.Sf())
+        fvc::flux(rho*HbyA)
     );
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
index 3fdadc042a..7fe544d6a5 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
@@ -14,7 +14,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(rho*HbyA) & mesh.Sf())
+        fvc::flux(rho*HbyA)
     );
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
index 358535efe9..a8a0807f24 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
@@ -15,7 +15,7 @@
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)
         )
       + phig
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index a303ae4fe4..c062af0364 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -128,11 +128,7 @@ int main(int argc, char *argv[])
             volScalarField rAU(1.0/UEqn.A());
             volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
             tUEqn.clear();
-            surfaceScalarField phiHbyA
-            (
-                "phiHbyA",
-                fvc::interpolate(HbyA) & mesh.Sf()
-            );
+            surfaceScalarField phiHbyA("phiHbyA", fvc::flux(HbyA));
             adjustPhi(phiHbyA, U, p);
 
             // Update the pressure BCs to ensure flux consistency
@@ -175,7 +171,7 @@ int main(int argc, char *argv[])
             //(
             //    fvc::reconstruct
             //    (
-            //        mesh.magSf()*(fvc::snGrad(Ua) & fvc::interpolate(U))
+            //        mesh.magSf()*fvc::dotInterpolate(fvc::snGrad(Ua), U)
             //    )
             //);
 
@@ -204,11 +200,7 @@ int main(int argc, char *argv[])
             volVectorField HbyAa("HbyAa", Ua);
             HbyAa = rAUa*UaEqn.H();
             tUaEqn.clear();
-            surfaceScalarField phiHbyAa
-            (
-                "phiHbyAa",
-                fvc::interpolate(HbyAa) & mesh.Sf()
-            );
+            surfaceScalarField phiHbyAa("phiHbyAa", fvc::flux(HbyAa));
             adjustPhi(phiHbyAa, Ua, pa);
 
             // Non-orthogonal pressure corrector loop
diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C
index e3a7fb67c5..04581bcb20 100644
--- a/applications/solvers/incompressible/icoFoam/icoFoam.C
+++ b/applications/solvers/incompressible/icoFoam/icoFoam.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
             surfaceScalarField phiHbyA
             (
                 "phiHbyA",
-                (fvc::interpolate(HbyA) & mesh.Sf())
+                fvc::flux(HbyA)
               + fvc::interpolate(rAU)*fvc::ddtCorr(U, phi)
             );
 
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index 3edbedf39f..bdac3f8336 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
             surfaceScalarField phiHbyA
             (
                 "phiHbyA",
-                (fvc::interpolate(HbyA) & mesh.Sf())
+                fvc::flux(HbyA)
               + fvc::interpolate(rAU)*fvc::ddtCorr(U, phi)
             );
 
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
index aaeb12ae06..3cb0580ba4 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
@@ -5,7 +5,7 @@ HbyA = rAUrel*UrelEqn.H();
 surfaceScalarField phiHbyA
 (
     "phiHbyA",
-    (fvc::interpolate(HbyA) & mesh.Sf())
+    fvc::flux(HbyA)
   + fvc::interpolate(rAUrel)*fvc::ddtCorr(Urel, phi)
 );
 
diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H
index ffce137326..c8d02ed281 100644
--- a/applications/solvers/incompressible/pimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H
@@ -3,7 +3,7 @@ volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 surfaceScalarField phiHbyA
 (
     "phiHbyA",
-    (fvc::interpolate(HbyA) & mesh.Sf())
+    fvc::flux(HbyA)
   + fvc::interpolate(rAU)*fvc::ddtCorr(U, phi)
 );
 
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
index 452f13fb1f..a53391a90b 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
@@ -3,7 +3,7 @@ volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 surfaceScalarField phiHbyA
 (
     "phiHbyA",
-    (fvc::interpolate(HbyA) & mesh.Sf())
+    fvc::flux(HbyA)
   + fvc::interpolate(rAU)*fvc::ddtCorr(U, Uf)
 );
 
diff --git a/applications/solvers/incompressible/pisoFoam/pEqn.H b/applications/solvers/incompressible/pisoFoam/pEqn.H
index 7d3284e0d4..05c34376ec 100644
--- a/applications/solvers/incompressible/pisoFoam/pEqn.H
+++ b/applications/solvers/incompressible/pisoFoam/pEqn.H
@@ -3,7 +3,7 @@ volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 surfaceScalarField phiHbyA
 (
     "phiHbyA",
-    (fvc::interpolate(HbyA) & mesh.Sf())
+    fvc::flux(HbyA)
   + fvc::interpolate(rAU)*fvc::ddtCorr(U, phi)
 );
 
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 47ec8ac9f6..6575a09f05 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
                 surfaceScalarField phiHbyA
                 (
                     "phiHbyA",
-                    (fvc::interpolate(HbyA) & mesh.Sf())
+                    fvc::flux(HbyA)
                   + fvc::interpolate(rAU)*fvc::ddtCorr(h, hU, phi)
                   - phih0
                 );
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H
index 9982ddf546..e92838716c 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H
@@ -3,7 +3,7 @@
     volVectorField HbyA("HbyA", Urel);
     HbyA = rAUrel*UrelEqn.H();
 
-    surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
+    surfaceScalarField phiHbyA("phiHbyA", fvc::flux(HbyA));
     adjustPhi(phiHbyA, Urel, p);
 
     tmp<volScalarField> rAtUrel(rAUrel);
diff --git a/applications/solvers/incompressible/simpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/pEqn.H
index 5d5dde848c..7e394e9c10 100644
--- a/applications/solvers/incompressible/simpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/pEqn.H
@@ -1,7 +1,7 @@
 {
     volScalarField rAU(1.0/UEqn.A());
     volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
-    surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
+    surfaceScalarField phiHbyA("phiHbyA", fvc::flux(HbyA));
     MRF.makeRelative(phiHbyA);
     adjustPhi(phiHbyA, U, p);
 
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
index 68bdcc77e0..c76143714e 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
@@ -10,7 +10,7 @@ else
 volVectorField& HbyA = tHbyA.ref();
 
 tUEqn.clear();
-surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
+surfaceScalarField phiHbyA("phiHbyA", fvc::flux(HbyA));
 
 MRF.makeRelative(phiHbyA);
 
diff --git a/applications/solvers/lagrangian/DPMFoam/UcEqn.H b/applications/solvers/lagrangian/DPMFoam/UcEqn.H
index 0bd4a7146d..d31bead5e1 100644
--- a/applications/solvers/lagrangian/DPMFoam/UcEqn.H
+++ b/applications/solvers/lagrangian/DPMFoam/UcEqn.H
@@ -14,8 +14,7 @@ surfaceScalarField rAUcf("Dp", fvc::interpolate(rAUc));
 
 surfaceScalarField phicForces
 (
-   (fvc::interpolate(rAUc*cloudVolSUSu/rhoc) & mesh.Sf())
- + rAUcf*(g & mesh.Sf())
+   fvc::flux(rAUc*cloudVolSUSu/rhoc) + rAUcf*(g & mesh.Sf())
 );
 
 if (pimple.momentumPredictor())
diff --git a/applications/solvers/lagrangian/DPMFoam/pEqn.H b/applications/solvers/lagrangian/DPMFoam/pEqn.H
index 6b7084de63..9e46551122 100644
--- a/applications/solvers/lagrangian/DPMFoam/pEqn.H
+++ b/applications/solvers/lagrangian/DPMFoam/pEqn.H
@@ -6,7 +6,7 @@
     (
         "phiHbyA",
         (
-           (fvc::interpolate(HbyA) & mesh.Sf())
+           fvc::flux(HbyA)
          + alphacf*rAUcf*fvc::ddtCorr(Uc, phic)
          + phicForces
         )
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
index ce9f819646..4f6eaf3550 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@@ -11,7 +11,7 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(HbyA) & mesh.Sf())
+            fvc::flux(HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
         )
     );
@@ -44,7 +44,7 @@ else
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)
         )
     );
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
index 11f140577f..7b5249d57e 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
@@ -10,7 +10,7 @@ surfaceScalarField phiHbyA
 (
     "phiHbyA",
     (
-        (fvc::interpolate(rho*HbyA) & mesh.Sf())
+        fvc::flux(rho*HbyA)
       + rhorAUf*fvc::ddtCorr(rho, U, phi)
     )
   + phig
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
index cb5b083b88..f6c8ceec21 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
@@ -12,7 +12,7 @@
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)
         )
     );
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
index 9b48bb939d..055eff6f0b 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
@@ -10,7 +10,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::interpolate(rho)*fvc::flux(HbyA)
     );
 
     MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
diff --git a/applications/solvers/lagrangian/sprayFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/pEqn.H
index 1447f5b6be..b15fb81e13 100644
--- a/applications/solvers/lagrangian/sprayFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/pEqn.H
@@ -19,7 +19,7 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(HbyA) & mesh.Sf())
+            fvc::flux(HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
         )
     );
@@ -52,7 +52,7 @@ else
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            fvc::flux(rho*HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, phi)
         )
     );
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H
index 8522e60918..90033814d3 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H
@@ -19,7 +19,7 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(HbyA) & mesh.Sf())
+            fvc::flux(HbyA)
           + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)/fvc::interpolate(rho)
         )
     );
@@ -52,7 +52,7 @@ else
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(rho*HbyA) & mesh.Sf())
+        fvc::flux(rho*HbyA)
       + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)
     );
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
index 37892c0e73..51a2da33bd 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
@@ -15,7 +15,7 @@
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
     volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
-    phi = (fvc::interpolate(HbyA) & mesh.Sf())
+    phi = fvc::flux(HbyA)
          + rhorAUf*fvc::ddtCorr(U, Uf);
     fvc::makeRelative(phi, U);
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index 5b238ccefa..4c337c4269 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -15,7 +15,7 @@
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
     volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
-    phi = (fvc::interpolate(HbyA) & mesh.Sf())
+    phi = fvc::flux(HbyA)
          + rhorAUf*fvc::ddtCorr(U, phi);
 
     surfaceScalarField phiGradp(rhorAUf*mesh.magSf()*fvc::snGrad(p));
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
index c326215512..859fc9cc4e 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
@@ -5,7 +5,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
       + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, Uf)
     );
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index a0a91c3255..a4a3fb2e29 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -5,7 +5,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
       + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
     );
 
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H
index 26ffef825a..70ac37c1b8 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H
@@ -5,7 +5,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
       + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
     );
 
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
index b586e77fad..e77f66b880 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
@@ -11,10 +11,7 @@
         dimensionedScalar("0", phi.dimensions(), 0)
     );
 
-    surfaceScalarField phir
-    (
-        mesh.Sf() & fvc::interpolate(UdmModel.Udm())
-    );
+    surfaceScalarField phir(fvc::flux(UdmModel.Udm()));
 
     if (nAlphaSubCycles > 1)
     {
diff --git a/applications/solvers/multiphase/driftFluxFoam/pEqn.H b/applications/solvers/multiphase/driftFluxFoam/pEqn.H
index 6cc93506df..6797c44ccb 100644
--- a/applications/solvers/multiphase/driftFluxFoam/pEqn.H
+++ b/applications/solvers/multiphase/driftFluxFoam/pEqn.H
@@ -5,7 +5,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
       + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
     );
     MRF.makeRelative(phiHbyA);
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
index e6723f47b2..2c7df14ae7 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
@@ -5,7 +5,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
       + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, Uf)
     );
     MRF.makeRelative(phiHbyA);
diff --git a/applications/solvers/multiphase/interFoam/pEqn.H b/applications/solvers/multiphase/interFoam/pEqn.H
index 42cf70fce5..43edce0c5d 100644
--- a/applications/solvers/multiphase/interFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/pEqn.H
@@ -7,7 +7,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
       + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
     );
     MRF.makeRelative(phiHbyA);
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
index f28bb8c2aa..7501f58062 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
@@ -5,7 +5,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
       + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, Uf)
     );
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
index fd85d96714..0b0a31c669 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
@@ -5,7 +5,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
       + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
     );
     adjustPhi(phiHbyA, U, p_rgh);
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
index 9dc9f2bf80..2f5f833d20 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,7 @@ License
 #include "slipFvPatchFields.H"
 #include "partialSlipFvPatchFields.H"
 #include "surfaceInterpolate.H"
+#include "fvcFlux.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -177,7 +178,7 @@ Foam::phaseModel::phaseModel
                     IOobject::NO_READ,
                     IOobject::AUTO_WRITE
                 ),
-                fvc::interpolate(U_) & mesh.Sf(),
+                fvc::flux(U_),
                 phiTypes
             )
         );
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index d2616fc556..4cddb12921 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -97,7 +97,7 @@
 
         phiHbyAs[phasei] =
         (
-            (fvc::interpolate(HbyAs[phasei]) & mesh.Sf())
+            fvc::flux(HbyAs[phasei])
           + rAlphaAUfs[phasei]*fvc::ddtCorr(phase.U(), phase.phi())
         );
         MRF.makeRelative(phiHbyAs[phasei]);
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
index 7d4c5f9039..76a44bd134 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
@@ -10,7 +10,7 @@ if (pimple.nCorrPISO() <= 1)
 surfaceScalarField phiHbyA
 (
     "phiHbyA",
-    (fvc::interpolate(HbyA) & mesh.Sf())
+    fvc::flux(HbyA)
   + rAUf*fvc::ddtCorr(U, phi)
 );
 
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H
index a74f6c2664..dac95a1974 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H
@@ -11,7 +11,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
       + rAUf*fvc::ddtCorr(U, Uf)
     );
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C
index 79e52a2856..7c0bf86c94 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,7 @@ License
 #include "liftModel.H"
 #include "phasePair.H"
 #include "fvcCurl.H"
+#include "fvcFlux.H"
 #include "surfaceInterpolate.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -78,11 +79,7 @@ Foam::tmp<Foam::volVectorField> Foam::liftModel::F() const
 
 Foam::tmp<Foam::surfaceScalarField> Foam::liftModel::Ff() const
 {
-    const fvMesh& mesh(this->pair_.phase1().mesh());
-
-    return
-        fvc::interpolate(pair_.dispersed())
-       *(fvc::interpolate(Fi()) & mesh.Sf());
+    return fvc::interpolate(pair_.dispersed())*fvc::flux(Fi());
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
index c17b649212..a2a95cce05 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
@@ -25,6 +25,7 @@ License
 
 #include "wallLubricationModel.H"
 #include "phasePair.H"
+#include "fvcFlux.H"
 #include "surfaceInterpolate.H"
 #include "wallFvPatch.H"
 
@@ -91,11 +92,7 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModel::F() const
 
 Foam::tmp<Foam::surfaceScalarField> Foam::wallLubricationModel::Ff() const
 {
-    const fvMesh& mesh(this->pair_.phase1().mesh());
-
-    return
-        fvc::interpolate(pair_.dispersed())
-       *(fvc::interpolate(Fi()) & mesh.Sf());
+    return fvc::interpolate(pair_.dispersed())*fvc::flux(Fi());
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index 74c6b7b46a..de31cefaa3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,7 @@ License
 #include "fvmSup.H"
 #include "fvcDdt.H"
 #include "fvcDiv.H"
+#include "fvcFlux.H"
 #include "surfaceInterpolate.H"
 #include "fvMatrix.H"
 
@@ -109,7 +110,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::phi(const volVectorField& U) const
                     IOobject::NO_READ,
                     IOobject::AUTO_WRITE
                 ),
-                fvc::interpolate(U) & U.mesh().Sf(),
+                fvc::flux(U),
                 phiTypes
             )
         );
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index 42e0fe70e4..05a049b4c6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -51,7 +51,7 @@ PtrList<surfaceScalarField> phiFs(phases.size());
                 new surfaceScalarField
                 (
                     IOobject::groupName("phiF", phase.name()),
-                    (fvc::interpolate(rAUs[phasei]*Fs()[phasei]) & mesh.Sf())
+                    fvc::flux(rAUs[phasei]*Fs()[phasei])
                 )
             );
         }
@@ -201,7 +201,7 @@ while (pimple.correct())
             new surfaceScalarField
             (
                 IOobject::groupName("phiHbyA", phase.name()),
-                (fvc::interpolate(HbyAs[phasei]) & mesh.Sf())
+                fvc::flux(HbyAs[phasei])
               + phiCorrCoeff
                *fvc::interpolate
                 (
@@ -209,7 +209,7 @@ while (pimple.correct())
                 )
                *(
                    MRF.absolute(phase.phi().oldTime())
-                 - (fvc::interpolate(phase.U().oldTime()) & mesh.Sf())
+                 - fvc::flux(phase.U().oldTime())
                 )/runTime.deltaT()
               - phigFs[phasei]
             )
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
index 104bc0047f..ba312ab248 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
@@ -65,18 +65,10 @@ tmp<surfaceScalarField> phiF2;
     surfaceScalarField snGradAlpha1(fvc::snGrad(alpha1)*mesh.magSf());
 
     // Phase-1 dispersion, lift and wall-lubrication flux
-    phiF1 =
-    (
-        DbyA1()*snGradAlpha1
-      + (fvc::interpolate(rAU1*F) & mesh.Sf())
-    );
+    phiF1 = DbyA1()*snGradAlpha1 + fvc::flux(rAU1*F);
 
     // Phase-2 dispersion, lift and wall-lubrication flux
-    phiF2 =
-    (
-      - DbyA2()*snGradAlpha1
-      - (fvc::interpolate(rAU2*F) & mesh.Sf())
-    );
+    phiF2 = - DbyA2()*snGradAlpha1 - fvc::flux(rAU2*F);
 
     // Cache the phase diffusivities for implicit treatment in the
     // phase-fraction equation
@@ -175,11 +167,11 @@ while (pimple.correct())
     surfaceScalarField phiHbyA1
     (
         IOobject::groupName("phiHbyA", phase1.name()),
-        (fvc::interpolate(HbyA1) & mesh.Sf())
+        fvc::flux(HbyA1)
       + phiCorrCoeff1*fvc::interpolate(alpha1.oldTime()*rho1.oldTime()*rAU1)
        *(
             MRF.absolute(phi1.oldTime())
-          - (fvc::interpolate(U1.oldTime()) & mesh.Sf())
+          - fvc::flux(U1.oldTime())
         )/runTime.deltaT()
       - phiF1()
       - phig1
@@ -189,11 +181,11 @@ while (pimple.correct())
     surfaceScalarField phiHbyA2
     (
         IOobject::groupName("phiHbyA", phase2.name()),
-        (fvc::interpolate(HbyA2) & mesh.Sf())
+        fvc::flux(HbyA2)
       + phiCorrCoeff2*fvc::interpolate(alpha2.oldTime()*rho2.oldTime()*rAU2)
        *(
             MRF.absolute(phi2.oldTime())
-          - (fvc::interpolate(U2.oldTime()) & mesh.Sf())
+          - fvc::flux(U2.oldTime())
         )/runTime.deltaT()
       - phiF2()
       - phig2
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
index d618226411..444f2de81f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
@@ -157,7 +157,7 @@ while (pimple.correct())
        *(
             (alphaRhof10 + Vmf)
            *MRF.absolute(phi1.oldTime())/runTime.deltaT()
-          + (fvc::interpolate(U1Eqn.H()) & mesh.Sf())
+          + fvc::flux(U1Eqn.H())
           + Vmf*ddtPhi2
           + Kdf*MRF.absolute(phi2)
           - Ff1()
@@ -175,7 +175,7 @@ while (pimple.correct())
        *(
             (alphaRhof20 + Vmf)
            *MRF.absolute(phi2.oldTime())/runTime.deltaT()
-          + (fvc::interpolate(U2Eqn.H()) & mesh.Sf())
+          + fvc::flux(U2Eqn.H())
           + Vmf*ddtPhi1
           + Kdf*MRF.absolute(phi1)
           - Ff2()
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
index 870034570a..d801fb8fa5 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
@@ -5,7 +5,7 @@
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
+        fvc::flux(HbyA)
       + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
     );
     adjustPhi(phiHbyA, U, p_rgh);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C
index 79e52a2856..7c0bf86c94 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,7 @@ License
 #include "liftModel.H"
 #include "phasePair.H"
 #include "fvcCurl.H"
+#include "fvcFlux.H"
 #include "surfaceInterpolate.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -78,11 +79,7 @@ Foam::tmp<Foam::volVectorField> Foam::liftModel::F() const
 
 Foam::tmp<Foam::surfaceScalarField> Foam::liftModel::Ff() const
 {
-    const fvMesh& mesh(this->pair_.phase1().mesh());
-
-    return
-        fvc::interpolate(pair_.dispersed())
-       *(fvc::interpolate(Fi()) & mesh.Sf());
+    return fvc::interpolate(pair_.dispersed())*fvc::flux(Fi());
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
index 2f3cb1aaa0..d148d2cefd 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 
 #include "wallLubricationModel.H"
 #include "phasePair.H"
+#include "fvcFlux.H"
 #include "surfaceInterpolate.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -67,11 +68,7 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModel::F() const
 
 Foam::tmp<Foam::surfaceScalarField> Foam::wallLubricationModel::Ff() const
 {
-    const fvMesh& mesh(this->pair_.phase1().mesh());
-
-    return
-        fvc::interpolate(pair_.dispersed())
-       *(fvc::interpolate(Fi()) & mesh.Sf());
+    return fvc::interpolate(pair_.dispersed())*fvc::flux(Fi());
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H
index c2621ae66a..b418877743 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H
@@ -70,18 +70,10 @@ tmp<surfaceScalarField> phiF2;
     surfaceScalarField snGradAlpha1(fvc::snGrad(alpha1)*mesh.magSf());
 
     // Phase-1 dispersion, lift and wall-lubrication flux
-    phiF1 =
-    (
-        Df1*snGradAlpha1
-      + (fvc::interpolate(rAU1*F) & mesh.Sf())
-    );
+    phiF1 = Df1*snGradAlpha1 + fvc::flux(rAU1*F);
 
     // Phase-1 dispersion, lift and wall-lubrication flux
-    phiF2 =
-    (
-      - Df2*snGradAlpha1
-      - (fvc::interpolate(rAU2*F) & mesh.Sf())
-    );
+    phiF2 = - Df2*snGradAlpha1 - fvc::flux(rAU2*F);
 }
 
 
@@ -172,11 +164,11 @@ while (pimple.correct())
     surfaceScalarField phiHbyA1
     (
         IOobject::groupName("phiHbyA", phase1.name()),
-        (fvc::interpolate(HbyA1) & mesh.Sf())
+        fvc::flux(HbyA1)
       + phiCorrCoeff1*fvc::interpolate(alpha1.oldTime()*rho1.oldTime()*rAU1)
        *(
             MRF.absolute(phi1.oldTime())
-          - (fvc::interpolate(U1.oldTime()) & mesh.Sf())
+          - fvc::flux(U1.oldTime())
         )/runTime.deltaT()
       - phiF1()
       - phig1
@@ -186,11 +178,11 @@ while (pimple.correct())
     surfaceScalarField phiHbyA2
     (
         IOobject::groupName("phiHbyA", phase2.name()),
-        (fvc::interpolate(HbyA2) & mesh.Sf())
+        fvc::flux(HbyA2)
       + phiCorrCoeff2*fvc::interpolate(alpha2.oldTime()*rho2.oldTime()*rAU2)
        *(
             MRF.absolute(phi2.oldTime())
-          - (fvc::interpolate(U2.oldTime()) & mesh.Sf())
+          - fvc::flux(U2.oldTime())
         )/runTime.deltaT()
       - phiF2()
       - phig2
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
index 63321bab7d..6855b6fb96 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
@@ -156,7 +156,7 @@ while (pimple.correct())
        *(
             (alphaRhof10 + Vmf)
            *MRF.absolute(phi1.oldTime())/runTime.deltaT()
-          + (fvc::interpolate(U1Eqn.H()) & mesh.Sf())
+          + fvc::flux(U1Eqn.H())
           + Vmf*ddtPhi2
           + Kdf*MRF.absolute(phi2)
           - Ff1()
@@ -174,7 +174,7 @@ while (pimple.correct())
        *(
             (alphaRhof20 + Vmf)
            *MRF.absolute(phi2.oldTime())/runTime.deltaT()
-          + (fvc::interpolate(U2Eqn.H()) & mesh.Sf())
+          + fvc::flux(U2Eqn.H())
           + Vmf*ddtPhi1
           + Kdf*MRF.absolute(phi1)
           - Ff2()
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
index b0b5a591b3..a553a01b5e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,7 @@ License
 #include "fixedValueFvPatchFields.H"
 #include "slipFvPatchFields.H"
 #include "partialSlipFvPatchFields.H"
+#include "fvcFlux.H"
 #include "surfaceInterpolate.H"
 
 
@@ -175,7 +176,7 @@ Foam::phaseModel::phaseModel
                     IOobject::NO_READ,
                     IOobject::AUTO_WRITE
                 ),
-                fvc::interpolate(U_) & fluid_.mesh().Sf(),
+                fvc::flux(U_),
                 phiTypes
             )
         );
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 97295969b9..87996b789d 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -390,6 +390,7 @@ laplacianSchemes = finiteVolume/laplacianSchemes
 $(laplacianSchemes)/laplacianScheme/laplacianSchemes.C
 $(laplacianSchemes)/gaussLaplacianScheme/gaussLaplacianSchemes.C
 
+finiteVolume/fvc/fvcFlux.C
 finiteVolume/fvc/fvcMeshPhi.C
 finiteVolume/fvc/fvcSmooth/fvcSmooth.C
 finiteVolume/fvc/fvcReconstructMag.C
diff --git a/src/finiteVolume/cfdTools/incompressible/createPhi.H b/src/finiteVolume/cfdTools/incompressible/createPhi.H
index c0c5842319..f2d8b4f9fb 100644
--- a/src/finiteVolume/cfdTools/incompressible/createPhi.H
+++ b/src/finiteVolume/cfdTools/incompressible/createPhi.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ surfaceScalarField phi
         IOobject::READ_IF_PRESENT,
         IOobject::AUTO_WRITE
     ),
-    linearInterpolate(U) & mesh.Sf()
+    fvc::flux(U)
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/cfdTools/incompressible/createPhiv.H b/src/finiteVolume/cfdTools/incompressible/createPhiv.H
index 6a723b29fe..97189c353f 100644
--- a/src/finiteVolume/cfdTools/incompressible/createPhiv.H
+++ b/src/finiteVolume/cfdTools/incompressible/createPhiv.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ surfaceScalarField phiv
         IOobject::READ_IF_PRESENT,
         IOobject::AUTO_WRITE
     ),
-    linearInterpolate(U) & mesh.Sf()
+    flux(U)
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index aabc1320f3..4165b62191 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -600,9 +600,10 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
 {
     const surfaceScalarField rDeltaT(fvc::interpolate(CorDeltaT()));
 
+    fluxFieldType phiUf0(mesh().Sf() & Uf.oldTime());
     fluxFieldType phiCorr
     (
-        mesh().Sf() & (Uf.oldTime() - fvc::interpolate(U.oldTime()))
+        phiUf0 - fvc::dotInterpolate(mesh().Sf(), U.oldTime())
     );
 
     return tmp<fluxFieldType>
@@ -615,12 +616,7 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
                 mesh().time().timeName(),
                 mesh()
             ),
-            this->fvcDdtPhiCoeff
-            (
-                U.oldTime(),
-                (mesh().Sf() & Uf.oldTime()),
-                phiCorr
-            )
+            this->fvcDdtPhiCoeff(U.oldTime(), phiUf0, phiCorr)
            *rDeltaT*phiCorr
         )
     );
@@ -639,7 +635,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
 
     fluxFieldType phiCorr
     (
-        phi.oldTime() - (mesh().Sf() & fvc::interpolate(U.oldTime()))
+        phi.oldTime() - fvc::dotInterpolate(mesh().Sf(), U.oldTime())
     );
 
     return tmp<fluxFieldType>
@@ -681,10 +677,8 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
             rho.oldTime()*U.oldTime()
         );
 
-        fluxFieldType phiCorr
-        (
-            mesh().Sf() & (Uf.oldTime() - fvc::interpolate(rhoU0))
-        );
+        fluxFieldType phiUf0(mesh().Sf() & Uf.oldTime());
+        fluxFieldType phiCorr(phiUf0 - fvc::dotInterpolate(mesh().Sf(), rhoU0));
 
         return tmp<fluxFieldType>
         (
@@ -697,13 +691,7 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
                     mesh().time().timeName(),
                     mesh()
                 ),
-                this->fvcDdtPhiCoeff
-                (
-                    rhoU0,
-                    mesh().Sf() & Uf.oldTime(),
-                    phiCorr
-                )
-               *rDeltaT*phiCorr
+                this->fvcDdtPhiCoeff(rhoU0, phiUf0, phiCorr)*rDeltaT*phiCorr
             )
         );
     }
@@ -750,7 +738,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
 
         fluxFieldType phiCorr
         (
-            phi.oldTime() - (mesh().Sf() & fvc::interpolate(rhoU0))
+            phi.oldTime() - fvc::dotInterpolate(mesh().Sf(), rhoU0)
         );
 
         return tmp<fluxFieldType>
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 9d4be317ff..67473222f5 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -1227,9 +1227,10 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
             this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
            *(
                 (rDtCoef*phi.oldTime() + offCentre_(dphidt0()))
-              - (
-                    mesh().Sf()
-                  & fvc::interpolate(rDtCoef*U.oldTime() + offCentre_(ddt0()))
+              - fvc::dotInterpolate
+                (
+                    mesh().Sf(),
+                    rDtCoef*U.oldTime() + offCentre_(ddt0())
                 )
             )
         )
@@ -1398,9 +1399,10 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
                 this->fvcDdtPhiCoeff(rhoU0, phi.oldTime())
                *(
                     (rDtCoef*phi.oldTime() + offCentre_(dphidt0()))
-                  - (
-                        mesh().Sf()
-                      & fvc::interpolate(rDtCoef*rhoU0 + offCentre_(ddt0()))
+                  - fvc::dotInterpolate
+                    (
+                        mesh().Sf(),
+                        rDtCoef*rhoU0 + offCentre_(ddt0())
                     )
                 )
             )
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index e6c7239f61..5a72c9d932 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -489,9 +489,10 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
 {
     dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
 
+    fluxFieldType phiUf0(mesh().Sf() & Uf.oldTime());
     fluxFieldType phiCorr
     (
-        mesh().Sf() & (Uf.oldTime() - fvc::interpolate(U.oldTime()))
+        phiUf0 - fvc::dotInterpolate(mesh().Sf(), U.oldTime())
     );
 
     return tmp<fluxFieldType>
@@ -504,12 +505,7 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
                 mesh().time().timeName(),
                 mesh()
             ),
-            this->fvcDdtPhiCoeff
-            (
-                U.oldTime(),
-                mesh().Sf() & Uf.oldTime(),
-                phiCorr
-            )
+            this->fvcDdtPhiCoeff(U.oldTime(), phiUf0, phiCorr)
            *rDeltaT*phiCorr
         )
     );
@@ -528,7 +524,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
 
     fluxFieldType phiCorr
     (
-        phi.oldTime() - (mesh().Sf() & fvc::interpolate(U.oldTime()))
+        phi.oldTime() - fvc::dotInterpolate(mesh().Sf(), U.oldTime())
     );
 
     return tmp<fluxFieldType>
@@ -570,10 +566,8 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
             rho.oldTime()*U.oldTime()
         );
 
-        fluxFieldType phiCorr
-        (
-            mesh().Sf() & (Uf.oldTime() - fvc::interpolate(rhoU0))
-        );
+        fluxFieldType phiUf0(mesh().Sf() & Uf.oldTime());
+        fluxFieldType phiCorr(phiUf0 - fvc::dotInterpolate(mesh().Sf(), rhoU0));
 
         return tmp<fluxFieldType>
         (
@@ -586,13 +580,7 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
                     mesh().time().timeName(),
                     mesh()
                 ),
-                this->fvcDdtPhiCoeff
-                (
-                    rhoU0,
-                    mesh().Sf() & Uf.oldTime(),
-                    phiCorr
-                )
-               *rDeltaT*phiCorr
+                this->fvcDdtPhiCoeff(rhoU0, phiUf0, phiCorr)*rDeltaT*phiCorr
             )
         );
     }
@@ -639,7 +627,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
 
         fluxFieldType phiCorr
         (
-            phi.oldTime() - (mesh().Sf() & fvc::interpolate(rhoU0))
+            phi.oldTime() - fvc::dotInterpolate(mesh().Sf(), rhoU0)
         );
 
         return tmp<fluxFieldType>
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index a3b9b841e1..3994877922 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -599,9 +599,10 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
 {
     const surfaceScalarField rDeltaT(fvc::interpolate(SLrDeltaT()));
 
+    fluxFieldType phiUf0(mesh().Sf() & Uf.oldTime());
     fluxFieldType phiCorr
     (
-        mesh().Sf() & (Uf.oldTime() - fvc::interpolate(U.oldTime()))
+        phiUf0 - fvc::dotInterpolate(mesh().Sf(), U.oldTime())
     );
 
     return tmp<fluxFieldType>
@@ -614,12 +615,7 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
                 mesh().time().timeName(),
                 mesh()
             ),
-            this->fvcDdtPhiCoeff
-            (
-                U.oldTime(),
-                (mesh().Sf() & Uf.oldTime()),
-                phiCorr
-            )
+            this->fvcDdtPhiCoeff(U.oldTime(), phiUf0, phiCorr)
            *rDeltaT*phiCorr
         )
     );
@@ -638,7 +634,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
 
     fluxFieldType phiCorr
     (
-        phi.oldTime() - (mesh().Sf() & fvc::interpolate(U.oldTime()))
+        phi.oldTime() - fvc::dotInterpolate(mesh().Sf(), U.oldTime())
     );
 
     return tmp<fluxFieldType>
@@ -680,10 +676,8 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
             rho.oldTime()*U.oldTime()
         );
 
-        fluxFieldType phiCorr
-        (
-            mesh().Sf() & (Uf.oldTime() - fvc::interpolate(rhoU0))
-        );
+        fluxFieldType phiUf0(mesh().Sf() & Uf.oldTime());
+        fluxFieldType phiCorr(phiUf0 - fvc::dotInterpolate(mesh().Sf(), rhoU0));
 
         return tmp<fluxFieldType>
         (
@@ -696,13 +690,7 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
                     mesh().time().timeName(),
                     mesh()
                 ),
-                this->fvcDdtPhiCoeff
-                (
-                    rhoU0,
-                    mesh().Sf() & Uf.oldTime(),
-                    phiCorr
-                )
-               *rDeltaT*phiCorr
+                this->fvcDdtPhiCoeff(rhoU0, phiUf0, phiCorr)*rDeltaT*phiCorr
             )
         );
     }
@@ -749,7 +737,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
 
         fluxFieldType phiCorr
         (
-            phi.oldTime() - (mesh().Sf() & fvc::interpolate(rhoU0))
+            phi.oldTime() - fvc::dotInterpolate(mesh().Sf(), rhoU0)
         );
 
         return tmp<fluxFieldType>
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index e3127a453b..a405a2c3f3 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -748,12 +748,10 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
            *rDeltaT
            *(
                 (coefft0*phi.oldTime() - coefft00*phi.oldTime().oldTime())
-              - (
-                    mesh().Sf()
-                  & fvc::interpolate
-                    (
-                        coefft0*U.oldTime() - coefft00*U.oldTime().oldTime()
-                    )
+              - fvc::dotInterpolate
+                (
+                    mesh().Sf(),
+                    coefft0*U.oldTime() - coefft00*U.oldTime().oldTime()
                 )
             )
         )
@@ -886,9 +884,10 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
                *rDeltaT
                *(
                     (coefft0*phi.oldTime() - coefft00*phi.oldTime().oldTime())
-                  - (
-                        mesh().Sf()
-                      & fvc::interpolate(coefft0*rhoU0 - coefft00*rhoU00)
+                  - fvc::dotInterpolate
+                    (
+                        mesh().Sf(),
+                        coefft0*rhoU0 - coefft00*rhoU00
                     )
                 )
             )
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 62cca7ec3a..cd0e1adc7e 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -183,7 +183,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
     const fluxFieldType& phi
 )
 {
-    return fvcDdtPhiCoeff(U, phi, phi - (mesh().Sf() & fvc::interpolate(U)));
+    return fvcDdtPhiCoeff(U, phi, phi - fvc::dotInterpolate(mesh().Sf(), U));
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
index 2b36031b92..f475ed24f4 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
@@ -288,7 +288,7 @@ tmp<surfaceScalarField> SS<scalar>::fvcDdtUfCorr                               \
     const surfaceScalarField& Uf                                               \
 )                                                                              \
 {                                                                              \
-    NotImplemented;                               \
+    NotImplemented;                                                            \
     return surfaceScalarField::null();                                         \
 }                                                                              \
                                                                                \
@@ -299,7 +299,7 @@ tmp<surfaceScalarField> SS<scalar>::fvcDdtPhiCorr                              \
     const surfaceScalarField& phi                                              \
 )                                                                              \
 {                                                                              \
-    NotImplemented;                              \
+    NotImplemented;                                                            \
     return surfaceScalarField::null();                                         \
 }                                                                              \
                                                                                \
@@ -311,7 +311,7 @@ tmp<surfaceScalarField> SS<scalar>::fvcDdtUfCorr                               \
     const surfaceScalarField& Uf                                               \
 )                                                                              \
 {                                                                              \
-    NotImplemented;                               \
+    NotImplemented;                                                            \
     return surfaceScalarField::null();                                         \
 }                                                                              \
                                                                                \
@@ -323,7 +323,7 @@ tmp<surfaceScalarField> SS<scalar>::fvcDdtPhiCorr                              \
     const surfaceScalarField& phi                                              \
 )                                                                              \
 {                                                                              \
-    NotImplemented;                              \
+    NotImplemented;                                                            \
     return surfaceScalarField::null();                                         \
 }                                                                              \
                                                                                \
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
index 69d707974a..da4c454a50 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@@ -496,9 +496,10 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
 {
     const surfaceScalarField rDeltaT(fvc::interpolate(localRDeltaT()));
 
+    fluxFieldType phiUf0(mesh().Sf() & Uf.oldTime());
     fluxFieldType phiCorr
     (
-        mesh().Sf() & (Uf.oldTime() - fvc::interpolate(U.oldTime()))
+        phiUf0 - fvc::dotInterpolate(mesh().Sf(), U.oldTime())
     );
 
     return tmp<fluxFieldType>
@@ -511,12 +512,7 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
                 mesh().time().timeName(),
                 mesh()
             ),
-            this->fvcDdtPhiCoeff
-            (
-                U.oldTime(),
-                (mesh().Sf() & Uf.oldTime()),
-                phiCorr
-            )
+            this->fvcDdtPhiCoeff(U.oldTime(), phiUf0, phiCorr)
            *rDeltaT*phiCorr
         )
     );
@@ -535,7 +531,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
 
     fluxFieldType phiCorr
     (
-        phi.oldTime() - (mesh().Sf() & fvc::interpolate(U.oldTime()))
+        phi.oldTime() - fvc::dotInterpolate(mesh().Sf(), U.oldTime())
     );
 
     return tmp<fluxFieldType>
@@ -577,10 +573,8 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
             rho.oldTime()*U.oldTime()
         );
 
-        fluxFieldType phiCorr
-        (
-            mesh().Sf() & (Uf.oldTime() - fvc::interpolate(rhoU0))
-        );
+        fluxFieldType phiUf0(mesh().Sf() & Uf.oldTime());
+        fluxFieldType phiCorr(phiUf0 - fvc::dotInterpolate(mesh().Sf(), rhoU0));
 
         return tmp<fluxFieldType>
         (
@@ -593,13 +587,7 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
                     mesh().time().timeName(),
                     mesh()
                 ),
-                this->fvcDdtPhiCoeff
-                (
-                    rhoU0,
-                    mesh().Sf() & Uf.oldTime(),
-                    phiCorr
-                )
-               *rDeltaT*phiCorr
+                this->fvcDdtPhiCoeff(rhoU0, phiUf0, phiCorr)*rDeltaT*phiCorr
             )
         );
     }
@@ -646,7 +634,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
 
         fluxFieldType phiCorr
         (
-            phi.oldTime() - (mesh().Sf() & fvc::interpolate(rhoU0))
+            phi.oldTime() - fvc::dotInterpolate(mesh().Sf(), rhoU0)
         );
 
         return tmp<fluxFieldType>
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcFlux.C b/src/finiteVolume/finiteVolume/fvc/fvcFlux.C
index ab9c346e3f..b1bf586e66 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcFlux.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcFlux.C
@@ -24,167 +24,32 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fvcFlux.H"
-#include "fvMesh.H"
-#include "convectionScheme.H"
+#include "surfaceInterpolate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace fvc
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-flux
+Foam::tmp<Foam::surfaceScalarField> Foam::fvc::flux
 (
-    const surfaceScalarField& phi,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
-    const word& name
+    const volVectorField& vvf
 )
 {
-    return fv::convectionScheme<Type>::New
+    return scheme<vector>
     (
-        vf.mesh(),
-        phi,
-        vf.mesh().divScheme(name)
-    )().flux(phi, vf);
+        vvf.mesh(),
+        "flux(" + vvf.name() + ')'
+    )().dotInterpolate(vvf.mesh().Sf(), vvf);
 }
 
 
-template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-flux
+Foam::tmp<Foam::surfaceScalarField> Foam::fvc::flux
 (
-    const tmp<surfaceScalarField>& tphi,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
-    const word& name
+    const tmp<volVectorField>& tvvf
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
-    (
-        fvc::flux(tphi(), vf, name)
-    );
-    tphi.clear();
+    tmp<surfaceScalarField> Flux(fvc::flux(tvvf()));
+    tvvf.clear();
     return Flux;
 }
 
 
-template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-flux
-(
-    const surfaceScalarField& phi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
-    const word& name
-)
-{
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
-    (
-        fvc::flux(phi, tvf(), name)
-    );
-    tvf.clear();
-    return Flux;
-}
-
-
-template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-flux
-(
-    const tmp<surfaceScalarField>& tphi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
-    const word& name
-)
-{
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
-    (
-        fvc::flux(tphi(), tvf(), name)
-    );
-    tphi.clear();
-    tvf.clear();
-    return Flux;
-}
-
-
-template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-flux
-(
-    const surfaceScalarField& phi,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
-)
-{
-    return fvc::flux
-    (
-        phi, vf, "flux("+phi.name()+','+vf.name()+')'
-    );
-}
-
-
-template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-flux
-(
-    const tmp<surfaceScalarField>& tphi,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
-)
-{
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
-    (
-        fvc::flux(tphi(), vf)
-    );
-    tphi.clear();
-    return Flux;
-}
-
-
-template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-flux
-(
-    const surfaceScalarField& phi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
-)
-{
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
-    (
-        fvc::flux(phi, tvf())
-    );
-    tvf.clear();
-    return Flux;
-}
-
-
-template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-flux
-(
-    const tmp<surfaceScalarField>& tphi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
-)
-{
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
-    (
-        fvc::flux(tphi(), tvf())
-    );
-    tphi.clear();
-    tvf.clear();
-    return Flux;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace fvc
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcFlux.H b/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
index 0e3e3a9fe6..e62dcec0cb 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
@@ -50,6 +50,19 @@ namespace Foam
 
 namespace fvc
 {
+    //- Return the face-flux field obtained from the given volVectorField
+    tmp<surfaceScalarField> flux(const volVectorField& vvf);
+
+    //- Return the face-flux field obtained from the given tmp volVectorField
+    tmp<surfaceScalarField> flux(const tmp<volVectorField>& tvvf);
+
+    template<class Type>
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    (
+        const surfaceScalarField&,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+    );
+
     template<class Type>
     tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
     (
@@ -120,7 +133,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "fvcFlux.C"
+    #include "fvcFluxTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C b/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
new file mode 100644
index 0000000000..ab9c346e3f
--- /dev/null
+++ b/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
@@ -0,0 +1,190 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2016 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 "fvcFlux.H"
+#include "fvMesh.H"
+#include "convectionScheme.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace fvc
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+flux
+(
+    const surfaceScalarField& phi,
+    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const word& name
+)
+{
+    return fv::convectionScheme<Type>::New
+    (
+        vf.mesh(),
+        phi,
+        vf.mesh().divScheme(name)
+    )().flux(phi, vf);
+}
+
+
+template<class Type>
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+flux
+(
+    const tmp<surfaceScalarField>& tphi,
+    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const word& name
+)
+{
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    (
+        fvc::flux(tphi(), vf, name)
+    );
+    tphi.clear();
+    return Flux;
+}
+
+
+template<class Type>
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+flux
+(
+    const surfaceScalarField& phi,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const word& name
+)
+{
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    (
+        fvc::flux(phi, tvf(), name)
+    );
+    tvf.clear();
+    return Flux;
+}
+
+
+template<class Type>
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+flux
+(
+    const tmp<surfaceScalarField>& tphi,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const word& name
+)
+{
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    (
+        fvc::flux(tphi(), tvf(), name)
+    );
+    tphi.clear();
+    tvf.clear();
+    return Flux;
+}
+
+
+template<class Type>
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+flux
+(
+    const surfaceScalarField& phi,
+    const GeometricField<Type, fvPatchField, volMesh>& vf
+)
+{
+    return fvc::flux
+    (
+        phi, vf, "flux("+phi.name()+','+vf.name()+')'
+    );
+}
+
+
+template<class Type>
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+flux
+(
+    const tmp<surfaceScalarField>& tphi,
+    const GeometricField<Type, fvPatchField, volMesh>& vf
+)
+{
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    (
+        fvc::flux(tphi(), vf)
+    );
+    tphi.clear();
+    return Flux;
+}
+
+
+template<class Type>
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+flux
+(
+    const surfaceScalarField& phi,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+)
+{
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    (
+        fvc::flux(phi, tvf())
+    );
+    tvf.clear();
+    return Flux;
+}
+
+
+template<class Type>
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+flux
+(
+    const tmp<surfaceScalarField>& tphi,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+)
+{
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    (
+        fvc::flux(tphi(), tvf())
+    );
+    tphi.clear();
+    tvf.clear();
+    return Flux;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fvc
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
index f7707e0db7..c7c38d79e8 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
@@ -26,6 +26,7 @@ License
 #include "fvcMeshPhi.H"
 #include "fvMesh.H"
 #include "ddtScheme.H"
+#include "surfaceInterpolate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
index fd9df516e8..937a359d85 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
@@ -121,7 +121,7 @@ gaussLaplacianScheme<Type, GType>::gammaSnGradCorr
         tgammaSnGradCorr.ref().replace
         (
             cmpt,
-            SfGammaCorr & fvc::interpolate(fvc::grad(vf.component(cmpt)))
+            fvc::dotInterpolate(SfGammaCorr, fvc::grad(vf.component(cmpt)))
         );
     }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
index cb23171ea6..6a2af46f66 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
@@ -308,4 +308,66 @@ Foam::fvc::interpolate
 }
 
 
+template<class Type>
+Foam::tmp
+<
+    Foam::GeometricField
+    <
+        typename Foam::innerProduct<Foam::vector, Type>::type,
+        Foam::fvsPatchField,
+        Foam::surfaceMesh
+    >
+>
+Foam::fvc::dotInterpolate
+(
+    const surfaceVectorField& Sf,
+    const GeometricField<Type, fvPatchField, volMesh>& vf
+)
+{
+    if (surfaceInterpolation::debug)
+    {
+        InfoInFunction
+            << "interpolating GeometricField<Type, fvPatchField, volMesh> "
+            << vf.name() << " using run-time selected scheme"
+            << endl;
+    }
+
+    return scheme<Type>
+    (
+        vf.mesh(),
+        "dotInterpolate(" + Sf.name() + ',' + vf.name() + ')'
+    )().dotInterpolate(Sf, vf);
+}
+
+
+template<class Type>
+Foam::tmp
+<
+    Foam::GeometricField
+    <
+        typename Foam::innerProduct<Foam::vector, Type>::type,
+        Foam::fvsPatchField,
+        Foam::surfaceMesh
+    >
+>
+Foam::fvc::dotInterpolate
+(
+    const surfaceVectorField& Sf,
+    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+)
+{
+    tmp
+    <
+        GeometricField
+        <
+            typename Foam::innerProduct<Foam::vector, Type>::type,
+            fvsPatchField,
+            surfaceMesh
+        >
+    > tsf = dotInterpolate(Sf, tvf());
+    tvf.clear();
+    return tsf;
+}
+
+
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
index 389e72018a..185284d21e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
@@ -157,6 +157,13 @@ namespace fvc
     );
 
 
+    //- Interpolate field onto faces using 'interpolate(\<name\>)'
+    template<class Type>
+    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
+    (
+        const GeometricField<Type, fvPatchField, volMesh>& tvf
+    );
+
     //- Interpolate tmp field onto faces using 'interpolate(\<name\>)'
     template<class Type>
     static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
@@ -164,12 +171,6 @@ namespace fvc
         const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
     );
 
-    //- Interpolate field onto faces using 'interpolate(\<name\>)'
-    template<class Type>
-    static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
-    (
-        const GeometricField<Type, fvPatchField, volMesh>& tvf
-    );
 
     //- Interpolate boundary field onto faces (simply a type conversion)
     template<class Type>
@@ -190,6 +191,43 @@ namespace fvc
     {
         return one();
     }
+
+
+    //- Interpolate field onto faces
+    //  and 'dot' with given surfaceVectorField Sf
+    template<class Type>
+    static
+    tmp
+    <
+        GeometricField
+        <
+            typename innerProduct<vector, Type>::type,
+            fvsPatchField,
+            surfaceMesh
+            >
+    > dotInterpolate
+    (
+        const surfaceVectorField& Sf,
+        const GeometricField<Type, fvPatchField, volMesh>& tvf
+    );
+
+    //- Interpolate tmp field onto faces
+    //  and 'dot' with given surfaceVectorField Sf
+    template<class Type>
+    static
+    tmp
+    <
+        GeometricField
+        <
+            typename innerProduct<vector, Type>::type,
+            fvsPatchField,
+            surfaceMesh
+            >
+    > dotInterpolate
+    (
+        const surfaceVectorField& Sf,
+        const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    );
 }
 
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
index ba28c423c9..1d4d885be4 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
@@ -140,9 +140,10 @@ void Foam::displacementSBRStressFvMotionSolver::solve()
         (
             Df
            *(
+               fvc::dotInterpolate
                (
-                   cellDisplacement_.mesh().Sf()
-                 & fvc::interpolate(gradCd.T() - gradCd)
+                   cellDisplacement_.mesh().Sf(),
+                   gradCd.T() - gradCd
                )
 
                // Solid-body rotation "lambda" term
@@ -162,9 +163,10 @@ void Foam::displacementSBRStressFvMotionSolver::solve()
         (
             Df
            *(
+               fvc::dotInterpolate
                (
-                   cellDisplacement_.mesh().Sf()
-                 & fvc::interpolate(gradCd + gradCd.T())
+                   cellDisplacement_.mesh().Sf(),
+                   gradCd + gradCd.T()
                )
 
                // Solid-body rotation "lambda" term
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 529b95f964..ae5357b185 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -30,6 +30,7 @@ License
 #include "fvcSnGrad.H"
 #include "fvcReconstruct.H"
 #include "fvcVolumeIntegrate.H"
+#include "fvcFlux.H"
 #include "addToRunTimeSelectionTable.H"
 #include "mappedWallPolyPatch.H"
 #include "mapDistribute.H"
@@ -325,7 +326,7 @@ tmp<Foam::fvVectorMatrix> kinematicSingleLayer::solveMomentum
                       + fvc::snGrad(pp, "snGrad(p)")*fvc::interpolate(delta_)
                       + fvc::snGrad(delta_)*fvc::interpolate(pp)
                     )
-                  - (fvc::interpolate(rho_*gTan()) & regionMesh().Sf())
+                  - fvc::flux(rho_*gTan())
                 )
             )
         );
@@ -365,15 +366,14 @@ void kinematicSingleLayer::solveThickness
             fvc::snGrad(pu, "snGrad(p)")
           + fvc::snGrad(pp, "snGrad(p)")*fvc::interpolate(delta_)
         )
-      - (fvc::interpolate(rho_*gTan()) & regionMesh().Sf())
+      - fvc::flux(rho_*gTan())
     );
     constrainFilmField(phiAdd, 0.0);
 
     surfaceScalarField phid
     (
         "phid",
-        (fvc::interpolate(U_*rho_) & regionMesh().Sf())
-      - deltarUAf*phiAdd*rhof
+        fvc::flux(U_*rho_) - deltarUAf*phiAdd*rhof
     );
     constrainFilmField(phid, 0.0);
 
@@ -807,7 +807,7 @@ kinematicSingleLayer::kinematicSingleLayer
                 IOobject::AUTO_WRITE,
                 false
             ),
-            fvc::interpolate(deltaRho_*U_) & regionMesh().Sf()
+            fvc::flux(deltaRho_*U_)
         );
 
         phi_ == phi0;
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 4ffc27c8d9..e1c65f2ad3 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -26,6 +26,7 @@ License
 #include "thermoSingleLayer.H"
 #include "fvcDiv.H"
 #include "fvcLaplacian.H"
+#include "fvcFlux.H"
 #include "fvm.H"
 #include "addToRunTimeSelectionTable.H"
 #include "zeroGradientFvPatchFields.H"
@@ -556,7 +557,7 @@ thermoSingleLayer::thermoSingleLayer
                 IOobject::AUTO_WRITE,
                 false
             ),
-            fvc::interpolate(deltaRho_*U_) & regionMesh().Sf()
+            fvc::flux(deltaRho_*U_)
         );
 
         phi_ == phi0;
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
index 309cee03eb..12c112d4e0 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
@@ -37,7 +37,7 @@ laplacianSchemes
 
 interpolationSchemes
 {
-    default         none;
+    default         linear;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
index 309cee03eb..12c112d4e0 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
@@ -37,7 +37,7 @@ laplacianSchemes
 
 interpolationSchemes
 {
-    default         none;
+    default         linear;
 }
 
 // ************************************************************************* //

From 9b7521ae0a49117269afae0611ed8c454aed5d3d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 7 Apr 2016 21:05:26 +0100
Subject: [PATCH 379/447] List: Remove the inherited UList::shallowCopy to
 avoid accidental misuse

---
 src/OpenFOAM/containers/Lists/List/List.H                    | 5 +++++
 .../SlicedGeometricField/SlicedGeometricField.C              | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 9b28f5461f..a4f342cc4a 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -208,6 +208,11 @@ public:
             //- Return subscript-checked element of UList.
             inline T& newElmt(const label);
 
+
+        //- Disallow implicit shallowCopy
+        void shallowCopy(const UList<T>&) = delete;
+
+
     // Member operators
 
         //- Assignment from UList operator. Takes linear time.
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
index d49c8b46f8..601e1041c0 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@@ -158,7 +158,7 @@ slicedBoundaryField
                     DimensionedField<Type, GeoMesh>::null()
                 )
             );
-            bf[patchi].shallowCopy(bField[patchi]);
+            bf[patchi].UList<Type>::shallowCopy(bField[patchi]);
         }
     }
 

From 0c7ce8938b817db02c824d483d557f895bbf9787 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 7 Apr 2016 21:47:08 +0100
Subject: [PATCH 380/447] rigidBodyDynamics: Added dictionary-based IO of the
 rigidBodyModel

---
 .../test/rigidBodyDynamics/pendulum/pendulum  |  38 ++++++
 .../rigidBodyDynamics/pendulum/pendulum.C     |  16 ++-
 .../spatialTransform/spatialTransformI.H      |   2 +-
 src/rigidBodyDynamics/Make/files              |   1 +
 .../bodies/compositeBody/compositeBody.C      |  48 +++++++
 .../bodies/compositeBody/compositeBody.H      | 103 +++++++++++++++
 .../bodies/compositeBody/compositeBodyI.H     |  46 +++++++
 .../bodies/masslessBody/masslessBody.C        |  19 +++
 .../bodies/masslessBody/masslessBody.H        |  11 ++
 .../bodies/masslessBody/masslessBodyI.H       |  11 ++
 .../bodies/rigidBody/rigidBody.C              |  47 ++++++-
 .../bodies/rigidBody/rigidBody.H              |  32 +++++
 .../bodies/rigidBody/rigidBodyI.H             |  13 +-
 src/rigidBodyDynamics/bodies/sphere/sphere.C  |  19 +++
 src/rigidBodyDynamics/bodies/sphere/sphere.H  |  11 ++
 src/rigidBodyDynamics/bodies/sphere/sphereI.H |  21 +++
 .../bodies/subBody/subBody.C                  |   2 +-
 .../bodies/subBody/subBody.H                  |   2 +-
 .../bodies/subBody/subBodyI.H                 |   2 +-
 src/rigidBodyDynamics/joints/Pa/Pa.C          |   8 +-
 src/rigidBodyDynamics/joints/Pa/Pa.H          |   4 +-
 src/rigidBodyDynamics/joints/Px/Px.C          |   8 +-
 src/rigidBodyDynamics/joints/Px/Px.H          |   4 +-
 src/rigidBodyDynamics/joints/Pxyz/Pxyz.C      |  12 +-
 src/rigidBodyDynamics/joints/Pxyz/Pxyz.H      |   4 +-
 src/rigidBodyDynamics/joints/Py/Py.C          |   8 +-
 src/rigidBodyDynamics/joints/Py/Py.H          |   4 +-
 src/rigidBodyDynamics/joints/Pz/Pz.C          |   8 +-
 src/rigidBodyDynamics/joints/Pz/Pz.H          |   4 +-
 src/rigidBodyDynamics/joints/Ra/Ra.C          |   8 +-
 src/rigidBodyDynamics/joints/Ra/Ra.H          |   4 +-
 src/rigidBodyDynamics/joints/Rs/Rs.C          |   8 +-
 src/rigidBodyDynamics/joints/Rs/Rs.H          |   4 +-
 src/rigidBodyDynamics/joints/Rx/Rx.C          |   8 +-
 src/rigidBodyDynamics/joints/Rx/Rx.H          |   4 +-
 src/rigidBodyDynamics/joints/Rxyz/Rxyz.C      |  12 +-
 src/rigidBodyDynamics/joints/Rxyz/Rxyz.H      |   4 +-
 src/rigidBodyDynamics/joints/Ry/Ry.C          |   8 +-
 src/rigidBodyDynamics/joints/Ry/Ry.H          |   4 +-
 src/rigidBodyDynamics/joints/Ryxz/Ryxz.C      |  12 +-
 src/rigidBodyDynamics/joints/Ryxz/Ryxz.H      |   4 +-
 src/rigidBodyDynamics/joints/Rz/Rz.C          |   8 +-
 src/rigidBodyDynamics/joints/Rz/Rz.H          |   4 +-
 src/rigidBodyDynamics/joints/Rzyx/Rzyx.C      |  12 +-
 src/rigidBodyDynamics/joints/Rzyx/Rzyx.H      |   4 +-
 src/rigidBodyDynamics/joints/joint/joint.C    |  35 ++++-
 src/rigidBodyDynamics/joints/joint/joint.H    |  22 +---
 src/rigidBodyDynamics/joints/joint/jointI.H   |   2 +-
 .../joints/nullJoint/nullJoint.C              |  12 +-
 .../joints/nullJoint/nullJoint.H              |   4 +-
 .../rigidBodyInertia/rigidBodyInertia.H       |   3 +
 .../rigidBodyInertia/rigidBodyInertiaI.H      |   9 ++
 .../rigidBodyModel/rigidBodyModel.C           | 120 +++++++++++++++++-
 .../rigidBodyModel/rigidBodyModel.H           |  21 ++-
 54 files changed, 700 insertions(+), 144 deletions(-)
 create mode 100644 applications/test/rigidBodyDynamics/pendulum/pendulum
 create mode 100644 src/rigidBodyDynamics/bodies/compositeBody/compositeBody.C
 create mode 100644 src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H
 create mode 100644 src/rigidBodyDynamics/bodies/compositeBody/compositeBodyI.H

diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum b/applications/test/rigidBodyDynamics/pendulum/pendulum
new file mode 100644
index 0000000000..4a8378b9f2
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum
@@ -0,0 +1,38 @@
+bodies0
+{
+    pendulum
+    {
+        type            rigidBody;
+        parent          root;
+        mass            1;
+        centreOfMass    (0 -1 0);
+        inertia         (0.001 0 0 0.001 0 0.001);
+        transform       (1 0 0 0 1 0 0 0 1) (0 0 0);
+        joint
+        {
+            type            Rz;
+        }
+    }
+}
+
+bodies
+{
+    hinge
+    {
+        type            masslessBody;
+        parent          root;
+        transform       (1 0 0 0 1 0 0 0 1) (0 0 0);
+        joint
+        {
+            type            Rz;
+        }
+    }
+    weight
+    {
+        type            sphere;
+        mergeWith       hinge;
+        mass            1;
+        radius          0.05;
+        transform       (1 0 0 0 1 0 0 0 1) (0 -1 0);
+    }
+}
diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum.C b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
index 8a15aec82d..2401ec256c 100644
--- a/applications/test/rigidBodyDynamics/pendulum/pendulum.C
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
@@ -34,6 +34,7 @@ Description
 #include "masslessBody.H"
 #include "sphere.H"
 #include "joints.H"
+#include "IFstream.H"
 
 using namespace Foam;
 using namespace RBD;
@@ -42,7 +43,8 @@ using namespace RBD;
 
 int main(int argc, char *argv[])
 {
-    bool testMerge = false;
+    /*
+    bool testMerge = true;
 
     // Create a model for the pendulum
     rigidBodyModel pendulum;
@@ -55,7 +57,7 @@ int main(int argc, char *argv[])
         (
             pendulum.bodyID("root"),
             Xt(Zero),
-            joint::New(new joints::Rz(pendulum)),
+            joint::New(new joints::Rz()),
             autoPtr<rigidBody>(new masslessBody("hinge"))
         );
 
@@ -72,10 +74,16 @@ int main(int argc, char *argv[])
         (
             pendulum.bodyID("root"),
             Xt(Zero),
-            joint::New(new joints::Rz(pendulum)),
+            joint::New(new joints::Rz()),
             rigidBody::New("pendulum", 1, vector(0, -1, 0), 1e-3*I)
         );
     }
+    */
+
+    // Create the pendulum model from dictionary
+    rigidBodyModel pendulum(dictionary(IFstream("pendulum")()));
+
+    pendulum.write(Info);
 
     // Create the joint-space state fields
     scalarField q(pendulum.nDoF(), Zero);
@@ -110,7 +118,7 @@ int main(int argc, char *argv[])
 
         qdot += 0.5*deltaT*qddot;
 
-        Info<< "Time << " << t << "s, angle = " << q[0] << "rad" << endl;
+        Info<< "Time " << t << "s, angle = " << q[0] << "rad" << endl;
     }
 
     Info<< "\nEnd\n" << endl;
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
index 8c2724aa33..c245fde390 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
@@ -217,7 +217,7 @@ inline Foam::Ostream& Foam::operator<<
     const spatialTransform& X
 )
 {
-    os << X.E() << token::SPACE << X.r() << endl;
+    os << X.E() << token::SPACE << X.r();
     return os;
 }
 
diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index c2c03b7172..7fc99c209a 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -1,5 +1,6 @@
 bodies/rigidBody/rigidBody.C
 bodies/masslessBody/masslessBody.C
+bodies/compositeBody/compositeBody.C
 bodies/subBody/subBody.C
 bodies/sphere/sphere.C
 
diff --git a/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.C b/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.C
new file mode 100644
index 0000000000..f898386c1a
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.C
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "compositeBody.H"
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::compositeBody::~compositeBody()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+const Foam::word& Foam::RBD::compositeBody::type() const
+{
+    return body_->type();
+}
+
+
+void Foam::RBD::compositeBody::write(Ostream& os) const
+{
+    body_->write(os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H b/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H
new file mode 100644
index 0000000000..c92d9bda31
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::compositeBody
+
+Description
+    This specialized rigidBody holds the original body after it has been merged
+    into a parent.
+
+SourceFiles
+    compositeBodyI.H
+    compositeBody.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_compositeBody_H
+#define RBD_compositeBody_H
+
+#include "rigidBody.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class compositeBody Declaration
+\*---------------------------------------------------------------------------*/
+
+class compositeBody
+:
+    public rigidBody
+{
+    // Private data
+
+        //- Original body from which this composite-body was constructed
+        autoPtr<rigidBody> body_;
+
+public:
+
+    // Constructors
+
+        //- Construct a merged version of the given rigidBody
+        //  providing the ID of the parent body to which this will be merged
+        //  and the transform relative to the parent
+        inline compositeBody(const autoPtr<rigidBody>& bodyPtr);
+
+
+    //- Destructor
+    virtual ~compositeBody();
+
+
+    // Member Functions
+
+        //- Return the type name of the original body
+        virtual const word& type() const;
+
+        //- Return the original body from which this composite-body
+        //  was constructed
+        inline const rigidBody& body() const;
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "compositeBodyI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/compositeBody/compositeBodyI.H b/src/rigidBodyDynamics/bodies/compositeBody/compositeBodyI.H
new file mode 100644
index 0000000000..dee27aec8c
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/compositeBody/compositeBodyI.H
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::RBD::compositeBody::compositeBody
+(
+    const autoPtr<rigidBody>& bodyPtr
+)
+:
+    rigidBody(bodyPtr()),
+    body_(bodyPtr)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::RBD::rigidBody& Foam::RBD::compositeBody::body() const
+{
+    return body_();
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
index 7e97bd8462..da0f731876 100644
--- a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
@@ -24,6 +24,25 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "masslessBody.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+    defineTypeNameAndDebug(masslessBody, 0);
+
+    addToRunTimeSelectionTable
+    (
+        rigidBody,
+        masslessBody,
+        dictionary
+    );
+}
+}
+
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
index 4c58f97616..d20c160d07 100644
--- a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
@@ -55,6 +55,10 @@ class masslessBody
 
 public:
 
+    //- Runtime type information
+    TypeName("masslessBody");
+
+
     // Constructors
 
         //- Construct a massless body
@@ -63,6 +67,13 @@ public:
         //- Construct a named massless body
         inline masslessBody(const word& name);
 
+        //- Construct from dictionary
+        inline masslessBody
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
 
     //- Destructor
     virtual ~masslessBody();
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBodyI.H b/src/rigidBodyDynamics/bodies/masslessBody/masslessBodyI.H
index 06acc415b6..e8319b4a39 100644
--- a/src/rigidBodyDynamics/bodies/masslessBody/masslessBodyI.H
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBodyI.H
@@ -37,4 +37,15 @@ inline Foam::RBD::masslessBody::masslessBody(const word& name)
 {}
 
 
+inline Foam::RBD::masslessBody::masslessBody
+(
+    const word& name,
+    const dictionary& dict
+)
+:
+    rigidBody(name, rigidBodyInertia())
+{}
+
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
index d71a082b51..7d797f0142 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
@@ -25,6 +25,26 @@ License
 
 #include "rigidBody.H"
 #include "subBody.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+    defineTypeNameAndDebug(rigidBody, 0);
+    defineRunTimeSelectionTable(rigidBody, dictionary);
+
+    addToRunTimeSelectionTable
+    (
+        rigidBody,
+        rigidBody,
+        dictionary
+    );
+}
+}
+
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
@@ -40,6 +60,31 @@ Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::rigidBody::New
 }
 
 
+Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::rigidBody::New
+(
+    const word& name,
+    const dictionary& dict
+)
+{
+    const word bodyType(dict.lookup("type"));
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(bodyType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown rigidBody type "
+            << bodyType << nl << nl
+            << "Valid rigidBody types are : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<rigidBody>(cstrIter()(name, dict));
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::RBD::rigidBody::~rigidBody()
@@ -72,7 +117,7 @@ void Foam::RBD::rigidBody::write(Ostream& os) const
     os.writeKeyword("centreOfMass")
         << c() << token::END_STATEMENT << nl;
 
-    os.writeKeyword("Inertia")
+    os.writeKeyword("inertia")
         << Ic() << token::END_STATEMENT << nl;
 }
 
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
index 9a7aad09e1..9d2b3f279d 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
@@ -35,6 +35,8 @@ SourceFiles
 #define RBD_rigidBody_H
 
 #include "rigidBodyInertia.H"
+#include "dictionary.H"
+#include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,6 +64,22 @@ class rigidBody
 
 public:
 
+    //- Runtime type information
+    TypeName("rigidBody");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            rigidBody,
+            dictionary,
+            (const word& name, const dictionary& dict),
+            (name, dict)
+        );
+
+
     // Constructors
 
         //- Construct from mass, centre of mass and moment of inertia tensor
@@ -81,6 +99,13 @@ public:
             const rigidBodyInertia& rbi
         );
 
+        //- Construct from dictionary
+        inline rigidBody
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
         //- Return clone of this rigidBody
         inline autoPtr<rigidBody> clone() const;
 
@@ -96,6 +121,13 @@ public:
             const symmTensor& Ic
         );
 
+        //- Select constructed from name and dictionary
+        static autoPtr<rigidBody> New
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
 
     //- Destructor
     virtual ~rigidBody();
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H b/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
index 2e68928a45..5b6a66e874 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
@@ -43,12 +43,23 @@ inline Foam::RBD::rigidBody::rigidBody
     const word& name,
     const rigidBodyInertia& rbi
 )
-    :
+:
     rigidBodyInertia(rbi),
     name_(name)
 {}
 
 
+inline Foam::RBD::rigidBody::rigidBody
+(
+    const word& name,
+    const dictionary& dict
+)
+:
+    rigidBodyInertia(dict),
+    name_(name)
+{}
+
+
 inline Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::rigidBody::clone() const
 {
     return autoPtr<rigidBody>(new rigidBody(*this));
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.C b/src/rigidBodyDynamics/bodies/sphere/sphere.C
index 275565ea9d..e581ce8648 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphere.C
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.C
@@ -24,6 +24,25 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "sphere.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+    defineTypeNameAndDebug(sphere, 0);
+
+    addToRunTimeSelectionTable
+    (
+        rigidBody,
+        sphere,
+        dictionary
+    );
+}
+}
+
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.H b/src/rigidBodyDynamics/bodies/sphere/sphere.H
index 72eb9c5788..ad5ca48bab 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphere.H
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.H
@@ -61,11 +61,22 @@ class sphere
 
 public:
 
+    //- Runtime type information
+    TypeName("sphere");
+
+
     // Constructors
 
         //- Construct from name, mass and radius
         inline sphere(const word& name, const scalar m, const scalar r);
 
+        //- Construct from dictionary
+        inline sphere
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
 
     //- Destructor
     virtual ~sphere();
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphereI.H b/src/rigidBodyDynamics/bodies/sphere/sphereI.H
index 9543e16a9d..42f429f1d4 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphereI.H
+++ b/src/rigidBodyDynamics/bodies/sphere/sphereI.H
@@ -37,6 +37,27 @@ inline Foam::RBD::sphere::sphere
 {}
 
 
+inline Foam::RBD::sphere::sphere
+(
+    const word& name,
+    const dictionary& dict
+)
+:
+    rigidBody
+    (
+        name,
+        rigidBodyInertia()
+    ),
+    r_(readScalar(dict.lookup("radius")))
+{
+    const scalar m(readScalar(dict.lookup("mass")));
+    rigidBodyInertia::operator=
+    (
+        rigidBodyInertia(m, Zero, (2.0/5.0)*m*sqr(r_)*I)
+    );
+}
+
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 inline Foam::scalar Foam::RBD::sphere::r() const
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBody.C b/src/rigidBodyDynamics/bodies/subBody/subBody.C
index e8756177c9..1508b8f431 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBody.C
+++ b/src/rigidBodyDynamics/bodies/subBody/subBody.C
@@ -35,7 +35,7 @@ Foam::RBD::subBody::~subBody()
 
 void Foam::RBD::subBody::write(Ostream& os) const
 {
-    os.writeKeyword("parentBody")
+    os.writeKeyword("parent")
         << parentName_ << token::END_STATEMENT << nl;
 
     os.writeKeyword("transform")
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBody.H b/src/rigidBodyDynamics/bodies/subBody/subBody.H
index f47fa2c299..a9163e8e3f 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBody.H
+++ b/src/rigidBodyDynamics/bodies/subBody/subBody.H
@@ -78,7 +78,7 @@ public:
         //  and the transform relative to the parent
         inline subBody
         (
-            autoPtr<rigidBody> bodyPtr,
+            const autoPtr<rigidBody>& bodyPtr,
             const word& parentName,
             const label parentID,
             const spatialTransform& parentXT
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
index 84f705ef4b..b8c2813d42 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
+++ b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
@@ -27,7 +27,7 @@ License
 
 inline Foam::RBD::subBody::subBody
 (
-    autoPtr<rigidBody> bodyPtr,
+    const autoPtr<rigidBody>& bodyPtr,
     const word& parentName,
     const label parentID,
     const spatialTransform& parentXT
diff --git a/src/rigidBodyDynamics/joints/Pa/Pa.C b/src/rigidBodyDynamics/joints/Pa/Pa.C
index 8472269504..2263ce3283 100644
--- a/src/rigidBodyDynamics/joints/Pa/Pa.C
+++ b/src/rigidBodyDynamics/joints/Pa/Pa.C
@@ -50,17 +50,17 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Pa::Pa(const rigidBodyModel& model, const vector& axis)
+Foam::RBD::joints::Pa::Pa(const vector& axis)
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(Zero, axis);
 }
 
 
-Foam::RBD::joints::Pa::Pa(const rigidBodyModel& model, const dictionary& dict)
+Foam::RBD::joints::Pa::Pa(const dictionary& dict)
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(Zero, dict.lookup("axis"));
 }
diff --git a/src/rigidBodyDynamics/joints/Pa/Pa.H b/src/rigidBodyDynamics/joints/Pa/Pa.H
index 99208d1e72..09f7eee753 100644
--- a/src/rigidBodyDynamics/joints/Pa/Pa.H
+++ b/src/rigidBodyDynamics/joints/Pa/Pa.H
@@ -72,10 +72,10 @@ public:
     // Constructors
 
         //- Construct for given model and axis
-        Pa(const rigidBodyModel& model, const vector& axis);
+        Pa(const vector& axis);
 
         //- Construct for given model from dictionary
-        Pa(const rigidBodyModel&, const dictionary& dict);
+        Pa(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Px/Px.C b/src/rigidBodyDynamics/joints/Px/Px.C
index 3edbb7a2a3..412a3df472 100644
--- a/src/rigidBodyDynamics/joints/Px/Px.C
+++ b/src/rigidBodyDynamics/joints/Px/Px.C
@@ -50,17 +50,17 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Px::Px(const rigidBodyModel& model)
+Foam::RBD::joints::Px::Px()
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(0, 0, 0, 1, 0, 0);
 }
 
 
-Foam::RBD::joints::Px::Px(const rigidBodyModel& model, const dictionary& dict)
+Foam::RBD::joints::Px::Px(const dictionary& dict)
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(0, 0, 0, 1, 0, 0);
 }
diff --git a/src/rigidBodyDynamics/joints/Px/Px.H b/src/rigidBodyDynamics/joints/Px/Px.H
index 0bbd6028b8..b7d77f344a 100644
--- a/src/rigidBodyDynamics/joints/Px/Px.H
+++ b/src/rigidBodyDynamics/joints/Px/Px.H
@@ -72,10 +72,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        Px(const rigidBodyModel& model);
+        Px();
 
         //- Construct for given model from dictionary
-        Px(const rigidBodyModel&, const dictionary& dict);
+        Px(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.C b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.C
index 131bcad8c9..fcb5dac7e8 100644
--- a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.C
+++ b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.C
@@ -50,9 +50,9 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Pxyz::Pxyz(const rigidBodyModel& model)
+Foam::RBD::joints::Pxyz::Pxyz()
 :
-    joint(model, 3)
+    joint(3)
 {
     S_[0] = spatialVector(0, 0, 0, 1, 0, 0);
     S_[1] = spatialVector(0, 0, 0, 0, 1, 0);
@@ -60,13 +60,9 @@ Foam::RBD::joints::Pxyz::Pxyz(const rigidBodyModel& model)
 }
 
 
-Foam::RBD::joints::Pxyz::Pxyz
-(
-    const rigidBodyModel& model,
-    const dictionary& dict
-)
+Foam::RBD::joints::Pxyz::Pxyz(const dictionary& dict)
 :
-    joint(model, 3)
+    joint(3)
 {
     S_[0] = spatialVector(0, 0, 0, 1, 0, 0);
     S_[1] = spatialVector(0, 0, 0, 0, 1, 0);
diff --git a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
index b5e87f6f1f..5fbdeb7833 100644
--- a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
+++ b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
@@ -72,10 +72,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        Pxyz(const rigidBodyModel& model);
+        Pxyz();
 
         //- Construct for given model from dictionary
-        Pxyz(const rigidBodyModel&, const dictionary& dict);
+        Pxyz(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Py/Py.C b/src/rigidBodyDynamics/joints/Py/Py.C
index e7e5b147ff..4b297bbcab 100644
--- a/src/rigidBodyDynamics/joints/Py/Py.C
+++ b/src/rigidBodyDynamics/joints/Py/Py.C
@@ -50,17 +50,17 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Py::Py(const rigidBodyModel& model)
+Foam::RBD::joints::Py::Py()
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(0, 0, 0, 0, 1, 0);
 }
 
 
-Foam::RBD::joints::Py::Py(const rigidBodyModel& model, const dictionary& dict)
+Foam::RBD::joints::Py::Py(const dictionary& dict)
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(0, 0, 0, 0, 1, 0);
 }
diff --git a/src/rigidBodyDynamics/joints/Py/Py.H b/src/rigidBodyDynamics/joints/Py/Py.H
index fb2a87601a..981e7154af 100644
--- a/src/rigidBodyDynamics/joints/Py/Py.H
+++ b/src/rigidBodyDynamics/joints/Py/Py.H
@@ -72,10 +72,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        Py(const rigidBodyModel& model);
+        Py();
 
         //- Construct for given model from dictionary
-        Py(const rigidBodyModel&, const dictionary& dict);
+        Py(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Pz/Pz.C b/src/rigidBodyDynamics/joints/Pz/Pz.C
index cbccb6dddd..83850020dd 100644
--- a/src/rigidBodyDynamics/joints/Pz/Pz.C
+++ b/src/rigidBodyDynamics/joints/Pz/Pz.C
@@ -50,17 +50,17 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Pz::Pz(const rigidBodyModel& model)
+Foam::RBD::joints::Pz::Pz()
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(0, 0, 0, 0, 0, 1);
 }
 
 
-Foam::RBD::joints::Pz::Pz(const rigidBodyModel& model, const dictionary& dict)
+Foam::RBD::joints::Pz::Pz(const dictionary& dict)
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(0, 0, 0, 0, 0, 1);
 }
diff --git a/src/rigidBodyDynamics/joints/Pz/Pz.H b/src/rigidBodyDynamics/joints/Pz/Pz.H
index d1a7a4e61f..18783f0d49 100644
--- a/src/rigidBodyDynamics/joints/Pz/Pz.H
+++ b/src/rigidBodyDynamics/joints/Pz/Pz.H
@@ -72,10 +72,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        Pz(const rigidBodyModel& model);
+        Pz();
 
         //- Construct for given model from dictionary
-        Pz(const rigidBodyModel&, const dictionary& dict);
+        Pz(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Ra/Ra.C b/src/rigidBodyDynamics/joints/Ra/Ra.C
index 2230863898..6d9e6aa5fe 100644
--- a/src/rigidBodyDynamics/joints/Ra/Ra.C
+++ b/src/rigidBodyDynamics/joints/Ra/Ra.C
@@ -50,17 +50,17 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Ra::Ra(const rigidBodyModel& model, const vector& axis)
+Foam::RBD::joints::Ra::Ra(const vector& axis)
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(axis, Zero);
 }
 
 
-Foam::RBD::joints::Ra::Ra(const rigidBodyModel& model, const dictionary& dict)
+Foam::RBD::joints::Ra::Ra(const dictionary& dict)
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(dict.lookup("axis"), Zero);
 }
diff --git a/src/rigidBodyDynamics/joints/Ra/Ra.H b/src/rigidBodyDynamics/joints/Ra/Ra.H
index b429678318..d098b2c82e 100644
--- a/src/rigidBodyDynamics/joints/Ra/Ra.H
+++ b/src/rigidBodyDynamics/joints/Ra/Ra.H
@@ -72,10 +72,10 @@ public:
     // Constructors
 
         //- Construct for given model and axis
-        Ra(const rigidBodyModel& model, const vector& axis);
+        Ra(const vector& axis);
 
         //- Construct for given model from dictionary
-        Ra(const rigidBodyModel&, const dictionary& dict);
+        Ra(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Rs/Rs.C b/src/rigidBodyDynamics/joints/Rs/Rs.C
index c5da501f0e..9658b7595e 100644
--- a/src/rigidBodyDynamics/joints/Rs/Rs.C
+++ b/src/rigidBodyDynamics/joints/Rs/Rs.C
@@ -50,9 +50,9 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Rs::Rs(const rigidBodyModel& model)
+Foam::RBD::joints::Rs::Rs()
 :
-    joint(model, 3)
+    joint(3)
 {
     S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
     S_[1] = spatialVector (0, 1, 0, 0, 0, 0);
@@ -60,9 +60,9 @@ Foam::RBD::joints::Rs::Rs(const rigidBodyModel& model)
 }
 
 
-Foam::RBD::joints::Rs::Rs(const rigidBodyModel& model, const dictionary& dict)
+Foam::RBD::joints::Rs::Rs(const dictionary& dict)
 :
-    joint(model, 3)
+    joint(3)
 {
     S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
     S_[1] = spatialVector (0, 1, 0, 0, 0, 0);
diff --git a/src/rigidBodyDynamics/joints/Rs/Rs.H b/src/rigidBodyDynamics/joints/Rs/Rs.H
index 3e1b0655f3..386a869bf6 100644
--- a/src/rigidBodyDynamics/joints/Rs/Rs.H
+++ b/src/rigidBodyDynamics/joints/Rs/Rs.H
@@ -73,10 +73,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        Rs(const rigidBodyModel& model);
+        Rs();
 
         //- Construct for given model from dictionary
-        Rs(const rigidBodyModel&, const dictionary& dict);
+        Rs(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Rx/Rx.C b/src/rigidBodyDynamics/joints/Rx/Rx.C
index c90f6fd976..87343fe55f 100644
--- a/src/rigidBodyDynamics/joints/Rx/Rx.C
+++ b/src/rigidBodyDynamics/joints/Rx/Rx.C
@@ -50,17 +50,17 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Rx::Rx(const rigidBodyModel& model)
+Foam::RBD::joints::Rx::Rx()
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
 }
 
 
-Foam::RBD::joints::Rx::Rx(const rigidBodyModel& model, const dictionary& dict)
+Foam::RBD::joints::Rx::Rx(const dictionary& dict)
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
 }
diff --git a/src/rigidBodyDynamics/joints/Rx/Rx.H b/src/rigidBodyDynamics/joints/Rx/Rx.H
index 79ca52d9f2..3da54830a9 100644
--- a/src/rigidBodyDynamics/joints/Rx/Rx.H
+++ b/src/rigidBodyDynamics/joints/Rx/Rx.H
@@ -72,10 +72,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        Rx(const rigidBodyModel& model);
+        Rx();
 
         //- Construct for given model from dictionary
-        Rx(const rigidBodyModel&, const dictionary& dict);
+        Rx(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.C b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.C
index 8dda6d3e6a..39b3d5f7de 100644
--- a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.C
+++ b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.C
@@ -50,9 +50,9 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Rxyz::Rxyz(const rigidBodyModel& model)
+Foam::RBD::joints::Rxyz::Rxyz()
 :
-    joint(model, 3)
+    joint(3)
 {
     S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
     S_[1] = spatialVector(0, 1, 0, 0, 0, 0);
@@ -60,13 +60,9 @@ Foam::RBD::joints::Rxyz::Rxyz(const rigidBodyModel& model)
 }
 
 
-Foam::RBD::joints::Rxyz::Rxyz
-(
-    const rigidBodyModel& model,
-    const dictionary& dict
-)
+Foam::RBD::joints::Rxyz::Rxyz(const dictionary& dict)
 :
-    joint(model, 3)
+    joint(3)
 {
     S_[0] = spatialVector(1, 0, 0, 0, 0, 0);
     S_[1] = spatialVector(0, 1, 0, 0, 0, 0);
diff --git a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
index 7ada2cc4a5..3a63a4ffbe 100644
--- a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
+++ b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
@@ -73,10 +73,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        Rxyz(const rigidBodyModel& model);
+        Rxyz();
 
         //- Construct for given model from dictionary
-        Rxyz(const rigidBodyModel&, const dictionary& dict);
+        Rxyz(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Ry/Ry.C b/src/rigidBodyDynamics/joints/Ry/Ry.C
index 4814264f1b..d771a7130f 100644
--- a/src/rigidBodyDynamics/joints/Ry/Ry.C
+++ b/src/rigidBodyDynamics/joints/Ry/Ry.C
@@ -50,17 +50,17 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Ry::Ry(const rigidBodyModel& model)
+Foam::RBD::joints::Ry::Ry()
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(0, 1, 0, 0, 0, 0);
 }
 
 
-Foam::RBD::joints::Ry::Ry(const rigidBodyModel& model, const dictionary& dict)
+Foam::RBD::joints::Ry::Ry(const dictionary& dict)
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(0, 1, 0, 0, 0, 0);
 }
diff --git a/src/rigidBodyDynamics/joints/Ry/Ry.H b/src/rigidBodyDynamics/joints/Ry/Ry.H
index 4a88a659a4..4bfa32401f 100644
--- a/src/rigidBodyDynamics/joints/Ry/Ry.H
+++ b/src/rigidBodyDynamics/joints/Ry/Ry.H
@@ -72,10 +72,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        Ry(const rigidBodyModel& model);
+        Ry();
 
         //- Construct for given model from dictionary
-        Ry(const rigidBodyModel&, const dictionary& dict);
+        Ry(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.C b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.C
index a52896299a..2de4088517 100644
--- a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.C
+++ b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.C
@@ -50,9 +50,9 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Ryxz::Ryxz(const rigidBodyModel& model)
+Foam::RBD::joints::Ryxz::Ryxz()
 :
-    joint(model, 3)
+    joint(3)
 {
     S_[0] = spatialVector(0, 1, 0, 0, 0, 0);
     S_[1] = spatialVector(1, 0, 0, 0, 0, 0);
@@ -60,13 +60,9 @@ Foam::RBD::joints::Ryxz::Ryxz(const rigidBodyModel& model)
 }
 
 
-Foam::RBD::joints::Ryxz::Ryxz
-(
-    const rigidBodyModel& model,
-    const dictionary& dict
-)
+Foam::RBD::joints::Ryxz::Ryxz(const dictionary& dict)
 :
-    joint(model, 3)
+    joint(3)
 {
     S_[0] = spatialVector(0, 1, 0, 0, 0, 0);
     S_[1] = spatialVector(1, 0, 0, 0, 0, 0);
diff --git a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
index 604e849b3a..02a7fe4200 100644
--- a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
+++ b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
@@ -73,10 +73,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        Ryxz(const rigidBodyModel& model);
+        Ryxz();
 
         //- Construct for given model from dictionary
-        Ryxz(const rigidBodyModel&, const dictionary& dict);
+        Ryxz(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Rz/Rz.C b/src/rigidBodyDynamics/joints/Rz/Rz.C
index 1465dfc460..9027e2d8c7 100644
--- a/src/rigidBodyDynamics/joints/Rz/Rz.C
+++ b/src/rigidBodyDynamics/joints/Rz/Rz.C
@@ -50,17 +50,17 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Rz::Rz(const rigidBodyModel& model)
+Foam::RBD::joints::Rz::Rz()
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(0, 0, 1, 0, 0, 0);
 }
 
 
-Foam::RBD::joints::Rz::Rz(const rigidBodyModel& model, const dictionary& dict)
+Foam::RBD::joints::Rz::Rz(const dictionary& dict)
 :
-    joint(model, 1)
+    joint(1)
 {
     S_[0] = spatialVector(0, 0, 1, 0, 0, 0);
 }
diff --git a/src/rigidBodyDynamics/joints/Rz/Rz.H b/src/rigidBodyDynamics/joints/Rz/Rz.H
index b14b6408fb..19a7697503 100644
--- a/src/rigidBodyDynamics/joints/Rz/Rz.H
+++ b/src/rigidBodyDynamics/joints/Rz/Rz.H
@@ -72,10 +72,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        Rz(const rigidBodyModel& model);
+        Rz();
 
         //- Construct for given model from dictionary
-        Rz(const rigidBodyModel&, const dictionary& dict);
+        Rz(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.C b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.C
index f55775330f..7b1a8bc1fc 100644
--- a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.C
+++ b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.C
@@ -50,9 +50,9 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::Rzyx::Rzyx(const rigidBodyModel& model)
+Foam::RBD::joints::Rzyx::Rzyx()
 :
-    joint(model, 3)
+    joint(3)
 {
     S_[0] = spatialVector(0, 0, 1, 0, 0, 0);
     S_[1] = spatialVector(0, 1, 0, 0, 0, 0);
@@ -60,13 +60,9 @@ Foam::RBD::joints::Rzyx::Rzyx(const rigidBodyModel& model)
 }
 
 
-Foam::RBD::joints::Rzyx::Rzyx
-(
-    const rigidBodyModel& model,
-    const dictionary& dict
-)
+Foam::RBD::joints::Rzyx::Rzyx(const dictionary& dict)
 :
-    joint(model, 3)
+    joint(3)
 {
     S_[0] = spatialVector(0, 0, 1, 0, 0, 0);
     S_[1] = spatialVector(0, 1, 0, 0, 0, 0);
diff --git a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
index 52c53939f1..344ad4fbc1 100644
--- a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
+++ b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
@@ -73,10 +73,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        Rzyx(const rigidBodyModel& model);
+        Rzyx();
 
         //- Construct for given model from dictionary
-        Rzyx(const rigidBodyModel&, const dictionary& dict);
+        Rzyx(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/joints/joint/joint.C b/src/rigidBodyDynamics/joints/joint/joint.C
index 04f41d65a4..4374990eb5 100644
--- a/src/rigidBodyDynamics/joints/joint/joint.C
+++ b/src/rigidBodyDynamics/joints/joint/joint.C
@@ -49,6 +49,30 @@ Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joint::New(joint* jointPtr)
 }
 
 
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joint::New
+(
+    const dictionary& dict
+)
+{
+    const word bodyType(dict.lookup("type"));
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(bodyType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown joint type "
+            << bodyType << nl << nl
+            << "Valid joint types are : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<joint>(cstrIter()(dict));
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::RBD::joint::~joint()
@@ -57,15 +81,12 @@ Foam::RBD::joint::~joint()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::PtrList<Foam::RBD::joint> Foam::RBD::joint::floating
-(
-    const rigidBodyModel& model
-)
+Foam::PtrList<Foam::RBD::joint> Foam::RBD::joint::floating()
 {
     PtrList<joint> cj(2);
-    cj.set(0, new joints::Pxyz(model));
-    //cj.set(1, new joints::Rs(model));
-    cj.set(1, new joints::Rzyx(model));
+    cj.set(0, new joints::Pxyz());
+    //cj.set(1, new joints::Rs());
+    cj.set(1, new joints::Rzyx());
     return cj;
 }
 
diff --git a/src/rigidBodyDynamics/joints/joint/joint.H b/src/rigidBodyDynamics/joints/joint/joint.H
index 4acfb7da95..58d68190de 100644
--- a/src/rigidBodyDynamics/joints/joint/joint.H
+++ b/src/rigidBodyDynamics/joints/joint/joint.H
@@ -157,20 +157,16 @@ public:
             autoPtr,
             joint,
             dictionary,
-            (
-                const rigidBodyModel& model,
-                const dictionary& dict
-            ),
-            (model, dict)
+            (const dictionary& dict),
+            (dict)
         );
 
 
     // Constructors
 
-        //- Construct joint for given rigidBodyModel
-        //  setting the size of the motion sub-space
+        //- Construct joint setting the size of the motion sub-space
         //  to the given degrees of freedom of the joint
-        inline joint(const rigidBodyModel&, const label nDoF);
+        inline joint(const label nDoF);
 
         //- Clone this joint (needed by PtrList)
         virtual autoPtr<joint> clone() const = 0;
@@ -185,12 +181,8 @@ public:
         //- Simple selector to return an autoPtr<joint> of the given joint*
         static autoPtr<joint> New(joint* jointPtr);
 
-        //- Select constructed from dictionary
-        static autoPtr<joint> New
-        (
-            const rigidBodyModel& model,
-            const dictionary& dict
-        );
+        //- Select from dictionary
+        static autoPtr<joint> New(const dictionary& dict);
 
 
     // Member Functions
@@ -216,7 +208,7 @@ public:
         inline const List<spatialVector>& S() const;
 
         //- Return a list of joints needed to emulate a floating body
-        static PtrList<joint> floating(const rigidBodyModel& model);
+        static PtrList<joint> floating();
 
         //- Update the rigidBodyModel state for the joint given
         //  the joint state q, w and velocity qDot
diff --git a/src/rigidBodyDynamics/joints/joint/jointI.H b/src/rigidBodyDynamics/joints/joint/jointI.H
index f2020c047c..47db466a7d 100644
--- a/src/rigidBodyDynamics/joints/joint/jointI.H
+++ b/src/rigidBodyDynamics/joints/joint/jointI.H
@@ -25,7 +25,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline Foam::RBD::joint::joint(const rigidBodyModel&, const label nDoF)
+inline Foam::RBD::joint::joint(const label nDoF)
 :
     S_(nDoF),
     index_(0),
diff --git a/src/rigidBodyDynamics/joints/nullJoint/nullJoint.C b/src/rigidBodyDynamics/joints/nullJoint/nullJoint.C
index 04cccfb6c2..30b72b1907 100644
--- a/src/rigidBodyDynamics/joints/nullJoint/nullJoint.C
+++ b/src/rigidBodyDynamics/joints/nullJoint/nullJoint.C
@@ -50,19 +50,15 @@ namespace joints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::joints::null::null(const rigidBodyModel& model)
+Foam::RBD::joints::null::null()
 :
-    joint(model, 0)
+    joint(0)
 {}
 
 
-Foam::RBD::joints::null::null
-(
-    const rigidBodyModel& model,
-    const dictionary& dict
-)
+Foam::RBD::joints::null::null(const dictionary& dict)
 :
-    joint(model, 0)
+    joint(0)
 {}
 
 
diff --git a/src/rigidBodyDynamics/joints/nullJoint/nullJoint.H b/src/rigidBodyDynamics/joints/nullJoint/nullJoint.H
index d7fc158d1a..68844d2e5f 100644
--- a/src/rigidBodyDynamics/joints/nullJoint/nullJoint.H
+++ b/src/rigidBodyDynamics/joints/nullJoint/nullJoint.H
@@ -72,10 +72,10 @@ public:
     // Constructors
 
         //- Construct for given model
-        null(const rigidBodyModel& model);
+        null();
 
         //- Construct for given model from dictionary
-        null(const rigidBodyModel&, const dictionary& dict);
+        null(const dictionary& dict);
 
         //- Clone this joint
         virtual autoPtr<joint> clone() const;
diff --git a/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H
index b5f1233837..44cc221c14 100644
--- a/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H
+++ b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H
@@ -111,6 +111,9 @@ public:
             const symmTensor& Ic
         );
 
+        //- Construct from dictionary
+        inline rigidBodyInertia(const dictionary& dict);
+
         //- Construct from the components of a spatial tensor
         inline explicit rigidBodyInertia(const spatialTensor& st);
 
diff --git a/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H
index 96d0264126..78d74db215 100644
--- a/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H
+++ b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H
@@ -25,6 +25,7 @@ License
 
 #include "spatialTransform.H"
 #include "transform.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
@@ -61,6 +62,14 @@ inline Foam::RBD::rigidBodyInertia::rigidBodyInertia
 {}
 
 
+inline Foam::RBD::rigidBodyInertia::rigidBodyInertia(const dictionary& dict)
+:
+    m_(readScalar(dict.lookup("mass"))),
+    c_(dict.lookup("centreOfMass")),
+    Ic_(dict.lookup("inertia"))
+{}
+
+
 inline Foam::RBD::rigidBodyInertia::rigidBodyInertia(const spatialTensor& st)
 :
     m_(st(3, 3)),
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index 7c8679dcf8..af3d70b19a 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -25,6 +25,7 @@ License
 
 #include "rigidBodyModel.H"
 #include "masslessBody.H"
+#include "compositeBody.H"
 #include "nullJoint.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -42,10 +43,10 @@ namespace RBD
 
 void Foam::RBD::rigidBodyModel::initializeRootBody()
 {
-    bodies_.append(new masslessBody);
+    bodies_.append(new masslessBody("root"));
     lambda_.append(0);
     bodyIDs_.insert("root", 0);
-    joints_.append(new joints::null(*this));
+    joints_.append(new joints::null());
     XT_.append(spatialTransform());
 
     nDoF_ = 0;
@@ -86,6 +87,41 @@ Foam::RBD::rigidBodyModel::rigidBodyModel()
 }
 
 
+Foam::RBD::rigidBodyModel::rigidBodyModel(const dictionary& dict)
+:
+    g_(Zero)
+{
+    initializeRootBody();
+
+    const dictionary& bodiesDict = dict.subDict("bodies");
+
+    forAllConstIter(IDLList<entry>, bodiesDict, iter)
+    {
+        const dictionary& bodyDict = iter().dict();
+
+        if (bodyDict.found("mergeWith"))
+        {
+            merge
+            (
+                bodyID(bodyDict.lookup("mergeWith")),
+                bodyDict.lookup("transform"),
+                rigidBody::New(iter().keyword(), bodyDict)
+            );
+        }
+        else
+        {
+            join
+            (
+                bodyID(bodyDict.lookup("parent")),
+                bodyDict.lookup("transform"),
+                joint::New(bodyDict.subDict("joint")),
+                rigidBody::New(iter().keyword(), bodyDict)
+            );
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::label Foam::RBD::rigidBodyModel::join
@@ -168,6 +204,23 @@ Foam::label Foam::RBD::rigidBodyModel::join
 }
 
 
+void Foam::RBD::rigidBodyModel::makeComposite(const label bodyID)
+{
+    if (!isA<compositeBody>(bodies_[bodyID]))
+    {
+        // Retrieve the un-merged body
+        autoPtr<rigidBody> bodyPtr = bodies_.set(bodyID, NULL);
+
+        // Insert the compositeBody containing the original body
+        bodies_.set
+        (
+            bodyID,
+            new compositeBody(bodyPtr)
+        );
+    }
+}
+
+
 Foam::label Foam::RBD::rigidBodyModel::merge
 (
     const label parentID,
@@ -183,6 +236,9 @@ Foam::label Foam::RBD::rigidBodyModel::merge
     if (merged(parentID))
     {
         const subBody& sBody = mergedBody(parentID);
+
+        makeComposite(sBody.parentID());
+
         sBodyPtr.set
         (
             new subBody
@@ -196,6 +252,8 @@ Foam::label Foam::RBD::rigidBodyModel::merge
     }
     else
     {
+        makeComposite(parentID);
+
         sBodyPtr.set
         (
             new subBody
@@ -238,4 +296,62 @@ Foam::spatialTransform Foam::RBD::rigidBodyModel::X0
 }
 
 
+void Foam::RBD::rigidBodyModel::write(Ostream& os) const
+{
+    os  << indent << "bodies" << nl
+        << indent << token::BEGIN_BLOCK << incrIndent << nl;
+
+    for (label i=1; i<nBodies(); i++)
+    {
+        os  << indent << bodies_[i].name() << nl
+            << indent << token::BEGIN_BLOCK << incrIndent << endl;
+
+        os.writeKeyword("type")
+            << bodies_[i].type() << token::END_STATEMENT << nl;
+
+        os.writeKeyword("parent")
+            << bodies_[lambda_[i]].name() << token::END_STATEMENT << nl;
+
+        bodies_[i].write(os);
+
+        os.writeKeyword("transform")
+            << XT_[i] << token::END_STATEMENT << nl;
+
+        os  << indent << "joint" << nl
+            << indent << token::BEGIN_BLOCK << incrIndent << endl;
+
+        os.writeKeyword("type")
+            << joints_[i].type() << token::END_STATEMENT << nl;
+
+        joints_[i].write(os);
+
+        os  << decrIndent << indent << token::END_BLOCK << endl;
+
+        os  << decrIndent << indent << token::END_BLOCK << endl;
+    }
+
+
+    forAll (mergedBodies_, i)
+    {
+        os  << indent << mergedBodies_[i].name() << nl
+            << indent << token::BEGIN_BLOCK << incrIndent << endl;
+
+        os.writeKeyword("type")
+            << mergedBodies_[i].body().type() << token::END_STATEMENT << nl;
+
+        os.writeKeyword("mergeWith")
+            << mergedBodies_[i].parentName() << token::END_STATEMENT << nl;
+
+        mergedBodies_[i].body().write(os);
+
+        os.writeKeyword("transform")
+            << mergedBodies_[i].parentXT() << token::END_STATEMENT << nl;
+
+        os  << decrIndent << indent << token::END_BLOCK << endl;
+    }
+
+    os  << decrIndent << indent << token::END_BLOCK << nl;
+}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
index 57c7a17e87..9c51cd280b 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
@@ -66,12 +66,17 @@ namespace RBD
 
 class rigidBodyModel
 {
-    //- Initialize the model with the root-body which is a fixed massless body
-    //  at the origin.
-    void initializeRootBody();
+    // Private member functions
 
-    //- Resize the state fields following the joining of a body
-    void resizeState();
+        //- Initialize the model with the root-body
+        //  which is a fixed massless bodyat the origin.
+        void initializeRootBody();
+
+        //- Resize the state fields following the joining of a body
+        void resizeState();
+
+        //- Convert the body with given ID into a composite-body
+        void makeComposite(const label bodyID);
 
 
 protected:
@@ -183,6 +188,9 @@ public:
         //- Null-constructor which adds the single root-body at the origin
         rigidBodyModel();
 
+        //- Construct from dictionary
+        rigidBodyModel(const dictionary& dict);
+
 
     //- Destructor
     virtual ~rigidBodyModel()
@@ -301,6 +309,9 @@ public:
             const scalarField& qDot,
             const scalarField& qDdot
         ) const;
+
+        //- Write
+        virtual void write(Ostream&) const;
 };
 
 

From 746cf915d4d72a2d69784eef4050bdb4c15f965e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 7 Apr 2016 22:28:52 +0100
Subject: [PATCH 381/447] rigidBodyModel: Provide support for copy-construction
 and assignment

---
 src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C  | 10 +++++++++-
 src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H  |  2 +-
 src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H |  6 ------
 src/rigidBodyDynamics/bodies/subBody/subBody.C      |  6 ------
 src/rigidBodyDynamics/bodies/subBody/subBody.H      | 12 ++++++------
 src/rigidBodyDynamics/bodies/subBody/subBodyI.H     | 13 ++++++++++++-
 6 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
index 7d797f0142..a02ad4207c 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
@@ -46,6 +46,14 @@ namespace RBD
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::rigidBody::clone() const
+{
+    return autoPtr<rigidBody>(new rigidBody(*this));
+}
+
+
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::rigidBody::New
@@ -104,7 +112,7 @@ void Foam::RBD::rigidBody::merge(const subBody& subBody)
     *this = rigidBody
     (
         name(),
-        *this + transform(subBody.parentXT(), subBody)
+        *this + transform(subBody.parentXT(), subBody.body())
     );
 }
 
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
index 9d2b3f279d..0d763727d1 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
@@ -107,7 +107,7 @@ public:
         );
 
         //- Return clone of this rigidBody
-        inline autoPtr<rigidBody> clone() const;
+        virtual autoPtr<rigidBody> clone() const;
 
 
     // Selectors
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H b/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
index 5b6a66e874..497eddf6a0 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
@@ -60,12 +60,6 @@ inline Foam::RBD::rigidBody::rigidBody
 {}
 
 
-inline Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::rigidBody::clone() const
-{
-    return autoPtr<rigidBody>(new rigidBody(*this));
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 inline const Foam::word& Foam::RBD::rigidBody::name() const
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBody.C b/src/rigidBodyDynamics/bodies/subBody/subBody.C
index 1508b8f431..b839538627 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBody.C
+++ b/src/rigidBodyDynamics/bodies/subBody/subBody.C
@@ -25,12 +25,6 @@ License
 
 #include "subBody.H"
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::RBD::subBody::~subBody()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void Foam::RBD::subBody::write(Ostream& os) const
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBody.H b/src/rigidBodyDynamics/bodies/subBody/subBody.H
index a9163e8e3f..f030d32ab7 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBody.H
+++ b/src/rigidBodyDynamics/bodies/subBody/subBody.H
@@ -51,8 +51,6 @@ namespace RBD
 \*---------------------------------------------------------------------------*/
 
 class subBody
-:
-    public rigidBody
 {
     // Private data
 
@@ -84,9 +82,8 @@ public:
             const spatialTransform& parentXT
         );
 
-
-    //- Destructor
-    virtual ~subBody();
+        //- Return clone of this subBody
+        inline autoPtr<subBody> clone() const;
 
 
     // Member Functions
@@ -94,6 +91,9 @@ public:
         //- Return the original body from which this sub-body was constructed
         inline const rigidBody& body() const;
 
+        //- Return the body name
+        inline const word& name() const;
+
         //- Return the parent body name
         inline const word& parentName() const;
 
@@ -104,7 +104,7 @@ public:
         inline const spatialTransform& parentXT() const;
 
         //- Write
-        virtual void write(Ostream&) const;
+        void write(Ostream&) const;
 };
 
 
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
index b8c2813d42..79104889ee 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
+++ b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
@@ -33,7 +33,6 @@ inline Foam::RBD::subBody::subBody
     const spatialTransform& parentXT
 )
 :
-    rigidBody(bodyPtr()),
     body_(bodyPtr),
     parentName_(parentName),
     parentID_(parentID),
@@ -41,6 +40,12 @@ inline Foam::RBD::subBody::subBody
 {}
 
 
+inline Foam::autoPtr<Foam::RBD::subBody> Foam::RBD::subBody::clone() const
+{
+    return autoPtr<subBody>(new subBody(*this));
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 inline const Foam::RBD::rigidBody& Foam::RBD::subBody::body() const
@@ -49,6 +54,12 @@ inline const Foam::RBD::rigidBody& Foam::RBD::subBody::body() const
 }
 
 
+inline const Foam::word& Foam::RBD::subBody::name() const
+{
+    return body_->name();
+}
+
+
 inline const Foam::word& Foam::RBD::subBody::parentName() const
 {
     return parentName_;

From 77ed073bdb8eea377bb83a0ede77a11657dc8be8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 7 Apr 2016 23:04:17 +0100
Subject: [PATCH 382/447] rigidBodyDynamics/bodies: Complete set of clone
 functions to support copy construction and assignment

---
 applications/test/rigidBodyDynamics/pendulum/pendulum.C   | 3 ++-
 .../bodies/compositeBody/compositeBody.C                  | 8 ++++++++
 .../bodies/compositeBody/compositeBody.H                  | 3 +++
 src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C  | 8 ++++++++
 src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H  | 3 +++
 src/rigidBodyDynamics/bodies/sphere/sphere.C              | 8 ++++++++
 src/rigidBodyDynamics/bodies/sphere/sphere.H              | 3 +++
 7 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum.C b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
index 2401ec256c..6e8991b9a4 100644
--- a/applications/test/rigidBodyDynamics/pendulum/pendulum.C
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
@@ -81,7 +81,8 @@ int main(int argc, char *argv[])
     */
 
     // Create the pendulum model from dictionary
-    rigidBodyModel pendulum(dictionary(IFstream("pendulum")()));
+    rigidBodyModel pendulum1(dictionary(IFstream("pendulum")()));
+    rigidBodyModel pendulum = pendulum1;
 
     pendulum.write(Info);
 
diff --git a/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.C b/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.C
index f898386c1a..3f09086016 100644
--- a/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.C
+++ b/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.C
@@ -31,6 +31,14 @@ Foam::RBD::compositeBody::~compositeBody()
 {}
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::compositeBody::clone() const
+{
+    return autoPtr<rigidBody>(new compositeBody(*this));
+}
+
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 const Foam::word& Foam::RBD::compositeBody::type() const
diff --git a/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H b/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H
index c92d9bda31..662ed39e8a 100644
--- a/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H
+++ b/src/rigidBodyDynamics/bodies/compositeBody/compositeBody.H
@@ -68,6 +68,9 @@ public:
         //  and the transform relative to the parent
         inline compositeBody(const autoPtr<rigidBody>& bodyPtr);
 
+        //- Return clone of this compositeBody
+        virtual autoPtr<rigidBody> clone() const;
+
 
     //- Destructor
     virtual ~compositeBody();
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
index da0f731876..e413792432 100644
--- a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
@@ -44,6 +44,14 @@ namespace RBD
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::masslessBody::clone() const
+{
+    return autoPtr<rigidBody>(new masslessBody(*this));
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::RBD::masslessBody::~masslessBody()
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
index d20c160d07..a29585e3f6 100644
--- a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.H
@@ -74,6 +74,9 @@ public:
             const dictionary& dict
         );
 
+        //- Return clone of this masslessBody
+        virtual autoPtr<rigidBody> clone() const;
+
 
     //- Destructor
     virtual ~masslessBody();
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.C b/src/rigidBodyDynamics/bodies/sphere/sphere.C
index e581ce8648..15523961a6 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphere.C
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.C
@@ -44,6 +44,14 @@ namespace RBD
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::sphere::clone() const
+{
+    return autoPtr<rigidBody>(new sphere(*this));
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::RBD::sphere::~sphere()
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.H b/src/rigidBodyDynamics/bodies/sphere/sphere.H
index ad5ca48bab..f2642c8a7e 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphere.H
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.H
@@ -77,6 +77,9 @@ public:
             const dictionary& dict
         );
 
+        //- Return clone of this sphere
+        virtual autoPtr<rigidBody> clone() const;
+
 
     //- Destructor
     virtual ~sphere();

From 1ec2507f629a185424bafbff3524b1f1438352ce Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 8 Apr 2016 16:35:49 +0100
Subject: [PATCH 383/447] rigidBodyDynamics: Added dictionary-based IO of the
 rigidBodyModel, bodies and joints Added support for composite joints
 including a specialized 6-DoF form for floating bodies.

---
 src/rigidBodyDynamics/Make/files              |   4 +-
 src/rigidBodyDynamics/joints/Pa/Pa.C          |  13 +-
 src/rigidBodyDynamics/joints/Pa/Pa.H          |   3 +
 src/rigidBodyDynamics/joints/Ra/Ra.C          |  13 +-
 src/rigidBodyDynamics/joints/Ra/Ra.H          |   3 +
 .../joints/composite/compositeJoint.C         | 115 +++++++++++++++
 .../joints/composite/compositeJoint.H         | 131 ++++++++++++++++++
 .../joints/floating/floatingJoint.C           | 108 +++++++++++++++
 .../joints/floating/floatingJoint.H           | 110 +++++++++++++++
 src/rigidBodyDynamics/joints/joint/joint.C    |  15 +-
 src/rigidBodyDynamics/joints/joint/joint.H    |  25 +++-
 src/rigidBodyDynamics/joints/joint/jointI.H   |  22 +++
 src/rigidBodyDynamics/joints/joints.H         |   6 +
 .../joints/{nullJoint => null}/nullJoint.C    |   0
 .../joints/{nullJoint => null}/nullJoint.H    |   0
 .../rigidBodyModel/rigidBodyModel.C           |  72 +++++++---
 .../rigidBodyModel/rigidBodyModel.H           |  24 +++-
 17 files changed, 617 insertions(+), 47 deletions(-)
 create mode 100644 src/rigidBodyDynamics/joints/composite/compositeJoint.C
 create mode 100644 src/rigidBodyDynamics/joints/composite/compositeJoint.H
 create mode 100644 src/rigidBodyDynamics/joints/floating/floatingJoint.C
 create mode 100644 src/rigidBodyDynamics/joints/floating/floatingJoint.H
 rename src/rigidBodyDynamics/joints/{nullJoint => null}/nullJoint.C (100%)
 rename src/rigidBodyDynamics/joints/{nullJoint => null}/nullJoint.H (100%)

diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index 7fc99c209a..1e658c85e9 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -5,7 +5,9 @@ bodies/subBody/subBody.C
 bodies/sphere/sphere.C
 
 joints/joint/joint.C
-joints/nullJoint/nullJoint.C
+joints/null/nullJoint.C
+joints/composite/compositeJoint.C
+joints/floating/floatingJoint.C
 
 joints/Rx/Rx.C
 joints/Ry/Ry.C
diff --git a/src/rigidBodyDynamics/joints/Pa/Pa.C b/src/rigidBodyDynamics/joints/Pa/Pa.C
index 2263ce3283..0bdfa0a42b 100644
--- a/src/rigidBodyDynamics/joints/Pa/Pa.C
+++ b/src/rigidBodyDynamics/joints/Pa/Pa.C
@@ -54,7 +54,7 @@ Foam::RBD::joints::Pa::Pa(const vector& axis)
 :
     joint(1)
 {
-    S_[0] = spatialVector(Zero, axis);
+    S_[0] = spatialVector(Zero, axis/mag(axis));
 }
 
 
@@ -62,7 +62,8 @@ Foam::RBD::joints::Pa::Pa(const dictionary& dict)
 :
     joint(1)
 {
-    S_[0] = spatialVector(Zero, dict.lookup("axis"));
+    vector axis(dict.lookup("axis"));
+    S_[0] = spatialVector(Zero, axis/mag(axis));
 }
 
 
@@ -95,4 +96,12 @@ void Foam::RBD::joints::Pa::jcalc
 }
 
 
+void Foam::RBD::joints::Pa::write(Ostream& os) const
+{
+    joint::write(os);
+    os.writeKeyword("axis")
+        << S_[0].l() << token::END_STATEMENT << nl;
+}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Pa/Pa.H b/src/rigidBodyDynamics/joints/Pa/Pa.H
index 09f7eee753..f27a8c850a 100644
--- a/src/rigidBodyDynamics/joints/Pa/Pa.H
+++ b/src/rigidBodyDynamics/joints/Pa/Pa.H
@@ -95,6 +95,9 @@ public:
             const scalarField& w,
             const scalarField& qDot
         ) const;
+
+        //- Write
+        virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/rigidBodyDynamics/joints/Ra/Ra.C b/src/rigidBodyDynamics/joints/Ra/Ra.C
index 6d9e6aa5fe..926f56a3b8 100644
--- a/src/rigidBodyDynamics/joints/Ra/Ra.C
+++ b/src/rigidBodyDynamics/joints/Ra/Ra.C
@@ -54,7 +54,7 @@ Foam::RBD::joints::Ra::Ra(const vector& axis)
 :
     joint(1)
 {
-    S_[0] = spatialVector(axis, Zero);
+    S_[0] = spatialVector(axis/mag(axis), Zero);
 }
 
 
@@ -62,7 +62,8 @@ Foam::RBD::joints::Ra::Ra(const dictionary& dict)
 :
     joint(1)
 {
-    S_[0] = spatialVector(dict.lookup("axis"), Zero);
+    vector axis(dict.lookup("axis"));
+    S_[0] = spatialVector(axis/mag(axis), Zero);
 }
 
 
@@ -95,4 +96,12 @@ void Foam::RBD::joints::Ra::jcalc
 }
 
 
+void Foam::RBD::joints::Ra::write(Ostream& os) const
+{
+    joint::write(os);
+    os.writeKeyword("axis")
+        << S_[0].w() << token::END_STATEMENT << nl;
+}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/Ra/Ra.H b/src/rigidBodyDynamics/joints/Ra/Ra.H
index d098b2c82e..def3724c13 100644
--- a/src/rigidBodyDynamics/joints/Ra/Ra.H
+++ b/src/rigidBodyDynamics/joints/Ra/Ra.H
@@ -95,6 +95,9 @@ public:
             const scalarField& w,
             const scalarField& qDot
         ) const;
+
+        //- Write
+        virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/rigidBodyDynamics/joints/composite/compositeJoint.C b/src/rigidBodyDynamics/joints/composite/compositeJoint.C
new file mode 100644
index 0000000000..28044e9493
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/composite/compositeJoint.C
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "compositeJoint.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(composite, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        composite,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+void Foam::RBD::joints::composite::setLastJoint()
+{
+    last().joint::operator=(*this);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::composite::composite(const PtrList<joint>& joints)
+:
+    PtrList<joint>(joints),
+    joint(last())
+{}
+
+
+Foam::RBD::joints::composite::composite(const dictionary& dict)
+:
+    PtrList<joint>(dict.lookup("joints")),
+    joint(last())
+{}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::composite::clone() const
+{
+    return autoPtr<joint>(new composite(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::composite::~composite()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::label Foam::RBD::joints::composite::nw() const
+{
+    return last().nw();
+}
+
+
+void Foam::RBD::joints::composite::jcalc
+(
+    joint::XSvc& J,
+    const scalarField& q,
+    const scalarField& w,
+    const scalarField& qDot
+) const
+{
+    last().jcalc(J, q, w, qDot);
+}
+
+
+void Foam::RBD::joints::composite::write(Ostream& os) const
+{
+    joint::write(os);
+    os.writeKeyword("joints");
+    os << static_cast<const PtrList<joint>&>(*this);
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/composite/compositeJoint.H b/src/rigidBodyDynamics/joints/composite/compositeJoint.H
new file mode 100644
index 0000000000..c3033b4abd
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/composite/compositeJoint.H
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::composite
+
+Description
+    Prismatic joint for translation along the specified arbitrary axis.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    composite.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_composite_H
+#define RBD_joints_composite_H
+
+#include "joint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+
+// Forward declaration of classes
+class rigidBodyModel;
+
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class composite Declaration
+\*---------------------------------------------------------------------------*/
+
+class composite
+:
+    public PtrList<joint>,
+    public joint
+{
+    // Private member functions
+
+        //- Set the properties of the last joint following construction
+        //  of the body containing the joint
+        void setLastJoint();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("composite");
+
+    //- Allow the rigidBodyModel class to set the last joint state
+    friend class Foam::RBD::rigidBodyModel;
+
+
+    // Constructors
+
+        //- Construct for given PtrList<joint>
+        composite(const PtrList<joint>& joints);
+
+        //- Construct for given model from dictionary
+        composite(const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~composite();
+
+
+    // Member Functions
+
+        //- Return the number of additional state variables need by this joint
+        virtual label nw() const;
+
+        //- Update the model state for this joint
+        virtual void jcalc
+        (
+            joint::XSvc& J,
+            const scalarField& q,
+            const scalarField& w,
+            const scalarField& qDot
+        ) const;
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/floating/floatingJoint.C b/src/rigidBodyDynamics/joints/floating/floatingJoint.C
new file mode 100644
index 0000000000..766e6504f6
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/floating/floatingJoint.C
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "floatingJoint.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+#include "Rs.H"
+#include "Rzyx.H"
+#include "Pxyz.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+    defineTypeNameAndDebug(floating, 0);
+
+    addToRunTimeSelectionTable
+    (
+        joint,
+        floating,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::RBD::joints::composite>
+Foam::RBD::joints::floating::sixDoF()
+{
+    PtrList<joint> cj(2);
+    cj.set(0, new joints::Pxyz());
+
+    // The quaternion-based spherical joint could be used
+    // but then w must be set appropriately
+    //cj.set(1, new joints::Rs());
+
+    // Alternatively the Euler-angle joint can be used
+    cj.set(1, new joints::Rzyx());
+
+    return autoPtr<composite>(new composite(cj));
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::floating::floating()
+:
+    composite(sixDoF())
+{}
+
+
+Foam::RBD::joints::floating::floating(const dictionary& dict)
+:
+    composite(sixDoF())
+{}
+
+
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::floating::clone() const
+{
+    return autoPtr<joint>(new floating(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::joints::floating::~floating()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::joints::floating::write(Ostream& os) const
+{
+    joint::write(os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/floating/floatingJoint.H b/src/rigidBodyDynamics/joints/floating/floatingJoint.H
new file mode 100644
index 0000000000..58c314d784
--- /dev/null
+++ b/src/rigidBodyDynamics/joints/floating/floatingJoint.H
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::joints::floating
+
+Description
+    Prismatic joint for translation along the specified arbitrary axis.
+
+    Reference:
+    \verbatim
+        Featherstone, R. (2008).
+        Rigid body dynamics algorithms.
+        Springer.
+        Chapter 4.
+    \endverbatim
+
+SourceFiles
+    floating.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_joints_floating_H
+#define RBD_joints_floating_H
+
+#include "compositeJoint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace joints
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class floating Declaration
+\*---------------------------------------------------------------------------*/
+
+class floating
+:
+    public composite
+{
+    // Private member functions
+
+        //- Return a list of joints needed to emulate a floating body
+        static autoPtr<composite> sixDoF();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("floating");
+
+
+    // Constructors
+
+        //- Construct
+        floating();
+
+        //- Construct for given model from dictionary
+        floating(const dictionary& dict);
+
+        //- Clone this joint
+        virtual autoPtr<joint> clone() const;
+
+
+    //- Destructor
+    virtual ~floating();
+
+
+    // Member Functions
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace joints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/joint/joint.C b/src/rigidBodyDynamics/joints/joint/joint.C
index 4374990eb5..f13ee347ea 100644
--- a/src/rigidBodyDynamics/joints/joint/joint.C
+++ b/src/rigidBodyDynamics/joints/joint/joint.C
@@ -25,9 +25,6 @@ License
 
 #include "joint.H"
 #include "rigidBodyModel.H"
-#include "Rs.H"
-#include "Rzyx.H"
-#include "Pxyz.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -81,18 +78,10 @@ Foam::RBD::joint::~joint()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::PtrList<Foam::RBD::joint> Foam::RBD::joint::floating()
+void Foam::RBD::joint::write(Ostream& os) const
 {
-    PtrList<joint> cj(2);
-    cj.set(0, new joints::Pxyz());
-    //cj.set(1, new joints::Rs());
-    cj.set(1, new joints::Rzyx());
-    return cj;
+    os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
 }
 
 
-void Foam::RBD::joint::write(Ostream& os) const
-{}
-
-
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/joint/joint.H b/src/rigidBodyDynamics/joints/joint/joint.H
index 58d68190de..64258a3f71 100644
--- a/src/rigidBodyDynamics/joints/joint/joint.H
+++ b/src/rigidBodyDynamics/joints/joint/joint.H
@@ -61,6 +61,12 @@ namespace RBD
 // Forward declaration of classes
 class rigidBodyModel;
 
+// Forward declaration of friend functions and operators
+class joint;
+
+inline Ostream& operator<<(Ostream&, const joint&);
+
+
 /*---------------------------------------------------------------------------*\
                          Class joint Declaration
 \*---------------------------------------------------------------------------*/
@@ -171,6 +177,17 @@ public:
         //- Clone this joint (needed by PtrList)
         virtual autoPtr<joint> clone() const = 0;
 
+        class iNew
+        {
+
+        public:
+
+            iNew()
+            {}
+
+            inline autoPtr<joint> operator()(Istream& is) const;
+        };
+
 
     //- Destructor
     virtual ~joint();
@@ -207,9 +224,6 @@ public:
         //- Return the joint motion sub-space
         inline const List<spatialVector>& S() const;
 
-        //- Return a list of joints needed to emulate a floating body
-        static PtrList<joint> floating();
-
         //- Update the rigidBodyModel state for the joint given
         //  the joint state q, w and velocity qDot
         virtual void jcalc
@@ -242,6 +256,11 @@ public:
             scalarField& q,
             scalarField& w
         ) const;
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<<(Ostream&, const joint&);
 };
 
 
diff --git a/src/rigidBodyDynamics/joints/joint/jointI.H b/src/rigidBodyDynamics/joints/joint/jointI.H
index 47db466a7d..0b33fb9322 100644
--- a/src/rigidBodyDynamics/joints/joint/jointI.H
+++ b/src/rigidBodyDynamics/joints/joint/jointI.H
@@ -107,4 +107,26 @@ inline void Foam::RBD::joint::operator()
 }
 
 
+Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joint::iNew::operator()
+(
+    Istream& is
+) const
+{
+    dictionary dict(is);
+    return New(dict);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+inline Foam::Ostream& Foam::RBD::operator<<(Ostream& os, const joint& j)
+{
+    os  << indent << token::BEGIN_BLOCK << incrIndent << endl;
+    j.write(os);
+    os  << decrIndent << indent << token::END_BLOCK;
+
+    return os;
+}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/joints/joints.H b/src/rigidBodyDynamics/joints/joints.H
index 2ddd6c905c..b95829646b 100644
--- a/src/rigidBodyDynamics/joints/joints.H
+++ b/src/rigidBodyDynamics/joints/joints.H
@@ -1,6 +1,12 @@
 // Null joint for the root-body
 #include "nullJoint.H"
 
+// Composite joint to handle combination of rotations and translations
+#include "compositeJoint.H"
+
+// 6-DoF joint for floating bodies
+#include "floatingJoint.H"
+
 // Revolute joints
 #include "Rx.H"
 #include "Ry.H"
diff --git a/src/rigidBodyDynamics/joints/nullJoint/nullJoint.C b/src/rigidBodyDynamics/joints/null/nullJoint.C
similarity index 100%
rename from src/rigidBodyDynamics/joints/nullJoint/nullJoint.C
rename to src/rigidBodyDynamics/joints/null/nullJoint.C
diff --git a/src/rigidBodyDynamics/joints/nullJoint/nullJoint.H b/src/rigidBodyDynamics/joints/null/nullJoint.H
similarity index 100%
rename from src/rigidBodyDynamics/joints/nullJoint/nullJoint.H
rename to src/rigidBodyDynamics/joints/null/nullJoint.H
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index af3d70b19a..6d93c8f5b6 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -124,12 +124,12 @@ Foam::RBD::rigidBodyModel::rigidBodyModel(const dictionary& dict)
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::label Foam::RBD::rigidBodyModel::join
+Foam::label Foam::RBD::rigidBodyModel::join_
 (
     const label parentID,
     const spatialTransform& XT,
-    const autoPtr<joint>& jointPtr,
-    const autoPtr<rigidBody>& bodyPtr
+    autoPtr<joint> jointPtr,
+    autoPtr<rigidBody> bodyPtr
 )
 {
     // Append the body
@@ -174,33 +174,71 @@ Foam::label Foam::RBD::rigidBodyModel::join
 (
     const label parentID,
     const spatialTransform& XT,
-    const PtrList<joint>& compositeJoint,
-    const autoPtr<rigidBody>& bodyPtr
+    autoPtr<joint> jointPtr,
+    autoPtr<rigidBody> bodyPtr
+)
+{
+    if (isA<joints::composite>(jointPtr()))
+    {
+        return join
+        (
+            parentID,
+            XT,
+            autoPtr<joints::composite>
+            (
+                dynamic_cast<joints::composite*>(jointPtr.ptr())
+            ),
+            bodyPtr
+        );
+    }
+    else
+    {
+        return join_
+        (
+            parentID,
+            XT,
+            jointPtr,
+            bodyPtr
+        );
+    }
+}
+
+
+Foam::label Foam::RBD::rigidBodyModel::join
+(
+    const label parentID,
+    const spatialTransform& XT,
+    autoPtr<joints::composite> cJointPtr,
+    autoPtr<rigidBody> bodyPtr
 )
 {
     label parent = parentID;
+    joints::composite& cJoint = cJointPtr();
 
     // For all but the final joint in the set add a masslessBody with the
     // joint and transform
-    for (label j=0; j<compositeJoint.size()-1; j++)
+    for (label j=0; j<cJoint.size()-1; j++)
     {
-        parent = join
+        parent = join_
         (
             parent,
             j == 0 ? XT : spatialTransform(),
-            compositeJoint[j].clone(),
+            cJoint[j].clone(),
             autoPtr<rigidBody>(new masslessBody)
         );
     }
 
     // For the final joint in the set add the read body
-    return join
+    parent = join_
     (
         parent,
-        compositeJoint.size() == 1 ? XT : spatialTransform(),
-        compositeJoint[compositeJoint.size()-1].clone(),
+        cJoint.size() == 1 ? XT : spatialTransform(),
+        autoPtr<joint>(cJointPtr.ptr()),
         bodyPtr
     );
+    cJoint.setLastJoint();
+
+    return parent;
 }
 
 
@@ -225,7 +263,7 @@ Foam::label Foam::RBD::rigidBodyModel::merge
 (
     const label parentID,
     const spatialTransform& XT,
-    const autoPtr<rigidBody>& bodyPtr
+    autoPtr<rigidBody> bodyPtr
 )
 {
     autoPtr<subBody> sBodyPtr;
@@ -317,15 +355,7 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
         os.writeKeyword("transform")
             << XT_[i] << token::END_STATEMENT << nl;
 
-        os  << indent << "joint" << nl
-            << indent << token::BEGIN_BLOCK << incrIndent << endl;
-
-        os.writeKeyword("type")
-            << joints_[i].type() << token::END_STATEMENT << nl;
-
-        joints_[i].write(os);
-
-        os  << decrIndent << indent << token::END_BLOCK << endl;
+        os  << indent << "joint" << nl << joints_[i] << endl;
 
         os  << decrIndent << indent << token::END_BLOCK << endl;
     }
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
index 9c51cd280b..57271d3ff2 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
@@ -52,6 +52,7 @@ SourceFiles
 #include "rigidBody.H"
 #include "subBody.H"
 #include "joint.H"
+#include "compositeJoint.H"
 #include "PtrList.H"
 #include "HashTable.H"
 
@@ -177,6 +178,19 @@ protected:
         mutable DynamicList<vector> u_;
 
 
+    // Protected member functions
+
+        //- Join the given body to the parent with ID parentID via the given
+        //  joint with transform from the parent frame to the joint frame XT.
+        virtual label join_
+        (
+            const label parentID,
+            const spatialTransform& XT,
+            autoPtr<joint> jointPtr,
+            autoPtr<rigidBody> bodyPtr
+        );
+
+
 public:
 
     //- Runtime type information
@@ -237,8 +251,8 @@ public:
         (
             const label parentID,
             const spatialTransform& XT,
-            const autoPtr<joint>& jointPtr,
-            const autoPtr<rigidBody>& bodyPtr
+            autoPtr<joint> jointPtr,
+            autoPtr<rigidBody> bodyPtr
         );
 
         //- Join the given body to the parent with ID parentID via the given
@@ -250,8 +264,8 @@ public:
         (
             const label parentID,
             const spatialTransform& XT,
-            const PtrList<joint>& compositeJoint,
-            const autoPtr<rigidBody>& bodyPtr
+            autoPtr<joints::composite> cJoint,
+            autoPtr<rigidBody> bodyPtr
         );
 
         //- Merge the given body with transform X into the parent with ID
@@ -262,7 +276,7 @@ public:
         (
             const label parentID,
             const spatialTransform& X,
-            const autoPtr<rigidBody>& bodyPtr
+            autoPtr<rigidBody> bodyPtr
         );
 
         //- Return true if the body with given ID has been merged with a parent

From 93f2f0d41a4aa2d588d8742d57d6f606464c6f66 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 8 Apr 2016 16:56:48 +0100
Subject: [PATCH 384/447] rigidBodyDynamics: Simplified the IO of bodies

---
 .../test/rigidBodyDynamics/pendulum/pendulum       |  4 ++--
 .../bodies/masslessBody/masslessBody.C             |  5 ++++-
 src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C |  3 +++
 src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H | 11 +++++++++++
 .../bodies/rigidBody/rigidBodyI.H                  |  9 +++++++++
 src/rigidBodyDynamics/bodies/sphere/sphere.C       |  3 +++
 .../rigidBodyModel/rigidBodyModel.C                | 14 ++++----------
 7 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum b/applications/test/rigidBodyDynamics/pendulum/pendulum
index 4a8378b9f2..d179af4438 100644
--- a/applications/test/rigidBodyDynamics/pendulum/pendulum
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum
@@ -3,10 +3,10 @@ bodies0
     pendulum
     {
         type            rigidBody;
-        parent          root;
         mass            1;
         centreOfMass    (0 -1 0);
         inertia         (0.001 0 0 0.001 0 0.001);
+        parent          root;
         transform       (1 0 0 0 1 0 0 0 1) (0 0 0);
         joint
         {
@@ -30,9 +30,9 @@ bodies
     weight
     {
         type            sphere;
-        mergeWith       hinge;
         mass            1;
         radius          0.05;
         transform       (1 0 0 0 1 0 0 0 1) (0 -1 0);
+        mergeWith       hinge;
     }
 }
diff --git a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
index e413792432..61e5b4bc75 100644
--- a/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
+++ b/src/rigidBodyDynamics/bodies/masslessBody/masslessBody.C
@@ -67,7 +67,10 @@ bool Foam::RBD::masslessBody::massless() const
 
 
 void Foam::RBD::masslessBody::write(Ostream& os) const
-{}
+{
+    os.writeKeyword("type")
+        << type() << token::END_STATEMENT << nl;
+}
 
 
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
index a02ad4207c..123f2794a4 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
@@ -119,6 +119,9 @@ void Foam::RBD::rigidBody::merge(const subBody& subBody)
 
 void Foam::RBD::rigidBody::write(Ostream& os) const
 {
+    os.writeKeyword("type")
+        << type() << token::END_STATEMENT << nl;
+
     os.writeKeyword("mass")
         << m() << token::END_STATEMENT << nl;
 
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
index 0d763727d1..2c8679b1e4 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.H
@@ -48,6 +48,12 @@ namespace RBD
 // Forward declaration of classes
 class subBody;
 
+// Forward declaration of friend functions and operators
+class rigidBody;
+
+inline Ostream& operator<<(Ostream&, const rigidBody&);
+
+
 /*---------------------------------------------------------------------------*\
                          Class rigidBody Declaration
 \*---------------------------------------------------------------------------*/
@@ -146,6 +152,11 @@ public:
 
         //- Write
         virtual void write(Ostream&) const;
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<<(Ostream&, const rigidBody&);
 };
 
 
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H b/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
index 497eddf6a0..3a74d42ea0 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBodyI.H
@@ -68,4 +68,13 @@ inline const Foam::word& Foam::RBD::rigidBody::name() const
 }
 
 
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+inline Foam::Ostream& Foam::RBD::operator<<(Ostream& os, const rigidBody& rb)
+{
+    rb.write(os);
+    return os;
+}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.C b/src/rigidBodyDynamics/bodies/sphere/sphere.C
index 15523961a6..ea4d13653e 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphere.C
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.C
@@ -62,6 +62,9 @@ Foam::RBD::sphere::~sphere()
 
 void Foam::RBD::sphere::write(Ostream& os) const
 {
+    os.writeKeyword("type")
+        << type() << token::END_STATEMENT << nl;
+
     os.writeKeyword("mass")
         << m() << token::END_STATEMENT << nl;
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index 6d93c8f5b6..0e8482fc5f 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -344,14 +344,11 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
         os  << indent << bodies_[i].name() << nl
             << indent << token::BEGIN_BLOCK << incrIndent << endl;
 
-        os.writeKeyword("type")
-            << bodies_[i].type() << token::END_STATEMENT << nl;
+        bodies_[i].write(os);
 
         os.writeKeyword("parent")
             << bodies_[lambda_[i]].name() << token::END_STATEMENT << nl;
 
-        bodies_[i].write(os);
-
         os.writeKeyword("transform")
             << XT_[i] << token::END_STATEMENT << nl;
 
@@ -366,17 +363,14 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
         os  << indent << mergedBodies_[i].name() << nl
             << indent << token::BEGIN_BLOCK << incrIndent << endl;
 
-        os.writeKeyword("type")
-            << mergedBodies_[i].body().type() << token::END_STATEMENT << nl;
-
-        os.writeKeyword("mergeWith")
-            << mergedBodies_[i].parentName() << token::END_STATEMENT << nl;
-
         mergedBodies_[i].body().write(os);
 
         os.writeKeyword("transform")
             << mergedBodies_[i].parentXT() << token::END_STATEMENT << nl;
 
+        os.writeKeyword("mergeWith")
+            << mergedBodies_[i].parentName() << token::END_STATEMENT << nl;
+
         os  << decrIndent << indent << token::END_BLOCK << endl;
     }
 

From 8b6fe62f880a7a336e7cf74fe07a1a344fb0428c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 8 Apr 2016 17:02:02 +0100
Subject: [PATCH 385/447] rigidBodyModel: Added operator<<(Ostream&, const
 rigidBodyModel&)

---
 .../test/rigidBodyDynamics/pendulum/pendulum.C        |  2 +-
 src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C |  9 +++++++++
 src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H | 11 +++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum.C b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
index 6e8991b9a4..49af5cbdd6 100644
--- a/applications/test/rigidBodyDynamics/pendulum/pendulum.C
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
     rigidBodyModel pendulum1(dictionary(IFstream("pendulum")()));
     rigidBodyModel pendulum = pendulum1;
 
-    pendulum.write(Info);
+    Info<< pendulum << endl;
 
     // Create the joint-space state fields
     scalarField q(pendulum.nDoF(), Zero);
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index 0e8482fc5f..47c7983939 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -378,4 +378,13 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
 }
 
 
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::RBD::operator<<(Ostream& os, const rigidBodyModel& rbm)
+{
+    rbm.write(os);
+    return os;
+}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
index 57271d3ff2..ff7a0a5391 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
@@ -61,6 +61,12 @@ namespace Foam
 namespace RBD
 {
 
+// Forward declaration of friend functions and operators
+class rigidBodyModel;
+
+Ostream& operator<<(Ostream&, const rigidBodyModel&);
+
+
 /*---------------------------------------------------------------------------*\
                          Class rigidBodyModel Declaration
 \*---------------------------------------------------------------------------*/
@@ -326,6 +332,11 @@ public:
 
         //- Write
         virtual void write(Ostream&) const;
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<<(Ostream&, const rigidBodyModel&);
 };
 
 

From 9ffaed8fd8426856692ff32fb07435ca8d102786 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 8 Apr 2016 17:16:01 +0100
Subject: [PATCH 386/447] rigidBodyDynamics/bodies/jointBody: Special body to
 support elements of composite joints

---
 .../test/rigidBodyDynamics/pendulum/pendulum  |  6 +-
 src/rigidBodyDynamics/Make/files              |  1 +
 .../bodies/jointBody/jointBody.C              | 61 ++++++++++++
 .../bodies/jointBody/jointBody.H              | 99 +++++++++++++++++++
 .../bodies/jointBody/jointBodyI.H             | 49 +++++++++
 .../rigidBodyModel/rigidBodyModel.C           | 29 +++---
 6 files changed, 229 insertions(+), 16 deletions(-)
 create mode 100644 src/rigidBodyDynamics/bodies/jointBody/jointBody.C
 create mode 100644 src/rigidBodyDynamics/bodies/jointBody/jointBody.H
 create mode 100644 src/rigidBodyDynamics/bodies/jointBody/jointBodyI.H

diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum b/applications/test/rigidBodyDynamics/pendulum/pendulum
index d179af4438..ca72a083a1 100644
--- a/applications/test/rigidBodyDynamics/pendulum/pendulum
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum
@@ -1,4 +1,4 @@
-bodies0
+bodies
 {
     pendulum
     {
@@ -10,12 +10,12 @@ bodies0
         transform       (1 0 0 0 1 0 0 0 1) (0 0 0);
         joint
         {
-            type            Rz;
+            type            floating;
         }
     }
 }
 
-bodies
+bodies0
 {
     hinge
     {
diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index 1e658c85e9..5849d63b1e 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -1,5 +1,6 @@
 bodies/rigidBody/rigidBody.C
 bodies/masslessBody/masslessBody.C
+bodies/jointBody/jointBody.C
 bodies/compositeBody/compositeBody.C
 bodies/subBody/subBody.C
 bodies/sphere/sphere.C
diff --git a/src/rigidBodyDynamics/bodies/jointBody/jointBody.C b/src/rigidBodyDynamics/bodies/jointBody/jointBody.C
new file mode 100644
index 0000000000..01a4a68c1d
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/jointBody/jointBody.C
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "jointBody.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+    defineTypeNameAndDebug(jointBody, 0);
+
+    addToRunTimeSelectionTable
+    (
+        rigidBody,
+        jointBody,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::jointBody::clone() const
+{
+    return autoPtr<rigidBody>(new jointBody(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::jointBody::~jointBody()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/jointBody/jointBody.H b/src/rigidBodyDynamics/bodies/jointBody/jointBody.H
new file mode 100644
index 0000000000..1784de009d
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/jointBody/jointBody.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\3
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::jointBody
+
+Description
+
+SourceFiles
+    jointBodyI.H
+    jointBody.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_jointBody_H
+#define RBD_jointBody_H
+
+#include "masslessBody.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class jointBody Declaration
+\*---------------------------------------------------------------------------*/
+
+class jointBody
+:
+    public masslessBody
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("jointBody");
+
+
+    // Constructors
+
+        //- Construct a joint body
+        inline jointBody();
+
+        //- Construct a named joint body
+        inline jointBody(const word& name);
+
+        //- Construct from dictionary
+        inline jointBody
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Return clone of this jointBody
+        virtual autoPtr<rigidBody> clone() const;
+
+
+    //- Destructor
+    virtual ~jointBody();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "jointBodyI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/jointBody/jointBodyI.H b/src/rigidBodyDynamics/bodies/jointBody/jointBodyI.H
new file mode 100644
index 0000000000..52f5e3bb6b
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/jointBody/jointBodyI.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::RBD::jointBody::jointBody()
+{}
+
+
+inline Foam::RBD::jointBody::jointBody(const word& name)
+:
+    masslessBody(name)
+{}
+
+
+inline Foam::RBD::jointBody::jointBody
+(
+    const word& name,
+    const dictionary& dict
+)
+:
+    masslessBody(name, dict)
+{}
+
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index 47c7983939..6e38206b51 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -26,6 +26,7 @@ License
 #include "rigidBodyModel.H"
 #include "masslessBody.H"
 #include "compositeBody.H"
+#include "jointBody.H"
 #include "nullJoint.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -215,7 +216,7 @@ Foam::label Foam::RBD::rigidBodyModel::join
     label parent = parentID;
     joints::composite& cJoint = cJointPtr();
 
-    // For all but the final joint in the set add a masslessBody with the
+    // For all but the final joint in the set add a jointBody with the
     // joint and transform
     for (label j=0; j<cJoint.size()-1; j++)
     {
@@ -224,7 +225,7 @@ Foam::label Foam::RBD::rigidBodyModel::join
             parent,
             j == 0 ? XT : spatialTransform(),
             cJoint[j].clone(),
-            autoPtr<rigidBody>(new masslessBody)
+            autoPtr<rigidBody>(new jointBody)
         );
     }
 
@@ -341,24 +342,26 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
 
     for (label i=1; i<nBodies(); i++)
     {
-        os  << indent << bodies_[i].name() << nl
-            << indent << token::BEGIN_BLOCK << incrIndent << endl;
+        if (!isType<jointBody>(bodies_[i]))
+        {
+            os  << indent << bodies_[i].name() << nl
+                << indent << token::BEGIN_BLOCK << incrIndent << endl;
 
-        bodies_[i].write(os);
+            bodies_[i].write(os);
 
-        os.writeKeyword("parent")
-            << bodies_[lambda_[i]].name() << token::END_STATEMENT << nl;
+            os.writeKeyword("parent")
+                << bodies_[lambda_[i]].name() << token::END_STATEMENT << nl;
 
-        os.writeKeyword("transform")
-            << XT_[i] << token::END_STATEMENT << nl;
+            os.writeKeyword("transform")
+                << XT_[i] << token::END_STATEMENT << nl;
 
-        os  << indent << "joint" << nl << joints_[i] << endl;
+            os  << indent << "joint" << nl << joints_[i] << endl;
 
-        os  << decrIndent << indent << token::END_BLOCK << endl;
+            os  << decrIndent << indent << token::END_BLOCK << endl;
+        }
     }
 
-
-    forAll (mergedBodies_, i)
+    forAll(mergedBodies_, i)
     {
         os  << indent << mergedBodies_[i].name() << nl
             << indent << token::BEGIN_BLOCK << incrIndent << endl;

From 81a6ea0cc93796a560dbaf849b6cccab696b563d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 8 Apr 2016 17:25:17 +0100
Subject: [PATCH 387/447] rigidBodyModel: Add a few more comments

---
 src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index 6e38206b51..e292fcb525 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -229,7 +229,7 @@ Foam::label Foam::RBD::rigidBodyModel::join
         );
     }
 
-    // For the final joint in the set add the read body
+    // For the final joint in the set add the real body
     parent = join_
     (
         parent,
@@ -237,6 +237,9 @@ Foam::label Foam::RBD::rigidBodyModel::join
         autoPtr<joint>(cJointPtr.ptr()),
         bodyPtr
     );
+
+    // Set the properties of the last joint in the list to those set
+    // by rigidBodyModel
     cJoint.setLastJoint();
 
     return parent;
@@ -340,8 +343,11 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
     os  << indent << "bodies" << nl
         << indent << token::BEGIN_BLOCK << incrIndent << nl;
 
+    // Write the moving bodies
     for (label i=1; i<nBodies(); i++)
     {
+        // Do not write joint-bodies created automatically to support elements
+        // of composite joints
         if (!isType<jointBody>(bodies_[i]))
         {
             os  << indent << bodies_[i].name() << nl
@@ -361,6 +367,7 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
         }
     }
 
+    // Write the bodies merged into the parent bodies for efficiency
     forAll(mergedBodies_, i)
     {
         os  << indent << mergedBodies_[i].name() << nl

From 8ca752eb7991e0cbdb6b87a4ad894bd680517b0e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 8 Apr 2016 18:03:51 +0100
Subject: [PATCH 388/447] 
 applications/test/rigidBodyDynamics/pendulum/pendulum: Corrected joint type

---
 applications/test/rigidBodyDynamics/pendulum/pendulum | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum b/applications/test/rigidBodyDynamics/pendulum/pendulum
index ca72a083a1..75d1a1706c 100644
--- a/applications/test/rigidBodyDynamics/pendulum/pendulum
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum
@@ -10,7 +10,7 @@ bodies
         transform       (1 0 0 0 1 0 0 0 1) (0 0 0);
         joint
         {
-            type            floating;
+            type            Rz;
         }
     }
 }

From 6af11bfa02fa13ff4434eb5cefbd2bc679ca5850 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Apr 2016 23:06:35 +0100
Subject: [PATCH 389/447] spatialTransform: Added the "&&" operator to
 transform positions

---
 .../spatialTransform/spatialTransform.H             |  4 ++++
 .../spatialTransform/spatialTransformI.H            | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
index 77f4946c8e..42eec8fcb8 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
@@ -178,6 +178,10 @@ public:
         //  X.v = (E . vw, E . (vl - r^vw))
         inline spatialVector operator&(const spatialVector& v) const;
 
+        //- Transform position p
+        //  X:p = (E . pw, E . (vl - r))
+        inline spatialVector operator&&(const spatialVector& v) const;
+
 
     // IOstream Operators
 
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
index c245fde390..83f40bb4a8 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
@@ -154,6 +154,19 @@ inline Foam::spatialVector Foam::spatialTransform::operator&
 }
 
 
+inline Foam::spatialVector Foam::spatialTransform::operator&&
+(
+    const spatialVector& v
+) const
+{
+    return spatialVector
+    (
+        E_ & v.w(),
+        E_ & (v.l() - r_)
+    );
+}
+
+
 inline Foam::spatialTransform::transpose::operator spatialTensor() const
 {
     return spatialTensor

From 01d503b1c0fe9d7ea339b8fc7362b2cb6fbc2962 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Apr 2016 23:07:23 +0100
Subject: [PATCH 390/447] applications/test/rigidBodyDynamics/pendulum: Cleanup

---
 .../test/rigidBodyDynamics/pendulum/Make/files  |  2 +-
 .../test/rigidBodyDynamics/pendulum/pendulum    |  4 ++--
 .../test/rigidBodyDynamics/pendulum/pendulum.C  | 17 ++++++++---------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/applications/test/rigidBodyDynamics/pendulum/Make/files b/applications/test/rigidBodyDynamics/pendulum/Make/files
index f860e98af4..471ba2b584 100644
--- a/applications/test/rigidBodyDynamics/pendulum/Make/files
+++ b/applications/test/rigidBodyDynamics/pendulum/Make/files
@@ -1,3 +1,3 @@
 pendulum.C
 
-EXE = $(FOAM_USER_APPBIN)/pendulum
+EXE = $(FOAM_USER_APPBIN)/Test-pendulum
diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum b/applications/test/rigidBodyDynamics/pendulum/pendulum
index 75d1a1706c..d179af4438 100644
--- a/applications/test/rigidBodyDynamics/pendulum/pendulum
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum
@@ -1,4 +1,4 @@
-bodies
+bodies0
 {
     pendulum
     {
@@ -15,7 +15,7 @@ bodies
     }
 }
 
-bodies0
+bodies
 {
     hinge
     {
diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum.C b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
index 49af5cbdd6..18626cba7c 100644
--- a/applications/test/rigidBodyDynamics/pendulum/pendulum.C
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
@@ -81,16 +81,15 @@ int main(int argc, char *argv[])
     */
 
     // Create the pendulum model from dictionary
-    rigidBodyModel pendulum1(dictionary(IFstream("pendulum")()));
-    rigidBodyModel pendulum = pendulum1;
+    rigidBodyModel pendulum(dictionary(IFstream("pendulum")()));
 
     Info<< pendulum << endl;
 
     // Create the joint-space state fields
     scalarField q(pendulum.nDoF(), Zero);
     scalarField w(pendulum.nw(), Zero);
-    scalarField qdot(pendulum.nDoF(), Zero);
-    scalarField qddot(pendulum.nDoF(), Zero);
+    scalarField qDot(pendulum.nDoF(), Zero);
+    scalarField qDdot(pendulum.nDoF(), Zero);
     scalarField tau(pendulum.nDoF(), Zero);
 
     // Set the angle of the pendulum to 0.3rad
@@ -104,20 +103,20 @@ int main(int argc, char *argv[])
     scalar deltaT = 0.01;
     for (scalar t=0; t<4.1; t+=deltaT)
     {
-        qdot += 0.5*deltaT*qddot;
-        q += deltaT*qdot;
+        qDot += 0.5*deltaT*qDdot;
+        q += deltaT*qDot;
 
         pendulum.forwardDynamics
         (
             q,
             w,
-            qdot,
+            qDot,
             tau,
             Field<spatialVector>(),
-            qddot
+            qDdot
         );
 
-        qdot += 0.5*deltaT*qddot;
+        qDot += 0.5*deltaT*qDdot;
 
         Info<< "Time " << t << "s, angle = " << q[0] << "rad" << endl;
     }

From d87b06eadb2476ca8e75b2b5f8aac5e6fc182ad2 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Apr 2016 23:07:45 +0100
Subject: [PATCH 391/447] rigidBodyDynamics/joints: Added doc for namespace

---
 src/rigidBodyDynamics/joints/joint/joint.H | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/rigidBodyDynamics/joints/joint/joint.H b/src/rigidBodyDynamics/joints/joint/joint.H
index 64258a3f71..bdab806be3 100644
--- a/src/rigidBodyDynamics/joints/joint/joint.H
+++ b/src/rigidBodyDynamics/joints/joint/joint.H
@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Namespace
+    Foam::RBD::joints
+
+Description
+    Namespace for rigid-body joints
+
 Class
     Foam::RBD::joint
 

From 762aa208b1172a457bb37d6b9e8089400b511d60 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Apr 2016 23:08:45 +0100
Subject: [PATCH 392/447] rigidBodyDynamics/bodies/subBody: Changed "parent" to
 "master" to avoid confusion with the parent to which this composite body is
 joined

---
 .../bodies/rigidBody/rigidBody.C              |  2 +-
 .../bodies/subBody/subBody.C                  |  6 ++--
 .../bodies/subBody/subBody.H                  | 36 +++++++++----------
 .../bodies/subBody/subBodyI.H                 | 24 ++++++-------
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
index 123f2794a4..ef744a5a0a 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
@@ -112,7 +112,7 @@ void Foam::RBD::rigidBody::merge(const subBody& subBody)
     *this = rigidBody
     (
         name(),
-        *this + transform(subBody.parentXT(), subBody.body())
+        *this + transform(subBody.masterXT(), subBody.body())
     );
 }
 
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBody.C b/src/rigidBodyDynamics/bodies/subBody/subBody.C
index b839538627..96924506be 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBody.C
+++ b/src/rigidBodyDynamics/bodies/subBody/subBody.C
@@ -29,11 +29,11 @@ License
 
 void Foam::RBD::subBody::write(Ostream& os) const
 {
-    os.writeKeyword("parent")
-        << parentName_ << token::END_STATEMENT << nl;
+    os.writeKeyword("master")
+        << masterName_ << token::END_STATEMENT << nl;
 
     os.writeKeyword("transform")
-        << parentXT_ << token::END_STATEMENT << nl;
+        << masterXT_ << token::END_STATEMENT << nl;
 }
 
 
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBody.H b/src/rigidBodyDynamics/bodies/subBody/subBody.H
index f030d32ab7..0cd3f7c930 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBody.H
+++ b/src/rigidBodyDynamics/bodies/subBody/subBody.H
@@ -26,7 +26,7 @@ Class
 
 Description
     This specialized rigidBody holds the original body after it has been merged
-    into a parent.
+    into a master.
 
 SourceFiles
     subBodyI.H
@@ -57,14 +57,14 @@ class subBody
         //- Original body from which this sub-body was constructed
         autoPtr<rigidBody> body_;
 
-        //- Parent body name
-        word parentName_;
+        //- Master body name
+        word masterName_;
 
-        //- Parent body ID
-        label parentID_;
+        //- Master body ID
+        label masterID_;
 
-        //- Transform with respect to parent body
-        spatialTransform parentXT_;
+        //- Transform with respect to master body
+        spatialTransform masterXT_;
 
 
 public:
@@ -72,14 +72,14 @@ public:
     // Constructors
 
         //- Construct a merged version of the given rigidBody
-        //  providing the ID of the parent body to which this will be merged
-        //  and the transform relative to the parent
+        //  providing the ID of the master body to which this will be merged
+        //  and the transform relative to the master
         inline subBody
         (
             const autoPtr<rigidBody>& bodyPtr,
-            const word& parentName,
-            const label parentID,
-            const spatialTransform& parentXT
+            const word& masterName,
+            const label masterID,
+            const spatialTransform& masterXT
         );
 
         //- Return clone of this subBody
@@ -94,14 +94,14 @@ public:
         //- Return the body name
         inline const word& name() const;
 
-        //- Return the parent body name
-        inline const word& parentName() const;
+        //- Return the master body name
+        inline const word& masterName() const;
 
-        //- Return the parent body Id
-        inline label parentID() const;
+        //- Return the master body Id
+        inline label masterID() const;
 
-        //- Return the transform with respect to the parent body
-        inline const spatialTransform& parentXT() const;
+        //- Return the transform with respect to the master body
+        inline const spatialTransform& masterXT() const;
 
         //- Write
         void write(Ostream&) const;
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
index 79104889ee..767ffc9612 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
+++ b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
@@ -28,15 +28,15 @@ License
 inline Foam::RBD::subBody::subBody
 (
     const autoPtr<rigidBody>& bodyPtr,
-    const word& parentName,
-    const label parentID,
-    const spatialTransform& parentXT
+    const word& masterName,
+    const label masterID,
+    const spatialTransform& masterXT
 )
 :
     body_(bodyPtr),
-    parentName_(parentName),
-    parentID_(parentID),
-    parentXT_(parentXT)
+    masterName_(masterName),
+    masterID_(masterID),
+    masterXT_(masterXT)
 {}
 
 
@@ -60,21 +60,21 @@ inline const Foam::word& Foam::RBD::subBody::name() const
 }
 
 
-inline const Foam::word& Foam::RBD::subBody::parentName() const
+inline const Foam::word& Foam::RBD::subBody::masterName() const
 {
-    return parentName_;
+    return masterName_;
 }
 
 
-inline Foam::label Foam::RBD::subBody::parentID() const
+inline Foam::label Foam::RBD::subBody::masterID() const
 {
-    return parentID_;
+    return masterID_;
 }
 
 
-inline const Foam::spatialTransform& Foam::RBD::subBody::parentXT() const
+inline const Foam::spatialTransform& Foam::RBD::subBody::masterXT() const
 {
-    return parentXT_;
+    return masterXT_;
 }
 
 

From 1f51c8a89dd759a2c2bfa53f2e40f44c62c5ac44 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Apr 2016 23:12:07 +0100
Subject: [PATCH 393/447] rigidBodyDynamics: Added support for restraints and a
 linear spring with damper

applications/test/rigidBodyDynamics/spring: Test of the linear spring with damper restraint
Damped simple harmonic motion of a weight on a spring is simulated and
the results compared with analytical solution

    Test-spring
    gnuplot spring.gnuplot
    evince spring.eps

This development is sponsored by Carnegie Wave Energy Ltd.
---
 .../test/rigidBodyDynamics/spring/Make/files  |   3 +
 .../rigidBodyDynamics/spring/Make/options     |   5 +
 .../test/rigidBodyDynamics/spring/spring      |  30 +++
 .../test/rigidBodyDynamics/spring/spring.C    | 109 +++++++++++
 .../rigidBodyDynamics/spring/spring.gnuplot   |  76 ++++++++
 src/rigidBodyDynamics/Make/files              |   4 +
 .../restraints/linearSpring/linearSpring.C    | 152 ++++++++++++++++
 .../restraints/linearSpring/linearSpring.H    | 130 +++++++++++++
 .../restraints/restraint/rigidBodyRestraint.C |  84 +++++++++
 .../restraints/restraint/rigidBodyRestraint.H | 171 ++++++++++++++++++
 .../restraint/rigidBodyRestraintNew.C         |  57 ++++++
 .../rigidBodyModel/forwardDynamics.C          |  17 ++
 .../rigidBodyModel/rigidBodyModel.C           |  88 ++++++++-
 .../rigidBodyModel/rigidBodyModel.H           |  25 +++
 .../rigidBodyModel/rigidBodyModelI.H          |  52 ++++++
 15 files changed, 993 insertions(+), 10 deletions(-)
 create mode 100644 applications/test/rigidBodyDynamics/spring/Make/files
 create mode 100644 applications/test/rigidBodyDynamics/spring/Make/options
 create mode 100644 applications/test/rigidBodyDynamics/spring/spring
 create mode 100644 applications/test/rigidBodyDynamics/spring/spring.C
 create mode 100644 applications/test/rigidBodyDynamics/spring/spring.gnuplot
 create mode 100644 src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
 create mode 100644 src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
 create mode 100644 src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
 create mode 100644 src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
 create mode 100644 src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C

diff --git a/applications/test/rigidBodyDynamics/spring/Make/files b/applications/test/rigidBodyDynamics/spring/Make/files
new file mode 100644
index 0000000000..397706b3ac
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/spring/Make/files
@@ -0,0 +1,3 @@
+spring.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-spring
diff --git a/applications/test/rigidBodyDynamics/spring/Make/options b/applications/test/rigidBodyDynamics/spring/Make/options
new file mode 100644
index 0000000000..4a9d828b67
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/spring/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/rigidBodyDynamics/lnInclude
+
+EXE_LIBS = \
+    -lrigidBodyDynamics
diff --git a/applications/test/rigidBodyDynamics/spring/spring b/applications/test/rigidBodyDynamics/spring/spring
new file mode 100644
index 0000000000..3024b0622b
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/spring/spring
@@ -0,0 +1,30 @@
+bodies
+{
+    weight
+    {
+        type            rigidBody;
+        mass            9.6;
+        centreOfMass    (0 0 0);
+        inertia         (0.1052 0 0 0.1052 0 0.1778);
+        parent          root;
+        transform       (1 0 0 0 1 0 0 0 1) (0 0 0);
+        joint
+        {
+            type            Pz;
+        }
+    }
+}
+
+restraints
+{
+    spring
+    {
+        type            linearSpring;
+        body            weight;
+        anchor          (0 0 0.5);
+        refAttachmentPt (0 0 0);
+        stiffness       5000;
+        damping         50;
+        restLength      0.4;
+    }
+}
diff --git a/applications/test/rigidBodyDynamics/spring/spring.C b/applications/test/rigidBodyDynamics/spring/spring.C
new file mode 100644
index 0000000000..65c6e88a5a
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/spring/spring.C
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+Application
+    spring
+
+Description
+    Simple weight and damped-spirng simulation with 1-DoF.
+
+\*---------------------------------------------------------------------------*/
+
+#include "rigidBodyModel.H"
+#include "masslessBody.H"
+#include "sphere.H"
+#include "joints.H"
+#include "IFstream.H"
+#include "OFstream.H"
+
+using namespace Foam;
+using namespace RBD;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    // Create the spring model from dictionary
+    rigidBodyModel spring(dictionary(IFstream("spring")()));
+
+    Info<< spring << endl;
+
+    // Create the joint-space state fields
+    scalarField q(spring.nDoF(), Zero);
+    scalarField w(spring.nw(), Zero);
+    scalarField qDot(spring.nDoF(), Zero);
+    scalarField qDdot(spring.nDoF(), Zero);
+    scalarField tau(spring.nDoF(), Zero);
+    Field<spatialVector> fx(spring.nBodies(), Zero);
+
+    OFstream qFile("qVsTime");
+    OFstream qDotFile("qDotVsTime");
+
+    // Integrate the motion of the spring for 4s using a symplectic method
+    scalar deltaT = 0.002;
+    for (scalar t=0; t<4; t+=deltaT)
+    {
+        qDot += 0.5*deltaT*qDdot;
+        q += deltaT*qDot;
+
+        // Update the body-state prior to the evaluation of the restraints
+        spring.forwardDynamicsCorrection
+        (
+            q,
+            w,
+            qDot,
+            qDdot
+        );
+
+        // Accumulate the restraint forces
+        fx = Zero;
+        spring.applyRestraints(fx);
+
+        // Calculate the body acceleration for the given state
+        // and restraint forces
+        spring.forwardDynamics
+        (
+            q,
+            w,
+            qDot,
+            tau,
+            fx,
+            qDdot
+        );
+
+        // Update the velocity
+        qDot += 0.5*deltaT*qDdot;
+
+        // Write the results for graph generation
+        // using 'gnuplot spring.gnuplot'
+        qFile << t << " " << q[0] << endl;
+        qDotFile << t << " " << qDot[0] << endl;
+    }
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/rigidBodyDynamics/spring/spring.gnuplot b/applications/test/rigidBodyDynamics/spring/spring.gnuplot
new file mode 100644
index 0000000000..28813508f4
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/spring/spring.gnuplot
@@ -0,0 +1,76 @@
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2016 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/>.
+#
+# Script
+#     spring.gnuplot
+#
+# Description
+#     Creates an PostScript graph file of Test-spring results vs
+#     the analytical solution.
+#
+#------------------------------------------------------------------------------
+
+reset
+
+set samples 2000
+
+k = 5000.0
+m = 9.6
+c = 50.0
+a = -0.1
+
+omega = sqrt(k/m)
+zeta = c/(2.0*m*omega)
+
+phi = atan((sqrt(1.0 - zeta**2))/zeta)
+A = a/sin(phi)
+
+pos(A, t, omega, phi, zeta) = A*exp(-zeta*omega*t)*sin(sqrt(1-zeta**2)*omega*t + phi)
+vel(A, t, omega, phi, zeta) = \
+A*exp(-zeta*omega*t)*\
+( \
+  sqrt(1-zeta**2)*omega*cos(sqrt(1-zeta**2)*omega*t + phi) \
+- zeta*omega*sin(sqrt(1-zeta**2)*omega*t + phi) \
+)
+
+set xlabel "Time/[s]"
+set ylabel "Position"
+
+set ytics nomirror
+set y2tics
+
+set yrange [-0.1:0.1]
+set y2range [-2:2]
+
+set xzeroaxis
+
+set terminal postscript eps color enhanced solid
+set output "spring.eps"
+
+plot \
+    "qVsTime" u 1:($2 - 0.1) w l t "Simulation, centre of mass relative to start", \
+    pos(A, x, omega, phi, zeta) w l t "Analytical solution, centre of mass", \
+    "qDotVsTime" u 1:2 w l axes x1y2 t "Simulation, vertical velocity", \
+    vel(A, x, omega, phi, zeta) w l axes x1y2 t "Analytical solution, vertical velocity"
+
+#------------------------------------------------------------------------------
diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index 5849d63b1e..ad592dc7ef 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -25,6 +25,10 @@ joints/Pz/Pz.C
 joints/Pa/Pa.C
 joints/Pxyz/Pxyz.C
 
+restraints/restraint/rigidBodyRestraint.C
+restraints/restraint/rigidBodyRestraintNew.C
+restraints/linearSpring/linearSpring.C
+
 rigidBodyModel/rigidBodyModel.C
 rigidBodyModel/forwardDynamics.C
 
diff --git a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
new file mode 100644
index 0000000000..ed1efb7f42
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
@@ -0,0 +1,152 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "linearSpring.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace restraints
+{
+    defineTypeNameAndDebug(linearSpring, 0);
+
+    addToRunTimeSelectionTable
+    (
+        restraint,
+        linearSpring,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::restraints::linearSpring::linearSpring
+(
+    const word& name,
+    const dictionary& dict,
+    const rigidBodyModel& model
+)
+:
+    restraint(name, dict, model),
+    anchor_(),
+    refAttachmentPt_(),
+    stiffness_(),
+    damping_(),
+    restLength_()
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::restraints::linearSpring::~linearSpring()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::spatialVector Foam::RBD::restraints::linearSpring::restrain() const
+{
+    spatialVector attachmentPt
+    (
+        model_.X0(bodyIndex_).inv() && spatialVector(Zero, refAttachmentPt_)
+    );
+
+    // Current axis of the spring
+    vector r = attachmentPt.l() - anchor_;
+    scalar magR = mag(r);
+    r /= (magR + VSMALL);
+
+    // Velocity of the end of the spring
+    vector v = model_.v(bodyIndex_, refAttachmentPt_).l();
+
+    // Force and moment including optional damping
+    vector force = (-stiffness_*(magR - restLength_) - damping_*(r & v))*r;
+    vector moment = (attachmentPt.l() - model_.X0(bodyIndex_).r()) ^ force;
+
+    if (model_.debug)
+    {
+        Info<< " attachmentPt - anchor " << r*magR
+            << " spring length " << magR
+            << " force " << force
+            << " moment " << moment
+            << endl;
+    }
+
+    return spatialVector(moment, force);
+}
+
+
+bool Foam::RBD::restraints::linearSpring::read
+(
+    const dictionary& dict
+)
+{
+    restraint::read(dict);
+
+    coeffs_.lookup("anchor") >> anchor_;
+    coeffs_.lookup("refAttachmentPt") >> refAttachmentPt_;
+    coeffs_.lookup("stiffness") >> stiffness_;
+    coeffs_.lookup("damping") >> damping_;
+    coeffs_.lookup("restLength") >> restLength_;
+
+    return true;
+}
+
+
+void Foam::RBD::restraints::linearSpring::write
+(
+    Ostream& os
+) const
+{
+    restraint::write(os);
+
+    os.writeKeyword("anchor")
+        << anchor_ << token::END_STATEMENT << nl;
+
+    os.writeKeyword("refAttachmentPt")
+        << refAttachmentPt_ << token::END_STATEMENT << nl;
+
+    os.writeKeyword("stiffness")
+        << stiffness_ << token::END_STATEMENT << nl;
+
+    os.writeKeyword("damping")
+        << damping_ << token::END_STATEMENT << nl;
+
+    os.writeKeyword("restLength")
+        << restLength_ << token::END_STATEMENT << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
new file mode 100644
index 0000000000..83d26b512e
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::restraints::linearSpring
+
+Description
+    Linear spring restraint.
+
+SourceFiles
+    linearSpring.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef linearSpring_H
+#define linearSpring_H
+
+#include "rigidBodyRestraint.H"
+#include "point.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace restraints
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class linearSpring Declaration
+\*---------------------------------------------------------------------------*/
+
+class linearSpring
+:
+    public restraint
+{
+    // Private data
+
+        //- Anchor point, where the spring is attached to an immovable
+        //  object
+        point anchor_;
+
+        //- Reference point of attachment to the solid body
+        point refAttachmentPt_;
+
+        //- Spring stiffness coefficient (N/m)
+        scalar stiffness_;
+
+        //- Damping coefficient (Ns/m)
+        scalar damping_;
+
+        //- Rest length - length of spring when no forces are applied to it
+        scalar restLength_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("linearSpring");
+
+
+    // Constructors
+
+        //- Construct from components
+        linearSpring
+        (
+            const word& name,
+            const dictionary& dict,
+            const rigidBodyModel& model
+        );
+
+        //- Construct and return a clone
+        virtual autoPtr<restraint> clone() const
+        {
+            return autoPtr<restraint>
+            (
+                new linearSpring(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~linearSpring();
+
+
+    // Member Functions
+
+        //- Return the external force applied to the body by this restraint
+        virtual spatialVector restrain() const;
+
+        //- Update properties from given dictionary
+        virtual bool read(const dictionary& dict);
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace restraints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
new file mode 100644
index 0000000000..3a75c4efbb
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------* \
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodyRestraint.H"
+#include "rigidBodyModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+    defineTypeNameAndDebug(restraint, 0);
+    defineRunTimeSelectionTable(restraint, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::restraint::restraint
+(
+    const word& name,
+    const dictionary& dict,
+    const rigidBodyModel& model
+)
+:
+    name_(name),
+    bodyIndex_(model.bodyID(dict.lookup("body"))),
+    coeffs_(dict),
+    model_(model)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::restraint::~restraint()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+const Foam::dictionary& Foam::RBD::restraint::coeffDict() const
+{
+    return coeffs_;
+}
+
+
+bool Foam::RBD::restraint::read(const dictionary& dict)
+{
+    coeffs_ = dict;
+    return true;
+}
+
+
+void Foam::RBD::restraint::write(Ostream& os) const
+{
+    os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
new file mode 100644
index 0000000000..917e2e6e19
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+Namespace
+    Foam::RBD::restraints
+
+Description
+    Namespace for rigid-body dynamics restraints
+
+Class
+    Foam::RBD::restraint
+
+Description
+    Base class for defining restraints for rigid-body dynamics
+
+SourceFiles
+    rigidBodyRestraint.C
+    rigidBodyRestraintNew.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_restraint_H
+#define RBD_restraint_H
+
+#include "dictionary.H"
+#include "autoPtr.H"
+#include "spatialVector.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+
+// Forward declaration of classes
+class rigidBodyModel;
+
+/*---------------------------------------------------------------------------*\
+                Class restraint Declaration
+\*---------------------------------------------------------------------------*/
+
+class restraint
+{
+
+protected:
+
+    // Protected data
+
+        //- Name of the restraint
+        word name_;
+
+        //- Index of the body the restraint is applied to
+        label bodyIndex_;
+
+        //- Restraint model specific coefficient dictionary
+        dictionary coeffs_;
+
+        //- Reference to the model
+        const rigidBodyModel& model_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("restraint");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            restraint,
+            dictionary,
+            (
+                const word& name,
+                const dictionary& dict,
+                const rigidBodyModel& model
+            ),
+            (name, dict, model)
+        );
+
+
+    // Constructors
+
+        //- Construct from the dict dictionary and Time
+        restraint
+        (
+            const word& name,
+            const dictionary& dict,
+            const rigidBodyModel& model
+        );
+
+        //- Construct and return a clone
+        virtual autoPtr<restraint> clone() const = 0;
+
+
+    // Selectors
+
+        //- Select constructed from the dict dictionary and Time
+        static autoPtr<restraint> New
+        (
+            const word& name,
+            const dictionary& dict,
+            const rigidBodyModel& model
+        );
+
+
+    //- Destructor
+    virtual ~restraint();
+
+
+    // Member Functions
+
+        //- Return the name
+        const word& name() const
+        {
+            return name_;
+        }
+
+        label bodyIndex() const
+        {
+            return bodyIndex_;
+        }
+
+        //- Return the external force applied to the body by this restraint
+        virtual spatialVector restrain() const = 0;
+
+        //- Update properties from given dictionary
+        virtual bool read(const dictionary& dict);
+
+        //- Return access to coeffs
+        const dictionary& coeffDict() const;
+
+        //- Write
+        virtual void write(Ostream&) const = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C
new file mode 100644
index 0000000000..ee8e0f2f1c
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodyRestraint.H"
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::RBD::restraint>
+Foam::RBD::restraint::New
+(
+    const word& name,
+    const dictionary& dict,
+    const rigidBodyModel& model
+)
+{
+    const word restraintType(dict.lookup("type"));
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(restraintType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown restraint type "
+            << restraintType << nl << nl
+            << "Valid restraint types are : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<restraint>(cstrIter()(name, dict, model));
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
index fc7bfd5e0c..411404dd85 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
@@ -27,6 +27,23 @@ License
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+void Foam::RBD::rigidBodyModel::applyRestraints(Field<spatialVector>& fx) const
+{
+    if (restraints_.empty())
+    {
+        return;
+    }
+
+    forAll(restraints_, ri)
+    {
+        DebugInfo << "Restraint " << restraints_[ri].name();
+
+        // Accumulate the restraint forces
+        fx[restraints_[ri].bodyIndex()] += restraints_[ri].restrain();
+    }
+}
+
+
 void Foam::RBD::rigidBodyModel::forwardDynamics
 (
     const scalarField& q,
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index e292fcb525..fe6471ac30 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -78,6 +78,41 @@ void Foam::RBD::rigidBodyModel::resizeState()
 }
 
 
+void Foam::RBD::rigidBodyModel::addRestraints
+(
+    const dictionary& dict
+)
+{
+    if (dict.found("restraints"))
+    {
+        const dictionary& restraintDict = dict.subDict("restraints");
+
+        label i = 0;
+
+        restraints_.setSize(restraintDict.size());
+
+        forAllConstIter(IDLList<entry>, restraintDict, iter)
+        {
+            if (iter().isDict())
+            {
+                restraints_.set
+                (
+                    i++,
+                    restraint::New
+                    (
+                        iter().keyword(),
+                        iter().dict(),
+                        *this
+                    )
+                );
+            }
+        }
+
+        restraints_.setSize(i);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
 
 Foam::RBD::rigidBodyModel::rigidBodyModel()
@@ -120,6 +155,9 @@ Foam::RBD::rigidBodyModel::rigidBodyModel(const dictionary& dict)
             );
         }
     }
+
+    // Read the restraints and any other re-readable settings.
+    read(dict);
 }
 
 
@@ -144,8 +182,8 @@ Foam::label Foam::RBD::rigidBodyModel::join_
     if (merged(parentID))
     {
         const subBody& sBody = mergedBody(parentID);
-        lambda_.append(sBody.parentID());
-        XT_.append(XT & sBody.parentXT());
+        lambda_.append(sBody.masterID());
+        XT_.append(XT & sBody.masterXT());
     }
     else
     {
@@ -279,16 +317,16 @@ Foam::label Foam::RBD::rigidBodyModel::merge
     {
         const subBody& sBody = mergedBody(parentID);
 
-        makeComposite(sBody.parentID());
+        makeComposite(sBody.masterID());
 
         sBodyPtr.set
         (
             new subBody
             (
                 bodyPtr,
-                bodies_[sBody.parentID()].name(),
-                sBody.parentID(),
-                XT & sBody.parentXT()
+                bodies_[sBody.masterID()].name(),
+                sBody.masterID(),
+                XT & sBody.masterXT()
             )
         );
     }
@@ -312,7 +350,7 @@ Foam::label Foam::RBD::rigidBodyModel::merge
     mergedBodies_.append(sBodyPtr);
 
     // Merge the sub-body with the parent
-    bodies_[sBody.parentID()].merge(sBody);
+    bodies_[sBody.masterID()].merge(sBody);
 
     const label sBodyID = mergedBodyID(mergedBodies_.size() - 1);
     bodyIDs_.insert(sBody.name(), sBodyID);
@@ -329,7 +367,7 @@ Foam::spatialTransform Foam::RBD::rigidBodyModel::X0
     if (merged(bodyId))
     {
         const subBody& mBody = mergedBody(bodyId);
-        return mBody.parentXT() & X0_[mBody.parentID()];
+        return mBody.masterXT() & X0_[mBody.masterID()];
     }
     else
     {
@@ -376,15 +414,45 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
         mergedBodies_[i].body().write(os);
 
         os.writeKeyword("transform")
-            << mergedBodies_[i].parentXT() << token::END_STATEMENT << nl;
+            << mergedBodies_[i].masterXT() << token::END_STATEMENT << nl;
 
         os.writeKeyword("mergeWith")
-            << mergedBodies_[i].parentName() << token::END_STATEMENT << nl;
+            << mergedBodies_[i].masterName() << token::END_STATEMENT << nl;
 
         os  << decrIndent << indent << token::END_BLOCK << endl;
     }
 
     os  << decrIndent << indent << token::END_BLOCK << nl;
+
+
+    if (!restraints_.empty())
+    {
+        os  << indent << "restraints" << nl
+            << indent << token::BEGIN_BLOCK << incrIndent << nl;
+
+        forAll(restraints_, ri)
+        {
+            word restraintType = restraints_[ri].type();
+
+            os  << indent << restraints_[ri].name() << nl
+                << indent << token::BEGIN_BLOCK << incrIndent << endl;
+
+            restraints_[ri].write(os);
+
+            os  << decrIndent << indent << token::END_BLOCK << endl;
+        }
+
+        os  << decrIndent << indent << token::END_BLOCK << nl;
+    }
+}
+
+
+bool Foam::RBD::rigidBodyModel::read(const dictionary& dict)
+{
+    restraints_.clear();
+    addRestraints(dict);
+
+    return true;
 }
 
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
index ff7a0a5391..5f4d18fb0d 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
@@ -53,6 +53,7 @@ SourceFiles
 #include "subBody.H"
 #include "joint.H"
 #include "compositeJoint.H"
+#include "rigidBodyRestraint.H"
 #include "PtrList.H"
 #include "HashTable.H"
 
@@ -85,6 +86,9 @@ class rigidBodyModel
         //- Convert the body with given ID into a composite-body
         void makeComposite(const label bodyID);
 
+        //- Add restraints to the motion
+        void addRestraints(const dictionary& dict);
+
 
 protected:
 
@@ -124,6 +128,9 @@ protected:
         //  joint.
         label nw_;
 
+        //- Motion restraints
+        PtrList<restraint> restraints_;
+
 
     // Other protected member data
 
@@ -288,6 +295,10 @@ public:
         //- Return true if the body with given ID has been merged with a parent
         inline bool merged(label bodyID) const;
 
+        //- Return the ID of the master body for a sub-body otherwise
+        //  return the given body ID
+        inline label master(label bodyID) const;
+
         //- Return the index of the merged body in the mergedBody list
         //  from the given body ID
         inline label mergedBodyIndex(const label mergedBodyID) const;
@@ -305,6 +316,16 @@ public:
         //- Return the current transform to the global frame for the given body
         spatialTransform X0(const label bodyId) const;
 
+        // Find the corresponding point in the master body frame
+        vector masterPoint(const label bodyID, const vector& p) const;
+
+        //- Return the velocity of the given point on the given body
+        spatialVector v(const label bodyID, const vector& p) const;
+
+        //- Apply the restraints and accumulate the external forces
+        //  into the fx field
+        void applyRestraints(Field<spatialVector>& fx) const;
+
         //- Calculate the joint acceleration qDdot from the joint state q,
         //  velocity qDot, internal force tau (in the joint frame) and
         //  external force fx (in the global frame) using the articulated body
@@ -333,6 +354,10 @@ public:
         //- Write
         virtual void write(Ostream&) const;
 
+        //- Read coefficients dictionary and update system parameters,
+        //  restraints but not the current state
+        bool read(const dictionary& dict);
+
 
     // Ostream Operator
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
index 34fa0670ef..478547892e 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
@@ -89,6 +89,19 @@ inline bool Foam::RBD::rigidBodyModel::merged(label bodyID) const
 }
 
 
+inline Foam::label Foam::RBD::rigidBodyModel::master(label bodyID) const
+{
+    if (bodyID < 0)
+    {
+        return mergedBody(bodyID).masterID();
+    }
+    else
+    {
+        return bodyID;
+    }
+}
+
+
 inline Foam::label
 Foam::RBD::rigidBodyModel::mergedBodyID(const label mergedBodyIndex) const
 {
@@ -123,4 +136,43 @@ inline Foam::label Foam::RBD::rigidBodyModel::bodyID(const word& name) const
 }
 
 
+inline Foam::vector Foam::RBD::rigidBodyModel::masterPoint
+(
+    const label bodyID,
+    const vector& p
+) const
+{
+    if (merged(bodyID))
+    {
+        return
+        (
+            mergedBody(bodyID).masterXT().inv()
+         && spatialVector(Zero, p)
+        ).l();
+    }
+    else
+    {
+        return p;
+    }
+}
+
+
+inline Foam::spatialVector Foam::RBD::rigidBodyModel::v
+(
+    const label bodyID,
+    const vector& p
+) const
+{
+    return
+    (
+        spatialTransform
+        (
+            X0_[master(bodyID)].E().T(),
+            masterPoint(bodyID, p)
+        )
+      & v_[master(bodyID)]
+    );
+}
+
+
 // ************************************************************************* //

From be567300c391633a68838ee5e7616043cf3bce53 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 11 Apr 2016 11:45:51 +0100
Subject: [PATCH 394/447] rigidBodyDynamics/restraints: Complete dictionary IO

---
 .../test/rigidBodyDynamics/spring/spring.C    |  1 +
 .../restraints/linearSpring/linearSpring.C    | 13 ++---
 .../restraints/linearSpring/linearSpring.H    |  5 +-
 .../restraints/restraint/rigidBodyRestraint.C |  5 +-
 .../restraints/restraint/rigidBodyRestraint.H | 16 ++++++-
 .../restraint/rigidBodyRestraintI.H           | 48 +++++++++++++++++++
 .../rigidBodyModel/forwardDynamics.C          |  1 +
 .../rigidBodyModel/rigidBodyModel.C           |  1 +
 .../rigidBodyModel/rigidBodyModel.H           |  5 +-
 .../rigidBodyModel/rigidBodyModelI.H          | 22 +++++++--
 10 files changed, 99 insertions(+), 18 deletions(-)
 create mode 100644 src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintI.H

diff --git a/applications/test/rigidBodyDynamics/spring/spring.C b/applications/test/rigidBodyDynamics/spring/spring.C
index 65c6e88a5a..a62bcb696d 100644
--- a/applications/test/rigidBodyDynamics/spring/spring.C
+++ b/applications/test/rigidBodyDynamics/spring/spring.C
@@ -33,6 +33,7 @@ Description
 #include "masslessBody.H"
 #include "sphere.H"
 #include "joints.H"
+#include "rigidBodyRestraint.H"
 #include "IFstream.H"
 #include "OFstream.H"
 
diff --git a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
index ed1efb7f42..42dc95b3ef 100644
--- a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
+++ b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
@@ -78,22 +78,19 @@ Foam::RBD::restraints::linearSpring::~linearSpring()
 
 Foam::spatialVector Foam::RBD::restraints::linearSpring::restrain() const
 {
-    spatialVector attachmentPt
-    (
-        model_.X0(bodyIndex_).inv() && spatialVector(Zero, refAttachmentPt_)
-    );
+    point attachmentPt = bodyPoint(refAttachmentPt_);
 
     // Current axis of the spring
-    vector r = attachmentPt.l() - anchor_;
+    vector r = attachmentPt - anchor_;
     scalar magR = mag(r);
     r /= (magR + VSMALL);
 
-    // Velocity of the end of the spring
-    vector v = model_.v(bodyIndex_, refAttachmentPt_).l();
+    // Velocity of the attached end of the spring
+    vector v = bodyPointVelocity(refAttachmentPt_).l();
 
     // Force and moment including optional damping
     vector force = (-stiffness_*(magR - restLength_) - damping_*(r & v))*r;
-    vector moment = (attachmentPt.l() - model_.X0(bodyIndex_).r()) ^ force;
+    vector moment = (attachmentPt - model_.X0(bodyIndex_).r()) ^ force;
 
     if (model_.debug)
     {
diff --git a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
index 83d26b512e..26bff8b8c0 100644
--- a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
+++ b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
@@ -32,11 +32,10 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef linearSpring_H
-#define linearSpring_H
+#ifndef RBD_restraints_linearSpring_H
+#define RBD_restraints_linearSpring_H
 
 #include "rigidBodyRestraint.H"
-#include "point.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
index 3a75c4efbb..f17b3b133a 100644
--- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
@@ -77,7 +77,10 @@ bool Foam::RBD::restraint::read(const dictionary& dict)
 
 void Foam::RBD::restraint::write(Ostream& os) const
 {
-    os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
+    os.writeKeyword("type")
+        << type() << token::END_STATEMENT << nl;
+    os.writeKeyword("body")
+        << model_.name(bodyIndex_) << token::END_STATEMENT << nl;
 }
 
 
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
index 917e2e6e19..c8320cbe7e 100644
--- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
@@ -39,12 +39,13 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef RBD_restraint_H
-#define RBD_restraint_H
+#ifndef RBD_rigidBodyRestraint_H
+#define RBD_rigidBodyRestraint_H
 
 #include "dictionary.H"
 #include "autoPtr.H"
 #include "spatialVector.H"
+#include "point.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -80,6 +81,13 @@ protected:
         //- Reference to the model
         const rigidBodyModel& model_;
 
+        //- Transform the given point on the restrained body to the global frame
+        inline point bodyPoint(const point& p) const;
+
+        //- Transform the velocity of the given point on the restrained body
+        //  to the global frame
+        inline spatialVector bodyPointVelocity(const point& p) const;
+
 
 public:
 
@@ -166,6 +174,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "rigidBodyRestraintI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintI.H b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintI.H
new file mode 100644
index 0000000000..c825702455
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintI.H
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodyModel.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::point Foam::RBD::restraint::bodyPoint
+(
+    const point& p
+) const
+{
+    return (model_.X0(bodyIndex_).inv() && spatialVector(Zero, p)).l();
+}
+
+
+inline Foam::spatialVector Foam::RBD::restraint::bodyPointVelocity
+(
+    const point& p
+) const
+{
+    return model_.v(bodyIndex_, p);
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
index 411404dd85..fbd0b02573 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "rigidBodyModel.H"
+#include "rigidBodyRestraint.H"
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index fe6471ac30..7993b3c77e 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -28,6 +28,7 @@ License
 #include "compositeBody.H"
 #include "jointBody.H"
 #include "nullJoint.H"
+#include "rigidBodyRestraint.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
index 5f4d18fb0d..c7a995a4be 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
@@ -53,7 +53,6 @@ SourceFiles
 #include "subBody.H"
 #include "joint.H"
 #include "compositeJoint.H"
-#include "rigidBodyRestraint.H"
 #include "PtrList.H"
 #include "HashTable.H"
 
@@ -64,6 +63,7 @@ namespace RBD
 
 // Forward declaration of friend functions and operators
 class rigidBodyModel;
+class restraint;
 
 Ostream& operator<<(Ostream&, const rigidBodyModel&);
 
@@ -255,6 +255,9 @@ public:
         //  after model construction
         inline vector& g();
 
+        //- Return the name of body with the given ID
+        inline const word& name(const label bodyID) const;
+
         //- Return the inertia of body i
         inline const rigidBodyInertia& I(const label i) const;
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
index 478547892e..ece6c9766d 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
@@ -38,6 +38,13 @@ Foam::RBD::rigidBodyModel::bodies() const
 }
 
 
+inline const Foam::DynamicList<Foam::label>&
+Foam::RBD::rigidBodyModel::lambda() const
+{
+    return lambda_;
+}
+
+
 inline const Foam::PtrList<Foam::RBD::joint>&
 Foam::RBD::rigidBodyModel::joints() const
 {
@@ -69,10 +76,19 @@ inline Foam::vector& Foam::RBD::rigidBodyModel::g()
 }
 
 
-inline const Foam::DynamicList<Foam::label>&
-Foam::RBD::rigidBodyModel::lambda() const
+inline const Foam::word& Foam::RBD::rigidBodyModel::name
+(
+    const label bodyID
+) const
 {
-    return lambda_;
+    if (merged(bodyID))
+    {
+        return mergedBody(bodyID).name();
+    }
+    else
+    {
+        return bodies_[bodyID].name();
+    }
 }
 
 

From a108759d3e0deea4f430c49ddda9f164a872fe27 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 11 Apr 2016 14:28:09 +0100
Subject: [PATCH 395/447] rigidBodyDynamics/restraints: Added linearDamper

---
 src/rigidBodyDynamics/Make/files              |   1 +
 .../restraints/linearDamper/linearDamper.C    | 112 +++++++++++++++++
 .../restraints/linearDamper/linearDamper.H    | 116 ++++++++++++++++++
 .../restraints/linearSpring/linearSpring.C    |  20 +--
 .../restraints/linearSpring/linearSpring.H    |   4 +-
 .../restraints/restraint/rigidBodyRestraint.C |   4 +-
 .../restraints/restraint/rigidBodyRestraint.H |   8 +-
 .../restraint/rigidBodyRestraintI.H           |   4 +-
 .../rigidBodyModel/forwardDynamics.C          |   2 +-
 .../rigidBodyModel/rigidBodyModel.C           |   6 +
 .../rigidBodyModel/rigidBodyModel.H           |   7 +-
 .../rigidBodyModel/rigidBodyModelI.H          |   7 ++
 12 files changed, 268 insertions(+), 23 deletions(-)
 create mode 100644 src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
 create mode 100644 src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H

diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index ad592dc7ef..bdd244ae8a 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -28,6 +28,7 @@ joints/Pxyz/Pxyz.C
 restraints/restraint/rigidBodyRestraint.C
 restraints/restraint/rigidBodyRestraintNew.C
 restraints/linearSpring/linearSpring.C
+restraints/linearDamper/linearDamper.C
 
 rigidBodyModel/rigidBodyModel.C
 rigidBodyModel/forwardDynamics.C
diff --git a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
new file mode 100644
index 0000000000..8b2939a56a
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013-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 "linearDamper.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace restraints
+{
+    defineTypeNameAndDebug(linearDamper, 0);
+
+    addToRunTimeSelectionTable
+    (
+        restraint,
+        linearDamper,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::restraints::linearDamper::linearDamper
+(
+    const word& name,
+    const dictionary& dict,
+    const rigidBodyModel& model
+)
+:
+    restraint(name, dict, model)
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::restraints::linearDamper::~linearDamper()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::spatialVector Foam::RBD::restraints::linearDamper::restrain() const
+{
+    vector force = -coeff_*model_.v(model_.master(bodyID_)).l();
+
+    if (model_.debug)
+    {
+        Info<< " force " << force << endl;
+    }
+
+    return spatialVector(Zero, force);
+}
+
+
+bool Foam::RBD::restraints::linearDamper::read
+(
+    const dictionary& dict
+)
+{
+    restraint::read(dict);
+
+    coeffs_.lookup("coeff") >> coeff_;
+
+    return true;
+}
+
+
+void Foam::RBD::restraints::linearDamper::write
+(
+    Ostream& os
+) const
+{
+    restraint::write(os);
+
+    os.writeKeyword("coeff")
+        << coeff_ << token::END_STATEMENT << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H
new file mode 100644
index 0000000000..e9ede58277
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::restraints::linearDamper
+
+Description
+    Linear damper restraint.  Operates in the local frame of the body.
+
+SourceFiles
+    linearDamper.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_restraints_linearDamper_H
+#define RBD_restraints_linearDamper_H
+
+#include "rigidBodyRestraint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace restraints
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class linearDamper Declaration
+\*---------------------------------------------------------------------------*/
+
+class linearDamper
+:
+    public restraint
+{
+    // Private data
+
+        //- Damping coefficient [Ns/m]
+        scalar coeff_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("linearDamper");
+
+
+    // Constructors
+
+        //- Construct from components
+        linearDamper
+        (
+            const word& name,
+            const dictionary& dict,
+            const rigidBodyModel& model
+        );
+
+        //- Construct and return a clone
+        virtual autoPtr<restraint> clone() const
+        {
+            return autoPtr<restraint>
+            (
+                new linearDamper(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~linearDamper();
+
+
+    // Member Functions
+
+        //- Return the external force applied to the body by this restraint
+        virtual spatialVector restrain() const;
+
+        //- Update properties from given dictionary
+        virtual bool read(const dictionary& dict);
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace restraints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
index 42dc95b3ef..63e3763443 100644
--- a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
+++ b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
@@ -57,12 +57,7 @@ Foam::RBD::restraints::linearSpring::linearSpring
     const rigidBodyModel& model
 )
 :
-    restraint(name, dict, model),
-    anchor_(),
-    refAttachmentPt_(),
-    stiffness_(),
-    damping_(),
-    restLength_()
+    restraint(name, dict, model)
 {
     read(dict);
 }
@@ -88,9 +83,16 @@ Foam::spatialVector Foam::RBD::restraints::linearSpring::restrain() const
     // Velocity of the attached end of the spring
     vector v = bodyPointVelocity(refAttachmentPt_).l();
 
-    // Force and moment including optional damping
-    vector force = (-stiffness_*(magR - restLength_) - damping_*(r & v))*r;
-    vector moment = (attachmentPt - model_.X0(bodyIndex_).r()) ^ force;
+    // Force and moment on the master body including optional damping
+    vector force
+    (
+        (-stiffness_*(magR - restLength_) - damping_*(r & v))*r
+    );
+
+    vector moment
+    (
+        (attachmentPt - model_.X0(model_.master(bodyID_)).r()) ^ force
+    );
 
     if (model_.debug)
     {
diff --git a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
index 26bff8b8c0..5d87ca8896 100644
--- a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
+++ b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
@@ -63,10 +63,10 @@ class linearSpring
         //- Reference point of attachment to the solid body
         point refAttachmentPt_;
 
-        //- Spring stiffness coefficient (N/m)
+        //- Spring stiffness coefficient [N/m]
         scalar stiffness_;
 
-        //- Damping coefficient (Ns/m)
+        //- Damping coefficient [Ns/m]
         scalar damping_;
 
         //- Rest length - length of spring when no forces are applied to it
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
index f17b3b133a..fb44f9fea1 100644
--- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
@@ -48,7 +48,7 @@ Foam::RBD::restraint::restraint
 )
 :
     name_(name),
-    bodyIndex_(model.bodyID(dict.lookup("body"))),
+    bodyID_(model.bodyID(dict.lookup("body"))),
     coeffs_(dict),
     model_(model)
 {}
@@ -80,7 +80,7 @@ void Foam::RBD::restraint::write(Ostream& os) const
     os.writeKeyword("type")
         << type() << token::END_STATEMENT << nl;
     os.writeKeyword("body")
-        << model_.name(bodyIndex_) << token::END_STATEMENT << nl;
+        << model_.name(bodyID_) << token::END_STATEMENT << nl;
 }
 
 
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
index c8320cbe7e..ea281a5350 100644
--- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
@@ -72,8 +72,8 @@ protected:
         //- Name of the restraint
         word name_;
 
-        //- Index of the body the restraint is applied to
-        label bodyIndex_;
+        //- ID of the body the restraint is applied to
+        label bodyID_;
 
         //- Restraint model specific coefficient dictionary
         dictionary coeffs_;
@@ -148,9 +148,9 @@ public:
             return name_;
         }
 
-        label bodyIndex() const
+        label bodyID() const
         {
-            return bodyIndex_;
+            return bodyID_;
         }
 
         //- Return the external force applied to the body by this restraint
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintI.H b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintI.H
index c825702455..11679170c4 100644
--- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintI.H
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintI.H
@@ -32,7 +32,7 @@ inline Foam::point Foam::RBD::restraint::bodyPoint
     const point& p
 ) const
 {
-    return (model_.X0(bodyIndex_).inv() && spatialVector(Zero, p)).l();
+    return (model_.X0(bodyID_).inv() && spatialVector(Zero, p)).l();
 }
 
 
@@ -41,7 +41,7 @@ inline Foam::spatialVector Foam::RBD::restraint::bodyPointVelocity
     const point& p
 ) const
 {
-    return model_.v(bodyIndex_, p);
+    return model_.v(bodyID_, p);
 }
 
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
index fbd0b02573..37800dcadd 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
@@ -40,7 +40,7 @@ void Foam::RBD::rigidBodyModel::applyRestraints(Field<spatialVector>& fx) const
         DebugInfo << "Restraint " << restraints_[ri].name();
 
         // Accumulate the restraint forces
-        fx[restraints_[ri].bodyIndex()] += restraints_[ri].restrain();
+        fx[master(restraints_[ri].bodyID())] += restraints_[ri].restrain();
     }
 }
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index 7993b3c77e..9b2a32de71 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -162,6 +162,12 @@ Foam::RBD::rigidBodyModel::rigidBodyModel(const dictionary& dict)
 }
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodyModel::~rigidBodyModel()
+{}
+
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::label Foam::RBD::rigidBodyModel::join_
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
index c7a995a4be..d02baa1704 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
@@ -89,7 +89,6 @@ class rigidBodyModel
         //- Add restraints to the motion
         void addRestraints(const dictionary& dict);
 
-
 protected:
 
     // Protected data representing the model structure
@@ -220,8 +219,7 @@ public:
 
 
     //- Destructor
-    virtual ~rigidBodyModel()
-    {}
+    virtual ~rigidBodyModel();
 
 
     // Member Functions
@@ -261,6 +259,9 @@ public:
         //- Return the inertia of body i
         inline const rigidBodyInertia& I(const label i) const;
 
+        //- Return the spatial velocity of the bodies
+        inline const spatialVector& v(const label i) const;
+
         //- Join the given body to the parent with ID parentID via the given
         //  joint with transform from the parent frame to the joint frame XT.
         virtual label join
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
index ece6c9766d..9cfab5e8cd 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
@@ -99,6 +99,13 @@ Foam::RBD::rigidBodyModel::I(const label i) const
 }
 
 
+inline const Foam::spatialVector&
+Foam::RBD::rigidBodyModel::v(const label i) const
+{
+    return v_[i];
+}
+
+
 inline bool Foam::RBD::rigidBodyModel::merged(label bodyID) const
 {
     return bodyID < 0;

From 3d5410d26b91d5378101ebf0189448db9d35a341 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 11 Apr 2016 14:29:00 +0100
Subject: [PATCH 396/447] Updated header

---
 src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
index 8b2939a56a..96982fedab 100644
--- a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
+++ b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 46cd2b3bedd759010c85e856141a817032367f2b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 11 Apr 2016 15:14:18 +0100
Subject: [PATCH 397/447] rigidBodyDynamics/restraints: Added
 linearAxialAngularSpring, linear axial angular spring restraint

Included for backward-compatibility with the 6-DoF solver but in the
future will be re-implemented as a joint rather than body restraint and
accumulated in tau (internal forces) rather than fx (external forces).
---
 src/rigidBodyDynamics/Make/files              |   1 +
 .../linearAxialAngularSpring.C                | 199 ++++++++++++++++++
 .../linearAxialAngularSpring.H                | 125 +++++++++++
 3 files changed, 325 insertions(+)
 create mode 100644 src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
 create mode 100644 src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H

diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index bdd244ae8a..b07f5e8c81 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -29,6 +29,7 @@ restraints/restraint/rigidBodyRestraint.C
 restraints/restraint/rigidBodyRestraintNew.C
 restraints/linearSpring/linearSpring.C
 restraints/linearDamper/linearDamper.C
+restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
 
 rigidBodyModel/rigidBodyModel.C
 rigidBodyModel/forwardDynamics.C
diff --git a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
new file mode 100644
index 0000000000..795c9021b7
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -0,0 +1,199 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "linearAxialAngularSpring.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace restraints
+{
+    defineTypeNameAndDebug(linearAxialAngularSpring, 0);
+
+    addToRunTimeSelectionTable
+    (
+        restraint,
+        linearAxialAngularSpring,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::restraints::linearAxialAngularSpring::
+linearAxialAngularSpring
+(
+    const word& name,
+    const dictionary& dict,
+    const rigidBodyModel& model
+)
+:
+    restraint(name, dict, model)
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::restraints::linearAxialAngularSpring::
+~linearAxialAngularSpring()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::spatialVector
+Foam::RBD::restraints::linearAxialAngularSpring::restrain() const
+{
+    vector refDir = rotationTensor(vector(1, 0, 0), axis_) & vector(0, 1, 0);
+
+    vector oldDir = refQ_ & refDir;
+    vector newDir = model_.X0(bodyID_).E() & refDir;
+
+    if (mag(oldDir & axis_) > 0.95 || mag(newDir & axis_) > 0.95)
+    {
+        // Directions close to the axis, changing reference
+        refDir = rotationTensor(vector(1, 0, 0), axis_) & vector(0, 0, 1);
+        oldDir = refQ_ & refDir;
+        newDir = model_.X0(bodyID_).E() & refDir;
+    }
+
+    // Removing axis component from oldDir and newDir and normalising
+    oldDir -= (axis_ & oldDir)*axis_;
+    oldDir /= (mag(oldDir) + VSMALL);
+
+    newDir -= (axis_ & newDir)*axis_;
+    newDir /= (mag(newDir) + VSMALL);
+
+    scalar theta = mag(acos(min(oldDir & newDir, 1.0)));
+
+    // Temporary axis with sign information
+    vector a = (oldDir ^ newDir);
+
+    // Ensure a is in direction of axis
+    a = (a & axis_)*axis_;
+
+    scalar magA = mag(a);
+
+    if (magA > VSMALL)
+    {
+        a /= magA;
+    }
+    else
+    {
+        a = Zero;
+    }
+
+    // Damping of along axis angular velocity only
+    vector moment
+    (
+        -(
+            stiffness_*theta
+          + damping_*(model_.v(model_.master(bodyID_)).w() & a)
+         )*a
+    );
+
+    if (model_.debug)
+    {
+        Info<< " angle " << theta*sign(a & axis_)
+            << " moment " << moment
+            << endl;
+    }
+
+    return spatialVector(moment, Zero);
+}
+
+
+bool Foam::RBD::restraints::linearAxialAngularSpring::read
+(
+    const dictionary& dict
+)
+{
+    restraint::read(dict);
+
+    refQ_ = coeffs_.lookupOrDefault<tensor>("referenceOrientation", I);
+
+    if (mag(mag(refQ_) - sqrt(3.0)) > 1e-9)
+    {
+        FatalErrorInFunction
+            << "referenceOrientation " << refQ_ << " is not a rotation tensor. "
+            << "mag(referenceOrientation) - sqrt(3) = "
+            << mag(refQ_) - sqrt(3.0) << nl
+            << exit(FatalError);
+    }
+
+    axis_ = coeffs_.lookup("axis");
+
+    scalar magAxis(mag(axis_));
+
+    if (magAxis > VSMALL)
+    {
+        axis_ /= magAxis;
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "axis has zero length"
+            << abort(FatalError);
+    }
+
+    coeffs_.lookup("stiffness") >> stiffness_;
+    coeffs_.lookup("damping") >> damping_;
+
+    return true;
+}
+
+
+void Foam::RBD::restraints::linearAxialAngularSpring::write
+(
+    Ostream& os
+) const
+{
+    restraint::write(os);
+
+    os.writeKeyword("referenceOrientation")
+        << refQ_ << token::END_STATEMENT << nl;
+
+    os.writeKeyword("axis")
+        << axis_ << token::END_STATEMENT << nl;
+
+    os.writeKeyword("stiffness")
+        << stiffness_ << token::END_STATEMENT << nl;
+
+    os.writeKeyword("damping")
+        << damping_ << token::END_STATEMENT << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
new file mode 100644
index 0000000000..412e21976a
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::restraints::linearAxialAngularSpring
+
+Description
+    Linear axial angular spring restraint.
+
+SourceFiles
+    linearAxialAngularSpring.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef linearAxialAngularSpring_H
+#define linearAxialAngularSpring_H
+
+#include "rigidBodyRestraint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace restraints
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class linearAxialAngularSpring Declaration
+\*---------------------------------------------------------------------------*/
+
+class linearAxialAngularSpring
+:
+    public restraint
+{
+    // Private data
+
+        //- Reference orientation where there is no moment
+        tensor refQ_;
+
+        //- Global unit axis around which the motion is sprung
+        vector axis_;
+
+        //- Spring stiffness coefficient (Nm/rad)
+        scalar stiffness_;
+
+        //- Damping coefficient (Nms/rad)
+        scalar damping_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("linearAxialAngularSpring");
+
+
+    // Constructors
+
+        //- Construct from components
+        linearAxialAngularSpring
+        (
+            const word& name,
+            const dictionary& dict,
+            const rigidBodyModel& model
+        );
+
+        //- Construct and return a clone
+        virtual autoPtr<restraint> clone() const
+        {
+            return autoPtr<restraint>
+            (
+                new linearAxialAngularSpring(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~linearAxialAngularSpring();
+
+
+    // Member Functions
+
+        //- Return the external force applied to the body by this restraint
+        virtual spatialVector restrain() const;
+
+        //- Update properties from given dictionary
+        virtual bool read(const dictionary& dict);
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 5c4719dea030ddb6dbb321e3f3a2a1ef22fb2da6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 11 Apr 2016 16:12:23 +0100
Subject: [PATCH 398/447] rigidBodyDynamics/restraints: Added
 sphericalAngularDamper, spherical angular damper restraint

---
 src/rigidBodyDynamics/Make/files              |   1 +
 .../linearAxialAngularSpring.H                |   4 +-
 .../sphericalAngularDamper.C                  | 114 +++++++++++++++++
 .../sphericalAngularDamper.H                  | 117 ++++++++++++++++++
 4 files changed, 234 insertions(+), 2 deletions(-)
 create mode 100644 src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C
 create mode 100644 src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H

diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index b07f5e8c81..5323037c3a 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -30,6 +30,7 @@ restraints/restraint/rigidBodyRestraintNew.C
 restraints/linearSpring/linearSpring.C
 restraints/linearDamper/linearDamper.C
 restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
+restraints/sphericalAngularDamper/sphericalAngularDamper.C
 
 rigidBodyModel/rigidBodyModel.C
 rigidBodyModel/forwardDynamics.C
diff --git a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
index 412e21976a..2f93637cb7 100644
--- a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
+++ b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
@@ -62,10 +62,10 @@ class linearAxialAngularSpring
         //- Global unit axis around which the motion is sprung
         vector axis_;
 
-        //- Spring stiffness coefficient (Nm/rad)
+        //- Spring stiffness coefficient [Nm/rad]
         scalar stiffness_;
 
-        //- Damping coefficient (Nms/rad)
+        //- Damping coefficient [Nms/rad]
         scalar damping_;
 
 
diff --git a/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C
new file mode 100644
index 0000000000..ddd96acf31
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "sphericalAngularDamper.H"
+#include "rigidBodyModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace restraints
+{
+    defineTypeNameAndDebug(sphericalAngularDamper, 0);
+
+    addToRunTimeSelectionTable
+    (
+        restraint,
+        sphericalAngularDamper,
+        dictionary
+    );
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::restraints::sphericalAngularDamper::
+sphericalAngularDamper
+(
+    const word& name,
+    const dictionary& dict,
+    const rigidBodyModel& model
+)
+:
+    restraint(name, dict, model)
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::restraints::sphericalAngularDamper::
+~sphericalAngularDamper()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::spatialVector
+Foam::RBD::restraints::sphericalAngularDamper::restrain() const
+{
+    vector moment = -coeff_*model_.v(model_.master(bodyID_)).w();
+
+    if (model_.debug)
+    {
+        Info<< " moment " << moment << endl;
+    }
+
+    return spatialVector(moment, Zero);
+}
+
+
+bool Foam::RBD::restraints::sphericalAngularDamper::read
+(
+    const dictionary& dict
+)
+{
+    restraint::read(dict);
+
+    coeffs_.lookup("coeff") >> coeff_;
+
+    return true;
+}
+
+
+void Foam::RBD::restraints::sphericalAngularDamper::write
+(
+    Ostream& os
+) const
+{
+    restraint::write(os);
+
+    os.writeKeyword("coeff") << coeff_ << token::END_STATEMENT << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H
new file mode 100644
index 0000000000..7754541b96
--- /dev/null
+++ b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::restraints::sphericalAngularDamper
+
+Description
+    Spherical angular damper restraint.
+    Operates in the local frame of the body.
+
+SourceFiles
+    sphericalAngularDamper.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef sphericalAngularDamper_H
+#define sphericalAngularDamper_H
+
+#include "rigidBodyRestraint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace restraints
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class sphericalAngularDamper Declaration
+\*---------------------------------------------------------------------------*/
+
+class sphericalAngularDamper
+:
+    public restraint
+{
+    // Private data
+
+        //- Damping coefficient [Nms/rad]
+        scalar coeff_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("sphericalAngularDamper");
+
+
+    // Constructors
+
+        //- Construct from components
+        sphericalAngularDamper
+        (
+            const word& name,
+            const dictionary& dict,
+            const rigidBodyModel& model
+        );
+
+        //- Construct and return a clone
+        virtual autoPtr<restraint> clone() const
+        {
+            return autoPtr<restraint>
+            (
+                new sphericalAngularDamper(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~sphericalAngularDamper();
+
+
+    // Member Functions
+
+        //- Return the external force applied to the body by this restraint
+        virtual spatialVector restrain() const;
+
+        //- Update properties from given dictionary
+        virtual bool read(const dictionary& dict);
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace restraints
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 33be0fa56490160c0b11900127d8f2ed3391d0ec Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 11 Apr 2016 19:01:16 +0100
Subject: [PATCH 399/447] rigidBodyDynamics/rigidBodyModelState: New class to
 hold the motion state of the rigid-body model

This is a more convenient way of maintaining the state or multiple
states (for higher-order integration), storing, retrieving and passing
between processors.
---
 .../rigidBodyDynamics/pendulum/pendulum.C     |  20 +--
 .../test/rigidBodyDynamics/spring/spring.C    |  28 +---
 src/rigidBodyDynamics/Make/files              |   3 +
 .../rigidBodyModel/forwardDynamics.C          |  23 ++-
 .../rigidBodyModel/rigidBodyModel.H           |  19 +--
 .../rigidBodyModelState/rigidBodyModelState.C |  55 ++++++
 .../rigidBodyModelState/rigidBodyModelState.H | 157 ++++++++++++++++++
 .../rigidBodyModelStateI.H                    |  76 +++++++++
 .../rigidBodyModelStateIO.C                   |  95 +++++++++++
 9 files changed, 421 insertions(+), 55 deletions(-)
 create mode 100644 src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
 create mode 100644 src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
 create mode 100644 src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H
 create mode 100644 src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C

diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum.C b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
index 18626cba7c..cc9fc374e5 100644
--- a/applications/test/rigidBodyDynamics/pendulum/pendulum.C
+++ b/applications/test/rigidBodyDynamics/pendulum/pendulum.C
@@ -32,6 +32,7 @@ Description
 
 #include "rigidBodyModel.H"
 #include "masslessBody.H"
+#include "rigidBodyModelState.H"
 #include "sphere.H"
 #include "joints.H"
 #include "IFstream.H"
@@ -86,10 +87,11 @@ int main(int argc, char *argv[])
     Info<< pendulum << endl;
 
     // Create the joint-space state fields
-    scalarField q(pendulum.nDoF(), Zero);
-    scalarField w(pendulum.nw(), Zero);
-    scalarField qDot(pendulum.nDoF(), Zero);
-    scalarField qDdot(pendulum.nDoF(), Zero);
+    rigidBodyModelState pendulumState(pendulum);
+    scalarField& q = pendulumState.q();
+    scalarField& qDot = pendulumState.qDot();
+    scalarField& qDdot = pendulumState.qDdot();
+
     scalarField tau(pendulum.nDoF(), Zero);
 
     // Set the angle of the pendulum to 0.3rad
@@ -106,15 +108,7 @@ int main(int argc, char *argv[])
         qDot += 0.5*deltaT*qDdot;
         q += deltaT*qDot;
 
-        pendulum.forwardDynamics
-        (
-            q,
-            w,
-            qDot,
-            tau,
-            Field<spatialVector>(),
-            qDdot
-        );
+        pendulum.forwardDynamics(pendulumState, tau, Field<spatialVector>());
 
         qDot += 0.5*deltaT*qDdot;
 
diff --git a/applications/test/rigidBodyDynamics/spring/spring.C b/applications/test/rigidBodyDynamics/spring/spring.C
index a62bcb696d..d427a620ba 100644
--- a/applications/test/rigidBodyDynamics/spring/spring.C
+++ b/applications/test/rigidBodyDynamics/spring/spring.C
@@ -34,6 +34,7 @@ Description
 #include "sphere.H"
 #include "joints.H"
 #include "rigidBodyRestraint.H"
+#include "rigidBodyModelState.H"
 #include "IFstream.H"
 #include "OFstream.H"
 
@@ -50,10 +51,11 @@ int main(int argc, char *argv[])
     Info<< spring << endl;
 
     // Create the joint-space state fields
-    scalarField q(spring.nDoF(), Zero);
-    scalarField w(spring.nw(), Zero);
-    scalarField qDot(spring.nDoF(), Zero);
-    scalarField qDdot(spring.nDoF(), Zero);
+    rigidBodyModelState springState(spring);
+    scalarField& q = springState.q();
+    scalarField& qDot = springState.qDot();
+    scalarField& qDdot = springState.qDdot();
+
     scalarField tau(spring.nDoF(), Zero);
     Field<spatialVector> fx(spring.nBodies(), Zero);
 
@@ -68,13 +70,7 @@ int main(int argc, char *argv[])
         q += deltaT*qDot;
 
         // Update the body-state prior to the evaluation of the restraints
-        spring.forwardDynamicsCorrection
-        (
-            q,
-            w,
-            qDot,
-            qDdot
-        );
+        spring.forwardDynamicsCorrection(springState);
 
         // Accumulate the restraint forces
         fx = Zero;
@@ -82,15 +78,7 @@ int main(int argc, char *argv[])
 
         // Calculate the body acceleration for the given state
         // and restraint forces
-        spring.forwardDynamics
-        (
-            q,
-            w,
-            qDot,
-            tau,
-            fx,
-            qDdot
-        );
+        spring.forwardDynamics(springState, tau, fx);
 
         // Update the velocity
         qDot += 0.5*deltaT*qDdot;
diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index 5323037c3a..761aec2db1 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -35,4 +35,7 @@ restraints/sphericalAngularDamper/sphericalAngularDamper.C
 rigidBodyModel/rigidBodyModel.C
 rigidBodyModel/forwardDynamics.C
 
+rigidBodyModelState/rigidBodyModelState.C
+rigidBodyModelState/rigidBodyModelStateIO.C
+
 LIB = $(FOAM_LIBBIN)/librigidBodyDynamics
diff --git a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
index 37800dcadd..fafce3431f 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "rigidBodyModel.H"
+#include "rigidBodyModelState.H"
 #include "rigidBodyRestraint.H"
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
@@ -47,14 +48,16 @@ void Foam::RBD::rigidBodyModel::applyRestraints(Field<spatialVector>& fx) const
 
 void Foam::RBD::rigidBodyModel::forwardDynamics
 (
-    const scalarField& q,
-    const scalarField& w,
-    const scalarField& qDot,
+    rigidBodyModelState& state,
     const scalarField& tau,
-    const Field<spatialVector>& fx,
-    scalarField& qDdot
+    const Field<spatialVector>& fx
 ) const
 {
+    const scalarField& q = state.q();
+    const scalarField& w = state.w();
+    const scalarField& qDot = state.qDot();
+    scalarField& qDdot = state.qDdot();
+
     DebugInFunction
         << "q = " << q << nl
         << "qDot = " << qDot << nl
@@ -199,14 +202,16 @@ void Foam::RBD::rigidBodyModel::forwardDynamics
 
 void Foam::RBD::rigidBodyModel::forwardDynamicsCorrection
 (
-    const scalarField& q,
-    const scalarField& w,
-    const scalarField& qDot,
-    const scalarField& qDdot
+    const rigidBodyModelState& state
 ) const
 {
     DebugInFunction << endl;
 
+    const scalarField& q = state.q();
+    const scalarField& w = state.w();
+    const scalarField& qDot = state.qDot();
+    const scalarField& qDdot = state.qDdot();
+
     // Joint state returned by jcalc
     joint::XSvc J;
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
index d02baa1704..6357458f36 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
@@ -63,10 +63,12 @@ namespace RBD
 
 // Forward declaration of friend functions and operators
 class rigidBodyModel;
-class restraint;
 
 Ostream& operator<<(Ostream&, const rigidBodyModel&);
 
+class rigidBodyModelState;
+class restraint;
+
 
 /*---------------------------------------------------------------------------*\
                          Class rigidBodyModel Declaration
@@ -336,24 +338,15 @@ public:
         //  algorithm (Section 7.3 and Table 7.1)
         void forwardDynamics
         (
-            const scalarField& q,
-            const scalarField& w,
-            const scalarField& qDot,
+            rigidBodyModelState& state,
             const scalarField& tau,
-            const Field<spatialVector>& fx,
-            scalarField& qDdot
+            const Field<spatialVector>& fx
         ) const;
 
         //- Correct the velocity and acceleration of the bodies in the model
         //  from the given joint state fields following an integration step
         //  of the forwardDynamics
-        void forwardDynamicsCorrection
-        (
-            const scalarField& q,
-            const scalarField& w,
-            const scalarField& qDot,
-            const scalarField& qDdot
-        ) const;
+        void forwardDynamicsCorrection(const rigidBodyModelState& state) const;
 
         //- Write
         virtual void write(Ostream&) const;
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
new file mode 100644
index 0000000000..cad3a5ce04
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodyModelState.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodyModelState::rigidBodyModelState
+(
+    const rigidBodyModel& model
+)
+:
+    q_(model.nDoF(), Zero),
+    w_(model.nw(), Zero),
+    qDot_(model.nDoF(), Zero),
+    qDdot_(model.nDoF(), Zero)
+{}
+
+
+Foam::RBD::rigidBodyModelState::rigidBodyModelState
+(
+    const rigidBodyModel& model,
+    const dictionary& dict
+)
+:
+    q_(dict.lookupOrDefault("q", scalarField(model.nDoF(), Zero))),
+    w_(dict.lookupOrDefault("w", scalarField(model.nw(), Zero))),
+    qDot_(dict.lookupOrDefault("qDot", scalarField(model.nDoF(), Zero))),
+    qDdot_(dict.lookupOrDefault("qDdot", scalarField(model.nDoF(), Zero)))
+{}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
new file mode 100644
index 0000000000..770011cc90
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
@@ -0,0 +1,157 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::rigidBodyModelState
+
+Description
+    Holds the motion state of rigid-body model.
+
+SourceFiles
+    rigidBodyModelStateI.H
+    rigidBodyModelState.C
+    rigidBodyModelStateIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef rigidBodyModelState_H
+#define rigidBodyModelState_H
+
+#include "rigidBodyModel.H"
+#include "scalarField.H"
+#include "dictionary.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class Istream;
+class Ostream;
+
+namespace RBD
+{
+
+// Forward declaration of friend functions and operators
+class rigidBodyModelState;
+Istream& operator>>(Istream&, rigidBodyModelState&);
+Ostream& operator<<(Ostream&, const rigidBodyModelState&);
+
+
+/*---------------------------------------------------------------------------*\
+                  Class rigidBodyModelState Declaration
+\*---------------------------------------------------------------------------*/
+
+class rigidBodyModelState
+{
+    // Private data
+
+        //- Joint position and orientation
+        scalarField q_;
+
+        //- Joint quaternion
+        scalarField w_;
+
+        //- Joint velocity
+        scalarField qDot_;
+
+        //- Joint acceleration
+        scalarField qDdot_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct for the given rigidBodyModel
+        rigidBodyModelState(const rigidBodyModel& model);
+
+        //- Construct from dictionary for the given rigidBodyModel
+        rigidBodyModelState
+        (
+            const rigidBodyModel& model,
+            const dictionary& dict
+        );
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return access to the joint position and orientation
+            inline const scalarField& q() const;
+
+            //- Return access to the joint quaternion
+            inline const scalarField& w() const;
+
+            //- Return access to the joint velocity
+            inline const scalarField& qDot() const;
+
+            //- Return access to the joint acceleration
+            inline const scalarField& qDdot() const;
+
+
+        // Edit
+
+            //- Return access to the joint position and orientation
+            inline scalarField& q();
+
+            //- Return access to the joint quaternion
+            inline scalarField& w();
+
+            //- Return access to the joint velocity
+            inline scalarField& qDot();
+
+            //- Return access to the joint acceleration
+            inline scalarField& qDdot();
+
+
+        //- Write to dictionary
+        void write(dictionary& dict) const;
+
+        //- Write to stream
+        void write(Ostream&) const;
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>(Istream&, rigidBodyModelState&);
+        friend Ostream& operator<<(Ostream&, const rigidBodyModelState&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "rigidBodyModelStateI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H
new file mode 100644
index 0000000000..34a3757e66
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::scalarField& Foam::RBD::rigidBodyModelState::q() const
+{
+    return q_;
+}
+
+
+inline const Foam::scalarField& Foam::RBD::rigidBodyModelState::w() const
+{
+    return w_;
+}
+
+
+inline const Foam::scalarField& Foam::RBD::rigidBodyModelState::qDot() const
+{
+    return qDot_;
+}
+
+
+inline const Foam::scalarField& Foam::RBD::rigidBodyModelState::qDdot() const
+{
+    return qDdot_;
+}
+
+
+inline Foam::scalarField& Foam::RBD::rigidBodyModelState::q()
+{
+    return q_;
+}
+
+
+inline Foam::scalarField& Foam::RBD::rigidBodyModelState::w()
+{
+    return w_;
+}
+
+
+inline Foam::scalarField& Foam::RBD::rigidBodyModelState::qDot()
+{
+    return qDot_;
+}
+
+
+inline Foam::scalarField& Foam::RBD::rigidBodyModelState::qDdot()
+{
+    return qDdot_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
new file mode 100644
index 0000000000..153f7ddd16
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodyModelState.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::rigidBodyModelState::write(dictionary& dict) const
+{
+    dict.add("q", q_);
+    dict.add("w", w_);
+    dict.add("qDot", qDot_);
+    dict.add("qDdot", qDdot_);
+}
+
+
+void Foam::RBD::rigidBodyModelState::write(Ostream& os) const
+{
+    os.writeKeyword("q") << q_ << token::END_STATEMENT << nl;
+    os.writeKeyword("w") << w_ << token::END_STATEMENT << nl;
+    os.writeKeyword("qDot") << qDot_ << token::END_STATEMENT << nl;
+    os.writeKeyword("qDdot") << qDdot_ << token::END_STATEMENT << nl;
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::RBD::operator>>
+(
+    Istream& is,
+    rigidBodyModelState& state
+)
+{
+    is  >> state.q_
+        >> state.w_
+        >> state.qDot_
+        >> state.qDdot_;
+
+    // Check state of Istream
+    is.check
+    (
+        "Foam::Istream& Foam::operator>>"
+        "(Foam::Istream&, Foam::RBD::rigidBodyModelState&)"
+    );
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::RBD::operator<<
+(
+    Ostream& os,
+    const rigidBodyModelState& state
+)
+{
+    os  << token::SPACE << state.q_
+        << token::SPACE << state.w_
+        << token::SPACE << state.qDot_
+        << token::SPACE << state.qDdot_;
+
+    // Check state of Ostream
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<(Foam::Ostream&, "
+        "const Foam::RBD::rigidBodyModelState&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //

From 1b90b1b9b3b8938d5e18ae7ccd7a418f7313b560 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 09:03:12 +0100
Subject: [PATCH 400/447] vtkSurfaceWriter: Changed precision of points to
 "double" to avoid the error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

“Error when reading ascii data. Possible mismatch of datasize with
declaration.”

Patch contributed by Karl Meredith, FMGlobal
---
 src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
index 5e6c38045b..c3e5a62570 100644
--- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ void Foam::vtkSurfaceWriter::writeGeometry
         << "DATASET POLYDATA" << nl;
 
     // Write vertex coords
-    os  << "POINTS " << points.size() << " float" << nl;
+    os  << "POINTS " << points.size() << " double" << nl;
     forAll(points, pointI)
     {
         const point& pt = points[pointI];

From 2870be400eb7bc94a01d32e2e176637e5b944eb3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 11:33:20 +0100
Subject: [PATCH 401/447] rigidBodyDynamics/rigidBodySolvers: Added run-time
 selectable solvers to integrate the rigid-body motion

Currently supported solvers: symplectic, Newmark, CrankNicolson

The symplectic solver should only be used if iteration over the forces
and body-motion is not required.  Newmark and CrankNicolson both require
iteration to provide 2nd-order behavior.

See applications/test/rigidBodyDynamics/spring for an example of the
application of the Newmark solver.

This development is sponsored by Carnegie Wave Energy Ltd.
---
 .../test/rigidBodyDynamics/spring/spring      |   8 +
 .../test/rigidBodyDynamics/spring/spring.C    |  47 ++---
 src/rigidBodyDynamics/Make/files              |   9 +
 .../rigidBodyModelState/rigidBodyModelState.H |   2 +-
 .../rigidBodyMotion/rigidBodyMotion.C         | 177 ++++++++++++++++
 .../rigidBodyMotion/rigidBodyMotion.H         | 198 ++++++++++++++++++
 .../rigidBodyMotion/rigidBodyMotionI.H        |  61 ++++++
 .../rigidBodyMotion/rigidBodyMotionIO.C       |  56 +++++
 .../CrankNicolson/CrankNicolson.C             |  92 ++++++++
 .../CrankNicolson/CrankNicolson.H             | 128 +++++++++++
 .../rigidBodySolvers/Newmark/Newmark.C        | 101 +++++++++
 .../rigidBodySolvers/Newmark/Newmark.H        | 126 +++++++++++
 .../rigidBodySolver/newRigidBodySolver.C      |  57 +++++
 .../rigidBodySolver/rigidBodySolver.C         |  55 +++++
 .../rigidBodySolver/rigidBodySolver.H         | 165 +++++++++++++++
 .../rigidBodySolver/rigidBodySolverI.H        |  95 +++++++++
 .../rigidBodySolvers/symplectic/symplectic.C  |  95 +++++++++
 .../rigidBodySolvers/symplectic/symplectic.H  | 125 +++++++++++
 18 files changed, 1571 insertions(+), 26 deletions(-)
 create mode 100644 src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
 create mode 100644 src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
 create mode 100644 src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
 create mode 100644 src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionIO.C
 create mode 100644 src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
 create mode 100644 src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.H
 create mode 100644 src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
 create mode 100644 src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H
 create mode 100644 src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C
 create mode 100644 src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
 create mode 100644 src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
 create mode 100644 src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
 create mode 100644 src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
 create mode 100644 src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.H

diff --git a/applications/test/rigidBodyDynamics/spring/spring b/applications/test/rigidBodyDynamics/spring/spring
index 3024b0622b..bae00a11ac 100644
--- a/applications/test/rigidBodyDynamics/spring/spring
+++ b/applications/test/rigidBodyDynamics/spring/spring
@@ -1,3 +1,11 @@
+solver
+{
+    type Newmark;
+}
+
+// It is necessary to iterate for the Newmark solver
+nIter 2;
+
 bodies
 {
     weight
diff --git a/applications/test/rigidBodyDynamics/spring/spring.C b/applications/test/rigidBodyDynamics/spring/spring.C
index d427a620ba..e6f36524c6 100644
--- a/applications/test/rigidBodyDynamics/spring/spring.C
+++ b/applications/test/rigidBodyDynamics/spring/spring.C
@@ -29,7 +29,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "rigidBodyModel.H"
+#include "rigidBodyMotion.H"
 #include "masslessBody.H"
 #include "sphere.H"
 #include "joints.H"
@@ -45,18 +45,19 @@ using namespace RBD;
 
 int main(int argc, char *argv[])
 {
+    dictionary springDict(IFstream("spring")());
+
     // Create the spring model from dictionary
-    rigidBodyModel spring(dictionary(IFstream("spring")()));
+    rigidBodyMotion spring(springDict);
+
+    label nIter(readLabel(springDict.lookup("nIter")));
 
     Info<< spring << endl;
 
-    // Create the joint-space state fields
-    rigidBodyModelState springState(spring);
-    scalarField& q = springState.q();
-    scalarField& qDot = springState.qDot();
-    scalarField& qDdot = springState.qDdot();
-
+    // Create the joint-space force field
     scalarField tau(spring.nDoF(), Zero);
+
+    // Create the external body force field
     Field<spatialVector> fx(spring.nBodies(), Zero);
 
     OFstream qFile("qVsTime");
@@ -66,27 +67,23 @@ int main(int argc, char *argv[])
     scalar deltaT = 0.002;
     for (scalar t=0; t<4; t+=deltaT)
     {
-        qDot += 0.5*deltaT*qDdot;
-        q += deltaT*qDot;
+        spring.newTime();
 
-        // Update the body-state prior to the evaluation of the restraints
-        spring.forwardDynamicsCorrection(springState);
-
-        // Accumulate the restraint forces
-        fx = Zero;
-        spring.applyRestraints(fx);
-
-        // Calculate the body acceleration for the given state
-        // and restraint forces
-        spring.forwardDynamics(springState, tau, fx);
-
-        // Update the velocity
-        qDot += 0.5*deltaT*qDdot;
+        for (label i=0; i<nIter; i++)
+        {
+            spring.update
+            (
+                deltaT,
+                deltaT,
+                tau,
+                fx
+            );
+        }
 
         // Write the results for graph generation
         // using 'gnuplot spring.gnuplot'
-        qFile << t << " " << q[0] << endl;
-        qDotFile << t << " " << qDot[0] << endl;
+        qFile << t << " " << spring.state().q()[0] << endl;
+        qDotFile << t << " " << spring.state().qDot()[0] << endl;
     }
 
     Info<< "\nEnd\n" << endl;
diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index 761aec2db1..6352eabd93 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -38,4 +38,13 @@ rigidBodyModel/forwardDynamics.C
 rigidBodyModelState/rigidBodyModelState.C
 rigidBodyModelState/rigidBodyModelStateIO.C
 
+rigidBodyMotion/rigidBodyMotion.C
+rigidBodyMotion/rigidBodyMotionIO.C
+
+rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
+rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C
+rigidBodySolvers/symplectic/symplectic.C
+rigidBodySolvers/Newmark/Newmark.C
+rigidBodySolvers/CrankNicolson/CrankNicolson.C
+
 LIB = $(FOAM_LIBBIN)/librigidBodyDynamics
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
index 770011cc90..512ce31235 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::rigidBodyModelState
+    Foam::RBD::rigidBodyModelState
 
 Description
     Holds the motion state of rigid-body model.
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
new file mode 100644
index 0000000000..d8d0f9dcbd
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
@@ -0,0 +1,177 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodyMotion.H"
+#include "rigidBodySolver.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodyMotion::rigidBodyMotion()
+:
+    rigidBodyModel(),
+    motionState_(*this),
+    motionState0_(*this),
+    aRelax_(1.0),
+    aDamp_(1.0),
+    report_(false),
+    solver_(NULL)
+{}
+
+
+Foam::RBD::rigidBodyMotion::rigidBodyMotion
+(
+    const dictionary& dict
+)
+:
+    rigidBodyModel(dict),
+    motionState_(*this),
+    motionState0_(motionState_),
+    aRelax_(dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0)),
+    aDamp_(dict.lookupOrDefault<scalar>("accelerationDamping", 1.0)),
+    report_(dict.lookupOrDefault<Switch>("report", false)),
+    solver_(rigidBodySolver::New(*this, dict.subDict("solver")))
+{}
+
+
+Foam::RBD::rigidBodyMotion::rigidBodyMotion
+(
+    const dictionary& dict,
+    const dictionary& stateDict
+)
+:
+    rigidBodyModel(dict),
+    motionState_(*this, stateDict),
+    motionState0_(motionState_),
+    aRelax_(dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0)),
+    aDamp_(dict.lookupOrDefault<scalar>("accelerationDamping", 1.0)),
+    report_(dict.lookupOrDefault<Switch>("report", false)),
+    solver_(rigidBodySolver::New(*this, dict.subDict("solver")))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodyMotion::~rigidBodyMotion()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::rigidBodyMotion::update
+(
+    scalar deltaT,
+    scalar deltaT0,
+    const scalarField& tau,
+    const Field<spatialVector>& fx
+)
+{
+    if (Pstream::master())
+    {
+        solver_->solve(deltaT, deltaT0, tau, fx);
+
+        if (report_)
+        {
+            status();
+        }
+    }
+
+    Pstream::scatter(motionState_);
+}
+
+
+void Foam::RBD::rigidBodyMotion::status() const
+{
+    /*
+    Info<< "Rigid body motion" << nl
+        << "    Centre of rotation: " << centreOfRotation() << nl
+        << "    Centre of mass: " << centreOfMass() << nl
+        << "    Orientation: " << orientation() << nl
+        << "    Linear velocity: " << v() << nl
+        << "    Angular velocity: " << omega()
+        << endl;
+    */
+}
+
+/*
+Foam::tmp<Foam::pointField> Foam::RBD::rigidBodyMotion::transform
+(
+    const pointField& initialPoints
+) const
+{
+    return
+    (
+        centreOfRotation()
+      + (Q() & initialQ_.T() & (initialPoints - initialCentreOfRotation_))
+    );
+}
+
+
+Foam::tmp<Foam::pointField> Foam::RBD::rigidBodyMotion::transform
+(
+    const pointField& initialPoints,
+    const scalarField& scale
+) const
+{
+    // Calculate the transformation septerion from the initial state
+    septernion s
+    (
+        centreOfRotation() - initialCentreOfRotation(),
+        quaternion(Q() & initialQ().T())
+    );
+
+    tmp<pointField> tpoints(new pointField(initialPoints));
+    pointField& points = tpoints.ref();
+
+    forAll(points, pointi)
+    {
+        // Move non-stationary points
+        if (scale[pointi] > SMALL)
+        {
+            // Use solid-body motion where scale = 1
+            if (scale[pointi] > 1 - SMALL)
+            {
+                points[pointi] = transform(initialPoints[pointi]);
+            }
+            // Slerp septernion interpolation
+            else
+            {
+                septernion ss(slerp(septernion::I, s, scale[pointi]));
+
+                points[pointi] =
+                    initialCentreOfRotation()
+                  + ss.transform
+                    (
+                        initialPoints[pointi]
+                      - initialCentreOfRotation()
+                    );
+            }
+        }
+    }
+
+    return tpoints;
+}
+*/
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
new file mode 100644
index 0000000000..632ec8b46e
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
@@ -0,0 +1,198 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::rigidBodyMotion
+
+Description
+    Six degree of freedom motion for a rigid body.
+
+    Angular momentum stored in body fixed reference frame.  Reference
+    orientation of the body (where Q = I) must align with the cartesian axes
+    such that the Inertia tensor is in principle component form.  Can add
+    restraints (e.g. a spring) and constraints (e.g. motion may only be on a
+    plane).
+
+    The time-integrator for the motion is run-time selectable with options for
+    symplectic (explicit), Crank-Nicolson and Newmark schemes.
+
+SourceFiles
+    rigidBodyMotionI.H
+    rigidBodyMotion.C
+    rigidBodyMotionIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef rigidBodyMotion_H
+#define rigidBodyMotion_H
+
+#include "rigidBodyModel.H"
+#include "rigidBodyModelState.H"
+#include "pointField.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+
+// Forward declarations
+class rigidBodySolver;
+
+/*---------------------------------------------------------------------------*\
+                      Class rigidBodyMotion Declaration
+\*---------------------------------------------------------------------------*/
+
+class rigidBodyMotion
+:
+    public rigidBodyModel
+{
+    friend class rigidBodySolver;
+
+    // Private data
+
+        //- Motion state data object
+        rigidBodyModelState motionState_;
+
+        //- Motion state data object for previous time-step
+        rigidBodyModelState motionState0_;
+
+        //- Acceleration relaxation coefficient
+        scalar aRelax_;
+
+        //- Acceleration damping coefficient (for steady-state simulations)
+        scalar aDamp_;
+
+        //- Switch to turn reporting of motion data on and off
+        Switch report_;
+
+        //- Motion solver
+        autoPtr<rigidBodySolver> solver_;
+
+
+        //- Construct as copy
+        rigidBodyMotion(const rigidBodyMotion&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        rigidBodyMotion();
+
+        //- Construct from dictionary
+        rigidBodyMotion
+        (
+            const dictionary& dict
+        );
+
+        //- Construct from constant and state dictionaries
+        rigidBodyMotion
+        (
+            const dictionary& dict,
+            const dictionary& stateDict
+        );
+
+
+    //- Destructor
+    ~rigidBodyMotion();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the report Switch
+            inline bool report() const;
+
+            //- Return the motion state
+            inline const rigidBodyModelState& state() const;
+
+
+        // Edit
+
+            //- Store the motion state at the beginning of the time-step
+            inline void newTime();
+
+
+        // Update state
+
+            //- Integration of velocities, orientation and position.
+            void update
+            (
+                scalar deltaT,
+                scalar deltaT0,
+                const scalarField& tau,
+                const Field<spatialVector>& fx
+            );
+
+            //- Report the status of the motion
+            void status() const;
+
+
+        // Transformations
+
+            /*
+            //- Transform the given initial state point by the current motion
+            //  state
+            inline point transform(const point& initialPoints) const;
+
+            //- Transform the given initial state pointField by the current
+            //  motion state
+            tmp<pointField> transform(const pointField& initialPoints) const;
+
+            //- Transform the given initial state pointField by the current
+            //  motion state scaled by the given scale
+            tmp<pointField> transform
+            (
+                const pointField& initialPoints,
+                const scalarField& scale
+            ) const;
+            */
+
+        //- Write
+        void write(Ostream&) const;
+
+        //- Read coefficients dictionary and update system parameters,
+        //  constraints and restraints but not the current state
+        bool read(const dictionary& dict);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "rigidBodyMotionI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
new file mode 100644
index 0000000000..9052f9386d
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+inline bool Foam::RBD::rigidBodyMotion::report() const
+{
+    return report_;
+}
+
+
+inline const Foam::RBD::rigidBodyModelState&
+Foam::RBD::rigidBodyMotion::state() const
+{
+    return motionState_;
+}
+
+
+inline void Foam::RBD::rigidBodyMotion::newTime()
+{
+    motionState0_ = motionState_;
+}
+
+/*
+inline Foam::point Foam::RBD::rigidBodyMotion::transform
+(
+    const point& initialPoint
+) const
+{
+    return
+    (
+        centreOfRotation()
+      + (Q() & initialQ_.T() & (initialPoint - initialCentreOfRotation_))
+    );
+}
+*/
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionIO.C b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionIO.C
new file mode 100644
index 0000000000..915af7f56f
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionIO.C
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodyMotion.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+bool Foam::RBD::rigidBodyMotion::read(const dictionary& dict)
+{
+    rigidBodyModel::read(dict);
+
+    aRelax_ = dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0);
+    aDamp_ = dict.lookupOrDefault<scalar>("accelerationDamping", 1.0);
+    report_ = dict.lookupOrDefault<Switch>("report", false);
+
+    return true;
+}
+
+
+void Foam::RBD::rigidBodyMotion::write(Ostream& os) const
+{
+    rigidBodyModel::write(os);
+
+    os.writeKeyword("accelerationRelaxation")
+        << aRelax_ << token::END_STATEMENT << nl;
+    os.writeKeyword("accelerationDamping")
+        << aDamp_ << token::END_STATEMENT << nl;
+    os.writeKeyword("report")
+        << report_ << token::END_STATEMENT << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
new file mode 100644
index 0000000000..694e1f003c
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "CrankNicolson.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace rigidBodySolvers
+{
+    defineTypeNameAndDebug(CrankNicolson, 0);
+    addToRunTimeSelectionTable(rigidBodySolver, CrankNicolson, dictionary);
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodySolvers::CrankNicolson::CrankNicolson
+(
+    rigidBodyMotion& body,
+    const dictionary& dict
+)
+:
+    rigidBodySolver(body),
+    aoc_(dict.lookupOrDefault<scalar>("aoc", 0.5)),
+    voc_(dict.lookupOrDefault<scalar>("voc", 0.5))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodySolvers::CrankNicolson::~CrankNicolson()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::RBD::rigidBodySolvers::CrankNicolson::solve
+(
+    scalar deltaT,
+    scalar deltaT0,
+    const scalarField& tau,
+    const Field<spatialVector>& fx
+)
+{
+    // Accumulate the restraint forces
+    Field<spatialVector> rfx(fx);
+    model_.applyRestraints(rfx);
+
+    // Calculate the accelerations for the given state and forces
+    model_.forwardDynamics(state(), tau, rfx);
+
+    // Correct velocity
+    qDot() = qDot0() + aDamp()*deltaT*(aoc_*qDdot() + (1 - aoc_)*qDdot0());
+
+    // Correct position
+    q() = q0() + deltaT*(voc_*qDot() + (1 - voc_)*qDot0());
+
+    // Update the body-state
+    model_.forwardDynamicsCorrection(state());
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.H b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.H
new file mode 100644
index 0000000000..048e6f967c
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.H
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::rigidBodySolvers::CrankNicolson
+
+Description
+    Crank-Nicolson 2nd-order time-integrator for 6DoF solid-body motion.
+
+    The off-centering coefficients for acceleration (velocity integration) and
+    velocity (position/orientation integration) may be specified but default
+    values of 0.5 for each are used if they are not specified.  With the default
+    off-centering this scheme is equivalent to the Newmark scheme with default
+    coefficients.
+
+    Example specification in dynamicMeshDict:
+    \verbatim
+    solver
+    {
+        type    CrankNicolson;
+        aoc     0.5;    // Acceleration off-centering coefficient
+        voc     0.5;    // Velocity off-centering coefficient
+    }
+    \endverbatim
+
+SeeAlso
+    Foam::RBD::rigidBodySolvers::Newmark
+
+SourceFiles
+    CrankNicolson.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CrankNicolson_H
+#define CrankNicolson_H
+
+#include "rigidBodySolver.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace rigidBodySolvers
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class CrankNicolson Declaration
+\*---------------------------------------------------------------------------*/
+
+class CrankNicolson
+:
+    public rigidBodySolver
+{
+    // Private data
+
+        //- Acceleration off-centering coefficient (default: 0.5)
+        const scalar aoc_;
+
+        //- Velocity off-centering coefficient (default: 0.5)
+        const scalar voc_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("CrankNicolson");
+
+
+    // Constructors
+
+        //- Construct for the given body from dictionary
+        CrankNicolson
+        (
+            rigidBodyMotion& body,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~CrankNicolson();
+
+
+    // Member Functions
+
+        //- Integrate the rigid-body joint-state one time-step
+        virtual void solve
+        (
+            scalar deltaT,
+            scalar deltaT0,
+            const scalarField& tau,
+            const Field<spatialVector>& fx
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace rigidBodySolvers
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
new file mode 100644
index 0000000000..8d8b8c767b
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "Newmark.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace rigidBodySolvers
+{
+    defineTypeNameAndDebug(Newmark, 0);
+    addToRunTimeSelectionTable(rigidBodySolver, Newmark, dictionary);
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodySolvers::Newmark::Newmark
+(
+    rigidBodyMotion& body,
+    const dictionary& dict
+)
+:
+    rigidBodySolver(body),
+    gamma_(dict.lookupOrDefault<scalar>("gamma", 0.5)),
+    beta_
+    (
+        max
+        (
+            0.25*sqr(gamma_ + 0.5),
+            dict.lookupOrDefault<scalar>("beta", 0.25)
+        )
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodySolvers::Newmark::~Newmark()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::RBD::rigidBodySolvers::Newmark::solve
+(
+    scalar deltaT,
+    scalar deltaT0,
+    const scalarField& tau,
+    const Field<spatialVector>& fx
+)
+{
+    // Accumulate the restraint forces
+    Field<spatialVector> rfx(fx);
+    model_.applyRestraints(rfx);
+
+    // Calculate the accelerations for the given state and forces
+    model_.forwardDynamics(state(), tau, rfx);
+
+    // Correct velocity
+    qDot() = qDot0() + aDamp()*deltaT*(gamma_*qDdot() + (1 - gamma_)*qDdot0());
+
+    // Correct position
+    q() = q0()
+      + deltaT*qDot0()
+      + sqr(deltaT)*beta_*qDdot() + sqr(deltaT)*(0.5 - beta_)*qDdot0();
+
+    // Update the body-state
+    model_.forwardDynamicsCorrection(state());
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H
new file mode 100644
index 0000000000..7faeebdf7d
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+Class
+    Foam::RBD::rigidBodySolvers::Newmark
+
+Description
+    Newmark 2nd-order time-integrator for 6DoF solid-body motion.
+
+    Reference:
+    \verbatim
+        Newmark, N. M. (1959).
+        A method of computation for structural dynamics.
+        Journal of the Engineering Mechanics Division, 85(3), 67-94.
+    \endverbatim
+
+    Example specification in dynamicMeshDict:
+    \verbatim
+    solver
+    {
+        type    Newmark;
+        gamma   0.5;    // Velocity integration coefficient
+        beta    0.25;   // Position integration coefficient
+    }
+    \endverbatim
+
+SourceFiles
+    Newmark.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Newmark_H
+#define Newmark_H
+
+#include "rigidBodySolver.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace rigidBodySolvers
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class Newmark Declaration
+\*---------------------------------------------------------------------------*/
+
+class Newmark
+:
+    public rigidBodySolver
+{
+    // Private data
+
+        //- Coefficient for velocity integration (default: 0.5)
+        const scalar gamma_;
+
+        //- Coefficient for position and orientation integration (default: 0.25)
+        const scalar beta_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("Newmark");
+
+
+    // Constructors
+
+        //- Construct for the given body from dictionary
+        Newmark
+        (
+            rigidBodyMotion& body,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~Newmark();
+
+
+    // Member Functions
+
+        //- Integrate the rigid-body joint-state one time-step
+        virtual void solve
+        (
+            scalar deltaT,
+            scalar deltaT0,
+            const scalarField& tau,
+            const Field<spatialVector>& fx
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace rigidBodySolvers
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C
new file mode 100644
index 0000000000..8db7777f77
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodySolver.H"
+
+// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::RBD::rigidBodySolver> Foam::RBD::rigidBodySolver::New
+(
+    rigidBodyMotion& body,
+    const dictionary& dict
+)
+{
+    word rigidBodySolverType(dict.lookup("type"));
+
+    Info<< "Selecting rigidBodySolver " << rigidBodySolverType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(rigidBodySolverType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown rigidBodySolverType type "
+            << rigidBodySolverType << endl << endl
+            << "Valid rigidBodySolver types are : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return cstrIter()(body, dict);
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
new file mode 100644
index 0000000000..669d8c9cc3
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodySolver.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+
+    defineTypeNameAndDebug(rigidBodySolver, 0);
+    defineRunTimeSelectionTable(rigidBodySolver, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodySolver::rigidBodySolver(rigidBodyMotion& body)
+:
+    model_(body)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodySolver::~rigidBodySolver()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
new file mode 100644
index 0000000000..c4137d4b9a
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
@@ -0,0 +1,165 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::rigidBodySolver
+
+Description
+
+SourceFiles
+    rigidBodySolver.C
+    newSixDoFSolver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_rigidBodySolver_H
+#define RBD_rigidBodySolver_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "rigidBodyMotion.H"
+#include "runTimeSelectionTables.H"
+
+namespace Foam
+{
+namespace RBD
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class rigidBodySolver Declaration
+\*---------------------------------------------------------------------------*/
+
+class rigidBodySolver
+{
+protected:
+
+    // Protected data
+
+        //- The rigid-body model
+        rigidBodyMotion& model_;
+
+
+        //- Return the motion state
+        inline rigidBodyModelState& state();
+
+        //- Return the motion state
+        inline const rigidBodyModelState& state0() const;
+
+
+        //- Return the current joint position and orientation
+        inline scalarField& q();
+
+        //- Return the current joint quaternion
+        inline scalarField& w();
+
+        //- Return the current joint velocity
+        inline scalarField& qDot();
+
+        //- Return the current joint acceleration
+        inline scalarField& qDdot();
+
+
+        //- Return the current joint position and orientation
+        inline const scalarField& q0() const;
+
+        //- Return the current joint quaternion
+        inline const scalarField& w0() const;
+
+        //- Return the current joint velocity
+        inline const scalarField& qDot0() const;
+
+        //- Return the current joint acceleration
+        inline const scalarField& qDdot0() const;
+
+
+        //- Acceleration damping coefficient (for steady-state simulations)
+        inline scalar aDamp() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("rigidBodySolver");
+
+
+    // Declare runtime construction
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            rigidBodySolver,
+            dictionary,
+            (
+                rigidBodyMotion& body,
+                const dictionary& dict
+            ),
+            (body, dict)
+        );
+
+
+    // Constructors
+
+        // Construct for given body
+        rigidBodySolver(rigidBodyMotion& body);
+
+
+    //- Destructor
+    virtual ~rigidBodySolver();
+
+
+    // Selectors
+
+        static autoPtr<rigidBodySolver> New
+        (
+            rigidBodyMotion& body,
+            const dictionary& dict
+        );
+
+
+    // Member Functions
+
+        //- Integrate the rigid-body joint-state one time-step
+        virtual void solve
+        (
+            scalar deltaT,
+            scalar deltaT0,
+            const scalarField& tau,
+            const Field<spatialVector>& fx
+        ) = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "rigidBodySolverI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
new file mode 100644
index 0000000000..b3d8043fa2
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+inline Foam::RBD::rigidBodyModelState& Foam::RBD::rigidBodySolver::state()
+{
+    return model_.motionState_;
+}
+
+
+inline const Foam::RBD::rigidBodyModelState&
+Foam::RBD::rigidBodySolver::state0() const
+{
+    return model_.motionState0_;
+}
+
+
+inline Foam::scalarField& Foam::RBD::rigidBodySolver::q()
+{
+    return state().q();
+}
+
+
+inline Foam::scalarField& Foam::RBD::rigidBodySolver::w()
+{
+    return state().w();
+}
+
+
+inline Foam::scalarField& Foam::RBD::rigidBodySolver::qDot()
+{
+    return state().qDot();
+}
+
+
+inline Foam::scalarField& Foam::RBD::rigidBodySolver::qDdot()
+{
+    return state().qDdot();
+}
+
+
+inline const Foam::scalarField& Foam::RBD::rigidBodySolver::q0() const
+{
+    return state0().q();
+}
+
+
+inline const Foam::scalarField& Foam::RBD::rigidBodySolver::w0() const
+{
+    return state0().w();
+}
+
+
+inline const Foam::scalarField& Foam::RBD::rigidBodySolver::qDot0() const
+{
+    return state0().qDot();
+}
+
+
+inline const Foam::scalarField& Foam::RBD::rigidBodySolver::qDdot0() const
+{
+    return state0().qDdot();
+}
+
+
+inline Foam::scalar Foam::RBD::rigidBodySolver::aDamp() const
+{
+    return model_.aDamp_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
new file mode 100644
index 0000000000..b05c5a567b
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "symplectic.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace rigidBodySolvers
+{
+    defineTypeNameAndDebug(symplectic, 0);
+    addToRunTimeSelectionTable(rigidBodySolver, symplectic, dictionary);
+}
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodySolvers::symplectic::symplectic
+(
+    rigidBodyMotion& body,
+    const dictionary& dict
+)
+:
+    rigidBodySolver(body)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::rigidBodySolvers::symplectic::~symplectic()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::RBD::rigidBodySolvers::symplectic::solve
+(
+    scalar deltaT,
+    scalar deltaT0,
+    const scalarField& tau,
+    const Field<spatialVector>& fx
+)
+{
+    // First simplectic step:
+    //     Half-step for linear and angular velocities
+    //     Update position and orientation
+    qDot() = qDot0() + aDamp()*0.5*deltaT0*qDdot();
+    q() = q0() + deltaT*qDot();
+
+    // Update the body-state prior to the evaluation of the restraints
+    model_.forwardDynamicsCorrection(state());
+
+    // Accumulate the restraint forces
+    Field<spatialVector> rfx(fx);
+    model_.applyRestraints(rfx);
+
+    // Calculate the body acceleration for the given state
+    // and restraint forces
+    model_.forwardDynamics(state(), tau, rfx);
+
+    // Second simplectic step:
+    //     Complete update of linear and angular velocities
+    qDot() += aDamp()*0.5*deltaT*qDdot();
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.H b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.H
new file mode 100644
index 0000000000..e15a73b59a
--- /dev/null
+++ b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.H
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::RBD::rigidBodySolvers::symplectic
+
+Description
+    Symplectic 2nd-order explicit time-integrator for rigid-body motion.
+
+    Reference:
+    \verbatim
+        Dullweber, A., Leimkuhler, B., & McLachlan, R. (1997).
+        Symplectic splitting methods for rigid body molecular dynamics.
+        The Journal of chemical physics, 107(15), 5840-5851.
+    \endverbatim
+
+    Can only be used for explicit integration of the motion of the body,
+    i.e. may only be called once per time-step, no outer-correctors may be
+    applied.  For implicit integration with outer-correctors choose either
+    CrankNicolson or Newmark schemes.
+
+    Example specification in dynamicMeshDict:
+    \verbatim
+    solver
+    {
+        type    symplectic;
+    }
+    \endverbatim
+
+SeeAlso
+    Foam::RBD::rigidBodySolvers::CrankNicolson
+    Foam::RBD::rigidBodySolvers::Newmark
+
+SourceFiles
+    symplectic.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef symplectic_H
+#define symplectic_H
+
+#include "rigidBodySolver.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+namespace rigidBodySolvers
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class symplectic Declaration
+\*---------------------------------------------------------------------------*/
+
+class symplectic
+:
+    public rigidBodySolver
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("symplectic");
+
+
+    // Constructors
+
+        //- Construct for the given body from dictionary
+        symplectic
+        (
+            rigidBodyMotion& body,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~symplectic();
+
+
+    // Member Functions
+
+        //- Integrate the rigid-body joint-state one time-step
+        virtual void solve
+        (
+            scalar deltaT,
+            scalar deltaT0,
+            const scalarField& tau,
+            const Field<spatialVector>& fx
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace rigidBodySolvers
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 3fda441e455daf2d7f9c725879315094daff3f38 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 11:36:59 +0100
Subject: [PATCH 402/447] Updated header

---
 src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H
index 7faeebdf7d..79adb8fc9f 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From f51dfc37f230349681b3ebdae3111292100c5df5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 12:57:31 +0100
Subject: [PATCH 403/447] rigidBodyDynamics: Simplified the interface to the
 solvers

---
 applications/test/rigidBodyDynamics/spring/spring.C  |  8 +-------
 .../rigidBodyMotion/rigidBodyMotion.C                |  7 ++++---
 .../rigidBodyMotion/rigidBodyMotion.H                | 12 +++++++++---
 .../rigidBodyMotion/rigidBodyMotionI.H               |  2 ++
 .../rigidBodySolvers/CrankNicolson/CrankNicolson.C   |  6 ++----
 .../rigidBodySolvers/CrankNicolson/CrankNicolson.H   |  4 +---
 .../rigidBodySolvers/Newmark/Newmark.C               |  9 ++++-----
 .../rigidBodySolvers/Newmark/Newmark.H               |  4 +---
 .../rigidBodySolver/rigidBodySolver.H                | 11 +++++++----
 .../rigidBodySolver/rigidBodySolverI.H               | 12 ++++++++++++
 .../rigidBodySolvers/symplectic/symplectic.C         |  8 +++-----
 .../rigidBodySolvers/symplectic/symplectic.H         |  4 +---
 12 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/applications/test/rigidBodyDynamics/spring/spring.C b/applications/test/rigidBodyDynamics/spring/spring.C
index e6f36524c6..1388fe1010 100644
--- a/applications/test/rigidBodyDynamics/spring/spring.C
+++ b/applications/test/rigidBodyDynamics/spring/spring.C
@@ -71,13 +71,7 @@ int main(int argc, char *argv[])
 
         for (label i=0; i<nIter; i++)
         {
-            spring.update
-            (
-                deltaT,
-                deltaT,
-                tau,
-                fx
-            );
+            spring.solve(deltaT, tau, fx);
         }
 
         // Write the results for graph generation
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
index d8d0f9dcbd..70b734da92 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
@@ -79,17 +79,18 @@ Foam::RBD::rigidBodyMotion::~rigidBodyMotion()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void Foam::RBD::rigidBodyMotion::update
+void Foam::RBD::rigidBodyMotion::solve
 (
     scalar deltaT,
-    scalar deltaT0,
     const scalarField& tau,
     const Field<spatialVector>& fx
 )
 {
+    deltaT_ = deltaT;
+
     if (Pstream::master())
     {
-        solver_->solve(deltaT, deltaT0, tau, fx);
+        solver_->solve(tau, fx);
 
         if (report_)
         {
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
index 632ec8b46e..398528a3b6 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
@@ -79,6 +79,12 @@ class rigidBodyMotion
         //- Motion state data object for previous time-step
         rigidBodyModelState motionState0_;
 
+        //- The current time-step
+        scalar deltaT_;
+
+        //- The previous time-step
+        scalar deltaT0_;
+
         //- Acceleration relaxation coefficient
         scalar aRelax_;
 
@@ -140,11 +146,11 @@ public:
 
         // Update state
 
-            //- Integration of velocities, orientation and position.
-            void update
+            //- Integrate velocities, orientation and position
+            //  for the given time-step
+            void solve
             (
                 scalar deltaT,
-                scalar deltaT0,
                 const scalarField& tau,
                 const Field<spatialVector>& fx
             );
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
index 9052f9386d..e9a430320d 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
@@ -41,8 +41,10 @@ Foam::RBD::rigidBodyMotion::state() const
 inline void Foam::RBD::rigidBodyMotion::newTime()
 {
     motionState0_ = motionState_;
+    deltaT0_ = deltaT_;
 }
 
+
 /*
 inline Foam::point Foam::RBD::rigidBodyMotion::transform
 (
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
index 694e1f003c..895e9b9e61 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
@@ -65,8 +65,6 @@ Foam::RBD::rigidBodySolvers::CrankNicolson::~CrankNicolson()
 
 void Foam::RBD::rigidBodySolvers::CrankNicolson::solve
 (
-    scalar deltaT,
-    scalar deltaT0,
     const scalarField& tau,
     const Field<spatialVector>& fx
 )
@@ -79,10 +77,10 @@ void Foam::RBD::rigidBodySolvers::CrankNicolson::solve
     model_.forwardDynamics(state(), tau, rfx);
 
     // Correct velocity
-    qDot() = qDot0() + aDamp()*deltaT*(aoc_*qDdot() + (1 - aoc_)*qDdot0());
+    qDot() = qDot0() + aDamp()*deltaT()*(aoc_*qDdot() + (1 - aoc_)*qDdot0());
 
     // Correct position
-    q() = q0() + deltaT*(voc_*qDot() + (1 - voc_)*qDot0());
+    q() = q0() + deltaT()*(voc_*qDot() + (1 - voc_)*qDot0());
 
     // Update the body-state
     model_.forwardDynamicsCorrection(state());
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.H b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.H
index 048e6f967c..0aa3a387ab 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.H
@@ -104,11 +104,9 @@ public:
 
     // Member Functions
 
-        //- Integrate the rigid-body joint-state one time-step
+        //- Integrate the rigid-body motion for one time-step
         virtual void solve
         (
-            scalar deltaT,
-            scalar deltaT0,
             const scalarField& tau,
             const Field<spatialVector>& fx
         );
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
index 8d8b8c767b..72e2eecea4 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
@@ -72,8 +72,6 @@ Foam::RBD::rigidBodySolvers::Newmark::~Newmark()
 
 void Foam::RBD::rigidBodySolvers::Newmark::solve
 (
-    scalar deltaT,
-    scalar deltaT0,
     const scalarField& tau,
     const Field<spatialVector>& fx
 )
@@ -86,12 +84,13 @@ void Foam::RBD::rigidBodySolvers::Newmark::solve
     model_.forwardDynamics(state(), tau, rfx);
 
     // Correct velocity
-    qDot() = qDot0() + aDamp()*deltaT*(gamma_*qDdot() + (1 - gamma_)*qDdot0());
+    qDot() = qDot0()
+      + aDamp()*deltaT()*(gamma_*qDdot() + (1 - gamma_)*qDdot0());
 
     // Correct position
     q() = q0()
-      + deltaT*qDot0()
-      + sqr(deltaT)*beta_*qDdot() + sqr(deltaT)*(0.5 - beta_)*qDdot0();
+      + deltaT()*qDot0()
+      + sqr(deltaT())*beta_*qDdot() + sqr(deltaT())*(0.5 - beta_)*qDdot0();
 
     // Update the body-state
     model_.forwardDynamicsCorrection(state());
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H
index 79adb8fc9f..b6745e2732 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.H
@@ -102,11 +102,9 @@ public:
 
     // Member Functions
 
-        //- Integrate the rigid-body joint-state one time-step
+        //- Integrate the rigid-body motion for one time-step
         virtual void solve
         (
-            scalar deltaT,
-            scalar deltaT0,
             const scalarField& tau,
             const Field<spatialVector>& fx
         );
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
index c4137d4b9a..a1959991b1 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
@@ -62,9 +62,14 @@ protected:
         //- Return the motion state
         inline rigidBodyModelState& state();
 
-        //- Return the motion state
+        //- Return the previous motion state
         inline const rigidBodyModelState& state0() const;
 
+        //- Return the current time-step
+        inline scalar deltaT() const;
+
+        //- Return the previous time-step
+        inline scalar deltaT0() const;
 
         //- Return the current joint position and orientation
         inline scalarField& q();
@@ -138,11 +143,9 @@ public:
 
     // Member Functions
 
-        //- Integrate the rigid-body joint-state one time-step
+        //- Integrate the rigid-body motion for one time-step
         virtual void solve
         (
-            scalar deltaT,
-            scalar deltaT0,
             const scalarField& tau,
             const Field<spatialVector>& fx
         ) = 0;
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
index b3d8043fa2..d1ddbd6880 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
@@ -38,6 +38,18 @@ Foam::RBD::rigidBodySolver::state0() const
 }
 
 
+inline Foam::scalar Foam::RBD::rigidBodySolver::deltaT() const
+{
+    return model_.deltaT_;
+}
+
+
+inline Foam::scalar Foam::RBD::rigidBodySolver::deltaT0() const
+{
+    return model_.deltaT0_;
+}
+
+
 inline Foam::scalarField& Foam::RBD::rigidBodySolver::q()
 {
     return state().q();
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
index b05c5a567b..76807a32b2 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
@@ -63,8 +63,6 @@ Foam::RBD::rigidBodySolvers::symplectic::~symplectic()
 
 void Foam::RBD::rigidBodySolvers::symplectic::solve
 (
-    scalar deltaT,
-    scalar deltaT0,
     const scalarField& tau,
     const Field<spatialVector>& fx
 )
@@ -72,8 +70,8 @@ void Foam::RBD::rigidBodySolvers::symplectic::solve
     // First simplectic step:
     //     Half-step for linear and angular velocities
     //     Update position and orientation
-    qDot() = qDot0() + aDamp()*0.5*deltaT0*qDdot();
-    q() = q0() + deltaT*qDot();
+    qDot() = qDot0() + aDamp()*0.5*deltaT0()*qDdot();
+    q() = q0() + deltaT()*qDot();
 
     // Update the body-state prior to the evaluation of the restraints
     model_.forwardDynamicsCorrection(state());
@@ -88,7 +86,7 @@ void Foam::RBD::rigidBodySolvers::symplectic::solve
 
     // Second simplectic step:
     //     Complete update of linear and angular velocities
-    qDot() += aDamp()*0.5*deltaT*qDdot();
+    qDot() += aDamp()*0.5*deltaT()*qDdot();
 }
 
 
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.H b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.H
index e15a73b59a..ec3f91d048 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.H
@@ -101,11 +101,9 @@ public:
 
     // Member Functions
 
-        //- Integrate the rigid-body joint-state one time-step
+        //- Integrate the rigid-body motion for one time-step
         virtual void solve
         (
-            scalar deltaT,
-            scalar deltaT0,
             const scalarField& tau,
             const Field<spatialVector>& fx
         );

From 948add3e10aea5fe1db4a5a4af5459871c668f7f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 16:16:30 +0100
Subject: [PATCH 404/447] applications/test/rigidBodyDynamics/spring: Correct
 typo

---
 applications/test/rigidBodyDynamics/spring/spring.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/test/rigidBodyDynamics/spring/spring.C b/applications/test/rigidBodyDynamics/spring/spring.C
index 1388fe1010..bf36cad1ea 100644
--- a/applications/test/rigidBodyDynamics/spring/spring.C
+++ b/applications/test/rigidBodyDynamics/spring/spring.C
@@ -25,7 +25,7 @@ Application
     spring
 
 Description
-    Simple weight and damped-spirng simulation with 1-DoF.
+    Simple weight and damped-spring simulation with 1-DoF.
 
 \*---------------------------------------------------------------------------*/
 

From 6be125814b2c1c6c7ee3fa11cd60fb07bd0cb5e5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 16:16:57 +0100
Subject: [PATCH 405/447] rigidBodyDynamics/rigidBodySolvers: Added support for
 the integration of quaternion joints

---
 .../rigidBodyModelState/rigidBodyModelState.C |  4 +--
 .../rigidBodyMotion/rigidBodyMotion.H         |  3 ++
 .../rigidBodyMotion/rigidBodyMotionI.H        |  7 ++++
 .../CrankNicolson/CrankNicolson.C             |  2 ++
 .../rigidBodySolvers/Newmark/Newmark.C        |  2 ++
 .../rigidBodySolver/rigidBodySolver.C         | 36 +++++++++++++++++++
 .../rigidBodySolver/rigidBodySolver.H         |  3 ++
 .../rigidBodySolvers/symplectic/symplectic.C  |  2 ++
 8 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
index cad3a5ce04..33ea779e7f 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
@@ -33,7 +33,7 @@ Foam::RBD::rigidBodyModelState::rigidBodyModelState
 )
 :
     q_(model.nDoF(), Zero),
-    w_(model.nw(), Zero),
+    w_(model.nw(), 1),
     qDot_(model.nDoF(), Zero),
     qDdot_(model.nDoF(), Zero)
 {}
@@ -46,7 +46,7 @@ Foam::RBD::rigidBodyModelState::rigidBodyModelState
 )
 :
     q_(dict.lookupOrDefault("q", scalarField(model.nDoF(), Zero))),
-    w_(dict.lookupOrDefault("w", scalarField(model.nw(), Zero))),
+    w_(dict.lookupOrDefault("w", scalarField(model.nw(), 1))),
     qDot_(dict.lookupOrDefault("qDot", scalarField(model.nDoF(), Zero))),
     qDdot_(dict.lookupOrDefault("qDdot", scalarField(model.nDoF(), Zero)))
 {}
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
index 398528a3b6..b2e4562b80 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
@@ -137,6 +137,9 @@ public:
             //- Return the motion state
             inline const rigidBodyModelState& state() const;
 
+            //- Return the motion state for modification
+            inline rigidBodyModelState& state();
+
 
         // Edit
 
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
index e9a430320d..0de439f807 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
@@ -38,6 +38,13 @@ Foam::RBD::rigidBodyMotion::state() const
 }
 
 
+inline Foam::RBD::rigidBodyModelState&
+Foam::RBD::rigidBodyMotion::state()
+{
+    return motionState_;
+}
+
+
 inline void Foam::RBD::rigidBodyMotion::newTime()
 {
     motionState0_ = motionState_;
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
index 895e9b9e61..6d48971be6 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
@@ -82,6 +82,8 @@ void Foam::RBD::rigidBodySolvers::CrankNicolson::solve
     // Correct position
     q() = q0() + deltaT()*(voc_*qDot() + (1 - voc_)*qDot0());
 
+    correctQuaternionJoints();
+
     // Update the body-state
     model_.forwardDynamicsCorrection(state());
 }
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
index 72e2eecea4..2d5e5d90ea 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
@@ -92,6 +92,8 @@ void Foam::RBD::rigidBodySolvers::Newmark::solve
       + deltaT()*qDot0()
       + sqr(deltaT())*beta_*qDdot() + sqr(deltaT())*(0.5 - beta_)*qDdot0();
 
+    correctQuaternionJoints();
+
     // Update the body-state
     model_.forwardDynamicsCorrection(state());
 }
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
index 669d8c9cc3..7cfc931778 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
@@ -52,4 +52,40 @@ Foam::RBD::rigidBodySolver::~rigidBodySolver()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::RBD::rigidBodySolver::correctQuaternionJoints()
+{
+    if (model_.nw())
+    {
+        forAll (model_.joints(), i)
+        {
+            const label qi = model_.joints()[i].qIndex();
+
+            if (model_.joints()[i].nw() == 1)
+            {
+                // Calculate the change in the normalized quaternion axis
+                vector dv((q().block<vector>(qi) - q0().block<vector>(qi)));
+                scalar magDv = mag(dv);
+
+                if (magDv > SMALL)
+                {
+                    // Calculate the quaternion corresponding to the change
+                    quaternion dQuat(dv/magDv, cos(magDv), true);
+
+                    // Transform the previous time quaternion
+                    quaternion quat
+                    (
+                        normalize(model_.joints()[i](q0(), w0())*dQuat)
+                    );
+
+                    // Update the joint state
+                    model_.joints()[i](quat, q(), w());
+                }
+            }
+        }
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
index a1959991b1..0183a4be71 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
@@ -100,6 +100,9 @@ protected:
         //- Acceleration damping coefficient (for steady-state simulations)
         inline scalar aDamp() const;
 
+        //- Correct the quaternion joints based on the current change in q
+        void correctQuaternionJoints();
+
 
 public:
 
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
index 76807a32b2..18b78ad89f 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
@@ -73,6 +73,8 @@ void Foam::RBD::rigidBodySolvers::symplectic::solve
     qDot() = qDot0() + aDamp()*0.5*deltaT0()*qDdot();
     q() = q0() + deltaT()*qDot();
 
+    correctQuaternionJoints();
+
     // Update the body-state prior to the evaluation of the restraints
     model_.forwardDynamicsCorrection(state());
 

From 985506be28248ed030220281bd96db37a2cd31da Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 16:37:26 +0100
Subject: [PATCH 406/447] applications/test/rigidBodyDynamics/spring: Updated
 comment

---
 applications/test/rigidBodyDynamics/spring/spring.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/test/rigidBodyDynamics/spring/spring.C b/applications/test/rigidBodyDynamics/spring/spring.C
index bf36cad1ea..15e9034b30 100644
--- a/applications/test/rigidBodyDynamics/spring/spring.C
+++ b/applications/test/rigidBodyDynamics/spring/spring.C
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
     OFstream qFile("qVsTime");
     OFstream qDotFile("qDotVsTime");
 
-    // Integrate the motion of the spring for 4s using a symplectic method
+    // Integrate the motion of the spring for 4s
     scalar deltaT = 0.002;
     for (scalar t=0; t<4; t+=deltaT)
     {

From 5e6bdeea57332653f174a86e563ba868bfd78f80 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 16:37:52 +0100
Subject: [PATCH 407/447] applications/test/rigidBodyDynamics/sphericalJoint:
 Test for the quaternion-based spherical joint

---
 .../sphericalJoint/Make/files                 |   3 +
 .../sphericalJoint/Make/options               |   5 +
 .../sphericalJoint/sphericalJoint             |  24 ++++
 .../sphericalJoint/sphericalJoint.C           | 105 ++++++++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 applications/test/rigidBodyDynamics/sphericalJoint/Make/files
 create mode 100644 applications/test/rigidBodyDynamics/sphericalJoint/Make/options
 create mode 100644 applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint
 create mode 100644 applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C

diff --git a/applications/test/rigidBodyDynamics/sphericalJoint/Make/files b/applications/test/rigidBodyDynamics/sphericalJoint/Make/files
new file mode 100644
index 0000000000..db7bc27a9b
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/sphericalJoint/Make/files
@@ -0,0 +1,3 @@
+sphericalJoint.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-sphericalJoint
diff --git a/applications/test/rigidBodyDynamics/sphericalJoint/Make/options b/applications/test/rigidBodyDynamics/sphericalJoint/Make/options
new file mode 100644
index 0000000000..4a9d828b67
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/sphericalJoint/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/rigidBodyDynamics/lnInclude
+
+EXE_LIBS = \
+    -lrigidBodyDynamics
diff --git a/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint
new file mode 100644
index 0000000000..c040a35e2e
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint
@@ -0,0 +1,24 @@
+solver
+{
+    type Newmark;
+}
+
+// It is necessary to iterate for the Newmark solver
+nIter 2;
+
+bodies
+{
+    pendulum
+    {
+        type            rigidBody;
+        mass            1;
+        centreOfMass    (0 -1 0);
+        inertia         (0.001 0 0 0.001 0 0.001);
+        parent          root;
+        transform       (1 0 0 0 1 0 0 0 1) (0 0 0);
+        joint
+        {
+            type            Rs;
+        }
+    }
+}
diff --git a/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
new file mode 100644
index 0000000000..75c63f273b
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+Application
+    sphericalJoint
+
+Description
+    Simple spherical-joint pendulum.
+
+\*---------------------------------------------------------------------------*/
+
+#include "rigidBodyMotion.H"
+#include "masslessBody.H"
+#include "sphere.H"
+#include "joints.H"
+#include "rigidBodyRestraint.H"
+#include "rigidBodyModelState.H"
+#include "IFstream.H"
+#include "OFstream.H"
+
+using namespace Foam;
+using namespace RBD;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    dictionary sphericalJointDict(IFstream("sphericalJoint")());
+
+    // Create the sphericalJoint model from dictionary
+    rigidBodyMotion sphericalJoint(sphericalJointDict);
+
+    label nIter(readLabel(sphericalJointDict.lookup("nIter")));
+
+    Info<< sphericalJoint << endl;
+
+    // Create the joint-space force field
+    scalarField tau(sphericalJoint.nDoF(), Zero);
+
+    // Create the external body force field
+    Field<spatialVector> fx(sphericalJoint.nBodies(), Zero);
+
+    // Set the angle of the pendulum to 0.3rad
+    sphericalJoint.joints()[1]
+    (
+        quaternion(quaternion::ZYX, vector(0.3, 0, 0)),
+        sphericalJoint.state().q(),
+        sphericalJoint.state().w()
+    );
+
+    // Set the gravitational acceleration
+    sphericalJoint.g() = vector(0, -9.81, 0);
+
+    OFstream omegaFile("omegaVsTime");
+
+    // Integrate the motion of the sphericalJoint for 4.1s
+    scalar deltaT = 0.01;
+    for (scalar t=0; t<4.1; t+=deltaT)
+    {
+        sphericalJoint.newTime();
+
+        for (label i=0; i<nIter; i++)
+        {
+            sphericalJoint.solve(deltaT, tau, fx);
+        }
+
+        // Write the results for graph generation
+        // using 'gnuplot sphericalJoint.gnuplot'
+        omegaFile
+            << t << " "
+            << sphericalJoint.joints()[1]
+               (
+                   sphericalJoint.state().q(),
+                   sphericalJoint.state().w()
+               ).eulerAngles(quaternion::ZYX).x()
+            << endl;
+    }
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //

From 2d2ecf91dc03626fc48a2b080e0612b7a87b9673 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 21:43:03 +0100
Subject: [PATCH 408/447] quaternion: Added static member function to return a
 unit quaternion constructed from a vector

    //- Return the unit quaternion (versor) from the given vector
    //  (w = sqrt(1 - |sqr(v)|))
    static inline quaternion unit(const vector& v);
---
 src/OpenFOAM/primitives/quaternion/quaternion.H  | 9 +++++++--
 src/OpenFOAM/primitives/quaternion/quaternionI.H | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.H b/src/OpenFOAM/primitives/quaternion/quaternion.H
index 33e74c04a0..ab1c5379bb 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.H
@@ -140,12 +140,17 @@ public:
             const bool normalized
         );
 
-        //- Construct given scalar part, the vector part = vector::zero
+        //- Construct a real from the given scalar part, the vector part = zero
         inline explicit quaternion(const scalar w);
 
-        //- Construct a pure quaternion given the vector part, scalar part = 0
+        //- Construct a pure imaginary quaternion given the vector part,
+        //  the scalar part = 0
         inline explicit quaternion(const vector& v);
 
+        //- Return the unit quaternion (versor) from the given vector
+        //  (w = sqrt(1 - |sqr(v)|))
+        static inline quaternion unit(const vector& v);
+
         //- Construct a quaternion given the three Euler angles
         inline quaternion
         (
diff --git a/src/OpenFOAM/primitives/quaternion/quaternionI.H b/src/OpenFOAM/primitives/quaternion/quaternionI.H
index 3fa4013503..f2e6761576 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternionI.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternionI.H
@@ -78,6 +78,12 @@ inline Foam::quaternion::quaternion(const vector& v)
 {}
 
 
+inline Foam::quaternion Foam::quaternion::unit(const vector& v)
+{
+    return quaternion(sqrt(1 - magSqr(v)), v);
+}
+
+
 inline Foam::quaternion::quaternion
 (
     const rotationSequence rs,

From 315a1baad3fc53ba9e39756f4e3530f029e30da3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 21:44:34 +0100
Subject: [PATCH 409/447] rigidBodyDynamics: Simplify handling of quaternions
 by maintaining a unit quaternion in the joint state field 'q'

'w' is now obtained from 'v' using the relation w = sqrt(1 - |sqr(v)|)
and 'v' is stored in the joint state field 'q' and integrated in the
usual manner but corrected using quaternion transformations.
---
 .../sphericalJoint/sphericalJoint.C                  |  6 ++----
 src/rigidBodyDynamics/joints/Pa/Pa.C                 |  1 -
 src/rigidBodyDynamics/joints/Pa/Pa.H                 |  1 -
 src/rigidBodyDynamics/joints/Px/Px.C                 |  1 -
 src/rigidBodyDynamics/joints/Px/Px.H                 |  1 -
 src/rigidBodyDynamics/joints/Pxyz/Pxyz.C             |  1 -
 src/rigidBodyDynamics/joints/Pxyz/Pxyz.H             |  1 -
 src/rigidBodyDynamics/joints/Py/Py.C                 |  1 -
 src/rigidBodyDynamics/joints/Py/Py.H                 |  1 -
 src/rigidBodyDynamics/joints/Pz/Pz.C                 |  1 -
 src/rigidBodyDynamics/joints/Pz/Pz.H                 |  1 -
 src/rigidBodyDynamics/joints/Ra/Ra.C                 |  1 -
 src/rigidBodyDynamics/joints/Ra/Ra.H                 |  1 -
 src/rigidBodyDynamics/joints/Rs/Rs.C                 |  3 +--
 src/rigidBodyDynamics/joints/Rs/Rs.H                 |  1 -
 src/rigidBodyDynamics/joints/Rx/Rx.C                 |  1 -
 src/rigidBodyDynamics/joints/Rx/Rx.H                 |  1 -
 src/rigidBodyDynamics/joints/Rxyz/Rxyz.C             |  1 -
 src/rigidBodyDynamics/joints/Rxyz/Rxyz.H             |  1 -
 src/rigidBodyDynamics/joints/Ry/Ry.C                 |  1 -
 src/rigidBodyDynamics/joints/Ry/Ry.H                 |  1 -
 src/rigidBodyDynamics/joints/Ryxz/Ryxz.C             |  1 -
 src/rigidBodyDynamics/joints/Ryxz/Ryxz.H             |  1 -
 src/rigidBodyDynamics/joints/Rz/Rz.C                 |  1 -
 src/rigidBodyDynamics/joints/Rz/Rz.H                 |  1 -
 src/rigidBodyDynamics/joints/Rzyx/Rzyx.C             |  1 -
 src/rigidBodyDynamics/joints/Rzyx/Rzyx.H             |  1 -
 .../joints/composite/compositeJoint.C                |  3 +--
 .../joints/composite/compositeJoint.H                |  1 -
 src/rigidBodyDynamics/joints/joint/joint.H           |  7 ++-----
 src/rigidBodyDynamics/joints/joint/jointI.H          |  9 +++------
 src/rigidBodyDynamics/joints/null/nullJoint.C        |  1 -
 src/rigidBodyDynamics/joints/null/nullJoint.H        |  1 -
 .../rigidBodyModel/forwardDynamics.C                 |  6 ++----
 .../rigidBodyModelState/rigidBodyModelState.C        |  2 --
 .../rigidBodyModelState/rigidBodyModelState.H        |  5 -----
 .../rigidBodyModelState/rigidBodyModelStateI.H       | 12 ------------
 .../rigidBodyModelState/rigidBodyModelStateIO.C      |  4 ----
 .../rigidBodySolver/rigidBodySolver.C                |  4 ++--
 .../rigidBodySolver/rigidBodySolver.H                |  2 --
 .../rigidBodySolver/rigidBodySolverI.H               | 12 ------------
 41 files changed, 13 insertions(+), 90 deletions(-)

diff --git a/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
index 75c63f273b..d69fdb54ca 100644
--- a/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
+++ b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
@@ -64,8 +64,7 @@ int main(int argc, char *argv[])
     sphericalJoint.joints()[1]
     (
         quaternion(quaternion::ZYX, vector(0.3, 0, 0)),
-        sphericalJoint.state().q(),
-        sphericalJoint.state().w()
+        sphericalJoint.state().q()
     );
 
     // Set the gravitational acceleration
@@ -90,8 +89,7 @@ int main(int argc, char *argv[])
             << t << " "
             << sphericalJoint.joints()[1]
                (
-                   sphericalJoint.state().q(),
-                   sphericalJoint.state().w()
+                   sphericalJoint.state().q()
                ).eulerAngles(quaternion::ZYX).x()
             << endl;
     }
diff --git a/src/rigidBodyDynamics/joints/Pa/Pa.C b/src/rigidBodyDynamics/joints/Pa/Pa.C
index 0bdfa0a42b..b30997acad 100644
--- a/src/rigidBodyDynamics/joints/Pa/Pa.C
+++ b/src/rigidBodyDynamics/joints/Pa/Pa.C
@@ -85,7 +85,6 @@ void Foam::RBD::joints::Pa::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Pa/Pa.H b/src/rigidBodyDynamics/joints/Pa/Pa.H
index f27a8c850a..d67af31d9a 100644
--- a/src/rigidBodyDynamics/joints/Pa/Pa.H
+++ b/src/rigidBodyDynamics/joints/Pa/Pa.H
@@ -92,7 +92,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 
diff --git a/src/rigidBodyDynamics/joints/Px/Px.C b/src/rigidBodyDynamics/joints/Px/Px.C
index 412a3df472..a4a382c2a4 100644
--- a/src/rigidBodyDynamics/joints/Px/Px.C
+++ b/src/rigidBodyDynamics/joints/Px/Px.C
@@ -84,7 +84,6 @@ void Foam::RBD::joints::Px::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Px/Px.H b/src/rigidBodyDynamics/joints/Px/Px.H
index b7d77f344a..979abcf5c0 100644
--- a/src/rigidBodyDynamics/joints/Px/Px.H
+++ b/src/rigidBodyDynamics/joints/Px/Px.H
@@ -92,7 +92,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.C b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.C
index fcb5dac7e8..6d87412e81 100644
--- a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.C
+++ b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.C
@@ -88,7 +88,6 @@ void Foam::RBD::joints::Pxyz::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
index 5fbdeb7833..02746bf14c 100644
--- a/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
+++ b/src/rigidBodyDynamics/joints/Pxyz/Pxyz.H
@@ -92,7 +92,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/joints/Py/Py.C b/src/rigidBodyDynamics/joints/Py/Py.C
index 4b297bbcab..6fb02c4f54 100644
--- a/src/rigidBodyDynamics/joints/Py/Py.C
+++ b/src/rigidBodyDynamics/joints/Py/Py.C
@@ -84,7 +84,6 @@ void Foam::RBD::joints::Py::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Py/Py.H b/src/rigidBodyDynamics/joints/Py/Py.H
index 981e7154af..bcbcd47785 100644
--- a/src/rigidBodyDynamics/joints/Py/Py.H
+++ b/src/rigidBodyDynamics/joints/Py/Py.H
@@ -92,7 +92,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/joints/Pz/Pz.C b/src/rigidBodyDynamics/joints/Pz/Pz.C
index 83850020dd..6c90c36790 100644
--- a/src/rigidBodyDynamics/joints/Pz/Pz.C
+++ b/src/rigidBodyDynamics/joints/Pz/Pz.C
@@ -84,7 +84,6 @@ void Foam::RBD::joints::Pz::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Pz/Pz.H b/src/rigidBodyDynamics/joints/Pz/Pz.H
index 18783f0d49..611397ded5 100644
--- a/src/rigidBodyDynamics/joints/Pz/Pz.H
+++ b/src/rigidBodyDynamics/joints/Pz/Pz.H
@@ -92,7 +92,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/joints/Ra/Ra.C b/src/rigidBodyDynamics/joints/Ra/Ra.C
index 926f56a3b8..468985ea67 100644
--- a/src/rigidBodyDynamics/joints/Ra/Ra.C
+++ b/src/rigidBodyDynamics/joints/Ra/Ra.C
@@ -85,7 +85,6 @@ void Foam::RBD::joints::Ra::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Ra/Ra.H b/src/rigidBodyDynamics/joints/Ra/Ra.H
index def3724c13..cd634f7b89 100644
--- a/src/rigidBodyDynamics/joints/Ra/Ra.H
+++ b/src/rigidBodyDynamics/joints/Ra/Ra.H
@@ -92,7 +92,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 
diff --git a/src/rigidBodyDynamics/joints/Rs/Rs.C b/src/rigidBodyDynamics/joints/Rs/Rs.C
index 9658b7595e..e7b284ebed 100644
--- a/src/rigidBodyDynamics/joints/Rs/Rs.C
+++ b/src/rigidBodyDynamics/joints/Rs/Rs.C
@@ -94,11 +94,10 @@ void Foam::RBD::joints::Rs::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
-    J.X.E() = operator()(q, w).R().T();
+    J.X.E() = operator()(q).R().T();
     J.X.r() = Zero;
 
     J.S = Zero;
diff --git a/src/rigidBodyDynamics/joints/Rs/Rs.H b/src/rigidBodyDynamics/joints/Rs/Rs.H
index 386a869bf6..9672168e8f 100644
--- a/src/rigidBodyDynamics/joints/Rs/Rs.H
+++ b/src/rigidBodyDynamics/joints/Rs/Rs.H
@@ -97,7 +97,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/joints/Rx/Rx.C b/src/rigidBodyDynamics/joints/Rx/Rx.C
index 87343fe55f..e2d3f6953d 100644
--- a/src/rigidBodyDynamics/joints/Rx/Rx.C
+++ b/src/rigidBodyDynamics/joints/Rx/Rx.C
@@ -84,7 +84,6 @@ void Foam::RBD::joints::Rx::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Rx/Rx.H b/src/rigidBodyDynamics/joints/Rx/Rx.H
index 3da54830a9..892cfcb709 100644
--- a/src/rigidBodyDynamics/joints/Rx/Rx.H
+++ b/src/rigidBodyDynamics/joints/Rx/Rx.H
@@ -92,7 +92,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.C b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.C
index 39b3d5f7de..2055c67488 100644
--- a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.C
+++ b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.C
@@ -88,7 +88,6 @@ void Foam::RBD::joints::Rxyz::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
index 3a63a4ffbe..43582796de 100644
--- a/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
+++ b/src/rigidBodyDynamics/joints/Rxyz/Rxyz.H
@@ -93,7 +93,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/joints/Ry/Ry.C b/src/rigidBodyDynamics/joints/Ry/Ry.C
index d771a7130f..89d414ecc3 100644
--- a/src/rigidBodyDynamics/joints/Ry/Ry.C
+++ b/src/rigidBodyDynamics/joints/Ry/Ry.C
@@ -84,7 +84,6 @@ void Foam::RBD::joints::Ry::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Ry/Ry.H b/src/rigidBodyDynamics/joints/Ry/Ry.H
index 4bfa32401f..0a870bd925 100644
--- a/src/rigidBodyDynamics/joints/Ry/Ry.H
+++ b/src/rigidBodyDynamics/joints/Ry/Ry.H
@@ -92,7 +92,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.C b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.C
index 2de4088517..fd5f942e33 100644
--- a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.C
+++ b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.C
@@ -88,7 +88,6 @@ void Foam::RBD::joints::Ryxz::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
index 02a7fe4200..1371abcf80 100644
--- a/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
+++ b/src/rigidBodyDynamics/joints/Ryxz/Ryxz.H
@@ -93,7 +93,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/joints/Rz/Rz.C b/src/rigidBodyDynamics/joints/Rz/Rz.C
index 9027e2d8c7..c02ba9cec1 100644
--- a/src/rigidBodyDynamics/joints/Rz/Rz.C
+++ b/src/rigidBodyDynamics/joints/Rz/Rz.C
@@ -84,7 +84,6 @@ void Foam::RBD::joints::Rz::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Rz/Rz.H b/src/rigidBodyDynamics/joints/Rz/Rz.H
index 19a7697503..01ed3139b0 100644
--- a/src/rigidBodyDynamics/joints/Rz/Rz.H
+++ b/src/rigidBodyDynamics/joints/Rz/Rz.H
@@ -92,7 +92,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.C b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.C
index 7b1a8bc1fc..1e35932222 100644
--- a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.C
+++ b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.C
@@ -88,7 +88,6 @@ void Foam::RBD::joints::Rzyx::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
index 344ad4fbc1..3aeb85dd63 100644
--- a/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
+++ b/src/rigidBodyDynamics/joints/Rzyx/Rzyx.H
@@ -93,7 +93,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/joints/composite/compositeJoint.C b/src/rigidBodyDynamics/joints/composite/compositeJoint.C
index 28044e9493..819d575962 100644
--- a/src/rigidBodyDynamics/joints/composite/compositeJoint.C
+++ b/src/rigidBodyDynamics/joints/composite/compositeJoint.C
@@ -96,11 +96,10 @@ void Foam::RBD::joints::composite::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
-    last().jcalc(J, q, w, qDot);
+    last().jcalc(J, q, qDot);
 }
 
 
diff --git a/src/rigidBodyDynamics/joints/composite/compositeJoint.H b/src/rigidBodyDynamics/joints/composite/compositeJoint.H
index c3033b4abd..80f3496fa7 100644
--- a/src/rigidBodyDynamics/joints/composite/compositeJoint.H
+++ b/src/rigidBodyDynamics/joints/composite/compositeJoint.H
@@ -109,7 +109,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 
diff --git a/src/rigidBodyDynamics/joints/joint/joint.H b/src/rigidBodyDynamics/joints/joint/joint.H
index bdab806be3..eb06419e93 100644
--- a/src/rigidBodyDynamics/joints/joint/joint.H
+++ b/src/rigidBodyDynamics/joints/joint/joint.H
@@ -236,7 +236,6 @@ public:
         (
             XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const = 0;
 
@@ -250,8 +249,7 @@ public:
         //  if it uses a quaternion representation for rotation
         inline quaternion operator()
         (
-            const scalarField& q,
-            const scalarField& w
+            const scalarField& q
         ) const;
 
         //- Set the state quaternion for this joint
@@ -259,8 +257,7 @@ public:
         inline void operator()
         (
             const quaternion& quat,
-            scalarField& q,
-            scalarField& w
+            scalarField& q
         ) const;
 
 
diff --git a/src/rigidBodyDynamics/joints/joint/jointI.H b/src/rigidBodyDynamics/joints/joint/jointI.H
index 0b33fb9322..090adb18d2 100644
--- a/src/rigidBodyDynamics/joints/joint/jointI.H
+++ b/src/rigidBodyDynamics/joints/joint/jointI.H
@@ -71,8 +71,7 @@ inline const Foam::List<Foam::spatialVector>& Foam::RBD::joint::S() const
 
 inline Foam::quaternion Foam::RBD::joint::operator()
 (
-    const scalarField& q,
-    const scalarField& w
+    const scalarField& q
 ) const
 {
     if (nw() != 1)
@@ -82,15 +81,14 @@ inline Foam::quaternion Foam::RBD::joint::operator()
             << abort(FatalError);
     }
 
-    return quaternion(w[wIndex_], q.block<vector>(qIndex_));
+    return quaternion::unit(q.block<vector>(qIndex_));
 }
 
 
 inline void Foam::RBD::joint::operator()
 (
     const quaternion& quat,
-    scalarField& q,
-    scalarField& w
+    scalarField& q
 ) const
 {
     if (nw() != 1)
@@ -100,7 +98,6 @@ inline void Foam::RBD::joint::operator()
             << abort(FatalError);
     }
 
-    w[wIndex_] = quat.w();
     q[qIndex_] = quat.v().x();
     q[qIndex_+1] = quat.v().y();
     q[qIndex_+2] = quat.v().z();
diff --git a/src/rigidBodyDynamics/joints/null/nullJoint.C b/src/rigidBodyDynamics/joints/null/nullJoint.C
index 30b72b1907..baed48767f 100644
--- a/src/rigidBodyDynamics/joints/null/nullJoint.C
+++ b/src/rigidBodyDynamics/joints/null/nullJoint.C
@@ -80,7 +80,6 @@ void Foam::RBD::joints::null::jcalc
 (
     joint::XSvc& J,
     const scalarField& q,
-    const scalarField& w,
     const scalarField& qDot
 ) const
 {
diff --git a/src/rigidBodyDynamics/joints/null/nullJoint.H b/src/rigidBodyDynamics/joints/null/nullJoint.H
index 68844d2e5f..cc97aed72b 100644
--- a/src/rigidBodyDynamics/joints/null/nullJoint.H
+++ b/src/rigidBodyDynamics/joints/null/nullJoint.H
@@ -92,7 +92,6 @@ public:
         (
             joint::XSvc& J,
             const scalarField& q,
-            const scalarField& w,
             const scalarField& qDot
         ) const;
 };
diff --git a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
index fafce3431f..a43e57a828 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
@@ -54,7 +54,6 @@ void Foam::RBD::rigidBodyModel::forwardDynamics
 ) const
 {
     const scalarField& q = state.q();
-    const scalarField& w = state.w();
     const scalarField& qDot = state.qDot();
     scalarField& qDdot = state.qDdot();
 
@@ -71,7 +70,7 @@ void Foam::RBD::rigidBodyModel::forwardDynamics
     for (label i=1; i<nBodies(); i++)
     {
         const joint& jnt = joints()[i];
-        jnt.jcalc(J, q, w, qDot);
+        jnt.jcalc(J, q, qDot);
 
         S_[i] = J.S;
         S1_[i] = J.S1;
@@ -208,7 +207,6 @@ void Foam::RBD::rigidBodyModel::forwardDynamicsCorrection
     DebugInFunction << endl;
 
     const scalarField& q = state.q();
-    const scalarField& w = state.w();
     const scalarField& qDot = state.qDot();
     const scalarField& qDdot = state.qDdot();
 
@@ -223,7 +221,7 @@ void Foam::RBD::rigidBodyModel::forwardDynamicsCorrection
         const joint& jnt = joints()[i];
         const label qi = jnt.qIndex();
 
-        jnt.jcalc(J, q, w, qDot);
+        jnt.jcalc(J, q, qDot);
 
         S_[i] = J.S;
         S1_[i] = J.S1;
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
index 33ea779e7f..9c70cfee2d 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
@@ -33,7 +33,6 @@ Foam::RBD::rigidBodyModelState::rigidBodyModelState
 )
 :
     q_(model.nDoF(), Zero),
-    w_(model.nw(), 1),
     qDot_(model.nDoF(), Zero),
     qDdot_(model.nDoF(), Zero)
 {}
@@ -46,7 +45,6 @@ Foam::RBD::rigidBodyModelState::rigidBodyModelState
 )
 :
     q_(dict.lookupOrDefault("q", scalarField(model.nDoF(), Zero))),
-    w_(dict.lookupOrDefault("w", scalarField(model.nw(), 1))),
     qDot_(dict.lookupOrDefault("qDot", scalarField(model.nDoF(), Zero))),
     qDdot_(dict.lookupOrDefault("qDdot", scalarField(model.nDoF(), Zero)))
 {}
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
index 512ce31235..483d98e19a 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
@@ -70,9 +70,6 @@ class rigidBodyModelState
         //- Joint position and orientation
         scalarField q_;
 
-        //- Joint quaternion
-        scalarField w_;
-
         //- Joint velocity
         scalarField qDot_;
 
@@ -103,7 +100,6 @@ public:
             inline const scalarField& q() const;
 
             //- Return access to the joint quaternion
-            inline const scalarField& w() const;
 
             //- Return access to the joint velocity
             inline const scalarField& qDot() const;
@@ -118,7 +114,6 @@ public:
             inline scalarField& q();
 
             //- Return access to the joint quaternion
-            inline scalarField& w();
 
             //- Return access to the joint velocity
             inline scalarField& qDot();
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H
index 34a3757e66..80bb529e02 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H
@@ -31,12 +31,6 @@ inline const Foam::scalarField& Foam::RBD::rigidBodyModelState::q() const
 }
 
 
-inline const Foam::scalarField& Foam::RBD::rigidBodyModelState::w() const
-{
-    return w_;
-}
-
-
 inline const Foam::scalarField& Foam::RBD::rigidBodyModelState::qDot() const
 {
     return qDot_;
@@ -55,12 +49,6 @@ inline Foam::scalarField& Foam::RBD::rigidBodyModelState::q()
 }
 
 
-inline Foam::scalarField& Foam::RBD::rigidBodyModelState::w()
-{
-    return w_;
-}
-
-
 inline Foam::scalarField& Foam::RBD::rigidBodyModelState::qDot()
 {
     return qDot_;
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
index 153f7ddd16..49e9153931 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
@@ -31,7 +31,6 @@ License
 void Foam::RBD::rigidBodyModelState::write(dictionary& dict) const
 {
     dict.add("q", q_);
-    dict.add("w", w_);
     dict.add("qDot", qDot_);
     dict.add("qDdot", qDdot_);
 }
@@ -40,7 +39,6 @@ void Foam::RBD::rigidBodyModelState::write(dictionary& dict) const
 void Foam::RBD::rigidBodyModelState::write(Ostream& os) const
 {
     os.writeKeyword("q") << q_ << token::END_STATEMENT << nl;
-    os.writeKeyword("w") << w_ << token::END_STATEMENT << nl;
     os.writeKeyword("qDot") << qDot_ << token::END_STATEMENT << nl;
     os.writeKeyword("qDdot") << qDdot_ << token::END_STATEMENT << nl;
 }
@@ -55,7 +53,6 @@ Foam::Istream& Foam::RBD::operator>>
 )
 {
     is  >> state.q_
-        >> state.w_
         >> state.qDot_
         >> state.qDdot_;
 
@@ -77,7 +74,6 @@ Foam::Ostream& Foam::RBD::operator<<
 )
 {
     os  << token::SPACE << state.q_
-        << token::SPACE << state.w_
         << token::SPACE << state.qDot_
         << token::SPACE << state.qDdot_;
 
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
index 7cfc931778..9156db842c 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
@@ -76,11 +76,11 @@ void Foam::RBD::rigidBodySolver::correctQuaternionJoints()
                     // Transform the previous time quaternion
                     quaternion quat
                     (
-                        normalize(model_.joints()[i](q0(), w0())*dQuat)
+                        normalize(model_.joints()[i](q0())*dQuat)
                     );
 
                     // Update the joint state
-                    model_.joints()[i](quat, q(), w());
+                    model_.joints()[i](quat, q());
                 }
             }
         }
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
index 0183a4be71..cdcdc0af59 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
@@ -75,7 +75,6 @@ protected:
         inline scalarField& q();
 
         //- Return the current joint quaternion
-        inline scalarField& w();
 
         //- Return the current joint velocity
         inline scalarField& qDot();
@@ -88,7 +87,6 @@ protected:
         inline const scalarField& q0() const;
 
         //- Return the current joint quaternion
-        inline const scalarField& w0() const;
 
         //- Return the current joint velocity
         inline const scalarField& qDot0() const;
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
index d1ddbd6880..1d781854b1 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
@@ -56,12 +56,6 @@ inline Foam::scalarField& Foam::RBD::rigidBodySolver::q()
 }
 
 
-inline Foam::scalarField& Foam::RBD::rigidBodySolver::w()
-{
-    return state().w();
-}
-
-
 inline Foam::scalarField& Foam::RBD::rigidBodySolver::qDot()
 {
     return state().qDot();
@@ -80,12 +74,6 @@ inline const Foam::scalarField& Foam::RBD::rigidBodySolver::q0() const
 }
 
 
-inline const Foam::scalarField& Foam::RBD::rigidBodySolver::w0() const
-{
-    return state0().w();
-}
-
-
 inline const Foam::scalarField& Foam::RBD::rigidBodySolver::qDot0() const
 {
     return state0().qDot();

From a0170df6c12c8f458b7b11cc611bbee425eca373 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 22:17:52 +0100
Subject: [PATCH 410/447] rigidBodyDynamics: Removed quaternion counter and
 index: 'nw', 'wIndex'

Replaced with 'unitQuaterion()' virtual function to indicate if the
joint uses a unit quaternion to represent rotation.
---
 .../sphericalJoint/sphericalJoint.C           |  4 +--
 src/rigidBodyDynamics/joints/Rs/Rs.C          |  6 ++---
 src/rigidBodyDynamics/joints/Rs/Rs.H          |  5 ++--
 .../joints/composite/compositeJoint.C         |  6 -----
 .../joints/composite/compositeJoint.H         |  3 ---
 src/rigidBodyDynamics/joints/joint/joint.H    | 25 +++++--------------
 src/rigidBodyDynamics/joints/joint/jointI.H   | 20 ++++++---------
 .../rigidBodyModel/rigidBodyModel.C           |  5 ++--
 .../rigidBodyModel/rigidBodyModel.H           | 14 +++--------
 .../rigidBodyModel/rigidBodyModelI.H          |  4 +--
 .../rigidBodySolver/rigidBodySolver.C         |  8 +++---
 11 files changed, 32 insertions(+), 68 deletions(-)

diff --git a/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
index d69fdb54ca..91a59104ed 100644
--- a/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
+++ b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
     Field<spatialVector> fx(sphericalJoint.nBodies(), Zero);
 
     // Set the angle of the pendulum to 0.3rad
-    sphericalJoint.joints()[1]
+    sphericalJoint.joints()[1].unitQuaternion
     (
         quaternion(quaternion::ZYX, vector(0.3, 0, 0)),
         sphericalJoint.state().q()
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
         // using 'gnuplot sphericalJoint.gnuplot'
         omegaFile
             << t << " "
-            << sphericalJoint.joints()[1]
+            << sphericalJoint.joints()[1].unitQuaternion
                (
                    sphericalJoint.state().q()
                ).eulerAngles(quaternion::ZYX).x()
diff --git a/src/rigidBodyDynamics/joints/Rs/Rs.C b/src/rigidBodyDynamics/joints/Rs/Rs.C
index e7b284ebed..da4bd36183 100644
--- a/src/rigidBodyDynamics/joints/Rs/Rs.C
+++ b/src/rigidBodyDynamics/joints/Rs/Rs.C
@@ -84,9 +84,9 @@ Foam::RBD::joints::Rs::~Rs()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::label Foam::RBD::joints::Rs::nw() const
+bool Foam::RBD::joints::Rs::unitQuaternion() const
 {
-    return 1;
+    return true;
 }
 
 
@@ -97,7 +97,7 @@ void Foam::RBD::joints::Rs::jcalc
     const scalarField& qDot
 ) const
 {
-    J.X.E() = operator()(q).R().T();
+    J.X.E() = joint::unitQuaternion(q).R().T();
     J.X.r() = Zero;
 
     J.S = Zero;
diff --git a/src/rigidBodyDynamics/joints/Rs/Rs.H b/src/rigidBodyDynamics/joints/Rs/Rs.H
index 9672168e8f..f689869056 100644
--- a/src/rigidBodyDynamics/joints/Rs/Rs.H
+++ b/src/rigidBodyDynamics/joints/Rs/Rs.H
@@ -88,9 +88,8 @@ public:
 
     // Member Functions
 
-        //- Return the number of additional state variable for this joint
-        //  For the quaternion this is 1 in addition to the 3 stored in q
-        virtual label nw() const;
+        //- Return true as this joint describes rotation using a quaternion
+        virtual bool unitQuaternion() const;
 
         //- Update the model state for this joint
         virtual void jcalc
diff --git a/src/rigidBodyDynamics/joints/composite/compositeJoint.C b/src/rigidBodyDynamics/joints/composite/compositeJoint.C
index 819d575962..a7d1fd8875 100644
--- a/src/rigidBodyDynamics/joints/composite/compositeJoint.C
+++ b/src/rigidBodyDynamics/joints/composite/compositeJoint.C
@@ -86,12 +86,6 @@ Foam::RBD::joints::composite::~composite()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::label Foam::RBD::joints::composite::nw() const
-{
-    return last().nw();
-}
-
-
 void Foam::RBD::joints::composite::jcalc
 (
     joint::XSvc& J,
diff --git a/src/rigidBodyDynamics/joints/composite/compositeJoint.H b/src/rigidBodyDynamics/joints/composite/compositeJoint.H
index 80f3496fa7..5d12bf5025 100644
--- a/src/rigidBodyDynamics/joints/composite/compositeJoint.H
+++ b/src/rigidBodyDynamics/joints/composite/compositeJoint.H
@@ -101,9 +101,6 @@ public:
 
     // Member Functions
 
-        //- Return the number of additional state variables need by this joint
-        virtual label nw() const;
-
         //- Update the model state for this joint
         virtual void jcalc
         (
diff --git a/src/rigidBodyDynamics/joints/joint/joint.H b/src/rigidBodyDynamics/joints/joint/joint.H
index eb06419e93..0ea00b678b 100644
--- a/src/rigidBodyDynamics/joints/joint/joint.H
+++ b/src/rigidBodyDynamics/joints/joint/joint.H
@@ -93,9 +93,6 @@ protected:
     //- Index of this joints data in the rigidBodyModel state
     label qIndex_;
 
-    //- Index of this joints quaternion data in the rigidBodyModel state
-    label wIndex_;
-
 
 private:
 
@@ -113,12 +110,6 @@ private:
             return qIndex_;
         }
 
-        //- Allow the rigidBodyModel to set the wIndex for this joint
-        label& wIndex()
-        {
-            return wIndex_;
-        }
-
 
 public:
 
@@ -213,8 +204,8 @@ public:
         //- Return the number of degrees of freedom in this joint
         inline label nDoF() const;
 
-        //- Return the number of additional state variables need by this joint
-        inline virtual label nw() const;
+        //- Return true if this joint describes rotation using a quaternion
+        inline virtual bool unitQuaternion() const;
 
         //- Return the index of this joint in the model
         inline label index() const;
@@ -223,10 +214,6 @@ public:
         //  in the rigidBodyModel state fields
         inline label qIndex() const;
 
-        //- Return start index for the additional state variables for this joint
-        //  in the rigidBodyModel w state field
-        inline label wIndex() const;
-
         //- Return the joint motion sub-space
         inline const List<spatialVector>& S() const;
 
@@ -245,16 +232,16 @@ public:
 
     // Member Operators
 
-        //- Return the state quaternion for this joint
+        //- Return the unit quaternion for this joint
         //  if it uses a quaternion representation for rotation
-        inline quaternion operator()
+        inline quaternion unitQuaternion
         (
             const scalarField& q
         ) const;
 
-        //- Set the state quaternion for this joint
+        //- Set the unit quaternion for this joint
         //  if it uses a quaternion representation for rotation
-        inline void operator()
+        inline void unitQuaternion
         (
             const quaternion& quat,
             scalarField& q
diff --git a/src/rigidBodyDynamics/joints/joint/jointI.H b/src/rigidBodyDynamics/joints/joint/jointI.H
index 090adb18d2..eb6e36a2ca 100644
--- a/src/rigidBodyDynamics/joints/joint/jointI.H
+++ b/src/rigidBodyDynamics/joints/joint/jointI.H
@@ -29,8 +29,7 @@ inline Foam::RBD::joint::joint(const label nDoF)
 :
     S_(nDoF),
     index_(0),
-    qIndex_(0),
-    wIndex_(0)
+    qIndex_(0)
 {}
 
 
@@ -41,9 +40,9 @@ inline Foam::label Foam::RBD::joint::nDoF() const
     return S_.size();
 }
 
-inline Foam::label Foam::RBD::joint::nw() const
+inline bool Foam::RBD::joint::unitQuaternion() const
 {
-    return 0;
+    return false;
 }
 
 inline Foam::label Foam::RBD::joint::index() const
@@ -56,11 +55,6 @@ inline Foam::label Foam::RBD::joint::qIndex() const
     return qIndex_;
 }
 
-inline Foam::label Foam::RBD::joint::wIndex() const
-{
-    return wIndex_;
-}
-
 inline const Foam::List<Foam::spatialVector>& Foam::RBD::joint::S() const
 {
     return S_;
@@ -69,12 +63,12 @@ inline const Foam::List<Foam::spatialVector>& Foam::RBD::joint::S() const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline Foam::quaternion Foam::RBD::joint::operator()
+inline Foam::quaternion Foam::RBD::joint::unitQuaternion
 (
     const scalarField& q
 ) const
 {
-    if (nw() != 1)
+    if (!unitQuaternion())
     {
         FatalErrorInFunction
             << "Attempt to get the quaternion for a non-spherical joint"
@@ -85,13 +79,13 @@ inline Foam::quaternion Foam::RBD::joint::operator()
 }
 
 
-inline void Foam::RBD::joint::operator()
+inline void Foam::RBD::joint::unitQuaternion
 (
     const quaternion& quat,
     scalarField& q
 ) const
 {
-    if (nw() != 1)
+    if (!unitQuaternion())
     {
         FatalErrorInFunction
             << "Attempt to set quaternion for a non-spherical joint"
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index 9b2a32de71..aebfb762ed 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -52,7 +52,7 @@ void Foam::RBD::rigidBodyModel::initializeRootBody()
     XT_.append(spatialTransform());
 
     nDoF_ = 0;
-    nw_ = 0;
+    unitQuaternions_ = false;
 
     resizeState();
 }
@@ -204,11 +204,10 @@ Foam::label Foam::RBD::rigidBodyModel::join_
     joint& curJoint = joints_[joints_.size() - 1];
     curJoint.index() = joints_.size() - 1;
     curJoint.qIndex() = prevJoint.qIndex() + prevJoint.nDoF();
-    curJoint.wIndex() = prevJoint.wIndex() + prevJoint.nw();
 
     // Increment the degrees of freedom
     nDoF_ += curJoint.nDoF();
-    nw_ += curJoint.nw();
+    unitQuaternions_ = unitQuaternions_ || curJoint.unitQuaternion();
 
     resizeState();
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
index 6357458f36..8d6c604ca0 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
@@ -123,11 +123,8 @@ protected:
         //  used to set the size of the of joint state fields q, qDot and qDdot.
         label nDoF_;
 
-        //- The number of additional state variable needed to describe the joint
-        //  states.  Typically this is the number of quaternion joints for which
-        //  the 'w' element is additional to the 3-degrees of freedom of the
-        //  joint.
-        label nw_;
+        //- True if any of the joints using quaternions
+        bool unitQuaternions_;
 
         //- Motion restraints
         PtrList<restraint> restraints_;
@@ -242,11 +239,8 @@ public:
         //  used to set the size of the of joint state fields q, qDot and qDdot.
         inline label nDoF() const;
 
-        //- Return the number of additional state variable needed to describe
-        //  the joint states.  Typically this is the number of quaternion
-        //  joints for which the 'w' element is additional to the 3-degrees of
-        //  freedom of the joint.
-        inline label nw() const;
+        //- Return true if any of the joints using quaternions
+        inline bool unitQuaternions() const;
 
         //- Return the acceleration due to gravity
         inline const vector& g() const;
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
index 9cfab5e8cd..b2fc636ff5 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModelI.H
@@ -58,9 +58,9 @@ inline Foam::label Foam::RBD::rigidBodyModel::nDoF() const
 }
 
 
-inline Foam::label Foam::RBD::rigidBodyModel::nw() const
+inline bool Foam::RBD::rigidBodyModel::unitQuaternions() const
 {
-    return nw_;
+    return unitQuaternions_;
 }
 
 
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
index 9156db842c..d161e6f681 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
@@ -56,13 +56,13 @@ Foam::RBD::rigidBodySolver::~rigidBodySolver()
 
 void Foam::RBD::rigidBodySolver::correctQuaternionJoints()
 {
-    if (model_.nw())
+    if (model_.unitQuaternions())
     {
         forAll (model_.joints(), i)
         {
             const label qi = model_.joints()[i].qIndex();
 
-            if (model_.joints()[i].nw() == 1)
+            if (model_.joints()[i].unitQuaternion())
             {
                 // Calculate the change in the normalized quaternion axis
                 vector dv((q().block<vector>(qi) - q0().block<vector>(qi)));
@@ -76,11 +76,11 @@ void Foam::RBD::rigidBodySolver::correctQuaternionJoints()
                     // Transform the previous time quaternion
                     quaternion quat
                     (
-                        normalize(model_.joints()[i](q0())*dQuat)
+                        normalize(model_.joints()[i].unitQuaternion(q0())*dQuat)
                     );
 
                     // Update the joint state
-                    model_.joints()[i](quat, q());
+                    model_.joints()[i].unitQuaternion(quat, q());
                 }
             }
         }

From b66675ed586c8694ecdc9d22ae5e594a152c81fb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 12 Apr 2016 22:23:04 +0100
Subject: [PATCH 411/447] rigidBodySolver: Updated comments

---
 .../rigidBodySolvers/rigidBodySolver/rigidBodySolver.C    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
index d161e6f681..8b4306e176 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.C
@@ -64,22 +64,22 @@ void Foam::RBD::rigidBodySolver::correctQuaternionJoints()
 
             if (model_.joints()[i].unitQuaternion())
             {
-                // Calculate the change in the normalized quaternion axis
+                // Calculate the change in the unit quaternion
                 vector dv((q().block<vector>(qi) - q0().block<vector>(qi)));
                 scalar magDv = mag(dv);
 
                 if (magDv > SMALL)
                 {
-                    // Calculate the quaternion corresponding to the change
+                    // Calculate the unit quaternion corresponding to the change
                     quaternion dQuat(dv/magDv, cos(magDv), true);
 
-                    // Transform the previous time quaternion
+                    // Transform the previous time unit quaternion
                     quaternion quat
                     (
                         normalize(model_.joints()[i].unitQuaternion(q0())*dQuat)
                     );
 
-                    // Update the joint state
+                    // Update the joint unit quaternion
                     model_.joints()[i].unitQuaternion(quat, q());
                 }
             }

From 23a8779379581b084564c97f1af54b2613055abf Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 15 Apr 2016 11:27:18 +0100
Subject: [PATCH 412/447] septernion: Changed definition of the forward
 transformation for consistency with spatialTransform

inline Foam::vector Foam::septernion::transformPoint(const vector& v) const
{
    return r().transform(v - t());
}

Now there is a 1:1 correspondence between septernion and
spatialTransform and a septernion constructor from spatialTransform
provided.

Additionally "septernion::transform" has been renamed
"septernion::transformPoint" to clarify that it transforms coordinate
points rather than displacements or other relative vectors.
---
 .../test/quaternion/Test-quaternion.C         | 20 +++++++----
 .../Fields/transformField/transformField.C    | 36 ++++++++-----------
 .../Fields/transformField/transformField.H    | 12 +++----
 .../primitives/septernion/septernion.C        |  4 +--
 .../primitives/septernion/septernion.H        | 15 ++++----
 .../primitives/septernion/septernionI.H       | 32 +++++++++++------
 .../spatialTransform/spatialTransform.H       |  4 +++
 .../spatialTransform/spatialTransformI.H      | 11 +++++-
 .../multiSolidBodyMotionFvMesh.C              |  4 +--
 ...yMotionDisplacementPointPatchVectorField.C | 10 +++---
 .../solidBodyMotionFunctions/SDA/SDA.C        |  4 +--
 .../axisRotationMotion/axisRotationMotion.C   |  4 +--
 .../linearMotion/linearMotion.C               |  4 +--
 .../multiMotion/multiMotion.C                 |  2 +-
 .../oscillatingLinearMotion.C                 |  4 +--
 .../oscillatingRotatingMotion.C               |  4 +--
 .../rotatingMotion/rotatingMotion.C           |  4 +--
 .../solidBodyMotionFunction.C                 |  7 ++--
 .../tabulated6DoFMotion/tabulated6DoFMotion.C |  4 +--
 .../solidBodyMotionFvMesh.C                   |  6 ++--
 20 files changed, 108 insertions(+), 83 deletions(-)

diff --git a/applications/test/quaternion/Test-quaternion.C b/applications/test/quaternion/Test-quaternion.C
index 31a6d3ff46..4d657fb818 100644
--- a/applications/test/quaternion/Test-quaternion.C
+++ b/applications/test/quaternion/Test-quaternion.C
@@ -39,10 +39,10 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    quaternion q(vector(1, 0, 0), 0.7853981);
+    quaternion q(vector(1, 2, 3), 0.7853981);
     Info<< "q " << q << endl;
 
-    vector v(0, 1, 0);
+    vector v(0.1, 0.4, 2.1);
     Info<< "v " << v << endl;
 
     Info<< "inv(q)*q " << inv(q)*q << endl;
@@ -50,8 +50,11 @@ int main(int argc, char *argv[])
     Info<< "q*quaternion(0, v)*conjugate(q) "
         << q*quaternion(0, v)*conjugate(q) << endl;
 
+    Info<< "q.R() " << q.R() << endl;
     Info<< "q.transform(v) " << q.transform(v) << endl;
     Info<< "q.R() & v " << (q.R() & v) << endl;
+    Info<< "quaternion(q.R()).transform(v) "
+        << (quaternion(q.R()).transform(v)) << endl;
 
     Info<< "q.invTransform(v) " << q.invTransform(v) << endl;
 
@@ -60,13 +63,16 @@ int main(int argc, char *argv[])
 
     Info<< "inv(tr)*tr " << inv(tr)*tr << endl;
 
-    Info<< "tr.transform(v) " << tr.transform(v) << endl;
+    Info<< "tr.transform(v) " << tr.transformPoint(v) << endl;
 
-    Info<< "(septernion(vector(0, -1, 0))*q*septernion(vector(0, 1, 0)))"
+    vector origin(1, 2, 4);
+
+    Info<< "(septernion(-origin)*q*septernion(origin))"
         << ".transform(v) "
-        <<  (septernion(vector(0, -1, 0))
-           *q
-           *septernion(vector(0, 1, 0))).transform(v)
+        << (septernion(-origin)*q*septernion(origin)).transformPoint(v)
+        <<  " "
+        << septernion(-origin)
+          .transformPoint(q.transform(septernion(origin).transformPoint(v)))
         << endl;
 
     Info<< "Test conversion from and to Euler-angles" << endl;
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformField.C b/src/OpenFOAM/fields/Fields/transformField/transformField.C
index 4d35792d73..564632e1c1 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformField.C
+++ b/src/OpenFOAM/fields/Fields/transformField/transformField.C
@@ -66,7 +66,7 @@ Foam::tmp<Foam::vectorField> Foam::transform
 }
 
 
-void Foam::transform
+void Foam::transformPoints
 (
     vectorField& rtf,
     const septernion& tr,
@@ -75,50 +75,44 @@ void Foam::transform
 {
     vector T = tr.t();
 
-    // Check if any rotation
-    if (mag(tr.r().R() - I) > SMALL)
+    // Check if any translation
+    if (mag(T) > VSMALL)
     {
-        transform(rtf, tr.r(), tf);
-
-        if (mag(T) > VSMALL)
-        {
-            rtf += T;
-        }
+        TFOR_ALL_F_OP_F_OP_S(vector, rtf, =, vector, tf, -, vector, T);
     }
     else
     {
-        if (mag(T) > VSMALL)
-        {
-            TFOR_ALL_F_OP_S_OP_F(vector, rtf, =, vector, T, +, vector, tf);
-        }
-        else
-        {
-            rtf = tf;
-        }
+        rtf = tf;
+    }
+
+    // Check if any rotation
+    if (mag(tr.r().R() - I) > SMALL)
+    {
+        transform(rtf, tr.r(), rtf);
     }
 }
 
 
-Foam::tmp<Foam::vectorField> Foam::transform
+Foam::tmp<Foam::vectorField> Foam::transformPoints
 (
     const septernion& tr,
     const vectorField& tf
 )
 {
     tmp<vectorField > tranf(new vectorField(tf.size()));
-    transform(tranf.ref(), tr, tf);
+    transformPoints(tranf.ref(), tr, tf);
     return tranf;
 }
 
 
-Foam::tmp<Foam::vectorField> Foam::transform
+Foam::tmp<Foam::vectorField> Foam::transformPoints
 (
     const septernion& tr,
     const tmp<vectorField>& ttf
 )
 {
     tmp<vectorField > tranf = New(ttf);
-    transform(tranf.ref(), tr, ttf());
+    transformPoints(tranf.ref(), tr, ttf());
     ttf.clear();
     return tranf;
 }
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformField.H b/src/OpenFOAM/fields/Fields/transformField/transformField.H
index efef059d9e..e466ab2021 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformField.H
+++ b/src/OpenFOAM/fields/Fields/transformField/transformField.H
@@ -117,14 +117,14 @@ tmp<vectorField> transform(const quaternion&, const vectorField&);
 tmp<vectorField> transform(const quaternion&, const tmp<vectorField>&);
 
 
-//- Transform given vectorField with the given septernion
-void transform(vectorField&, const septernion&, const vectorField&);
+//- Transform given vectorField of coordinates with the given septernion
+void transformPoints(vectorField&, const septernion&, const vectorField&);
 
-//- Transform given vectorField with the given septernion
-tmp<vectorField> transform(const septernion&, const vectorField&);
+//- Transform given vectorField of coordinates with the given septernion
+tmp<vectorField> transformPoints(const septernion&, const vectorField&);
 
-//- Transform given tmp<vectorField> with the given septernion
-tmp<vectorField> transform(const septernion&, const tmp<vectorField>&);
+//- Transform given tmp<vectorField> of coordinates with the given septernion
+tmp<vectorField> transformPoints(const septernion&, const tmp<vectorField>&);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/septernion/septernion.C b/src/OpenFOAM/primitives/septernion/septernion.C
index 67cae051fd..0dd3718a45 100644
--- a/src/OpenFOAM/primitives/septernion/septernion.C
+++ b/src/OpenFOAM/primitives/septernion/septernion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ Foam::septernion Foam::slerp
     const scalar t
 )
 {
-    return septernion((1.0-t)*qa.t()+t*qb.t(), slerp(qa.r(), qb.r(), t));
+    return septernion((1 - t)*qa.t() + t*qb.t(), slerp(qa.r(), qb.r(), t));
 }
 
 
diff --git a/src/OpenFOAM/primitives/septernion/septernion.H b/src/OpenFOAM/primitives/septernion/septernion.H
index b6a672f3ec..c6bccca2eb 100644
--- a/src/OpenFOAM/primitives/septernion/septernion.H
+++ b/src/OpenFOAM/primitives/septernion/septernion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,6 +43,7 @@ SourceFiles
 
 #include "vector.H"
 #include "quaternion.H"
+#include "spatialTransform.H"
 #include "word.H"
 #include "contiguous.H"
 
@@ -97,6 +98,9 @@ public:
         //- Construct a pure rotation septernion given a rotation quaternion
         inline explicit septernion(const quaternion& r);
 
+        //- Construct a general septernion from the given spatialTransform
+        inline explicit septernion(const spatialTransform& st);
+
         //- Construct from Istream
         septernion(Istream&);
 
@@ -117,11 +121,11 @@ public:
 
            // Transform
 
-               //- Transform the given vector
-               inline vector transform(const vector& v) const;
+               //- Transform the given coordinate point
+               inline vector transformPoint(const vector& v) const;
 
-               //- Inverse Transform the given vector
-               inline vector invTransform(const vector& v) const;
+               //- Inverse Transform the given coordinate point
+               inline vector invTransformPoint(const vector& v) const;
 
 
     // Member operators
@@ -153,7 +157,6 @@ public:
 //- Return the inverse of the given septernion
 inline septernion inv(const septernion& tr);
 
-
 //- Return a string representation of a septernion
 word name(const septernion&);
 
diff --git a/src/OpenFOAM/primitives/septernion/septernionI.H b/src/OpenFOAM/primitives/septernion/septernionI.H
index d4a6a61789..8acf2b51e9 100644
--- a/src/OpenFOAM/primitives/septernion/septernionI.H
+++ b/src/OpenFOAM/primitives/septernion/septernionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,10 +42,16 @@ inline Foam::septernion::septernion(const vector& t)
 
 inline Foam::septernion::septernion(const quaternion& r)
 :
-    t_(vector::zero),
+    t_(Zero),
     r_(r)
 {}
 
+inline Foam::septernion::septernion(const spatialTransform& st)
+:
+    t_(st.r()),
+    r_(st.E())
+{}
+
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -73,15 +79,15 @@ inline Foam::quaternion& Foam::septernion::r()
 }
 
 
-inline Foam::vector Foam::septernion::transform(const vector& v) const
+inline Foam::vector Foam::septernion::transformPoint(const vector& v) const
 {
-    return t() + r().transform(v);
+    return r().transform(v - t());
 }
 
 
-inline Foam::vector Foam::septernion::invTransform(const vector& v) const
+inline Foam::vector Foam::septernion::invTransformPoint(const vector& v) const
 {
-    return r().invTransform(v - t());
+    return t() + r().invTransform(v);
 }
 
 
@@ -95,7 +101,7 @@ inline void Foam::septernion::operator=(const septernion& tr)
 
 inline void Foam::septernion::operator*=(const septernion& tr)
 {
-    t_ += r().transform(tr.t());
+    t_ = tr.t() + tr.r().invTransform(t_);
     r_ *= tr.r();
 }
 
@@ -103,6 +109,7 @@ inline void Foam::septernion::operator*=(const septernion& tr)
 inline void Foam::septernion::operator=(const vector& t)
 {
     t_ = t;
+    r_ = quaternion::I;
 }
 
 inline void Foam::septernion::operator+=(const vector& t)
@@ -118,16 +125,19 @@ inline void Foam::septernion::operator-=(const vector& t)
 
 inline void Foam::septernion::operator=(const quaternion& r)
 {
+    t_ = Zero;
     r_ = r;
 }
 
 inline void Foam::septernion::operator*=(const quaternion& r)
 {
+    t_ = r.invTransform(t_);
     r_ *= r;
 }
 
 inline void Foam::septernion::operator/=(const quaternion& r)
 {
+    t_ = r.transform(t_);
     r_ /= r;
 }
 
@@ -149,7 +159,7 @@ inline void Foam::septernion::operator/=(const scalar s)
 
 inline Foam::septernion Foam::inv(const septernion& tr)
 {
-    return septernion(-tr.r().invTransform(tr.t()), conjugate(tr.r()));
+    return septernion(-tr.r().transform(tr.t()), conjugate(tr.r()));
 }
 
 
@@ -213,7 +223,7 @@ inline Foam::septernion Foam::operator*
     const quaternion& r
 )
 {
-    return septernion(tr.t(), tr.r()*r);
+    return septernion(r.invTransform(tr.t()), tr.r()*r);
 }
 
 
@@ -223,7 +233,7 @@ inline Foam::septernion Foam::operator/
     const quaternion& r
 )
 {
-    return septernion(tr.t(), tr.r()/r);
+    return septernion(r.transform(tr.t()), tr.r()/r);
 }
 
 
@@ -235,7 +245,7 @@ inline Foam::septernion Foam::operator*
 {
     return septernion
     (
-        tr1.t() + tr1.r().transform(tr2.t()),
+        tr2.r().invTransform(tr1.t()) + tr2.t(),
         tr1.r().transform(tr2.r())
     );
 }
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
index 42eec8fcb8..475b03f9bb 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
@@ -178,6 +178,10 @@ public:
         //  X.v = (E . vw, E . (vl - r^vw))
         inline spatialVector operator&(const spatialVector& v) const;
 
+        //- Transform position p
+        //  X:p = E . (pl - r)
+        inline vector transformPoint(const vector& p) const;
+
         //- Transform position p
         //  X:p = (E . pw, E . (vl - r))
         inline spatialVector operator&&(const spatialVector& v) const;
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
index 83f40bb4a8..ab1dcaaec9 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
@@ -128,7 +128,7 @@ inline Foam::spatialTransform::operator spatialTensor() const
 inline void Foam::spatialTransform::operator&=(const spatialTransform& X)
 {
     E_ &= X.E_;
-    r_ = X.r_ + (r_ & X.E_.T());
+    r_ = X.r_ + (r_ & X.E_);
 }
 
 
@@ -167,6 +167,15 @@ inline Foam::spatialVector Foam::spatialTransform::operator&&
 }
 
 
+inline Foam::vector Foam::spatialTransform::transformPoint
+(
+    const vector& p
+) const
+{
+    return E_ & (p - r_);
+}
+
+
 inline Foam::spatialTransform::transpose::operator spatialTensor() const
 {
     return spatialTensor
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C
index 4051f7a7ea..3e6d98ea8e 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,7 +185,7 @@ bool Foam::multiSolidBodyMotionFvMesh::update()
         const labelList& zonePoints = pointIDs_[i];
 
         UIndirectList<point>(transformedPts, zonePoints) =
-            transform
+            transformPoints
             (
                 SBMFs_[i].transformation(),
                 pointField(transformedPts, zonePoints)
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
index f925d3a20b..7f3b08d1e9 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ solidBodyMotionDisplacementPointPatchVectorField
         // Determine current local points and offset
         fixedValuePointPatchVectorField::operator==
         (
-            transform(SBMFPtr_().transformation(), localPoints0())
+            transformPoints(SBMFPtr_().transformation(), localPoints0())
            -localPoints0()
         );
     }
@@ -86,7 +86,7 @@ solidBodyMotionDisplacementPointPatchVectorField
 
     fixedValuePointPatchVectorField::operator==
     (
-        transform(SBMFPtr_().transformation(), localPoints0())
+        transformPoints(SBMFPtr_().transformation(), localPoints0())
        -localPoints0()
     );
 }
@@ -117,7 +117,7 @@ solidBodyMotionDisplacementPointPatchVectorField
 
     fixedValuePointPatchVectorField::operator==
     (
-        transform(SBMFPtr_().transformation(), localPoints0())
+        transformPoints(SBMFPtr_().transformation(), localPoints0())
        -localPoints0()
     );
 }
@@ -160,7 +160,7 @@ void solidBodyMotionDisplacementPointPatchVectorField::updateCoeffs()
     // Determine current local points and offset
     fixedValuePointPatchVectorField::operator==
     (
-        transform(SBMFPtr_().transformation(), localPoints0())
+        transformPoints(SBMFPtr_().transformation(), localPoints0())
        -localPoints0()
     );
 
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C
index cb8ac12385..4c9dbed484 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C
@@ -91,9 +91,9 @@ Foam::septernion Foam::solidBodyMotionFunctions::SDA::transformation() const
         heaveA_*(sin(wr*time + phh) - sin(phh))
     );
     quaternion R(quaternion::XYZ, vector(rollA*sin(wr*time + phr), 0, 0));
-    septernion TR(septernion(CofG_ + T)*R*septernion(-CofG_));
+    septernion TR(septernion(-CofG_ - T)*R*septernion(CofG_));
 
-    InfoInFunction << "Time = " << time << " transformation: " << TR << endl;
+    DebugInFunction << "Time = " << time << " transformation: " << TR << endl;
 
     return TR;
 }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
index ede53f4cb7..fb5d430704 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
@@ -83,9 +83,9 @@ Foam::solidBodyMotionFunctions::axisRotationMotion::transformation() const
 
     scalar magOmega = mag(omega);
     quaternion R(omega/magOmega, magOmega);
-    septernion TR(septernion(origin_)*R*septernion(-origin_));
+    septernion TR(septernion(-origin_)*R*septernion(origin_));
 
-    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
+    DebugInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C
index a3be9a8f83..a382d19063 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C
@@ -74,9 +74,9 @@ Foam::solidBodyMotionFunctions::linearMotion::transformation() const
     const vector displacement = velocity_*t;
 
     quaternion R(1);
-    septernion TR(septernion(displacement)*R);
+    septernion TR(septernion(-displacement)*R);
 
-    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
+    DebugInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.C
index a88c1d9e9f..313b20b506 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.C
@@ -77,7 +77,7 @@ Foam::solidBodyMotionFunctions::multiMotion::transformation() const
         TR *= SBMFs_[i].transformation();
     }
 
-    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
+    DebugInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
index 9e03d3b93f..3b46909015 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
@@ -74,9 +74,9 @@ Foam::solidBodyMotionFunctions::oscillatingLinearMotion::transformation() const
     const vector displacement = amplitude_*sin(omega_*t);
 
     quaternion R(1);
-    septernion TR(septernion(displacement)*R);
+    septernion TR(septernion(-displacement)*R);
 
-    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
+    DebugInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
index fcceb2f0e4..eff5e30fc2 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
@@ -82,9 +82,9 @@ transformation() const
     eulerAngles *= pi/180.0;
 
     quaternion R(quaternion::XYZ, eulerAngles);
-    septernion TR(septernion(origin_)*R*septernion(-origin_));
+    septernion TR(septernion(-origin_)*R*septernion(origin_));
 
-    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
+    DebugInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
index d4a6470249..b246dd9cc1 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
@@ -78,9 +78,9 @@ Foam::solidBodyMotionFunctions::rotatingMotion::transformation() const
     scalar angle = omega_->integrate(0, t);
 
     quaternion R(axis_, angle);
-    septernion TR(septernion(origin_)*R*septernion(-origin_));
+    septernion TR(septernion(-origin_)*R*septernion(origin_));
 
-    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
+    DebugInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C
index 214ac972a1..fd2fb3a9d2 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,9 +29,8 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(solidBodyMotionFunction, 0);
-
-defineRunTimeSelectionTable(solidBodyMotionFunction, dictionary);
+    defineTypeNameAndDebug(solidBodyMotionFunction, 0);
+    defineRunTimeSelectionTable(solidBodyMotionFunction, dictionary);
 }
 
 
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
index 356d2a8266..f185693c85 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
@@ -105,9 +105,9 @@ Foam::solidBodyMotionFunctions::tabulated6DoFMotion::transformation() const
     TRV[1] *= pi/180.0;
 
     quaternion R(quaternion::XYZ, TRV[1]);
-    septernion TR(septernion(CofG_ + TRV[0])*R*septernion(-CofG_));
+    septernion TR(septernion(-CofG_ + -TRV[0])*R*septernion(CofG_));
 
-    InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
+    DebugInFunction << "Time = " << t << " transformation: " << TR << endl;
 
     return TR;
 }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
index b12b241429..4271a89430 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -193,7 +193,7 @@ bool Foam::solidBodyMotionFvMesh::update()
     {
         fvMesh::movePoints
         (
-            transform
+            transformPoints
             (
                 SBMFPtr_().transformation(),
                 undisplacedPoints_
@@ -205,7 +205,7 @@ bool Foam::solidBodyMotionFvMesh::update()
         pointField transformedPts(undisplacedPoints_);
 
         UIndirectList<point>(transformedPts, pointIDs_) =
-            transform
+            transformPoints
             (
                 SBMFPtr_().transformation(),
                 pointField(transformedPts, pointIDs_)

From 683cfb9d97c6407772f63571cc2bd1151bacbe57 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 15 Apr 2016 11:32:42 +0100
Subject: [PATCH 413/447] vector::zero -> Zero

---
 .../dynamicIndexedOctree.C                    | 10 ++++----
 .../algorithms/indexedOctree/indexedOctree.C  | 10 ++++----
 .../pointConstraint/pointConstraintI.H        | 14 +++++------
 .../CalcPatchToPatchWeights.C                 |  4 ++--
 src/OpenFOAM/meshes/boundBox/boundBox.C       | 16 ++++++-------
 src/OpenFOAM/meshes/boundBox/boundBoxI.H      |  6 ++---
 .../meshes/boundBox/boundBoxTemplates.C       |  6 ++---
 src/OpenFOAM/meshes/meshShapes/cell/cell.C    |  8 +++----
 .../meshes/meshShapes/cellModel/cellModel.C   |  8 +++----
 src/OpenFOAM/meshes/meshShapes/face/face.C    | 10 ++++----
 .../meshes/meshShapes/face/faceTemplates.C    |  2 +-
 .../polyMesh/globalMeshData/globalMeshData.C  |  2 +-
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       | 24 +++++++++----------
 src/OpenFOAM/meshes/polyMesh/polyMeshClear.C  |  8 +++----
 .../meshes/polyMesh/polyMeshFromShapeMesh.C   |  8 +++----
 src/OpenFOAM/meshes/polyMesh/polyMeshIO.C     |  8 +++----
 src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C |  4 ++--
 .../constraint/cyclic/cyclicPolyPatch.C       | 14 +++++------
 .../constraint/oldCyclic/oldCyclicPolyPatch.C | 12 +++++-----
 .../constraint/processor/processorPolyPatch.C |  4 ++--
 .../constraint/wedge/wedgePolyPatch.C         | 10 ++++----
 .../PatchTools/PatchToolsNormals.C            |  8 +++----
 .../primitiveMeshCellCentresAndVols.C         |  6 ++---
 .../primitiveMeshCheck/primitiveMeshCheck.C   |  2 +-
 .../primitiveMeshCheck/primitiveMeshTools.C   |  6 ++---
 .../primitiveMeshFaceCentresAndAreas.C        |  8 +++----
 .../primitiveShapes/objectHit/PointHit.H      |  4 ++--
 .../primitiveShapes/objectHit/PointIndexHit.H |  4 ++--
 .../primitiveShapes/objectHit/pointHitSort.H  |  4 ++--
 .../meshes/primitiveShapes/plane/plane.C      |  6 ++---
 .../tetrahedron/tetrahedronI.H                |  4 ++--
 .../primitiveShapes/triangle/triangleI.H      |  4 ++--
 .../vectorTensorTransform.C                   |  6 ++---
 .../vectorTensorTransformI.H                  |  6 ++---
 .../primitives/quaternion/quaternion.C        |  4 ++--
 .../primitives/quaternion/quaternionI.H       |  4 ++--
 .../spatialTransform/spatialTransformI.H      | 16 ++++++-------
 src/OpenFOAM/primitives/triad/triadI.H        |  4 ++--
 38 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
index 043ea1558d..20475acead 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
@@ -1677,7 +1677,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
         if ((startBit & endBit) != 0)
         {
             // Both start and end outside domain and in same block.
-            return pointIndexHit(false, vector::zero, -1);
+            return pointIndexHit(false, Zero, -1);
         }
 
 
@@ -1691,7 +1691,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
             // Track start to inside domain.
             if (!treeBb.intersects(start, end, trackStart))
             {
-                return pointIndexHit(false, vector::zero, -1);
+                return pointIndexHit(false, Zero, -1);
             }
         }
 
@@ -1700,7 +1700,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
             // Track end to inside domain.
             if (!treeBb.intersects(end, trackStart, trackEnd))
             {
-                return pointIndexHit(false, vector::zero, -1);
+                return pointIndexHit(false, Zero, -1);
             }
         }
 
@@ -2129,7 +2129,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findNearest
 {
     scalar nearestDistSqr = startDistSqr;
     label nearestShapeI = -1;
-    point nearestPoint = vector::zero;
+    point nearestPoint = Zero;
 
     if (nodes_.size())
     {
@@ -2174,7 +2174,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findNearest
     }
     else
     {
-        nearestPoint = vector::zero;
+        nearestPoint = Zero;
     }
 
     return pointIndexHit(nearestShapeI != -1, nearestPoint, nearestShapeI);
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index 4d79eef695..2480f2dc75 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
@@ -1710,7 +1710,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
         if ((startBit & endBit) != 0)
         {
             // Both start and end outside domain and in same block.
-            return pointIndexHit(false, vector::zero, -1);
+            return pointIndexHit(false, Zero, -1);
         }
 
 
@@ -1724,7 +1724,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
             // Track start to inside domain.
             if (!treeBb.intersects(start, end, trackStart))
             {
-                return pointIndexHit(false, vector::zero, -1);
+                return pointIndexHit(false, Zero, -1);
             }
         }
 
@@ -1733,7 +1733,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
             // Track end to inside domain.
             if (!treeBb.intersects(end, trackStart, trackEnd))
             {
-                return pointIndexHit(false, vector::zero, -1);
+                return pointIndexHit(false, Zero, -1);
             }
         }
 
@@ -2350,7 +2350,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
 {
     scalar nearestDistSqr = startDistSqr;
     label nearestShapeI = -1;
-    point nearestPoint = vector::zero;
+    point nearestPoint = Zero;
 
     if (nodes_.size())
     {
@@ -2401,7 +2401,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
 ) const
 {
     label nearestShapeI = -1;
-    point nearestPoint = vector::zero;
+    point nearestPoint = Zero;
 
     if (nodes_.size())
     {
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraintI.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraintI.H
index 82c1957c3b..27aa1debf4 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraintI.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraintI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ License
 
 inline Foam::pointConstraint::pointConstraint()
 :
-    Tuple2<label, vector>(0, vector::zero)
+    Tuple2<label, vector>(0, Zero)
 {}
 
 
@@ -68,7 +68,7 @@ void Foam::pointConstraint::applyConstraint(const vector& cd)
         if (mag(cd & second()) > 1e-3)
         {
             first() = 3;
-            second() = vector::zero;
+            second() = Zero;
         }
     }
 }
@@ -103,13 +103,13 @@ void Foam::pointConstraint::combine(const pointConstraint& pc)
             {
                 // Different directions
                 first() = 3;
-                second() = vector::zero;
+                second() = Zero;
             }
         }
         else
         {
             first() = 3;
-            second() = vector::zero;
+            second() = Zero;
         }
     }
 }
@@ -131,7 +131,7 @@ Foam::tensor Foam::pointConstraint::constraintTransformation() const
     }
     else
     {
-        return tensor::zero;
+        return Zero;
     }
 }
 
@@ -172,7 +172,7 @@ const
     // Knock out remaining vectors
     for (direction dir = n; dir < vecs.size(); dir++)
     {
-        vecs[dir] = vector::zero;
+        vecs[dir] = Zero;
     }
 
     tt = tensor(vecs[0], vecs[1], vecs[2]);
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
index 6f9f1e8595..87c18a3127 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
         const typename FromPatch::FaceType& hitFace =
             fromPatchFaces[proj[pointI].hitObject()];
 
-        point hitPoint = point::zero;
+        point hitPoint = Zero;
 
         if (proj[pointI].hit())
         {
diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.C b/src/OpenFOAM/meshes/boundBox/boundBox.C
index e75389a6f0..6c3ec8036f 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.C
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.C
@@ -51,8 +51,8 @@ void Foam::boundBox::calculate(const UList<point>& points, const bool doReduce)
 {
     if (points.empty())
     {
-        min_ = point::zero;
-        max_ = point::zero;
+        min_ = Zero;
+        max_ = Zero;
 
         if (doReduce && Pstream::parRun())
         {
@@ -87,8 +87,8 @@ void Foam::boundBox::calculate(const UList<point>& points, const bool doReduce)
 
 Foam::boundBox::boundBox(const UList<point>& points, const bool doReduce)
 :
-    min_(point::zero),
-    max_(point::zero)
+    min_(Zero),
+    max_(Zero)
 {
     calculate(points, doReduce);
 }
@@ -96,8 +96,8 @@ Foam::boundBox::boundBox(const UList<point>& points, const bool doReduce)
 
 Foam::boundBox::boundBox(const tmp<pointField>& points, const bool doReduce)
 :
-    min_(point::zero),
-    max_(point::zero)
+    min_(Zero),
+    max_(Zero)
 {
     calculate(points(), doReduce);
     points.clear();
@@ -111,8 +111,8 @@ Foam::boundBox::boundBox
     const bool doReduce
 )
 :
-    min_(point::zero),
-    max_(point::zero)
+    min_(Zero),
+    max_(Zero)
 {
     if (points.empty() || indices.empty())
     {
diff --git a/src/OpenFOAM/meshes/boundBox/boundBoxI.H b/src/OpenFOAM/meshes/boundBox/boundBoxI.H
index 4c3fc06203..13af23e99c 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBoxI.H
+++ b/src/OpenFOAM/meshes/boundBox/boundBoxI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,8 +31,8 @@ License
 
 inline Foam::boundBox::boundBox()
 :
-    min_(point::zero),
-    max_(point::zero)
+    min_(Zero),
+    max_(Zero)
 {}
 
 
diff --git a/src/OpenFOAM/meshes/boundBox/boundBoxTemplates.C b/src/OpenFOAM/meshes/boundBox/boundBoxTemplates.C
index 68d62e7569..81aa3f267b 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBoxTemplates.C
+++ b/src/OpenFOAM/meshes/boundBox/boundBoxTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,8 +38,8 @@ Foam::boundBox::boundBox
     const bool doReduce
 )
 :
-    min_(point::zero),
-    max_(point::zero)
+    min_(Zero),
+    max_(Zero)
 {
     // a FixedList is never empty
     if (points.empty())
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.C b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
index 969b33784b..aa2e026141 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -192,7 +192,7 @@ Foam::point Foam::cell::centre
 
     // first calculate the aproximate cell centre as the average of all
     // face centres
-    vector cEst = vector::zero;
+    vector cEst = Zero;
     scalar sumArea = 0;
 
     const labelList& faces = *this;
@@ -208,7 +208,7 @@ Foam::point Foam::cell::centre
 
     // Calculate the centre by breaking the cell into pyramids and
     // volume-weighted averaging their centres
-    vector sumVc = vector::zero;
+    vector sumVc = Zero;
 
     scalar sumV = 0;
 
@@ -251,7 +251,7 @@ Foam::scalar Foam::cell::mag
 
     // first calculate the aproximate cell centre as the average of all
     // face centres
-    vector cEst = vector::zero;
+    vector cEst = Zero;
     scalar nCellFaces = 0;
 
     const labelList& faces = *this;
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C
index a8c014b335..a25c393310 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Foam::vector Foam::cellModel::centre
 ) const
 {
     // Estimate centre of cell
-    vector cEst = vector::zero;
+    vector cEst = Zero;
 
     // Sum the points idicated by the label list
     forAll(pointLabels, i)
@@ -50,7 +50,7 @@ Foam::vector Foam::cellModel::centre
     // Calculate the centre by breaking the cell into pyramids and
     // volume-weighted averaging their centres
     scalar sumV = 0.0;
-    vector sumVc = vector::zero;
+    vector sumVc = Zero;
 
     const faceList cellFaces = faces(pointLabels);
 
@@ -92,7 +92,7 @@ Foam::scalar Foam::cellModel::mag
 ) const
 {
     // Estimate centre of cell
-    vector cEst = vector::zero;
+    vector cEst = Zero;
 
     // Sum the points idicated by the label list
     forAll(pointLabels, i)
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index d4bf604b5c..6c65137162 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -505,7 +505,7 @@ Foam::point Foam::face::centre(const pointField& points) const
     }
 
 
-    point centrePoint = point::zero;
+    point centrePoint = Zero;
     for (label pI=0; pI<nPoints; ++pI)
     {
         centrePoint += points[operator[](pI)];
@@ -513,7 +513,7 @@ Foam::point Foam::face::centre(const pointField& points) const
     centrePoint /= nPoints;
 
     scalar sumA = 0;
-    vector sumAc = vector::zero;
+    vector sumAc = Zero;
 
     for (label pI=0; pI<nPoints; ++pI)
     {
@@ -572,14 +572,14 @@ Foam::vector Foam::face::normal(const pointField& p) const
 
     label pI;
 
-    point centrePoint = vector::zero;
+    point centrePoint = Zero;
     for (pI = 0; pI < nPoints; ++pI)
     {
         centrePoint += p[operator[](pI)];
     }
     centrePoint /= nPoints;
 
-    vector n = vector::zero;
+    vector n = Zero;
 
     point nextPoint = centrePoint;
 
@@ -742,7 +742,7 @@ Foam::tensor Foam::face::inertia
 
     const point ctr = centre(p);
 
-    tensor J = tensor::zero;
+    tensor J = Zero;
 
     forAll(*this, i)
     {
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C b/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
index 33d1f97b78..6220d253cd 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
@@ -70,7 +70,7 @@ Type Foam::face::average
 
     label nPoints = size();
 
-    point centrePoint = point::zero;
+    point centrePoint = Zero;
     Type cf = Zero;
 
     for (label pI=0; pI<nPoints; pI++)
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 26e369cff8..5a25df9d61 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1917,7 +1917,7 @@ Foam::pointField Foam::globalMeshData::sharedPoints() const
             (
                 Pstream::blocking,
                 slave,
-                sharedPoints.size()*sizeof(vector::zero)
+                sharedPoints.size()*sizeof(Zero)
             );
             toSlave << sharedPoints;
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 6af1eb9be2..4aa8f63a39 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -62,8 +62,8 @@ void Foam::polyMesh::calcDirections() const
     label nEmptyPatches = 0;
     label nWedgePatches = 0;
 
-    vector emptyDirVec = vector::zero;
-    vector wedgeDirVec = vector::zero;
+    vector emptyDirVec = Zero;
+    vector wedgeDirVec = Zero;
 
     forAll(boundaryMesh(), patchi)
     {
@@ -205,8 +205,8 @@ Foam::polyMesh::polyMesh(const IOobject& io)
     ),
     bounds_(points_),
     comm_(UPstream::worldComm),
-    geometricD_(Vector<label>::zero),
-    solutionD_(Vector<label>::zero),
+    geometricD_(Zero),
+    solutionD_(Zero),
     tetBasePtIsPtr_(NULL),
     cellTreePtr_(NULL),
     pointZones_
@@ -399,8 +399,8 @@ Foam::polyMesh::polyMesh
     ),
     bounds_(points_, syncPar),
     comm_(UPstream::worldComm),
-    geometricD_(Vector<label>::zero),
-    solutionD_(Vector<label>::zero),
+    geometricD_(Zero),
+    solutionD_(Zero),
     tetBasePtIsPtr_(NULL),
     cellTreePtr_(NULL),
     pointZones_
@@ -550,8 +550,8 @@ Foam::polyMesh::polyMesh
     ),
     bounds_(points_, syncPar),
     comm_(UPstream::worldComm),
-    geometricD_(Vector<label>::zero),
-    solutionD_(Vector<label>::zero),
+    geometricD_(Zero),
+    solutionD_(Zero),
     tetBasePtIsPtr_(NULL),
     cellTreePtr_(NULL),
     pointZones_
@@ -888,8 +888,8 @@ void Foam::polyMesh::addPatches
     }
 
     // Reset valid directions
-    geometricD_ = Vector<label>::zero;
-    solutionD_ = Vector<label>::zero;
+    geometricD_ = Zero;
+    solutionD_ = Zero;
 
     boundary_.setSize(p.size());
 
@@ -1110,8 +1110,8 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
     cellZones_.movePoints(points_);
 
     // Reset valid directions (could change with rotation)
-    geometricD_ = Vector<label>::zero;
-    solutionD_ = Vector<label>::zero;
+    geometricD_ = Zero;
+    solutionD_ = Zero;
 
     meshObject::movePoints<polyMesh>(*this);
     meshObject::movePoints<pointMesh>(*this);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
index 4cea2cb388..fa1bdc8bdd 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
@@ -66,8 +66,8 @@ void Foam::polyMesh::clearGeom()
     boundary_.clearGeom();
 
     // Reset valid directions (could change with rotation)
-    geometricD_ = Vector<label>::zero;
-    solutionD_ = Vector<label>::zero;
+    geometricD_ = Zero;
+    solutionD_ = Zero;
 
     // Remove the stored tet base points
     tetBasePtIsPtr_.clear();
@@ -134,8 +134,8 @@ void Foam::polyMesh::clearAddressing(const bool isMeshUpdate)
     globalMeshDataPtr_.clear();
 
     // Reset valid directions
-    geometricD_ = Vector<label>::zero;
-    solutionD_ = Vector<label>::zero;
+    geometricD_ = Zero;
+    solutionD_ = Zero;
 
     // Update zones
     pointZones_.clearAddressing();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 143dfa79af..d0461b67a9 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -473,8 +473,8 @@ Foam::polyMesh::polyMesh
     ),
     bounds_(points_, syncPar),
     comm_(UPstream::worldComm),
-    geometricD_(Vector<label>::zero),
-    solutionD_(Vector<label>::zero),
+    geometricD_(Zero),
+    solutionD_(Zero),
     tetBasePtIsPtr_(NULL),
     cellTreePtr_(NULL),
     pointZones_
@@ -757,8 +757,8 @@ Foam::polyMesh::polyMesh
     ),
     bounds_(points_, syncPar),
     comm_(UPstream::worldComm),
-    geometricD_(Vector<label>::zero),
-    solutionD_(Vector<label>::zero),
+    geometricD_(Zero),
+    solutionD_(Zero),
     tetBasePtIsPtr_(NULL),
     cellTreePtr_(NULL),
     pointZones_
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 9ddd2d8394..d67eeeceb8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -268,8 +268,8 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
 
         // Derived info
         bounds_ = boundBox(points_);
-        geometricD_ = Vector<label>::zero;
-        solutionD_ = Vector<label>::zero;
+        geometricD_ = Zero;
+        solutionD_ = Zero;
 
         // Zones
         pointZoneMesh newPointZones
@@ -442,8 +442,8 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         bounds_ = boundBox(points_);
 
         // Rotation can cause direction vector to change
-        geometricD_ = Vector<label>::zero;
-        solutionD_ = Vector<label>::zero;
+        geometricD_ = Zero;
+        solutionD_ = Zero;
 
         return polyMesh::POINTS_MOVED;
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
index 004cee98d8..6e13ab57ee 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
@@ -95,8 +95,8 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
     meshObject::updateMesh<pointMesh>(*this, mpm);
 
     // Reset valid directions (could change by faces put into empty patches)
-    geometricD_ = Vector<label>::zero;
-    solutionD_ = Vector<label>::zero;
+    geometricD_ = Zero;
+    solutionD_ = Zero;
 
     const_cast<Time&>(time()).functionObjects().updateMesh(mpm);
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 55a56ea38f..f9a789efc2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -607,9 +607,9 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
     coupledPolyPatch(name, size, start, index, bm, patchType, transform),
     neighbPatchName_(word::null),
     neighbPatchID_(-1),
-    rotationAxis_(vector::zero),
-    rotationCentre_(point::zero),
-    separationVector_(vector::zero),
+    rotationAxis_(Zero),
+    rotationCentre_(Zero),
+    separationVector_(Zero),
     coupledPointsPtr_(NULL),
     coupledEdgesPtr_(NULL)
 {
@@ -659,9 +659,9 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
     neighbPatchName_(dict.lookupOrDefault("neighbourPatch", word::null)),
     coupleGroup_(dict),
     neighbPatchID_(-1),
-    rotationAxis_(vector::zero),
-    rotationCentre_(point::zero),
-    separationVector_(vector::zero),
+    rotationAxis_(Zero),
+    rotationCentre_(Zero),
+    separationVector_(Zero),
     coupledPointsPtr_(NULL),
     coupledEdgesPtr_(NULL)
 {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
index 96b06851ce..0f75909ee6 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
@@ -571,9 +571,9 @@ Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
 :
     coupledPolyPatch(name, size, start, index, bm, patchType, transform),
     featureCos_(0.9),
-    rotationAxis_(vector::zero),
-    rotationCentre_(point::zero),
-    separationVector_(vector::zero)
+    rotationAxis_(Zero),
+    rotationCentre_(Zero),
+    separationVector_(Zero)
 {}
 
 
@@ -588,9 +588,9 @@ Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
 :
     coupledPolyPatch(name, dict, index, bm, patchType),
     featureCos_(0.9),
-    rotationAxis_(vector::zero),
-    rotationCentre_(point::zero),
-    separationVector_(vector::zero)
+    rotationAxis_(Zero),
+    rotationCentre_(Zero),
+    separationVector_(Zero)
 {
     if (dict.found("neighbourPatch"))
     {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 8ab5848a55..8d039e2aa0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -589,7 +589,7 @@ void Foam::processorPolyPatch::initOrder
             // Get the average of the points of each face. This is needed in
             // case the face centroid calculation is incorrect due to the face
             // having a very high aspect ratio.
-            pointField facePointAverages(pp.size(), point::zero);
+            pointField facePointAverages(pp.size(), Zero);
             forAll(pp, fI)
             {
                 const labelList& facePoints = pp[fI];
@@ -949,7 +949,7 @@ bool Foam::processorPolyPatch::order
             {
                 const pointField& ppPoints = pp.points();
 
-                pointField facePointAverages(pp.size(), point::zero);
+                pointField facePointAverages(pp.size(), Zero);
                 forAll(pp, fI)
                 {
                     const labelList& facePoints = pp[fI];
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
index e8fd99e786..5cb0d9c7d8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,8 +143,8 @@ Foam::wedgePolyPatch::wedgePolyPatch
     centreNormal_(vector::rootMax),
     n_(vector::rootMax),
     cosAngle_(0.0),
-    faceT_(tensor::zero),
-    cellT_(tensor::zero)
+    faceT_(Zero),
+    cellT_(Zero)
 {}
 
 
@@ -162,8 +162,8 @@ Foam::wedgePolyPatch::wedgePolyPatch
     centreNormal_(vector::rootMax),
     n_(vector::rootMax),
     cosAngle_(0.0),
-    faceT_(tensor::zero),
-    cellT_(tensor::zero)
+    faceT_(Zero),
+    cellT_(Zero)
 {}
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
index 34be2afdca..a72c330842 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
@@ -59,7 +59,7 @@ Foam::PatchTools::pointNormals
     // patch points since the master point does not have to be on the
     // patch!
 
-    pointField coupledPointNormals(map.constructSize(), vector::zero);
+    pointField coupledPointNormals(map.constructSize(), Zero);
 
     {
         // Collect local pointFaces (sized on patch points only)
@@ -158,7 +158,7 @@ Foam::PatchTools::pointNormals
     // 1. Start off with local normals (note:without calculating pointNormals
     //    to avoid them being stored)
 
-    tmp<pointField> textrudeN(new pointField(p.nPoints(), vector::zero));
+    tmp<pointField> textrudeN(new pointField(p.nPoints(), Zero));
     pointField& extrudeN = textrudeN.ref();
     {
         const faceList& localFaces = p.localFaces();
@@ -212,7 +212,7 @@ Foam::PatchTools::edgeNormals
 {
     // 1. Start off with local normals
 
-    tmp<pointField> tedgeNormals(new pointField(p.nEdges(), vector::zero));
+    tmp<pointField> tedgeNormals(new pointField(p.nEdges(), Zero));
     pointField& edgeNormals = tedgeNormals.ref();
     {
         const labelListList& edgeFaces = p.edgeFaces();
@@ -239,7 +239,7 @@ Foam::PatchTools::edgeNormals
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     //- Construct with all data in consistent orientation
-    pointField cppEdgeData(map.constructSize(), vector::zero);
+    pointField cppEdgeData(map.constructSize(), Zero);
 
     forAll(patchEdges, i)
     {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
index 458336db20..fec99b0e52 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ void Foam::primitiveMesh::makeCellCentresAndVols
 ) const
 {
     // Clear the fields for accumulation
-    cellCtrs = vector::zero;
+    cellCtrs = Zero;
     cellVols = 0.0;
 
     const labelList& own = faceOwner();
@@ -87,7 +87,7 @@ void Foam::primitiveMesh::makeCellCentresAndVols
     // first estimate the approximate cell centre as the average of
     // face centres
 
-    vectorField cEst(nCells(), vector::zero);
+    vectorField cEst(nCells(), Zero);
     labelField nCellFaces(nCells(), 0);
 
     forAll(own, facei)
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index a25bf4da61..87a473b610 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -58,7 +58,7 @@ bool Foam::primitiveMesh::checkClosedBoundary
     // Loop through all boundary faces and sum up the face area vectors.
     // For a closed boundary, this should be zero in all vector components
 
-    vector sumClosed(vector::zero);
+    vector sumClosed(Zero);
     scalar sumMagClosedBoundary = 0;
 
     for (label faceI = nInternalFaces(); faceI < areas.size(); faceI++)
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
index 6f8b8b83f4..1be204c191 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
@@ -254,8 +254,8 @@ void Foam::primitiveMeshTools::cellClosedness
     // Loop through cell faces and sum up the face area vectors for each cell.
     // This should be zero in all vector components
 
-    vectorField sumClosed(mesh.nCells(), vector::zero);
-    vectorField sumMagClosed(mesh.nCells(), vector::zero);
+    vectorField sumClosed(mesh.nCells(), Zero);
+    vectorField sumMagClosed(mesh.nCells(), Zero);
 
     forAll(own, faceI)
     {
@@ -511,7 +511,7 @@ Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::cellDeterminant
             {
                 avgArea /= nInternalFaces;
 
-                symmTensor areaTensor(symmTensor::zero);
+                symmTensor areaTensor(Zero);
 
                 forAll(curFaces, i)
                 {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
index 236b1e30ee..f6c29aae8c 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,9 @@ void Foam::primitiveMesh::makeFaceCentresAndAreas
         }
         else
         {
-            vector sumN = vector::zero;
+            vector sumN = Zero;
             scalar sumA = 0.0;
-            vector sumAc = vector::zero;
+            vector sumAc = Zero;
 
             point fCentre = p[f[0]];
             for (label pi = 1; pi < nPoints; pi++)
@@ -123,7 +123,7 @@ void Foam::primitiveMesh::makeFaceCentresAndAreas
             if (sumA < ROOTVSMALL)
             {
                 fCtrs[facei] = fCentre;
-                fAreas[facei] = vector::zero;
+                fAreas[facei] = Zero;
             }
             else
             {
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
index e6196b9d37..1c55ad2d05 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ public:
         PointHit()
         :
             hit_(false),
-            hitPoint_(vector::zero),
+            hitPoint_(Zero),
             distance_(GREAT),
             eligibleMiss_(false)
         {}
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H
index fa15dbfd42..13118adb01 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,7 @@ public:
         PointIndexHit()
         :
             hit_(false),
-            hitPoint_(vector::zero),
+            hitPoint_(Zero),
             index_(-1)
         {}
 
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H
index 97eea8bc7c..ab981bd022 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ public:
         //- Construct null
         pointHitSort()
         :
-            inter_(false, vector::zero, GREAT, false),
+            inter_(false, Zero, GREAT, false),
             index_(-1)
         {}
 
diff --git a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
index aa101235d5..482142bb2a 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
+++ b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
@@ -112,7 +112,7 @@ void Foam::plane::calcPntAndVec
 Foam::plane::plane(const vector& normalVector)
 :
     unitVector_(normalVector),
-    basePoint_(vector::zero)
+    basePoint_(Zero)
 {
     scalar magUnitVector(mag(unitVector_));
 
@@ -168,8 +168,8 @@ Foam::plane::plane
 
 Foam::plane::plane(const dictionary& dict)
 :
-    unitVector_(vector::zero),
-    basePoint_(point::zero)
+    unitVector_(Zero),
+    basePoint_(Zero)
 {
     const word planeType(dict.lookup("planeType"));
 
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
index a5e6864c7c..10db7e8d96 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -470,7 +470,7 @@ bool Foam::tetrahedron<Point, PointRef>::inside(const point& pt) const
     // planeBase[2] = tetBasePt = b_
     // planeBase[3] = tetBasePt = b_
 
-    vector n = vector::zero;
+    vector n = Zero;
 
     {
         // 0, a
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
index fbc5a14286..96d3cffb84 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -439,7 +439,7 @@ inline Foam::pointHit Foam::triangle<Point, PointRef>::intersection
     const scalar det = edge1 & pVec;
 
     // Initialise to miss
-    pointHit intersection(false, vector::zero, GREAT, false);
+    pointHit intersection(false, Zero, GREAT, false);
 
     if (alg == intersection::VISIBLE)
     {
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
index 9f06005074..b0b7df27ef 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
@@ -34,15 +34,15 @@ const char* const Foam::vectorTensorTransform::typeName =
 
 const Foam::vectorTensorTransform Foam::vectorTensorTransform::zero
 (
-    vector::zero,
-    tensor::zero,
+    Zero,
+    Zero,
     false
 );
 
 
 const Foam::vectorTensorTransform Foam::vectorTensorTransform::I
 (
-    vector::zero,
+    Zero,
     sphericalTensor::I,
     false
 );
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H
index 74d8c5755e..2290352d7a 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ License
 
 inline Foam::vectorTensorTransform::vectorTensorTransform()
 :
-    t_(vector::zero),
+    t_(Zero),
     R_(sphericalTensor::I),
     hasR_(false)
 {}
@@ -56,7 +56,7 @@ inline Foam::vectorTensorTransform::vectorTensorTransform(const vector& t)
 
 inline Foam::vectorTensorTransform::vectorTensorTransform(const tensor& R)
 :
-    t_(vector::zero),
+    t_(Zero),
     R_(R),
     hasR_(true)
 {}
diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.C b/src/OpenFOAM/primitives/quaternion/quaternion.C
index df54f702cd..e2bb676d8f 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.C
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ Foam::quaternion Foam::exp(const quaternion& q)
 
     if (magV == 0)
     {
-        return quaternion(1, vector::zero);
+        return quaternion(1, Zero);
     }
 
     const scalar expW = exp(q.w());
diff --git a/src/OpenFOAM/primitives/quaternion/quaternionI.H b/src/OpenFOAM/primitives/quaternion/quaternionI.H
index f2e6761576..b64fc8f26b 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternionI.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternionI.H
@@ -67,7 +67,7 @@ inline Foam::quaternion::quaternion
 inline Foam::quaternion::quaternion(const scalar w)
 :
     w_(w),
-    v_(vector::zero)
+    v_(Zero)
 {}
 
 
@@ -515,7 +515,7 @@ inline Foam::vector Foam::quaternion::eulerAngles
         default:
             FatalErrorInFunction
                 << "Unknown rotation sequence " << rs << abort(FatalError);
-            return vector::zero;
+            return Zero;
             break;
     }
 }
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
index ab1dcaaec9..4ab3f7e512 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
@@ -38,7 +38,7 @@ Foam::tensor Foam::spatialTransform::Erx() const
 inline Foam::spatialTransform::spatialTransform()
 :
     E_(tensor::I),
-    r_(vector::zero)
+    r_(Zero)
 {}
 
 
@@ -119,7 +119,7 @@ inline Foam::spatialTransform::operator spatialTensor() const
 {
     return spatialTensor
     (
-        E_,             tensor::zero,
+        E_,             Zero,
        -Erx(),          E_
     );
 }
@@ -181,7 +181,7 @@ inline Foam::spatialTransform::transpose::operator spatialTensor() const
     return spatialTensor
     (
         X_.E().T(),    -X_.Erx().T(),
-        tensor::zero,   X_.E().T()
+        Zero,           X_.E().T()
     );
 }
 
@@ -206,7 +206,7 @@ inline Foam::spatialTransform::dual::operator spatialTensor() const
     return spatialTensor
     (
         X_.E(),        -X_.Erx(),
-        tensor::zero,   X_.E()
+        Zero,           X_.E()
     );
 }
 
@@ -254,25 +254,25 @@ namespace Foam
 //- Rotational spatial transformation tensor about the x-axis by omega radians
 inline spatialTransform Xrx(const scalar& omega)
 {
-    return spatialTransform(Rx(omega), vector::zero);
+    return spatialTransform(Rx(omega), Zero);
 }
 
 //- Rotational spatial transformation tensor about the x-axis by omega radians
 inline spatialTransform Xry(const scalar& omega)
 {
-    return spatialTransform(Ry(omega), vector::zero);
+    return spatialTransform(Ry(omega), Zero);
 }
 
 //- Rotational spatial transformation tensor about the z-axis by omega radians
 inline spatialTransform Xrz(const scalar& omega)
 {
-    return spatialTransform(Rz(omega), vector::zero);
+    return spatialTransform(Rz(omega), Zero);
 }
 
 //- Rotational spatial transformation tensor about axis a by omega radians
 inline spatialTransform Xr(const vector& a, const scalar omega)
 {
-    return spatialTransform(Ra(a, omega), vector::zero);
+    return spatialTransform(Ra(a, omega), Zero);
 }
 
 //- Translational spatial transformation tensor for translation r
diff --git a/src/OpenFOAM/primitives/triad/triadI.H b/src/OpenFOAM/primitives/triad/triadI.H
index 2025dd6dd7..d259258178 100644
--- a/src/OpenFOAM/primitives/triad/triadI.H
+++ b/src/OpenFOAM/primitives/triad/triadI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ inline Foam::triad::triad(Istream& is)
 
 inline bool Foam::triad::set(const direction d) const
 {
-    return operator[](d)[0] < GREAT; // vector::zero;
+    return operator[](d)[0] < GREAT;
 }
 
 

From 6145141def726b08e6c287033c8f8e85500c3689 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 15 Apr 2016 11:33:06 +0100
Subject: [PATCH 414/447] sixDoFRigidBodyMotion: Updated for change in
 definition of septernion::transform

---
 .../sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
index c3a94123d1..3cad6ca354 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
@@ -352,7 +352,7 @@ Foam::tmp<Foam::pointField> Foam::sixDoFRigidBodyMotion::transform
     septernion s
     (
         centreOfRotation() - initialCentreOfRotation(),
-        quaternion(Q() & initialQ().T())
+        quaternion(Q().T() & initialQ())
     );
 
     tmp<pointField> tpoints(new pointField(initialPoints));
@@ -375,7 +375,7 @@ Foam::tmp<Foam::pointField> Foam::sixDoFRigidBodyMotion::transform
 
                 points[pointi] =
                     initialCentreOfRotation()
-                  + ss.transform
+                  + ss.invTransformPoint
                     (
                         initialPoints[pointi]
                       - initialCentreOfRotation()

From 889580541b49795242c371b69deeb55df88b8de1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 16 Apr 2016 09:54:21 +0100
Subject: [PATCH 415/447] doc/Doxygen/_Footer: Updated copyright date Patch
 contributed by Bruno Santos

---
 doc/Doxygen/_Footer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Doxygen/_Footer b/doc/Doxygen/_Footer
index a9a791baee..b66c8a072c 100644
--- a/doc/Doxygen/_Footer
+++ b/doc/Doxygen/_Footer
@@ -2,7 +2,7 @@
   </div> <!-- main -->
   <div class="footer">
     <p>
-      Copyright&nbsp;&copy;&nbsp;2011-2013&nbsp;
+      Copyright&nbsp;&copy;&nbsp;2011-2016&nbsp;
       <a href="http://www.openfoam.org/about">OpenFOAM Foundation</a>
       |
       OPENFOAM&reg; is a registered

From a8b6ebdb52e36fc6b8295724211df4316ecc8b83 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 16 Apr 2016 09:57:25 +0100
Subject: [PATCH 416/447] doc/Doxygen/_Footer: Updated link to
 http://openfoam.org Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2053

---
 doc/Doxygen/_Footer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Doxygen/_Footer b/doc/Doxygen/_Footer
index b66c8a072c..d7b19528ec 100644
--- a/doc/Doxygen/_Footer
+++ b/doc/Doxygen/_Footer
@@ -3,7 +3,7 @@
   <div class="footer">
     <p>
       Copyright&nbsp;&copy;&nbsp;2011-2016&nbsp;
-      <a href="http://www.openfoam.org/about">OpenFOAM Foundation</a>
+      <a href="http://www.openfoam.org">OpenFOAM Foundation</a>
       |
       OPENFOAM&reg; is a registered
       <a href="http://www.openfoam.com/legal/trademark-policy.php">trademarks

From 2986757793fff5af80aaaa3bbaba7acc40b9bd60 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 16 Apr 2016 13:26:41 +0100
Subject: [PATCH 417/447] src/Pstream/mpi/UPstream.C: Updated for Int64 Patch
 contributed by Bruno Santos Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2055

---
 src/Pstream/mpi/UPstream.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 1ba7dfbe33..4e105aa767 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -326,7 +326,7 @@ void Foam::UPstream::allToAll
             (
                 // NOTE: const_cast is a temporary hack for
                 // backward-compatibility with versions of OpenMPI < 1.7.4
-                const_cast<int*>(sendData.begin()),
+                const_cast<label*>(sendData.begin()),
                 sizeof(label),
                 MPI_BYTE,
                 recvData.begin(),

From 75c7b7b2390b7cf1647a924a42e5648327343c11 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 16 Apr 2016 15:59:05 +0100
Subject: [PATCH 418/447] quaternion/septernion: Added multi-
 quaternion/septernion averaging

Using method based on
http://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/20070017872.pdf
but simplified for the case where the quaternions are similar.
---
 .../test/quaternion/Test-quaternion.C         | 12 +++++++
 .../primitives/quaternion/quaternion.C        | 25 +++++++++++++
 .../primitives/quaternion/quaternion.H        |  7 ++++
 .../primitives/septernion/septernion.C        | 35 +++++++++++++++++--
 .../primitives/septernion/septernion.H        |  7 ++++
 5 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/applications/test/quaternion/Test-quaternion.C b/applications/test/quaternion/Test-quaternion.C
index 4d657fb818..c3acadf7cf 100644
--- a/applications/test/quaternion/Test-quaternion.C
+++ b/applications/test/quaternion/Test-quaternion.C
@@ -97,6 +97,18 @@ int main(int argc, char *argv[])
         }
     }
 
+    List<septernion> ss(3);
+    List<scalar> w(3);
+
+    ss[0] = septernion(vector(0, 0.1, 0), quaternion(0.7, vector(1, 2, 3)));
+    w[0] = 0.1;
+    ss[1] = septernion(vector(0, 0.2, 0), quaternion(-0.6, vector(-2, -1, -3)));
+    w[1] = 0.5;
+    ss[2] = septernion(vector(0, 0.3, 0), quaternion(0.3, vector(3, 2, 1)));
+    w[2] = 0.4;
+
+    Info<< "average(ss, w) " << average(ss, w) << endl;
+
     Info<< "End\n" << endl;
 
     return 0;
diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.C b/src/OpenFOAM/primitives/quaternion/quaternion.C
index e2bb676d8f..fa509113e0 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.C
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.C
@@ -69,6 +69,31 @@ Foam::quaternion Foam::slerp
 }
 
 
+Foam::quaternion Foam::average
+(
+    const UList<quaternion>& qs,
+    const UList<scalar> w
+)
+{
+    quaternion qa(w[0]*qs[0]);
+
+    for (label i=1; i<qs.size(); i++)
+    {
+        // Invert quaternion if it has the opposite sign to the average
+        if ((qa & qs[i]) > 0)
+        {
+            qa += w[i]*qs[i];
+        }
+        else
+        {
+            qa -= w[i]*qs[i];
+        }
+    }
+
+    return qa;
+}
+
+
 Foam::quaternion Foam::exp(const quaternion& q)
 {
     const scalar magV = mag(q.v());
diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.H b/src/OpenFOAM/primitives/quaternion/quaternion.H
index ab1c5379bb..a36b0eed35 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.H
@@ -259,6 +259,13 @@ quaternion slerp
     const scalar t
 );
 
+//- Simple weighted average with sign change
+quaternion average
+(
+    const UList<quaternion>& qs,
+    const UList<scalar> w
+);
+
 //- Exponent of a quaternion
 quaternion exp(const quaternion& q);
 
diff --git a/src/OpenFOAM/primitives/septernion/septernion.C b/src/OpenFOAM/primitives/septernion/septernion.C
index 0dd3718a45..34562bba06 100644
--- a/src/OpenFOAM/primitives/septernion/septernion.C
+++ b/src/OpenFOAM/primitives/septernion/septernion.C
@@ -61,12 +61,41 @@ Foam::word Foam::name(const septernion& s)
 
 Foam::septernion Foam::slerp
 (
-    const septernion& qa,
-    const septernion& qb,
+    const septernion& sa,
+    const septernion& sb,
     const scalar t
 )
 {
-    return septernion((1 - t)*qa.t() + t*qb.t(), slerp(qa.r(), qb.r(), t));
+    return septernion((1 - t)*sa.t() + t*sb.t(), slerp(sa.r(), sb.r(), t));
+}
+
+
+Foam::septernion Foam::average
+(
+    const UList<septernion>& ss,
+    const UList<scalar> w
+)
+{
+    septernion sa(w[0]*ss[0]);
+
+    for (label i=1; i<ss.size(); i++)
+    {
+        sa.t() += w[i]*ss[i].t();
+
+        // Invert quaternion if it has the opposite sign to the average
+        if ((sa.r() & ss[i].r()) > 0)
+        {
+            sa.r() += w[i]*ss[i].r();
+        }
+        else
+        {
+            sa.r() -= w[i]*ss[i].r();
+        }
+    }
+
+    normalize(sa.r());
+
+    return sa;
 }
 
 
diff --git a/src/OpenFOAM/primitives/septernion/septernion.H b/src/OpenFOAM/primitives/septernion/septernion.H
index c6bccca2eb..eb34cb5a6e 100644
--- a/src/OpenFOAM/primitives/septernion/septernion.H
+++ b/src/OpenFOAM/primitives/septernion/septernion.H
@@ -168,6 +168,13 @@ septernion slerp
     const scalar t
 );
 
+//- Simple weighted average
+septernion average
+(
+    const UList<septernion>& ss,
+    const UList<scalar> w
+);
+
 //- Data associated with septernion type are contiguous
 template<>
 inline bool contiguous<septernion>() {return true;}

From f78d929b3fda6dfbd03b91b2f6e70a1c400c7a20 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 16 Apr 2016 16:01:38 +0100
Subject: [PATCH 419/447] linearSpring: Minor improvement in messages

---
 .../restraints/linearSpring/linearSpring.C                | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
index 63e3763443..b4562d9104 100644
--- a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
+++ b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
@@ -89,14 +89,12 @@ Foam::spatialVector Foam::RBD::restraints::linearSpring::restrain() const
         (-stiffness_*(magR - restLength_) - damping_*(r & v))*r
     );
 
-    vector moment
-    (
-        (attachmentPt - model_.X0(model_.master(bodyID_)).r()) ^ force
-    );
+    vector moment(attachmentPt ^ force);
 
     if (model_.debug)
     {
-        Info<< " attachmentPt - anchor " << r*magR
+        Info<< " attachmentPt " << attachmentPt
+            << " attachmentPt - anchor " << r*magR
             << " spring length " << magR
             << " force " << force
             << " moment " << moment

From 69e877a53a462a990e31a240c4eab4016fc71282 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 16 Apr 2016 16:02:25 +0100
Subject: [PATCH 420/447] rigidBodyMeshMotion: displacementMotionSolver for the
 mesh-motion of multiple articulated rigid-bodies

The motion of the bodies is integrated using the rigidBodyDynamics
library with joints, restraints and external forces.

The mesh-motion is interpolated using septernion averaging.

This development is sponsored by Carnegie Wave Energy Ltd.
---
 src/dynamicMesh/Make/files                    |   3 +
 .../pointPatchDist}/externalPointEdgePoint.C  |   2 +-
 .../pointPatchDist}/externalPointEdgePoint.H  |   2 +-
 .../pointPatchDist}/externalPointEdgePointI.H |   2 +-
 .../pointPatchDist}/pointPatchDist.C          |   2 +-
 .../pointPatchDist}/pointPatchDist.H          |   2 +-
 .../rigidBodyModelState/rigidBodyModelState.C |   6 +-
 .../rigidBodyModelState/rigidBodyModelState.H |   9 +
 .../rigidBodyModelStateI.H                    |  12 +
 .../rigidBodyModelStateIO.C                   |   8 +-
 .../rigidBodyMotion/rigidBodyMotion.C         | 165 ++++++--
 .../rigidBodyMotion/rigidBodyMotion.H         |  54 +--
 .../rigidBodyMotion/rigidBodyMotionI.H        |  16 -
 .../rigidBodySolver/rigidBodySolver.H         |  18 +-
 .../rigidBodySolver/rigidBodySolverI.H        |  37 +-
 src/rigidBodyMeshMotion/Make/files            |   3 +
 src/rigidBodyMeshMotion/Make/options          |  14 +
 src/rigidBodyMeshMotion/rigidBodyMeshMotion.C | 357 ++++++++++++++++++
 src/rigidBodyMeshMotion/rigidBodyMeshMotion.H | 184 +++++++++
 src/sixDoFRigidBodyMotion/Make/files          |   2 -
 20 files changed, 782 insertions(+), 116 deletions(-)
 rename src/{sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver => dynamicMesh/pointPatchDist}/externalPointEdgePoint.C (95%)
 rename src/{sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver => dynamicMesh/pointPatchDist}/externalPointEdgePoint.H (99%)
 rename src/{sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver => dynamicMesh/pointPatchDist}/externalPointEdgePointI.H (98%)
 rename src/{sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver => dynamicMesh/pointPatchDist}/pointPatchDist.C (98%)
 rename src/{sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver => dynamicMesh/pointPatchDist}/pointPatchDist.H (97%)
 create mode 100644 src/rigidBodyMeshMotion/Make/files
 create mode 100644 src/rigidBodyMeshMotion/Make/options
 create mode 100644 src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
 create mode 100644 src/rigidBodyMeshMotion/rigidBodyMeshMotion.H

diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files
index c9c748ec4a..851530cd04 100644
--- a/src/dynamicMesh/Make/files
+++ b/src/dynamicMesh/Make/files
@@ -104,4 +104,7 @@ extrudePatchMesh/extrudePatchMesh.C
 polyMeshFilter/polyMeshFilterSettings.C
 polyMeshFilter/polyMeshFilter.C
 
+pointPatchDist/externalPointEdgePoint.C
+pointPatchDist/pointPatchDist.C
+
 LIB = $(FOAM_LIBBIN)/libdynamicMesh
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/externalPointEdgePoint.C b/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.C
similarity index 95%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/externalPointEdgePoint.C
rename to src/dynamicMesh/pointPatchDist/externalPointEdgePoint.C
index 8ed6f62005..c3473844d6 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/externalPointEdgePoint.C
+++ b/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/externalPointEdgePoint.H b/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.H
similarity index 99%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/externalPointEdgePoint.H
rename to src/dynamicMesh/pointPatchDist/externalPointEdgePoint.H
index 85871fc5bf..cabedb0277 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/externalPointEdgePoint.H
+++ b/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/externalPointEdgePointI.H b/src/dynamicMesh/pointPatchDist/externalPointEdgePointI.H
similarity index 98%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/externalPointEdgePointI.H
rename to src/dynamicMesh/pointPatchDist/externalPointEdgePointI.H
index 44ee302e4c..5927de0776 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/externalPointEdgePointI.H
+++ b/src/dynamicMesh/pointPatchDist/externalPointEdgePointI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/pointPatchDist.C b/src/dynamicMesh/pointPatchDist/pointPatchDist.C
similarity index 98%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/pointPatchDist.C
rename to src/dynamicMesh/pointPatchDist/pointPatchDist.C
index 7a1eb25a4e..7f2b0e54cc 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/pointPatchDist.C
+++ b/src/dynamicMesh/pointPatchDist/pointPatchDist.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/pointPatchDist.H b/src/dynamicMesh/pointPatchDist/pointPatchDist.H
similarity index 97%
rename from src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/pointPatchDist.H
rename to src/dynamicMesh/pointPatchDist/pointPatchDist.H
index 7d15d30fff..6a806fa46d 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/pointPatchDist.H
+++ b/src/dynamicMesh/pointPatchDist/pointPatchDist.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
index 9c70cfee2d..c1a086ec14 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.C
@@ -34,7 +34,8 @@ Foam::RBD::rigidBodyModelState::rigidBodyModelState
 :
     q_(model.nDoF(), Zero),
     qDot_(model.nDoF(), Zero),
-    qDdot_(model.nDoF(), Zero)
+    qDdot_(model.nDoF(), Zero),
+    deltaT_(0)
 {}
 
 
@@ -46,7 +47,8 @@ Foam::RBD::rigidBodyModelState::rigidBodyModelState
 :
     q_(dict.lookupOrDefault("q", scalarField(model.nDoF(), Zero))),
     qDot_(dict.lookupOrDefault("qDot", scalarField(model.nDoF(), Zero))),
-    qDdot_(dict.lookupOrDefault("qDdot", scalarField(model.nDoF(), Zero)))
+    qDdot_(dict.lookupOrDefault("qDdot", scalarField(model.nDoF(), Zero))),
+    deltaT_(dict.lookupOrDefault<scalar>("deltaT", 0))
 {}
 
 
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
index 483d98e19a..6b10ac355e 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
@@ -76,6 +76,9 @@ class rigidBodyModelState
         //- Joint acceleration
         scalarField qDdot_;
 
+        //- The time-step used to integrate to this state
+        scalar deltaT_;
+
 
 public:
 
@@ -107,6 +110,9 @@ public:
             //- Return access to the joint acceleration
             inline const scalarField& qDdot() const;
 
+            //- Return access to the time-step
+            inline scalar deltaT() const;
+
 
         // Edit
 
@@ -121,6 +127,9 @@ public:
             //- Return access to the joint acceleration
             inline scalarField& qDdot();
 
+            //- Return access to the time-step
+            inline scalar& deltaT();
+
 
         //- Write to dictionary
         void write(dictionary& dict) const;
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H
index 80bb529e02..e3fb2678f4 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateI.H
@@ -43,6 +43,12 @@ inline const Foam::scalarField& Foam::RBD::rigidBodyModelState::qDdot() const
 }
 
 
+inline Foam::scalar Foam::RBD::rigidBodyModelState::deltaT() const
+{
+    return deltaT_;
+}
+
+
 inline Foam::scalarField& Foam::RBD::rigidBodyModelState::q()
 {
     return q_;
@@ -61,4 +67,10 @@ inline Foam::scalarField& Foam::RBD::rigidBodyModelState::qDdot()
 }
 
 
+inline Foam::scalar& Foam::RBD::rigidBodyModelState::deltaT()
+{
+    return deltaT_;
+}
+
+
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
index 49e9153931..bf30398b9b 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
@@ -33,6 +33,7 @@ void Foam::RBD::rigidBodyModelState::write(dictionary& dict) const
     dict.add("q", q_);
     dict.add("qDot", qDot_);
     dict.add("qDdot", qDdot_);
+    dict.add("deltaT", deltaT_);
 }
 
 
@@ -41,6 +42,7 @@ void Foam::RBD::rigidBodyModelState::write(Ostream& os) const
     os.writeKeyword("q") << q_ << token::END_STATEMENT << nl;
     os.writeKeyword("qDot") << qDot_ << token::END_STATEMENT << nl;
     os.writeKeyword("qDdot") << qDdot_ << token::END_STATEMENT << nl;
+    os.writeKeyword("deltaT") << deltaT_ << token::END_STATEMENT << nl;
 }
 
 
@@ -54,7 +56,8 @@ Foam::Istream& Foam::RBD::operator>>
 {
     is  >> state.q_
         >> state.qDot_
-        >> state.qDdot_;
+        >> state.qDdot_
+        >> state.deltaT_;
 
     // Check state of Istream
     is.check
@@ -75,7 +78,8 @@ Foam::Ostream& Foam::RBD::operator<<
 {
     os  << token::SPACE << state.q_
         << token::SPACE << state.qDot_
-        << token::SPACE << state.qDdot_;
+        << token::SPACE << state.qDdot_
+        << token::SPACE << state.deltaT_;
 
     // Check state of Ostream
     os.check
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
index 70b734da92..d6bf0ffbef 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
@@ -25,6 +25,20 @@ License
 
 #include "rigidBodyMotion.H"
 #include "rigidBodySolver.H"
+#include "septernion.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::RBD::rigidBodyMotion::initialize()
+{
+    // Calculate the initial body-state
+    forwardDynamicsCorrection(rigidBodyModelState(*this));
+    X00_ = X0_;
+
+    // Update the body-state to correspond to the current joint-state
+    forwardDynamicsCorrection(motionState_);
+}
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -39,7 +53,6 @@ Foam::RBD::rigidBodyMotion::rigidBodyMotion()
     solver_(NULL)
 {}
 
-
 Foam::RBD::rigidBodyMotion::rigidBodyMotion
 (
     const dictionary& dict
@@ -48,11 +61,14 @@ Foam::RBD::rigidBodyMotion::rigidBodyMotion
     rigidBodyModel(dict),
     motionState_(*this),
     motionState0_(motionState_),
+    X00_(X0_.size()),
     aRelax_(dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0)),
     aDamp_(dict.lookupOrDefault<scalar>("accelerationDamping", 1.0)),
     report_(dict.lookupOrDefault<Switch>("report", false)),
     solver_(rigidBodySolver::New(*this, dict.subDict("solver")))
-{}
+{
+    initialize();
+}
 
 
 Foam::RBD::rigidBodyMotion::rigidBodyMotion
@@ -64,11 +80,14 @@ Foam::RBD::rigidBodyMotion::rigidBodyMotion
     rigidBodyModel(dict),
     motionState_(*this, stateDict),
     motionState0_(motionState_),
+    X00_(X0_.size()),
     aRelax_(dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0)),
     aDamp_(dict.lookupOrDefault<scalar>("accelerationDamping", 1.0)),
     report_(dict.lookupOrDefault<Switch>("report", false)),
     solver_(rigidBodySolver::New(*this, dict.subDict("solver")))
-{}
+{
+    initialize();
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -79,6 +98,23 @@ Foam::RBD::rigidBodyMotion::~rigidBodyMotion()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+Foam::spatialTransform Foam::RBD::rigidBodyMotion::X00
+(
+    const label bodyId
+) const
+{
+    if (merged(bodyId))
+    {
+        const subBody& mBody = mergedBody(bodyId);
+        return mBody.masterXT() & X00_[mBody.masterID()];
+    }
+    else
+    {
+        return X00_[bodyId];
+    }
+}
+
+
 void Foam::RBD::rigidBodyMotion::solve
 (
     scalar deltaT,
@@ -86,7 +122,12 @@ void Foam::RBD::rigidBodyMotion::solve
     const Field<spatialVector>& fx
 )
 {
-    deltaT_ = deltaT;
+    motionState_.deltaT() = deltaT;
+
+    if (motionState0_.deltaT() < SMALL)
+    {
+        motionState0_.deltaT() = deltaT;
+    }
 
     if (Pstream::master())
     {
@@ -115,64 +156,108 @@ void Foam::RBD::rigidBodyMotion::status() const
     */
 }
 
-/*
-Foam::tmp<Foam::pointField> Foam::RBD::rigidBodyMotion::transform
+
+Foam::tmp<Foam::pointField> Foam::RBD::rigidBodyMotion::transformPoints
 (
+    const label bodyID,
+    const scalarField& weight,
     const pointField& initialPoints
 ) const
 {
-    return
-    (
-        centreOfRotation()
-      + (Q() & initialQ_.T() & (initialPoints - initialCentreOfRotation_))
-    );
-}
+    // Calculate the transform from the initial state in the global frame
+    // to the current state in the global frame
+    spatialTransform X(X0(bodyID).inv() & X00(bodyID));
 
-
-Foam::tmp<Foam::pointField> Foam::RBD::rigidBodyMotion::transform
-(
-    const pointField& initialPoints,
-    const scalarField& scale
-) const
-{
-    // Calculate the transformation septerion from the initial state
-    septernion s
-    (
-        centreOfRotation() - initialCentreOfRotation(),
-        quaternion(Q() & initialQ().T())
-    );
+    // Calculate the septernion equivalent of the transformation for 'slerp'
+    // interpolation
+    septernion s(X);
 
     tmp<pointField> tpoints(new pointField(initialPoints));
     pointField& points = tpoints.ref();
 
-    forAll(points, pointi)
+    forAll(points, i)
     {
         // Move non-stationary points
-        if (scale[pointi] > SMALL)
+        if (weight[i] > SMALL)
         {
-            // Use solid-body motion where scale = 1
-            if (scale[pointi] > 1 - SMALL)
+            // Use solid-body motion where weight = 1
+            if (weight[i] > 1 - SMALL)
             {
-                points[pointi] = transform(initialPoints[pointi]);
+                points[i] = X.transformPoint(initialPoints[i]);
             }
             // Slerp septernion interpolation
             else
             {
-                septernion ss(slerp(septernion::I, s, scale[pointi]));
-
-                points[pointi] =
-                    initialCentreOfRotation()
-                  + ss.transform
-                    (
-                        initialPoints[pointi]
-                      - initialCentreOfRotation()
-                    );
+                points[i] =
+                    slerp(septernion::I, s, weight[i])
+                   .transformPoint(initialPoints[i]);
             }
         }
     }
 
     return tpoints;
 }
-*/
+
+
+Foam::tmp<Foam::pointField> Foam::RBD::rigidBodyMotion::transformPoints
+(
+    const labelList& bodyIDs,
+    const List<const scalarField*>& weights,
+    const pointField& initialPoints
+) const
+{
+    List<septernion> ss(bodyIDs.size() + 1);
+    ss[bodyIDs.size()] = septernion::I;
+
+    forAll(bodyIDs, bi)
+    {
+        const label bodyID = bodyIDs[bi];
+
+        // Calculate the transform from the initial state in the global frame
+        // to the current state in the global frame
+        spatialTransform X(X0(bodyID).inv() & X00(bodyID));
+
+        // Calculate the septernion equivalent of the transformation
+        ss[bi] = septernion(X);
+    }
+
+    tmp<pointField> tpoints(new pointField(initialPoints));
+    pointField& points = tpoints.ref();
+
+    List<scalar> w(ss.size());
+
+    forAll(points, i)
+    {
+        // Sum (1 - wi) and find the maximum wi
+        scalar sum1mw = 0;
+        scalar maxw = 0;
+
+        forAll(bodyIDs, bi)
+        {
+            w[bi] = (*(weights[bi]))[i];
+            sum1mw += 1 - w[bi];
+            maxw = max(maxw, w[bi]);
+        }
+
+        // Calculate the limiter for (1 - wi) to ensure the sum(wi) = maxw
+        scalar lambda = (w.size() - 1 - maxw)/sum1mw;
+
+        // Limit (1 - wi) and sum the resulting wi
+        scalar sumw = 0;
+        forAll(bodyIDs, bi)
+        {
+            w[bi] = 1 - lambda*(1 - w[bi]);
+            sumw += w[bi];
+        }
+
+        // Calculate the weight for the stationary far-field
+        w[bodyIDs.size()] = 1 - sumw;
+
+        points[i] = average(ss, w).transformPoint(initialPoints[i]);
+    }
+
+    return tpoints;
+}
+
 
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
index b2e4562b80..4e3203de59 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
@@ -79,11 +79,8 @@ class rigidBodyMotion
         //- Motion state data object for previous time-step
         rigidBodyModelState motionState0_;
 
-        //- The current time-step
-        scalar deltaT_;
-
-        //- The previous time-step
-        scalar deltaT0_;
+        //- Initial transform for external forces to the bodies reference frame
+        List<spatialTransform> X00_;
 
         //- Acceleration relaxation coefficient
         scalar aRelax_;
@@ -98,9 +95,17 @@ class rigidBodyMotion
         autoPtr<rigidBodySolver> solver_;
 
 
-        //- Construct as copy
+    // Private Member Functions
+
+        //- Initialize the body-state
+        void initialize();
+
+        //- Disallow copy construct
         rigidBodyMotion(const rigidBodyMotion&);
 
+        //- Disallow default bitwise assignment
+        void operator=(const rigidBodyMotion&);
+
 
 public:
 
@@ -140,6 +145,10 @@ public:
             //- Return the motion state for modification
             inline rigidBodyModelState& state();
 
+            //- Return the initial transform to the global frame for the
+            //  given body
+            spatialTransform X00(const label bodyId) const;
+
 
         // Edit
 
@@ -164,23 +173,26 @@ public:
 
         // Transformations
 
-            /*
-            //- Transform the given initial state point by the current motion
-            //  state
-            inline point transform(const point& initialPoints) const;
-
-            //- Transform the given initial state pointField by the current
-            //  motion state
-            tmp<pointField> transform(const pointField& initialPoints) const;
-
-            //- Transform the given initial state pointField by the current
-            //  motion state scaled by the given scale
-            tmp<pointField> transform
+            //- Transform the given initial pointField of the specified body
+            //  to correspond to the current motion state scaled using
+            //  'slerp' interpolation
+            tmp<pointField> transformPoints
             (
-                const pointField& initialPoints,
-                const scalarField& scale
+                const label bodyID,
+                const scalarField& weight,
+                const pointField& initialPoints
             ) const;
-            */
+
+            //- Transform the given initial pointField of the specified body
+            //  to correspond to the current motion state scaled using
+            //  'slerp' interpolation
+            tmp<pointField> transformPoints
+            (
+                const labelList& bodyIDs,
+                const List<const scalarField*>& weights,
+                const pointField& initialPoints
+            ) const;
+
 
         //- Write
         void write(Ostream&) const;
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
index 0de439f807..8b11b1ca28 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotionI.H
@@ -48,23 +48,7 @@ Foam::RBD::rigidBodyMotion::state()
 inline void Foam::RBD::rigidBodyMotion::newTime()
 {
     motionState0_ = motionState_;
-    deltaT0_ = deltaT_;
 }
 
 
-/*
-inline Foam::point Foam::RBD::rigidBodyMotion::transform
-(
-    const point& initialPoint
-) const
-{
-    return
-    (
-        centreOfRotation()
-      + (Q() & initialQ_.T() & (initialPoint - initialCentreOfRotation_))
-    );
-}
-*/
-
-
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
index cdcdc0af59..1ab119bcee 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
@@ -62,15 +62,6 @@ protected:
         //- Return the motion state
         inline rigidBodyModelState& state();
 
-        //- Return the previous motion state
-        inline const rigidBodyModelState& state0() const;
-
-        //- Return the current time-step
-        inline scalar deltaT() const;
-
-        //- Return the previous time-step
-        inline scalar deltaT0() const;
-
         //- Return the current joint position and orientation
         inline scalarField& q();
 
@@ -82,6 +73,12 @@ protected:
         //- Return the current joint acceleration
         inline scalarField& qDdot();
 
+        //- Return the current time-step
+        inline scalar deltaT() const;
+
+
+        //- Return the previous motion state
+        inline const rigidBodyModelState& state0() const;
 
         //- Return the current joint position and orientation
         inline const scalarField& q0() const;
@@ -94,6 +91,9 @@ protected:
         //- Return the current joint acceleration
         inline const scalarField& qDdot0() const;
 
+        //- Return the previous time-step
+        inline scalar deltaT0() const;
+
 
         //- Acceleration damping coefficient (for steady-state simulations)
         inline scalar aDamp() const;
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
index 1d781854b1..53736a02ab 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
@@ -31,25 +31,6 @@ inline Foam::RBD::rigidBodyModelState& Foam::RBD::rigidBodySolver::state()
 }
 
 
-inline const Foam::RBD::rigidBodyModelState&
-Foam::RBD::rigidBodySolver::state0() const
-{
-    return model_.motionState0_;
-}
-
-
-inline Foam::scalar Foam::RBD::rigidBodySolver::deltaT() const
-{
-    return model_.deltaT_;
-}
-
-
-inline Foam::scalar Foam::RBD::rigidBodySolver::deltaT0() const
-{
-    return model_.deltaT0_;
-}
-
-
 inline Foam::scalarField& Foam::RBD::rigidBodySolver::q()
 {
     return state().q();
@@ -68,6 +49,18 @@ inline Foam::scalarField& Foam::RBD::rigidBodySolver::qDdot()
 }
 
 
+inline Foam::scalar Foam::RBD::rigidBodySolver::deltaT() const
+{
+    return model_.motionState_.deltaT();
+}
+
+
+inline const Foam::RBD::rigidBodyModelState&
+Foam::RBD::rigidBodySolver::state0() const
+{
+    return model_.motionState0_;
+}
+
 inline const Foam::scalarField& Foam::RBD::rigidBodySolver::q0() const
 {
     return state0().q();
@@ -86,6 +79,12 @@ inline const Foam::scalarField& Foam::RBD::rigidBodySolver::qDdot0() const
 }
 
 
+inline Foam::scalar Foam::RBD::rigidBodySolver::deltaT0() const
+{
+    return model_.motionState0_.deltaT();
+}
+
+
 inline Foam::scalar Foam::RBD::rigidBodySolver::aDamp() const
 {
     return model_.aDamp_;
diff --git a/src/rigidBodyMeshMotion/Make/files b/src/rigidBodyMeshMotion/Make/files
new file mode 100644
index 0000000000..f7fcbc1361
--- /dev/null
+++ b/src/rigidBodyMeshMotion/Make/files
@@ -0,0 +1,3 @@
+rigidBodyMeshMotion.C
+
+LIB = $(FOAM_LIBBIN)/librigidBodyMeshMotion
diff --git a/src/rigidBodyMeshMotion/Make/options b/src/rigidBodyMeshMotion/Make/options
new file mode 100644
index 0000000000..92a8f72b4d
--- /dev/null
+++ b/src/rigidBodyMeshMotion/Make/options
@@ -0,0 +1,14 @@
+EXE_INC = -ggdb3 -DFULLDEBUG \
+    -I$(LIB_SRC)/rigidBodyDynamics/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude
+
+LIB_LIBS = \
+    -lrigidBodyDynamics \
+    -lforces \
+    -lmeshTools \
+    -lfileFormats \
+    -ldynamicMesh
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
new file mode 100644
index 0000000000..a2fa567a5b
--- /dev/null
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -0,0 +1,357 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "rigidBodyMeshMotion.H"
+#include "addToRunTimeSelectionTable.H"
+#include "polyMesh.H"
+#include "pointPatchDist.H"
+#include "pointConstraints.H"
+#include "uniformDimensionedFields.H"
+#include "forces.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(rigidBodyMeshMotion, 0);
+
+    addToRunTimeSelectionTable
+    (
+        motionSolver,
+        rigidBodyMeshMotion,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::rigidBodyMeshMotion::bodyMesh::bodyMesh
+(
+    const polyMesh& mesh,
+    const word& name,
+    const label bodyID,
+    const dictionary& dict
+)
+:
+    name_(name),
+    bodyID_(bodyID),
+    patches_(wordReList(dict.lookup("patches"))),
+    patchSet_(mesh.boundaryMesh().patchSet(patches_)),
+    di_(readScalar(dict.lookup("innerDistance"))),
+    do_(readScalar(dict.lookup("outerDistance"))),
+    weight_
+    (
+        IOobject
+        (
+            name_ + ".motionScale",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        pointMesh::New(mesh),
+        dimensionedScalar("zero", dimless, 0.0)
+    )
+{}
+
+
+Foam::rigidBodyMeshMotion::rigidBodyMeshMotion
+(
+    const polyMesh& mesh,
+    const IOdictionary& dict
+)
+:
+    displacementMotionSolver(mesh, dict, typeName),
+    model_
+    (
+        coeffDict(),
+        IOobject
+        (
+            "rigidBodyMotionState",
+            mesh.time().timeName(),
+            "uniform",
+            mesh
+        ).headerOk()
+      ? IOdictionary
+        (
+            IOobject
+            (
+                "rigidBodyMotionState",
+                mesh.time().timeName(),
+                "uniform",
+                mesh,
+                IOobject::READ_IF_PRESENT,
+                IOobject::NO_WRITE,
+                false
+            )
+        )
+      : coeffDict()
+    ),
+    test_(coeffDict().lookupOrDefault<Switch>("test", false)),
+    rhoInf_(1.0),
+    rhoName_(coeffDict().lookupOrDefault<word>("rhoName", "rho")),
+    curTimeIndex_(-1)
+{
+    if (rhoName_ == "rhoInf")
+    {
+        rhoInf_ = readScalar(coeffDict().lookup("rhoInf"));
+    }
+
+    const dictionary& bodiesDict = coeffDict().subDict("bodies");
+
+    forAllConstIter(IDLList<entry>, bodiesDict, iter)
+    {
+        const dictionary& bodyDict = iter().dict();
+
+        if (bodyDict.found("patches"))
+        {
+            bodyMeshes_.append
+            (
+                new bodyMesh
+                (
+                    mesh,
+                    iter().keyword(),
+                    model_.bodyID(iter().keyword()),
+                    bodyDict
+                )
+            );
+        }
+    }
+
+    // Calculate scaling factor everywhere for each meshed body
+    forAll(bodyMeshes_, bi)
+    {
+        const pointMesh& pMesh = pointMesh::New(mesh);
+
+        pointPatchDist pDist(pMesh, bodyMeshes_[bi].patchSet_, points0());
+
+        pointScalarField& scale = bodyMeshes_[bi].weight_;
+
+        // Scaling: 1 up to di then linear down to 0 at do away from patches
+        scale.internalField() =
+            min
+            (
+                max
+                (
+                    (bodyMeshes_[bi].do_ - pDist.internalField())
+                   /(bodyMeshes_[bi].do_ - bodyMeshes_[bi].di_),
+                    scalar(0)
+                ),
+                scalar(1)
+            );
+
+        // Convert the scale function to a cosine
+        scale.internalField() =
+            min
+            (
+                max
+                (
+                    0.5
+                  - 0.5
+                   *cos(scale.internalField()
+                   *Foam::constant::mathematical::pi),
+                    scalar(0)
+                ),
+                scalar(1)
+            );
+
+        pointConstraints::New(pMesh).constrain(scale);
+        //scale.write();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::rigidBodyMeshMotion::~rigidBodyMeshMotion()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::pointField>
+Foam::rigidBodyMeshMotion::curPoints() const
+{
+    return points0() + pointDisplacement_.internalField();
+}
+
+
+void Foam::rigidBodyMeshMotion::solve()
+{
+    const Time& t = mesh().time();
+
+    if (mesh().nPoints() != points0().size())
+    {
+        FatalErrorInFunction
+            << "The number of points in the mesh seems to have changed." << endl
+            << "In constant/polyMesh there are " << points0().size()
+            << " points; in the current mesh there are " << mesh().nPoints()
+            << " points." << exit(FatalError);
+    }
+
+    // Store the motion state at the beginning of the time-step
+    if (curTimeIndex_ != this->db().time().timeIndex())
+    {
+        model_.newTime();
+        curTimeIndex_ = this->db().time().timeIndex();
+    }
+
+    dimensionedVector g("g", dimAcceleration, vector::zero);
+
+    if (db().foundObject<uniformDimensionedVectorField>("g"))
+    {
+        g = db().lookupObject<uniformDimensionedVectorField>("g");
+    }
+    else if (coeffDict().found("g"))
+    {
+        coeffDict().lookup("g") >> g;
+    }
+
+    model_.g() = g.value();
+
+    if (test_)
+    {
+        label nIter(readLabel(coeffDict().lookup("nIter")));
+
+        for (label i=0; i<nIter; i++)
+        {
+            model_.solve
+            (
+                t.deltaTValue(),
+                scalarField(model_.nDoF(), Zero),
+                Field<spatialVector>(model_.nBodies(), Zero)
+            );
+        }
+    }
+    else
+    {
+        Field<spatialVector> fx(model_.nBodies(), Zero);
+
+        forAll(bodyMeshes_, bi)
+        {
+            const label bodyID = bodyMeshes_[bi].bodyID_;
+
+            dictionary forcesDict;
+
+            forcesDict.add("type", forces::typeName);
+            forcesDict.add("patches", bodyMeshes_[bi].patches_);
+            forcesDict.add("rhoInf", rhoInf_);
+            forcesDict.add("rhoName", rhoName_);
+            forcesDict.add("CofR", model_.X0(bodyID).r());
+
+            forces f("forces", db(), forcesDict);
+
+            f.calcForcesMoment();
+
+            fx[bodyID].l() = f.forceEff();
+            fx[bodyID].w() = f.momentEff();
+        }
+
+        model_.solve
+        (
+            t.deltaTValue(),
+            scalarField(model_.nDoF(), Zero),
+            fx
+        );
+    }
+
+
+    // Update the displacements
+    if (bodyMeshes_.size() == 1)
+    {
+        pointDisplacement_.internalField() = model_.transformPoints
+        (
+            bodyMeshes_[0].bodyID_,
+            bodyMeshes_[0].weight_,
+            points0()
+        ) - points0();
+    }
+    else
+    {
+        labelList bodyIDs(bodyMeshes_.size());
+        List<const scalarField*> weights(bodyMeshes_.size());
+        forAll(bodyIDs, bi)
+        {
+            bodyIDs[bi] = bodyMeshes_[bi].bodyID_;
+            weights[bi] = &bodyMeshes_[bi].weight_;
+        }
+
+        pointDisplacement_.internalField() =
+            model_.transformPoints(bodyIDs, weights, points0()) - points0();
+    }
+
+    // Displacement has changed. Update boundary conditions
+    pointConstraints::New
+    (
+        pointDisplacement_.mesh()
+    ).constrainDisplacement(pointDisplacement_);
+}
+
+
+bool Foam::rigidBodyMeshMotion::writeObject
+(
+    IOstream::streamFormat fmt,
+    IOstream::versionNumber ver,
+    IOstream::compressionType cmp
+) const
+{
+    IOdictionary dict
+    (
+        IOobject
+        (
+            "rigidBodyMotionState",
+            mesh().time().timeName(),
+            "uniform",
+            mesh(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    model_.state().write(dict);
+    return dict.regIOobject::write();
+}
+
+
+bool Foam::rigidBodyMeshMotion::read()
+{
+    if (displacementMotionSolver::read())
+    {
+        model_.read(coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H
new file mode 100644
index 0000000000..f97384e1db
--- /dev/null
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::rigidBodyMeshMotion
+
+Description
+    Rigid-body mesh motion solver for fvMesh.
+
+    Applies septernion interpolation of movement as function of distance to the
+    object surface.
+
+SourceFiles
+    rigidBodyMeshMotion.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef rigidBodyMeshMotion_H
+#define rigidBodyMeshMotion_H
+
+#include "displacementMotionSolver.H"
+#include "rigidBodyMotion.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+        Class rigidBodyMeshMotion Declaration
+\*---------------------------------------------------------------------------*/
+
+class rigidBodyMeshMotion
+:
+    public displacementMotionSolver
+{
+    //- Class containing the patches and point motion weighting for each body
+    class bodyMesh
+    {
+        //- Name of the body
+        const word name_;
+
+        //- ID of the body in the RBD::rigidBodyMotion
+        const label bodyID_;
+
+        //- List of mesh patches associated with this body
+        const wordReList patches_;
+
+        //- Patches to integrate forces
+        const labelHashSet patchSet_;
+
+        //- Inner morphing distance (limit of solid-body region)
+        const scalar di_;
+
+        //- Outer morphing distance (limit of linear interpolation region)
+        const scalar do_;
+
+        //- Current interpolation weight
+        //  (1 at patches and within di_, 0 at do_ and beyond)
+        pointScalarField weight_;
+
+
+    public:
+
+        friend class rigidBodyMeshMotion;
+
+        bodyMesh
+        (
+            const polyMesh& mesh,
+            const word& name,
+            const label bodyID,
+            const dictionary& dict
+        );
+    };
+
+
+    // Private data
+
+        //- Rigid-body model
+        RBD::rigidBodyMotion model_;
+
+        //- List of the bodyMeshes containing the patches and point motion
+        //  weighting for each body
+        PtrList<bodyMesh> bodyMeshes_;
+
+        //- Switch for test-mode in which only the
+        //  gravitational body-force is applied
+        Switch test_;
+
+        //- Reference density required by the forces object for
+        //  incompressible calculations, required if rhoName == rhoInf
+        scalar rhoInf_;
+
+        //- Name of density field, optional unless used for an
+        //  incompressible simulation, when this needs to be specified
+        //  as rhoInf
+        word rhoName_;
+
+        //- Current time index (used for updating)
+        label curTimeIndex_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        rigidBodyMeshMotion
+        (
+            const rigidBodyMeshMotion&
+        );
+
+        //- Disallow default bitwise assignment
+        void operator=(const rigidBodyMeshMotion&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("rigidBodyMotion");
+
+
+    // Constructors
+
+        //- Construct from polyMesh and IOdictionary
+        rigidBodyMeshMotion
+        (
+            const polyMesh&,
+            const IOdictionary& dict
+        );
+
+
+    //- Destructor
+    ~rigidBodyMeshMotion();
+
+
+    // Member Functions
+
+        //- Return point location obtained from the current motion field
+        virtual tmp<pointField> curPoints() const;
+
+        //- Solve for motion
+        virtual void solve();
+
+        //- Write state using given format, version and compression
+        virtual bool writeObject
+        (
+            IOstream::streamFormat fmt,
+            IOstream::versionNumber ver,
+            IOstream::compressionType cmp
+        ) const;
+
+        //- Read dynamicMeshDict dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/Make/files b/src/sixDoFRigidBodyMotion/Make/files
index 1184c6ad72..837d2df3fd 100644
--- a/src/sixDoFRigidBodyMotion/Make/files
+++ b/src/sixDoFRigidBodyMotion/Make/files
@@ -28,8 +28,6 @@ pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacement
 pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
 
 sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
-sixDoFRigidBodyMotionSolver/externalPointEdgePoint.C
-sixDoFRigidBodyMotionSolver/pointPatchDist.C
 
 sixDoFSolvers/sixDoFSolver/sixDoFSolver.C
 sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C

From 8c6fa81eba70b614acc6ea6c00e3a1ed5a65bb3b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 16 Apr 2016 18:34:41 +0100
Subject: [PATCH 421/447] vector::zero -> Zero

---
 .../basic/potentialFoam/createFields.H        |  2 +-
 .../combustion/chemFoam/createFields.H        |  2 +-
 .../electromagnetics/magneticFoam/magnet.H    |  6 +--
 .../solid/createSolidFields.H                 |  2 +-
 .../boundaryFoam/createFields.H               |  2 +-
 .../boundaryFoam/interrogateWallPatches.H     |  2 +-
 .../solvers/lagrangian/DPMFoam/DPMFoam.C      |  4 +-
 .../relativeVelocityModel.C                   |  2 +-
 .../multiphaseEulerFoam/createFields.H        |  2 +-
 .../multiphaseSystem/multiphaseSystem.C       |  4 +-
 .../multiphaseSystem/phaseModel/phaseModel.C  |  2 +-
 .../multiphase/multiphaseEulerFoam/pEqn.H     |  2 +-
 .../potentialFreeSurfaceFoam/createFields.H   |  2 +-
 .../liftModels/noLift/noLift.C                |  4 +-
 .../noTurbulentDispersion.C                   |  4 +-
 .../noWallLubrication/noWallLubrication.C     |  6 +--
 .../MomentumTransferPhaseSystem.C             |  4 +-
 .../MovingPhaseModel/MovingPhaseModel.C       |  2 +-
 .../phasePressureModel/phasePressureModel.C   |  4 +-
 .../liftModels/noLift/noLift.C                |  4 +-
 .../noTurbulentDispersion.C                   |  4 +-
 .../noWallLubrication/noWallLubrication.C     |  6 +--
 .../phasePressureModel/phasePressureModel.C   |  4 +-
 .../tractionDisplacementFvPatchVectorField.C  |  8 ++--
 .../kineticEnergyLimiter.H                    |  2 +-
 ...DisplacementCorrectionFvPatchVectorField.C |  8 ++--
 .../test/PatchTools/Test-PatchTools.C         |  4 +-
 .../test/mappedPatch/Test-MappedPatch.C       |  4 +-
 .../momentOfInertia/Test-momentOfInertia.C    |  8 ++--
 .../passiveParticle/Test-passiveParticle.C    |  4 +-
 .../test/pointField/Test-PointField.C         |  4 +-
 .../test/primitivePatch/Test-PrimitivePatch.C |  6 +--
 .../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 16 ++++----
 .../Optional/ccm26ToFoam/ccm26ToFoam.C        |  2 +-
 .../mesh/conversion/datToFoam/datToFoam.C     |  6 +--
 .../fluent3DMeshToFoam/fluent3DMeshToFoam.L   |  6 +--
 .../extrudeToRegionMesh/extrudeToRegionMesh.C |  2 +-
 .../backgroundMeshDecomposition.C             |  4 +-
 .../cellAspectRatioControl.C                  |  4 +-
 .../cellShapeControl/cellShapeControl.C       |  4 +-
 .../cellShapeControlMesh.C                    |  2 +-
 .../fileControl/fileControl.C                 |  6 +--
 .../searchableSurfaceControl.C                |  4 +-
 .../conformalVoronoiMesh.C                    |  4 +-
 .../conformalVoronoiMeshConformToSurface.C    |  4 +-
 .../featurePointConformerSpecialisations.C    | 10 ++---
 .../indexedCell/indexedCellI.H                |  8 ++--
 .../conformationSurfaces.C                    |  2 +-
 .../autoDensity/autoDensity.C                 |  6 +--
 .../generation/foamyMesh/foamyQuadMesh/CV2D.C |  2 +-
 .../foamyQuadMesh/shortEdgeFilter2D.C         |  2 +-
 .../manipulation/checkMesh/checkGeometry.C    |  2 +-
 .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C     |  2 +-
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.C        |  2 +-
 .../postProcessing/wall/wallGradU/wallGradU.C |  4 +-
 .../wall/wallShearStress/wallShearStress.C    |  4 +-
 .../viewFactorsGen/viewFactorsGen.C           |  2 +-
 .../surfaceBooleanFeatures.C                  |  2 +-
 .../surfaceFeatureExtract.C                   |  6 +--
 .../surface/surfaceInertia/surfaceInertia.C   |  8 ++--
 .../surfaceLambdaMuSmooth.C                   |  2 +-
 .../surfaceSplitNonManifolds.C                |  4 +-
 .../primitives/DiagTensor/DiagTensor.H        |  3 ++
 .../primitives/DiagTensor/DiagTensorI.H       |  7 ++++
 .../anisotropicFilter/anisotropicFilter.C     |  4 +-
 .../fixedShearStressFvPatchVectorField.C      |  4 +-
 .../turbulenceModels/laminar/laminar.C        |  2 +-
 .../nonlinearEddyViscosity.C                  |  2 +-
 src/dynamicMesh/boundaryMesh/boundaryMesh.C   |  2 +-
 .../extrudePatchMesh/extrudePatchMesh.C       |  2 +-
 src/dynamicMesh/meshCut/cellCuts/cellCuts.C   |  2 +-
 .../meshCut/cellLooper/geomCellLooper.C       |  4 +-
 .../directions/directionInfo/directionInfoI.H |  4 +-
 .../meshCut/refineCell/refineCell.C           |  4 +-
 .../polyMeshGeometry/polyMeshGeometry.C       | 12 +++---
 .../polyMeshAdder/faceCoupleInfo.C            |  2 +-
 .../polyTopoChange/addObject/polyAddPoint.H   |  4 +-
 .../polyTopoChange/edgeCollapser.C            | 10 ++---
 .../modifyObject/polyModifyPoint.H            |  4 +-
 .../polyTopoChange/polyTopoChange.C           |  2 +-
 .../slidingInterfaceProjectPoints.C           |  4 +-
 .../extendedEdgeMesh/extendedEdgeMeshI.H      |  4 +-
 .../extendedEdgeMeshTemplates.C               |  2 +-
 .../extendedFeatureEdgeMeshI.H                |  4 +-
 .../extendedFeatureEdgeMeshTemplates.C        |  2 +-
 .../cfdTools/general/MRF/MRFZone.C            |  2 +-
 .../cfdTools/general/MRF/MRFZoneList.C        |  2 +-
 .../general/SRF/SRFModel/SRFModel/SRFModel.C  |  2 +-
 .../SRFFreestreamVelocityFvPatchVectorField.C |  4 +-
 .../SRFVelocityFvPatchVectorField.C           |  4 +-
 .../DarcyForchheimer/DarcyForchheimer.C       | 14 +++----
 .../porosityModel/fixedCoeff/fixedCoeff.C     | 10 ++---
 .../porosityModel/porosityModel.C             |  2 +-
 .../activeBaffleVelocityFvPatchVectorField.C  |  4 +-
 ...ureForceBaffleVelocityFvPatchVectorField.C |  2 +-
 .../codedMixed/codedMixedFvPatchField.H       |  4 +-
 ...malInletOutletVelocityFvPatchVectorField.C | 10 ++---
 ...erstitialInletVelocityFvPatchVectorField.C |  4 +-
 ...mappedVelocityFluxFixedValueFvPatchField.C |  4 +-
 .../derived/noSlip/noSlipFvPatchVectorField.C |  6 +--
 ...utletPhaseMeanVelocityFvPatchVectorField.C | 12 +++---
 ...aseHydrostaticPressureFvPatchScalarField.C |  4 +-
 ...tedInletOutletVelocityFvPatchVectorField.C |  6 +--
 ...tOutletParSlipVelocityFvPatchVectorField.C |  6 +--
 ...ureInletOutletVelocityFvPatchVectorField.C | 14 +++----
 ...malInletOutletVelocityFvPatchVectorField.C |  6 +--
 .../rotatingWallVelocityFvPatchVectorField.C  |  2 +-
 .../supersonicFreestreamFvPatchVectorField.C  |  8 ++--
 ...ityHydrostaticPressureFvPatchScalarField.C |  4 +-
 .../LeastSquaresGrad/LeastSquaresVectors.C    |  2 +-
 .../invDistLeastSquaresVectors.C              |  6 +--
 .../leastSquaresGrad/leastSquaresVectors.C    |  6 +--
 .../unweightedLeastSquaresVectors.C           |  6 +--
 .../constraint/cyclicACMI/cyclicACMIFvPatch.C |  2 +-
 .../constraint/cyclicAMI/cyclicAMIFvPatch.C   |  2 +-
 .../advectionDiffusionPatchDistMethod.C       |  4 +-
 .../fvMesh/wallDist/wallDist/wallDist.C       |  2 +-
 .../schemes/linearUpwind/linearUpwindV.C      |  4 +-
 .../skewCorrected/skewCorrectionVectors.C     |  2 +-
 .../surfaceInterpolation.C                    |  2 +-
 .../displacementSBRStressFvMotionSolver.C     |  2 +-
 .../displacementInterpolationMotionSolver.C   |  2 +-
 .../displacementLaplacianFvMotionSolver.C     |  2 +-
 .../displacementLayeredMotionMotionSolver.C   |  4 +-
 .../layeredSolver/pointEdgeStructuredWalkI.H  |  4 +-
 .../velocityLaplacianFvMotionSolver.C         |  2 +-
 ...llatingDisplacementPointPatchVectorField.C |  6 +--
 ...OscillatingVelocityPointPatchVectorField.C |  6 +--
 ...llatingDisplacementPointPatchVectorField.C |  4 +-
 ...oscillatingVelocityPointPatchVectorField.C |  4 +-
 ...surfaceDisplacementPointPatchVectorField.C |  8 ++--
 ...aceSlipDisplacementPointPatchVectorField.C |  4 +-
 .../waveDisplacementPointPatchVectorField.C   |  8 ++--
 .../actuationDiskSourceTemplates.C            |  4 +-
 .../meanVelocityForce/meanVelocityForce.C     |  4 +-
 .../radialActuationDiskSourceTemplates.C      |  4 +-
 .../derived/rotorDiskSource/rotorDiskSource.C | 22 +++++------
 .../trimModel/targetCoeff/targetCoeffTrim.C   | 10 ++---
 .../tabulatedAccelerationSource.C             |  4 +-
 .../interRegionExplicitPorositySource.C       |  8 ++--
 .../clouds/Templates/DSMCCloud/DSMCCloud.C    | 10 ++---
 .../clouds/Templates/DSMCCloud/DSMCCloudI.H   |  2 +-
 .../Templates/DSMCParcel/DSMCParcelIO.C       |  2 +-
 src/lagrangian/basic/particle/particleI.H     |  4 +-
 .../basic/particle/particleTemplates.C        |  4 +-
 .../coalCloudList/coalCloudListI.H            |  2 +-
 .../Templates/KinematicCloud/KinematicCloud.C |  8 ++--
 .../KinematicCloud/KinematicCloudI.H          |  2 +-
 .../CollidingParcel/CollidingParcelI.H        |  8 ++--
 .../CollidingParcel/CollidingParcelIO.C       |  8 ++--
 .../KinematicParcel/KinematicParcel.C         |  6 +--
 .../KinematicParcel/KinematicParcelI.H        | 12 +++---
 .../KinematicParcel/KinematicParcelIO.C       |  8 ++--
 .../Templates/MPPICParcel/MPPICParcelI.H      |  4 +-
 .../Templates/MPPICParcel/MPPICParcelIO.C     |  4 +-
 .../MPPICParcel/MPPICParcelTrackingDataI.H    |  2 +-
 .../ReactingMultiphaseParcel.C                |  6 +--
 .../Templates/ReactingParcel/ReactingParcel.C |  6 +--
 .../Templates/ThermoParcel/ThermoParcel.C     |  6 +--
 .../ParticleCollector/ParticleCollector.C     |  2 +-
 .../ParticleForceList/ParticleForceList.C     |  4 +-
 .../PairCollision/PairCollision.C             |  4 +-
 .../PairSpringSliderDashpot.C                 |  6 +--
 .../WallLocalSpringSliderDashpot.C            |  2 +-
 .../WallSpringSliderDashpot.C                 |  2 +-
 .../ConeInjection/ConeInjection.C             |  2 +-
 .../ConeNozzleInjection/ConeNozzleInjection.C |  8 ++--
 .../InflationInjection/InflationInjection.C   |  2 +-
 .../InjectionModel/InjectionModel.C           |  6 +--
 .../kinematicParcelInjectionData.C            |  4 +-
 .../InjectionModel/NoInjection/NoInjection.C  |  4 +-
 .../DistortedSphereDragForce.C                |  4 +-
 .../Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C |  6 +--
 .../Drag/NonSphereDrag/NonSphereDragForce.C   |  4 +-
 .../PlessisMasliyahDragForce.C                |  4 +-
 .../Drag/SphereDrag/SphereDragForce.C         |  4 +-
 .../Drag/WenYuDrag/WenYuDragForce.C           |  4 +-
 .../ParticleForces/Gravity/GravityForce.C     |  4 +-
 .../ParticleForces/Lift/LiftForce/LiftForce.C |  4 +-
 .../NonInertialFrame/NonInertialFrameForce.C  | 20 +++++-----
 .../Paramagnetic/ParamagneticForce.C          |  4 +-
 .../ParticleForce/ParticleForce.C             |  6 +--
 .../PressureGradient/PressureGradientForce.C  |  4 +-
 .../Kinematic/ParticleForces/SRF/SRFForce.C   |  4 +-
 .../LocalInteraction/LocalInteraction.C       |  6 +--
 .../StandardWallInteraction.C                 |  4 +-
 .../MPPIC/AveragingMethods/Moment/Moment.C    |  4 +-
 .../MPPIC/DampingModels/NoDamping/NoDamping.C |  4 +-
 .../MPPIC/PackingModels/Explicit/Explicit.C   |  2 +-
 .../MPPIC/PackingModels/Implicit/Implicit.C   |  2 +-
 .../MPPIC/PackingModels/NoPacking/NoPacking.C |  4 +-
 .../ThermoSurfaceFilm/ThermoSurfaceFilm.C     |  4 +-
 .../molecule/mdTools/averageMDFields.H        |  6 +--
 .../calculateAutoCorrelationFunctions.H       |  6 +--
 .../molecule/mdTools/createMDFields.H         |  8 ++--
 .../mdTools/meanMomentumEnergyAndNMols.H      |  8 ++--
 .../molecule/mdTools/resetMDFields.H          |  2 +-
 .../molecule/mdTools/temperatureAndPressure.H |  4 +-
 .../mdTools/temperatureAndPressureVariables.H |  4 +-
 .../molecule/molecule/molecule.C              | 10 ++---
 .../molecule/molecule/moleculeI.H             | 20 +++++-----
 .../molecule/molecule/moleculeIO.C            | 16 ++++----
 .../molecule/moleculeCloud/moleculeCloud.C    | 12 +++---
 .../potential/potential/potential.C           |  4 +-
 .../Templates/SprayParcel/SprayParcelIO.C     |  2 +-
 .../GradientDispersionRAS.C                   |  4 +-
 .../StochasticDispersionRAS.C                 |  4 +-
 .../BrownianMotion/BrownianMotionForce.C      |  2 +-
 .../medialAxisMeshMover.C                     | 20 +++++-----
 .../meshRefinement/meshRefinement.C           |  2 +-
 .../meshRefinement/meshRefinementRefine.C     |  8 ++--
 .../refinementFeatures/refinementFeatures.C   |  4 +-
 .../refinementSurfaces/refinementSurfaces.C   |  4 +-
 .../snappyHexMeshDriver/snappyLayerDriver.C   | 16 ++++----
 .../snappyLayerDriverShrink.C                 | 10 ++---
 .../snappyHexMeshDriver/snappySnapDriver.C    | 18 ++++-----
 .../snappySnapDriverFeature.C                 | 38 +++++++++----------
 .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.C   | 16 ++++----
 .../coordinateRotation/axesRotation.C         |  2 +-
 .../coordinateRotation/cylindrical.C          | 14 +++----
 .../coordinateSystems/coordinateSystem.C      |  2 +-
 src/meshTools/indexedOctree/treeDataFace.C    |  4 +-
 .../indexedOctree/treeDataPrimitivePatch.C    |  2 +-
 .../mappedPolyPatch/mappedPatchBase.C         | 10 ++---
 src/meshTools/meshTools/meshTools.C           |  2 +-
 .../momentOfInertia/momentOfInertia.C         |  8 ++--
 .../primitiveMeshGeometry.C                   | 10 ++---
 .../searchableSurface/searchableBox.C         |  2 +-
 .../searchableSurface/searchableCylinder.C    |  4 +-
 .../searchableSurface/searchableDisk.C        |  6 +--
 .../searchableSurface/searchablePlane.C       |  2 +-
 .../searchableSurface/searchablePlate.C       |  4 +-
 .../searchableSurface/searchableSphere.C      |  2 +-
 .../searchableSurfaceWithGaps.C               |  2 +-
 .../searchableSurfacesQueries.C               |  2 +-
 .../searchableSurface/triSurfaceMesh.C        |  6 +--
 .../faceSources/regionToFace/regionToFace.C   |  4 +-
 .../booleanSurface/booleanSurface.C           |  4 +-
 .../surfaceLocation/surfaceLocation.C         |  4 +-
 .../triSurfaceSearch/triSurfaceRegionSearch.C |  4 +-
 .../triSurfaceSearch/triSurfaceSearch.C       |  2 +-
 .../triSurfaceTools/triSurfaceTools.C         |  2 +-
 .../twoDPointCorrector/twoDPointCorrector.C   |  4 +-
 .../forces/forceCoeffs/forceCoeffs.C          |  6 +--
 .../functionObjects/forces/forces/forces.C    | 22 +++++------
 .../utilities/pressureTools/pressureTools.C   |  2 +-
 .../utilities/vorticity/vorticity.C           |  4 +-
 .../wallShearStress/wallShearStress.C         |  4 +-
 .../regionModel/regionModel1D/regionModel1D.C |  4 +-
 .../singleLayerRegion/singleLayerRegion.C     |  4 +-
 .../kinematicSingleLayer.C                    |  8 ++--
 .../filmTurbulenceModel/laminar/laminar.C     |  2 +-
 .../contactAngleForce/contactAngleForce.C     |  2 +-
 .../curvatureSeparation/curvatureSeparation.C |  2 +-
 src/rigidBodyMeshMotion/rigidBodyMeshMotion.C |  2 +-
 .../triSurfaceMeshPointSet.C                  |  4 +-
 .../sampledSurface/isoSurface/isoSurface.C    |  6 +--
 .../isoSurface/isoSurfaceCell.C               |  4 +-
 ...gidBodyDisplacementPointPatchVectorField.C |  6 +--
 ...gidBodyDisplacementPointPatchVectorField.C |  6 +--
 ...xDoFRigidBodyMotionOrientationConstraint.C |  4 +-
 .../sixDoFRigidBodyMotionPointConstraint.C    |  4 +-
 .../linearAxialAngularSpring.C                |  6 +--
 .../restraints/linearDamper/linearDamper.C    |  4 +-
 .../restraints/linearSpring/linearSpring.C    |  4 +-
 .../sphericalAngularDamper.C                  |  4 +-
 .../sphericalAngularSpring.C                  | 10 ++---
 .../tabulatedAxialAngularSpring.C             |  4 +-
 .../sixDoFRigidBodyMotion.C                   | 10 ++---
 .../sixDoFRigidBodyMotionState.C              | 12 +++---
 .../sixDoFRigidBodyMotionSolver.C             |  4 +-
 .../radiativeIntensityRay.C                   |  4 +-
 .../faceTriangulation/faceTriangulation.C     |  2 +-
 273 files changed, 704 insertions(+), 696 deletions(-)

diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H
index a4e09d481f..80866b5779 100644
--- a/applications/solvers/basic/potentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/createFields.H
@@ -12,7 +12,7 @@ volVectorField U
     mesh
 );
 
-U = dimensionedVector("0", U.dimensions(), vector::zero);
+U = dimensionedVector("0", U.dimensions(), Zero);
 
 surfaceScalarField phi
 (
diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H
index 698ca98463..2d2e9d1ebd 100644
--- a/applications/solvers/combustion/chemFoam/createFields.H
+++ b/applications/solvers/combustion/chemFoam/createFields.H
@@ -80,7 +80,7 @@
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionedVector("zero", dimVelocity, vector::zero)
+        dimensionedVector("zero", dimVelocity, Zero)
     );
 
     #include "createPhi.H"
diff --git a/applications/solvers/electromagnetics/magneticFoam/magnet.H b/applications/solvers/electromagnetics/magneticFoam/magnet.H
index 031f64ca09..7e9b04a4c5 100644
--- a/applications/solvers/electromagnetics/magneticFoam/magnet.H
+++ b/applications/solvers/electromagnetics/magneticFoam/magnet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ public:
         inline magnet()
         :
             remanence_("Mr", dimensionSet(0, -1, 0, 0, 0, 1, 0), 0),
-            orientation_(vector::zero)
+            orientation_(Zero)
         {}
 
         //- Construct from components
@@ -94,7 +94,7 @@ public:
         inline magnet(Istream& is)
         :
             remanence_("Mr", dimensionSet(0, -1, 0, 0, 0, 1, 0), 0),
-            orientation_(vector::zero)
+            orientation_(Zero)
         {
             is >> *this;
         }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
index d80e053727..f900fba316 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@@ -55,7 +55,7 @@
                     (
                         "zero",
                         tkappaByCp().dimensions(),
-                        symmTensor::zero
+                        Zero
                     ),
                     zeroGradientFvPatchSymmTensorField::typeName
                 )
diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H
index 0298c8339c..dff4b701f5 100644
--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@@ -45,5 +45,5 @@ dimensionedVector gradP
 (
     "gradP",
     dimensionSet(0, 1, -2, 0, 0),
-    vector::zero
+    Zero
 );
diff --git a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
index 513ca54a42..ca337512dc 100644
--- a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
+++ b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
@@ -3,7 +3,7 @@
 label faceId(-1);
 label patchId(-1);
 label nWallFaces(0);
-vector wallNormal(vector::zero);
+vector wallNormal(Zero);
 
 const fvPatchList& patches = mesh.boundary();
 
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index 9e2208479d..728e3e45d2 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -102,14 +102,14 @@ int main(int argc, char *argv[])
             (
                 "0",
                 cloudSU.dimensions()/dimVolume,
-                vector::zero
+                Zero
             ),
             zeroGradientFvPatchVectorField::typeName
         );
 
         cloudVolSUSu.internalField() = -cloudSU.source()/mesh.V();
         cloudVolSUSu.correctBoundaryConditions();
-        cloudSU.source() = vector::zero;
+        cloudSU.source() = Zero;
 
         // --- Pressure-velocity PIMPLE corrector loop
         while (pimple.loop())
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
index 5131d63e57..c8e3bb3721 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
@@ -59,7 +59,7 @@ Foam::relativeVelocityModel::relativeVelocityModel
             IOobject::AUTO_WRITE
         ),
         alphac_.mesh(),
-        dimensionedVector("Udm", dimVelocity, vector::zero)
+        dimensionedVector("Udm", dimVelocity, Zero)
     )
 {}
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
index 0747583599..212160b83e 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
@@ -23,7 +23,7 @@ volVectorField U
         IOobject::AUTO_WRITE
     ),
     mesh,
-    dimensionedVector("U", dimVelocity, vector::zero)
+    dimensionedVector("U", dimVelocity, Zero)
 );
 
 surfaceScalarField phi
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 27a5067edd..3f514904ec 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -634,7 +634,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
             (
                 "Svm",
                 dimensionSet(1, -2, -2, 0, 0),
-                vector::zero
+                Zero
             )
         )
     );
@@ -677,7 +677,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
             )
         )
         {
-            tSvm.ref().boundaryField()[patchi] = vector::zero;
+            tSvm.ref().boundaryField()[patchi] = Zero;
         }
     }
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
index 2f5f833d20..7929a9d1ad 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
@@ -99,7 +99,7 @@ Foam::phaseModel::phaseModel
             mesh
         ),
         mesh,
-        dimensionedVector("0", dimVelocity/dimTime, vector::zero)
+        dimensionedVector("0", dimVelocity/dimTime, Zero)
     ),
     alphaPhi_
     (
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 4cddb12921..bbcc36f4e7 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -264,7 +264,7 @@
 
             mSfGradp = pEqnIncomp.flux()/rAUf;
 
-            U = dimensionedVector("U", dimVelocity, vector::zero);
+            U = dimensionedVector("U", dimVelocity, Zero);
 
             phasei = 0;
             forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H
index 40ba336dad..23845a4f75 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H
@@ -49,7 +49,7 @@ volVectorField zeta
         IOobject::AUTO_WRITE
     ),
     mesh,
-    dimensionedVector("zero", dimLength, vector::zero)
+    dimensionedVector("zero", dimLength, Zero)
 );
 
 Info<< "Creating field p_gh\n" << endl;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C
index d4e13d5c7f..f8480dc69b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ Foam::tmp<Foam::volVectorField> Foam::liftModels::noLift::F() const
                 false
             ),
             mesh,
-            dimensionedVector("zero", dimF, vector::zero)
+            dimensionedVector("zero", dimF, Zero)
         )
     );
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
index 5845e3569a..2a65c1e1c6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ Foam::turbulentDispersionModels::noTurbulentDispersion::F() const
                     mesh
                 ),
                 mesh,
-                dimensionedVector("zero", dimF, vector::zero)
+                dimensionedVector("zero", dimF, Zero)
             )
         );
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
index 8de7e30260..b35bd0ef8f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ Foam::wallLubricationModels::noWallLubrication::Fi() const
                 false
             ),
             mesh,
-            dimensionedVector("zero", dimF, vector::zero)
+            dimensionedVector("zero", dimF, Zero)
         )
     );
 }
@@ -108,7 +108,7 @@ Foam::wallLubricationModels::noWallLubrication::F() const
                 false
             ),
             mesh,
-            dimensionedVector("zero", dimF, vector::zero)
+            dimensionedVector("zero", dimF, Zero)
         )
     );
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index 6ea8dadf59..b9859eb41d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -317,7 +317,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::F
                     false
                 ),
                 this->mesh_,
-                dimensionedVector("zero", liftModel::dimF, vector::zero)
+                dimensionedVector("zero", liftModel::dimF, Zero)
             )
         );
     }
@@ -533,7 +533,7 @@ Foam::volVectorField& Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setF
                     false
                 ),
                 this->mesh_,
-                dimensionedVector("zero", liftModel::dimF, vector::zero)
+                dimensionedVector("zero", liftModel::dimF, Zero)
             )
         );
     }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index de31cefaa3..4563f191b9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -173,7 +173,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
             fluid.mesh()
         ),
         fluid.mesh(),
-        dimensionedVector("0", dimAcceleration, vector::zero)
+        dimensionedVector("0", dimAcceleration, Zero)
     ),
     divU_(NULL),
     turbulence_
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index a9eb50af35..9d3b53c782 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -144,7 +144,7 @@ Foam::RASModels::phasePressureModel::R() const
             (
                 "R",
                 dimensionSet(0, 2, -2, 0, 0),
-                symmTensor::zero
+                Zero
             )
         )
     );
@@ -227,7 +227,7 @@ Foam::RASModels::phasePressureModel::devRhoReff() const
             (
                 "R",
                 rho_.dimensions()*dimensionSet(0, 2, -2, 0, 0),
-                symmTensor::zero
+                Zero
             )
         )
     );
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C
index d4e13d5c7f..f8480dc69b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ Foam::tmp<Foam::volVectorField> Foam::liftModels::noLift::F() const
                 false
             ),
             mesh,
-            dimensionedVector("zero", dimF, vector::zero)
+            dimensionedVector("zero", dimF, Zero)
         )
     );
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
index 5845e3569a..2a65c1e1c6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ Foam::turbulentDispersionModels::noTurbulentDispersion::F() const
                     mesh
                 ),
                 mesh,
-                dimensionedVector("zero", dimF, vector::zero)
+                dimensionedVector("zero", dimF, Zero)
             )
         );
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
index 8de7e30260..b35bd0ef8f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ Foam::wallLubricationModels::noWallLubrication::Fi() const
                 false
             ),
             mesh,
-            dimensionedVector("zero", dimF, vector::zero)
+            dimensionedVector("zero", dimF, Zero)
         )
     );
 }
@@ -108,7 +108,7 @@ Foam::wallLubricationModels::noWallLubrication::F() const
                 false
             ),
             mesh,
-            dimensionedVector("zero", dimF, vector::zero)
+            dimensionedVector("zero", dimF, Zero)
         )
     );
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index 3c8b16027f..0c5906d905 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -150,7 +150,7 @@ Foam::RASModels::phasePressureModel::R() const
             (
                 "R",
                 dimensionSet(0, 2, -2, 0, 0),
-                symmTensor::zero
+                Zero
             )
         )
     );
@@ -233,7 +233,7 @@ Foam::RASModels::phasePressureModel::devRhoReff() const
             (
                 "R",
                 rho_.dimensions()*dimensionSet(0, 2, -2, 0, 0),
-                symmTensor::zero
+                Zero
             )
         )
     );
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
index 57f4e68589..49d62b804e 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,11 +42,11 @@ tractionDisplacementFvPatchVectorField
 )
 :
     fixedGradientFvPatchVectorField(p, iF),
-    traction_(p.size(), vector::zero),
+    traction_(p.size(), Zero),
     pressure_(p.size(), 0.0)
 {
     fvPatchVectorField::operator=(patchInternalField());
-    gradient() = vector::zero;
+    gradient() = Zero;
 }
 
 
@@ -78,7 +78,7 @@ tractionDisplacementFvPatchVectorField
     pressure_("pressure", dict, p.size())
 {
     fvPatchVectorField::operator=(patchInternalField());
-    gradient() = vector::zero;
+    gradient() = Zero;
 }
 
 
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/kineticEnergyLimiter.H b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/kineticEnergyLimiter.H
index 169c7f229f..589566e3a1 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/kineticEnergyLimiter.H
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/kineticEnergyLimiter.H
@@ -14,6 +14,6 @@ if (!(runTime.timeIndex() % 5))
     if (smi < -SMALL)
     {
         Info<< "Resetting Dcorr to 0" << endl;
-        Dcorr == dimensionedVector("0", Dcorr.dimensions(), vector::zero);
+        Dcorr == dimensionedVector("0", Dcorr.dimensions(), Zero);
     }
 }
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
index debf1ee9a3..33c1e8a8c6 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,11 +42,11 @@ tractionDisplacementCorrectionFvPatchVectorField
 )
 :
     fixedGradientFvPatchVectorField(p, iF),
-    traction_(p.size(), vector::zero),
+    traction_(p.size(), Zero),
     pressure_(p.size(), 0.0)
 {
     fvPatchVectorField::operator=(patchInternalField());
-    gradient() = vector::zero;
+    gradient() = Zero;
 }
 
 
@@ -78,7 +78,7 @@ tractionDisplacementCorrectionFvPatchVectorField
     pressure_("pressure", dict, p.size())
 {
     fvPatchVectorField::operator=(patchInternalField());
-    gradient() = vector::zero;
+    gradient() = Zero;
 }
 
 
diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C
index 7807287900..094ea00f10 100644
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/applications/test/PatchTools/Test-PatchTools.C
@@ -66,7 +66,7 @@ using namespace Foam;
 //    //    (note:without calculating pointNormals
 //    //     to avoid them being stored)
 //
-//    tmp<pointField> textrudeN(new pointField(p.nPoints(), vector::zero));
+//    tmp<pointField> textrudeN(new pointField(p.nPoints(), Zero));
 //    pointField& extrudeN = textrudeN();
 //    {
 //        const faceList& localFaces = p.localFaces();
@@ -123,7 +123,7 @@ using namespace Foam;
 //        globalData.globalPointTransformedSlaves();
 //
 //
-//    pointField coupledPointNormals(map.constructSize(), vector::zero);
+//    pointField coupledPointNormals(map.constructSize(), Zero);
 //
 //    forAll(meshPoints, patchPointI)
 //    {
diff --git a/applications/test/mappedPatch/Test-MappedPatch.C b/applications/test/mappedPatch/Test-MappedPatch.C
index 9f0258dfec..d1a28a823a 100644
--- a/applications/test/mappedPatch/Test-MappedPatch.C
+++ b/applications/test/mappedPatch/Test-MappedPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedVector("zero", dimLength, vector::zero),
+        dimensionedVector("zero", dimLength, Zero),
         patchFieldTypes
     );
 
diff --git a/applications/test/momentOfInertia/Test-momentOfInertia.C b/applications/test/momentOfInertia/Test-momentOfInertia.C
index a1d9c7c133..726454e3a1 100644
--- a/applications/test/momentOfInertia/Test-momentOfInertia.C
+++ b/applications/test/momentOfInertia/Test-momentOfInertia.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011-2013 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
 
         point Cf = f.centre(pts);
 
-        tensor J = tensor::zero;
+        tensor J = Zero;
 
         J = f.inertia(pts, Cf, density);
 
@@ -141,8 +141,8 @@ int main(int argc, char *argv[])
         tetFaces[3] = triFace(0, 1, 3);
 
         scalar m = 0.0;
-        vector cM = vector::zero;
-        tensor J = tensor::zero;
+        vector cM = Zero;
+        tensor J = Zero;
 
         momentOfInertia::massPropertiesSolid(pts, tetFaces, density, m, cM, J);
 
diff --git a/applications/test/passiveParticle/Test-passiveParticle.C b/applications/test/passiveParticle/Test-passiveParticle.C
index 05c28602d2..68bea7b8ef 100644
--- a/applications/test/passiveParticle/Test-passiveParticle.C
+++ b/applications/test/passiveParticle/Test-passiveParticle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
         Pout<< "Starting particles:" << particles.size() << endl;
 
         Pout<< "Adding a particle." << endl;
-        particles.addParticle(new passiveParticle(mesh, vector::zero, -1));
+        particles.addParticle(new passiveParticle(mesh, Zero, -1));
 
         forAllConstIter(passiveParticleCloud, particles, iter)
         {
diff --git a/applications/test/pointField/Test-PointField.C b/applications/test/pointField/Test-PointField.C
index b2524a2044..020fdb0e60 100644
--- a/applications/test/pointField/Test-PointField.C
+++ b/applications/test/pointField/Test-PointField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
             IOobject::AUTO_WRITE
         ),
         pMesh,
-        dimensionedVector("fvmU", dimLength, vector::zero),
+        dimensionedVector("fvmU", dimLength, Zero),
         pointPatchVectorField::calculatedType()
     );
 
diff --git a/applications/test/primitivePatch/Test-PrimitivePatch.C b/applications/test/primitivePatch/Test-PrimitivePatch.C
index 3f5e9161e3..c575782f4c 100644
--- a/applications/test/primitivePatch/Test-PrimitivePatch.C
+++ b/applications/test/primitivePatch/Test-PrimitivePatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,7 +156,7 @@ void writeEdgeFaces
 
     OFstream efStream("edgeFaces.obj");
 
-    pointField ctrs(localFaces.size(), vector::zero);
+    pointField ctrs(localFaces.size(), Zero);
 
     forAll(localFaces, faceI)
     {
@@ -188,7 +188,7 @@ void writeFaceFaces
 
     OFstream ffStream("faceFaces.obj");
 
-    pointField ctrs(localFaces.size(), vector::zero);
+    pointField ctrs(localFaces.size(), Zero);
 
     forAll(localFaces, faceI)
     {
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 8be739c5ff..0f6ad2efe3 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -1075,25 +1075,25 @@ int main(int argc, char *argv[])
     (
         subsetter.subMesh(),
         map,
-        vector::zero
+        Zero
     );
     initCreatedPatches<volSphericalTensorField>
     (
         subsetter.subMesh(),
         map,
-        sphericalTensor::zero
+        Zero
     );
     initCreatedPatches<volSymmTensorField>
     (
         subsetter.subMesh(),
         map,
-        symmTensor::zero
+        Zero
     );
     initCreatedPatches<volTensorField>
     (
         subsetter.subMesh(),
         map,
-        tensor::zero
+        Zero
     );
 
     initCreatedPatches<surfaceScalarField>
@@ -1106,25 +1106,25 @@ int main(int argc, char *argv[])
     (
         subsetter.subMesh(),
         map,
-        vector::zero
+        Zero
     );
     initCreatedPatches<surfaceSphericalTensorField>
     (
         subsetter.subMesh(),
         map,
-        sphericalTensor::zero
+        Zero
     );
     initCreatedPatches<surfaceSymmTensorField>
     (
         subsetter.subMesh(),
         map,
-        symmTensor::zero
+        Zero
     );
     initCreatedPatches<surfaceTensorField>
     (
         subsetter.subMesh(),
         map,
-        tensor::zero
+        Zero
     );
 
 
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index 83ffb09f39..b95acd7978 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -213,7 +213,7 @@ void ReadVertices
 
     // Convert to foamPoints
     foamPoints.setSize(nVertices);
-    foamPoints = vector::zero;
+    foamPoints = Zero;
     foamPointMap.setSize(nVertices);
 
     forAll(foamPointMap, i)
diff --git a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
index c10b7c761d..4ee10d1f15 100644
--- a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
+++ b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
     // We ignore the first layer of points in i and j the biconic meshes
     label nPointsij = (iPoints - 1)*(jPoints - 1);
 
-    pointField points(nPointsij, vector::zero);
+    pointField points(nPointsij, Zero);
 
     for (direction comp = 0; comp < 2; comp++)
     {
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    pointField pointsWedge(nPointsij*2, vector::zero);
+    pointField pointsWedge(nPointsij*2, Zero);
 
     fileName pointsFile(runTime.constantPath()/"points.tmp");
     OFstream pFile(pointsFile);
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 10a4b189b5..1d28f046dc 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -1089,9 +1089,9 @@ int main(int argc, char *argv[])
                     mesh.boundaryMesh(),
                     neighbPatchName,
                     cyclicPolyPatch::NOORDERING,
-                    vector::zero,
-                    vector::zero,
-                    vector::zero
+                    Zero,
+                    Zero,
+                    Zero
                 );
             }
             else
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index ac12a39f4e..8c5c0c458c 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -2296,7 +2296,7 @@ int main(int argc, char *argv[])
     // Calculate region normals by reducing local region normals
     pointField localRegionNormals(localToGlobalRegion.size());
     {
-        pointField localSum(localToGlobalRegion.size(), vector::zero);
+        pointField localSum(localToGlobalRegion.size(), Zero);
 
         forAll(pointLocalRegions, faceI)
         {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 72a0b76e55..c1bf4ed7fe 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -533,7 +533,7 @@ bool Foam::backgroundMeshDecomposition::refineCell
 //        pointField samplePoints
 //        (
 //            volRes_*volRes_*volRes_,
-//            vector::zero
+//            Zero
 //        );
 //
 //        // scalar sampleVol = cellBb.volume()/samplePoints.size();
@@ -1238,7 +1238,7 @@ Foam::backgroundMeshDecomposition::intersectsProcessors
         const point& e = ends[sI];
 
         // Dummy point for treeBoundBox::intersects
-        point p(vector::zero);
+        point p(Zero);
 
         label nCandidates = 0;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C
index bbd52ecfe7..191ddf53a9 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Foam::cellAspectRatioControl::cellAspectRatioControl
         aspectRatioDict_.lookupOrDefault<vector>
         (
             "aspectRatioDirection",
-            vector::zero
+            Zero
         )
     )
 {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
index 9e3e9e82ad..4283fb7c35 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
@@ -177,7 +177,7 @@ Foam::tensor Foam::cellShapeControl::cellAlignment(const point& pt) const
 
     shapeControlMesh_.barycentricCoords(pt, bary, ch);
 
-    tensor alignment = tensor::zero;
+    tensor alignment = Zero;
 
     if (shapeControlMesh_.dimension() < 3 || shapeControlMesh_.is_infinite(ch))
     {
@@ -249,7 +249,7 @@ void Foam::cellShapeControl::cellSizeAndAlignment
 
     shapeControlMesh_.barycentricCoords(pt, bary, ch);
 
-    alignment = tensor::zero;
+    alignment = Zero;
     size = 0;
 
     if (shapeControlMesh_.dimension() < 3 || shapeControlMesh_.is_infinite(ch))
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
index 24916fa50b..8c597b90f1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
@@ -601,7 +601,7 @@ void Foam::cellShapeControlMesh::distribute
 
 Foam::tensorField Foam::cellShapeControlMesh::dumpAlignments() const
 {
-    tensorField alignmentsTmp(number_of_vertices(), tensor::zero);
+    tensorField alignmentsTmp(number_of_vertices(), Zero);
 
     label count = 0;
     for
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
index 921298660d..b2ed90169f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ Foam::fileControl::~fileControl()
 //
 //    label nearest = 0;
 //
-//    tensor alignment = Foam::tensor::zero;
+//    tensor alignment = Zero;
 //    forAll(bary, pI)
 //    {
 //        //alignment += bary[pI]*ch->vertex(pI)->alignment();
@@ -155,7 +155,7 @@ Foam::fileControl::~fileControl()
 //        size += bary[pI]*ch->vertex(pI)->size();
 //    }
 //
-////    alignment = Foam::tensor::zero;
+////    alignment = Zero;
 ////    forAll(bary, pI)
 ////    {
 ////        alignment += bary[pI]*ch->vertex(pI)->alignment();
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
index 851a773b06..ef565a405f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ addToRunTimeSelectionTable
 //
 //    const tensor Rp = rotationTensor(vector(0,0,1), np);
 //
-//    vector na = vector::zero;
+//    vector na = Zero;
 //
 //    scalar smallestAngle = GREAT;
 //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 601fcc95a7..3b892fc44a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1080,7 +1080,7 @@ void Foam::conformalVoronoiMesh::move()
     vectorField displacementAccumulator
     (
         number_of_vertices(),
-        vector::zero
+        Zero
     );
 
     PackedBoolList pointToBeRetained
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 638ae6a51b..e8013eb1c4 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -1581,7 +1581,7 @@ void Foam::conformalVoronoiMesh::limitDisplacement
     // Do not allow infinite recursion
     if (callCount > 7)
     {
-        displacement = vector::zero;
+        displacement = Zero;
         return;
     }
 
@@ -1630,7 +1630,7 @@ void Foam::conformalVoronoiMesh::limitDisplacement
             if (magSqr(pt - surfHit.hitPoint()) <= searchDistanceSqr)
             {
                 // Cannot limit displacement, point closer than tolerance
-                displacement = vector::zero;
+                displacement = Zero;
                 return;
             }
         }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
index 56c5929343..826372dab3 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -200,8 +200,8 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
         Foam::point externalPtD;
         Foam::point externalPtE;
 
-        vector convexEdgePlaneCNormal(vector::zero);
-        vector convexEdgePlaneDNormal(vector::zero);
+        vector convexEdgePlaneCNormal(Zero);
+        vector convexEdgePlaneDNormal(Zero);
 
         const labelList& concaveEdgeNormals = edgeNormals[concaveEdgeI];
         const labelList& convexEdgeANormals = edgeNormals[convexEdgesI[0]];
@@ -632,8 +632,8 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
         Foam::point externalPtD;
         Foam::point externalPtE;
 
-        vector concaveEdgePlaneCNormal(vector::zero);
-        vector concaveEdgePlaneDNormal(vector::zero);
+        vector concaveEdgePlaneCNormal(Zero);
+        vector concaveEdgePlaneDNormal(Zero);
 
         const labelList& convexEdgeNormals = edgeNormals[convexEdgeI];
         const labelList& concaveEdgeANormals = edgeNormals[concaveEdgesI[0]];
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
index 14695671d9..2b1d991a69 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,8 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-//#include "indexedCellChecks.H"
-
 template<class Gt, class Cb>
 Foam::tetCell CGAL::indexedCell<Gt, Cb>::unsortedVertexGlobalIndices
 (
@@ -578,8 +576,8 @@ inline bool CGAL::indexedCell<Gt, Cb>::potentialCoplanarCell() const
 
     if (nMasters == 2 && nSlaves == 2)
     {
-        Foam::vector vp0(Foam::vector::zero);
-        Foam::vector vp1(Foam::vector::zero);
+        Foam::vector vp0(Foam::Zero);
+        Foam::vector vp1(Foam::Zero);
 
         if
         (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index f79c96654d..47efc0e8fa 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -43,7 +43,7 @@ void Foam::conformationSurfaces::hasBoundedVolume
     List<volumeType>& referenceVolumeTypes
 ) const
 {
-    vector sum(vector::zero);
+    vector sum(Zero);
     label totalTriangles = 0;
 
     forAll(surfaces_, s)
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
index 5ce01e23b5..e2d1001504 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -416,7 +416,7 @@ bool Foam::autoDensity::fillBox
 
             label nLine = 6*(surfRes_ - 2);
 
-            pointField linePoints(nLine, vector::zero);
+            pointField linePoints(nLine, Zero);
 
             scalarField lineSizes(nLine, 0.0);
 
@@ -532,7 +532,7 @@ bool Foam::autoDensity::fillBox
         pointField samplePoints
         (
             volRes_*volRes_*volRes_,
-            vector::zero
+            Zero
         );
 
         vector delta = span/volRes_;
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
index 8a0443e1a8..9a56358064 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
@@ -862,7 +862,7 @@ void Foam::CV2D::newPoints()
             edgei = 0;
 
             // Initialise the displacement for the centre and sum-weights
-            vector2D disp = vector2D::zero;
+            vector2D disp = Zero;
             scalar sumw = 0;
 
             do
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
index 91da90bf77..e8caabad93 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
@@ -426,7 +426,7 @@ Foam::shortEdgeFilter2D::filter()
 
     label totalNewPoints = points.size() - nPointsToRemove;
 
-    pointField newPoints(totalNewPoints, vector::zero);
+    pointField newPoints(totalNewPoints, Zero);
     labelList newPointNumbers(points.size(), -1);
     label numberRemoved = 0;
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index 2060a4687e..5b7bb7708f 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -285,7 +285,7 @@ namespace Foam
                 label n = 0;
 
                 // Extract for every face the i'th position
-                pointField ptsAtIndex(pts.size(), vector::zero);
+                pointField ptsAtIndex(pts.size(), Zero);
                 forAll(cpp, faceI)
                 {
                     const pointField& facePts = pts[faceI];
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index f30956dddb..836e84a6ab 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -704,7 +704,7 @@ void Foam::vtkPV3Foam::renderPatchNames(vtkRenderer* renderer, const bool show)
             // Create storage for additional zone centres
             forAll(zoneNFaces, zoneI)
             {
-                zoneCentre[patchI].append(vector::zero);
+                zoneCentre[patchI].append(Zero);
             }
 
             // Do averaging per individual zone
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index 2bfefc267c..a55567dbe1 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -708,7 +708,7 @@ void Foam::vtkPVFoam::renderPatchNames
             // Create storage for additional zone centres
             forAll(zoneNFaces, zoneI)
             {
-                zoneCentre[patchI].append(vector::zero);
+                zoneCentre[patchI].append(Zero);
             }
 
             // Do averaging per individual zone
diff --git a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
index 7d58220a59..89fcc68dbc 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
+++ b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
                 (
                     "wallGradU",
                     U.dimensions()/dimLength,
-                    vector::zero
+                    Zero
                 )
             );
 
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
index b834cd1871..89c9e9e58a 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
+++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
             (
                 "wallShearStress",
                 sqr(dimLength)/sqr(dimTime),
-                vector::zero
+                Zero
             )
         );
 
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index cdafdf3b20..9d247dabd6 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -738,7 +738,7 @@ int main(int argc, char *argv[])
     {
         const boundBox& box = mesh.bounds();
         const Vector<label>& dirs = mesh.geometricD();
-        vector emptyDir = vector::zero;
+        vector emptyDir = Zero;
         forAll(dirs, i)
         {
             if (dirs[i] == -1)
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index b539946bc6..1acf1835a6 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -504,7 +504,7 @@ int main(int argc, char *argv[])
     label nFeatEds = inter.cutEdges().size();
 
     DynamicList<vector> normals(2*nFeatEds);
-    vectorField edgeDirections(nFeatEds, vector::zero);
+    vectorField edgeDirections(nFeatEds, Zero);
     DynamicList<extendedFeatureEdgeMesh::sideVolumeType> normalVolumeTypes
     (
         2*nFeatEds
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 2882e6af2a..cf8373b4c3 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -196,7 +196,7 @@ vectorField calcVertexNormals(const triSurface& surf)
 
     Info<< "Calculating vertex normals" << endl;
 
-    vectorField pointNormals(surf.nPoints(), vector::zero);
+    vectorField pointNormals(surf.nPoints(), Zero);
 
     const pointField& points = surf.points();
     const labelListList& pointFaces = surf.pointFaces();
@@ -276,8 +276,8 @@ triSurfacePointScalarField calcCurvature
         const edgeList fEdges = f.edges();
 
         // Calculate the edge vectors and the normal differences
-        vectorField edgeVectors(f.size(), vector::zero);
-        vectorField normalDifferences(f.size(), vector::zero);
+        vectorField edgeVectors(f.size(), Zero);
+        vectorField normalDifferences(f.size(), Zero);
 
         forAll(fEdges, feI)
         {
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index fa714c2bb5..d41147e0d2 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011-2015 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -83,14 +83,14 @@ int main(int argc, char *argv[])
     const fileName surfFileName = args[1];
     const scalar density = args.optionLookupOrDefault("density", 1.0);
 
-    vector refPt = vector::zero;
+    vector refPt = Zero;
     bool calcAroundRefPt = args.optionReadIfPresent("referencePoint", refPt);
 
     triSurface surf(surfFileName);
 
     scalar m = 0.0;
-    vector cM = vector::zero;
-    tensor J = tensor::zero;
+    vector cM = Zero;
+    tensor J = Zero;
 
     if (args.optionFound("shellProperties"))
     {
diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
index 46bbfdf395..9daa179437 100644
--- a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
+++ b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
@@ -56,7 +56,7 @@ tmp<pointField> avg
 {
     const labelListList& pointEdges = s.pointEdges();
 
-    tmp<pointField> tavg(new pointField(s.nPoints(), vector::zero));
+    tmp<pointField> tavg(new pointField(s.nPoints(), Zero));
     pointField& avg = tavg.ref();
 
     forAll(pointEdges, vertI)
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index e3a4bc56de..3e69502c79 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -558,7 +558,7 @@ void calcPointVecs
 
             // Determine vector as average of the vectors in the two faces.
             // If there is only one face available use only one vector.
-            vector midVec(vector::zero);
+            vector midVec(Zero);
 
             if (face0I != -1)
             {
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
index cd61a57988..3973e00dac 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
@@ -77,6 +77,9 @@ public:
         //- Construct null
         inline DiagTensor();
 
+        //- Construct initialized to zero
+        inline DiagTensor(const Foam::zero);
+
         //- Construct given VectorSpace
         template<class Cmpt2>
         inline DiagTensor(const VectorSpace<DiagTensor<Cmpt2>, Cmpt2, 3>&);
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
index 49ed7b8998..3faf0a22e7 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
@@ -33,6 +33,13 @@ inline Foam::DiagTensor<Cmpt>::DiagTensor()
 {}
 
 
+template<class Cmpt>
+inline Foam::DiagTensor<Cmpt>::DiagTensor(const Foam::zero)
+:
+    VectorSpace<DiagTensor<Cmpt>, Cmpt, 3>(Zero)
+{}
+
+
 template<class Cmpt>
 template<class Cmpt2>
 inline Foam::DiagTensor<Cmpt>::DiagTensor
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
index 8128591b42..0d326caa8c 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
@@ -57,7 +57,7 @@ Foam::anisotropicFilter::anisotropicFilter
             mesh
         ),
         mesh,
-        dimensionedVector("zero", dimLength*dimLength, vector::zero),
+        dimensionedVector("zero", dimLength*dimLength, Zero),
         calculatedFvPatchVectorField::typeName
     )
 {
@@ -94,7 +94,7 @@ Foam::anisotropicFilter::anisotropicFilter
             mesh
         ),
         mesh,
-        dimensionedVector("zero", dimLength*dimLength, vector::zero),
+        dimensionedVector("zero", dimLength*dimLength, Zero),
         calculatedFvPatchScalarField::typeName
     )
 {
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index 979bd51893..db3e262477 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -39,7 +39,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF),
-    tau0_(vector::zero)
+    tau0_(Zero)
 {}
 
 
@@ -51,7 +51,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF),
-    tau0_(dict.lookupOrDefault<vector>("tau", vector::zero))
+    tau0_(dict.lookupOrDefault<vector>("tau", Zero))
 {
     fvPatchField<vector>::operator=(patchInternalField());
 }
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
index cb7a802655..2e60815a41 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
@@ -240,7 +240,7 @@ Foam::laminar<BasicTurbulenceModel>::R() const
             this->mesh_,
             dimensionedSymmTensor
             (
-                "R", sqr(this->U_.dimensions()), symmTensor::zero
+                "R", sqr(this->U_.dimensions()), Zero
             )
         )
     );
diff --git a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
index 409e9e8ca9..c38f806e26 100644
--- a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
@@ -67,7 +67,7 @@ Foam::nonlinearEddyViscosity<BasicTurbulenceModel>::nonlinearEddyViscosity
         (
             "nonlinearStress",
             sqr(dimVelocity),
-            symmTensor::zero
+            Zero
         )
     )
 {}
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index aed63e9f62..29b9450f55 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -557,7 +557,7 @@ void Foam::boundaryMesh::read(const polyMesh& mesh)
         {
             const face& f = msh[faceI];
 
-            point ctr(vector::zero);
+            point ctr(Zero);
 
             forAll(f, fp)
             {
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
index d2e00ec96f..fc066d7e9e 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -203,7 +203,7 @@ void extrudePatchMesh::extrudeMesh(const List<polyPatch*>& regionPatches)
         // Calculate region normals by reducing local region normals
         pointField localRegionNormals(localToGlobalRegion.size());
         {
-            pointField localSum(localToGlobalRegion.size(), vector::zero);
+            pointField localSum(localToGlobalRegion.size(), Zero);
 
             forAll(pointLocalRegions, faceI)
             {
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index 388a9f2ff5..c499fbcb5d 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -1208,7 +1208,7 @@ bool Foam::cellCuts::loopAnchorConsistent
 
 
     // Get average position of anchor points.
-    vector avg(vector::zero);
+    vector avg(Zero);
 
     forAll(anchorPoints, ptI)
     {
diff --git a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
index 2b1310ab91..230948a42b 100644
--- a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -384,7 +384,7 @@ bool Foam::geomCellLooper::cut
 
     // Get points on loop and centre of loop
     pointField loopPoints(localLoop.size());
-    point ctr(vector::zero);
+    point ctr(Zero);
 
     forAll(localLoop, i)
     {
diff --git a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H
index c2c77f7384..d1c51df3f1 100644
--- a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H
+++ b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ License
 inline Foam::directionInfo::directionInfo()
 :
     index_(-3),
-    n_(vector::zero)
+    n_(Zero)
 {}
 
 
diff --git a/src/dynamicMesh/meshCut/refineCell/refineCell.C b/src/dynamicMesh/meshCut/refineCell/refineCell.C
index 5517d34a66..bcc88ca8e1 100644
--- a/src/dynamicMesh/meshCut/refineCell/refineCell.C
+++ b/src/dynamicMesh/meshCut/refineCell/refineCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 Foam::refineCell::refineCell()
 :
     cellNo_(-1),
-    direction_(vector::zero)
+    direction_(Zero)
 {}
 
 
diff --git a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
index 2bd277acac..8738f58979 100644
--- a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
+++ b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
@@ -63,9 +63,9 @@ void Foam::polyMeshGeometry::updateFaceCentresAndAreas
         }
         else
         {
-            vector sumN = vector::zero;
+            vector sumN = Zero;
             scalar sumA = 0.0;
-            vector sumAc = vector::zero;
+            vector sumAc = Zero;
 
             point fCentre = p[f[0]];
             for (label pi = 1; pi < nPoints; pi++)
@@ -102,7 +102,7 @@ void Foam::polyMeshGeometry::updateCellCentresAndVols
 )
 {
     // Clear the fields for accumulation
-    UIndirectList<vector>(cellCentres_, changedCells) = vector::zero;
+    UIndirectList<vector>(cellCentres_, changedCells) = Zero;
     UIndirectList<scalar>(cellVolumes_, changedCells) = 0.0;
 
     const labelList& own = mesh_.faceOwner();
@@ -111,7 +111,7 @@ void Foam::polyMeshGeometry::updateCellCentresAndVols
     // first estimate the approximate cell centre as the average of face centres
 
     vectorField cEst(mesh_.nCells());
-    UIndirectList<vector>(cEst, changedCells) = vector::zero;
+    UIndirectList<vector>(cEst, changedCells) = Zero;
     scalarField nCellFaces(mesh_.nCells());
     UIndirectList<scalar>(nCellFaces, changedCells) = 0.0;
 
@@ -1693,7 +1693,7 @@ bool Foam::polyMeshGeometry::checkFaceTwist
 
         if (f.size() > 3)
         {
-            vector nf(vector::zero);
+            vector nf(Zero);
 
             if (mesh.isInternalFace(faceI))
             {
@@ -2118,7 +2118,7 @@ bool Foam::polyMeshGeometry::checkCellDeterminant
     {
         const cell& cFaces = cells[affectedCells[i]];
 
-        tensor areaSum(tensor::zero);
+        tensor areaSum(Zero);
         scalar magAreaSum = 0;
 
         forAll(cFaces, cFaceI)
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index 37b1cab458..8be41984af 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -184,7 +184,7 @@ void Foam::faceCoupleInfo::writePointsFaces() const
                     << " at position " << c[cutFaceI].centre(c.points())
                     << endl;
 
-                equivMasterFaces[cutFaceI] = vector::zero;
+                equivMasterFaces[cutFaceI] = Zero;
             }
         }
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H
index 3ec0ed0e7a..61fef2b33c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
         //- Construct null.  Used only for list construction
         polyAddPoint()
         :
-            p_(vector::zero),
+            p_(Zero),
             masterPointID_(-1),
             zoneID_(-1),
             inCell_(false)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index 7ee5f74e14..5136f38376 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -209,7 +209,7 @@ void Foam::edgeCollapser::collapseToEdge
 
     if (!maxPriorityPts.empty())
     {
-        Foam::point averagePt(vector::zero);
+        Foam::point averagePt(Zero);
 
         forAll(maxPriorityPts, ptI)
         {
@@ -259,7 +259,7 @@ void Foam::edgeCollapser::collapseToEdge
 
     if (!maxPriorityPts.empty())
     {
-        Foam::point averagePt(vector::zero);
+        Foam::point averagePt(Zero);
 
         forAll(maxPriorityPts, ptI)
         {
@@ -321,7 +321,7 @@ void Foam::edgeCollapser::collapseToPoint
 
     if (!maxPriorityPts.empty())
     {
-        Foam::point averagePt(vector::zero);
+        Foam::point averagePt(Zero);
 
         forAll(maxPriorityPts, ptI)
         {
@@ -580,7 +580,7 @@ Foam::edgeCollapser::collapseType Foam::edgeCollapser::collapseFace
 
     const scalar fA = f.mag(pts);
 
-    vector collapseAxis = vector::zero;
+    vector collapseAxis = Zero;
     scalar aspectRatio = 1.0;
 
     faceCollapseAxisAndAspectRatio(f, fC, collapseAxis, aspectRatio);
@@ -1035,7 +1035,7 @@ Foam::label Foam::edgeCollapser::syncCollapse
     List<pointEdgeCollapse> allEdgeInfo
     (
         mesh_.nEdges(),
-        pointEdgeCollapse(vector::zero, -1, -1)
+        pointEdgeCollapse(Zero, -1, -1)
     );
 
     // Mark selected edges for collapse
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyPoint.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyPoint.H
index 23fa9b348d..efd18fa772 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyPoint.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyPoint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ public:
         polyModifyPoint()
         :
             pointID_(-1),
-            location_(vector::zero),
+            location_(Zero),
             removeFromZone_(false),
             zoneID_(-1),
             inCell_(false)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index f7bd8e4808..d25e88975e 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -3117,7 +3117,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
             }
             else
             {
-                renumberedMeshPoints[newPointI] = vector::zero;
+                renumberedMeshPoints[newPointI] = Zero;
             }
         }
 
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index e937c18d18..f87b08e6e2 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -250,7 +250,7 @@ bool Foam::slidingInterface::projectPoints() const
     if (projectedSlavePointsPtr_) delete projectedSlavePointsPtr_;
 
     projectedSlavePointsPtr_ =
-        new pointField(slavePointFaceHits.size(), vector::zero);
+        new pointField(slavePointFaceHits.size(), Zero);
     pointField& projectedSlavePoints = *projectedSlavePointsPtr_;
 
     // Adjust projection to type of match
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
index 55d2911346..098f7e399e 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ inline Foam::vector Foam::extendedEdgeMesh::edgeDirection
             << e.start() << " " << e.end()
             << exit(FatalError);
 
-        return vector::zero;
+        return Zero;
     }
 }
 
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
index a35d894a13..1f2051a336 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
@@ -166,7 +166,7 @@ void Foam::extendedEdgeMesh::sortPointsAndEdges
                 );
         }
 
-        vector fC0tofC1(vector::zero);
+        vector fC0tofC1(Zero);
 
         if (eFaces.size() == 2)
         {
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
index 103d6c78cd..55cc8ffa62 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
+++ b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,7 +133,7 @@ inline Foam::vector Foam::extendedFeatureEdgeMesh::edgeDirection
             << e.start() << " " << e.end()
             << exit(FatalError);
 
-        return vector::zero;
+        return Zero;
     }
 }
 
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
index 8e9cc5b409..8aba7d0b59 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
@@ -166,7 +166,7 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
                 );
         }
 
-        vector fC0tofC1(vector::zero);
+        vector fC0tofC1(Zero);
 
         if (eFaces.size() == 2)
         {
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index 0c902d6faa..90239b4984 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -423,7 +423,7 @@ void Foam::MRFZone::makeRelative(volVectorField& U) const
         forAll(includedFaces_[patchi], i)
         {
             label patchFacei = includedFaces_[patchi][i];
-            U.boundaryField()[patchi][patchFacei] = vector::zero;
+            U.boundaryField()[patchi][patchFacei] = Zero;
         }
     }
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
index 6b9cc1ca6f..271157b9a6 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
@@ -177,7 +177,7 @@ Foam::tmp<Foam::volVectorField> Foam::MRFZoneList::DDt
                 U.mesh()
             ),
             U.mesh(),
-            dimensionedVector("0", U.dimensions()/dimTime, vector::zero)
+            dimensionedVector("0", U.dimensions()/dimTime, Zero)
         )
     );
     volVectorField& acceleration = tacceleration.ref();
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
index 93944c12bf..7077bc2f6b 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
@@ -62,7 +62,7 @@ Foam::SRF::SRFModel::SRFModel
     origin_("origin", dimLength, lookup("origin")),
     axis_(lookup("axis")),
     SRFModelCoeffs_(subDict(type + "Coeffs")),
-    omega_(dimensionedVector("omega", dimless/dimTime, vector::zero))
+    omega_(dimensionedVector("omega", dimless/dimTime, Zero))
 {
     // Normalise the axis
     axis_ /= mag(axis_);
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
index b463e79d80..bfb1caf470 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ SRFFreestreamVelocityFvPatchVectorField
 :
     inletOutletFvPatchVectorField(p, iF),
     relative_(false),
-    UInf_(vector::zero)
+    UInf_(Zero)
 {}
 
 
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
index 2a17513700..ec59dbedfc 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField
 :
     fixedValueFvPatchVectorField(p, iF),
     relative_(0),
-    inletValue_(p.size(), vector::zero)
+    inletValue_(p.size(), Zero)
 {}
 
 
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
index 411b8dfc6b..ff87ca2e1d 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
@@ -84,7 +84,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
             D_[zoneI].setSize(1);
             F_[zoneI].setSize(1);
 
-            D_[zoneI][0] = tensor::zero;
+            D_[zoneI][0] = Zero;
             D_[zoneI][0].xx() = dXYZ_.value().x();
             D_[zoneI][0].yy() = dXYZ_.value().y();
             D_[zoneI][0].zz() = dXYZ_.value().z();
@@ -92,7 +92,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
             D_[zoneI][0] = coordSys_.R().transformTensor(D_[zoneI][0]);
 
             // leading 0.5 is from 1/2*rho
-            F_[zoneI][0] = tensor::zero;
+            F_[zoneI][0] = Zero;
             F_[zoneI][0].xx() = 0.5*fXYZ_.value().x();
             F_[zoneI][0].yy() = 0.5*fXYZ_.value().y();
             F_[zoneI][0].zz() = 0.5*fXYZ_.value().z();
@@ -111,13 +111,13 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
 
             forAll(cells, i)
             {
-                D_[zoneI][i] = tensor::zero;
+                D_[zoneI][i] = Zero;
                 D_[zoneI][i].xx() = dXYZ_.value().x();
                 D_[zoneI][i].yy() = dXYZ_.value().y();
                 D_[zoneI][i].zz() = dXYZ_.value().z();
 
                 // leading 0.5 is from 1/2*rho
-                F_[zoneI][i] = tensor::zero;
+                F_[zoneI][i] = Zero;
                 F_[zoneI][i].xx() = 0.5*fXYZ_.value().x();
                 F_[zoneI][i].yy() = 0.5*fXYZ_.value().y();
                 F_[zoneI][i].zz() = 0.5*fXYZ_.value().z();
@@ -143,7 +143,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
                 IOobject::NO_WRITE
             ),
             mesh_,
-            dimensionedTensor("0", dXYZ_.dimensions(), tensor::zero)
+            dimensionedTensor("0", dXYZ_.dimensions(), Zero)
         );
         volTensorField Fout
         (
@@ -156,7 +156,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
                 IOobject::NO_WRITE
             ),
             mesh_,
-            dimensionedTensor("0", fXYZ_.dimensions(), tensor::zero)
+            dimensionedTensor("0", fXYZ_.dimensions(), Zero)
         );
 
         UIndirectList<tensor>(Dout, mesh_.cellZones()[cellZoneIDs_[0]]) = D_[0];
@@ -177,7 +177,7 @@ void Foam::porosityModels::DarcyForchheimer::calcForce
 ) const
 {
     scalarField Udiag(U.size(), 0.0);
-    vectorField Usource(U.size(), vector::zero);
+    vectorField Usource(U.size(), Zero);
     const scalarField& V = mesh_.V();
 
     apply(Udiag, Usource, V, rho, mu, U);
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
index 6525c6c2c3..35073cd36a 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
@@ -140,13 +140,13 @@ void Foam::porosityModels::fixedCoeff::calcTransformModelData()
             alpha_[zoneI].setSize(1);
             beta_[zoneI].setSize(1);
 
-            alpha_[zoneI][0] = tensor::zero;
+            alpha_[zoneI][0] = Zero;
             alpha_[zoneI][0].xx() = alphaXYZ_.value().x();
             alpha_[zoneI][0].yy() = alphaXYZ_.value().y();
             alpha_[zoneI][0].zz() = alphaXYZ_.value().z();
             alpha_[zoneI][0] = coordSys_.R().transformTensor(alpha_[zoneI][0]);
 
-            beta_[zoneI][0] = tensor::zero;
+            beta_[zoneI][0] = Zero;
             beta_[zoneI][0].xx() = betaXYZ_.value().x();
             beta_[zoneI][0].yy() = betaXYZ_.value().y();
             beta_[zoneI][0].zz() = betaXYZ_.value().z();
@@ -164,12 +164,12 @@ void Foam::porosityModels::fixedCoeff::calcTransformModelData()
 
             forAll(cells, i)
             {
-                alpha_[zoneI][i] = tensor::zero;
+                alpha_[zoneI][i] = Zero;
                 alpha_[zoneI][i].xx() = alphaXYZ_.value().x();
                 alpha_[zoneI][i].yy() = alphaXYZ_.value().y();
                 alpha_[zoneI][i].zz() = alphaXYZ_.value().z();
 
-                beta_[zoneI][i] = tensor::zero;
+                beta_[zoneI][i] = Zero;
                 beta_[zoneI][i].xx() = betaXYZ_.value().x();
                 beta_[zoneI][i].yy() = betaXYZ_.value().y();
                 beta_[zoneI][i].zz() = betaXYZ_.value().z();
@@ -193,7 +193,7 @@ void Foam::porosityModels::fixedCoeff::calcForce
 ) const
 {
     scalarField Udiag(U.size(), 0.0);
-    vectorField Usource(U.size(), vector::zero);
+    vectorField Usource(U.size(), Zero);
     const scalarField& V = mesh_.V();
     scalar rhoRef = readScalar(coeffs_.lookup("rhoRef"));
 
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
index 631f074ad9..0338e35154 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
@@ -154,7 +154,7 @@ Foam::tmp<Foam::vectorField> Foam::porosityModel::porosityModel::force
 {
     transformModelData();
 
-    tmp<vectorField> tforce(new vectorField(U.size(), vector::zero));
+    tmp<vectorField> tforce(new vectorField(U.size(), Zero));
 
     if (!cellZoneIDs_.empty())
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index 3b3667bbb5..1ce7a7d39f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ activeBaffleVelocityFvPatchVectorField
     maxOpenFractionDelta_(readScalar(dict.lookup("maxOpenFractionDelta"))),
     curTimeIndex_(-1)
 {
-    fvPatchVectorField::operator=(vector::zero);
+    fvPatchVectorField::operator=(Zero);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index cef5a6e58f..04d33d9b8a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -107,7 +107,7 @@ activePressureForceBaffleVelocityFvPatchVectorField
     fBased_(readBool(dict.lookup("forceBased"))),
     baffleActivated_(0)
 {
-    fvPatchVectorField::operator=(vector::zero);
+    fvPatchVectorField::operator=(Zero);
 
     if (p.size() > 0)
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
index e774bf915c..9d6cf1ae72 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
@@ -50,7 +50,7 @@ Description
             this->refValue() =
                 vector(1, 0, 0)
                *min(10, 0.1*this->db().time().value());
-            this->refGrad() = vector::zero;
+            this->refGrad() = Zero;
             this->valueFraction() = 1.0;
         #};
 
@@ -76,7 +76,7 @@ Description
         code
         #{
             this->refValue() = min(10, 0.1*this->db().time().value());
-            this->refGrad() = vector::zero;
+            this->refGrad() = Zero;
             this->valueFraction() = 1.0;
         #};
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
index b432f7884e..72f372ad91 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
@@ -46,9 +46,9 @@ fixedNormalInletOutletVelocityFvPatchVectorField
         fvPatchVectorField::New("fixedValue", p, iF)
     )
 {
-    refValue() = vector::zero;
-    refGrad() = vector::zero;
-    valueFraction() = symmTensor::zero;
+    refValue() = Zero;
+    refGrad() = Zero;
+    valueFraction() = Zero;
 }
 
 
@@ -70,8 +70,8 @@ fixedNormalInletOutletVelocityFvPatchVectorField
 {
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
     refValue() = normalVelocity();
-    refGrad() = vector::zero;
-    valueFraction() = symmTensor::zero;
+    refGrad() = Zero;
+    valueFraction() = Zero;
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
index e5f7a049f4..00f2a8307e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ interstitialInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF),
-    inletVelocity_(p.size(), vector::zero),
+    inletVelocity_(p.size(), Zero),
     alphaName_("alpha")
 {}
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
index 713b94492e..be3e6304b9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -168,7 +168,7 @@ void Foam::mappedVelocityFluxFixedValueFvPatchField::updateCoeffs()
     {
         case mappedPolyPatch::NEARESTFACE:
         {
-            vectorField allUValues(nbrMesh.nFaces(), vector::zero);
+            vectorField allUValues(nbrMesh.nFaces(), Zero);
             scalarField allPhiValues(nbrMesh.nFaces(), 0.0);
 
             forAll(UField.boundaryField(), patchI)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
index da715a6d29..b042164ca7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
@@ -34,7 +34,7 @@ Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
     const DimensionedField<vector, volMesh>& iF
 )
 :
-    fixedValueFvPatchVectorField(p, iF, vector::zero)
+    fixedValueFvPatchVectorField(p, iF, Zero)
 {}
 
 
@@ -45,7 +45,7 @@ Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchVectorField(p, iF, vector::zero)
+    fixedValueFvPatchVectorField(p, iF, Zero)
 {}
 
 
@@ -57,7 +57,7 @@ Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchVectorField(p, iF, vector::zero)
+    fixedValueFvPatchVectorField(p, iF, Zero)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index abf782bc90..4004a66362 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,8 +42,8 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField
     Umean_(0),
     alphaName_("none")
 {
-    refValue() = vector::zero;
-    refGrad() = vector::zero;
+    refValue() = Zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 }
 
@@ -75,8 +75,8 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField
     Umean_(readScalar(dict.lookup("Umean"))),
     alphaName_(dict.lookup("alpha"))
 {
-    refValue() = vector::zero;
-    refGrad() = vector::zero;
+    refValue() = Zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 
     if (dict.found("value"))
@@ -145,7 +145,7 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::updateCoeffs()
     // such that the phase mean is Umean_
     if (Uzgmean >= Umean_)
     {
-        refValue() = vector::zero;
+        refValue() = Zero;
         valueFraction() = 1.0 - Umean_/Uzgmean;
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index 09da151f98..85eae30419 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ phaseHydrostaticPressureFvPatchScalarField
     phaseName_("alpha"),
     rho_(0.0),
     pRefValue_(0.0),
-    pRefPoint_(vector::zero)
+    pRefPoint_(Zero)
 {
     this->refValue() = 0.0;
     this->refGrad() = 0.0;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index a6a18a61cc..a8b69d0040 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField
     inletDir_(p.size())
 {
     refValue() = *this;
-    refGrad() = vector::zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 }
 
@@ -80,7 +80,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField
 {
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
     refValue() = *this;
-    refGrad() = vector::zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index 0e15350470..e691e374b0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ pressureInletOutletParSlipVelocityFvPatchVectorField
     rhoName_("rho")
 {
     refValue() = *this;
-    refGrad() = vector::zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 }
 
@@ -78,7 +78,7 @@ pressureInletOutletParSlipVelocityFvPatchVectorField
 {
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
     refValue() = *this;
-    refGrad() = vector::zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
index 63f9707715..5b28ef39c5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,9 +41,9 @@ pressureInletOutletVelocityFvPatchVectorField
     directionMixedFvPatchVectorField(p, iF),
     phiName_("phi")
 {
-    refValue() = vector::zero;
-    refGrad() = vector::zero;
-    valueFraction() = symmTensor::zero;
+    refValue() = Zero;
+    refGrad() = Zero;
+    valueFraction() = Zero;
 }
 
 
@@ -88,11 +88,11 @@ pressureInletOutletVelocityFvPatchVectorField
     }
     else
     {
-        refValue() = vector::zero;
+        refValue() = Zero;
     }
 
-    refGrad() = vector::zero;
-    valueFraction() = symmTensor::zero;
+    refGrad() = Zero;
+    valueFraction() = Zero;
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index 70ce9adedc..79dd6a8c92 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField
     rhoName_("rho")
 {
     refValue() = *this;
-    refGrad() = vector::zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 }
 
@@ -78,7 +78,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField
 {
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
     refValue() = *this;
-    refGrad() = vector::zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index 4262a54a3f..461481f5fb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -39,7 +39,7 @@ rotatingWallVelocityFvPatchVectorField
 :
     fixedValueFvPatchField<vector>(p, iF),
     origin_(),
-    axis_(vector::zero),
+    axis_(Zero),
     omega_(0)
 {}
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index fb17d580b6..d2cf3bff2b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,13 +41,13 @@ supersonicFreestreamFvPatchVectorField
     TName_("T"),
     pName_("p"),
     psiName_("thermo:psi"),
-    UInf_(vector::zero),
+    UInf_(Zero),
     pInf_(0),
     TInf_(0),
     gamma_(0)
 {
     refValue() = patchInternalField();
-    refGrad() = vector::zero;
+    refGrad() = Zero;
     valueFraction() = 1;
 }
 
@@ -82,7 +82,7 @@ supersonicFreestreamFvPatchVectorField
     }
 
     refValue() = *this;
-    refGrad() = vector::zero;
+    refGrad() = Zero;
     valueFraction() = 1;
 
     if (pInf_ < SMALL)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index e43b61dede..6eea5de3bc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ uniformDensityHydrostaticPressureFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     rho_(0.0),
     pRefValue_(0.0),
-    pRefPoint_(vector::zero)
+    pRefPoint_(Zero)
 {}
 
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
index 80054e1849..c0d37aa177 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
@@ -88,7 +88,7 @@ void Foam::fv::LeastSquaresVectors<Stencil>::calcLeastSquaresVectors()
         dd -= dd0;
 
         // Finalize the gradient weighting vectors
-        lsvi[0] = vector::zero;
+        lsvi[0] = Zero;
         for (label j=1; j<lsvi.size(); j++)
         {
             lsvi[j] = dd & lsvi[j];
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
index 493d650341..12ee0858f3 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
@@ -51,7 +51,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             false
         ),
         mesh_,
-        dimensionedVector("zero", dimless/dimLength, vector::zero)
+        dimensionedVector("zero", dimless/dimLength, Zero)
     ),
     nVectors_
     (
@@ -65,7 +65,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             false
         ),
         mesh_,
-        dimensionedVector("zero", dimless/dimLength, vector::zero)
+        dimensionedVector("zero", dimless/dimLength, Zero)
     )
 {
     calcLeastSquaresVectors();
@@ -96,7 +96,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
     const volVectorField& C = mesh.C();
 
     // Set up temporary storage for the dd tensor (before inversion)
-    symmTensorField dd(mesh_.nCells(), symmTensor::zero);
+    symmTensorField dd(mesh_.nCells(), Zero);
 
     forAll(owner, facei)
     {
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
index a83990120c..3a6e8233fa 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
@@ -51,7 +51,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             false
         ),
         mesh_,
-        dimensionedVector("zero", dimless/dimLength, vector::zero)
+        dimensionedVector("zero", dimless/dimLength, Zero)
     ),
     nVectors_
     (
@@ -65,7 +65,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             false
         ),
         mesh_,
-        dimensionedVector("zero", dimless/dimLength, vector::zero)
+        dimensionedVector("zero", dimless/dimLength, Zero)
     )
 {
     calcLeastSquaresVectors();
@@ -99,7 +99,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 
 
     // Set up temporary storage for the dd tensor (before inversion)
-    symmTensorField dd(mesh_.nCells(), symmTensor::zero);
+    symmTensorField dd(mesh_.nCells(), Zero);
 
     forAll(owner, facei)
     {
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
index c025d6a2df..b6bb1475d0 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
@@ -51,7 +51,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             false
         ),
         mesh_,
-        dimensionedVector("zero", dimless/dimLength, vector::zero)
+        dimensionedVector("zero", dimless/dimLength, Zero)
     ),
     nVectors_
     (
@@ -65,7 +65,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             false
         ),
         mesh_,
-        dimensionedVector("zero", dimless/dimLength, vector::zero)
+        dimensionedVector("zero", dimless/dimLength, Zero)
     )
 {
     calcLeastSquaresVectors();
@@ -96,7 +96,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
     const volVectorField& C = mesh.C();
 
     // Set up temporary storage for the dd tensor (before inversion)
-    symmTensorField dd(mesh_.nCells(), symmTensor::zero);
+    symmTensorField dd(mesh_.nCells(), Zero);
 
     forAll(owner, facei)
     {
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
index ed1d97fb19..174372192d 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
@@ -140,7 +140,7 @@ Foam::tmp<Foam::vectorField> Foam::cyclicACMIFvPatch::delta() const
         (
             interpolate
             (
-                vectorField(nbrPatchCoupled.size(), vector::zero),
+                vectorField(nbrPatchCoupled.size(), Zero),
                 nbrPatchNonOverlap.delta()()
             )
         );
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
index 69e940d12f..29439cc879 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
@@ -102,7 +102,7 @@ Foam::tmp<Foam::vectorField> Foam::cyclicAMIFvPatch::delta() const
                 interpolate
                 (
                     nbrPatch.coupledFvPatch::delta(),
-                    vectorField(this->size(), vector::zero)
+                    vectorField(this->size(), Zero)
                 );
         }
         else
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
index 88955afa56..87ca3336d1 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ bool Foam::patchDistMethods::advectionDiffusion::correct
             false
         ),
         mesh_,
-        dimensionedVector("ny", dimless, vector::zero),
+        dimensionedVector("ny", dimless, Zero),
         patchTypes<vector>(mesh_, patchIDs_)
     );
 
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
index 9ff12dd69c..ae5be722b1 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
@@ -49,7 +49,7 @@ void Foam::wallDist::constructn() const
                 mesh()
             ),
             mesh(),
-            dimensionedVector("n" & patchTypeName_, dimless, vector::zero),
+            dimensionedVector("n" & patchTypeName_, dimless, Zero),
             patchDistMethod::patchTypes<vector>(mesh(), patchIDs_)
         )
     );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
index 608c573ad2..f8237e1d35 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
@@ -118,7 +118,7 @@ Foam::linearUpwindV<Type>::correction
         {
             if (maxCorrs < 0)
             {
-                sfCorr[facei] = vector::zero;
+                sfCorr[facei] = Zero;
             }
             else if (sfCorrs > maxCorrs)
             {
@@ -185,7 +185,7 @@ Foam::linearUpwindV<Type>::correction
                 {
                     if (maxCorrs < 0)
                     {
-                        pSfCorr[facei] = vector::zero;
+                        pSfCorr[facei] = Zero;
                     }
                     else if (pSfCorrs > maxCorrs)
                     {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
index 445bf197e5..4e7bf60dd4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
@@ -98,7 +98,7 @@ void Foam::skewCorrectionVectors::calcSkewCorrectionVectors()
 
         if (!patchSkewCorrVecs.coupled())
         {
-            patchSkewCorrVecs = vector::zero;
+            patchSkewCorrVecs = Zero;
         }
         else
         {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
index 2895e1256e..6195180a87 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
@@ -364,7 +364,7 @@ void Foam::surfaceInterpolation::makeNonOrthCorrectionVectors() const
 
         if (!patchCorrVecs.coupled())
         {
-            patchCorrVecs = vector::zero;
+            patchCorrVecs = Zero;
         }
         else
         {
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
index 1d4d885be4..42ddced8ee 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
@@ -74,7 +74,7 @@ Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver
         (
             "cellDisplacement",
             pointDisplacement().dimensions(),
-            vector::zero
+            Zero
         ),
         cellMotionBoundaryTypes<vector>(pointDisplacement().boundaryField())
     ),
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
index b1a72eb6f8..7c3f889de1 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
@@ -316,7 +316,7 @@ Foam::displacementInterpolationMotionSolver::curPoints() const
     pointField& curPoints = tcurPoints.ref();
 
     // Interpolate the displacement of the face zones.
-    vectorField zoneDisp(displacements_.size(), vector::zero);
+    vectorField zoneDisp(displacements_.size(), Zero);
     forAll(zoneDisp, zoneI)
     {
         if (times_[zoneI].size())
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index 863f800d19..71fc5e1aa7 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -72,7 +72,7 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
         (
             "cellDisplacement",
             pointDisplacement_.dimensions(),
-            vector::zero
+            Zero
         ),
         cellMotionBoundaryTypes<vector>(pointDisplacement_.boundaryField())
     ),
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
index 0900344564..fa29dff619 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
@@ -164,7 +164,7 @@ void Foam::displacementLayeredMotionMotionSolver::walkStructured
                 points0()[pointI],  // location of data
                 vector::max,        // not valid
                 0.0,
-                vector::zero        // passive data
+                Zero        // passive data
             );
         }
     }
@@ -182,7 +182,7 @@ void Foam::displacementLayeredMotionMotionSolver::walkStructured
                 mesh().edges()[edgeI].centre(points0()),    // location of data
                 vector::max,                                // not valid
                 0.0,
-                vector::zero
+                Zero
             );
         }
     }
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
index d65fcc672b..a01394dd7a 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ inline Foam::pointEdgeStructuredWalk::pointEdgeStructuredWalk()
     point0_(vector::max),
     previousPoint_(vector::max),
     dist_(0),
-    data_(vector::zero)
+    data_(Zero)
 {}
 
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
index ba05811ba6..ccf29e4221 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
@@ -69,7 +69,7 @@ Foam::velocityLaplacianFvMotionSolver::velocityLaplacianFvMotionSolver
         (
             "cellMotionU",
             pointMotionU_.dimensions(),
-            vector::zero
+            Zero
         ),
         cellMotionBoundaryTypes<vector>(pointMotionU_.boundaryField())
     ),
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
index d3514243de..c30708bf17 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,8 +44,8 @@ angularOscillatingDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchField<vector>(p, iF),
-    axis_(vector::zero),
-    origin_(vector::zero),
+    axis_(Zero),
+    origin_(Zero),
     angle0_(0.0),
     amplitude_(0.0),
     omega_(0.0),
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
index 2192763c5d..607189f57e 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,8 +44,8 @@ angularOscillatingVelocityPointPatchVectorField
 )
 :
     fixedValuePointPatchField<vector>(p, iF),
-    axis_(vector::zero),
-    origin_(vector::zero),
+    axis_(Zero),
+    origin_(Zero),
     angle0_(0.0),
     amplitude_(0.0),
     omega_(0.0),
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
index 6e5811d388..50c25c9977 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ oscillatingDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchField<vector>(p, iF),
-    amplitude_(vector::zero),
+    amplitude_(Zero),
     omega_(0.0)
 {}
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
index fdccc34d4f..fdc13505bf 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ oscillatingVelocityPointPatchVectorField
 )
 :
     fixedValuePointPatchField<vector>(p, iF),
-    amplitude_(vector::zero),
+    amplitude_(Zero),
     omega_(0.0),
     p0_(p.localPoints())
 {}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 00a99a9056..b2f3b35317 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ void surfaceDisplacementPointPatchVectorField::calcProjection
     const scalar projectLen = mag(mesh.bounds().max()-mesh.bounds().min());
 
     // For case of fixed projection vector:
-    vector projectVec(vector::zero);
+    vector projectVec(Zero);
     if (projectMode_ == FIXEDNORMAL)
     {
         vector n = projectDir_/mag(projectDir_);
@@ -308,9 +308,9 @@ surfaceDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchVectorField(p, iF),
-    velocity_(vector::zero),
+    velocity_(Zero),
     projectMode_(NEAREST),
-    projectDir_(vector::zero),
+    projectDir_(Zero),
     wedgePlane_(-1)
 {}
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 3117758565..68cbdf0458 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -308,7 +308,7 @@ surfaceSlipDisplacementPointPatchVectorField
 :
     pointPatchVectorField(p, iF),
     projectMode_(NEAREST),
-    projectDir_(vector::zero),
+    projectDir_(Zero),
     wedgePlane_(-1)
 {}
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
index 43a5cd9269..51d6921ef5 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,9 +39,9 @@ waveDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchField<vector>(p, iF),
-    amplitude_(vector::zero),
+    amplitude_(Zero),
     omega_(0.0),
-    waveNumber_(vector::zero)
+    waveNumber_(Zero)
 {}
 
 
@@ -56,7 +56,7 @@ waveDisplacementPointPatchVectorField
     fixedValuePointPatchField<vector>(p, iF, dict),
     amplitude_(dict.lookup("amplitude")),
     omega_(readScalar(dict.lookup("omega"))),
-    waveNumber_(dict.lookupOrDefault<vector>("waveNumber", vector::zero))
+    waveNumber_(dict.lookupOrDefault<vector>("waveNumber", Zero))
 {
     if (!dict.found("value"))
     {
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
index 191bf9286f..78a1572df6 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ void Foam::fv::actuationDiskSource::addActuationDiskAxialInertialResistance
 {
     scalar a = 1.0 - Cp_/Ct_;
     vector uniDiskDir = diskDir_/mag(diskDir_);
-    tensor E(tensor::zero);
+    tensor E(Zero);
     E.xx() = uniDiskDir.x();
     E.yy() = uniDiskDir.y();
     E.zz() = uniDiskDir.z();
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
index f4a6ca68e6..65af46d7ac 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -204,7 +204,7 @@ void Foam::fv::meanVelocityForce::addSup
             IOobject::NO_WRITE
         ),
         mesh_,
-        dimensionedVector("zero", eqn.dimensions()/dimVolume, vector::zero)
+        dimensionedVector("zero", eqn.dimensions()/dimVolume, Zero)
     );
 
     scalar gradP = gradP0_ + dGradP_;
diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
index 65290d600f..d475cb7316 100644
--- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ addRadialActuationDiskAxialInertialResistance
     scalarField Tr(cells.size());
     const vector uniDiskDir = diskDir_/mag(diskDir_);
 
-    tensor E(tensor::zero);
+    tensor E(Zero);
     E.xx() = uniDiskDir.x();
     E.yy() = uniDiskDir.y();
     E.zz() = uniDiskDir.z();
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index e88c02c664..1806a7acc0 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,7 +135,7 @@ void Foam::fv::rotorDiskSource::setFaceArea(vector& axis, const bool correct)
     const vectorField& Sf = mesh_.Sf();
     const scalarField& magSf = mesh_.magSf();
 
-    vector n = vector::zero;
+    vector n = Zero;
 
     // Calculate cell addressing for selected cells
     labelList cellAddr(mesh_.nCells(), -1);
@@ -263,9 +263,9 @@ void Foam::fv::rotorDiskSource::setFaceArea(vector& axis, const bool correct)
 void Foam::fv::rotorDiskSource::createCoordinateSystem()
 {
     // Construct the local rotor co-prdinate system
-    vector origin(vector::zero);
-    vector axis(vector::zero);
-    vector refDir(vector::zero);
+    vector origin(Zero);
+    vector axis(Zero);
+    vector refDir(Zero);
 
     geometryModeType gm =
         geometryModeTypeNames_.read(coeffs_.lookup("geometryMode"));
@@ -289,7 +289,7 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
             origin /= sumV;
 
             // Determine first radial vector
-            vector dx1(vector::zero);
+            vector dx1(Zero);
             scalar magR = -GREAT;
             forAll(cells_, i)
             {
@@ -459,7 +459,7 @@ Foam::tmp<Foam::vectorField> Foam::fv::rotorDiskSource::inflowVelocity
         }
     }
 
-    return tmp<vectorField>(new vectorField(mesh_.nCells(), vector::zero));
+    return tmp<vectorField>(new vectorField(mesh_.nCells(), Zero));
 }
 
 
@@ -479,10 +479,10 @@ Foam::fv::rotorDiskSource::rotorDiskSource
     omega_(0.0),
     nBlades_(0),
     inletFlow_(ifLocal),
-    inletVelocity_(vector::zero),
+    inletVelocity_(Zero),
     tipEffect_(1.0),
     flap_(),
-    x_(cells_.size(), vector::zero),
+    x_(cells_.size(), Zero),
     R_(cells_.size(), I),
     invR_(cells_.size(), I),
     area_(cells_.size(), 0.0),
@@ -524,7 +524,7 @@ void Foam::fv::rotorDiskSource::addSup
         (
             "zero",
             eqn.dimensions()/dimVolume,
-            vector::zero
+            Zero
         )
     );
 
@@ -565,7 +565,7 @@ void Foam::fv::rotorDiskSource::addSup
         (
             "zero",
             eqn.dimensions()/dimVolume,
-            vector::zero
+            Zero
         )
     );
 
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
index 1f9905b94b..e23a0643fd 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
@@ -63,7 +63,7 @@ Foam::vector Foam::targetCoeffTrim::calcCoeffs
 
     scalar coeff1 = alpha_*sqr(rotor_.omega())*mathematical::pi;
 
-    vector cf(vector::zero);
+    vector cf(Zero);
     forAll(cells, i)
     {
         label cellI = cells[i];
@@ -119,9 +119,9 @@ void Foam::targetCoeffTrim::correctTrim
         // iterate to find new pitch angles to achieve target force
         scalar err = GREAT;
         label iter = 0;
-        tensor J(tensor::zero);
+        tensor J(Zero);
 
-        vector old = vector::zero;
+        vector old = Zero;
         while ((err > tol_) && (iter < nIter_))
         {
             // cache initial theta vector
@@ -199,8 +199,8 @@ Foam::targetCoeffTrim::targetCoeffTrim
     trimModel(rotor, dict, typeName),
     calcFrequency_(-1),
     useCoeffs_(true),
-    target_(vector::zero),
-    theta_(vector::zero),
+    target_(Zero),
+    theta_(Zero),
     nIter_(50),
     tol_(1e-8),
     relax_(1.0),
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
index 6c23ae848a..5b70fbfbfc 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ Foam::fv::tabulatedAccelerationSource::tabulatedAccelerationSource
     option(name, modelType, dict, mesh),
     motion_(coeffs_, mesh.time()),
     UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
-    g0_("g0", dimAcceleration, vector::zero)
+    g0_("g0", dimAcceleration, Zero)
 {
     fieldNames_.setSize(1, UName_);
     applied_.setSize(1, false);
diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
index 306421495e..8c51b741ec 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
@@ -154,7 +154,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
             IOobject::NO_WRITE
         ),
         nbrMesh,
-        dimensionedVector("zero", U.dimensions(), vector::zero)
+        dimensionedVector("zero", U.dimensions(), Zero)
     );
 
     // Map local velocity onto neighbour region
@@ -175,7 +175,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
     vectorField& Usource = porosityEqn.source();
 
     Udiag.setSize(eqn.diag().size(), 0.0);
-    Usource.setSize(eqn.source().size(), vector::zero);
+    Usource.setSize(eqn.source().size(), Zero);
 
     meshInterp().mapTgtToSrc(nbrEqn.diag(), plusEqOp<scalar>(), Udiag);
     meshInterp().mapTgtToSrc(nbrEqn.source(), plusEqOp<vector>(), Usource);
@@ -208,7 +208,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
             IOobject::NO_WRITE
         ),
         nbrMesh,
-        dimensionedVector("zero", U.dimensions(), vector::zero)
+        dimensionedVector("zero", U.dimensions(), Zero)
     );
 
     // Map local velocity onto neighbour region
@@ -276,7 +276,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
     vectorField& Usource = porosityEqn.source();
 
     Udiag.setSize(eqn.diag().size(), 0.0);
-    Usource.setSize(eqn.source().size(), vector::zero);
+    Usource.setSize(eqn.source().size(), Zero);
 
     meshInterp().mapTgtToSrc(nbrEqn.diag(), plusEqOp<scalar>(), Udiag);
     meshInterp().mapTgtToSrc(nbrEqn.source(), plusEqOp<vector>(), Usource);
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
index 90608e1f51..e635f1864c 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
@@ -392,7 +392,7 @@ void Foam::DSMCCloud<ParcelType>::resetFields()
     (
         "zero",
         dimensionSet(1, -1, -2, 0, 0),
-        vector::zero
+        Zero
     );
 
     rhoN_ = dimensionedScalar("zero",  dimensionSet(0, -3, 0, 0, 0), VSMALL);
@@ -406,7 +406,7 @@ void Foam::DSMCCloud<ParcelType>::resetFields()
     (
         "zero",
         dimensionSet(1, -2, -1, 0, 0),
-        vector::zero
+        Zero
     );
 }
 
@@ -800,7 +800,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
         (
             "zero",
             dimensionSet(1, -1, -2, 0, 0),
-            vector::zero
+            Zero
         )
     ),
     rhoN_
@@ -896,7 +896,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
         (
             "zero",
             dimensionSet(1, -2, -1, 0, 0),
-            vector::zero
+            Zero
         )
     ),
     constProps_(),
@@ -934,7 +934,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
             (
                 "zero",
                 dimensionSet(0, 1, -1, 0, 0),
-                vector::zero
+                Zero
             )
         )
     ),
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
index 9e8465f475..58fec01633 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
@@ -276,7 +276,7 @@ inline Foam::scalar Foam::DSMCCloud<ParcelType>::massInSystem() const
 template<class ParcelType>
 inline Foam::vector Foam::DSMCCloud<ParcelType>::linearMomentumOfSystem() const
 {
-    vector linearMomentum(vector::zero);
+    vector linearMomentum(Zero);
 
     forAllConstIter(typename DSMCCloud<ParcelType>, *this, iter)
     {
diff --git a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
index d9311e7fae..c47e7bff39 100644
--- a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
+++ b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
@@ -48,7 +48,7 @@ Foam::DSMCParcel<ParcelType>::DSMCParcel
 )
 :
     ParcelType(mesh, is, readFields),
-    U_(vector::zero),
+    U_(Zero),
     Ei_(0.0),
     typeId_(-1)
 {
diff --git a/src/lagrangian/basic/particle/particleI.H b/src/lagrangian/basic/particle/particleI.H
index c1960b37d0..ca68468eb2 100644
--- a/src/lagrangian/basic/particle/particleI.H
+++ b/src/lagrangian/basic/particle/particleI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,7 +166,7 @@ inline Foam::scalar Foam::particle::movingTetLambda
     point b0 = b00 + stepFraction_*(b - b00);
 
     // Normal of plane at start of tracking portion
-    vector n0 = vector::zero;
+    vector n0 = Zero;
 
     {
         tetIndices tetIs(cellI, tetFaceI, tetPtI, mesh_);
diff --git a/src/lagrangian/basic/particle/particleTemplates.C b/src/lagrangian/basic/particle/particleTemplates.C
index 68bc5ab1e3..73b82985cd 100644
--- a/src/lagrangian/basic/particle/particleTemplates.C
+++ b/src/lagrangian/basic/particle/particleTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -820,7 +820,7 @@ void Foam::particle::hitWallFaces
                     lambdaDistanceTolerance
                 );
 
-                pointHit hitInfo(vector::zero);
+                pointHit hitInfo(Zero);
 
                 if (mesh_.moving())
                 {
diff --git a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
index a249a875d1..c476221ece 100644
--- a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
+++ b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
@@ -43,7 +43,7 @@ Foam::coalCloudList::UTrans() const
                 IOobject::NO_WRITE
             ),
             mesh_,
-            dimensionedVector("zero", dimMass*dimVelocity, vector::zero)
+            dimensionedVector("zero", dimMass*dimVelocity, Zero)
         )
     );
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index c4f6899966..aa72f933dc 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -367,7 +367,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
                 IOobject::AUTO_WRITE
             ),
             mesh_,
-            dimensionedVector("zero", dimMass*dimVelocity, vector::zero)
+            dimensionedVector("zero", dimMass*dimVelocity, Zero)
         )
     ),
     UCoeff_
@@ -601,7 +601,7 @@ void Foam::KinematicCloud<CloudType>::restoreState()
 template<class CloudType>
 void Foam::KinematicCloud<CloudType>::resetSourceTerms()
 {
-    UTrans().field() = vector::zero;
+    UTrans().field() = Zero;
     UCoeff().field() = 0.0;
 }
 
@@ -729,7 +729,7 @@ void Foam::KinematicCloud<CloudType>::patchData
         }
         else
         {
-            Up = vector::zero;
+            Up = Zero;
         }
     }
     else
@@ -739,7 +739,7 @@ void Foam::KinematicCloud<CloudType>::patchData
         vector n00 = tetIs.oldFaceTri(mesh_).normal();
 
         // Difference in normal over timestep
-        vector dn = vector::zero;
+        vector dn = Zero;
 
         if (mag(n00) > SMALL)
         {
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 69b0eb60af..48b2a3a556 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -285,7 +285,7 @@ template<class CloudType>
 inline Foam::vector
 Foam::KinematicCloud<CloudType>::linearMomentumOfSystem() const
 {
-    vector linearMomentum(vector::zero);
+    vector linearMomentum(Zero);
 
     forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
index cc5940fcda..f942425429 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,9 +70,9 @@ inline Foam::CollidingParcel<ParcelType>::CollidingParcel
 )
 :
     ParcelType(owner, position, cellI, tetFaceI, tetPtI),
-    f_(vector::zero),
-    angularMomentum_(vector::zero),
-    torque_(vector::zero),
+    f_(Zero),
+    angularMomentum_(Zero),
+    torque_(Zero),
     collisionRecords_()
 {}
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
index 25aee6fa83..f0c2007e48 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,9 +52,9 @@ Foam::CollidingParcel<ParcelType>::CollidingParcel
 )
 :
     ParcelType(mesh, is, readFields),
-    f_(vector::zero),
-    angularMomentum_(vector::zero),
-    torque_(vector::zero),
+    f_(Zero),
+    angularMomentum_(Zero),
+    torque_(Zero),
     collisionRecords_()
 {
     if (readFields)
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index b7a2d9cf7c..3798650fc8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,13 +113,13 @@ void Foam::KinematicParcel<ParcelType>::calc
     //~~~~~~~~
 
     // Explicit momentum source for particle
-    vector Su = vector::zero;
+    vector Su = Zero;
 
     // Linearised momentum source coefficient
     scalar Spu = 0.0;
 
     // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
+    vector dUTrans = Zero;
 
 
     // Motion
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 2f998dd3a1..ca445b3f64 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,13 +85,13 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     nParticle_(0),
     d_(0.0),
     dTarget_(0.0),
-    U_(vector::zero),
+    U_(Zero),
     rho_(0.0),
     age_(0.0),
     tTurb_(0.0),
-    UTurb_(vector::zero),
+    UTurb_(Zero),
     rhoc_(0.0),
-    Uc_(vector::zero),
+    Uc_(Zero),
     muc_(0.0)
 {}
 
@@ -122,9 +122,9 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     rho_(constProps.rho0()),
     age_(0.0),
     tTurb_(0.0),
-    UTurb_(vector::zero),
+    UTurb_(Zero),
     rhoc_(0.0),
-    Uc_(vector::zero),
+    Uc_(Zero),
     muc_(0.0)
 {}
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 79ef7f29fa..9015582842 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,13 +58,13 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     nParticle_(0.0),
     d_(0.0),
     dTarget_(0.0),
-    U_(vector::zero),
+    U_(Zero),
     rho_(0.0),
     age_(0.0),
     tTurb_(0.0),
-    UTurb_(vector::zero),
+    UTurb_(Zero),
     rhoc_(0.0),
-    Uc_(vector::zero),
+    Uc_(Zero),
     muc_(0.0)
 {
     if (readFields)
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelI.H b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelI.H
index ab01a6421d..1311ee5bab 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ inline Foam::MPPICParcel<ParcelType>::MPPICParcel
 )
 :
     ParcelType(owner, position, cellI, tetFaceI, tetPtI),
-    UCorrect_(vector::zero)
+    UCorrect_(Zero)
 {}
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
index 78ec2af314..ab4eb3e0c9 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ Foam::MPPICParcel<ParcelType>::MPPICParcel
 )
 :
     ParcelType(mesh, is, readFields),
-    UCorrect_(vector::zero)
+    UCorrect_(Zero)
 {
     if (readFields)
     {
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
index dbe94e219a..2be585ba41 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
@@ -150,7 +150,7 @@ Foam::MPPICParcel<ParcelType>::TrackingData<CloudType>::updateAverages
     volumeAverage_() = 0;
     radiusAverage_() = 0;
     rhoAverage_() = 0;
-    uAverage_() = vector::zero;
+    uAverage_() = Zero;
     uSqrAverage_() = 0;
     frequencyAverage_() = 0;
     massAverage_() = 0;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 289127b18b..2e14674bb8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,13 +197,13 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     //~~~~~~~~
 
     // Explicit momentum source for particle
-    vector Su = vector::zero;
+    vector Su = Zero;
 
     // Linearised momentum source coefficient
     scalar Spu = 0.0;
 
     // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
+    vector dUTrans = Zero;
 
     // Explicit enthalpy source for particle
     scalar Sh = 0.0;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 0a34b43108..4dac19bec2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -418,13 +418,13 @@ void Foam::ReactingParcel<ParcelType>::calc
     // ~~~~~~~
 
     // Explicit momentum source for particle
-    vector Su = vector::zero;
+    vector Su = Zero;
 
     // Linearised momentum source coefficient
     scalar Spu = 0.0;
 
     // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
+    vector dUTrans = Zero;
 
     // Explicit enthalpy source for particle
     scalar Sh = 0.0;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index cbbf563fa4..8ae9e09d59 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,13 +163,13 @@ void Foam::ThermoParcel<ParcelType>::calc
     // ~~~~~~~
 
     // Explicit momentum source for particle
-    vector Su = vector::zero;
+    vector Su = Zero;
 
     // Linearised momentum source coefficient
     scalar Spu = 0.0;
 
     // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
+    vector dUTrans = Zero;
 
     // Explicit enthalpy source for particle
     scalar Sh = 0.0;
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index ab54ee6617..dff3601186 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -174,7 +174,7 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
         // set 4 quadrants for single sector cases
         nS = 4;
 
-        vector tangent = vector::zero;
+        vector tangent = Zero;
         scalar magTangent = 0.0;
 
         Random rnd(1234);
diff --git a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
index 1c7371f439..9ecc679c24 100644
--- a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
+++ b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
@@ -154,7 +154,7 @@ Foam::forceSuSp Foam::ParticleForceList<CloudType>::calcCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     if (calcCoupled_)
     {
@@ -178,7 +178,7 @@ Foam::forceSuSp Foam::ParticleForceList<CloudType>::calcNonCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     if (calcNonCoupled_)
     {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index c26194be06..fd21059d90 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -47,9 +47,9 @@ void Foam::PairCollision<CloudType>::preInteraction()
     {
         typename CloudType::parcelType& p = iter();
 
-        p.f() = vector::zero;
+        p.f() = Zero;
 
-        p.torque() = vector::zero;
+        p.torque() = Zero;
     }
 }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
index e2b92e630d..21064f7b85 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -271,8 +271,8 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
 
                 fT_AB = -mu_*mag(fN_AB)*USlip_AB/mag(USlip_AB);
 
-                tangentialOverlap_AB = vector::zero;
-                tangentialOverlap_BA = vector::zero;
+                tangentialOverlap_AB = Zero;
+                tangentialOverlap_BA = Zero;
             }
             else
             {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
index d8efdd992b..cbc6db3234 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
@@ -151,7 +151,7 @@ void Foam::WallLocalSpringSliderDashpot<CloudType>::evaluateWall
 
             fT_PW = -mu*mag(fN_PW)*USlip_PW/mag(USlip_PW);
 
-            tangentialOverlap_PW = vector::zero;
+            tangentialOverlap_PW = Zero;
         }
         else
         {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
index bafdb086d1..f41e124836 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
@@ -138,7 +138,7 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
 
             fT_PW = -mu_*mag(fN_PW)*USlip_PW/mag(USlip_PW);
 
-            tangentialOverlap_PW = vector::zero;
+            tangentialOverlap_PW = Zero;
         }
         else
         {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 34ef7c273f..0e65b0e519 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -107,7 +107,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
 
         axis /= mag(axis);
 
-        vector tangent = vector::zero;
+        vector tangent = Zero;
         scalar magTangent = 0.0;
 
         cachedRandom& rnd = this->owner().rndGen();
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 89f885065e..a757a39f83 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -152,9 +152,9 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
             owner.rndGen()
         )
     ),
-    tanVec1_(vector::zero),
-    tanVec2_(vector::zero),
-    normal_(vector::zero),
+    tanVec1_(Zero),
+    tanVec2_(Zero),
+    normal_(Zero),
 
     UMag_(0.0),
     Cd_(owner.db().time(), "Cd"),
@@ -179,7 +179,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     direction_ /= mag(direction_);
 
     // Determine direction vectors tangential to direction
-    vector tangent = vector::zero;
+    vector tangent = Zero;
     scalar magTangent = 0.0;
 
     while(magTangent < SMALL)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index f33f45d86e..2ba1a53765 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -266,7 +266,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
                 (
                     vectorPairScalarPair
                     (
-                        Pair<vector>(mesh.cellCentres()[cI], vector::zero),
+                        Pair<vector>(mesh.cellCentres()[cI], Zero),
                         Pair<scalar>(dSeed_, dNew)
                     )
                 );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 18a3c22a99..1f5960b75f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -445,7 +445,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 label tetFaceI = -1;
                 label tetPtI = -1;
 
-                vector pos = vector::zero;
+                vector pos = Zero;
 
                 setPositionAndCell
                 (
@@ -565,7 +565,7 @@ void Foam::InjectionModel<CloudType>::injectSteadyState
         label tetFaceI = -1;
         label tetPtI = -1;
 
-        vector pos = vector::zero;
+        vector pos = Zero;
 
         setPositionAndCell
         (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
index f245d62751..12364b9dfe 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ namespace Foam
 Foam::kinematicParcelInjectionData::kinematicParcelInjectionData()
 :
     x_(point::zero),
-    U_(vector::zero),
+    U_(Zero),
     d_(0.0),
     rho_(0.0),
     mDot_(0.0)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
index cd28712ee8..6200468ad9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ void Foam::NoInjection<CloudType>::setProperties
 )
 {
     // set particle velocity
-    parcel.U() = vector::zero;
+    parcel.U() = Zero;
 
     // set particle diameter
     parcel.d() = 0.0;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
index 7a3ec75ebd..7d66ae2b37 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ Foam::forceSuSp Foam::DistortedSphereDragForce<CloudType>::calcCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     // Limit the drop distortion to y=0 (sphere) and y=1 (disk)
     scalar y = min(max(p.y(), 0), 1);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C
index a18ffbecdb..fde0072ae2 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ Foam::forceSuSp Foam::ErgunWenYuDragForce<CloudType>::calcCoupled
     {
         return forceSuSp
         (
-            vector::zero,
+            Zero,
             (mass/p.rho())
            *(150.0*(1.0 - alphac)/alphac + 1.75*Re)*muc/(alphac*sqr(p.d()))
         );
@@ -117,7 +117,7 @@ Foam::forceSuSp Foam::ErgunWenYuDragForce<CloudType>::calcCoupled
     {
         return forceSuSp
         (
-            vector::zero,
+            Zero,
             (mass/p.rho())
            *0.75*CdRe(alphac*Re)*muc*pow(alphac, -2.65)/(alphac*sqr(p.d()))
         );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C
index 489079f524..3cbccc4787 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ Foam::forceSuSp Foam::NonSphereDragForce<CloudType>::calcCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     value.Sp() = mass*0.75*muc*CdRe(Re)/(p.rho()*sqr(p.d()));
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
index 970dee90f9..7e2914e16a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,7 +121,7 @@ Foam::forceSuSp Foam::PlessisMasliyahDragForce<CloudType>::calcCoupled
 
     return forceSuSp
     (
-        vector::zero,
+        Zero,
         (mass/p.rho())
        *(A*(1.0 - alphac)/alphac + B*Re)*muc/(alphac*sqr(p.d()))
     );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.C
index 4cb63e4781..b93c2650aa 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ Foam::forceSuSp Foam::SphereDragForce<CloudType>::calcCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     value.Sp() = mass*0.75*muc*CdRe(Re)/(p.rho()*sqr(p.d()));
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C
index 57356aa147..c6747ce768 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ Foam::forceSuSp Foam::WenYuDragForce<CloudType>::calcCoupled
 
     return forceSuSp
     (
-        vector::zero,
+        Zero,
         (mass/p.rho())
        *0.75*CdRe(alphac*Re)*muc*pow(alphac, -2.65)/(alphac*sqr(p.d()))
     );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.C
index d2bb31bc03..54f7dc9c63 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ Foam::forceSuSp Foam::GravityForce<CloudType>::calcNonCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     value.Su() = mass*g_*(1.0 - p.rhoc()/p.rho());
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
index a4faceeec7..5ffcb390a0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,7 +134,7 @@ Foam::forceSuSp Foam::LiftForce<CloudType>::calcCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     vector curlUc =
         curlUcInterp().interpolate(p.position(), p.currentTetIndices());
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
index d0edd8a228..9630f242b2 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
             "linearAcceleration"
         )
     ),
-    W_(vector::zero),
+    W_(Zero),
     omegaName_
     (
         this->coeffs().template lookupOrDefault<word>
@@ -54,7 +54,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
             "angularVelocity"
         )
     ),
-    omega_(vector::zero),
+    omega_(Zero),
     omegaDotName_
     (
         this->coeffs().template lookupOrDefault<word>
@@ -63,7 +63,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
             "angularAcceleration"
         )
     ),
-    omegaDot_(vector::zero),
+    omegaDot_(Zero),
     centreOfRotationName_
     (
         this->coeffs().template lookupOrDefault<word>
@@ -72,7 +72,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
             "centreOfRotation"
         )
     ),
-    centreOfRotation_(vector::zero)
+    centreOfRotation_(Zero)
 {}
 
 
@@ -106,10 +106,10 @@ Foam::NonInertialFrameForce<CloudType>::~NonInertialFrameForce()
 template<class CloudType>
 void Foam::NonInertialFrameForce<CloudType>::cacheFields(const bool store)
 {
-    W_ = vector::zero;
-    omega_ = vector::zero;
-    omegaDot_ = vector::zero;
-    centreOfRotation_ = vector::zero;
+    W_ = Zero;
+    omega_ = Zero;
+    omegaDot_ = Zero;
+    centreOfRotation_ = Zero;
 
     if (store)
     {
@@ -186,7 +186,7 @@ Foam::forceSuSp Foam::NonInertialFrameForce<CloudType>::calcNonCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     const vector r = p.position() - centreOfRotation_;
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C
index 62628e6178..00737cc110 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ Foam::forceSuSp Foam::ParamagneticForce<CloudType>::calcNonCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     const interpolation<vector>& HdotGradHInterp = *HdotGradHInterpPtr_;
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C
index a5a07d7baa..b337b4222f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ Foam::forceSuSp Foam::ParticleForce<CloudType>::calcCoupled
 ) const
 {
     forceSuSp value;
-    value.Su() = vector::zero;
+    value.Su() = Zero;
     value.Sp() = 0.0;
 
     return value;
@@ -104,7 +104,7 @@ Foam::forceSuSp Foam::ParticleForce<CloudType>::calcNonCoupled
 ) const
 {
     forceSuSp value;
-    value.Su() = vector::zero;
+    value.Su() = Zero;
     value.Sp() = 0.0;
 
     return value;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
index 4949ed7bf1..eac19829f0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ Foam::forceSuSp Foam::PressureGradientForce<CloudType>::calcCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     vector DUcDt =
         DUcDtInterp().interpolate(p.position(), p.currentTetIndices());
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C
index eed0c800d0..82fdca98e1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ Foam::forceSuSp Foam::SRFForce<CloudType>::calcNonCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     const typename SRF::SRFModel& srf = *srfPtr_;
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 441812b543..6bd49e57ac 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,7 +197,7 @@ bool Foam::LocalInteraction<CloudType>::correct
 
                 keepParticle = false;
                 active = false;
-                U = vector::zero;
+                U = Zero;
                 nEscape_[patchI]++;
                 massEscape_[patchI] += dm;
                 if (writeFields_)
@@ -214,7 +214,7 @@ bool Foam::LocalInteraction<CloudType>::correct
 
                 keepParticle = true;
                 active = false;
-                U = vector::zero;
+                U = Zero;
                 nStick_[patchI]++;
                 massStick_[patchI] += dm;
                 if (writeFields_)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
index 74c7aa3efd..da19861aa1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
@@ -122,7 +122,7 @@ bool Foam::StandardWallInteraction<CloudType>::correct
             {
                 keepParticle = false;
                 active = false;
-                U = vector::zero;
+                U = Zero;
                 nEscape_++;
                 massEscape_ += p.mass()*p.nParticle();
                 break;
@@ -131,7 +131,7 @@ bool Foam::StandardWallInteraction<CloudType>::correct
             {
                 keepParticle = true;
                 active = false;
-                U = vector::zero;
+                U = Zero;
                 nStick_++;
                 break;
             }
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C
index 0a2d801b85..6fbade1dbf 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C
@@ -41,7 +41,7 @@ Foam::AveragingMethods::Moment<Type>::Moment
     dataX_(FieldField<Field, Type>::operator[](1)),
     dataY_(FieldField<Field, Type>::operator[](2)),
     dataZ_(FieldField<Field, Type>::operator[](3)),
-    transform_(mesh.nCells(), symmTensor::zero),
+    transform_(mesh.nCells(), Zero),
     scale_(0.5*pow(mesh.V(), 1.0/3.0))
 {
     scalar a = 1.0/24.0;
@@ -65,7 +65,7 @@ Foam::AveragingMethods::Moment<Type>::Moment
         const List<tetIndices> cellTets =
             polyMeshTetDecomposition::cellTetIndices(mesh, cellI);
 
-        symmTensor A(symmTensor::zero);
+        symmTensor A(Zero);
 
         forAll(cellTets, tetI)
         {
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.C b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.C
index c49bf78aa5..5d59f60147 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ Foam::vector Foam::DampingModels::NoDamping<CloudType>::velocityCorrection
     const scalar deltaT
 ) const
 {
-    return vector::zero;
+    return Zero;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C
index d5bdc17687..f4d5d0fa58 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C
@@ -162,7 +162,7 @@ Foam::vector Foam::PackingModels::Explicit<CloudType>::velocityCorrection
     const vector uRelative = p.U() - uMean;
 
     // correction velocity
-    vector dU = vector::zero;
+    vector dU = Zero;
 
     //// existing forces
     //const scalar Re = p.Re(p.U(), p.d(), p.rhoc(), p.muc());
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
index ad22dc25fb..31065b6191 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
@@ -253,7 +253,7 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
                     IOobject::NO_WRITE
                 ),
                 mesh,
-                dimensionedVector("zero", dimVelocity, vector::zero),
+                dimensionedVector("zero", dimVelocity, Zero),
                 fixedValueFvPatchField<vector>::typeName
             );
             U.internalField() = uAverage.internalField();
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.C
index 92adbba777..bbd3327002 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ Foam::vector Foam::PackingModels::NoPacking<CloudType>::velocityCorrection
     const scalar deltaT
 ) const
 {
-    return vector::zero;
+    return Zero;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index 7f75237886..f5dcf903e1 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ Foam::vector Foam::ThermoSurfaceFilm<CloudType>::tangentVector
     const vector& v
 ) const
 {
-    vector tangent = vector::zero;
+    vector tangent = Zero;
     scalar magTangent = 0.0;
 
     while (magTangent < SMALL)
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
index a19febe07b..fe512038ae 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
@@ -41,7 +41,7 @@ if (runTime.outputTime())
         Bulk velocity
     \*-----------------------------------------------------------------------*/
 
-    vectorField totalMomentum_sum(mesh.nCells(), vector::zero);
+    vectorField totalMomentum_sum(mesh.nCells(), Zero);
 
     scalarField totalMass_sum(mesh.nCells(), 0.0);
 
@@ -71,7 +71,7 @@ if (runTime.outputTime())
             }
             else
             {
-                singleSpeciesVelocity[sSV] = vector::zero;
+                singleSpeciesVelocity[sSV] = Zero;
             }
         }
     }
@@ -87,7 +87,7 @@ if (runTime.outputTime())
         }
         else
         {
-            itotalVelocity[tV] = vector::zero;
+            itotalVelocity[tV] = Zero;
         }
     }
 
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
index 4b46bdd0df..29a94307ce 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
 
 if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
 {
-    vector p = vector::zero;
+    vector p = Zero;
 
     forAllConstIter(IDLList<molecule>, molecules, mol)
     {
@@ -61,7 +61,7 @@ if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
 
 if (mesh.time().timeIndex() % hfacf.sampleSteps() == 0)
 {
-    vector s = vector::zero;
+    vector s = Zero;
 
     forAllConstIter(IDLList<molecule>, molecules, mol)
     {
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
index b730adb56e..83bcaa8ec7 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
@@ -15,7 +15,7 @@ List<scalarField> allSpeciesM_RU
 List<vectorField> allSpeciesVelocitySum_RU
 (
     molecules.potential().nIds(),
-    vectorField (mesh.nCells(), vector::zero)
+    vectorField (mesh.nCells(), Zero)
 );
 
 List<scalarField> allSpeciesVelocityMagSquaredSum_RU
@@ -171,7 +171,7 @@ forAll(allSpeciesVelocity, v)
         )
     );
     allSpeciesVelocity[v].internalField() =
-        vectorField (mesh.nCells(), vector::zero);
+        vectorField (mesh.nCells(), Zero);
     allSpeciesVelocity[v].correctBoundaryConditions();
 }
 
@@ -191,7 +191,7 @@ Info << "    Creating total velocity field" << endl;
 //     dimVelocity,
 //     "zeroGradient"
 // );
-// totalVelocity.internalField() = vectorField (mesh.nCells(), vector::zero);
+// totalVelocity.internalField() = vectorField (mesh.nCells(), Zero);
 // totalVelocity.correctBoundaryConditions();
 
 
@@ -209,7 +209,7 @@ volVectorField totalVelocity
 
     ),
     mesh,
-    dimensionedVector("zero", dimVelocity, vector::zero)
+    dimensionedVector("zero", dimVelocity, Zero)
 );
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
index ae117cafc5..a23468df1c 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,9 +31,9 @@ Description
 \*---------------------------------------------------------------------------*/
 
 
-vector singleStepTotalLinearMomentum(vector::zero);
+vector singleStepTotalLinearMomentum(Zero);
 
-vector singleStepTotalAngularMomentum(vector::zero);
+vector singleStepTotalAngularMomentum(Zero);
 
 scalar singleStepMaxVelocityMag = 0.0;
 
@@ -47,7 +47,7 @@ scalar singleStepTotalPE = 0.0;
 
 scalar singleStepTotalrDotf = 0.0;
 
-//vector singleStepCentreOfMass(vector::zero);
+//vector singleStepCentreOfMass(Zero);
 
 label singleStepNMols = molecules.size();
 
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
index 4bd50ebafc..ddf96d1ef0 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
@@ -15,7 +15,7 @@ if (runTime.outputTime())
     allSpeciesVelocitySum_RU = List<vectorField>
     (
         molecules.potential().nIds(),
-        vectorField(mesh.nCells(), vector::zero)
+        vectorField(mesh.nCells(), Zero)
     );
 
     allSpeciesVelocityMagSquaredSum_RU = List<scalarField>
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
index df182244d2..6f32f0ec13 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ if (runTime.outputTime())
             << "no molecules in system" << endl;
     }
 
-    accumulatedTotalLinearMomentum = vector::zero;
+    accumulatedTotalLinearMomentum = Zero;
 
     accumulatedTotalMass = 0.0;
 
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
index d0aa0aabe8..0ce24f3da4 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-vector accumulatedTotalLinearMomentum(vector::zero);
+vector accumulatedTotalLinearMomentum(Zero);
 
 scalar accumulatedTotalMass = 0.0;
 
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
index 75312848bd..a5ba420f34 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,9 +147,9 @@ bool Foam::molecule::move(molecule::trackingData& td, const scalar trackTime)
 
         scalar m = constProps.mass();
 
-        a_ = vector::zero;
+        a_ = Zero;
 
-        tau_ = vector::zero;
+        tau_ = Zero;
 
         forAll(siteForces_, s)
         {
@@ -166,9 +166,9 @@ bool Foam::molecule::move(molecule::trackingData& td, const scalar trackTime)
 
         if (constProps.pointMolecule())
         {
-            tau_ = vector::zero;
+            tau_ = Zero;
 
-            pi_ = vector::zero;
+            pi_ = Zero;
         }
 
         if (constProps.linearMolecule())
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
index 062395ba6b..9430f22e62 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ inline Foam::molecule::constantProperties::constantProperties
 
     mass_ = sum(siteMasses_);
 
-    vector centreOfMass(vector::zero);
+    vector centreOfMass(Zero);
 
     // Calculate the centre of mass of the body and subtract it from each
     // position
@@ -80,7 +80,7 @@ inline Foam::molecule::constantProperties::constantProperties
     {
         // Single site molecule - no rotational motion.
 
-        siteReferencePositions_[0] = vector::zero;
+        siteReferencePositions_[0] = Zero;
 
         momentOfInertia_ = diagTensor(-1, -1, -1);
     }
@@ -101,7 +101,7 @@ inline Foam::molecule::constantProperties::constantProperties
         // The rotation was around the centre of mass but remove any
         // components that have crept in due to floating point errors
 
-        centreOfMass = vector::zero;
+        centreOfMass = Zero;
 
         forAll(siteReferencePositions_, i)
         {
@@ -112,7 +112,7 @@ inline Foam::molecule::constantProperties::constantProperties
 
         siteReferencePositions_ -= centreOfMass;
 
-        diagTensor momOfInertia = diagTensor::zero;
+        diagTensor momOfInertia = Zero;
 
         forAll(siteReferencePositions_, i)
         {
@@ -135,7 +135,7 @@ inline Foam::molecule::constantProperties::constantProperties
 
         // Calculate the inertia tensor in the current orientation
 
-        tensor momOfInertia(tensor::zero);
+        tensor momOfInertia(Zero);
 
         forAll(siteReferencePositions_, i)
         {
@@ -179,7 +179,7 @@ inline Foam::molecule::constantProperties::constantProperties
         // The rotation was around the centre of mass but remove any
         // components that have crept in due to floating point errors
 
-        centreOfMass = vector::zero;
+        centreOfMass = Zero;
 
         forAll(siteReferencePositions_, i)
         {
@@ -193,7 +193,7 @@ inline Foam::molecule::constantProperties::constantProperties
         // Calculate the moment of inertia in the principle component
         // reference frame
 
-        momOfInertia = tensor::zero;
+        momOfInertia = Zero;
 
         forAll(siteReferencePositions_, i)
         {
@@ -244,10 +244,10 @@ inline Foam::molecule::molecule
     tau_(tau),
     specialPosition_(specialPosition),
     potentialEnergy_(0.0),
-    rf_(tensor::zero),
+    rf_(Zero),
     special_(special),
     id_(id),
-    siteForces_(constProps.nSites(), vector::zero),
+    siteForces_(constProps.nSites(), Zero),
     sitePositions_(constProps.nSites())
 {
     setSitePositions(constProps);
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
index c7829e6958..d6fd3cbd29 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,14 +45,14 @@ Foam::molecule::molecule
 )
 :
     particle(mesh, is, readFields),
-    Q_(tensor::zero),
-    v_(vector::zero),
-    a_(vector::zero),
-    pi_(vector::zero),
-    tau_(vector::zero),
-    specialPosition_(vector::zero),
+    Q_(Zero),
+    v_(Zero),
+    a_(Zero),
+    pi_(Zero),
+    tau_(Zero),
+    specialPosition_(Zero),
     potentialEnergy_(0.0),
-    rf_(tensor::zero),
+    rf_(Zero),
     special_(0),
     id_(0),
     siteForces_(0),
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index ae57fb42fa..e4bc84a7dc 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -1016,7 +1016,7 @@ void Foam::moleculeCloud::createMolecule
             << abort(FatalError);
     }
 
-    point specialPosition(vector::zero);
+    point specialPosition(Zero);
 
     label special = 0;
 
@@ -1033,7 +1033,7 @@ void Foam::moleculeCloud::createMolecule
 
     v += bulkVelocity;
 
-    vector pi = vector::zero;
+    vector pi = Zero;
 
     tensor Q = I;
 
@@ -1072,9 +1072,9 @@ void Foam::moleculeCloud::createMolecule
             tetPt,
             Q,
             v,
-            vector::zero,
+            Zero,
             pi,
-            vector::zero,
+            Zero,
             specialPosition,
             constProps(id),
             special,
@@ -1184,11 +1184,11 @@ void Foam::moleculeCloud::calculateForce()
     // Set accumulated quantities to zero
     forAllIter(moleculeCloud, *this, mol)
     {
-        mol().siteForces() = vector::zero;
+        mol().siteForces() = Zero;
 
         mol().potentialEnergy() = 0.0;
 
-        mol().rf() = tensor::zero;
+        mol().rf() = Zero;
     }
 
     calculatePairForce();
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C
index b33d39987c..8c8b04e8b9 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.C
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -225,7 +225,7 @@ void Foam::potential::potential::readPotentialDict()
     // *************************************************************************
     // External Forces
 
-    gravity_ = vector::zero;
+    gravity_ = Zero;
 
     if (potentialDict.found("external"))
     {
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
index 101ea7cf79..dab14e4248 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
@@ -47,7 +47,7 @@ Foam::SprayParcel<ParcelType>::SprayParcel
 :
     ParcelType(mesh, is, readFields),
     d0_(0.0),
-    position0_(vector::zero),
+    position0_(Zero),
     sigma_(0.0),
     mu_(0.0),
     liquidCore_(0.0),
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
index da2d36baf1..8469c76035 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,7 +148,7 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
     else
     {
         tTurb = GREAT;
-        UTurb = vector::zero;
+        UTurb = Zero;
     }
 
     return Uc + UTurb;
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
index 554967aa99..e5131b8007 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
     else
     {
         tTurb = GREAT;
-        UTurb = vector::zero;
+        UTurb = Zero;
     }
 
     return Uc + UTurb;
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index 4c2059e0a9..9dffc11bcd 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -165,7 +165,7 @@ Foam::forceSuSp Foam::BrownianMotionForce<CloudType>::calcCoupled
     const scalar muc
 ) const
 {
-    forceSuSp value(vector::zero, 0.0);
+    forceSuSp value(Zero, 0.0);
 
     const scalar dp = p.d();
     const scalar Tc = p.Tc();
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index fc70998861..3b521a75b4 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -558,7 +558,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                                 points[pointI],
                                 0.0,
                                 pointI,         // passive data
-                                vector::zero    // passive data
+                                Zero    // passive data
                             )
                         );
                         pointMedialDist[pointI] = maxInfo.last();
@@ -614,7 +614,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                                     medialAxisPt,   //points[pointI],
                                     magSqr(points[pointI]-medialAxisPt),//0.0,
                                     pointI,         // passive data
-                                    vector::zero    // passive data
+                                    Zero    // passive data
                                 )
                             );
                             pointMedialDist[pointI] = maxInfo.last();
@@ -671,7 +671,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                                     points[pointI],
                                     0.0,
                                     pointI,         // passive data
-                                    vector::zero    // passive data
+                                    Zero    // passive data
                                 )
                             );
                             pointMedialDist[pointI] = maxInfo.last();
@@ -728,7 +728,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                                         points[pointI],
                                         0.0,
                                         pointI,         // passive data
-                                        vector::zero    // passive data
+                                        Zero    // passive data
                                     )
                                 );
                                 pointMedialDist[pointI] = maxInfo.last();
@@ -868,13 +868,13 @@ bool Foam::medialAxisMeshMover::unmarkExtrusion
     if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDE)
     {
         extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
-        patchDisp[patchPointI] = vector::zero;
+        patchDisp[patchPointI] = Zero;
         return true;
     }
     else if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDEREMOVE)
     {
         extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
-        patchDisp[patchPointI] = vector::zero;
+        patchDisp[patchPointI] = Zero;
         return true;
     }
     else
@@ -1639,7 +1639,7 @@ Foam::medialAxisMeshMover::medialAxisMeshMover
             false
         ),
         pMesh(),
-        dimensionedVector("dispVec", dimLength, vector::zero)
+        dimensionedVector("dispVec", dimLength, Zero)
     ),
     medialRatio_
     (
@@ -1681,7 +1681,7 @@ Foam::medialAxisMeshMover::medialAxisMeshMover
             false
         ),
         pMesh(),
-        dimensionedVector("medialVec", dimLength, vector::zero)
+        dimensionedVector("medialVec", dimLength, Zero)
     )
 {
     update(dict);
@@ -1981,7 +1981,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
                 points[pointI],
                 0.0,
                 thickness[patchPointI],       // transport layer thickness
-                vector::zero                  // passive vector
+                Zero                  // passive vector
             );
         }
 
@@ -2007,7 +2007,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     {
         if (!pointWallDist[pointI].valid(dummyTrackData))
         {
-            displacement[pointI] = vector::zero;
+            displacement[pointI] = Zero;
         }
         else
         {
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 1847f050ea..9845e32f4f 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -1839,7 +1839,7 @@ Foam::tmp<Foam::pointVectorField> Foam::meshRefinement::makeDisplacementField
                 IOobject::AUTO_WRITE
             ),
             pMesh,
-            dimensionedVector("displacement", dimLength, vector::zero),
+            dimensionedVector("displacement", dimLength, Zero),
             patchFieldTypes
         )
     );
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index a46c41a412..707e5ce426 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -1528,7 +1528,7 @@ bool Foam::meshRefinement::isGap
     {
         scalar cosAngle = (normal0 & normal1);
 
-        vector avg = vector::zero;
+        vector avg = Zero;
         if (cosAngle < (-1+planarCos))
         {
             // Opposite normals
@@ -1585,7 +1585,7 @@ bool Foam::meshRefinement::isNormalGap
     {
         scalar cosAngle = (normal0 & normal1);
 
-        vector avg = vector::zero;
+        vector avg = Zero;
         if (cosAngle < (-1+planarCos))
         {
             // Opposite normals
@@ -1774,8 +1774,8 @@ Foam::label Foam::meshRefinement::markProximityRefinement
     // minLevel) and cache per cell the max surface level and the local normal
     // on that surface.
     labelList cellMaxLevel(mesh_.nCells(), -1);
-    vectorField cellMaxNormal(mesh_.nCells(), vector::zero);
-    pointField cellMaxLocation(mesh_.nCells(), vector::zero);
+    vectorField cellMaxNormal(mesh_.nCells(), Zero);
+    pointField cellMaxLocation(mesh_.nCells(), Zero);
 
     {
         // Per segment the normals of the surfaces
diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
index 544d895c89..bd988ed382 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
@@ -535,7 +535,7 @@ void Foam::refinementFeatures::findNearestEdge
     nearInfo.setSize(samples.size());
     nearInfo = pointIndexHit();
     nearNormal.setSize(samples.size());
-    nearNormal = vector::zero;
+    nearNormal = Zero;
 
     forAll(edgeTrees_, featI)
     {
@@ -594,7 +594,7 @@ void Foam::refinementFeatures::findNearestRegionEdge
     nearInfo.setSize(samples.size());
     nearInfo = pointIndexHit();
     nearNormal.setSize(samples.size());
-    nearNormal = vector::zero;
+    nearNormal = Zero;
 
 
     const PtrList<indexedOctree<treeDataEdge>>& regionTrees =
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
index 5046f34166..285197bc7b 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -935,7 +935,7 @@ void Foam::refinementSurfaces::findNearestIntersection
     region1.setSize(start.size());
     region1 = -1;
     normal1.setSize(start.size());
-    normal1 = vector::zero;
+    normal1 = Zero;
 
     // Current end of segment to test.
     pointField nearest(end);
@@ -1185,7 +1185,7 @@ void Foam::refinementSurfaces::findNearestRegion
     hitRegion.setSize(hitSurface.size());
     hitRegion = -1;
     hitNormal.setSize(hitSurface.size());
-    hitNormal = vector::zero;
+    hitNormal = Zero;
 
     forAll(surfacesToTest, i)
     {
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 1d1620e9d6..08aaa80cf9 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -225,14 +225,14 @@ bool Foam::snappyLayerDriver::unmarkExtrusion
     {
         extrudeStatus[patchPointI] = NOEXTRUDE;
         patchNLayers[patchPointI] = 0;
-        patchDisp[patchPointI] = vector::zero;
+        patchDisp[patchPointI] = Zero;
         return true;
     }
     else if (extrudeStatus[patchPointI] == EXTRUDEREMOVE)
     {
         extrudeStatus[patchPointI] = NOEXTRUDE;
         patchNLayers[patchPointI] = 0;
-        patchDisp[patchPointI] = vector::zero;
+        patchDisp[patchPointI] = Zero;
         return true;
     }
     else
@@ -868,7 +868,7 @@ Foam::snappyLayerDriver::makeLayerDisplacementField
                 IOobject::AUTO_WRITE
             ),
             pMesh,
-            dimensionedVector("displacement", dimLength, vector::zero),
+            dimensionedVector("displacement", dimLength, Zero),
             patchFieldTypes,
             actualPatchTypes
         )
@@ -955,7 +955,7 @@ void Foam::snappyLayerDriver::growNoExtrusion
     {
         if (extrudeStatus[patchPointI] == NOEXTRUDE)
         {
-            patchDisp[patchPointI] = vector::zero;
+            patchDisp[patchPointI] = Zero;
             patchNLayers[patchPointI] = 0;
         }
     }
@@ -1520,7 +1520,7 @@ void Foam::snappyLayerDriver::getPatchDisplacement
         {
             // Do not use unmarkExtrusion; forcibly set to zero extrusion.
             patchNLayers[patchPointI] = 0;
-            patchDisp[patchPointI] = vector::zero;
+            patchDisp[patchPointI] = Zero;
         }
         else
         {
@@ -1549,7 +1549,7 @@ void Foam::snappyLayerDriver::getPatchDisplacement
     {
         if (extrudeStatus[patchPointI] == EXTRUDEREMOVE)
         {
-            point avg(vector::zero);
+            point avg(Zero);
             label nPoints = 0;
 
             const labelList& pEdges = pp.pointEdges()[patchPointI];
@@ -1786,7 +1786,7 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
         else if (extrudeStatus[patchPointI] == NOEXTRUDE)
         {
             // Make sure displacement is 0. Should already be so but ...
-            patchDisp[patchPointI] = vector::zero;
+            patchDisp[patchPointI] = Zero;
             patchNLayers[patchPointI] = 0;
         }
     }
@@ -3277,7 +3277,7 @@ void Foam::snappyLayerDriver::addLayers
 
         // Calculate displacement for final layer for addPatchLayer.
         // (layer of cells next to the original mesh)
-        vectorField finalDisp(patchNLayers.size(), vector::zero);
+        vectorField finalDisp(patchNLayers.size(), Zero);
 
         forAll(nPatchPointLayers, i)
         {
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
index 5568f09025..5af612eda6 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
@@ -1097,7 +1097,7 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
                                     medialAxisPt,   //points[pointI],
                                     magSqr(points[pointI]-medialAxisPt),//0.0,
                                     pointI,         // passive data
-                                    vector::zero    // passive data
+                                    Zero    // passive data
                                 )
                             );
                             pointMedialDist[pointI] = maxInfo.last();
@@ -1153,7 +1153,7 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
                                     points[pointI],
                                     0.0,
                                     pointI,         // passive data
-                                    vector::zero    // passive data
+                                    Zero    // passive data
                                 )
                             );
                             pointMedialDist[pointI] = maxInfo.last();
@@ -1203,7 +1203,7 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
                                         points[pointI],
                                         0.0,
                                         pointI,         // passive data
-                                        vector::zero    // passive data
+                                        Zero    // passive data
                                     )
                                 );
                                 pointMedialDist[pointI] = maxInfo.last();
@@ -1584,7 +1584,7 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
                 points[pointI],
                 0.0,
                 thickness[patchPointI],       // transport layer thickness
-                vector::zero                  // passive vector
+                Zero                  // passive vector
             );
         }
 
@@ -1608,7 +1608,7 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
     {
         if (!pointWallDist[pointI].valid(dummyTrackData))
         {
-            displacement[pointI] = vector::zero;
+            displacement[pointI] = Zero;
         }
         else
         {
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 53f234c98f..c4215b1f46 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -189,7 +189,7 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
     // Get average position of boundary face centres
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    vectorField avgBoundary(pointFaces.size(), vector::zero);
+    vectorField avgBoundary(pointFaces.size(), Zero);
     labelList nBoundary(pointFaces.size(), 0);
 
     forAll(pointFaces, patchPointI)
@@ -237,7 +237,7 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
     vectorField avgInternal;
     labelList nInternal;
     {
-        vectorField globalSum(mesh.nPoints(), vector::zero);
+        vectorField globalSum(mesh.nPoints(), Zero);
         labelList globalNum(mesh.nPoints(), 0);
 
         // Note: no use of pointFaces
@@ -351,7 +351,7 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
 
 
     // Displacement to calculate.
-    pointField patchDisp(meshPoints.size(), vector::zero);
+    pointField patchDisp(meshPoints.size(), Zero);
 
     forAll(pointFaces, i)
     {
@@ -426,7 +426,7 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
 //    const labelListList& pointEdges = pp.pointEdges();
 //    const edgeList& edges = pp.edges();
 //
-//    tmp<pointField> tavg(new pointField(pointEdges.size(), vector::zero));
+//    tmp<pointField> tavg(new pointField(pointEdges.size(), Zero));
 //    pointField& avg = tavg();
 //
 //    forAll(pointEdges, vertI)
@@ -872,7 +872,7 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avgCellCentres
 
     tmp<pointField> tavgBoundary
     (
-        new pointField(pointFaces.size(), vector::zero)
+        new pointField(pointFaces.size(), Zero)
     );
     pointField& avgBoundary = tavgBoundary.ref();
     labelList nBoundary(pointFaces.size(), 0);
@@ -1580,7 +1580,7 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
     const fvMesh& mesh = meshRefiner.mesh();
 
     // Displacement per patch point
-    vectorField patchDisp(localPoints.size(), vector::zero);
+    vectorField patchDisp(localPoints.size(), Zero);
 
     if (returnReduce(localPoints.size(), sumOp<label>()) > 0)
     {
@@ -1904,7 +1904,7 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
 //    // the patch.
 //
 //    // Displacement per patch point
-//    vectorField patchDisp(localPoints.size(), vector::zero);
+//    vectorField patchDisp(localPoints.size(), Zero);
 //    // Current best snap distance
 //    scalarField minSnapDist(snapDist);
 //    // Current surface snapped to
@@ -2829,7 +2829,7 @@ void Foam::snappySnapDriver::doSnap
             //    if (snapParams.detectNearSurfacesSnap())
             //    {
             //        nearestPoint.setSize(pp.nPoints(), vector::max);
-            //        nearestNormal.setSize(pp.nPoints(), vector::zero);
+            //        nearestNormal.setSize(pp.nPoints(), Zero);
             //    }
             //
             //    vectorField disp = calcNearestSurface
@@ -3053,7 +3053,7 @@ void Foam::snappySnapDriver::doSnap
             if (snapParams.detectNearSurfacesSnap())
             {
                 nearestPoint.setSize(pp.nPoints(), vector::max);
-                nearestNormal.setSize(pp.nPoints(), vector::zero);
+                nearestNormal.setSize(pp.nPoints(), Zero);
             }
 
             vectorField disp = calcNearestSurface
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index 96cd3c5a51..b101e3ae97 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -150,7 +150,7 @@ void Foam::snappySnapDriver::smoothAndConstrain
         // - same for feature points. They are already attracted to the
         //   nearest feature point.
 
-        vectorField dispSum(pp.nPoints(), vector::zero);
+        vectorField dispSum(pp.nPoints(), Zero);
         labelList dispCount(pp.nPoints(), 0);
 
         const labelListList& pointEdges = pp.pointEdges();
@@ -231,9 +231,9 @@ void Foam::snappySnapDriver::calcNearestFace
 
     // Displacement and orientation per pp face.
     faceDisp.setSize(pp.size());
-    faceDisp = vector::zero;
+    faceDisp = Zero;
     faceSurfaceNormal.setSize(pp.size());
-    faceSurfaceNormal = vector::zero;
+    faceSurfaceNormal = Zero;
     faceSurfaceGlobalRegion.setSize(pp.size());
     faceSurfaceGlobalRegion = -1;
 
@@ -406,7 +406,7 @@ void Foam::snappySnapDriver::calcNearestFace
 
     // Determine rotation axis
     faceRotation.setSize(pp.size());
-    faceRotation = vector::zero;
+    faceRotation = Zero;
 
     forAll(faceRotation, faceI)
     {
@@ -692,7 +692,7 @@ Foam::pointIndexHit Foam::snappySnapDriver::findMultiPatchPoint
             }
         }
     }
-    return pointIndexHit(false, vector::zero, labelMax);
+    return pointIndexHit(false, Zero, labelMax);
 }
 
 
@@ -826,7 +826,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
     pointConstraint& patchConstraint
 ) const
 {
-    patchAttraction = vector::zero;
+    patchAttraction = Zero;
     patchConstraint = pointConstraint();
 
     const List<point>& pfSurfNormals = pointFaceSurfNormals[pointI];
@@ -1048,7 +1048,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
 
     forAll(pp.localPoints(), pointI)
     {
-        vector attraction = vector::zero;
+        vector attraction = Zero;
         pointConstraint constraint;
 
         featureAttractionUsingReconstruction
@@ -1403,7 +1403,7 @@ void Foam::snappySnapDriver::releasePointsNextToMultiPatch
                     //Pout<< "Knocking out constraint"
                     //    << " on non-multiPatchPoint:"
                     //    << pp.localPoints()[pointI] << endl;
-                    patchAttraction[pointI] = vector::zero;
+                    patchAttraction[pointI] = Zero;
                     patchConstraints[pointI] = pointConstraint();
                     nChanged++;
 
@@ -1712,7 +1712,7 @@ Foam::snappySnapDriver::findNearFeaturePoint
                 // Current pointI nearer.
                 pointAttractor[featI][featPointI] = pointI;
                 pointConstraints[featI][featPointI].first() = 3;
-                pointConstraints[featI][featPointI].second() = vector::zero;
+                pointConstraints[featI][featPointI].second() = Zero;
 
                 // Store for later use
                 patchAttraction[pointI] = featPt-pt;
@@ -1720,7 +1720,7 @@ Foam::snappySnapDriver::findNearFeaturePoint
                     pointConstraints[featI][featPointI];
 
                 // Reset oldPointI to nearest on feature edge
-                patchAttraction[oldPointI] = vector::zero;
+                patchAttraction[oldPointI] = Zero;
                 patchConstraints[oldPointI] = pointConstraint();
 
                 findNearFeatureEdge
@@ -1744,7 +1744,7 @@ Foam::snappySnapDriver::findNearFeaturePoint
             // Current pointI nearer.
             pointAttractor[featI][featPointI] = pointI;
             pointConstraints[featI][featPointI].first() = 3;
-            pointConstraints[featI][featPointI].second() = vector::zero;
+            pointConstraints[featI][featPointI].second() = Zero;
 
             // Store for later use
             patchAttraction[pointI] = featPt-pt;
@@ -1831,7 +1831,7 @@ void Foam::snappySnapDriver::determineFeatures
     {
         const point& pt = pp.localPoints()[pointI];
 
-        vector attraction = vector::zero;
+        vector attraction = Zero;
         pointConstraint constraint;
 
         featureAttractionUsingReconstruction
@@ -2373,7 +2373,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
                     pointAttractor[featI][featPointI] = pointI;
                     pointConstraints[featI][featPointI].first() = 3;
                     pointConstraints[featI][featPointI].second() =
-                        vector::zero;
+                        Zero;
 
                     // Store for later use
                     patchAttraction[pointI] = featPt-pt;
@@ -2570,7 +2570,7 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
 
     // Per mesh point the point on nearest feature edge.
     patchAttraction.setSize(pp.nPoints());
-    patchAttraction = vector::zero;
+    patchAttraction = Zero;
     patchConstraints.setSize(pp.nPoints());
     patchConstraints = pointConstraint();
 
@@ -2746,7 +2746,7 @@ void Foam::snappySnapDriver::featureAttractionUsingFeatureEdges
     }
 
     // Reverse: from pp point to nearest feature
-    vectorField rawPatchAttraction(pp.nPoints(), vector::zero);
+    vectorField rawPatchAttraction(pp.nPoints(), Zero);
     List<pointConstraint> rawPatchConstraints(pp.nPoints());
 
     determineFeatures
@@ -3080,11 +3080,11 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
         // vector from point on surface back to face centre
-        vectorField faceDisp(pp.size(), vector::zero);
+        vectorField faceDisp(pp.size(), Zero);
         // normal of surface at point on surface
-        vectorField faceSurfaceNormal(pp.size(), vector::zero);
+        vectorField faceSurfaceNormal(pp.size(), Zero);
         labelList faceSurfaceGlobalRegion(pp.size(), -1);
-        vectorField faceRotation(pp.size(), vector::zero);
+        vectorField faceRotation(pp.size(), Zero);
 
         calcNearestFace
         (
@@ -3132,7 +3132,7 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
 
     // Nearest feature
     patchAttraction.setSize(localPoints.size());
-    patchAttraction = vector::zero;
+    patchAttraction = Zero;
     // Constraints at feature
     patchConstraints.setSize(localPoints.size());
     patchConstraints = pointConstraint();
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index a14224a42b..d795579e82 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ void Foam::cyclicAMIPolyPatch::calcTransforms
     {
         case ROTATIONAL:
         {
-            tensor revT = tensor::zero;
+            tensor revT = Zero;
 
             if (rotationAngleDefined_)
             {
@@ -217,8 +217,8 @@ void Foam::cyclicAMIPolyPatch::calcTransforms
             }
             else
             {
-                point n0 = vector::zero;
-                point n1 = vector::zero;
+                point n0 = Zero;
+                point n1 = Zero;
                 if (half0Ctrs.size())
                 {
                     n0 = findFaceNormalMaxRadius(half0Ctrs);
@@ -485,11 +485,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
     coupledPolyPatch(name, size, start, index, bm, patchType, transform),
     nbrPatchName_(word::null),
     nbrPatchID_(-1),
-    rotationAxis_(vector::zero),
+    rotationAxis_(Zero),
     rotationCentre_(point::zero),
     rotationAngleDefined_(false),
     rotationAngle_(0.0),
-    separationVector_(vector::zero),
+    separationVector_(Zero),
     AMIPtr_(NULL),
     AMIReverse_(false),
     AMIRequireMatch_(true),
@@ -515,11 +515,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
     nbrPatchName_(dict.lookupOrDefault<word>("neighbourPatch", "")),
     coupleGroup_(dict),
     nbrPatchID_(-1),
-    rotationAxis_(vector::zero),
+    rotationAxis_(Zero),
     rotationCentre_(point::zero),
     rotationAngleDefined_(false),
     rotationAngle_(0.0),
-    separationVector_(vector::zero),
+    separationVector_(Zero),
     AMIPtr_(NULL),
     AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
     AMIRequireMatch_(true),
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
index ae0614f8de..1c62449c20 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
@@ -90,7 +90,7 @@ void Foam::axesRotation::calcTransform
                 << "Unhandled axes specifictation" << endl
                 << abort(FatalError);
 
-            Rtr = tensor::zero;
+            Rtr = Zero;
             break;
         }
     }
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
index 572db42283..25cbcc4a47 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
@@ -100,7 +100,7 @@ Foam::cylindrical::cylindrical
 :
     Rptr_(),
     origin_(point::zero),
-    e3_(vector::zero)
+    e3_(Zero)
 {
     // If origin is specified in the coordinateSystem
     if (dict.parent().found("origin"))
@@ -165,8 +165,8 @@ Foam::cylindrical::cylindrical(const dictionary& dict)
 Foam::cylindrical::cylindrical(const tensorField& R)
 :
     Rptr_(),
-    origin_(vector::zero),
-    e3_(vector::zero)
+    origin_(Zero),
+    e3_(Zero)
 {
     Rptr_() = R;
 }
@@ -222,7 +222,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindrical::transform
 Foam::vector Foam::cylindrical::transform(const vector& v) const
 {
     NotImplemented;
-    return vector::zero;
+    return Zero;
 }
 
 
@@ -248,7 +248,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindrical::invTransform
 Foam::vector Foam::cylindrical::invTransform(const vector& v) const
 {
     NotImplemented;
-    return vector::zero;
+    return Zero;
 }
 
 
@@ -284,7 +284,7 @@ Foam::tensor Foam::cylindrical::transformTensor
 {
     NotImplemented;
 
-    return tensor::zero;
+    return Zero;
 }
 
 
@@ -345,7 +345,7 @@ Foam::symmTensor Foam::cylindrical::transformVector
 ) const
 {
     NotImplemented;
-    return symmTensor::zero;
+    return Zero;
 }
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C
index e3d9a53c10..92d1cb40f4 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystem.C
@@ -281,7 +281,7 @@ Foam::tmp<Foam::vectorField> Foam::coordinateSystem::globalToLocal
 void Foam::coordinateSystem::clear()
 {
     note_.clear();
-    origin_ = point::zero;
+    origin_ = Zero;
     R_->clear();
 }
 
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index 6a9c188988..ff831965ad 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -265,7 +265,7 @@ Foam::volumeType Foam::treeDataFace::getVolumeType
             // triangle normals)
             const labelList& pFaces = mesh_.pointFaces()[f[fp]];
 
-            vector pointNormal(vector::zero);
+            vector pointNormal(Zero);
 
             forAll(pFaces, i)
             {
@@ -334,7 +334,7 @@ Foam::volumeType Foam::treeDataFace::getVolumeType
             // triangle normals)
             const labelList& eFaces = mesh_.edgeFaces()[myEdges[myEdgeI]];
 
-            vector edgeNormal(vector::zero);
+            vector edgeNormal(Zero);
 
             forAll(eFaces, i)
             {
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index 2beba5e37e..30265ba8ed 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -286,7 +286,7 @@ Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
             // triangle normals)
             const labelList& eFaces = patch_.edgeFaces()[edgeI];
 
-            vector edgeNormal(vector::zero);
+            vector edgeNormal(Zero);
 
             forAll(eFaces, i)
             {
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 0ecb78004f..c42a97c0dd 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -939,7 +939,7 @@ Foam::mappedPatchBase::mappedPatchBase
     samplePatch_(""),
     coupleGroup_(),
     offsetMode_(UNIFORM),
-    offset_(vector::zero),
+    offset_(Zero),
     offsets_(pp.size(), offset_),
     distance_(0),
     sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@@ -966,7 +966,7 @@ Foam::mappedPatchBase::mappedPatchBase
     samplePatch_(samplePatch),
     coupleGroup_(),
     offsetMode_(NONUNIFORM),
-    offset_(vector::zero),
+    offset_(Zero),
     offsets_(offsets),
     distance_(0),
     sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@@ -1020,7 +1020,7 @@ Foam::mappedPatchBase::mappedPatchBase
     samplePatch_(samplePatch),
     coupleGroup_(),
     offsetMode_(NORMAL),
-    offset_(vector::zero),
+    offset_(Zero),
     offsets_(0),
     distance_(distance),
     sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@@ -1044,7 +1044,7 @@ Foam::mappedPatchBase::mappedPatchBase
     samplePatch_(dict.lookupOrDefault<word>("samplePatch", "")),
     coupleGroup_(dict),
     offsetMode_(UNIFORM),
-    offset_(vector::zero),
+    offset_(Zero),
     offsets_(0),
     distance_(0.0),
     sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@@ -1126,7 +1126,7 @@ Foam::mappedPatchBase::mappedPatchBase
     samplePatch_(dict.lookupOrDefault<word>("samplePatch", "")),
     coupleGroup_(dict), //dict.lookupOrDefault<word>("coupleGroup", "")),
     offsetMode_(UNIFORM),
-    offset_(vector::zero),
+    offset_(Zero),
     offsets_(0),
     distance_(0.0),
     sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C
index 24753a108b..9eac2eeb99 100644
--- a/src/meshTools/meshTools/meshTools.C
+++ b/src/meshTools/meshTools/meshTools.C
@@ -171,7 +171,7 @@ Foam::vectorField Foam::meshTools::calcBoxPointNormals(const primitivePatch& pp)
             }
             else
             {
-                pn[pointI] = vector::zero;
+                pn[pointI] = Zero;
 
                 WarningInFunction
                     << "No visible octant for point:" << pp.meshPoints()[pointI]
diff --git a/src/meshTools/momentOfInertia/momentOfInertia.C b/src/meshTools/momentOfInertia/momentOfInertia.C
index c28ca0325b..98b44ac340 100644
--- a/src/meshTools/momentOfInertia/momentOfInertia.C
+++ b/src/meshTools/momentOfInertia/momentOfInertia.C
@@ -198,8 +198,8 @@ void Foam::momentOfInertia::massPropertiesShell
     // Reset properties for accumulation
 
     mass = 0.0;
-    cM = vector::zero;
-    J = tensor::zero;
+    cM = Zero;
+    J = Zero;
 
     // Find centre of mass
 
@@ -337,8 +337,8 @@ Foam::tensor Foam::momentOfInertia::meshInertia
     }
 
     scalar m = 0.0;
-    vector cM = vector::zero;
-    tensor J = tensor::zero;
+    vector cM = Zero;
+    tensor J = Zero;
 
     massPropertiesSolid(mesh.points(), faces, 1.0, m, cM, J);
 
diff --git a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
index 24e7d39a17..933a95a38a 100644
--- a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
+++ b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
@@ -62,9 +62,9 @@ void Foam::primitiveMeshGeometry::updateFaceCentresAndAreas
         }
         else
         {
-            vector sumN = vector::zero;
+            vector sumN = Zero;
             scalar sumA = 0.0;
-            vector sumAc = vector::zero;
+            vector sumAc = Zero;
 
             point fCentre = p[f[0]];
             for (label pi = 1; pi < nPoints; pi++)
@@ -101,7 +101,7 @@ void Foam::primitiveMeshGeometry::updateCellCentresAndVols
 )
 {
     // Clear the fields for accumulation
-    UIndirectList<vector>(cellCentres_, changedCells) = vector::zero;
+    UIndirectList<vector>(cellCentres_, changedCells) = Zero;
     UIndirectList<scalar>(cellVolumes_, changedCells) = 0.0;
 
     const labelList& own = mesh_.faceOwner();
@@ -110,7 +110,7 @@ void Foam::primitiveMeshGeometry::updateCellCentresAndVols
     // first estimate the approximate cell centre as the average of face centres
 
     vectorField cEst(mesh_.nCells());
-    UIndirectList<vector>(cEst, changedCells) = vector::zero;
+    UIndirectList<vector>(cEst, changedCells) = Zero;
     scalarField nCellFaces(mesh_.nCells());
     UIndirectList<scalar>(nCellFaces, changedCells) = 0.0;
 
@@ -1187,7 +1187,7 @@ bool Foam::primitiveMeshGeometry::checkCellDeterminant
     {
         const cell& cFaces = cells[affectedCells[i]];
 
-        tensor areaSum(tensor::zero);
+        tensor areaSum(Zero);
         scalar magAreaSum = 0;
 
         forAll(cFaces, cFaceI)
diff --git a/src/meshTools/searchableSurface/searchableBox.C b/src/meshTools/searchableSurface/searchableBox.C
index c42150e7ef..ba5da457eb 100644
--- a/src/meshTools/searchableSurface/searchableBox.C
+++ b/src/meshTools/searchableSurface/searchableBox.C
@@ -579,7 +579,7 @@ void Foam::searchableBox::getNormal
 ) const
 {
     normal.setSize(info.size());
-    normal = vector::zero;
+    normal = Zero;
 
     forAll(info, i)
     {
diff --git a/src/meshTools/searchableSurface/searchableCylinder.C b/src/meshTools/searchableSurface/searchableCylinder.C
index 69568fa18d..53c0c48cb3 100644
--- a/src/meshTools/searchableSurface/searchableCylinder.C
+++ b/src/meshTools/searchableSurface/searchableCylinder.C
@@ -93,7 +93,7 @@ Foam::pointIndexHit Foam::searchableCylinder::findNearest
 
     if (magV < ROOTVSMALL)
     {
-        v = vector::zero;
+        v = Zero;
     }
     else
     {
@@ -651,7 +651,7 @@ void Foam::searchableCylinder::getNormal
 ) const
 {
     normal.setSize(info.size());
-    normal = vector::zero;
+    normal = Zero;
 
     forAll(info, i)
     {
diff --git a/src/meshTools/searchableSurface/searchableDisk.C b/src/meshTools/searchableSurface/searchableDisk.C
index b7a7347d5e..a62604c259 100644
--- a/src/meshTools/searchableSurface/searchableDisk.C
+++ b/src/meshTools/searchableSurface/searchableDisk.C
@@ -58,7 +58,7 @@ Foam::pointIndexHit Foam::searchableDisk::findNearest
 
     if (magV < ROOTVSMALL)
     {
-        v = vector::zero;
+        v = Zero;
     }
     else
     {
@@ -85,7 +85,7 @@ void Foam::searchableDisk::findLine
     pointIndexHit& info
 ) const
 {
-    info = pointIndexHit(false, vector::zero, -1);
+    info = pointIndexHit(false, Zero, -1);
 
     vector v(start - origin_);
 
@@ -103,7 +103,7 @@ void Foam::searchableDisk::findLine
 
     if (magV < ROOTVSMALL)
     {
-        v = vector::zero;
+        v = Zero;
     }
     else
     {
diff --git a/src/meshTools/searchableSurface/searchablePlane.C b/src/meshTools/searchableSurface/searchablePlane.C
index c704e18d9c..d059c6ef44 100644
--- a/src/meshTools/searchableSurface/searchablePlane.C
+++ b/src/meshTools/searchableSurface/searchablePlane.C
@@ -46,7 +46,7 @@ Foam::pointIndexHit Foam::searchablePlane::findLine
     const point& end
 ) const
 {
-    pointIndexHit info(true, vector::zero, 0);
+    pointIndexHit info(true, Zero, 0);
 
     linePointRef l(start, end);
 
diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C
index 166aef7752..aacb605b31 100644
--- a/src/meshTools/searchableSurface/searchablePlate.C
+++ b/src/meshTools/searchableSurface/searchablePlate.C
@@ -132,7 +132,7 @@ Foam::pointIndexHit Foam::searchablePlate::findLine
     pointIndexHit info
     (
         true,
-        vector::zero,
+        Zero,
         0
     );
 
@@ -424,7 +424,7 @@ void Foam::searchablePlate::getNormal
 ) const
 {
     normal.setSize(info.size());
-    normal = vector::zero;
+    normal = Zero;
     forAll(normal, i)
     {
         normal[i][normalDir_] = 1.0;
diff --git a/src/meshTools/searchableSurface/searchableSphere.C b/src/meshTools/searchableSurface/searchableSphere.C
index dbdc208e6b..d63749657b 100644
--- a/src/meshTools/searchableSurface/searchableSphere.C
+++ b/src/meshTools/searchableSurface/searchableSphere.C
@@ -326,7 +326,7 @@ void Foam::searchableSphere::getNormal
 ) const
 {
     normal.setSize(info.size());
-    normal = vector::zero;
+    normal = Zero;
 
     forAll(info, i)
     {
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
index d9d578c876..ce9d1addd3 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
@@ -47,7 +47,7 @@ Foam::Pair<Foam::vector> Foam::searchableSurfaceWithGaps::offsetVecs
     const point& end
 ) const
 {
-    Pair<vector> offsets(vector::zero, vector::zero);
+    Pair<vector> offsets(Zero, Zero);
 
     vector n(end-start);
 
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index 9220198b5f..fd9914c725 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -862,7 +862,7 @@ Foam::pointIndexHit Foam::searchableSurfacesQueries::facesIntersection
     // starting point onto the surfaces and the mid point
     List<point> nearest(surfacesToTest.size()+1);
 
-    point sumNearest = vector::zero;
+    point sumNearest = Zero;
 
     forAll(surfacesToTest, i)
     {
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index 507e839c92..22b54df937 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -463,7 +463,7 @@ Foam::triSurfaceMesh::edgeTree() const
           + nInternalEdges()
         );
 
-        treeBoundBox bb(vector::zero, vector::zero);
+        treeBoundBox bb(Zero, Zero);
 
         if (bEdges.size())
         {
@@ -678,7 +678,7 @@ void Foam::triSurfaceMesh::getNormal
             else
             {
                 // Set to what?
-                normal[i] = vector::zero;
+                normal[i] = Zero;
             }
         }
     }
@@ -699,7 +699,7 @@ void Foam::triSurfaceMesh::getNormal
             else
             {
                 // Set to what?
-                normal[i] = vector::zero;
+                normal[i] = Zero;
             }
         }
     }
diff --git a/src/meshTools/sets/faceSources/regionToFace/regionToFace.C b/src/meshTools/sets/faceSources/regionToFace/regionToFace.C
index 5c5f538876..e03a9f5c79 100644
--- a/src/meshTools/sets/faceSources/regionToFace/regionToFace.C
+++ b/src/meshTools/sets/faceSources/regionToFace/regionToFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ void Foam::regionToFace::combine(topoSet& set, const bool add) const
 
     mappedPatchBase::nearInfo ni
     (
-        pointIndexHit(false, vector::zero, -1),
+        pointIndexHit(false, Zero, -1),
         Tuple2<scalar, label>
         (
             sqr(GREAT),
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
index 1e60d1cd27..09ca7c7eee 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -943,7 +943,7 @@ Foam::booleanSurface::booleanSurface
     const pointField& pts = combinedSurf.points();
 
     label minFaceI = -1;
-    pointHit minHit(false, vector::zero, GREAT, true);
+    pointHit minHit(false, Zero, GREAT, true);
 
     forAll(combinedSurf, faceI)
     {
diff --git a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
index 1063a7f6b8..d3a16dd2bc 100644
--- a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
+++ b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::vector Foam::surfaceLocation::normal(const triSurface& s) const
         }
         else
         {
-            vector edgeNormal(vector::zero);
+            vector edgeNormal(Zero);
 
             forAll(eFaces, i)
             {
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C
index 4a5cf4039b..fc4b61767a 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,7 +121,7 @@ Foam::triSurfaceRegionSearch::treeByRegion() const
             );
 
             // Calculate bb without constructing local point numbering.
-            treeBoundBox bb(vector::zero, vector::zero);
+            treeBoundBox bb(Zero, Zero);
 
             if (indirectRegionPatches_[regionI].size())
             {
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
index 15eb7dcf25..e747010075 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -200,7 +200,7 @@ Foam::triSurfaceSearch::tree() const
     if (treePtr_.empty())
     {
         // Calculate bb without constructing local point numbering.
-        treeBoundBox bb(vector::zero, vector::zero);
+        treeBoundBox bb(Zero, Zero);
 
         if (surface().size())
         {
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index 029b28c5a9..47d20dcfc0 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -2118,7 +2118,7 @@ Foam::vector Foam::triSurfaceTools::surfaceNormal
         // Calculate edge normal by averaging face normals
         const labelList& eFaces = surf.edgeFaces()[edgeI];
 
-        vector edgeNormal(vector::zero);
+        vector edgeNormal(Zero);
 
         forAll(eFaces, i)
         {
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index 95b1701ea3..61689f137a 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -201,7 +201,7 @@ Foam::twoDPointCorrector::twoDPointCorrector(const polyMesh& mesh)
     planeNormalPtr_(NULL),
     normalEdgeIndicesPtr_(NULL),
     isWedge_(false),
-    wedgeAxis_(vector::zero),
+    wedgeAxis_(Zero),
     wedgeAngle_(0.0)
 {}
 
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 41c0f5f3db..f75de46e10 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -128,9 +128,9 @@ Foam::forceCoeffs::forceCoeffs
 )
 :
     forces(name, obr, dict, loadFromFiles, false),
-    liftDir_(vector::zero),
-    dragDir_(vector::zero),
-    pitchAxis_(vector::zero),
+    liftDir_(Zero),
+    dragDir_(Zero),
+    pitchAxis_(Zero),
     magUInf_(0.0),
     lRef_(0.0),
     Aref_(0.0)
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index 75ebd61f32..b55eeab66c 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -543,7 +543,7 @@ Foam::forces::forces
     localSystem_(false),
     porosity_(false),
     nBin_(1),
-    binDir_(vector::zero),
+    binDir_(Zero),
     binDx_(0.0),
     binMin_(GREAT),
     binPoints_(),
@@ -602,7 +602,7 @@ Foam::forces::forces
     localSystem_(false),
     porosity_(false),
     nBin_(1),
-    binDir_(vector::zero),
+    binDir_(Zero),
     binDx_(0.0),
     binMin_(GREAT),
     binPoints_(),
@@ -807,13 +807,13 @@ void Foam::forces::calcForcesMoment()
         return;
     }
 
-    force_[0] = vector::zero;
-    force_[1] = vector::zero;
-    force_[2] = vector::zero;
+    force_[0] = Zero;
+    force_[1] = Zero;
+    force_[2] = Zero;
 
-    moment_[0] = vector::zero;
-    moment_[1] = vector::zero;
-    moment_[2] = vector::zero;
+    moment_[0] = Zero;
+    moment_[1] = Zero;
+    moment_[2] = Zero;
 
     if (directForceDensity_)
     {
@@ -848,7 +848,7 @@ void Foam::forces::calcForcesMoment()
             vectorField fT(sA*fD.boundaryField()[patchI] - fN);
 
             //- Porous force
-            vectorField fP(Md.size(), vector::zero);
+            vectorField fP(Md.size(), Zero);
 
             applyBins(Md, fN, fT, fP, mesh.C().boundaryField()[patchI]);
         }
@@ -886,7 +886,7 @@ void Foam::forces::calcForcesMoment()
 
             vectorField fT(Sfb[patchI] & devRhoReffb[patchI]);
 
-            vectorField fP(Md.size(), vector::zero);
+            vectorField fP(Md.size(), Zero);
 
             applyBins(Md, fN, fT, fP, mesh.C().boundaryField()[patchI]);
         }
@@ -929,7 +929,7 @@ void Foam::forces::calcForcesMoment()
                 const vectorField fP(fPTot, cZone);
                 const vectorField Md(d - coordSys_.origin());
 
-                const vectorField fDummy(Md.size(), vector::zero);
+                const vectorField fDummy(Md.size(), Zero);
 
                 applyBins(Md, fDummy, fDummy, fP, d);
             }
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
index 3dd1877a87..84a50de5f8 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
+++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
@@ -197,7 +197,7 @@ Foam::pressureTools::pressureTools
     pRef_(0.0),
     calcCoeff_(false),
     pInf_(0.0),
-    UInf_(vector::zero),
+    UInf_(Zero),
     rhoInf_(0.0)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
diff --git a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
index 5fb24ce1f7..6d22f5a977 100644
--- a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
+++ b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ Foam::vorticity::vorticity
                     IOobject::NO_WRITE
                 ),
                 mesh,
-                dimensionedVector("0", dimless/dimTime, vector::zero)
+                dimensionedVector("0", dimless/dimTime, Zero)
             )
         );
 
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
index 7f86ed6944..b8a7bf66d2 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ Foam::wallShearStress::wallShearStress
                 (
                     "0",
                     sqr(dimLength)/sqr(dimTime),
-                    vector::zero
+                    Zero
                 )
             )
         );
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.C b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
index ba750c9f76..62a6dba740 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1D.C
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
@@ -217,7 +217,7 @@ Foam::tmp<Foam::labelField> Foam::regionModels::regionModel1D::moveMesh
                 oldCf[i + 1] = regionMesh().faceCentres()[faces[i]];
             }
 
-            vector newDelta = vector::zero;
+            vector newDelta = Zero;
             point nbrCf = oldCf[0];
 
             forAll(faces, i)
@@ -229,7 +229,7 @@ Foam::tmp<Foam::labelField> Foam::regionModels::regionModel1D::moveMesh
 
                 newDelta += (deltaV[cellI]/mag(sf))*n;
 
-                vector localDelta = vector::zero;
+                vector localDelta = Zero;
                 forAll(f, pti)
                 {
                     const label pointI = f[pti];
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
index aba31e75dd..11350225c3 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ void Foam::regionModels::singleLayerRegion::constructMeshObjects()
                 NO_WRITE
             ),
             regionMesh(),
-            dimensionedVector("zero", dimless, vector::zero),
+            dimensionedVector("zero", dimless, Zero),
             zeroGradientFvPatchField<vector>::typeName
         )
     );
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index ae5357b185..bf49d5b168 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -88,7 +88,7 @@ void kinematicSingleLayer::resetPrimaryRegionSourceTerms()
     }
 
     rhoSpPrimary_ == dimensionedScalar("zero", rhoSp_.dimensions(), 0.0);
-    USpPrimary_ == dimensionedVector("zero", USp_.dimensions(), vector::zero);
+    USpPrimary_ == dimensionedVector("zero", USp_.dimensions(), Zero);
     pSpPrimary_ == dimensionedScalar("zero", pSp_.dimensions(), 0.0);
 }
 
@@ -644,7 +644,7 @@ kinematicSingleLayer::kinematicSingleLayer
         regionMesh(),
         dimensionedVector
         (
-            "zero", dimMass*dimVelocity/dimArea/dimTime, vector::zero
+            "zero", dimMass*dimVelocity/dimArea/dimTime, Zero
         ),
         this->mappedPushedFieldPatchTypes<vector>()
     ),
@@ -688,7 +688,7 @@ kinematicSingleLayer::kinematicSingleLayer
             IOobject::NO_WRITE
         ),
         primaryMesh(),
-        dimensionedVector("zero", USp_.dimensions(), vector::zero)
+        dimensionedVector("zero", USp_.dimensions(), Zero)
     ),
     pSpPrimary_
     (
@@ -728,7 +728,7 @@ kinematicSingleLayer::kinematicSingleLayer
             IOobject::NO_WRITE
         ),
         regionMesh(),
-        dimensionedVector("zero", dimVelocity, vector::zero),
+        dimensionedVector("zero", dimVelocity, Zero),
         this->mappedFieldAndInternalPatchTypes<vector>()
     ),
     pPrimary_
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
index 4a1c6383e8..fea9663477 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
@@ -83,7 +83,7 @@ tmp<volVectorField> laminar::Us() const
                 IOobject::NO_WRITE
             ),
             owner_.regionMesh(),
-            dimensionedVector("zero", dimVelocity, vector::zero),
+            dimensionedVector("zero", dimVelocity, Zero),
             extrapolatedCalculatedFvPatchVectorField::typeName
         )
     );
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
index c8d111579e..d560d810c3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
@@ -149,7 +149,7 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
                 IOobject::NO_WRITE
             ),
             owner_.regionMesh(),
-            dimensionedVector("zero", dimForce/dimArea, vector::zero)
+            dimensionedVector("zero", dimForce/dimArea, Zero)
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index 72ec8a44ba..0fd83cea97 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -229,7 +229,7 @@ curvatureSeparation::curvatureSeparation
     deltaByR1Min_(coeffDict_.lookupOrDefault<scalar>("deltaByR1Min", 0.0)),
     definedPatchRadii_(),
     magG_(mag(owner.g().value())),
-    gHat_(vector::zero)
+    gHat_(Zero)
 {
     if (magG_ < ROOTVSMALL)
     {
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index a2fa567a5b..a770c7ced9 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -221,7 +221,7 @@ void Foam::rigidBodyMeshMotion::solve()
         curTimeIndex_ = this->db().time().timeIndex();
     }
 
-    dimensionedVector g("g", dimAcceleration, vector::zero);
+    dimensionedVector g("g", dimAcceleration, Zero);
 
     if (db().foundObject<uniformDimensionedVectorField>("g"))
     {
diff --git a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
index cdf9384be6..c4e4773376 100644
--- a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
+++ b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -169,7 +169,7 @@ Foam::point Foam::triSurfaceMeshPointSet::getRefPoint(const List<point>& pts)
     }
     else
     {
-        return vector::zero;
+        return Zero;
     }
 }
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index bff64af5cf..e698b3c8c9 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -470,7 +470,7 @@ void Foam::isoSurface::calcCutTypes
 // Caculate centre of surface.
 Foam::point Foam::isoSurface::calcCentre(const triSurface& s)
 {
-    vector sum = vector::zero;
+    vector sum = Zero;
 
     forAll(s, i)
     {
@@ -510,7 +510,7 @@ void Foam::isoSurface::calcSnappedCc
 
             localTriPoints.clear();
             label nOther = 0;
-            point otherPointSum = vector::zero;
+            point otherPointSum = Zero;
 
             // Create points for all intersections close to cell centre
             // (i.e. from pyramid edges)
@@ -696,7 +696,7 @@ void Foam::isoSurface::calcSnappedPoint
 
         localTriPoints.clear();
         label nOther = 0;
-        point otherPointSum = vector::zero;
+        point otherPointSum = Zero;
 
         forAll(pFaces, pFaceI)
         {
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index afd756ac3c..e4b03e09fa 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -250,7 +250,7 @@ Foam::labelPair Foam::isoSurfaceCell::findCommonPoints
 
 Foam::point Foam::isoSurfaceCell::calcCentre(const triSurface& s)
 {
-    vector sum = vector::zero;
+    vector sum = Zero;
 
     forAll(s, i)
     {
@@ -267,7 +267,7 @@ Foam::pointIndexHit Foam::isoSurfaceCell::collapseSurface
     DynamicList<labelledTri, 64>& localTris
 ) const
 {
-    pointIndexHit info(false, vector::zero, localTris.size());
+    pointIndexHit info(false, Zero, localTris.size());
 
     if (localTris.size() == 1)
     {
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index b69b8065be..0595948e73 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ sixDoFRigidBodyDisplacementPointPatchVectorField
     rhoInf_(1.0),
     rhoName_("rho"),
     lookupGravity_(-1),
-    g_(vector::zero),
+    g_(Zero),
     curTimeIndex_(-1)
 {}
 
@@ -70,7 +70,7 @@ sixDoFRigidBodyDisplacementPointPatchVectorField
     rhoInf_(1.0),
     rhoName_(dict.lookupOrDefault<word>("rhoName", "rho")),
     lookupGravity_(-1),
-    g_(vector::zero),
+    g_(Zero),
     curTimeIndex_(-1)
 {
     if (rhoName_ == "rhoInf")
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
index d567e3e04a..98d1fc871b 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -160,7 +160,7 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
         firstIter = true;
     }
 
-    vector gravity = vector::zero;
+    vector gravity = Zero;
 
     if (db().foundObject<uniformDimensionedVectorField>("g"))
     {
@@ -175,7 +175,7 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
     (
         firstIter,
         gravity*motion_.mass(),
-        vector::zero,
+        Zero,
         t.deltaTValue(),
         t.deltaT0Value()
     );
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C
index 90b162078f..c3a0cb965b 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ constrainRotation
     pointConstraint& pc
 ) const
 {
-    pc.combine(pointConstraint(Tuple2<label, vector>(3, vector::zero)));
+    pc.combine(pointConstraint(Tuple2<label, vector>(3, Zero)));
 }
 
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
index 56e79b30f5..32021c0747 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ void Foam::sixDoFRigidBodyMotionConstraints::point::constrainTranslation
     pointConstraint& pc
 ) const
 {
-    pc.combine(pointConstraint(Tuple2<label, vector>(3, vector::zero)));
+    pc.combine(pointConstraint(Tuple2<label, vector>(3, Zero)));
 }
 
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
index 7f0d8ddb01..2237bf6963 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,13 +120,13 @@ Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::restrain
     }
     else
     {
-        a = vector::zero;
+        a = Zero;
     }
 
     // Damping of along axis angular velocity only
     restraintMoment = -stiffness_*theta*a - damping_*(motion.omega() & a)*a;
 
-    restraintForce = vector::zero;
+    restraintForce = Zero;
 
     // Not needed to be altered as restraintForce is zero, but set to
     // centreOfRotation to be sure of no spurious moment
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C
index 3ce4308d9f..5d70d4db11 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearDamper::restrain
 ) const
 {
     restraintForce = -coeff_*motion.v();
-    restraintMoment = vector::zero;
+    restraintMoment = Zero;
 
     if (motion.report())
     {
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C
index 754177bbd5..40b19b2006 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::restrain
 
     restraintForce = -stiffness_*(magR - restLength_)*r - damping_*(r & v)*r;
 
-    restraintMoment = vector::zero;
+    restraintMoment = Zero;
 
     if (motion.report())
     {
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C
index d372a67148..f073125666 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularDamper::restrain
 ) const
 {
     restraintMoment = -coeff_*motion.omega();
-    restraintForce = vector::zero;
+    restraintForce = Zero;
 
     if (motion.report())
     {
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
index 4ae6f217a4..aa012153ce 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,14 +80,14 @@ void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::restrain
     vector& restraintMoment
 ) const
 {
-    restraintMoment = vector::zero;
+    restraintMoment = Zero;
 
     for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
     {
-        vector axis = vector::zero;
+        vector axis = Zero;
         axis[cmpt] = 1;
 
-        vector refDir = vector::zero;
+        vector refDir = Zero;
         refDir[(cmpt + 1) % 3] = 1;
 
         vector newDir = motion.orientation() & refDir;
@@ -101,7 +101,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::restrain
 
     restraintMoment += -damping_*motion.omega();
 
-    restraintForce = vector::zero;
+    restraintForce = Zero;
 
     // Not needed to be altered as restraintForce is zero, but set to
     // centreOfRotation to be sure of no spurious moment
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
index acaeea98fc..000ca2618f 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::restrain
     // Damping of along axis angular velocity only
     restraintMoment = moment*axis_ - damping_*(motion.omega() & axis_)*axis_;
 
-    restraintForce = vector::zero;
+    restraintForce = Zero;
 
     // Not needed to be altered as restraintForce is zero, but set to
     // centreOfRotation to be sure of no spurious moment
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
index 3cad6ca354..06774ef78b 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
@@ -46,13 +46,13 @@ void Foam::sixDoFRigidBodyMotion::applyRestraints()
             }
 
             // Restraint position
-            point rP = vector::zero;
+            point rP = Zero;
 
             // Restraint force
-            vector rF = vector::zero;
+            vector rF = Zero;
 
             // Restraint moment
-            vector rM = vector::zero;
+            vector rM = Zero;
 
             // Accumulate the restraints
             restraints_[rI].restrain(*this, rP, rF, rM);
@@ -78,8 +78,8 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion()
     constraints_(),
     tConstraints_(tensor::I),
     rConstraints_(tensor::I),
-    initialCentreOfMass_(vector::zero),
-    initialCentreOfRotation_(vector::zero),
+    initialCentreOfMass_(Zero),
+    initialCentreOfRotation_(Zero),
     initialQ_(I),
     mass_(VSMALL),
     momentOfInertia_(diagTensor::one*VSMALL),
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C
index 24eeda45d8..f6328c1057 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,12 +29,12 @@ License
 
 Foam::sixDoFRigidBodyMotionState::sixDoFRigidBodyMotionState()
 :
-    centreOfRotation_(vector::zero),
+    centreOfRotation_(Zero),
     Q_(I),
-    v_(vector::zero),
-    a_(vector::zero),
-    pi_(vector::zero),
-    tau_(vector::zero)
+    v_(Zero),
+    a_(Zero),
+    pi_(Zero),
+    tau_(Zero)
 {}
 
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
index 2ca63eb8f3..4bc236df58 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -187,7 +187,7 @@ void Foam::sixDoFRigidBodyMotionSolver::solve()
         firstIter = true;
     }
 
-    dimensionedVector g("g", dimAcceleration, vector::zero);
+    dimensionedVector g("g", dimAcceleration, Zero);
 
     if (db().foundObject<uniformDimensionedVectorField>("g"))
     {
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index 92f0ae3084..224d8f8743 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -108,8 +108,8 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
         mesh_,
         dimensionedScalar("Qem", dimMass/pow3(dimTime), 0.0)
     ),
-    d_(vector::zero),
-    dAve_(vector::zero),
+    d_(Zero),
+    dAve_(Zero),
     theta_(theta),
     phi_(phi),
     omega_(0.0),
diff --git a/src/triSurface/faceTriangulation/faceTriangulation.C b/src/triSurface/faceTriangulation/faceTriangulation.C
index 6b44c53065..c34dbb1ac5 100644
--- a/src/triSurface/faceTriangulation/faceTriangulation.C
+++ b/src/triSurface/faceTriangulation/faceTriangulation.C
@@ -218,7 +218,7 @@ void Foam::faceTriangulation::findDiagonal
 
     label faceVertI = f.fcIndex(startIndex);
 
-    pointHit minInter(false, vector::zero, GREAT, true);
+    pointHit minInter(false, Zero, GREAT, true);
     label minIndex = -1;
     scalar minPosOnEdge = GREAT;
 

From 2797ec2d27e6ea19918a49793683bf51bde6e975 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 16 Apr 2016 18:43:51 +0100
Subject: [PATCH 422/447] externalWallHeatFluxTemperatureFvPatchScalarField:
 Corrected handling of QrPrevious_ Patch contributed by Bruno Santos Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=2052

---
 ...ternalWallHeatFluxTemperatureFvPatchScalarField.C |  4 +++-
 ...ternalWallHeatFluxTemperatureFvPatchScalarField.H | 12 ++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index 9a23256da0..e0f2f2cba5 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -70,7 +70,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
     q_(p.size(), 0.0),
     h_(p.size(), 0.0),
     Ta_(p.size(), 0.0),
-    QrPrevious_(p.size()),
+    QrPrevious_(p.size(), 0.0),
     QrRelaxation_(1),
     QrName_("undefined-Qr"),
     thicknessLayers_(),
@@ -228,6 +228,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::autoMap
     q_.autoMap(m);
     h_.autoMap(m);
     Ta_.autoMap(m);
+    QrPrevious_.autoMap(m);
 }
 
 
@@ -245,6 +246,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::rmap
     q_.rmap(tiptf.q_, addr);
     h_.rmap(tiptf.h_, addr);
     Ta_.rmap(tiptf.Ta_, addr);
+    QrPrevious_.rmap(tiptf.QrPrevious_, addr);
 }
 
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
index 163cb9537d..8e1e3a8c25 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,9 +82,13 @@ Description
     }
     \endverbatim
 
-Note
-  - Only supply \c h and \c Ta, or \c q in the dictionary (see above)
-  - kappa entries can be: fluidThermo, solidThermo or lookup
+  Note:
+
+    \li Only supply \c h and \c Ta, or \c q in the dictionary (see above)
+    \li \c kappa and \c kappaName are inherited from temperatureCoupledBase.
+
+SeeAlso
+    Foam::temperatureCoupledBase
 
 SourceFiles
     externalWallHeatFluxTemperatureFvPatchScalarField.C

From 2e990f19d85051d7f5b68f03b8f1fcb44f08d2fe Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 17 Apr 2016 15:29:51 +0100
Subject: [PATCH 423/447] Updated references See also
 http://www.openfoam.org/mantisbt/view.php?id=2036

---
 .../tetrahedron/tetrahedronI.H                |  2 +-
 .../primitiveShapes/triangle/triangleI.H      |  2 +-
 .../PairSpringSliderDashpot.H                 |  2 +-
 .../distribution/distribution.C               |  2 +-
 .../pairPotential/derived/azizChen/azizChen.H | 21 ++++---------
 .../derived/maitlandSmith/maitlandSmith.H     | 30 +++++--------------
 .../BrownianMotion/BrownianMotionForce.H      | 13 ++++++--
 7 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
index 10db7e8d96..4863ec2202 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
@@ -319,7 +319,7 @@ Foam::scalar Foam::tetrahedron<Point, PointRef>::barycentric
     List<scalar>& bary
 ) const
 {
-    // From:
+    // Reference:
     // http://en.wikipedia.org/wiki/Barycentric_coordinate_system_(mathematics)
 
     vector e0(a_ - d_);
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
index 96d3cffb84..f4eeb23898 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
@@ -270,7 +270,7 @@ Foam::scalar Foam::triangle<Point, PointRef>::barycentric
     List<scalar>& bary
 ) const
 {
-    // From:
+    // Reference:
     // Real-time collision detection, Christer Ericson, 2005, p47-48
 
     vector v0 = b_ - a_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
index d96fcdddc4..fd970a90e9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
@@ -140,7 +140,7 @@ public:
         // centres separated by a distance rAB.  Assumes rAB < (rA + rB).
         inline scalar overlapArea(scalar rA, scalar rB, scalar rAB) const
         {
-            // From:
+            // Reference:
             // http://mathworld.wolfram.com/Sphere-SphereIntersection.html
             return
                 mathematical::pi/4.0
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
index 2bbccf60fc..da37720b9c 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
@@ -147,7 +147,7 @@ Foam::scalar Foam::distribution::mean() const
 
 Foam::scalar Foam::distribution::median()
 {
-    // From:
+    // Reference:
     // http://mathworld.wolfram.com/StatisticalMedian.html
     // The statistical median is the value of the distribution variable
     // where the cumulative distribution = 0.5.
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
index c08341dc9a..9b3705fd8f 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,23 +25,12 @@ Class
     Foam::pairPotentials::azizChen
 
 Description
-    Foam::pairPotentials::azizChen
 
-    From:
+    Reference:
     \verbatim
-        \article{MA_Aziz_Chen,
-        author = {R. A. Aziz and H. H. Chen},
-        collaboration = {},
-        title = {An accurate intermolecular potential for argon},
-        publisher = {AIP},
-        year = {1977},
-        journal = {The Journal of Chemical Physics},
-        volume = {67},
-        number = {12},
-        pages = {5719-5726},
-        url = {http://link.aip.org/link/?JCP/67/5719/1},
-        doi = {10.1063/1.434827}
-        }
+        Aziz, R. A. & Chen, H.H. (1977).
+        An Accurate Intermolecular Potential for Argon.
+        Journal of Chemical Physics, Vol. 67, No. 12, p. 5179.
     \endverbatim
 
 SourceFiles
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
index e766bfba34..c3d944e6a3 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,33 +25,19 @@ Class
     Foam::pairPotentials::maitlandSmith
 
 Description
-    Foam::pairPotentials::maitlandSmith
 
-    From:
+    Reference:
     \verbatim
-        @ARTICLE{MA_Maitland_Smith,
-        author = {{Maitland}, G.~C. and {Smith}, E.~B.},
-        title = {A simplified representation of
-        intermolecular potential energy},
-        journal = {Chemical Physics Letters},
-        year = 1973,
-        month = oct,
-        volume = 22,
-        pages = {443-446},
-        adsurl = {http://adsabs.harvard.edu/abs/1973CPL....22..443M},
-        adsnote = {Provided by the SAO/NASA Astrophysics Data System}
-        }
+        Maitland, G. C., & Smith, E. B. (1973).
+        A simplified representation of intermolecular potential energy.
+        Chemical Physics Letters, 22(3), 443-446.
     \endverbatim
 
     Parameters for other monoatomics from:
     \verbatim
-        @BOOK{MD_Maitland_Rigby_Smith_Wakeham,
-        AUTHOR =       {Geoffrey C. Maitland and Maurice Rigby and
-        E. Brian Smith and William A. Wakeham},
-        TITLE =        {Intermolecular Forces: Their Origin and Determination},
-        PUBLISHER =    {Oxford University Press},
-        YEAR =         {1981}
-        }
+        Maitland, G. C., Rigby, M., Smith, E., Wakeham, W. (1981).
+        Intermolecular forces: Their origin and determination.
+        Oxford: Clarendon Press.
     \endverbatim
 
 SourceFiles
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
index 8cac9f0e6f..0c7a5e89f7 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
@@ -25,7 +25,16 @@ Class
     Foam::BrownianMotionForce
 
 Description
-    Calculates particle Brownian motion force
+    Calculates particle Brownian motion force.
+
+    Reference:
+    \verbatim
+        Li, A., & Ahmadi, G. (1992).
+        Dispersion and deposition of spherical particles from point sources
+        in a turbulent channel flow.
+        Aerosol science and technology,
+        16(4), 209-226.
+    \endverbatim
 
 SourceFiles
     BrownianMotionForceI.H
@@ -129,7 +138,7 @@ public:
             //- Cache fields
             virtual void cacheFields(const bool store);
 
-            //- Calculate the non-coupled force
+            //- Calculate the coupled force
             virtual forceSuSp calcCoupled
             (
                 const typename CloudType::parcelType& p,

From 6862e3d76ee82756737ad5bd9a455c9bba032ffa Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 17 Apr 2016 15:39:09 +0100
Subject: [PATCH 424/447] BrownianMotionForce: Corrected expression for s0
 Patch provided by Bruno Santos Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2036

---
 .../ParticleForces/BrownianMotion/BrownianMotionForce.C        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index 9dffc11bcd..3903093628 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -187,9 +187,8 @@ Foam::forceSuSp Foam::BrownianMotionForce<CloudType>::calcCoupled
     }
     else
     {
-        const scalar rhoRatio = p.rho()/p.rhoc();
         const scalar s0 =
-            216*muc*sigma*Tc/(sqr(mathematical::pi)*pow5(dp)*(rhoRatio)*cc);
+            216*muc*sigma*Tc/(sqr(mathematical::pi)*pow5(dp)*sqr(p.rho())*cc);
         f = eta*sqrt(mathematical::pi*s0/dt);
     }
 

From 0ea229ccc880ae9564f5b339060ad2d94f78db23 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 17 Apr 2016 15:45:29 +0100
Subject: [PATCH 425/447] PtrListIO: Indent list elements on output.
 Particularly useful for lists of dictionaries.

---
 src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C b/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C
index 81741ed1c6..893a1cfd02 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -188,7 +188,8 @@ template<class T>
 Foam::Ostream& Foam::operator<<(Ostream& os, const PtrList<T>& L)
 {
     // Write size and start delimiter
-    os << nl << L.size() << nl << token::BEGIN_LIST;
+    os  << nl << indent << L.size() << nl
+        << indent << token::BEGIN_LIST << incrIndent;
 
     // Write contents
     forAll(L, i)
@@ -197,7 +198,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const PtrList<T>& L)
     }
 
     // Write end delimiter
-    os << nl << token::END_LIST << nl;
+    os << nl << decrIndent << indent << token::END_LIST << nl;
 
     // Check state of IOstream
     os.check("Ostream& operator<<(Ostream&, const PtrList&)");

From 312d613f73ad9636230a5e73c3cd1431bc14cf75 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 17 Apr 2016 15:46:22 +0100
Subject: [PATCH 426/447] rigidBodyMeshMotion: Read initial state and g from
 dictionary if present

---
 .../rigidBodyModelState/rigidBodyModelStateIO.C      |  2 +-
 .../rigidBodyMotion/rigidBodyMotion.C                | 12 +++++++++++-
 src/rigidBodyMeshMotion/rigidBodyMeshMotion.C        | 11 ++---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
index bf30398b9b..c17819b410 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
@@ -76,7 +76,7 @@ Foam::Ostream& Foam::RBD::operator<<
     const rigidBodyModelState& state
 )
 {
-    os  << token::SPACE << state.q_
+    os  << state.q_
         << token::SPACE << state.qDot_
         << token::SPACE << state.qDdot_
         << token::SPACE << state.deltaT_;
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
index d6bf0ffbef..30ad316f6c 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
@@ -59,7 +59,7 @@ Foam::RBD::rigidBodyMotion::rigidBodyMotion
 )
 :
     rigidBodyModel(dict),
-    motionState_(*this),
+    motionState_(*this, dict),
     motionState0_(motionState_),
     X00_(X0_.size()),
     aRelax_(dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0)),
@@ -67,6 +67,11 @@ Foam::RBD::rigidBodyMotion::rigidBodyMotion
     report_(dict.lookupOrDefault<Switch>("report", false)),
     solver_(rigidBodySolver::New(*this, dict.subDict("solver")))
 {
+    if (dict.found("g"))
+    {
+        g() = vector(dict.lookup("g"));
+    }
+
     initialize();
 }
 
@@ -86,6 +91,11 @@ Foam::RBD::rigidBodyMotion::rigidBodyMotion
     report_(dict.lookupOrDefault<Switch>("report", false)),
     solver_(rigidBodySolver::New(*this, dict.subDict("solver")))
 {
+    if (dict.found("g"))
+    {
+        g() = vector(dict.lookup("g"));
+    }
+
     initialize();
 }
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index a770c7ced9..f114cfc6b6 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -221,18 +221,11 @@ void Foam::rigidBodyMeshMotion::solve()
         curTimeIndex_ = this->db().time().timeIndex();
     }
 
-    dimensionedVector g("g", dimAcceleration, Zero);
-
     if (db().foundObject<uniformDimensionedVectorField>("g"))
     {
-        g = db().lookupObject<uniformDimensionedVectorField>("g");
+        model_.g() =
+            db().lookupObject<uniformDimensionedVectorField>("g").value();
     }
-    else if (coeffDict().found("g"))
-    {
-        coeffDict().lookup("g") >> g;
-    }
-
-    model_.g() = g.value();
 
     if (test_)
     {

From e47179a70dd7ae393e81511f94d274225930d345 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 17 Apr 2016 15:47:03 +0100
Subject: [PATCH 427/447] 
 applications/test/rigidBodyDynamics/pendulumAndSpring: Another slightly more
 complex test

---
 .../pendulumAndSpring/Make/files              |  3 +
 .../pendulumAndSpring/Make/options            |  5 +
 .../pendulumAndSpring/pendulumAndSpring       | 64 +++++++++++++
 .../pendulumAndSpring/pendulumAndSpring.C     | 92 +++++++++++++++++++
 .../pendulumAndSpring.gnuplot                 | 53 +++++++++++
 5 files changed, 217 insertions(+)
 create mode 100644 applications/test/rigidBodyDynamics/pendulumAndSpring/Make/files
 create mode 100644 applications/test/rigidBodyDynamics/pendulumAndSpring/Make/options
 create mode 100644 applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring
 create mode 100644 applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C
 create mode 100644 applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.gnuplot

diff --git a/applications/test/rigidBodyDynamics/pendulumAndSpring/Make/files b/applications/test/rigidBodyDynamics/pendulumAndSpring/Make/files
new file mode 100644
index 0000000000..aef882dc34
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/pendulumAndSpring/Make/files
@@ -0,0 +1,3 @@
+pendulumAndSpring.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-pendulumAndSpring
diff --git a/applications/test/rigidBodyDynamics/pendulumAndSpring/Make/options b/applications/test/rigidBodyDynamics/pendulumAndSpring/Make/options
new file mode 100644
index 0000000000..4a9d828b67
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/pendulumAndSpring/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/rigidBodyDynamics/lnInclude
+
+EXE_LIBS = \
+    -lrigidBodyDynamics
diff --git a/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring b/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring
new file mode 100644
index 0000000000..ec9c3517b7
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring
@@ -0,0 +1,64 @@
+solver
+{
+    type Newmark;
+}
+
+// It is necessary to iterate for the Newmark solver
+nIter 2;
+
+bodies
+{
+    M
+    {
+        type            sphere;
+        parent          root;
+        mass            6e4;
+        radius          0.01;
+        transform       (1 0 0 0 1 0 0 0 1) (0 0 0);
+        joint
+        {
+            type composite;
+
+            joints
+            (
+                {
+                    type            Px;
+                }
+                {
+                    type            Rz;
+                }
+            );
+        }
+    }
+
+    m
+    {
+        type            sphere;
+        parent          M;
+        mass            6e3;
+        radius          0.01;
+        transform       (1 0 0 0 1 0 0 0 1) (0 -5 0);
+        mergeWith       M;
+    }
+}
+
+restraints
+{
+    spring
+    {
+        type            linearSpring;
+        body            M;
+        anchor          (0 0 0);
+        refAttachmentPt (0 0 0);
+        stiffness       1e5;
+        damping         0;
+        restLength      0;
+    }
+}
+
+// Set the gravitational acceleration
+g (0 -9.81 0);
+
+// Set the initial offset of the pendulum to 1.5m
+// and the angle of the pendulum to 30deg
+q (1.5 0.5235987);
diff --git a/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C b/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C
new file mode 100644
index 0000000000..94e151f69c
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+Application
+    pendulumAndSpring
+
+Description
+    Simple 2-DoF pendulum and spring simulation.
+
+\*---------------------------------------------------------------------------*/
+
+#include "rigidBodyMotion.H"
+#include "masslessBody.H"
+#include "sphere.H"
+#include "joints.H"
+#include "rigidBodyRestraint.H"
+#include "rigidBodyModelState.H"
+#include "IFstream.H"
+#include "OFstream.H"
+#include "constants.H"
+
+using namespace Foam;
+using namespace RBD;
+using namespace Foam::constant::mathematical;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    dictionary pendulumAndSpringDict(IFstream("pendulumAndSpring")());
+
+    // Create the pendulumAndSpring model from dictionary
+    rigidBodyMotion pendulumAndSpring(pendulumAndSpringDict);
+
+    label nIter(readLabel(pendulumAndSpringDict.lookup("nIter")));
+
+    Info<< pendulumAndSpring << endl;
+    Info<< "// Joint state " << endl;
+    pendulumAndSpring.state().write(Info);
+
+    // Create the joint-space force field
+    scalarField tau(pendulumAndSpring.nDoF(), Zero);
+
+    // Create the external body force field
+    Field<spatialVector> fx(pendulumAndSpring.nBodies(), Zero);
+
+    OFstream xFile("xVsTime");
+    OFstream omegaFile("omegaVsTime");
+
+    // Integrate the motion of the pendulumAndSpring for 100s
+    scalar deltaT = 0.01;
+    for (scalar t=0; t<20; t+=deltaT)
+    {
+        pendulumAndSpring.newTime();
+
+        for (label i=0; i<nIter; i++)
+        {
+            pendulumAndSpring.solve(deltaT, tau, fx);
+        }
+
+        // Write the results for graph generation
+        xFile << t << " " << pendulumAndSpring.state().q()[0] << endl;
+        omegaFile << t << " " << pendulumAndSpring.state().q()[1] << endl;
+    }
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.gnuplot b/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.gnuplot
new file mode 100644
index 0000000000..90e5c9b4ce
--- /dev/null
+++ b/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.gnuplot
@@ -0,0 +1,53 @@
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2016 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/>.
+#
+# Script
+#     pendulumAndSpring.gnuplot
+#
+# Description
+#     Creates an PostScript graph file of Test-pendulumAndSpring results
+#
+#------------------------------------------------------------------------------
+
+reset
+
+set xlabel "Time/[s]"
+set ylabel "x"
+set y2label "omega"
+
+set ytics nomirror
+set y2tics
+
+set yrange [-1.5:1.5]
+set y2range [-35:35]
+
+set xzeroaxis
+
+set terminal postscript eps color enhanced solid
+set output "pendulumAndSpring.eps"
+
+plot \
+    "xVsTime" u 1:2 w l t "x", \
+    "omegaVsTime" u 1:(57.29578*$2) w l axes x1y2 t "omega"
+
+#------------------------------------------------------------------------------

From e7ef7ed4e6f0fbdc5adb4f831ca747d09bd70585 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 17 Apr 2016 21:02:57 +0100
Subject: [PATCH 428/447] src/OpenFOAM/primitives: inherit operator=(const
 Foam::zero) from base class where appropriate

---
 src/OpenFOAM/primitives/RowVector/RowVector.H         |  5 -----
 src/OpenFOAM/primitives/RowVector/RowVectorI.H        |  9 ---------
 .../primitives/SphericalTensor/SphericalTensor.H      |  6 ------
 .../primitives/SphericalTensor/SphericalTensorI.H     |  9 ---------
 .../primitives/SphericalTensor2D/SphericalTensor2D.H  |  6 ------
 .../primitives/SphericalTensor2D/SphericalTensor2DI.H |  9 ---------
 src/OpenFOAM/primitives/SymmTensor/SymmTensor.H       |  6 +++---
 src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H      |  7 -------
 src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H   |  4 ++--
 src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H  |  7 -------
 src/OpenFOAM/primitives/Tensor/Tensor.H               |  6 +++---
 src/OpenFOAM/primitives/Tensor/TensorI.H              |  7 -------
 src/OpenFOAM/primitives/Tensor2D/Tensor2D.H           |  3 ---
 src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H          | 11 +----------
 src/OpenFOAM/primitives/Vector/Vector.H               |  5 -----
 src/OpenFOAM/primitives/Vector/VectorI.H              |  9 ---------
 src/OpenFOAM/primitives/Vector2D/Vector2D.H           |  6 ------
 src/OpenFOAM/primitives/Vector2D/Vector2DI.H          |  9 ---------
 .../CompactSpatialTensor/CompactSpatialTensor.H       |  5 -----
 .../CompactSpatialTensor/CompactSpatialTensorI.H      |  9 ---------
 .../CompactSpatialTensorT/CompactSpatialTensorT.H     |  5 -----
 .../CompactSpatialTensorT/CompactSpatialTensorTI.H    |  9 ---------
 .../SpatialTensor/SpatialTensor.H                     |  5 -----
 .../SpatialTensor/SpatialTensorI.H                    |  9 ---------
 .../SpatialVector/SpatialVector.H                     |  2 --
 .../SpatialVector/SpatialVectorI.H                    |  7 -------
 26 files changed, 9 insertions(+), 166 deletions(-)

diff --git a/src/OpenFOAM/primitives/RowVector/RowVector.H b/src/OpenFOAM/primitives/RowVector/RowVector.H
index f670241f66..f69b2aa252 100644
--- a/src/OpenFOAM/primitives/RowVector/RowVector.H
+++ b/src/OpenFOAM/primitives/RowVector/RowVector.H
@@ -94,11 +94,6 @@ public:
             inline Cmpt& x();
             inline Cmpt& y();
             inline Cmpt& z();
-
-
-    // Member Operators
-
-        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/RowVector/RowVectorI.H b/src/OpenFOAM/primitives/RowVector/RowVectorI.H
index 2419ff2225..69c3b120e6 100644
--- a/src/OpenFOAM/primitives/RowVector/RowVectorI.H
+++ b/src/OpenFOAM/primitives/RowVector/RowVectorI.H
@@ -109,13 +109,4 @@ inline Cmpt& Foam::RowVector<Cmpt>::z()
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class Cmpt>
-inline void Foam::RowVector<Cmpt>::operator=(const Foam::zero)
-{
-    RowVector::msType::operator=(Zero);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
index 9c8b8a12a9..3f17389aae 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
@@ -109,12 +109,6 @@ public:
 
         //- Transpose
         inline const SphericalTensor<Cmpt>& T() const;
-
-
-    // Member Operators
-
-        //- Assignment to zero
-        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
index cb4d7fda30..7d0ed79041 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
@@ -88,15 +88,6 @@ Foam::SphericalTensor<Cmpt>::T() const
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class Cmpt>
-inline void Foam::SphericalTensor<Cmpt>::operator=(const Foam::zero)
-{
-    SphericalTensor::vsType::operator=(Zero);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
index 8db556c9cd..465dbb0e27 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
@@ -100,12 +100,6 @@ public:
 
             inline const Cmpt& ii() const;
             inline Cmpt& ii();
-
-
-    // Member Operators
-
-        //- Assignment to zero
-        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
index 2147a736d2..e956abe1be 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
@@ -79,15 +79,6 @@ inline Cmpt& Foam::SphericalTensor2D<Cmpt>::ii()
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class Cmpt>
-inline void Foam::SphericalTensor2D<Cmpt>::operator=(const Foam::zero)
-{
-    SphericalTensor2D::vsType::operator=(Zero);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index 2ee9b74e9f..036f63e84e 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -128,10 +128,10 @@ public:
 
     // Member Operators
 
-        //- Assignment to zero
-        inline void operator=(const Foam::zero);
+        //- Inherit VectorSpace assignment operators
+        using SymmTensor::vsType::operator=;
 
-        //- Construct given SphericalTensor
+        //- Assign to given SphericalTensor
         inline void operator=(const SphericalTensor<Cmpt>&);
 };
 
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index 9b97a9dedc..b40f40859f 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -175,13 +175,6 @@ inline void Foam::SymmTensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 }
 
 
-template<class Cmpt>
-inline void Foam::SymmTensor<Cmpt>::operator=(const Foam::zero)
-{
-    SymmTensor::vsType::operator=(Zero);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
index ad733376ec..141f15f2d2 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
@@ -120,8 +120,8 @@ public:
 
     // Member Operators
 
-        //- Assignment to zero
-        inline void operator=(const Foam::zero);
+        //- Inherit VectorSpace assignment operators
+        using SymmTensor2D::vsType::operator=;
 
         //- Construct given SphericalTensor2D
         inline void operator=(const SphericalTensor2D<Cmpt>&);
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
index d69b566a46..769fe9e6be 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
@@ -137,13 +137,6 @@ inline void Foam::SymmTensor2D<Cmpt>::operator=
 }
 
 
-template<class Cmpt>
-inline void Foam::SymmTensor2D<Cmpt>::operator=(const Foam::zero)
-{
-    SymmTensor2D::vsType::operator=(Zero);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index 42570c866e..3b9165f652 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -185,6 +185,9 @@ public:
         //- Inner-product with a Tensor
         inline void operator&=(const Tensor<Cmpt>&);
 
+        //- Inherit MatrixSpace assignment operators
+        using Tensor::msType::operator=;
+
         //- Assign to an equivalent vector space
         template<class Cmpt2>
         inline void operator=(const VectorSpace<Tensor<Cmpt2>, Cmpt2, 9>&);
@@ -197,9 +200,6 @@ public:
 
         //- Assign to a triad
         inline void operator=(const Vector<Vector<Cmpt>>&);
-
-        //- Assignment to zero
-        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 116dc7d352..b9e68a3b0d 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -400,13 +400,6 @@ inline void Foam::Tensor<Cmpt>::operator=(const Vector<Vector<Cmpt>>& tr)
 }
 
 
-template<class Cmpt>
-inline void Foam::Tensor<Cmpt>::operator=(const Foam::zero)
-{
-    Tensor::msType::operator=(Zero);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
index 7ff02d3f9f..5ee3db5827 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
@@ -145,9 +145,6 @@ public:
 
         //- Copy SphericalTensor2D
         inline void operator=(const SphericalTensor2D<Cmpt>&);
-
-        //- Assignment to zero
-        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
index f965993811..7f6be0d324 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
@@ -170,7 +170,7 @@ inline Foam::Tensor2D<Cmpt> Foam::Tensor2D<Cmpt>::T() const
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
 inline void Foam::Tensor2D<Cmpt>::operator=(const SymmTensor2D<Cmpt>& st)
@@ -188,15 +188,6 @@ inline void Foam::Tensor2D<Cmpt>::operator=(const SphericalTensor2D<Cmpt>& st)
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class Cmpt>
-inline void Foam::Tensor2D<Cmpt>::operator=(const Foam::zero)
-{
-    Tensor2D::msType::operator=(Zero);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/Vector/Vector.H b/src/OpenFOAM/primitives/Vector/Vector.H
index b442d8fff1..8929027e03 100644
--- a/src/OpenFOAM/primitives/Vector/Vector.H
+++ b/src/OpenFOAM/primitives/Vector/Vector.H
@@ -112,11 +112,6 @@ public:
         (
             const Foam::List<Vector<Cmpt>>&
         ) const;
-
-
-    // Member Operators
-
-        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Vector/VectorI.H b/src/OpenFOAM/primitives/Vector/VectorI.H
index c6c52f2f43..518a398dc5 100644
--- a/src/OpenFOAM/primitives/Vector/VectorI.H
+++ b/src/OpenFOAM/primitives/Vector/VectorI.H
@@ -121,15 +121,6 @@ inline const Foam::Vector<Cmpt>& Foam::Vector<Cmpt>::centre
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class Cmpt>
-inline void Foam::Vector<Cmpt>::operator=(const Foam::zero)
-{
-    Vector::vsType::operator=(Zero);
-}
-
-
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2D.H b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
index c30e8a47eb..58546c6933 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2D.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
@@ -103,12 +103,6 @@ public:
 
             //- Perp dot product (dot product with perpendicular vector)
             inline scalar perp(const Vector2D<Cmpt>& b) const;
-
-
-    // Member Operators
-
-        //- Assignment to zero
-        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
index 36b70942b4..3148e7d0af 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
@@ -90,15 +90,6 @@ inline Cmpt& Foam::Vector2D<Cmpt>::y()
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class Cmpt>
-inline void Foam::Vector2D<Cmpt>::operator=(const Foam::zero)
-{
-    Vector2D::vsType::operator=(Zero);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H
index 03e6dcc565..4f2e0bbd3d 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H
@@ -93,11 +93,6 @@ public:
 
         //- Construct from Istream
         inline CompactSpatialTensor(Istream&);
-
-
-    // Member Operators
-
-        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H
index 5b45979de9..742faf5716 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H
@@ -94,13 +94,4 @@ inline Foam::CompactSpatialTensor<Cmpt>::CompactSpatialTensor(Istream& is)
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Cmpt>
-inline void Foam::CompactSpatialTensor<Cmpt>::operator=(const Foam::zero)
-{
-    CompactSpatialTensor::msType::operator=(Zero);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H
index 2ec83b589f..fbb1d6adf6 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H
@@ -92,11 +92,6 @@ public:
 
         //- Construct from Istream
         inline CompactSpatialTensorT(Istream&);
-
-
-    // Member Operators
-
-        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H
index 51a1a8bae8..284a3b3d0f 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H
@@ -94,13 +94,4 @@ inline Foam::CompactSpatialTensorT<Cmpt>::CompactSpatialTensorT(Istream& is)
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Cmpt>
-inline void Foam::CompactSpatialTensorT<Cmpt>::operator=(const Foam::zero)
-{
-    CompactSpatialTensorT::msType::operator=(Zero);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
index 63e2d7e7b7..04d53b5979 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H
@@ -123,11 +123,6 @@ public:
 
         //- Construct from Istream
         inline SpatialTensor(Istream&);
-
-
-    // Member Operators
-
-        inline void operator=(const Foam::zero);
 };
 
 
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
index d6712e8caa..16f6967a4a 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H
@@ -133,15 +133,6 @@ inline Foam::SpatialTensor<Cmpt>::SpatialTensor(Istream& is)
 {}
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class Cmpt>
-inline void Foam::SpatialTensor<Cmpt>::operator=(const Foam::zero)
-{
-    SpatialTensor::msType::operator=(Zero);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
index ef48678f2a..c56a7e06d6 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H
@@ -151,8 +151,6 @@ public:
 
     // Member Operators
 
-        inline void operator=(const Foam::zero);
-
         //- Return the dual spatial vector
         inline dual operator*() const;
 };
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
index c4adce263f..8b23c7b5df 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H
@@ -205,13 +205,6 @@ const Foam::SpatialVector<Cmpt>& Foam::SpatialVector<Cmpt>::dual::v() const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<class Cmpt>
-inline void Foam::SpatialVector<Cmpt>::operator=(const Foam::zero)
-{
-    SpatialVector::vsType::operator=(Zero);
-}
-
-
 template<class Cmpt>
 inline typename Foam::SpatialVector<Cmpt>::dual
 Foam::SpatialVector<Cmpt>::operator*() const

From 39d7706ec93a07fb6a75a5ff331274597ad14bad Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 18 Apr 2016 15:37:57 +0100
Subject: [PATCH 429/447] rigidBodyDynamics/bodies/cuboid: New body shape
 Calculate the inertia from the lengths of the sides

---
 src/rigidBodyDynamics/bodies/cuboid/cuboid.C  |  76 +++++++++++
 src/rigidBodyDynamics/bodies/cuboid/cuboid.H  | 124 ++++++++++++++++++
 src/rigidBodyDynamics/bodies/cuboid/cuboidI.H |  86 ++++++++++++
 3 files changed, 286 insertions(+)
 create mode 100644 src/rigidBodyDynamics/bodies/cuboid/cuboid.C
 create mode 100644 src/rigidBodyDynamics/bodies/cuboid/cuboid.H
 create mode 100644 src/rigidBodyDynamics/bodies/cuboid/cuboidI.H

diff --git a/src/rigidBodyDynamics/bodies/cuboid/cuboid.C b/src/rigidBodyDynamics/bodies/cuboid/cuboid.C
new file mode 100644
index 0000000000..5309ae50b4
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/cuboid/cuboid.C
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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 "cuboid.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+    defineTypeNameAndDebug(cuboid, 0);
+
+    addToRunTimeSelectionTable
+    (
+        rigidBody,
+        cuboid,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::cuboid::clone() const
+{
+    return autoPtr<rigidBody>(new cuboid(*this));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::RBD::cuboid::~cuboid()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::RBD::cuboid::write(Ostream& os) const
+{
+    os.writeKeyword("type")
+        << type() << token::END_STATEMENT << nl;
+
+    os.writeKeyword("mass")
+        << m() << token::END_STATEMENT << nl;
+
+    os.writeKeyword("L")
+        << L() << token::END_STATEMENT << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/cuboid/cuboid.H b/src/rigidBodyDynamics/bodies/cuboid/cuboid.H
new file mode 100644
index 0000000000..7432f7cbc0
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/cuboid/cuboid.H
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\3
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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::cuboid
+
+Description
+    Specialization of rigidBody to construct a cuboid given the mass and
+    lengths of the sides.
+
+SourceFiles
+    cuboidI.H
+    cuboid.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef RBD_cuboid_H
+#define RBD_cuboid_H
+
+#include "rigidBody.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RBD
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class cuboid Declaration
+\*---------------------------------------------------------------------------*/
+
+class cuboid
+:
+    public rigidBody
+{
+    // Private member data
+
+        //- Lengths of the sides
+        vector L_;
+
+
+    // Private member functions
+
+        // Calculate and return the inertia tensor
+        inline symmTensor I(const scalar m, const vector& L) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("cuboid");
+
+
+    // Constructors
+
+        //- Construct from name, mass, centre of mass and lengths of the sides.
+        inline cuboid
+        (
+            const word& name,
+            const scalar m,
+            const vector& c,
+            const vector& L
+        );
+
+        //- Construct from dictionary
+        inline cuboid
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Return clone of this cuboid
+        virtual autoPtr<rigidBody> clone() const;
+
+
+    //- Destructor
+    virtual ~cuboid();
+
+
+    // Member Functions
+
+        //- Return the lengths of the sides of the cuboid
+        inline const vector& L() const;
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RBD
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "cuboidI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/rigidBodyDynamics/bodies/cuboid/cuboidI.H b/src/rigidBodyDynamics/bodies/cuboid/cuboidI.H
new file mode 100644
index 0000000000..e18a835bc0
--- /dev/null
+++ b/src/rigidBodyDynamics/bodies/cuboid/cuboidI.H
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+inline Foam::symmTensor Foam::RBD::cuboid::I
+(
+    const scalar m,
+    const vector& L
+) const
+{
+    const scalar mBy12 = m/12.0;
+    const scalar mSqrLx = mBy12*sqr(L.x());
+    const scalar mSqrLy = mBy12*sqr(L.y());
+    const scalar mSqrLz = mBy12*sqr(L.z());
+
+    return symmTensor
+    (
+        mSqrLy + mSqrLz, 0,               0,
+                         mSqrLx + mSqrLz, 0,
+                                          mSqrLx + mSqrLy
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::RBD::cuboid::cuboid
+(
+    const word& name,
+    const scalar m,
+    const vector& c,
+    const vector& L
+)
+:
+    rigidBody(name, m, c, I(m, L)),
+    L_(L)
+{}
+
+
+inline Foam::RBD::cuboid::cuboid
+(
+    const word& name,
+    const dictionary& dict
+)
+:
+    rigidBody(name, rigidBodyInertia()),
+    L_(dict.lookup("L"))
+{
+    const scalar m(readScalar(dict.lookup("mass")));
+    const vector c(dict.lookup("centreOfMass"));
+    rigidBodyInertia::operator=(rigidBodyInertia(m, c, I(m, L_)));
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+inline const Foam::vector& Foam::RBD::cuboid::L() const
+{
+    return L_;
+}
+
+
+// ************************************************************************* //

From da7c56674dc736100970f809897835f955b9cf4d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 18 Apr 2016 15:39:07 +0100
Subject: [PATCH 430/447] rigidBodyDynamics/bodies/sphere: Added support for
 the centre of mass being offset from the centre of rotation

---
 src/rigidBodyDynamics/bodies/sphere/sphere.H  | 16 +++++++++--
 src/rigidBodyDynamics/bodies/sphere/sphereI.H | 27 ++++++++++++-------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/rigidBodyDynamics/bodies/sphere/sphere.H b/src/rigidBodyDynamics/bodies/sphere/sphere.H
index f2642c8a7e..e3310f735d 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphere.H
+++ b/src/rigidBodyDynamics/bodies/sphere/sphere.H
@@ -59,6 +59,12 @@ class sphere
         scalar r_;
 
 
+    // Private member functions
+
+        // Calculate and return the inertia tensor
+        inline symmTensor I(const scalar m, const scalar r) const;
+
+
 public:
 
     //- Runtime type information
@@ -67,8 +73,14 @@ public:
 
     // Constructors
 
-        //- Construct from name, mass and radius
-        inline sphere(const word& name, const scalar m, const scalar r);
+        //- Construct from name, mass, centre of mass and radius
+        inline sphere
+        (
+            const word& name,
+            const scalar m,
+            const vector& c,
+            const scalar r
+        );
 
         //- Construct from dictionary
         inline sphere
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphereI.H b/src/rigidBodyDynamics/bodies/sphere/sphereI.H
index 42f429f1d4..49d9fc0e0b 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphereI.H
+++ b/src/rigidBodyDynamics/bodies/sphere/sphereI.H
@@ -23,16 +23,29 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+inline Foam::symmTensor Foam::RBD::sphere::I
+(
+    const scalar m,
+    const scalar r
+) const
+{
+    return ((2.0/5.0)*m*sqr(r))*Foam::I;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::RBD::sphere::sphere
 (
     const word& name,
     const scalar m,
+    const vector& c,
     const scalar r
 )
 :
-    rigidBody(name, m, Zero, (2.0/5.0)*m*sqr(r)*I),
+    rigidBody(name, m, c, I(m, r)),
     r_(r)
 {}
 
@@ -43,18 +56,12 @@ inline Foam::RBD::sphere::sphere
     const dictionary& dict
 )
 :
-    rigidBody
-    (
-        name,
-        rigidBodyInertia()
-    ),
+    rigidBody(name, rigidBodyInertia()),
     r_(readScalar(dict.lookup("radius")))
 {
     const scalar m(readScalar(dict.lookup("mass")));
-    rigidBodyInertia::operator=
-    (
-        rigidBodyInertia(m, Zero, (2.0/5.0)*m*sqr(r_)*I)
-    );
+    const vector c(dict.lookup("centreOfMass"));
+    rigidBodyInertia::operator=(rigidBodyInertia(m, c, I(m, r_)));
 }
 
 

From e60f9f457f4e42a3a499e86644610a04658ca460 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 18 Apr 2016 15:40:23 +0100
Subject: [PATCH 431/447] src/rigidBodyDynamics/rigidBodyMotion: Added support
 for acceleration relaxation

---
 src/rigidBodyDynamics/Make/files                    |  1 +
 .../rigidBodyMotion/rigidBodyMotion.C               | 13 +++++++++++++
 .../rigidBodyMotion/rigidBodyMotion.H               | 10 ++++++++++
 .../rigidBodySolvers/CrankNicolson/CrankNicolson.C  |  2 +-
 .../rigidBodySolvers/Newmark/Newmark.C              |  4 ++--
 .../rigidBodySolver/rigidBodySolver.H               |  4 ----
 .../rigidBodySolver/rigidBodySolverI.H              |  6 ------
 .../rigidBodySolvers/symplectic/symplectic.C        |  4 ++--
 src/rigidBodyMeshMotion/rigidBodyMeshMotion.C       |  7 ++-----
 .../sixDoFSolvers/Newmark/Newmark.C                 |  4 ++--
 10 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/rigidBodyDynamics/Make/files b/src/rigidBodyDynamics/Make/files
index 6352eabd93..07612c1038 100644
--- a/src/rigidBodyDynamics/Make/files
+++ b/src/rigidBodyDynamics/Make/files
@@ -4,6 +4,7 @@ bodies/jointBody/jointBody.C
 bodies/compositeBody/compositeBody.C
 bodies/subBody/subBody.C
 bodies/sphere/sphere.C
+bodies/cuboid/cuboid.C
 
 joints/joint/joint.C
 joints/null/nullJoint.C
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
index 30ad316f6c..23146ef869 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
@@ -125,6 +125,19 @@ Foam::spatialTransform Foam::RBD::rigidBodyMotion::X00
 }
 
 
+void Foam::RBD::rigidBodyMotion::forwardDynamics
+(
+    rigidBodyModelState& state,
+    const scalarField& tau,
+    const Field<spatialVector>& fx
+) const
+{
+    scalarField qDdotPrev = state.qDdot();
+    rigidBodyModel::forwardDynamics(state, tau, fx);
+    state.qDdot() = aDamp_*(aRelax_*state.qDdot() + (1 - aRelax_)*qDdotPrev);
+}
+
+
 void Foam::RBD::rigidBodyMotion::solve
 (
     scalar deltaT,
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
index 4e3203de59..a88763e15d 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
@@ -158,6 +158,16 @@ public:
 
         // Update state
 
+            //- Calculate and optionally relax the joint acceleration qDdot from
+            //  the joint state q, velocity qDot, internal force tau (in the
+            //  joint frame) and external force fx (in the global frame)
+            void forwardDynamics
+            (
+                rigidBodyModelState& state,
+                const scalarField& tau,
+                const Field<spatialVector>& fx
+            ) const;
+
             //- Integrate velocities, orientation and position
             //  for the given time-step
             void solve
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
index 6d48971be6..fc15b3e6f7 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
@@ -77,7 +77,7 @@ void Foam::RBD::rigidBodySolvers::CrankNicolson::solve
     model_.forwardDynamics(state(), tau, rfx);
 
     // Correct velocity
-    qDot() = qDot0() + aDamp()*deltaT()*(aoc_*qDdot() + (1 - aoc_)*qDdot0());
+    qDot() = qDot0() + deltaT()*(aoc_*qDdot() + (1 - aoc_)*qDdot0());
 
     // Correct position
     q() = q0() + deltaT()*(voc_*qDot() + (1 - voc_)*qDot0());
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
index 2d5e5d90ea..11f80a3732 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
@@ -85,12 +85,12 @@ void Foam::RBD::rigidBodySolvers::Newmark::solve
 
     // Correct velocity
     qDot() = qDot0()
-      + aDamp()*deltaT()*(gamma_*qDdot() + (1 - gamma_)*qDdot0());
+      + deltaT()*(gamma_*qDdot() + (1 - gamma_)*qDdot0());
 
     // Correct position
     q() = q0()
       + deltaT()*qDot0()
-      + sqr(deltaT())*beta_*qDdot() + sqr(deltaT())*(0.5 - beta_)*qDdot0();
+      + sqr(deltaT())*(beta_*qDdot() + (0.5 - beta_)*qDdot0());
 
     correctQuaternionJoints();
 
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
index 1ab119bcee..6c2c3c678b 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolver.H
@@ -94,10 +94,6 @@ protected:
         //- Return the previous time-step
         inline scalar deltaT0() const;
 
-
-        //- Acceleration damping coefficient (for steady-state simulations)
-        inline scalar aDamp() const;
-
         //- Correct the quaternion joints based on the current change in q
         void correctQuaternionJoints();
 
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
index 53736a02ab..afac337637 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverI.H
@@ -85,10 +85,4 @@ inline Foam::scalar Foam::RBD::rigidBodySolver::deltaT0() const
 }
 
 
-inline Foam::scalar Foam::RBD::rigidBodySolver::aDamp() const
-{
-    return model_.aDamp_;
-}
-
-
 // ************************************************************************* //
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
index 18b78ad89f..f0dbb3e0df 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
@@ -70,7 +70,7 @@ void Foam::RBD::rigidBodySolvers::symplectic::solve
     // First simplectic step:
     //     Half-step for linear and angular velocities
     //     Update position and orientation
-    qDot() = qDot0() + aDamp()*0.5*deltaT0()*qDdot();
+    qDot() = qDot0() + 0.5*deltaT0()*qDdot();
     q() = q0() + deltaT()*qDot();
 
     correctQuaternionJoints();
@@ -88,7 +88,7 @@ void Foam::RBD::rigidBodySolvers::symplectic::solve
 
     // Second simplectic step:
     //     Complete update of linear and angular velocities
-    qDot() += aDamp()*0.5*deltaT()*qDdot();
+    qDot() += 0.5*deltaT()*qDdot();
 }
 
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index f114cfc6b6..6397e637ed 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -250,19 +250,16 @@ void Foam::rigidBodyMeshMotion::solve()
             const label bodyID = bodyMeshes_[bi].bodyID_;
 
             dictionary forcesDict;
-
             forcesDict.add("type", forces::typeName);
             forcesDict.add("patches", bodyMeshes_[bi].patches_);
             forcesDict.add("rhoInf", rhoInf_);
             forcesDict.add("rhoName", rhoName_);
-            forcesDict.add("CofR", model_.X0(bodyID).r());
+            forcesDict.add("CofR", vector::zero);
 
             forces f("forces", db(), forcesDict);
-
             f.calcForcesMoment();
 
-            fx[bodyID].l() = f.forceEff();
-            fx[bodyID].w() = f.momentEff();
+            fx[bodyID] = spatialVector(f.momentEff(), f.forceEff());
         }
 
         model_.solve
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
index 4f39b3266c..b1685e1528 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
@@ -96,7 +96,7 @@ void Foam::sixDoFSolvers::Newmark::solve
             tConstraints()
           & (
                 deltaT*v0()
-              + sqr(deltaT)*beta_*a() + sqr(deltaT)*(0.5 - beta_)*a0()
+              + aDamp()*sqr(deltaT)*(beta_*a() + (0.5 - beta_)*a0())
             )
         );
 
@@ -105,7 +105,7 @@ void Foam::sixDoFSolvers::Newmark::solve
         rConstraints()
       & (
             deltaT*pi0()
-          + sqr(deltaT)*beta_*tau() + sqr(deltaT)*(0.5 - beta_)*tau0()
+          + aDamp()*sqr(deltaT)*(beta_*tau() + (0.5 - beta_)*tau0())
         );
     Tuple2<tensor, vector> Qpi = rotate(Q0(), piDeltaT, 1);
     Q() = Qpi.first();

From 792b42e76b67cf16fd203879eab8055a99d08458 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 18 Apr 2016 15:40:57 +0100
Subject: [PATCH 432/447] Updated header

---
 src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
index b1685e1528..5a392b1b47 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From d0b5bef948b78adf6d714d565b8bb29137d5a83e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 18 Apr 2016 15:41:10 +0100
Subject: [PATCH 433/447] tutorials/multiphase/interDyMFoam/ras/floatingObject:
 Updated to use rigidBodyDynamics

---
 .../floatingObject/constant/dynamicMeshDict   | 96 ++++++++-----------
 .../constant/dynamicMeshDict.sixDoF           | 94 ++++++++++++++++++
 2 files changed, 134 insertions(+), 56 deletions(-)
 create mode 100644 tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict.sixDoF

diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict
index 090aa63d16..d04014451f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict
@@ -16,75 +16,59 @@ FoamFile
 
 dynamicFvMesh       dynamicMotionSolverFvMesh;
 
-motionSolverLibs    ("libsixDoFRigidBodyMotion.so");
+motionSolverLibs   ("librigidBodyMeshMotion.so");
 
-solver              sixDoFRigidBodyMotion;
+solver             rigidBodyMotion;
 
-sixDoFRigidBodyMotionCoeffs
+rigidBodyMotionCoeffs
 {
-    patches         (floatingObject);
-    innerDistance   0.05;
-    outerDistance   0.35;
-
-    centreOfMass    (0.5 0.45 0.35);
-
-    // Cuboid dimensions
-    Lx              0.3;
-    Ly              0.2;
-    Lz              0.5;
-
-    // Density of the solid
-    rho             500;
-
-    // Cuboid mass
-    mass            #calc "$rho*$Lx*$Ly*$Lz";
-
-    // Cuboid moment of inertia about the centre of mass
-    momentOfInertia #codeStream
-    {
-        codeInclude
-        #{
-            #include "diagTensor.H"
-        #};
-
-        code
-        #{
-            scalar sqrLx = sqr($Lx);
-            scalar sqrLy = sqr($Ly);
-            scalar sqrLz = sqr($Lz);
-            os  <<
-                $mass
-               *diagTensor(sqrLy + sqrLz, sqrLx + sqrLz, sqrLx + sqrLy)/12.0;
-        #};
-    };
-
     report          on;
-    accelerationRelaxation 0.7;
 
     solver
     {
         type Newmark;
     }
 
-    constraints
+    accelerationRelaxation 0.7;
+
+    bodies
     {
-        // fixedPoint
-        // {
-        //     sixDoFRigidBodyMotionConstraint point;
-        //     centreOfRotation (0.5 0.45 0.1);
-        // }
-
-        fixedLine
+        floatingObject
         {
-            sixDoFRigidBodyMotionConstraint line;
-            centreOfRotation (0.5 0.45 0.1);
-            direction (0 1 0);
-        }
+            type            cuboid;
+            parent          root;
 
-        fixedAxis
-        {
-            sixDoFRigidBodyMotionConstraint axis;
-            axis (0 1 0);
+            // Cuboid dimensions
+            Lx              0.3;
+            Ly              0.2;
+            Lz              0.5;
+
+            // Density of the cuboid
+            rho             500;
+
+            // Cuboid mass
+            mass            #calc "$rho*$Lx*$Ly*$Lz";
+            L               ($Lx $Ly $Lz);
+            centreOfMass    (0 0 0.25);
+            transform       (1 0 0 0 1 0 0 0 1) (0.5 0.45 0.1);
+
+            joint
+            {
+                type            composite;
+                joints
+                (
+                    {
+                        type Py;
+                    }
+                    {
+                        type Ry;
+                    }
+                );
+            }
+
+            patches         (floatingObject);
+            innerDistance   0.05;
+            outerDistance   0.35;
         }
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict.sixDoF b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict.sixDoF
new file mode 100644
index 0000000000..aa43b2aeb4
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict.sixDoF
@@ -0,0 +1,94 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      motionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh       dynamicMotionSolverFvMesh;
+
+motionSolverLibs    ("libsixDoFRigidBodyMotion.so");
+
+solver              sixDoFRigidBodyMotion;
+
+sixDoFRigidBodyMotionCoeffs
+{
+    patches         (floatingObject);
+    innerDistance   0.05;
+    outerDistance   0.35;
+
+    centreOfMass    (0.5 0.45 0.35);
+
+    // Cuboid dimensions
+    Lx              0.3;
+    Ly              0.2;
+    Lz              0.5;
+
+    // Density of the solid
+    rho             500;
+
+    // Cuboid mass
+    mass            #calc "$rho*$Lx*$Ly*$Lz";
+
+    // Cuboid moment of inertia about the centre of mass
+    momentOfInertia #codeStream
+    {
+        codeInclude
+        #{
+            #include "diagTensor.H"
+        #};
+
+        code
+        #{
+            scalar sqrLx = sqr($Lx);
+            scalar sqrLy = sqr($Ly);
+            scalar sqrLz = sqr($Lz);
+            os  <<
+                $mass
+               *diagTensor(sqrLy + sqrLz, sqrLx + sqrLz, sqrLx + sqrLy)/12.0;
+        #};
+    };
+
+    report          on;
+    accelerationRelaxation 0.7;
+    //accelerationDamping 0;
+
+    solver
+    {
+        type Newmark;
+    }
+
+    constraints
+    {
+        // fixedPoint
+        // {
+        //     sixDoFRigidBodyMotionConstraint point;
+        //     centreOfRotation (0.5 0.45 0.1);
+        // }
+
+        fixedLine
+        {
+            sixDoFRigidBodyMotionConstraint line;
+            centreOfRotation (0.5 0.45 0.1);
+            direction (0 1 0);
+        }
+
+        fixedAxis
+        {
+            sixDoFRigidBodyMotionConstraint axis;
+            axis (0 1 0);
+        }
+    }
+}
+
+
+// ************************************************************************* //

From a1f209c48267d8b9ef7a76c562469db19c354e67 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 19 Apr 2016 10:02:14 +0100
Subject: [PATCH 434/447] doc/codingStyleGuide.org: Added specification
 references in class headers

---
 doc/codingStyleGuide.org | 216 ++++++++++++++++++++++-----------------
 1 file changed, 123 insertions(+), 93 deletions(-)

diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index 4a6a679d55..e763b7c0c1 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -2,7 +2,7 @@
 #
 #+TITLE:                 OpenFOAM C++ style guide
 #+AUTHOR:                  OpenFOAM Foundation
-#+DATE:                       Aug 2011-2015
+#+DATE:                         2011-2016
 #+LINK:                   http://www.OpenFOAM.org
 #+OPTIONS: author:nil ^:{}
 #+STARTUP: hidestars
@@ -22,23 +22,23 @@
     + Stream output
       + =<<= is always four characters after the start of the stream,
         so that the =<<= symbols align, i.e.
-        #+BEGIN_SRC c++
+        #+begin_src c++
         Info<< ...
         os  << ...
-        #+END_SRC
+        #+end_src
         so
-        #+BEGIN_SRC C++
+        #+begin_src C++
         WarningInFunction
             << "Warning message"
-        #+END_SRC
+        #+end_src
         *not*
-        #+BEGIN_SRC C++
+        #+begin_src C++
         WarningInFunction
         << "Warning message"
-        #+END_SRC
+        #+end_src
 
     + Remove unnecessary class section headers, i.e. remove
-#+BEGIN_SRC C++
+#+begin_src C++
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
     // Check
@@ -46,21 +46,21 @@
     // Edit
 
     // Write
-#+END_SRC
+#+end_src
       if they contain nothing, even if planned for 'future use'
 
     + Class titles should be centred
-#+BEGIN_SRC C++
+#+begin_src C++
 /*---------------------------------------------------------------------------*\
                         Class exampleClass Declaration
 \*---------------------------------------------------------------------------*/
-#+END_SRC
+#+end_src
       *not*
-#+BEGIN_SRC C++
+#+begin_src C++
 /*---------------------------------------------------------------------------*\
                 Class exampleClass Declaration
 \*---------------------------------------------------------------------------*/
-#+END_SRC
+#+end_src
 
 *** The /.H/ Header Files
     + Header file spacing
@@ -71,42 +71,42 @@
       + Text on the line starting with =//-= becomes the Doxygen brief
         description;
       + Text on subsequent lines becomes the Doxygen detailed description /e.g./
-        #+BEGIN_SRC C++
+        #+begin_src C++
         //- A function which returns a thing
         //  This is a detailed description of the function
         //  which processes stuff and returns other stuff
         //  depending on things.
         thing function(stuff1, stuff2);
-        #+END_SRC
+        #+end_src
       + List entries start with =-= or =-#= for numbered lists but cannot start
         on the line immediately below the brief description so
-        #+BEGIN_SRC C++
+        #+begin_src C++
         //- Compare triFaces
         //  Returns:
         //  -  0: different
         //  - +1: identical
         //  - -1: same face, but different orientation
         static inline int compare(const triFace&, const triFace&);
-        #+END_SRC
+        #+end_src
         or
-        #+BEGIN_SRC C++
+        #+begin_src C++
         //- Compare triFaces returning 0, +1 or -1
         //
         //  -  0: different
         //  - +1: identical
         //  - -1: same face, but different orientation
         static inline int compare(const triFace&, const triFace&);
-        #+END_SRC
+        #+end_src
         *not*
-        #+BEGIN_SRC C++
+        #+begin_src C++
         //- Compare triFaces returning 0, +1 or -1
         //  -  0: different
         //  - +1: identical
         //  - -1: same face, but different orientation
         static inline int compare(const triFace&, const triFace&);
-        #+END_SRC
+        #+end_src
       + List can be nested for example
-        #+BEGIN_SRC C++
+        #+begin_src C++
         //- Search for \em name
         //  in the following hierarchy:
         //  -# personal settings:
@@ -125,15 +125,15 @@
         //  \return the full path name or fileName() if the name cannot be found
         //  Optionally abort if the file cannot be found
         fileName findEtcFile(const fileName&, bool mandatory=false);
-        #+END_SRC
+        #+end_src
       + For more details see the Doxygen documentation.
     + Destructor
       + When adding a comment to the destructor use =//-= and code as a normal
         function:
-        #+BEGIN_SRC C++
+        #+begin_src C++
         //- Destructor
         ~className();
-        #+END_SRC
+        #+end_src
     + Inline functions
       + Use inline functions where appropriate in a separate /classNameI.H/
         file.  Avoid cluttering the header file with function bodies.
@@ -141,22 +141,22 @@
 *** The /.C/ Sourcs Files
     + Do not open/close namespaces in a /.C/ file
       + Fully scope the function name, i.e.
-        #+BEGIN_SRC C++
+        #+begin_src C++
         Foam::returnType Foam::className::functionName()
-        #+END_SRC
+        #+end_src
         *not*
-        #+BEGIN_SRC C++
+        #+begin_src C++
         namespace Foam
         {
             ...
             returnType className::functionName()
             ...
         }
-        #+END_SRC
+        #+end_src
         *Exception*
         When there are multiple levels of namespace, they may be used in the
         /.C/ file to avoid excessive clutter, i.e.
-        #+BEGIN_SRC C++
+        #+begin_src C++
         namespace Foam
         {
         namespace compressible
@@ -167,7 +167,7 @@
         } // End namespace RASModels
         } // End namespace compressible
         } // End namespace Foam
-        #+END_SRC
+        #+end_src
 
     + Use two empty lines between functions
 
@@ -178,25 +178,25 @@
     + =const=
       + Use everywhere it is applicable.
     + Variable initialisation using
-      #+BEGIN_SRC C++
+      #+begin_src C++
       const className& variableName = otherClass.data();
-      #+END_SRC
+      #+end_src
       *not*
-      #+BEGIN_SRC C++
+      #+begin_src C++
       const className& variableName(otherClass.data());
-      #+END_SRC
+      #+end_src
     + Virtual functions
       + If a class is virtual, make all derived classes virtual.
 
 *** Conditional Statements
-    #+BEGIN_SRC C++
+    #+begin_src C++
     if (condition)
     {
         code;
     }
-    #+END_SRC
+    #+end_src
     OR
-    #+BEGIN_SRC C++
+    #+begin_src C++
     if
     (
        long condition
@@ -204,24 +204,24 @@
     {
         code;
     }
-    #+END_SRC
+    #+end_src
     *not* (no space between =if= and =(= used)
-    #+BEGIN_SRC C++
+    #+begin_src C++
     if(condition)
     {
         code;
     }
-    #+END_SRC
+    #+end_src
 
 *** =for= and =while= Loops
-    #+BEGIN_SRC C++
+    #+begin_src C++
     for (i = 0; i < maxI; i++)
     {
         code;
     }
-    #+END_SRC
+    #+end_src
     OR
-    #+BEGIN_SRC C++
+    #+begin_src C++
     for
     (
         i = 0;
@@ -231,33 +231,33 @@
     {
         code;
     }
-    #+END_SRC
+    #+end_src
     *not* this (no space between =for= and =(= used)
-    #+BEGIN_SRC C++
+    #+begin_src C++
     for(i = 0; i < maxI; i++)
     {
         code;
     }
-    #+END_SRC
+    #+end_src
     Note that when indexing through iterators, it is often slightly more
     efficient to use the pre-increment form. Eg, =++iter= instead of =iter++=
 
 *** =forAll=, =forAllIter=, =forAllConstIter=, /etc./ loops
     Like =for= loops, but
-    #+BEGIN_SRC C++
+    #+begin_src C++
     forAll(
-    #+END_SRC
+    #+end_src
     *not*
-    #+BEGIN_SRC C++
+    #+begin_src C++
     forAll (
-    #+END_SRC
+    #+end_src
     Using the =forAllIter= and =forAllConstIter= macros is generally
     advantageous - less typing, easier to find later.  However, since
     they are macros, they will fail if the iterated object contains
     any commas /e.g./ following will FAIL!:
-    #+BEGIN_SRC C++
+    #+begin_src C++
     forAllIter(HashTable<labelPair, edge, Hash<edge>>, foo, iter)
-    #+END_SRC
+    #+end_src
     These convenience macros are also generally avoided in other
     container classes and OpenFOAM primitive classes.
 
@@ -266,104 +266,104 @@
       + Split initially after the function return type and left align
       + Do not put =const= onto its own line - use a split to keep it with
         the function name and arguments.
-        #+BEGIN_SRC C++
+        #+begin_src C++
         const Foam::longReturnTypeName&
         Foam::longClassName::longFunctionName const
-        #+END_SRC
+        #+end_src
         *not*
-        #+BEGIN_SRC C++
+        #+begin_src C++
         const Foam::longReturnTypeName&
             Foam::longClassName::longFunctionName const
-        #+END_SRC
+        #+end_src
         *nor*
-        #+BEGIN_SRC C++
+        #+begin_src C++
         const Foam::longReturnTypeName& Foam::longClassName::longFunctionName
         const
-        #+END_SRC
+        #+end_src
         *nor*
-        #+BEGIN_SRC C++
+        #+begin_src C++
         const Foam::longReturnTypeName& Foam::longClassName::
         longFunctionName const
-        #+END_SRC
+        #+end_src
       + If it needs to be split again, split at the function name (leaving
         behind the preceding scoping =::=s), and again, left align, i.e.
-        #+BEGIN_SRC C++
+        #+begin_src C++
         const Foam::longReturnTypeName&
         Foam::veryveryveryverylongClassName::
         veryveryveryverylongFunctionName const
-        #+END_SRC
+        #+end_src
 
 ***** Splitting long lines at an "="
      Indent after split
-     #+BEGIN_SRC C++
+     #+begin_src C++
      variableName =
          longClassName.longFunctionName(longArgument);
-     #+END_SRC
+     #+end_src
      OR (where necessary)
-     #+BEGIN_SRC C++
+     #+begin_src C++
      variableName =
          longClassName.longFunctionName
          (
              longArgument1,
              longArgument2
          );
-     #+END_SRC
+     #+end_src
      *not*
-     #+BEGIN_SRC C++
+     #+begin_src C++
      variableName =
      longClassName.longFunctionName(longArgument);
-     #+END_SRC
+     #+end_src
      *nor*
-     #+BEGIN_SRC C++
+     #+begin_src C++
      variableName = longClassName.longFunctionName
      (
          longArgument1,
          longArgument2
      );
-     #+END_SRC
+     #+end_src
 
 *** Maths and Logic
     + Operator spacing
-      #+BEGIN_SRC C++
+      #+begin_src C++
       a + b, a - b
       a*b, a/b
       a & b, a ^ b
       a = b, a != b
       a < b, a > b, a >= b, a <= b
       a || b, a && b
-      #+END_SRC
+      #+end_src
     + Splitting formulae over several lines
 
       Split and indent as per "splitting long lines at an ="
       with the operator on the lower line.  Align operator so that first
       variable, function or bracket on the next line is 4 spaces indented i.e.
-      #+BEGIN_SRC C++
+      #+begin_src C++
       variableName =
           a*(a + b)
          *exp(c/d)
          *(k + t);
-      #+END_SRC
+      #+end_src
       This is sometimes more legible when surrounded by extra parentheses:
 
-      #+BEGIN_SRC C++
+      #+begin_src C++
       variableName =
       (
           a*(a + b)
          *exp(c/d)
          *(k + t)
       );
-      #+END_SRC
+      #+end_src
     + Splitting logical tests over several lines
 
       outdent the operator so that the next variable to test is aligned with
       the four space indentation, i.e.
-      #+BEGIN_SRC C++
+      #+begin_src C++
       if
       (
           a == true
        && b == c
       )
-      #+END_SRC
+      #+end_src
 
 ** Documentation
 *** General
@@ -376,7 +376,7 @@
     + The first paragraph following the 'Description' will be used for the
       brief description, the remaining paragraphs become the detailed
       description.  For example,
-      #+BEGIN_SRC C++
+      #+begin_example C++
       Class
           Foam::myClass
 
@@ -385,38 +385,38 @@
 
           The class is implemented as a set of recommendations that may
           sometimes be useful.
-      #+END_SRC
+      #+end_example
 
     + The class name must be qualified by its namespace, otherwise Doxygen
       will think you are documenting some other class.
     + If you don't have anything to say about the class (at the moment), use
       the namespace-qualified class name for the description. This aids with
       finding these under-documented classes later.
-      #+BEGIN_SRC C++
+      #+begin_example C++
       Class
           Foam::myUnderDocumentedClass
 
       Description
           Foam::myUnderDocumentedClass
-      #+END_SRC
+      #+end_example
     + Use 'Class' and 'Namespace' tags in the header files.
       The Description block then applies to documenting the class.
     + Use 'InClass' and 'InNamespace' in the source files.
       The Description block then applies to documenting the file itself.
-      #+BEGIN_SRC C++
+      #+begin_example C++
       InClass
           Foam::myClass
 
       Description
           Implements the read and writing of files.
-      #+END_SRC
+      #+end_example
 
 *** Doxygen Special Commands
     Doxygen has a large number of special commands with a =\= prefix.
 
     Since the filtering removes the leading spaces within the blocks, the
     Doxygen commmands can be inserted within the block without problems.
-    #+BEGIN_SRC C++
+    #+begin_example C++
     InClass
         Foam::myClass
 
@@ -440,7 +440,7 @@
                 ...  // some operation
             }
         \endcode
-    #+END_SRC
+    #+end_example
 
 *** HTML Special Commands
     Since Doxygen also handles HTML tags to a certain extent, the angle
@@ -457,15 +457,15 @@
     + If the namespaces is used to hold sub-models, the namespace can be
       documented in the same file as the class with the model selector.
       /e.g./,
-      #+BEGIN_SRC C++
+      #+begin_example C++
       documented namespace 'Foam::functionEntries' within the
       class 'Foam::functionEntry'
-      #+END_SRC
+      #+end_example
     + If nothing else helps, find some sensible header.
       /e.g./,
-      #+BEGIN_SRC C++
+      #+begin_example C++
       namespace 'Foam' is documented in the foamVersion.H file
-      #+END_SRC
+      #+end_example
 
 *** Documenting Applications
     Any number of classes might be defined by a particular application, but
@@ -491,6 +491,36 @@
     used as a variable or class method name, it is probably better to use
     '-ize', which is considered the main form by the Oxford University
     Press. /e.g./,
-    #+BEGIN_SRC C++
+    #+begin_src C++
     myClass.initialize()
-    #+END_SRC
+    #+end_src
+*** References
+    References provided in the =Description= section of the class header files
+    should be formatted in the [[http://www.apastyle.org][APA (American
+    Psychological Association)]] style /e.g./ from =kEpsilon.H=
+    #+begin_example
+Description
+    Standard k-epsilon turbulence model for incompressible and compressible
+    flows including rapid distortion theory (RDT) based compression term.
+
+    Reference:
+    \verbatim
+        Standard model:
+            Launder, B. E., & Spalding, D. B. (1972).
+            Lectures in mathematical models of turbulence.
+
+            Launder, B. E., & Spalding, D. B. (1974).
+            The numerical computation of turbulent flows.
+            Computer methods in applied mechanics and engineering,
+            3(2), 269-289.
+
+        For the RDT-based compression term:
+            El Tahry, S. H. (1983).
+            k-epsilon equation for compressible reciprocating engine flows.
+            Journal of Energy, 7(4), 345-353.
+    \endverbatim
+    #+end_example
+    The APA style is a commonly used standard and references are available in
+    this format from many sources including
+    [[http://www.citationmachine.net/apa/cite-a-book][Citation Machine]] and
+    [[http://scholar.google.com][Google Scholar]].

From 125a986467aad86f18f2f0c3426b219015ff5e0b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 19 Apr 2016 10:32:25 +0100
Subject: [PATCH 435/447] rigidBodyDynamics: Added support for running in
 parallel

The joint-space dynamics is solved on the master processor only and the
resulting joint-state distributed to the slave processors on which the
body-state is then updated.  This guarantees consistency of the body
position and orientation on all processors.
---
 .../rigidBodyMotion/rigidBodyMotion.C         | 26 +++++++++----------
 .../rigidBodyMotion/rigidBodyMotion.H         |  4 +--
 .../CrankNicolson/CrankNicolson.C             |  3 ---
 .../rigidBodySolvers/Newmark/Newmark.C        |  3 ---
 src/rigidBodyMeshMotion/rigidBodyMeshMotion.C |  7 +++++
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
index 23146ef869..9eb21c3969 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
@@ -155,28 +155,26 @@ void Foam::RBD::rigidBodyMotion::solve
     if (Pstream::master())
     {
         solver_->solve(tau, fx);
-
-        if (report_)
-        {
-            status();
-        }
     }
 
     Pstream::scatter(motionState_);
+
+    // Update the body-state to correspond to the current joint-state
+    forwardDynamicsCorrection(motionState_);
 }
 
 
-void Foam::RBD::rigidBodyMotion::status() const
+void Foam::RBD::rigidBodyMotion::status(const label bodyID) const
 {
-    /*
-    Info<< "Rigid body motion" << nl
-        << "    Centre of rotation: " << centreOfRotation() << nl
-        << "    Centre of mass: " << centreOfMass() << nl
-        << "    Orientation: " << orientation() << nl
-        << "    Linear velocity: " << v() << nl
-        << "    Angular velocity: " << omega()
+    const spatialTransform CofR(X0(bodyID));
+    const spatialVector vCofR(v(bodyID, Zero));
+
+    Info<< "Rigid-body motion of the " << name(bodyID) << nl
+        << "    Centre of rotation: " << CofR.r() << nl
+        << "    Orientation: " << CofR.E() << nl
+        << "    Linear velocity: " << vCofR.l() << nl
+        << "    Angular velocity: " << vCofR.w()
         << endl;
-    */
 }
 
 
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
index a88763e15d..c386169064 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
@@ -177,8 +177,8 @@ public:
                 const Field<spatialVector>& fx
             );
 
-            //- Report the status of the motion
-            void status() const;
+            //- Report the status of the motion of the given body
+            void status(const label bodyID) const;
 
 
         // Transformations
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
index fc15b3e6f7..d056d784f6 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
@@ -83,9 +83,6 @@ void Foam::RBD::rigidBodySolvers::CrankNicolson::solve
     q() = q0() + deltaT()*(voc_*qDot() + (1 - voc_)*qDot0());
 
     correctQuaternionJoints();
-
-    // Update the body-state
-    model_.forwardDynamicsCorrection(state());
 }
 
 
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
index 11f80a3732..48a88c606c 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
@@ -93,9 +93,6 @@ void Foam::RBD::rigidBodySolvers::Newmark::solve
       + sqr(deltaT())*(beta_*qDdot() + (0.5 - beta_)*qDdot0());
 
     correctQuaternionJoints();
-
-    // Update the body-state
-    model_.forwardDynamicsCorrection(state());
 }
 
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index 6397e637ed..a207cfa0c0 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -270,6 +270,13 @@ void Foam::rigidBodyMeshMotion::solve()
         );
     }
 
+    if (Pstream::master() && model_.report())
+    {
+        forAll(bodyMeshes_, bi)
+        {
+            model_.status(bodyMeshes_[bi].bodyID_);
+        }
+    }
 
     // Update the displacements
     if (bodyMeshes_.size() == 1)

From bbc05bdf7e082fb6d630603637a3a86c6e2f4e07 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 19 Apr 2016 10:35:09 +0100
Subject: [PATCH 436/447] tutorials/multiphase/interDyMFoam/ras/DTCHull:
 Updated to use the rigidBodyDynamics solver

---
 .../ras/DTCHull/constant/dynamicMeshDict      | 83 ++++++++++---------
 .../DTCHull/constant/dynamicMeshDict.sixDoF   | 74 +++++++++++++++++
 2 files changed, 120 insertions(+), 37 deletions(-)
 create mode 100644 tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict.sixDoF

diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict
index 02088e1075..50d603874d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict
@@ -16,56 +16,65 @@ FoamFile
 
 dynamicFvMesh       dynamicMotionSolverFvMesh;
 
-motionSolverLibs    ("libsixDoFRigidBodyMotion.so");
+motionSolverLibs   ("librigidBodyMeshMotion.so");
 
-solver              sixDoFRigidBodyMotion;
+solver             rigidBodyMotion;
 
-sixDoFRigidBodyMotionCoeffs
+rigidBodyMotionCoeffs
 {
-    patches         (hull);
-    innerDistance   0.3;
-    outerDistance   1;
-
-    centreOfMass    (2.929541 0 0.2);
-    mass            412.73;
-    momentOfInertia (40 921 921);
-    rhoInf          1;
     report          on;
 
-    value           uniform (0 0 0);
-
-    accelerationRelaxation 0.4;
-
     solver
     {
         type Newmark;
     }
 
-    constraints
-    {
-        zAxis
-        {
-            sixDoFRigidBodyMotionConstraint line;
-            direction     (0 0 1);
-        }
-        yPlane
-        {
-            sixDoFRigidBodyMotionConstraint axis;
-            axis          (0 1 0);
-        }
-    }
+    accelerationRelaxation 0.4;
 
-    restraints
+    bodies
     {
-        translationDamper
+        hull
         {
-            sixDoFRigidBodyMotionRestraint linearDamper;
-            coeff         8596;
-        }
-        rotationDamper
-        {
-            sixDoFRigidBodyMotionRestraint sphericalAngularDamper;
-            coeff         11586;
+            type            rigidBody;
+            parent          root;
+
+            centreOfMass    (0 0 0);
+            mass            412.73;
+            inertia         (40 0 0 921 0 921);
+            transform       (1 0 0 0 1 0 0 0 1) (2.929541 0 0.2);
+
+            joint
+            {
+                type    composite;
+                joints
+                (
+                    {
+                        type Pz;
+                    }
+                    {
+                        type Ry;
+                    }
+                );
+            }
+
+            restraints
+            {
+                translationDamper
+                {
+                    type    linearDamper;
+                    coeff   8596;
+                }
+
+                rotationDamper
+                {
+                    type    sphericalAngularDamper;
+                    coeff   11586;
+                }
+            }
+
+            patches         (hull);
+            innerDistance   0.3;
+            outerDistance   1;
         }
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict.sixDoF b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict.sixDoF
new file mode 100644
index 0000000000..02088e1075
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict.sixDoF
@@ -0,0 +1,74 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      dynamicMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh       dynamicMotionSolverFvMesh;
+
+motionSolverLibs    ("libsixDoFRigidBodyMotion.so");
+
+solver              sixDoFRigidBodyMotion;
+
+sixDoFRigidBodyMotionCoeffs
+{
+    patches         (hull);
+    innerDistance   0.3;
+    outerDistance   1;
+
+    centreOfMass    (2.929541 0 0.2);
+    mass            412.73;
+    momentOfInertia (40 921 921);
+    rhoInf          1;
+    report          on;
+
+    value           uniform (0 0 0);
+
+    accelerationRelaxation 0.4;
+
+    solver
+    {
+        type Newmark;
+    }
+
+    constraints
+    {
+        zAxis
+        {
+            sixDoFRigidBodyMotionConstraint line;
+            direction     (0 0 1);
+        }
+        yPlane
+        {
+            sixDoFRigidBodyMotionConstraint axis;
+            axis          (0 1 0);
+        }
+    }
+
+    restraints
+    {
+        translationDamper
+        {
+            sixDoFRigidBodyMotionRestraint linearDamper;
+            coeff         8596;
+        }
+        rotationDamper
+        {
+            sixDoFRigidBodyMotionRestraint sphericalAngularDamper;
+            coeff         11586;
+        }
+    }
+}
+
+
+// ************************************************************************* //

From 9b68e6d80ca70277e2d8f6ee69b851b94a26e13b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 19 Apr 2016 11:11:22 +0100
Subject: [PATCH 437/447] src/Allwmake: Added the new rigidBodyMeshMotion
 library

---
 src/Allwmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Allwmake b/src/Allwmake
index 569ef55c28..395557d19c 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -80,6 +80,7 @@ postProcessing/Allwmake $targetType $*
 
 wmake $targetType sixDoFRigidBodyMotion
 wmake $targetType rigidBodyDynamics
+wmake $targetType rigidBodyMeshMotion
 
 
 #------------------------------------------------------------------------------

From 90f5cc6b9d9b0116a85183c58093b308a4741ee5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 19 Apr 2016 21:58:10 +0100
Subject: [PATCH 438/447] rigidBodyDynamics: Generalized the interface to the
 restraints

Now internal forces and restraints may be applied between bodies within
the articulated structure.
---
 .../linearAxialAngularSpring.C                   | 16 +++++++++-------
 .../linearAxialAngularSpring.H                   |  9 +++++++--
 .../restraints/linearDamper/linearDamper.C       |  9 +++++++--
 .../restraints/linearDamper/linearDamper.H       |  9 +++++++--
 .../restraints/linearSpring/linearSpring.C       |  9 +++++++--
 .../restraints/linearSpring/linearSpring.H       |  9 +++++++--
 .../restraints/restraint/rigidBodyRestraint.C    |  1 +
 .../restraints/restraint/rigidBodyRestraint.H    | 13 +++++++++++--
 .../sphericalAngularDamper.C                     | 16 +++++++++-------
 .../sphericalAngularDamper.H                     |  9 +++++++--
 .../rigidBodyModel/forwardDynamics.C             |  8 ++++++--
 .../rigidBodyModel/rigidBodyModel.H              |  6 +++---
 .../CrankNicolson/CrankNicolson.C                |  5 +++--
 .../rigidBodySolvers/Newmark/Newmark.C           |  5 +++--
 .../rigidBodySolvers/symplectic/symplectic.C     |  5 +++--
 15 files changed, 90 insertions(+), 39 deletions(-)

diff --git a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
index 795c9021b7..8f0b6143e5 100644
--- a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -50,8 +50,7 @@ namespace restraints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::restraints::linearAxialAngularSpring::
-linearAxialAngularSpring
+Foam::RBD::restraints::linearAxialAngularSpring::linearAxialAngularSpring
 (
     const word& name,
     const dictionary& dict,
@@ -66,15 +65,17 @@ linearAxialAngularSpring
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::RBD::restraints::linearAxialAngularSpring::
-~linearAxialAngularSpring()
+Foam::RBD::restraints::linearAxialAngularSpring::~linearAxialAngularSpring()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::spatialVector
-Foam::RBD::restraints::linearAxialAngularSpring::restrain() const
+void Foam::RBD::restraints::linearAxialAngularSpring::restrain
+(
+    scalarField& tau,
+    Field<spatialVector>& fx
+) const
 {
     vector refDir = rotationTensor(vector(1, 0, 0), axis_) & vector(0, 1, 0);
 
@@ -131,7 +132,8 @@ Foam::RBD::restraints::linearAxialAngularSpring::restrain() const
             << endl;
     }
 
-    return spatialVector(moment, Zero);
+    // Accumulate the force for the restrained body
+    fx[bodyIndex_] += spatialVector(moment, Zero);
 }
 
 
diff --git a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
index 2f93637cb7..66b34e0df7 100644
--- a/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
+++ b/src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
@@ -101,8 +101,13 @@ public:
 
     // Member Functions
 
-        //- Return the external force applied to the body by this restraint
-        virtual spatialVector restrain() const;
+        //- Accumulate the retraint internal joint forces into the tau field and
+        //  external forces into the fx field
+        virtual void restrain
+        (
+            scalarField& tau,
+            Field<spatialVector>& fx
+        ) const;
 
         //- Update properties from given dictionary
         virtual bool read(const dictionary& dict);
diff --git a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
index 96982fedab..d3e4e063da 100644
--- a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
+++ b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
@@ -71,7 +71,11 @@ Foam::RBD::restraints::linearDamper::~linearDamper()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::spatialVector Foam::RBD::restraints::linearDamper::restrain() const
+void Foam::RBD::restraints::linearDamper::restrain
+(
+    scalarField& tau,
+    Field<spatialVector>& fx
+) const
 {
     vector force = -coeff_*model_.v(model_.master(bodyID_)).l();
 
@@ -80,7 +84,8 @@ Foam::spatialVector Foam::RBD::restraints::linearDamper::restrain() const
         Info<< " force " << force << endl;
     }
 
-    return spatialVector(Zero, force);
+    // Accumulate the force for the restrained body
+    fx[bodyIndex_] += spatialVector(Zero, force);
 }
 
 
diff --git a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H
index e9ede58277..c0a2c37288 100644
--- a/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H
+++ b/src/rigidBodyDynamics/restraints/linearDamper/linearDamper.H
@@ -92,8 +92,13 @@ public:
 
     // Member Functions
 
-        //- Return the external force applied to the body by this restraint
-        virtual spatialVector restrain() const;
+        //- Accumulate the retraint internal joint forces into the tau field and
+        //  external forces into the fx field
+        virtual void restrain
+        (
+            scalarField& tau,
+            Field<spatialVector>& fx
+        ) const;
 
         //- Update properties from given dictionary
         virtual bool read(const dictionary& dict);
diff --git a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
index b4562d9104..9449d60042 100644
--- a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
+++ b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.C
@@ -71,7 +71,11 @@ Foam::RBD::restraints::linearSpring::~linearSpring()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::spatialVector Foam::RBD::restraints::linearSpring::restrain() const
+void Foam::RBD::restraints::linearSpring::restrain
+(
+    scalarField& tau,
+    Field<spatialVector>& fx
+) const
 {
     point attachmentPt = bodyPoint(refAttachmentPt_);
 
@@ -101,7 +105,8 @@ Foam::spatialVector Foam::RBD::restraints::linearSpring::restrain() const
             << endl;
     }
 
-    return spatialVector(moment, force);
+    // Accumulate the force for the restrained body
+    fx[bodyIndex_] += spatialVector(moment, force);
 }
 
 
diff --git a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
index 5d87ca8896..b7a90f77d0 100644
--- a/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
+++ b/src/rigidBodyDynamics/restraints/linearSpring/linearSpring.H
@@ -105,8 +105,13 @@ public:
 
     // Member Functions
 
-        //- Return the external force applied to the body by this restraint
-        virtual spatialVector restrain() const;
+        //- Accumulate the retraint internal joint forces into the tau field and
+        //  external forces into the fx field
+        virtual void restrain
+        (
+            scalarField& tau,
+            Field<spatialVector>& fx
+        ) const;
 
         //- Update properties from given dictionary
         virtual bool read(const dictionary& dict);
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
index fb44f9fea1..be56e7b084 100644
--- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
@@ -49,6 +49,7 @@ Foam::RBD::restraint::restraint
 :
     name_(name),
     bodyID_(model.bodyID(dict.lookup("body"))),
+    bodyIndex_(model.master(bodyID_)),
     coeffs_(dict),
     model_(model)
 {}
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
index ea281a5350..acb392de16 100644
--- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
@@ -46,6 +46,7 @@ SourceFiles
 #include "autoPtr.H"
 #include "spatialVector.H"
 #include "point.H"
+#include "scalarField.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -75,6 +76,9 @@ protected:
         //- ID of the body the restraint is applied to
         label bodyID_;
 
+        //- Index of the body the force is applied to
+        label bodyIndex_;
+
         //- Restraint model specific coefficient dictionary
         dictionary coeffs_;
 
@@ -153,8 +157,13 @@ public:
             return bodyID_;
         }
 
-        //- Return the external force applied to the body by this restraint
-        virtual spatialVector restrain() const = 0;
+        //- Accumulate the retraint internal joint forces into the tau field and
+        //  external forces into the fx field
+        virtual void restrain
+        (
+            scalarField& tau,
+            Field<spatialVector>& fx
+        ) const = 0;
 
         //- Update properties from given dictionary
         virtual bool read(const dictionary& dict);
diff --git a/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C
index ddd96acf31..8ef17486b7 100644
--- a/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C
+++ b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C
@@ -50,8 +50,7 @@ namespace restraints
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::RBD::restraints::sphericalAngularDamper::
-sphericalAngularDamper
+Foam::RBD::restraints::sphericalAngularDamper::sphericalAngularDamper
 (
     const word& name,
     const dictionary& dict,
@@ -66,15 +65,17 @@ sphericalAngularDamper
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::RBD::restraints::sphericalAngularDamper::
-~sphericalAngularDamper()
+Foam::RBD::restraints::sphericalAngularDamper::~sphericalAngularDamper()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::spatialVector
-Foam::RBD::restraints::sphericalAngularDamper::restrain() const
+void Foam::RBD::restraints::sphericalAngularDamper::restrain
+(
+    scalarField& tau,
+    Field<spatialVector>& fx
+) const
 {
     vector moment = -coeff_*model_.v(model_.master(bodyID_)).w();
 
@@ -83,7 +84,8 @@ Foam::RBD::restraints::sphericalAngularDamper::restrain() const
         Info<< " moment " << moment << endl;
     }
 
-    return spatialVector(moment, Zero);
+    // Accumulate the force for the restrained body
+    fx[bodyIndex_] += spatialVector(moment, Zero);
 }
 
 
diff --git a/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H
index 7754541b96..ccff2ff660 100644
--- a/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H
+++ b/src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.H
@@ -93,8 +93,13 @@ public:
 
     // Member Functions
 
-        //- Return the external force applied to the body by this restraint
-        virtual spatialVector restrain() const;
+        //- Accumulate the retraint internal joint forces into the tau field and
+        //  external forces into the fx field
+        virtual void restrain
+        (
+            scalarField& tau,
+            Field<spatialVector>& fx
+        ) const;
 
         //- Update properties from given dictionary
         virtual bool read(const dictionary& dict);
diff --git a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
index a43e57a828..97d837abb5 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/forwardDynamics.C
@@ -29,7 +29,11 @@ License
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void Foam::RBD::rigidBodyModel::applyRestraints(Field<spatialVector>& fx) const
+void Foam::RBD::rigidBodyModel::applyRestraints
+(
+    scalarField& tau,
+    Field<spatialVector>& fx
+) const
 {
     if (restraints_.empty())
     {
@@ -41,7 +45,7 @@ void Foam::RBD::rigidBodyModel::applyRestraints(Field<spatialVector>& fx) const
         DebugInfo << "Restraint " << restraints_[ri].name();
 
         // Accumulate the restraint forces
-        fx[master(restraints_[ri].bodyID())] += restraints_[ri].restrain();
+        restraints_[ri].restrain(tau, fx);
     }
 }
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
index 8d6c604ca0..d7d8f8e5b9 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.H
@@ -322,9 +322,9 @@ public:
         //- Return the velocity of the given point on the given body
         spatialVector v(const label bodyID, const vector& p) const;
 
-        //- Apply the restraints and accumulate the external forces
-        //  into the fx field
-        void applyRestraints(Field<spatialVector>& fx) const;
+        //- Apply the restraints and accumulate the internal joint forces
+        //  into the tau field and external forces into the fx field
+        void applyRestraints(scalarField& tau, Field<spatialVector>& fx) const;
 
         //- Calculate the joint acceleration qDdot from the joint state q,
         //  velocity qDot, internal force tau (in the joint frame) and
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
index d056d784f6..590b9708ba 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/CrankNicolson/CrankNicolson.C
@@ -70,11 +70,12 @@ void Foam::RBD::rigidBodySolvers::CrankNicolson::solve
 )
 {
     // Accumulate the restraint forces
+    scalarField rtau(tau);
     Field<spatialVector> rfx(fx);
-    model_.applyRestraints(rfx);
+    model_.applyRestraints(rtau, rfx);
 
     // Calculate the accelerations for the given state and forces
-    model_.forwardDynamics(state(), tau, rfx);
+    model_.forwardDynamics(state(), rtau, rfx);
 
     // Correct velocity
     qDot() = qDot0() + deltaT()*(aoc_*qDdot() + (1 - aoc_)*qDdot0());
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
index 48a88c606c..3722f9e9f8 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/Newmark/Newmark.C
@@ -77,11 +77,12 @@ void Foam::RBD::rigidBodySolvers::Newmark::solve
 )
 {
     // Accumulate the restraint forces
+    scalarField rtau(tau);
     Field<spatialVector> rfx(fx);
-    model_.applyRestraints(rfx);
+    model_.applyRestraints(rtau, rfx);
 
     // Calculate the accelerations for the given state and forces
-    model_.forwardDynamics(state(), tau, rfx);
+    model_.forwardDynamics(state(), rtau, rfx);
 
     // Correct velocity
     qDot() = qDot0()
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
index f0dbb3e0df..f1b3338c32 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/symplectic/symplectic.C
@@ -79,12 +79,13 @@ void Foam::RBD::rigidBodySolvers::symplectic::solve
     model_.forwardDynamicsCorrection(state());
 
     // Accumulate the restraint forces
+    scalarField rtau(tau);
     Field<spatialVector> rfx(fx);
-    model_.applyRestraints(rfx);
+    model_.applyRestraints(rtau, rfx);
 
     // Calculate the body acceleration for the given state
     // and restraint forces
-    model_.forwardDynamics(state(), tau, rfx);
+    model_.forwardDynamics(state(), rtau, rfx);
 
     // Second simplectic step:
     //     Complete update of linear and angular velocities

From 3639f36d37e3c3f1ce90dc19aac3621e1ca9b91e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 20 Apr 2016 10:33:19 +0100
Subject: [PATCH 439/447] codingStyleGuide: Corrected sectioning

---
 doc/codingStyleGuide.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index e763b7c0c1..ba9343a767 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -1,6 +1,6 @@
 #                            -*- mode: org; -*-
 #
-#+TITLE:                 OpenFOAM C++ style guide
+#+TITLE:                 OpenFOAM C++ Style Guide
 #+AUTHOR:                  OpenFOAM Foundation
 #+DATE:                         2011-2016
 #+LINK:                   http://www.OpenFOAM.org
@@ -8,7 +8,7 @@
 #+STARTUP: hidestars
 #+STARTUP: odd
 
-* OpenFOAM C++ style guide
+* Code
 *** General
     + 80 character lines max
     + The normal indentation is 4 spaces per logical level.
@@ -365,7 +365,7 @@
       )
       #+end_src
 
-** Documentation
+* Documentation
 *** General
     + For readability in the comment blocks, certain tags are used that are
       translated by pre-filtering the file before sending it to Doxygen.

From 1197304b1ebb6b919b1b3b0be914e7101b9832a9 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 20 Apr 2016 18:23:59 +0100
Subject: [PATCH 440/447] README.org: Added link to the OpenFOAM C++ Style
 Guide

---
 README.org | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.org b/README.org
index d4f14dbe13..58df48f056 100644
--- a/README.org
+++ b/README.org
@@ -1,8 +1,8 @@
 #                            -*- mode: org; -*-
 #
-#+TITLE:                README for [[http://www.openfoam.org/dev.php][OpenFOAM-dev]]
+#+TITLE:     README for [[http://www.openfoam.org/dev.php][OpenFOAM-dev]]
 #+AUTHOR:               The OpenFOAM Foundation
-#+DATE:                     9th March 2015
+#+DATE:                     20th April 2016
 #+LINK:                  http://www.openfoam.org
 #+OPTIONS: author:nil ^:{}
 # Copyright (c) 2015-2016 OpenFOAM Foundation.
@@ -26,5 +26,6 @@
 * [[http://www.OpenFOAM.org/git.php][Download and installation instructions]]
 * [[http://www.OpenFOAM.org/docs][Documentation]]
 * [[http://OpenFOAM.github.io/Documentation-dev/html][Source code documentation]]
+* [[http://OpenFOAM.github.io/Documentation-dev/html/codingStyleGuide.html][OpenFOAM C++ Style Guide]]
 * [[http://www.OpenFOAM.org/bugs][Reporting bugs in OpenFOAM]]
 * [[http://www.openfoam.org/contact][Contacting the OpenFOAM Foundation]]

From d57464a99da0a2e64363158756c5fa047388e0b1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 21 Apr 2016 21:05:47 +0100
Subject: [PATCH 441/447] transformPoints: Added "End" message Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=2059

---
 .../mesh/manipulation/transformPoints/transformPoints.C         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 2fa9ff457e..9f33669af9 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -308,6 +308,8 @@ int main(int argc, char *argv[])
     Info<< "Writing points into directory " << points.path() << nl << endl;
     points.write();
 
+    Info<< "End\n" << endl;
+
     return 0;
 }
 

From 0aaf154100b7bdeaeabea1d70e7fca0285b7ffbc Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 21 Apr 2016 21:06:45 +0100
Subject: [PATCH 442/447] utilities/mesh/manipulation: Rationalized "End"
 message

---
 .../utilities/mesh/manipulation/flattenMesh/flattenMesh.C     | 4 +++-
 .../utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C     | 2 +-
 .../mesh/manipulation/orientFaceZone/orientFaceZone.C         | 2 +-
 .../utilities/mesh/manipulation/renumberMesh/renumberMesh.C   | 2 +-
 .../utilities/mesh/manipulation/rotateMesh/rotateMesh.C       | 2 +-
 applications/utilities/mesh/manipulation/setSet/setSet.C      | 2 +-
 .../utilities/mesh/manipulation/setsToZones/setsToZones.C     | 2 +-
 .../utilities/mesh/manipulation/splitMesh/splitMesh.C         | 2 +-
 .../utilities/mesh/manipulation/stitchMesh/stitchMesh.C       | 2 +-
 .../utilities/mesh/manipulation/subsetMesh/subsetMesh.C       | 2 +-
 applications/utilities/mesh/manipulation/topoSet/topoSet.C    | 2 +-
 11 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
index 6aed660ed8..6265e135db 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
+++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,6 +96,8 @@ int main(int argc, char *argv[])
     Info<< "Writing points into directory " << points.path() << nl << endl;
     points.write();
 
+    Info<< "End\n" << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index 46f59e91e8..fe7c635c3d 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
 
     masterMesh.write();
 
-    Info<< "\nEnd\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
index 1e92368b09..5d8491eac3 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
+++ b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
@@ -385,7 +385,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info<< "\nEnd\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index b8e25e4f6c..d6ad992547 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -1445,7 +1445,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info<< "\nEnd\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
index ae534f9a59..973fe94af2 100644
--- a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
+++ b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
         RotateFields<surfaceTensorField>(mesh, objects, T);
     }
 
-    Info<< "\nEnd\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index c5459ebb9c..1cd3ad6958 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -1029,7 +1029,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info<< "\nEnd\n" << endl;
+    Info<< "End\n" << endl;
 
     return status;
 }
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index da157f7577..753f98dad4 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -333,7 +333,7 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    Info<< "\nEnd\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index 7d40e2449a..671d996a7e 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    Info<< nl << "end" << endl;
+    Info<< "End\n" << endl;
     return 0;
 }
 
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index c6409dbf98..6f492d7bad 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -499,7 +499,7 @@ int main(int argc, char *argv[])
     // Write fields
     runTime.write();
 
-    Info<< nl << "end" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 784e260a94..896ee84bdd 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -462,7 +462,7 @@ int main(int argc, char *argv[])
     }
 
 
-    Info<< "\nEnd\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index 4112e4df19..e27054b3e3 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -370,7 +370,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info<< "\nEnd\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

From 5f13806591975ef39d64c57170bd4654a414e1fd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 21 Apr 2016 21:07:28 +0100
Subject: [PATCH 443/447] Updated headers

---
 .../utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C       | 2 +-
 .../utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C | 2 +-
 .../utilities/mesh/manipulation/rotateMesh/rotateMesh.C         | 2 +-
 .../utilities/mesh/manipulation/setsToZones/setsToZones.C       | 2 +-
 applications/utilities/mesh/manipulation/splitMesh/splitMesh.C  | 2 +-
 .../utilities/mesh/manipulation/stitchMesh/stitchMesh.C         | 2 +-
 applications/utilities/mesh/manipulation/topoSet/topoSet.C      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index fe7c635c3d..29dc2155cd 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
index 5d8491eac3..5595138322 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
+++ b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
index 973fe94af2..fb49b074fa 100644
--- a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
+++ b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index 753f98dad4..8b23cfe5cd 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index 671d996a7e..36c5de626f 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 6f492d7bad..d2f166a654 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index e27054b3e3..8f368f1b3f 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 9d0f4997d360d3ff3c23578a749585ab8864393c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 21 Apr 2016 21:07:39 +0100
Subject: [PATCH 444/447] Tensor, SymmTensor: Simplified invariantII

Now the calculation of the 2nd-invariant is more efficient and
accumulates less round-off error.
---
 src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H | 9 ++-------
 src/OpenFOAM/primitives/Tensor/TensorI.H         | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index b40f40859f..be703817a5 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -404,13 +404,8 @@ inline Cmpt invariantII(const SymmTensor<Cmpt>& st)
 {
     return
     (
-        0.5*sqr(tr(st))
-      - 0.5*
-        (
-           st.xx()*st.xx() + st.xy()*st.xy() + st.xz()*st.xz()
-         + st.xy()*st.xy() + st.yy()*st.yy() + st.yz()*st.yz()
-         + st.xz()*st.xz() + st.yz()*st.yz() + st.zz()*st.zz()
-        )
+        st.xx()*st.yy() + st.yy()*st.zz() + st.xx()*st.zz()
+      - sqr(st.xy()) - sqr(st.yz()) - sqr(st.xz())
     );
 }
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index b9e68a3b0d..a20ba8773e 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -659,13 +659,8 @@ inline Cmpt invariantII(const Tensor<Cmpt>& t)
 {
     return
     (
-        0.5*sqr(tr(t))
-      - 0.5*
-        (
-           t.xx()*t.xx() + t.xy()*t.xy() + t.xz()*t.xz()
-         + t.yx()*t.yx() + t.yy()*t.yy() + t.yz()*t.yz()
-         + t.zx()*t.zx() + t.zy()*t.zy() + t.zz()*t.zz()
-        )
+        t.xx()*t.yy() + t.yy()*t.zz() + t.xx()*t.zz()
+      - t.xy()*t.yx() - t.yz()*t.zy() - t.xz()*t.zx()
     );
 }
 

From 870d75c2d34e889e0f9d073abbb11ed0eb214671 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 21 Apr 2016 21:08:56 +0100
Subject: [PATCH 445/447] dictionary: Corrected topDict() Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2060

---
 src/OpenFOAM/db/dictionary/dictionary.C | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index a85406d53f..aaace1d07e 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -238,7 +238,7 @@ const Foam::dictionary& Foam::dictionary::topDict() const
     }
     else
     {
-        return p;
+        return *this;
     }
 }
 
@@ -273,7 +273,7 @@ Foam::SHA1Digest Foam::dictionary::digest() const
 {
     OSHA1stream os;
 
-    // process entries
+    // Process entries
     forAllConstIter(IDLList<entry>, *this, iter)
     {
         os << *iter;
@@ -285,12 +285,12 @@ Foam::SHA1Digest Foam::dictionary::digest() const
 
 Foam::tokenList Foam::dictionary::tokens() const
 {
-    // linearise dictionary into a string
+    // Serialize dictionary into a string
     OStringStream os;
     write(os, false);
     IStringStream is(os.str());
 
-    // parse string as tokens
+    // Parse string as tokens
     DynamicList<token> tokens;
     token t;
     while (is.read(t))
@@ -579,10 +579,10 @@ bool Foam::dictionary::substituteScopedKeyword(const word& keyword)
 {
     word varName = keyword(1, keyword.size()-1);
 
-    // lookup the variable name in the given dictionary
+    // Lookup the variable name in the given dictionary
     const entry* ePtr = lookupScopedEntryPtr(varName, true, true);
 
-    // if defined insert its entries into this dictionary
+    // If defined insert its entries into this dictionary
     if (ePtr != NULL)
     {
         const dictionary& addDict = ePtr->dict();
@@ -737,7 +737,7 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
 
     if (mergeEntry && iter != hashedEntries_.end())
     {
-        // merge dictionary with dictionary
+        // Merge dictionary with dictionary
         if (iter()->isDict() && entryPtr->isDict())
         {
             iter()->dict().merge(entryPtr->dict());
@@ -747,7 +747,7 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
         }
         else
         {
-            // replace existing dictionary with entry or vice versa
+            // Replace existing dictionary with entry or vice versa
             IDLList<entry>::replace(iter(), entryPtr);
             delete iter();
             hashedEntries_.erase(iter);
@@ -859,7 +859,7 @@ void Foam::dictionary::set(entry* entryPtr)
 {
     entry* existingPtr = lookupEntryPtr(entryPtr->keyword(), false, true);
 
-    // clear dictionary so merge acts like overwrite
+    // Clear dictionary so merge acts like overwrite
     if (existingPtr && existingPtr->isDict())
     {
         existingPtr->dict().clear();
@@ -919,7 +919,7 @@ bool Foam::dictionary::changeKeyword
     bool forceOverwrite
 )
 {
-    // no change
+    // No change
     if (oldKeyword == newKeyword)
     {
         return false;
@@ -985,7 +985,7 @@ bool Foam::dictionary::changeKeyword
         }
     }
 
-    // change name and HashTable, but leave DL-List untouched
+    // Change name and HashTable, but leave DL-List untouched
     iter()->keyword() = newKeyword;
     iter()->name() = name() + '.' + newKeyword;
     hashedEntries_.erase(oldKeyword);
@@ -1039,7 +1039,7 @@ bool Foam::dictionary::merge(const dictionary& dict)
         }
         else
         {
-            // not found - just add
+            // Not found - just add
             add(iter().clone(*this).ptr());
             changed = true;
         }
@@ -1060,7 +1060,7 @@ void Foam::dictionary::clear()
 
 void Foam::dictionary::transfer(dictionary& dict)
 {
-    // changing parents probably doesn't make much sense,
+    // Changing parents probably doesn't make much sense,
     // but what about the names?
     name() = dict.name();
 

From 294379d421de5a5f4d165edcc475e72e2eca0550 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 21 Apr 2016 21:13:10 +0100
Subject: [PATCH 446/447] tutorials/incompressible/pisoFoam/les/motorBike:
 Corrected typos Resolves bug-report
 http://openfoam.org/mantisbt/view.php?id=2061

---
 .../pisoFoam/les/motorBike/lesFiles/fvSchemes              | 1 +
 .../pisoFoam/les/motorBike/lesFiles/fvSolution             | 7 ++++---
 .../pisoFoam/les/motorBike/motorBike/system/fvSolution     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
index 440b2b2311..fea0d13d57 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
index ea00426f61..75b0b6674a 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -31,13 +32,13 @@ solvers
         nCellsInCoarsestLevel 50;
         agglomerator    faceAreaPair;
         mergeLevels     1;
-    };
+    }
 
     pFinal
     {
         $p;
         relTol          0;
-    };
+    }
 
     "(U|k|B|nuTilda)"
     {
@@ -45,7 +46,7 @@ solvers
         smoother        symGaussSeidel;
         tolerance       1e-7;
         relTol          0;
-    };
+    }
 }
 
 PISO
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution
index 5eeddfb8fd..d499b12eab 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution
@@ -36,7 +36,7 @@ solvers
         $p;
         tolerance       1e-6;
         relTol          0;
-    };
+    }
 
     Phi
     {

From e5a029c187f56a0d64e8cc37872a0daaf227524e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 21 Apr 2016 21:19:01 +0100
Subject: [PATCH 447/447] 
 tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle: Added alphaPhi to
 correctFluxes Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=2062

---
 .../ras/damBreakWithObstacle/constant/dynamicMeshDict    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
index 7132713ff0..78c25b1632 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
@@ -21,19 +21,26 @@ dynamicRefineFvMeshCoeffs
 {
     // How often to refine
     refineInterval  1;
+
     // Field to be refinement on
     field           alpha.water;
+
     // Refine field inbetween lower..upper
     lowerRefineLevel 0.001;
     upperRefineLevel 0.999;
+
     // If value < unrefineLevel unrefine
     unrefineLevel   10;
+
     // Have slower than 2:1 refinement
     nBufferLayers   1;
+
     // Refine cells only up to maxRefinement levels
     maxRefinement   2;
+
     // Stop refinement if maxCells reached
     maxCells        200000;
+
     // Flux field and corresponding velocity field. Fluxes on changed
     // faces get recalculated by interpolating the velocity. Use 'none'
     // on surfaceScalarFields that do not need to be reinterpolated.
@@ -42,8 +49,10 @@ dynamicRefineFvMeshCoeffs
         (phi none)
         (nHatf none)
         (rhoPhi none)
+        (alphaPhi none)
         (ghf none)
     );
+
     // Write the refinement level as a volScalarField
     dumpLevel       true;
 }